@takeshape/schema 8.165.1 → 8.167.2

package/dist/schema-util.js

@@ -716,9 +716,8 @@ function getShapeDependencies(projectSchema, shape, predicate) {
   const shapeNames = new Set();
 
   const findDependencies = schema => {
-    schema = schema.items ?? schema;
-
     if (!predicate || predicate(schema)) {
+      schema = schema.items ?? schema;
       const refItem = (0, _refs.getRef)(projectSchema, schema);
 
       if (refItem) {

package/dist/template-shapes/templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../src/template-shapes/templates.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAE,cAAc,EAAE,KAAK,EAAc,MAAM,mBAAmB,CAAC;AACxF,OAAO,KAAK,EAAC,gBAAgB,EAAE,eAAe,EAAC,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAWtC,eAAO,MAAM,SAAS,YAoJH,OAAO,SAAS,KAAK,KAAG,gBAAgB,AApJP,CAAC;AACrD,eAAO,MAAM,kBAAkB,YAmJZ,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAnJW,CAAC;AACvE,eAAO,MAAM,UAAU,YAoWJ,eAAe,SAAS,KAAK,KAAG,gBAAgB,AApWA,CAAC;AACpE,eAAO,MAAM,YAAY,YAmWN,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAnWK,CAAC;AACzE,eAAO,MAAM,UAAU,sBAgNI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAhNE,CAAC;AAC9E,eAAO,MAAM,UAAU,sBA+MI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AA/ME,CAAC;AAC9E,eAAO,MAAM,aAAa,sBA8MC,eAAe,SAAS,KAAK,KAAG,gBAAgB,AA9MW,CAAC;AACvF,eAAO,MAAM,UAAU,sBA6MI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AA7ME,CAAC;AAC9E,eAAO,MAAM,aAAa,8BAAwB,CAAC;AACnD,eAAO,MAAM,aAAa,8BAAwB,CAAC;AACnD,eAAO,MAAM,YAAY,YAyRN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAzRY,CAAC;AACxE,eAAO,MAAM,YAAY,YAwRN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAxRY,CAAC;AACxE,eAAO,MAAM,eAAe,YAuRT,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAvRkB,CAAC;AAC9E,eAAO,MAAM,YAAY,YAsRN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAtRY,CAAC;AAExE,eAAO,MAAM,iBAAiB,OAU5B,CAAC;AAEH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAqB5D,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,YAMzB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,YAKxB,CAAC;AAEF,eAAO,MAAM,qBAAqB,OAsBjC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,gBAAgB,CAetF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,gBAAgB,CAmBtF;AAsBD,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,aAChC,OAAO,SAAS,KAAK,KAAG,gBAAgB,CAU1D;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,aAAa,eACxC,MAAM,YAG1B;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAyBD;;GAEG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,uBAM9C,eAAe,SAAS,KAAK,KAAG,gBAAgB,CA4E1E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,aAAa,aACtC,OAAO,SAAS,KAAK,KAAG,gBAAgB,CAiB1D;AAED,eAAO,MAAM,gBAAgB,EAAE,YAwB9B,CAAC;AAuBF,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,aAC5D,eAAe,SAAS,KAAK,KAAG,gBAAgB,CA0BlE"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../src/template-shapes/templates.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAiB,cAAc,EAAE,KAAK,EAAc,MAAM,mBAAmB,CAAC;AACvG,OAAO,KAAK,EAAC,gBAAgB,EAAE,eAAe,EAAC,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAWtC,eAAO,MAAM,SAAS,YAoJH,OAAO,SAAS,KAAK,KAAG,gBAAgB,AApJP,CAAC;AACrD,eAAO,MAAM,kBAAkB,YAmJZ,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAnJW,CAAC;AACvE,eAAO,MAAM,UAAU,YAsWJ,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAtWA,CAAC;AACpE,eAAO,MAAM,YAAY,YAqWN,eAAe,SAAS,KAAK,KAAG,gBAAgB,AArWK,CAAC;AACzE,eAAO,MAAM,UAAU,sBAkNI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAlNE,CAAC;AAC9E,eAAO,MAAM,UAAU,sBAiNI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAjNE,CAAC;AAC9E,eAAO,MAAM,aAAa,sBAgNC,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAhNW,CAAC;AACvF,eAAO,MAAM,UAAU,sBA+MI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AA/ME,CAAC;AAC9E,eAAO,MAAM,aAAa,8BAAwB,CAAC;AACnD,eAAO,MAAM,aAAa,8BAAwB,CAAC;AACnD,eAAO,MAAM,YAAY,YA2RN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AA3RY,CAAC;AACxE,eAAO,MAAM,YAAY,YA0RN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AA1RY,CAAC;AACxE,eAAO,MAAM,eAAe,YAyRT,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAzRkB,CAAC;AAC9E,eAAO,MAAM,YAAY,YAwRN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAxRY,CAAC;AAExE,eAAO,MAAM,iBAAiB,OAU5B,CAAC;AAEH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAqB5D,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,YAMzB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,YAKxB,CAAC;AAEF,eAAO,MAAM,qBAAqB,OAsBjC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,gBAAgB,CAetF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,gBAAgB,CAmBtF;AAsBD,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,aAChC,OAAO,SAAS,KAAK,KAAG,gBAAgB,CAU1D;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,aAAa,eACxC,MAAM,YAG1B;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AA2BD;;GAEG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,uBAM9C,eAAe,SAAS,KAAK,KAAG,gBAAgB,CA4E1E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,aAAa,aACtC,OAAO,SAAS,KAAK,KAAG,gBAAgB,CAiB1D;AAED,eAAO,MAAM,gBAAgB,EAAE,YAwB9B,CAAC;AAuBF,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,aAC5D,eAAe,SAAS,KAAK,KAAG,gBAAgB,CA0BlE"}

package/dist/template-shapes/templates.js

@@ -255,24 +255,21 @@ function getOutputShapeName(name) {
   return name.replace(/(?:Input|PartialInput)$/, '');
 }
 
-function rewriteRefs(shapeSchema, rewriteShapeName) {
+function rewriteRefs(context, shapeSchema, rewriteShapeName) {
   const newSchema = (0, _util.deepClone)(shapeSchema);
   (0, _util.visit)(newSchema, ['$ref', '@ref'], (_, path) => {
     const parentPath = path.slice(0, -1);
     const value = (0, _get.default)(newSchema, parentPath);
 
     if ((value['@ref'] || value.$ref) && !parentPath.includes('@input') && !parentPath.includes('@output')) {
-      if (value['@ref']) {
-        const ref = value['@ref'];
-        const parts = ref.split(':');
-        value['@ref'] = `local:${rewriteShapeName(parts[1])}`;
-      }
+      const refItem = (0, _refs.getRef)(context, value);
+
+      if (refItem) {
+        value['@ref'] = refItem.isForeign ? (0, _refs.refItemToAtRef)(refItem) : `local:${rewriteShapeName((0, _refs.refItemToShapeName)(refItem))}`;
 
-      if (value.$ref) {
-        const ref = value.$ref;
-        const parts = ref.split('/');
-        parts[2] = rewriteShapeName(parts[2]);
-        value.$ref = parts.join('/');
+        if (value.$ref) {
+          delete value.$ref;
+        }
       }
     }
   });
@@ -301,7 +298,7 @@ function getMutationArgs(templateName, verb) {
       rewrittenSchema = (0, _createInputSchema.createInputSchema)(shape.schema, {
         isUpdate
       });
-      inputShapeSchema = rewriteRefs(rewrittenSchema, getInputShapeName);
+      inputShapeSchema = rewriteRefs(projectSchema, rewrittenSchema, getInputShapeName);
     }
 
     const inputShape = (0, _schemaUtil.createShape)(inputName, (0, _util2.mergeObjectSchemas)(shouldRequireId ? idSchema : undefined, inputShapeSchema), {
@@ -341,7 +338,7 @@ function getMutationArgs(templateName, verb) {
         }).map(shapeName => {
           const shape = projectSchema.shapes[shapeName]; // We only allow partial input at the top-level
 
-          return (0, _schemaUtil.createShape)(getInputShapeName(shapeName), rewriteRefs((0, _createInputSchema.createInputSchema)(shape.schema), getInputShapeName));
+          return (0, _schemaUtil.createShape)(getInputShapeName(shapeName), rewriteRefs(projectSchema, (0, _createInputSchema.createInputSchema)(shape.schema), getInputShapeName));
         }), 'name')),
         ...(addStructure ? {
           ContentStructureInput

package/es/schema-util.js

@@ -590,9 +590,8 @@ export function getShapeDependencies(projectSchema, shape, predicate) {
   const shapeNames = new Set();
 
   const findDependencies = schema => {
-    schema = schema.items ?? schema;
-
     if (!predicate || predicate(schema)) {
+      schema = schema.items ?? schema;
       const refItem = getRef(projectSchema, schema);
 
       if (refItem) {

package/es/template-shapes/templates.js

@@ -3,7 +3,7 @@ import { listTypePrefix } from '../migration';
 import { deepClone, pascalCase, visit } from '@takeshape/util';
 import keyBy from 'lodash/keyBy';
 import { createShape, getShapeDependencies, isIndexedRemoteShape } from '../schema-util';
-import { getFlattenedTemplateShapeName, getRefShapeName } from '../refs';
+import { getFlattenedTemplateShapeName, getRef, getRefShapeName, refItemToAtRef, refItemToShapeName } from '../refs';
 import { getWhereSearchArg } from './where';
 import { mergeObjectSchemas, mergeSchemaProperties } from '../util';
 import { createInputSchema } from '../create-input-schema';
@@ -200,24 +200,21 @@ export function getOutputShapeName(name) {
   return name.replace(/(?:Input|PartialInput)$/, '');
 }
 
-function rewriteRefs(shapeSchema, rewriteShapeName) {
+function rewriteRefs(context, shapeSchema, rewriteShapeName) {
   const newSchema = deepClone(shapeSchema);
   visit(newSchema, ['$ref', '@ref'], (_, path) => {
     const parentPath = path.slice(0, -1);
     const value = get(newSchema, parentPath);
 
     if ((value['@ref'] || value.$ref) && !parentPath.includes('@input') && !parentPath.includes('@output')) {
-      if (value['@ref']) {
-        const ref = value['@ref'];
-        const parts = ref.split(':');
-        value['@ref'] = `local:${rewriteShapeName(parts[1])}`;
-      }
+      const refItem = getRef(context, value);
+
+      if (refItem) {
+        value['@ref'] = refItem.isForeign ? refItemToAtRef(refItem) : `local:${rewriteShapeName(refItemToShapeName(refItem))}`;
 
-      if (value.$ref) {
-        const ref = value.$ref;
-        const parts = ref.split('/');
-        parts[2] = rewriteShapeName(parts[2]);
-        value.$ref = parts.join('/');
+        if (value.$ref) {
+          delete value.$ref;
+        }
       }
     }
   });
@@ -246,7 +243,7 @@ export function getMutationArgs(templateName, verb) {
       rewrittenSchema = createInputSchema(shape.schema, {
         isUpdate
       });
-      inputShapeSchema = rewriteRefs(rewrittenSchema, getInputShapeName);
+      inputShapeSchema = rewriteRefs(projectSchema, rewrittenSchema, getInputShapeName);
     }
 
     const inputShape = createShape(inputName, mergeObjectSchemas(shouldRequireId ? idSchema : undefined, inputShapeSchema), {
@@ -286,7 +283,7 @@ export function getMutationArgs(templateName, verb) {
         }).map(shapeName => {
           const shape = projectSchema.shapes[shapeName]; // We only allow partial input at the top-level
 
-          return createShape(getInputShapeName(shapeName), rewriteRefs(createInputSchema(shape.schema), getInputShapeName));
+          return createShape(getInputShapeName(shapeName), rewriteRefs(projectSchema, createInputSchema(shape.schema), getInputShapeName));
         }), 'name')),
         ...(addStructure ? {
           ContentStructureInput

package/package.json

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