@takeshape/schema 8.145.0 → 8.149.0

package/dist/schema-util.js

@@ -13,10 +13,8 @@ exports.createShape = createShape;
 exports.emptySchema = emptySchema;
 exports.ensureQuery = exports.ensureMutation = void 0;
 exports.filterGraphQLServiceMap = filterGraphQLServiceMap;
-exports.findExistingRelationships = findExistingRelationships;
 exports.findMapping = findMapping;
 exports.findQuery = exports.findMutation = void 0;
-exports.findShapeFormConfig = findShapeFormConfig;
 exports.getAllNamespaceShapes = getAllNamespaceShapes;
 exports.getAllRefs = getAllRefs;
 exports.getAllRefsInQueries = getAllRefsInQueries;
@@ -71,8 +69,6 @@ var _omitBy = _interopRequireDefault(require("lodash/omitBy"));
 
 var _pickBy = _interopRequireDefault(require("lodash/pickBy"));
 
-var _get = _interopRequireDefault(require("lodash/get"));
-
 var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 
 var _isObject = _interopRequireDefault(require("lodash/isObject"));
@@ -101,6 +97,8 @@ var _refs = require("./refs");
 
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 
+var _isString = _interopRequireDefault(require("lodash/isString"));
+
 var _unions = require("./unions");
 
 var _merge = require("./util/merge");
@@ -142,7 +140,7 @@ exports.arraySchemaKeys = arraySchemaKeys;
 const multipleRelationshipSchemaKeys = [...schemaMetadataKeys, 'maxItems', 'minItems']; // All properties except properties, items, additionalItems
 
 exports.multipleRelationshipSchemaKeys = multipleRelationshipSchemaKeys;
-const nonStructuralSchemaKeys = [...scalarSchemaKeys, '@relationship', '@backreference', 'required', 'maxItems', 'minItems', 'uniqueItems'];
+const nonStructuralSchemaKeys = [...scalarSchemaKeys, '@resolver', '@input', '@output', '@backreference', '@args', 'required', 'maxItems', 'minItems', 'uniqueItems'];
 exports.nonStructuralSchemaKeys = nonStructuralSchemaKeys;
 
 function getServiceIdFieldName(serviceFieldName) {
@@ -530,94 +528,6 @@ function applyDefaultsToSchema(projectSchema) {
   };
 }
 
-function addRelationship(relationships, id, env) {
-  if (!relationships[id]) {
-    relationships[id] = [];
-  }
-
-  relationships[id].push(env);
-}
-/**
- * Finds all relationships in the schema and returns an object indexed by shape.id that lists all of the shapes
- * properties that reference it
- */
-
-
-function findExistingRelationships(projectSchema, shapes) {
-  const relationships = {};
-  const shapeArray = Object.values(shapes);
-  const shapesSeen = new Set();
-  const shapeIds = new Set(shapeArray.map(shape => shape.id));
-
-  const findRelationships = (schema, path, parentShapeName) => {
-    if (schema['@relationship']) {
-      var _schema$Backreferenc;
-
-      const {
-        shapeIds: relatedShapeIds
-      } = schema['@relationship'];
-      const relatedName = (_schema$Backreferenc = schema['@backreference']) === null || _schema$Backreferenc === void 0 ? void 0 : _schema$Backreferenc.name;
-
-      for (const shapeId of relatedShapeIds) {
-        if (shapeIds.has(shapeId)) {
-          var _schema$Backreferenc2;
-
-          addRelationship(relationships, shapeId, {
-            relatedName,
-            path: path.slice(1),
-            shapeId: path[0],
-            hasBackreference: Boolean((_schema$Backreferenc2 = schema['@backreference']) === null || _schema$Backreferenc2 === void 0 ? void 0 : _schema$Backreferenc2.enabled),
-            schema,
-            shapeName: parentShapeName
-          });
-        }
-      }
-    }
-
-    const shapeName = (0, _refs.getRefShapeName)(projectSchema, schema);
-
-    if (shapeName && !shapes[shapeName]) {
-      return;
-    }
-
-    const prop = shapeName ? (0, _refs.followRef)(projectSchema, schema) : schema;
-
-    if (shapeName) {
-      // Skip shapes we have already seen to avoid cycles
-      if (shapesSeen.has(shapeName)) {
-        return;
-      }
-
-      shapesSeen.add(shapeName);
-    }
-
-    if (prop.properties) {
-      for (const name of Object.keys(prop.properties)) {
-        findRelationships(prop.properties[name], path.concat(name), shapeName ?? parentShapeName);
-      }
-    } else if (prop.items) {
-      findRelationships(prop.items, path, shapeName ?? parentShapeName);
-    } else if ((0, _unions.isUnionSchema)(prop)) {
-      for (const child of prop.oneOf) {
-        findRelationships(child, path, shapeName ?? parentShapeName);
-      }
-    }
-  };
-
-  for (const shape of shapeArray) {
-    if (isModelShape(shape)) {
-      const {
-        schema,
-        id,
-        name
-      } = shape;
-      findRelationships(schema, [id], name);
-    }
-  }
-
-  return relationships;
-}
-
 function stringifyQuerySource(providerId, serviceId) {
   return `${providerId}:${serviceId}`;
 }
