@takeshape/schema 9.58.0 → 9.58.2

package/dist/util/merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/util/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAY,MAAM,mBAAmB,CAAC;AAazF,wBAAgB,kBAAkB,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,YAAY,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,YAAY,CAgBjG;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,GAAG,YAAY,CAiBjH;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,UAAU,CAezF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAgBvG;AAED,wBAAgB,gBAAgB,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAErE;AAkKD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,iBAAiB,GACtB;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,SAAS,CAAA;CAAC,GAAG;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,iBAAiB,CAAA;CAAC,CAwChG"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/util/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAY,MAAM,mBAAmB,CAAC;AAazF,wBAAgB,kBAAkB,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,YAAY,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,YAAY,CAgBjG;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,GAAG,YAAY,CAiBjH;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,UAAU,CAezF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAgBvG;AAED,wBAAgB,gBAAgB,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAErE;AAmLD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,iBAAiB,GACtB;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,SAAS,CAAA;CAAC,GAAG;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,iBAAiB,CAAA;CAAC,CAwChG"}

package/dist/util/merge.js

@@ -192,6 +192,12 @@ function getChangedShape(schema, change) {
   const shape = findChangedShape(schema, change);
   (0, _tinyInvariant.default)(shape, 'Expected shape not found');
   return shape;
+}
+
+function rebaseShapeProperties(toShape, fromShape, baseShape) {
+  return baseShape ? (0, _util.rebaseObject)((0, _omit.default)(toShape, 'schema'), (0, _omit.default)(baseShape, 'schema'), (0, _omit.default)(fromShape, 'schema')) : { ...toShape,
+    ...fromShape
+  };
 } // eslint-disable-next-line complexity
 
 
