@takeshape/schema 8.265.1 → 8.268.0

package/dist/util/merge.d.ts

@@ -1,11 +1,11 @@
 import { FormConfig, ObjectSchema, ProjectSchema } from '../project-schema';
 export declare function mergeObjectSchemas(...args: Array<ObjectSchema | undefined>): ObjectSchema;
-export declare function mergeSchemaProperties(base: ObjectSchema, overrides: ObjectSchema): ObjectSchema;
-export declare function rebaseSchemaProperties(to: ObjectSchema, base: ObjectSchema, from: ObjectSchema): ObjectSchema;
-export declare function mergeFormProperties(base: FormConfig, overrides: FormConfig): FormConfig;
-export declare function rebaseFormProperties(to: FormConfig, base: FormConfig, from: FormConfig): FormConfig;
+export declare function mergeSchemaProperties(parent: ObjectSchema, overrides: ObjectSchema): ObjectSchema;
+export declare function rebaseSchemaProperties(base: ObjectSchema, parent: ObjectSchema, head: ObjectSchema): ObjectSchema;
+export declare function mergeFormProperties(parent: FormConfig, overrides: FormConfig): FormConfig;
+export declare function rebaseFormProperties(base: FormConfig, parent: FormConfig, head: FormConfig): FormConfig;
 export declare function mergeFormConfigs(...configs: FormConfig[]): FormConfig;
-export declare function mergeProjectSchemas(to: ProjectSchema, base: ProjectSchema, from: ProjectSchema): {
+export declare function mergeProjectSchemas(base: ProjectSchema, parent: ProjectSchema, head: ProjectSchema): {
     error: string;
     mergedSchema: undefined;
 } | {

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,aAAa,EAAQ,MAAM,mBAAmB,CAAC;AAYjF,wBAAgB,kBAAkB,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,YAAY,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,YAAY,CAgB/F;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,GAAG,YAAY,CAiB7G;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,UAAU,CAevF;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAgBnG;AAED,wBAAgB,gBAAgB,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAErE;AAoJD,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,aAAa,EACnB,IAAI,EAAE,aAAa,GAClB;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,SAAS,CAAA;CAAC,GAAG;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,aAAa,CAAA;CAAC,CAsC5F"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/util/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,YAAY,EAAE,aAAa,EAAQ,MAAM,mBAAmB,CAAC;AAYjF,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;AAoJD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,aAAa,GAClB;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,SAAS,CAAA;CAAC,GAAG;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,aAAa,CAAA;CAAC,CAsC5F"}

package/dist/util/merge.js

@@ -40,13 +40,13 @@ function mergeObjectSchemas(...args) {
   });
 }
 
