@takeshape/schema 8.46.0 → 8.49.0

package/lib/flatten-templates.js

@@ -31,7 +31,7 @@ function flattenTemplates(projectSchema) {
       const {
         shapeName,
         dependencies
-      } = (0, _templateShapes.resolveTemplate)(projectSchema, ref.template, (0, _refs.refItemToShapeName)(ref));
+      } = (0, _templateShapes.resolveTemplate)(newSchema, ref.template, (0, _refs.refItemToShapeName)(ref));
       (0, _set.default)(newSchema, ref.path, ref.path[ref.path.length - 1] === '@ref' ? `local:${shapeName}` : shapeName);
       Object.assign(newSchema.shapes, dependencies);
     }

package/lib/template-shapes/templates.js

@@ -297,7 +297,7 @@ function getMutationArgs(templateName, verb) {
           const shapeName = (0, _refs.getRefShapeName)(projectSchema, propSchema);
 
           if (shapeName) {
-            return !projectSchema.shapes[getInputShapeName(shapeName)];
+            return shapeName !== 'TSRelationship' && !projectSchema.shapes[getInputShapeName(shapeName)];
           }
 
           return true;

package/lib/template-shapes/where.d.ts

@@ -20,10 +20,11 @@ export declare const fieldTypeComparison: Record<string, {
 export declare const comparatorDescriptions: Record<string, string>;
 export declare const booleanOperators: string[];
 export declare const boolOpDescriptionMap: Record<string, string>;
+export declare function isEqualRelationship(a: PropertySchema, b: PropertySchema): boolean;
 export declare function getFieldTypeComparison(fieldType: string): Maybe<Record<string, PropertySchema>>;
 export interface PropertyContext {
     shapeCache: ShapeCache;
-    conflictingProperties: string[];
+    conflictingProperties?: Set<string>;
     projectSchema: ProjectSchema;
     relationshipDepth: number;
     booleanOperators?: boolean;

package/lib/template-shapes/where.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"where.d.ts","sourceRoot":"","sources":["../../../src/template-shapes/where.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAY,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAC,cAAc,EAAE,aAAa,EAAE,KAAK,EAAC,MAAM,mBAAmB,CAAC;AAM5E,OAAO,EAAC,YAAY,EAAE,QAAQ,EAAC,MAAM,mBAAmB,CAAC;AAczD,OAAO,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAIzC,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,yBAAyB,sBAAgB,OAA0C,CAAC;AAEjG,aAAK,qBAAqB,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE5F,aAAK,UAAU,GAAG,KAAK,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;AAExC,cAAM,UAAU;IACd,MAAM,0BAAiC;IACvC,UAAU,cAAqB;IAE/B,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/B,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAO/C,UAAU,IAAI,QAAQ;CAiBvB;AAED,eAAO,MAAM,mBAAmB,EAAE,MAAM,CACtC,MAAM,EACN;IAAC,WAAW,EAAE,qBAAqB,EAAE,CAAC;IAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAA;CAAC,CAW1F,CAAC;AACF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CASzD,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAuB,CAAC;AACrD,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAIvD,CAAC;AA0BF,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAc/F;AAsGD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAiBD,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAerH;AAYD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,eAAe,GACvB,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CA+EvC;AAkED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,gBAAgB,CA0BrG;AAED,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,KAAK,EAAE,GACtB;IAAC,MAAM,EAAE,YAAY,CAAC;IAAC,YAAY,EAAE,QAAQ,CAAA;CAAC,CAchD"}
+{"version":3,"file":"where.d.ts","sourceRoot":"","sources":["../../../src/template-shapes/where.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAY,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAC,cAAc,EAAE,aAAa,EAAE,KAAK,EAAC,MAAM,mBAAmB,CAAC;AAI5E,OAAO,EAAC,YAAY,EAAE,QAAQ,EAAC,MAAM,mBAAmB,CAAC;AAczD,OAAO,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAIzC,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,yBAAyB,sBAAgB,OAA0C,CAAC;AAEjG,aAAK,qBAAqB,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE5F,aAAK,UAAU,GAAG,KAAK,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;AAExC,cAAM,UAAU;IACd,MAAM,0BAAiC;IACvC,UAAU,cAAqB;IAE/B,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/B,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAO/C,UAAU,IAAI,QAAQ;CAiBvB;AAED,eAAO,MAAM,mBAAmB,EAAE,MAAM,CACtC,MAAM,EACN;IAAC,WAAW,EAAE,qBAAqB,EAAE,CAAC;IAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAA;CAAC,CAW1F,CAAC;AACF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CASzD,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAuB,CAAC;AACrD,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAIvD,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,GAAG,OAAO,CAkBjF;AAqBD,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAc/F;AAsGD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,qBAAqB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACpC,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAiBD,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAkBrH;AAYD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,eAAe,GACvB,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAkFvC;AAkED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,gBAAgB,CA4BrG;AAED,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,KAAK,EAAE,GACtB;IAAC,MAAM,EAAE,YAAY,CAAC;IAAC,YAAY,EAAE,QAAQ,CAAA;CAAC,CAchD"}

package/lib/template-shapes/where.js

@@ -9,13 +9,10 @@ exports.getFields = getFields;
 exports.getPropertyComparisonType = getPropertyComparisonType;
 exports.getWhereSearchArg = getWhereSearchArg;
 exports.getWhereShape = getWhereShape;
+exports.isEqualRelationship = isEqualRelationship;
 
 var _util = require("@takeshape/util");
 
-var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
-
-var _get = _interopRequireDefault(require("lodash/get"));
-
 var _unset = _interopRequireDefault(require("lodash/unset"));
 
 var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
@@ -145,13 +142,40 @@ const boolOpDescriptionMap = {
 };
 exports.boolOpDescriptionMap = boolOpDescriptionMap;
 
-const getConflictingProperties = (projectSchema, shapes) => {
-  let conflicts = [];
+function isEqualRelationship(a, b) {
+  var _a$Relationship, _b$Relationship;
+
+  // non-relationships are considered equal in that they are both equal that regard
+  if (!a['@relationship'] && !b['@relationship']) {
+    return true;
+  }
+
+  const idsA = (_a$Relationship = a['@relationship']) === null || _a$Relationship === void 0 ? void 0 : _a$Relationship.shapeIds;
+
+  if (!idsA) {
+    return false;
+  }
+
+  const idsB = (_b$Relationship = b['@relationship']) === null || _b$Relationship === void 0 ? void 0 : _b$Relationship.shapeIds;
+
+  if (!idsB || idsA.length !== idsB.length) {
+    return false;
+  }
+
+  const idSet = new Set(idsA);
+  return idsB.every(id => idSet.has(id));
+}
+
+function getConflictingProperties(projectSchema, shapes) {
+  const conflicts = new Set();
   const allProps = {};
 
   for (const shape of Object.values(shapes)) {
-    const shapeConflicts = (0, _schemaUtil.createSchemaPropertyList)(projectSchema, shape.schema).filterBy(([name, prop]) => name in allProps && (allProps[name].type !== prop.type || !(0, _isEqual.default)((0, _get.default)(allProps, [name, '@relationship', 'shapeIds']), (0, _get.default)(prop, ['@relationship', 'shapeIds'])))).getNames();
-    conflicts = conflicts.concat(shapeConflicts);
+    for (const [name, prop] of (0, _schemaUtil.createSchemaPropertyList)(projectSchema, shape.schema).getNodes()) {
+      if (name in allProps && (allProps[name].type !== prop.type || !isEqualRelationship(allProps[name], prop))) {
+        conflicts.add(name);
+      }
+    }
 
     if ((0, _types.isObjectSchema)(shape.schema)) {
       Object.assign(allProps, shape.schema.properties);
@@ -159,7 +183,7 @@ const getConflictingProperties = (projectSchema, shapes) => {
   }
 
   return conflicts;
-};
+}
 
 function getFieldTypeComparison(fieldType) {
   const comparison = fieldTypeComparison[fieldType];
@@ -286,7 +310,7 @@ function getTypeName(name, prop, shapeName, context) {
 
   if (type === 'object' || type === 'array') {
     const prefix = `TS${relationshipDepth >= MAX_RELATIONSHIP_DEPTH ? 'Shallow' : ''}Where`;
-    const fieldName = `${conflictingProperties.includes(name) ? '_' : ''}${(0, _util.pascalCase)(name)}`;
+    const fieldName = `${conflictingProperties !== null && conflictingProperties !== void 0 && conflictingProperties.has(name) ? '_' : ''}${(0, _util.pascalCase)(name)}`;
     const refItem = (0, _refs.getRefOrItemsRef)(projectSchema, prop);
     const suffix = refItem ? (0, _refs.refItemToShapeName)(refItem) : `${shapeName}${fieldName}`;
     return `${prefix}${suffix}`;
@@ -307,12 +331,16 @@ function getFields(typeName, shapes, context) {
   } = context;
   const result = {};
   const tooDeep = exceededRelationshipDepth(relationshipDepth);
+  const conflictingProperties = shapes.length ? getConflictingProperties(projectSchema, shapes) : undefined;
+  const fieldContext = { ...context,
+    conflictingProperties
+  };
 
   for (const shape of shapes) {
     const nodes = (0, _schemaUtil.createSchemaPropertyList)(projectSchema, shape.schema).filterBy(([name, property]) => !skipField(name, property, projectSchema, tooDeep)).getNodes();
 
     for (const [name, property] of nodes) {
-      Object.assign(result, getPropertyComparisonType(name, property, shape.name, context));
+      Object.assign(result, getPropertyComparisonType(name, property, shape.name, fieldContext));
     }
   }
 
@@ -364,7 +392,7 @@ function getPropertyComparisonType(name, prop, shapeName, context) {
     }
   }
 
-  if (!shapeCache.has(typeName)) {
+  if (!shapeCache.has(typeName) && !projectSchema.shapes[typeName]) {
     shapeCache.set(typeName, () => {
       var _prop$items;
 
@@ -376,13 +404,11 @@ function getPropertyComparisonType(name, prop, shapeName, context) {
       } else if (prop['@relationship']) {
         const shapes = prop['@relationship'].shapeIds.map(id => (0, _schemaUtil.getShapeById)(projectSchema, id)).filter(_util.isDefined);
         props = getFields(typeName, shapes, { ...context,
-          conflictingProperties: getConflictingProperties(context.projectSchema, shapes),
           relationshipDepth: relationshipDepth + 1
         });
       } else if ((0, _unions.isUnionSchema)(propOrItems)) {
         const shapes = (0, _unions.enumerateOneOfKeys)(projectSchema, propOrItems.oneOf).map(option => projectSchema.shapes[option.shapeName]);
         props = getFields(typeName, shapes, { ...context,
-          conflictingProperties: getConflictingProperties(context.projectSchema, shapes),
           relationshipDepth,
           booleanOperators: false
         });
@@ -392,10 +418,14 @@ function getPropertyComparisonType(name, prop, shapeName, context) {
         const properties = ((_prop$items2 = prop.items) === null || _prop$items2 === void 0 ? void 0 : _prop$items2.properties) ?? prop.properties;
 
         if (properties) {
+          props = props ?? {};
+          const fieldContext = { ...context,
+            conflictingProperties: undefined // non-union objects have no conflicts
+
+          };
+
           for (const propName of Object.keys(properties)) {
-            props = { ...props,
-              ...getPropertyComparisonType(propName, properties[propName], shapeName, context)
-            };
+            Object.assign(props, getPropertyComparisonType(propName, properties[propName], shapeName, fieldContext));
           }
         }
       } else {
@@ -420,8 +450,8 @@ function getPropertyComparisonType(name, prop, shapeName, context) {
     });
   }
 
-  if (shapeCache.has(typeName)) {
-    const fieldName = `${conflictingProperties.includes(name) ? `${shapeName}_` : ''}${name}`;
+  if (shapeCache.has(typeName) || projectSchema.shapes[typeName]) {
+    const fieldName = `${conflictingProperties !== null && conflictingProperties !== void 0 && conflictingProperties.has(name) ? `${shapeName}_` : ''}${name}`;
     return {
       [fieldName]: {
         '@ref': `local:${typeName}`
@@ -500,14 +530,20 @@ function expandUnionShapes(projectSchema, shapes) {
 
 function getWhereShape(projectSchema, selectedShapes) {
   const shapeName = selectedShapes.length === 1 ? `TSWhere${(0, _util.pascalCase)(selectedShapes[0].name)}Input` : 'TSWhereInput';
+
+  if (projectSchema.shapes[shapeName]) {
+    return {
+      shapeName,
+      dependencies: {}
+    };
+  }
+
   const expandedShapes = expandUnionShapes(projectSchema, selectedShapes);
   const isManyContentTypes = expandedShapes.length > 1;
   const shapeCache = new ShapeCache();
-  const conflictingProperties = getConflictingProperties(projectSchema, expandedShapes);
   const fields = getFields(shapeName, expandedShapes, {
     projectSchema,
     shapeCache,
-    conflictingProperties,
     relationshipDepth: 0
   });
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "8.46.0",
+  "version": "8.49.0",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -21,9 +21,9 @@
     "examples"
   ],
   "dependencies": {
-    "@takeshape/errors": "8.46.0",
-    "@takeshape/json-schema": "8.46.0",
-    "@takeshape/util": "8.46.0",
+    "@takeshape/errors": "8.49.0",
+    "@takeshape/json-schema": "8.49.0",
+    "@takeshape/util": "8.49.0",
     "ajv": "^7.0.4",
     "ajv-formats": "^1.5.1",
     "blueimp-md5": "^2.10.0",