@@ -870,7 +780,9 @@ function visitSchemaPropertiesHelper(entries, path, callback) {
 }
 
 function visitSchemaProperties(schema, path, callback) {
-  if ((0, _utils.isObjectSchema)(schema)) {
+  if ((0, _utils.isArraySchema)(schema)) {
+    visitSchemaPropertiesHelper(Object.entries(schema.items), [...path, 'items'], callback);
+  } else if ((0, _utils.isObjectSchema)(schema)) {
     visitSchemaPropertiesHelper(Object.entries(schema.properties), [...path, 'properties'], callback);
   } else if ((0, _utils.isExtendsSchema)(schema)) {
     visitSchemaPropertiesHelper(Object.entries(schema.extends), [...path, 'extends'], callback);
@@ -901,29 +813,41 @@ function addRef(refs, ref, predicate) {
 
 function getAllRefsInShapes(projectSchema, predicate) {
   const items = [];
-
-  const shapeVisitor = (schema, schemaPath) => {
-    if (schema['@args'] && typeof schema['@args'] === 'object') {
-      visitSchemaProperties(schema['@args'], schemaPath.concat(['@args']), (argSchema, argPath) => {
-        addRef(items, (0, _refs.getRefOrItemsRef)(projectSchema, argSchema, argPath), predicate);
-      });
+  const refPropNames = ['$ref', '@ref', '@args', 'args'];
+  (0, _util.visit)(projectSchema.shapes, refPropNames, (ref, refPath) => {
+    // The client sometimes generates invalid schemas, like refs that are
+    // undefined. Treat ref as unknown and toss those out.
+    // See the `useShapeEditor > can deal with renames test`
+    if (!(0, _isString.default)(ref)) {
+      return;
     }
 
-    addRef(items, getArgsReferenceWithPath(projectSchema, schema, schemaPath), predicate);
-    const newPath = schema.items ? schemaPath.concat('items') : schemaPath;
-    const newSchema = schema.items ?? schema;
+    const propName = refPath[refPath.length - 1];
+    const path = ['shapes', ...refPath];
+    let refItem = {};
 
-    if ((0, _utils.isRefSchema)(newSchema)) {
-      addRef(items, (0, _refs.getRefOrItemsRef)(projectSchema, newSchema, newPath), predicate);
-    } else if ((0, _utils.isObjectSchema)(newSchema) || (0, _utils.isAllOfSchema)(newSchema) || (0, _utils.isOneOfSchema)(newSchema)) {
-      visitSchemaProperties(newSchema, newPath, shapeVisitor);
+    if (propName === '@ref') {
+      const {
+        shapeName,
+        template
+      } = (0, _refs.parseTemplateShape)(ref);
+      refItem = { ...(0, _refs.atRefToRefItem)(projectSchema, shapeName, template),
+        path
+      };
+    } else if (propName === '$ref') {
+      refItem = { ...(0, _refs.refToRefItem)(projectSchema, ref),
+        path
+      };
+    } else if (propName === '@args' || propName === 'args') {
+      refItem = { ...(0, _refs.refExpressionToRefItem)(projectSchema, ref),
+        path
+      };
     }
-  };
-
-  for (const [shapeName, shape] of Object.entries(projectSchema.shapes)) {
-    visitSchemaProperties(shape.schema, ['shapes', shapeName, 'schema'], shapeVisitor);
-  }
 
+    if ((0, _refs.isRefItemWithPath)(refItem)) {
+      addRef(items, refItem, predicate);
+    }
+  });
   return items;
 }
 /**
@@ -1346,17 +1270,9 @@ const ensureQuery = (projectSchema, shapeName, resolver) => ensureQueryHelper(pr
 exports.ensureQuery = ensureQuery;
 
 const ensureMutation = (projectSchema, shapeName, resolver) => ensureQueryHelper(projectSchema, shapeName, resolver, 'mutation');
-/**
- * Find the form config for a given shape name and the form key.
- */
-
 
 exports.ensureMutation = ensureMutation;
 
-function findShapeFormConfig(projectSchema, shapeName, formName) {
-  return (0, _get.default)(projectSchema, ['forms', shapeName, formName]);
-}
-
 /**
  * Find the query in the schema that corresponds to the given shape and resolver.
  */

package/dist/schemas/index.d.ts

@@ -1,5 +1,5 @@
-export declare const CURRENT_SCHEMA_VERSION = "3.17.1";
+export declare const CURRENT_SCHEMA_VERSION = "3.18.0";
 export { default as anyProjectSchema } from './project-schema.json';
-export { default as latestSchemaJson } from './project-schema/v3.17.1.json';
+export { default as latestSchemaJson } from './project-schema/v3.18.0.json';
 export declare const allProjectSchemas: any[];
 //# sourceMappingURL=index.d.ts.map

package/dist/schemas/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schemas/index.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAC/C,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAsC1E,eAAO,MAAM,iBAAiB,OAsC7B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schemas/index.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAC/C,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAuC1E,eAAO,MAAM,iBAAiB,OAuC7B,CAAC"}

package/dist/schemas/index.js

@@ -19,7 +19,7 @@ Object.defineProperty(exports, "latestSchemaJson", {
 
 var _projectSchema = _interopRequireDefault(require("./project-schema.json"));
 
-var _v = _interopRequireDefault(require("./project-schema/v3.17.1.json"));
+var _v = _interopRequireDefault(require("./project-schema/v3.18.0.json"));
 
 var _metaSchemaV = _interopRequireDefault(require("./project-schema/meta-schema-v1.0.0.json"));
 
@@ -91,12 +91,14 @@ var _v23 = _interopRequireDefault(require("./project-schema/v3.16.0.json"));
 
 var _v24 = _interopRequireDefault(require("./project-schema/v3.17.0.json"));
 
-var _v25 = _interopRequireDefault(require("./project-schema/v4.0.0.json"));
+var _v25 = _interopRequireDefault(require("./project-schema/v3.17.1.json"));
+
+var _v26 = _interopRequireDefault(require("./project-schema/v4.0.0.json"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // This file is generated by "pnpm json2ts"
-const CURRENT_SCHEMA_VERSION = '3.17.1';
+const CURRENT_SCHEMA_VERSION = '3.18.0';
 exports.CURRENT_SCHEMA_VERSION = CURRENT_SCHEMA_VERSION;
-const allProjectSchemas = [_metaSchemaV.default, _v2.default, _metaSchemaV2.default, _v3.default, _metaSchemaV3.default, _v4.default, _metaSchemaV4.default, _v5.default, _metaSchemaV5.default, _v6.default, _metaSchemaV6.default, _v7.default, _metaSchemaV7.default, _v8.default, _metaSchemaV8.default, _v9.default, _metaSchemaV9.default, _v10.default, _metaSchemaV10.default, _v11.default, _metaSchemaV11.default, _v12.default, _metaSchemaV12.default, _v13.default, _v14.default, _v15.default, _v16.default, _v17.default, _v18.default, _v19.default, _v20.default, _v21.default, _v22.default, _v23.default, _v24.default, _v.default, _v25.default];
+const allProjectSchemas = [_metaSchemaV.default, _v2.default, _metaSchemaV2.default, _v3.default, _metaSchemaV3.default, _v4.default, _metaSchemaV4.default, _v5.default, _metaSchemaV5.default, _v6.default, _metaSchemaV6.default, _v7.default, _metaSchemaV7.default, _v8.default, _metaSchemaV8.default, _v9.default, _metaSchemaV9.default, _v10.default, _metaSchemaV10.default, _v11.default, _metaSchemaV11.default, _v12.default, _metaSchemaV12.default, _v13.default, _v14.default, _v15.default, _v16.default, _v17.default, _v18.default, _v19.default, _v20.default, _v21.default, _v22.default, _v23.default, _v24.default, _v25.default, _v.default, _v26.default];
 exports.allProjectSchemas = allProjectSchemas;

package/dist/schemas/index.ts

@@ -1,7 +1,7 @@
 // This file is generated by "pnpm json2ts"
-export const CURRENT_SCHEMA_VERSION = '3.17.1';
+export const CURRENT_SCHEMA_VERSION = '3.18.0';
 export {default as anyProjectSchema} from './project-schema.json';
-export {default as latestSchemaJson} from './project-schema/v3.17.1.json';
+export {default as latestSchemaJson} from './project-schema/v3.18.0.json';
 import metaSchemaV1_0_0 from './project-schema/meta-schema-v1.0.0.json';
 import projectSchemaV1_0_0 from './project-schema/v1.0.0.json';
 import metaSchemaV3_0_0 from './project-schema/meta-schema-v3.0.0.json';
@@ -38,6 +38,7 @@ import projectSchemaV3_15_0 from './project-schema/v3.15.0.json';
 import projectSchemaV3_16_0 from './project-schema/v3.16.0.json';
 import projectSchemaV3_17_0 from './project-schema/v3.17.0.json';
 import projectSchemaV3_17_1 from './project-schema/v3.17.1.json';
+import projectSchemaV3_18_0 from './project-schema/v3.18.0.json';
 import projectSchemaV4_0_0 from './project-schema/v4.0.0.json';
 export const allProjectSchemas = [
   metaSchemaV1_0_0,
@@ -76,5 +77,6 @@ export const allProjectSchemas = [
   projectSchemaV3_16_0,
   projectSchemaV3_17_0,
   projectSchemaV3_17_1,
+  projectSchemaV3_18_0,
   projectSchemaV4_0_0
 ];