@takeshape/schema 8.282.0 → 8.282.4

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,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"}
+{"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;AAajF,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;AA6JD,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,CAwC5F"}

package/dist/util/merge.js

@@ -31,6 +31,8 @@ var _types = require("../types");
 
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
 
+var _pickBy = _interopRequireDefault(require("lodash/pickBy"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function mergeObjectSchemas(...args) {
@@ -134,7 +136,15 @@ function mergeFormConfigs(...configs) {
   });
 }
 
-const mergeableSections = ['shapes', 'mutations', 'queries', 'forms', 'services'];
+const mergeableSections = ['shapes', 'mutations', 'queries', 'forms', 'services', 'indexedShapes'];
+
+const isMergeableSection = str => {
+  return mergeableSections.includes(str);
+};
+
+const pickUnmergeable = projectSchema => {
+  return (0, _pickBy.default)(projectSchema, (_value, key) => !isMergeableSection(key));
+};
 
 function compareSection(section, original, updated) {
   const changes = [];
@@ -310,6 +320,7 @@ function mergeProjectSchemas(base, parent, head) {
     applyChange(mergedSchema, parent, head, change);
   }
 
+  Object.assign(mergedSchema, (0, _util.rebaseObject)(pickUnmergeable(base), pickUnmergeable(parent), pickUnmergeable(head)));
   return {
     error: undefined,
     mergedSchema

package/es/util/merge.js

@@ -8,6 +8,7 @@ import last from 'lodash/last';
 import omit from 'lodash/omit';
 import { isExtendsSchema, isObjectSchema } from '../types';
 import invariant from 'tiny-invariant';
+import pickBy from 'lodash/pickBy';
 export function mergeObjectSchemas(...args) {
   return args.filter(isDefined).reduce(mergeSchemaProperties, {
     type: 'object',
@@ -103,7 +104,15 @@ export function mergeFormConfigs(...configs) {
     order: []
   });
 }
-const mergeableSections = ['shapes', 'mutations', 'queries', 'forms', 'services'];
+const mergeableSections = ['shapes', 'mutations', 'queries', 'forms', 'services', 'indexedShapes'];
+
+const isMergeableSection = str => {
+  return mergeableSections.includes(str);
+};
+
+const pickUnmergeable = projectSchema => {
+  return pickBy(projectSchema, (_value, key) => !isMergeableSection(key));
+};
 
 function compareSection(section, original, updated) {
   const changes = [];
@@ -279,6 +288,7 @@ export function mergeProjectSchemas(base, parent, head) {
     applyChange(mergedSchema, parent, head, change);
   }
 
+  Object.assign(mergedSchema, rebaseObject(pickUnmergeable(base), pickUnmergeable(parent), pickUnmergeable(head)));
   return {
     error: undefined,
     mergedSchema

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "8.282.0",
+  "version": "8.282.4",
   "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.282.0",
-    "@takeshape/util": "8.282.0",
-    "@takeshape/json-schema": "8.282.0"
+    "@takeshape/json-schema": "8.282.4",
+    "@takeshape/errors": "8.282.4",
+    "@takeshape/util": "8.282.4"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",