"release v1.0.0-alpha.20"

Author: JamesMessinger

dist/ref-parser.js

@@ -1,6 +1,6 @@
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.$RefParser = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 /**!
- * JSON Schema $Ref Parser v1.0.0-alpha.19
+ * JSON Schema $Ref Parser v1.0.0-alpha.20
  *
  * @link https://github.com/BigstickCarpet/json-schema-ref-parser
  * @license MIT
@@ -535,13 +535,18 @@ function merge(src, dest) {
     var topKeys = Object.keys(src);
     for (var i = 0; i < topKeys.length; i++) {
       var topKey = topKeys[i];
-      var child = src[topKey];
-      var childKeys = Object.keys(child);
-      for (var j = 0; j < childKeys.length; j++) {
-        var childKey = childKeys[j];
-        var childValue = child[childKey];
-        if (childValue !== undefined) {
-          dest[topKey][childKey] = childValue;
+      var srcChild = src[topKey];
+      if (dest[topKey] === undefined) {
+        dest[topKey] = srcChild;
+      }
+      else {
+        var childKeys = Object.keys(srcChild);
+        for (var j = 0; j < childKeys.length; j++) {
+          var childKey = childKeys[j];
+          var srcChildValue = srcChild[childKey];
+          if (srcChildValue !== undefined) {
+            dest[topKey][childKey] = srcChildValue;
+          }
         }
       }
     }

dist/ref-parser.js.map

@@ -1,5 +1,5 @@
 /**!
- * JSON Schema $Ref Parser v1.0.0-alpha.19
+ * JSON Schema $Ref Parser v1.0.0-alpha.20
  *
  * @link https://github.com/BigstickCarpet/json-schema-ref-parser
  * @license MIT

dist/ref-parser.min.js

@@ -1,6 +1,6 @@
 {
   "name": "json-schema-ref-parser",
-  "version": "1.0.0-alpha.19",
+  "version": "1.0.0-alpha.20",
   "description": "Parse, Resolve, and Dereference JSON Schema $ref pointers",
   "keywords": [
     "json",