@takeshape/schema 8.48.2 → 8.49.0

package/es/flatten-templates.js

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

package/es/template-shapes/templates.js

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

package/es/template-shapes/where.js

@@ -1,8 +1,6 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import { pascalCase, isDefined } from '@takeshape/util';
-import isEqual from 'lodash/isEqual';
-import get from 'lodash/get';
 import unset from 'lodash/unset';
 import isFunction from 'lodash/isFunction';
 import { createSchemaPropertyList, createShape, getAllRefsInShapes, getShapeById } from '../schema-util';
@@ -110,14 +108,40 @@ export const boolOpDescriptionMap = {
   OR: 'OR takes an array of conditions that should appear in the matching results. Nested boolean operators can be used to create complex filters.',
   NOT: 'NOT takes a single condition that must not appear in the matching results.'
 };
+export function isEqualRelationship(a, b) {
+  var _a$Relationship, _b$Relationship;
 
-const getConflictingProperties = (projectSchema, shapes) => {
-  let conflicts = [];
+  // 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 = createSchemaPropertyList(projectSchema, shape.schema).filterBy(([name, prop]) => name in allProps && (allProps[name].type !== prop.type || !isEqual(get(allProps, [name, '@relationship', 'shapeIds']), get(prop, ['@relationship', 'shapeIds'])))).getNames();
-    conflicts = conflicts.concat(shapeConflicts);
+    for (const [name, prop] of createSchemaPropertyList(projectSchema, shape.schema).getNodes()) {
+      if (name in allProps && (allProps[name].type !== prop.type || !isEqualRelationship(allProps[name], prop))) {
+        conflicts.add(name);
+      }
+    }
 
     if (isObjectSchema(shape.schema)) {
       Object.assign(allProps, shape.schema.properties);
@@ -125,7 +149,7 @@ const getConflictingProperties = (projectSchema, shapes) => {
   }
 
   return conflicts;
-};
+}
 
 export function getFieldTypeComparison(fieldType) {
   const comparison = fieldTypeComparison[fieldType];
@@ -252,7 +276,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) ? '_' : ''}${pascalCase(name)}`;
+    const fieldName = `${conflictingProperties !== null && conflictingProperties !== void 0 && conflictingProperties.has(name) ? '_' : ''}${pascalCase(name)}`;
     const refItem = getRefOrItemsRef(projectSchema, prop);
     const suffix = refItem ? refItemToShapeName(refItem) : `${shapeName}${fieldName}`;
     return `${prefix}${suffix}`;
@@ -273,12 +297,16 @@ export 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 = 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));
     }
   }
 
@@ -330,7 +358,7 @@ export function getPropertyComparisonType(name, prop, shapeName, context) {
     }
   }
 
-  if (!shapeCache.has(typeName)) {
+  if (!shapeCache.has(typeName) && !projectSchema.shapes[typeName]) {
     shapeCache.set(typeName, () => {
       var _prop$items;
 
@@ -342,13 +370,11 @@ export function getPropertyComparisonType(name, prop, shapeName, context) {
       } else if (prop['@relationship']) {
         const shapes = prop['@relationship'].shapeIds.map(id => getShapeById(projectSchema, id)).filter(isDefined);
         props = getFields(typeName, shapes, { ...context,
-          conflictingProperties: getConflictingProperties(context.projectSchema, shapes),
           relationshipDepth: relationshipDepth + 1
         });
       } else if (isUnionSchema(propOrItems)) {
         const shapes = enumerateOneOfKeys(projectSchema, propOrItems.oneOf).map(option => projectSchema.shapes[option.shapeName]);
         props = getFields(typeName, shapes, { ...context,
-          conflictingProperties: getConflictingProperties(context.projectSchema, shapes),
           relationshipDepth,
           booleanOperators: false
         });
@@ -358,10 +384,14 @@ export 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 {
@@ -386,8 +416,8 @@ export 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}`
@@ -466,14 +496,20 @@ function expandUnionShapes(projectSchema, shapes) {
 
 export function getWhereShape(projectSchema, selectedShapes) {
   const shapeName = selectedShapes.length === 1 ? `TSWhere${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 {