@@ -201,12 +207,17 @@ function attemptToMerge(base, parent, head, change) {
   const toSchema = toShape.schema;
   const fromSchema = fromShape.schema;
 
+  if ((0, _isEqual.default)(toSchema, fromSchema)) {
+    const baseShape = findChangedShape(parent, change);
+    return { ...rebaseShapeProperties(toShape, fromShape, baseShape),
+      schema: toSchema
+    };
+  }
+
   if ((0, _types.isObjectSchema)(toSchema) && (0, _types.isObjectSchema)(fromSchema)) {
     const baseShape = findChangedShape(parent, change);
     const baseSchema = baseShape === null || baseShape === void 0 ? void 0 : baseShape.schema;
-    return { ...(baseShape ? (0, _util.rebaseObject)((0, _omit.default)(toShape, 'schema'), (0, _omit.default)(baseShape, 'schema'), (0, _omit.default)(fromShape, 'schema')) : { ...toShape,
-        ...fromShape
-      }),
+    return { ...rebaseShapeProperties(toShape, fromShape, baseShape),
       schema: change.op === 'update' && baseSchema && (0, _types.isObjectSchema)(baseSchema) ? rebaseSchemaProperties(toSchema, baseSchema, fromSchema) : mergeSchemaProperties(toSchema, fromSchema)
     };
   }
@@ -217,10 +228,9 @@ function attemptToMerge(base, parent, head, change) {
     const fromObj = (0, _last.default)(fromSchema.extends);
 
     if (toObj && (0, _types.isObjectSchema)(toObj) && fromObj && (0, _types.isObjectSchema)(fromObj) && toSchema.extends.slice(0, toSchema.extends.length - 1).every((item, i) => (0, _isEqual.default)(item, fromExtends[i]))) {
-      var _findChangedShape;
-
       let mergedObjSchema;
-      const baseSchema = (_findChangedShape = findChangedShape(parent, change)) === null || _findChangedShape === void 0 ? void 0 : _findChangedShape.schema;
+      const baseShape = findChangedShape(parent, change);
+      const baseSchema = baseShape === null || baseShape === void 0 ? void 0 : baseShape.schema;
 
       if (change.op === 'update' && baseSchema && (0, _types.isExtendsSchema)(baseSchema)) {
         const baseObj = (0, _last.default)(baseSchema.extends);
@@ -234,7 +244,7 @@ function attemptToMerge(base, parent, head, change) {
         mergedObjSchema = mergeSchemaProperties(toObj, fromObj);
       }
 
-      return { ...fromShape,
+      return { ...rebaseShapeProperties(toShape, fromShape, baseShape),
         schema: {
           extends: [...toSchema.extends.slice(0, toSchema.extends.length - 1), mergedObjSchema]
         }

package/es/util/merge.js

@@ -160,6 +160,12 @@ function getChangedShape(schema, change) {
   const shape = findChangedShape(schema, change);
   invariant(shape, 'Expected shape not found');
   return shape;
+}
+
+function rebaseShapeProperties(toShape, fromShape, baseShape) {
+  return baseShape ? rebaseObject(omit(toShape, 'schema'), omit(baseShape, 'schema'), omit(fromShape, 'schema')) : { ...toShape,
+    ...fromShape
+  };
 } // eslint-disable-next-line complexity
 
 
@@ -169,12 +175,17 @@ function attemptToMerge(base, parent, head, change) {
   const toSchema = toShape.schema;
   const fromSchema = fromShape.schema;
 
+  if (isEqual(toSchema, fromSchema)) {
+    const baseShape = findChangedShape(parent, change);
+    return { ...rebaseShapeProperties(toShape, fromShape, baseShape),
+      schema: toSchema
+    };
+  }
+
   if (isObjectSchema(toSchema) && isObjectSchema(fromSchema)) {
     const baseShape = findChangedShape(parent, change);
     const baseSchema = baseShape === null || baseShape === void 0 ? void 0 : baseShape.schema;
-    return { ...(baseShape ? rebaseObject(omit(toShape, 'schema'), omit(baseShape, 'schema'), omit(fromShape, 'schema')) : { ...toShape,
-        ...fromShape
-      }),
+    return { ...rebaseShapeProperties(toShape, fromShape, baseShape),
       schema: change.op === 'update' && baseSchema && isObjectSchema(baseSchema) ? rebaseSchemaProperties(toSchema, baseSchema, fromSchema) : mergeSchemaProperties(toSchema, fromSchema)
     };
   }
@@ -185,10 +196,9 @@ function attemptToMerge(base, parent, head, change) {
     const fromObj = last(fromSchema.extends);
 
     if (toObj && isObjectSchema(toObj) && fromObj && isObjectSchema(fromObj) && toSchema.extends.slice(0, toSchema.extends.length - 1).every((item, i) => isEqual(item, fromExtends[i]))) {
-      var _findChangedShape;
-
       let mergedObjSchema;
-      const baseSchema = (_findChangedShape = findChangedShape(parent, change)) === null || _findChangedShape === void 0 ? void 0 : _findChangedShape.schema;
+      const baseShape = findChangedShape(parent, change);
+      const baseSchema = baseShape === null || baseShape === void 0 ? void 0 : baseShape.schema;
 
       if (change.op === 'update' && baseSchema && isExtendsSchema(baseSchema)) {
         const baseObj = last(baseSchema.extends);
@@ -202,7 +212,7 @@ function attemptToMerge(base, parent, head, change) {
         mergedObjSchema = mergeSchemaProperties(toObj, fromObj);
       }
 
-      return { ...fromShape,
+      return { ...rebaseShapeProperties(toShape, fromShape, baseShape),
         schema: {
           extends: [...toSchema.extends.slice(0, toSchema.extends.length - 1), mergedObjSchema]
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "9.58.0",
+  "version": "9.58.2",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -28,9 +28,9 @@
     "p-reduce": "^2.1.0",
     "semver": "^7.3.2",
     "tiny-invariant": "^1.2.0",
-    "@takeshape/json-schema": "9.58.0",
-    "@takeshape/util": "9.58.0",
-    "@takeshape/errors": "9.58.0"
+    "@takeshape/errors": "9.58.2",
+    "@takeshape/util": "9.58.2",
+    "@takeshape/json-schema": "9.58.2"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",
@@ -46,7 +46,7 @@
     "meow": "^9.0.0",
     "p-map": "^5.0.0",
     "shortid": "^2.2.15",
-    "@takeshape/typescript-jest-junit-reporter": "9.58.0"
+    "@takeshape/typescript-jest-junit-reporter": "9.58.2"
   },
   "engines": {
     "node": ">=16"