-function mergeSchemaProperties(base, overrides) {
-  const result = { ...base,
-    properties: { ...base.properties,
+function mergeSchemaProperties(parent, overrides) {
+  const result = { ...parent,
+    properties: { ...parent.properties,
       ...overrides.properties
     }
   };
-  const required = (0, _union.default)(base.required, overrides.required);
+  const required = (0, _union.default)(parent.required, overrides.required);
 
   if (required.length) {
     result.required = required;
@@ -55,22 +55,22 @@ function mergeSchemaProperties(base, overrides) {
   return result;
 }
 
-function rebaseSchemaProperties(to, base, from) {
+function rebaseSchemaProperties(base, parent, head) {
   const {
     properties: toProperties,
     required: toRequired,
     ...toOther
-  } = to;
+  } = base;
   const {
     properties: baseProperties,
     required: baseRequired,
     ...baseOther
-  } = base;
+  } = parent;
   const {
     properties: fromProperties,
     required: fromRequired,
     ...fromOther
-  } = from;
+  } = head;
   const newSchema = { ...(0, _util.rebaseObject)(toOther, baseOther, fromOther),
     type: 'object',
     properties: (0, _util.rebaseObject)(toProperties, baseProperties, fromProperties)
@@ -84,13 +84,13 @@ function rebaseSchemaProperties(to, base, from) {
   return newSchema;
 }
 
-function mergeFormProperties(base, overrides) {
-  const result = { ...base,
-    properties: { ...base.properties,
+function mergeFormProperties(parent, overrides) {
+  const result = { ...parent,
+    properties: { ...parent.properties,
       ...overrides.properties
     }
   };
-  const order = (0, _union.default)(base.order, overrides.order);
+  const order = (0, _union.default)(parent.order, overrides.order);
 
   if (order.length) {
     result.order = order;
@@ -99,22 +99,22 @@ function mergeFormProperties(base, overrides) {
   return result;
 }
 
-function rebaseFormProperties(to, base, from) {
+function rebaseFormProperties(base, parent, head) {
   const {
     properties: toProperties,
     order: toOrder,
     ...toOther
-  } = to;
+  } = base;
   const {
     properties: baseProperties,
     order: baseOrder,
     ...baseOther
-  } = base;
+  } = parent;
   const {
     properties: fromProperties,
     order: fromOrder,
     ...fromOther
-  } = from;
+  } = head;
   const newForm = { ...(0, _util.rebaseObject)(toOther, baseOther, fromOther),
     properties: (0, _util.rebaseObject)(toProperties, baseProperties, fromProperties)
   };
@@ -170,8 +170,8 @@ function compareSection(section, original, updated) {
   return changes;
 }
 
-function compareSections(base, branch) {
-  return mergeableSections.flatMap(section => base[section] || branch[section] ? compareSection(section, base[section] ?? {}, branch[section] ?? {}) : []);
+function compareSections(parent, branch) {
+  return mergeableSections.flatMap(section => parent[section] || branch[section] ? compareSection(section, parent[section] ?? {}, branch[section] ?? {}) : []);
 }
 
 function findChangedShape(schema, change) {
@@ -185,14 +185,14 @@ function getChangedShape(schema, change) {
 } // eslint-disable-next-line complexity
 
 
-function attemptToMerge(to, base, from, change) {
-  const toShape = getChangedShape(to, change);
-  const fromShape = getChangedShape(from, change);
+function attemptToMerge(base, parent, head, change) {
+  const toShape = getChangedShape(base, change);
+  const fromShape = getChangedShape(head, change);
   const toSchema = toShape.schema;
   const fromSchema = fromShape.schema;
 
   if ((0, _types.isObjectSchema)(toSchema) && (0, _types.isObjectSchema)(fromSchema)) {
-    const baseShape = findChangedShape(base, change);
+    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
@@ -210,7 +210,7 @@ function attemptToMerge(to, base, from, change) {
       var _findChangedShape;
 
       let mergedObjSchema;
-      const baseSchema = (_findChangedShape = findChangedShape(base, change)) === null || _findChangedShape === void 0 ? void 0 : _findChangedShape.schema;
+      const baseSchema = (_findChangedShape = findChangedShape(parent, change)) === null || _findChangedShape === void 0 ? void 0 : _findChangedShape.schema;
 
       if (change.op === 'update' && baseSchema && (0, _types.isExtendsSchema)(baseSchema)) {
         const baseObj = (0, _last.default)(baseSchema.extends);
@@ -233,45 +233,45 @@ function attemptToMerge(to, base, from, change) {
   }
 }
 
-function applyChange(to, base, from, change) {
+function applyChange(base, parent, head, change) {
   if (change.op === 'remove') {
-    (0, _unset.default)(to, change.path);
+    (0, _unset.default)(base, change.path);
   } else if (change.op === 'add') {
-    (0, _set.default)(to, change.path, change.value);
+    (0, _set.default)(base, change.path, change.value);
   } else if (change.op === 'update') {
     if (change.section === 'shapes') {
-      const mergedShape = attemptToMerge(to, base, from, change);
+      const mergedShape = attemptToMerge(base, parent, head, change);
 
       if (mergedShape) {
-        (0, _set.default)(to, change.path, mergedShape);
+        (0, _set.default)(base, change.path, mergedShape);
         return;
       }
     } else if (change.section === 'forms') {
-      var _to$forms, _to$forms$shapeName, _from$forms, _from$forms$shapeName;
+      var _base$forms, _base$forms$shapeName, _head$forms, _head$forms$shapeName;
 
       const shapeName = change.path[1];
-      const toForm = (_to$forms = to.forms) === null || _to$forms === void 0 ? void 0 : (_to$forms$shapeName = _to$forms[shapeName]) === null || _to$forms$shapeName === void 0 ? void 0 : _to$forms$shapeName.default;
-      const fromForm = (_from$forms = from.forms) === null || _from$forms === void 0 ? void 0 : (_from$forms$shapeName = _from$forms[shapeName]) === null || _from$forms$shapeName === void 0 ? void 0 : _from$forms$shapeName.default;
+      const toForm = (_base$forms = base.forms) === null || _base$forms === void 0 ? void 0 : (_base$forms$shapeName = _base$forms[shapeName]) === null || _base$forms$shapeName === void 0 ? void 0 : _base$forms$shapeName.default;
+      const fromForm = (_head$forms = head.forms) === null || _head$forms === void 0 ? void 0 : (_head$forms$shapeName = _head$forms[shapeName]) === null || _head$forms$shapeName === void 0 ? void 0 : _head$forms$shapeName.default;
 
       if (toForm && fromForm) {
-        var _base$forms, _base$forms$shapeName;
+        var _parent$forms, _parent$forms$shapeNa;
 
-        const baseForm = (_base$forms = base.forms) === null || _base$forms === void 0 ? void 0 : (_base$forms$shapeName = _base$forms[shapeName]) === null || _base$forms$shapeName === void 0 ? void 0 : _base$forms$shapeName.default;
-        (0, _set.default)(to, change.path, {
+        const baseForm = (_parent$forms = parent.forms) === null || _parent$forms === void 0 ? void 0 : (_parent$forms$shapeNa = _parent$forms[shapeName]) === null || _parent$forms$shapeNa === void 0 ? void 0 : _parent$forms$shapeNa.default;
+        (0, _set.default)(base, change.path, {
           default: baseForm ? rebaseFormProperties(toForm, baseForm, fromForm) : mergeFormConfigs(toForm, fromForm)
         });
         return;
       }
     }
 
-    (0, _set.default)(to, change.path, change.value);
+    (0, _set.default)(base, change.path, change.value);
   }
 }
 
-function mergeProjectSchemas(to, base, from) {
-  const changesTo = compareSections(base, to);
-  const changesFrom = compareSections(base, from);
-  const mergedSchema = (0, _util.deepClone)(to);
+function mergeProjectSchemas(base, parent, head) {
+  const changesTo = compareSections(parent, base);
+  const changesFrom = compareSections(parent, head);
+  const mergedSchema = (0, _util.deepClone)(base);
 
   for (let change of changesFrom) {
     const potentialConflict = changesTo.find(changeTo => (0, _isEqual.default)(changeTo.path, change.path));
@@ -286,7 +286,7 @@ function mergeProjectSchemas(to, base, from) {
 
       if (potentialConflict.op === 'add' && change.op === 'add' || potentialConflict.op === 'update' && change.op === 'update') {
         if (change.section === 'shapes') {
-          const mergedValue = attemptToMerge(to, base, from, change); // eslint-disable-next-line max-depth
+          const mergedValue = attemptToMerge(base, parent, head, change); // eslint-disable-next-line max-depth
 
           if (!mergedValue) {
             return {
@@ -307,7 +307,7 @@ function mergeProjectSchemas(to, base, from) {
       }
     }
 
-    applyChange(mergedSchema, base, from, change);
+    applyChange(mergedSchema, parent, head, change);
   }
 
   return {

package/es/util/merge.js

@@ -14,13 +14,13 @@ export function mergeObjectSchemas(...args) {
     properties: {}
   });
 }
-export function mergeSchemaProperties(base, overrides) {
-  const result = { ...base,
-    properties: { ...base.properties,
+export function mergeSchemaProperties(parent, overrides) {
+  const result = { ...parent,
+    properties: { ...parent.properties,
       ...overrides.properties
     }
   };
-  const required = union(base.required, overrides.required);
+  const required = union(parent.required, overrides.required);
 
   if (required.length) {
     result.required = required;
@@ -28,22 +28,22 @@ export function mergeSchemaProperties(base, overrides) {
 
   return result;
 }
-export function rebaseSchemaProperties(to, base, from) {
+export function rebaseSchemaProperties(base, parent, head) {
   const {
     properties: toProperties,
     required: toRequired,
     ...toOther
-  } = to;
+  } = base;
   const {
     properties: baseProperties,
     required: baseRequired,
     ...baseOther
-  } = base;
+  } = parent;
   const {
     properties: fromProperties,
     required: fromRequired,
     ...fromOther
-  } = from;
+  } = head;
   const newSchema = { ...rebaseObject(toOther, baseOther, fromOther),
     type: 'object',
     properties: rebaseObject(toProperties, baseProperties, fromProperties)
@@ -56,13 +56,13 @@ export function rebaseSchemaProperties(to, base, from) {
 
   return newSchema;
 }
-export function mergeFormProperties(base, overrides) {
-  const result = { ...base,
-    properties: { ...base.properties,
+export function mergeFormProperties(parent, overrides) {
+  const result = { ...parent,
+    properties: { ...parent.properties,
       ...overrides.properties
     }
   };
-  const order = union(base.order, overrides.order);
+  const order = union(parent.order, overrides.order);
 
   if (order.length) {
     result.order = order;
@@ -70,22 +70,22 @@ export function mergeFormProperties(base, overrides) {
 
   return result;
 }
-export function rebaseFormProperties(to, base, from) {
+export function rebaseFormProperties(base, parent, head) {
   const {
     properties: toProperties,
     order: toOrder,
     ...toOther
-  } = to;
+  } = base;
   const {
     properties: baseProperties,
     order: baseOrder,
     ...baseOther
-  } = base;
+  } = parent;
   const {
     properties: fromProperties,
     order: fromOrder,
     ...fromOther
-  } = from;
+  } = head;
   const newForm = { ...rebaseObject(toOther, baseOther, fromOther),
     properties: rebaseObject(toProperties, baseProperties, fromProperties)
   };
@@ -139,8 +139,8 @@ function compareSection(section, original, updated) {
   return changes;
 }
 
-function compareSections(base, branch) {
-  return mergeableSections.flatMap(section => base[section] || branch[section] ? compareSection(section, base[section] ?? {}, branch[section] ?? {}) : []);
+function compareSections(parent, branch) {
+  return mergeableSections.flatMap(section => parent[section] || branch[section] ? compareSection(section, parent[section] ?? {}, branch[section] ?? {}) : []);
 }
 
 function findChangedShape(schema, change) {
@@ -154,14 +154,14 @@ function getChangedShape(schema, change) {
 } // eslint-disable-next-line complexity
 
 
-function attemptToMerge(to, base, from, change) {
-  const toShape = getChangedShape(to, change);
-  const fromShape = getChangedShape(from, change);
+function attemptToMerge(base, parent, head, change) {
+  const toShape = getChangedShape(base, change);
+  const fromShape = getChangedShape(head, change);
   const toSchema = toShape.schema;
   const fromSchema = fromShape.schema;
 
   if (isObjectSchema(toSchema) && isObjectSchema(fromSchema)) {
-    const baseShape = findChangedShape(base, change);
+    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
@@ -179,7 +179,7 @@ function attemptToMerge(to, base, from, change) {
       var _findChangedShape;
 
       let mergedObjSchema;
-      const baseSchema = (_findChangedShape = findChangedShape(base, change)) === null || _findChangedShape === void 0 ? void 0 : _findChangedShape.schema;
+      const baseSchema = (_findChangedShape = findChangedShape(parent, change)) === null || _findChangedShape === void 0 ? void 0 : _findChangedShape.schema;
 
       if (change.op === 'update' && baseSchema && isExtendsSchema(baseSchema)) {
         const baseObj = last(baseSchema.extends);
@@ -202,45 +202,45 @@ function attemptToMerge(to, base, from, change) {
   }
 }
 
-function applyChange(to, base, from, change) {
+function applyChange(base, parent, head, change) {
   if (change.op === 'remove') {
-    unset(to, change.path);
+    unset(base, change.path);
   } else if (change.op === 'add') {
-    set(to, change.path, change.value);
+    set(base, change.path, change.value);
   } else if (change.op === 'update') {
     if (change.section === 'shapes') {
-      const mergedShape = attemptToMerge(to, base, from, change);
+      const mergedShape = attemptToMerge(base, parent, head, change);
 
       if (mergedShape) {
-        set(to, change.path, mergedShape);
+        set(base, change.path, mergedShape);
         return;
       }
     } else if (change.section === 'forms') {
-      var _to$forms, _to$forms$shapeName, _from$forms, _from$forms$shapeName;
+      var _base$forms, _base$forms$shapeName, _head$forms, _head$forms$shapeName;
 
       const shapeName = change.path[1];
-      const toForm = (_to$forms = to.forms) === null || _to$forms === void 0 ? void 0 : (_to$forms$shapeName = _to$forms[shapeName]) === null || _to$forms$shapeName === void 0 ? void 0 : _to$forms$shapeName.default;
-      const fromForm = (_from$forms = from.forms) === null || _from$forms === void 0 ? void 0 : (_from$forms$shapeName = _from$forms[shapeName]) === null || _from$forms$shapeName === void 0 ? void 0 : _from$forms$shapeName.default;
+      const toForm = (_base$forms = base.forms) === null || _base$forms === void 0 ? void 0 : (_base$forms$shapeName = _base$forms[shapeName]) === null || _base$forms$shapeName === void 0 ? void 0 : _base$forms$shapeName.default;
+      const fromForm = (_head$forms = head.forms) === null || _head$forms === void 0 ? void 0 : (_head$forms$shapeName = _head$forms[shapeName]) === null || _head$forms$shapeName === void 0 ? void 0 : _head$forms$shapeName.default;
 
       if (toForm && fromForm) {
-        var _base$forms, _base$forms$shapeName;
+        var _parent$forms, _parent$forms$shapeNa;
 
-        const baseForm = (_base$forms = base.forms) === null || _base$forms === void 0 ? void 0 : (_base$forms$shapeName = _base$forms[shapeName]) === null || _base$forms$shapeName === void 0 ? void 0 : _base$forms$shapeName.default;
-        set(to, change.path, {
+        const baseForm = (_parent$forms = parent.forms) === null || _parent$forms === void 0 ? void 0 : (_parent$forms$shapeNa = _parent$forms[shapeName]) === null || _parent$forms$shapeNa === void 0 ? void 0 : _parent$forms$shapeNa.default;
+        set(base, change.path, {
           default: baseForm ? rebaseFormProperties(toForm, baseForm, fromForm) : mergeFormConfigs(toForm, fromForm)
         });
         return;
       }
     }
 
-    set(to, change.path, change.value);
+    set(base, change.path, change.value);
   }
 }
 
-export function mergeProjectSchemas(to, base, from) {
-  const changesTo = compareSections(base, to);
-  const changesFrom = compareSections(base, from);
-  const mergedSchema = deepClone(to);
+export function mergeProjectSchemas(base, parent, head) {
+  const changesTo = compareSections(parent, base);
+  const changesFrom = compareSections(parent, head);
+  const mergedSchema = deepClone(base);
 
   for (let change of changesFrom) {
     const potentialConflict = changesTo.find(changeTo => isEqual(changeTo.path, change.path));
@@ -255,7 +255,7 @@ export function mergeProjectSchemas(to, base, from) {
 
       if (potentialConflict.op === 'add' && change.op === 'add' || potentialConflict.op === 'update' && change.op === 'update') {
         if (change.section === 'shapes') {
-          const mergedValue = attemptToMerge(to, base, from, change); // eslint-disable-next-line max-depth
+          const mergedValue = attemptToMerge(base, parent, head, change); // eslint-disable-next-line max-depth
 
           if (!mergedValue) {
             return {
@@ -276,7 +276,7 @@ export function mergeProjectSchemas(to, base, from) {
       }
     }
 
-    applyChange(mergedSchema, base, from, change);
+    applyChange(mergedSchema, parent, head, change);
   }
 
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "8.265.1",
+  "version": "8.268.0",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -30,9 +30,9 @@
     "p-reduce": "^2.1.0",
     "semver": "^7.3.2",
     "tiny-invariant": "^1.2.0",
-    "@takeshape/errors": "8.265.1",
-    "@takeshape/util": "8.265.1",
-    "@takeshape/json-schema": "8.265.1"
+    "@takeshape/errors": "8.268.0",
+    "@takeshape/json-schema": "8.268.0",
+    "@takeshape/util": "8.268.0"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",