@takeshape/schema 8.145.1 → 8.150.0

package/dist/util/form-config.js

@@ -0,0 +1,97 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findShapeFormConfig = findShapeFormConfig;
+exports.normalizeForms = normalizeForms;
+
+var _util = require("@takeshape/util");
+
+var _refs = require("../refs");
+
+var _schemaUtil = require("../schema-util");
+
+function normalizeForms(projectSchema) {
+  const normalizedForms = {};
+  const {
+    forms = {}
+  } = projectSchema;
+
+  const storeSourceForm = (shapeName, formConfig, propName) => {
+    // Leave original forms intact for backwards compatibility
+    if (!forms[shapeName]) {
+      if (!normalizedForms[shapeName]) {
+        normalizedForms[shapeName] = {
+          default: (0, _util.deepClone)(formConfig)
+        };
+      } // Remove prop now that it has been normalized
+      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+
+
+      delete normalizedForms[shapeName].default.properties[propName];
+    }
+  };
+
+  const normalizeNested = (shapeName, formConfig) => {
+    const shape = projectSchema.shapes[shapeName];
+
+    if (!shape || !formConfig.properties) {
+      return;
+    }
+
+    const propertyAccessor = (0, _schemaUtil.createSchemaPropertyAccessor)(projectSchema, shape);
+
+    for (const propName of Object.keys(formConfig.properties)) {
+      const propConfig = formConfig.properties[propName];
+      const propSchema = propertyAccessor.getValue(propName);
+
+      if (propSchema) {
+        const ref = (0, _refs.getRef)(projectSchema, propSchema);
+
+        if (ref && propConfig.properties) {
+          const nestedShapeName = (0, _refs.refItemToShapeName)(ref);
+          normalizedForms[nestedShapeName] = {
+            default: (0, _util.deepClone)(propConfig)
+          };
+          storeSourceForm(shapeName, formConfig, propName);
+          normalizeNested(nestedShapeName, propConfig);
+        }
+      }
+    }
+  };
+
+  if (forms) {
+    for (const shapeName of Object.keys(forms)) {
+      normalizeNested(shapeName, forms[shapeName].default); // copy forms with no changes
+
+      if (!normalizedForms[shapeName]) {
+        normalizedForms[shapeName] = forms[shapeName];
+      }
+    }
+  }
+
+  return normalizedForms;
+}
+
+const cache = new WeakMap();
+/**
+ * Find the form config for a given shape name and the form key.
+ */
+
+function findShapeFormConfig(projectSchema, shapeName, formName) {
+  var _normalizedForms$shap;
+
+  if (!projectSchema.forms) {
+    return;
+  }
+
+  let normalizedForms = cache.get(projectSchema);
+
+  if (!normalizedForms) {
+    normalizedForms = normalizeForms(projectSchema);
+    cache.set(projectSchema, normalizedForms);
+  }
+
+  return (_normalizedForms$shap = normalizedForms[shapeName]) === null || _normalizedForms$shap === void 0 ? void 0 : _normalizedForms$shap[formName];
+}

package/dist/util/index.d.ts

@@ -1,4 +1,5 @@
 export * from './api-indexing';
 export * from './detect-cycles';
 export * from './merge';
+export * from './form-config';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC"}

package/dist/util/index.js

@@ -41,4 +41,17 @@ Object.keys(_merge).forEach(function (key) {
       return _merge[key];
     }
   });
+});
+
+var _formConfig = require("./form-config");
+
+Object.keys(_formConfig).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _formConfig[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _formConfig[key];
+    }
+  });
 });

package/dist/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,WAAW,EAAC,MAAM,KAAK,CAAC;AACvD,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAmB,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EASb,iBAAiB,EAGlB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AAwcnF,oBAAY,sBAAsB,GAC9B;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC1D;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,yBAAyB,EAAE,CAAA;CAAC,CAAC;AAE3E,wBAAgB,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,yBAAyB,CAuBzE;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/C,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,KAAK,sBAAsB,CAAC;CAClF;AACD,MAAM,WAAW,eAAe;IAC9B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC;CACnE;AAqKD;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,sBAAsB,CAqB9F;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAgBnE;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,OAAO,GAAG,SAAS,CAQpE;AAgBD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,CAQlE;AAqBD;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,mBAAmB,CAarF"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,WAAW,EAAC,MAAM,KAAK,CAAC;AACvD,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAmB,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EASb,iBAAiB,EAKlB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AAoenF,oBAAY,sBAAsB,GAC9B;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC1D;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,yBAAyB,EAAE,CAAA;CAAC,CAAC;AAE3E,wBAAgB,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,yBAAyB,CAuBzE;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/C,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,KAAK,sBAAsB,CAAC;CAClF;AACD,MAAM,WAAW,eAAe;IAC9B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC;CACnE;AAqKD;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,sBAAsB,CAqB9F;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAgBnE;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,OAAO,GAAG,SAAS,CAQpE;AAgBD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,CAQlE;AAqBD;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,mBAAmB,CAarF"}

package/dist/validate.js

@@ -12,6 +12,8 @@ exports.validateSchema = validateSchema;
 
 var _types = require("./types/types");
 
+var _jsonpathPlus = require("jsonpath-plus");
+
 var _jsonSchema = require("@takeshape/json-schema");
 
 var _errors = require("@takeshape/errors");
@@ -58,6 +60,8 @@ var _util = require("@takeshape/util");
 
 var _forOwn = _interopRequireDefault(require("lodash/forOwn"));
 
+var _relationships = require("./relationships");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function findDuplicates(items) {
@@ -209,6 +213,15 @@ function validateResolver(projectSchema, basePath, resolver) {
     return [takeshapeResolver, utilResolver, graphqlResolver, restResolver, awsLambdaResolver].flatMap(resolver => resolver.properties.name.enum).includes(resolverName);
   };
 
+  const isValidShapeName = shapeName => {
+    var _indexedShapes;
+
+    const modelShape = shapeName ? projectSchema.shapes[shapeName] : undefined;
+    return Boolean((modelShape === null || modelShape === void 0 ? void 0 : modelShape.model) || shapeName && ((_indexedShapes = projectSchema.indexedShapes) === null || _indexedShapes === void 0 ? void 0 : _indexedShapes[shapeName]));
+  };
+
+  const isLessThanV3_9_0 = (0, _lt.default)((0, _coerce2.default)(projectSchema.schemaVersion) ?? _versions.LEGACY_SCHEMA_VERSION, '3.9.0');
+
   const validateBasicResolver = resolver => {
     if ((0, _utils.isBasicResolver)(resolver)) {
       var _projectSchema$servic;
@@ -221,35 +234,23 @@ function validateResolver(projectSchema, basePath, resolver) {
         });
       }
 
-      if ((0, _lt.default)((0, _coerce2.default)(projectSchema.schemaVersion) ?? _versions.LEGACY_SCHEMA_VERSION, '3.9.0')) {
-        if (!isValidResolverNameV3_9_0(resolver.name)) {
-          errors.push({
-            type: 'notFound',
-            path: basePath.concat(['name']),
-            message: `Invalid resolver name "${resolver.name}"`
-          });
-        }
+      if (isLessThanV3_9_0 && !isValidResolverNameV3_9_0(resolver.name)) {
+        errors.push({
+          type: 'notFound',
+          path: basePath.concat(['name']),
+          message: `Invalid resolver name "${resolver.name}"`
+        });
       }
 
-      if (resolver.name.startsWith('takeshape')) {
+      if (isLessThanV3_9_0 && resolver.name.startsWith('takeshape')) {
         var _options;
 
-        let shapeName;
-
         if ((_options = resolver.options) !== null && _options !== void 0 && _options.model) {
           var _options2;
 
-          shapeName = (_options2 = resolver.options) === null || _options2 === void 0 ? void 0 : _options2.model;
-        } else if (resolver.shapeName) {
-          shapeName = resolver.shapeName;
-        }
+          const shapeName = (_options2 = resolver.options) === null || _options2 === void 0 ? void 0 : _options2.model;
 
-        if (shapeName) {
-          var _indexedShapes;
-
-          const modelShape = projectSchema.shapes[shapeName];
-
-          if (!(modelShape !== null && modelShape !== void 0 && modelShape.model) && !(shapeName && (_indexedShapes = projectSchema.indexedShapes) !== null && _indexedShapes !== void 0 && _indexedShapes[shapeName])) {
+          if (!isValidShapeName(shapeName)) {
             errors.push({
               type: 'notFound',
               path: basePath.concat(['options', 'model']),
@@ -258,6 +259,20 @@ function validateResolver(projectSchema, basePath, resolver) {
           }
         }
       }
+
+      if (resolver.shapeName) {
+        const {
+          shapeName
+        } = resolver;
+
+        if (!isValidShapeName(shapeName)) {
+          errors.push({
+            type: 'notFound',
+            path: basePath.concat(['shapeName']),
+            message: `Invalid Model Shape "${shapeName ?? ''}"`
+          });
+        }
+      }
     } else {
       errors.push({
         type: 'notFound',
@@ -403,29 +418,43 @@ function validateRefs(projectSchema, additionalShapeNames = builtInShapeNames) {
   return errors;
 }
 
+function visitShapePropertiesJson(projectSchema, callback) {
+  (0, _jsonpathPlus.JSONPath)('shapes.*.schema.properties.*', projectSchema, (property, _type, {
+    path: propertyPath
+  }) => {
+    callback(property, propertyPath.slice(3, -2).split(`']['`));
+  }, undefined);
+}
+
 function validateDirectives(projectSchema, additionalShapeIds = builtInModelShapeIds) {
   const errors = [];
   const projectShapeIds = new Set([...getModelShapeIds(projectSchema.shapes), ...additionalShapeIds]);
-  (0, _schemaUtil.visitShapeProperties)(projectSchema.shapes, (schema, path) => {
-    if (schema['@relationship']) {
-      var _schema$Relationship;
-
-      const shapeIds = (_schema$Relationship = schema['@relationship']) === null || _schema$Relationship === void 0 ? void 0 : _schema$Relationship.shapeIds;
-      shapeIds.forEach(shapeId => {
-        if (!projectShapeIds.has(shapeId)) {
-          const propPath = path.concat('@relationship');
-          errors.push({
-            type: 'notFound',
-            path: propPath,
-            message: `Invalid shapeId relationship "${shapeId}" for property "${propPath[4]}" in shape "${propPath[1]}"`
-          });
-        }
-      });
+  const isLessThanV3_18_0 = (0, _lt.default)((0, _coerce2.default)(projectSchema.schemaVersion) ?? _versions.LEGACY_SCHEMA_VERSION, '3.18.0');
+  visitShapePropertiesJson(projectSchema, (property, propertyPath) => {
+    if (isLessThanV3_18_0) {
+      const propSchema = property;
+
+      if (propSchema['@relationship']) {
+        var _propSchema$Relation;
+
+        const shapeIds = (_propSchema$Relation = propSchema['@relationship']) === null || _propSchema$Relation === void 0 ? void 0 : _propSchema$Relation.shapeIds;
+        shapeIds.forEach(shapeId => {
+          if (!projectShapeIds.has(shapeId)) {
+            const propPath = propertyPath.concat('@relationship');
+            errors.push({
+              type: 'notFound',
+              path: propPath,
+              message: `Invalid shapeId relationship "${shapeId}" for property "${propPath[4]}" in shape "${propPath[1]}"`
+            });
+          }
+        });
+      }
     }
 
-    if (schema['@resolver']) {
-      const resolver = schema['@resolver'];
-      const propPath = path.concat('@resolver');
+    const resolver = property['@resolver'];
+
+    if (resolver) {
+      const propPath = propertyPath.concat('@resolver');
       const resolverErrors = validateResolver(projectSchema, propPath, resolver);
 
       if (resolverErrors) {
@@ -438,11 +467,12 @@ function validateDirectives(projectSchema, additionalShapeIds = builtInModelShap
 
 function validateOneOfs(projectSchema) {
   const errors = [];
-  (0, _schemaUtil.visitShapeProperties)(projectSchema.shapes, (schema, path) => {
-    const oneOfPath = schema.items ? ['items', 'oneOf'] : ['oneOf'];
-    schema = schema.items ? schema.items : schema;
+  visitShapePropertiesJson(projectSchema, (property, propertyPath) => {
+    const oneOfPath = property.items ? ['items', 'oneOf'] : ['oneOf'];
+    const relationship = (0, _relationships.getRelationship)(property);
+    const schema = property.items ? property.items : property;
 
-    if (schema.oneOf) {
+    if (schema.oneOf && !relationship) {
       if ((0, _unions.isUnionSchema)(schema)) {
         const modelsReferenced = (0, _unions.enumerateOneOfKeys)(projectSchema, schema.oneOf).map(child => child.shapeName).filter(shapeName => projectSchema.shapes[shapeName].model);
 
@@ -450,14 +480,14 @@ function validateOneOfs(projectSchema) {
           const shapeNames = modelsReferenced.join(', ');
           errors.push({
             type: 'json',
-            path: path.concat(oneOfPath),
+            path: propertyPath.concat(oneOfPath),
             message: `Invalid refs to ${shapeNames}. oneOf unions cannot reference model shapes. Use @relationship instead`
           });
         }
       } else if (!(0, _enum.isEnumLikeSchema)(schema)) {
         errors.push({
           type: 'json',
-          path: path.concat(oneOfPath),
+          path: propertyPath.concat(oneOfPath),
           message: `Invalid oneOf must contain only @ref or title + enum/const schemas`
         });
       }

package/es/builtin-schema.js

@@ -33,6 +33,23 @@ export const builtInShapes = {
       required: ['id']
     }
   },
+  TSRelationshipArgs: {
+    id: 'TSRelationshipArgs',
+    name: 'TSRelationshipArgs',
+    title: 'TSRelationshipArgs',
+    schema: {
+      type: 'object',
+      properties: {
+        enableLocaleFallback: {
+          type: 'boolean',
+          default: true
+        },
+        locale: {
+          type: 'string'
+        }
+      }
+    }
+  },
   TSColorHsl: {
     id: 'TSColorHsl',
     name: 'TSColorHsl',

package/es/get-is-leaf.js

@@ -1,6 +1,7 @@
 import { getType } from './content-schema-transform';
 import { getKey, isBuiltinType } from './schema-util';
 import { followRef, getRefShapeName } from './refs';
+import { isPropertySchemaWithRelationship } from './types';
 const scalarTags = new Set(['draftjs']);
 
 function isLeafTypeV3(projectSchema, propertySchema) {
@@ -8,7 +9,7 @@ function isLeafTypeV3(projectSchema, propertySchema) {
   return Boolean( // Must have key
   getKey(propertySchema) && ( // If is not a structure, then is a leaf
   !['object', 'array'].includes(type) || // If is relationship, then is a leaf
-  propertySchema['@relationship'] || propertySchema['@tag'] && scalarTags.has(propertySchema['@tag']) || // If is array, then should not be a synchronized structure
+  isPropertySchemaWithRelationship(propertySchema) || propertySchema['@tag'] && scalarTags.has(propertySchema['@tag']) || // If is array, then should not be a synchronized structure
   type === 'array' && !propertySchema['@syncLocaleStructure'] || isBuiltinType(projectSchema, propertySchema)));
 }
 

package/es/migration/index.js

@@ -21,6 +21,7 @@ import migrateToV3_15_0 from './to/v3.15.0';
 import migrateToV3_16_0 from './to/v3.16.0';
 import migrateToV3_17_0 from './to/v3.17.0';
 import migrateToV3_17_1 from './to/v3.17.1';
+import migrateToV3_18_0 from './to/v3.18.0';
 export const migrateTo = {
   'v3.0.0': migrateToV3_0_0,
   'v3.1.0': migrateToV3_1_0,
@@ -44,7 +45,8 @@ export const migrateTo = {
   'v3.15.0': migrateToV3_15_0,
   'v3.16.0': migrateToV3_16_0,
   'v3.17.0': migrateToV3_17_0,
-  'v3.17.1': migrateToV3_17_1
+  'v3.17.1': migrateToV3_17_1,
+  'v3.18.0': migrateToV3_18_0
 };
 export * from './utils';
 export const listTypePrefix = 'PaginatedList';

package/es/migration/to/v3.18.0.js

@@ -0,0 +1,72 @@
+import { isDefined, visit } from '@takeshape/util';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import omit from 'lodash/omit';
+
+const migrate = async (_, projectSchema) => {
+  visit(projectSchema, ['@relationship'], (relationship, path) => {
+    const propertyPath = path.slice(0, -1);
+    const originalPropertySchema = get(projectSchema, propertyPath);
+    const propertySchema = omit(originalPropertySchema, ['@relationship', 'type', '$ref']);
+    const shapeIdMap = new Map(Object.values(projectSchema.shapes).map(shape => [shape.id, shape]));
+
+    const shapeIdsToShapeRefs = shapeIds => {
+      return shapeIds.map(shapeId => {
+        let shape;
+
+        if (shapeId === 'ASSET') {
+          shape = {
+            name: 'Asset'
+          };
+        } else {
+          shape = shapeIdMap.get(shapeId);
+        }
+
+        if (!shape) {
+          return;
+        }
+
+        return {
+          '@ref': `local:${shape.name}`
+        };
+      }).filter(isDefined);
+    };
+
+    const shapeRefs = shapeIdsToShapeRefs(relationship.shapeIds);
+    const shapeRefsSchema = shapeRefs.length === 1 ? shapeRefs[0] : {
+      oneOf: shapeRefs
+    };
+
+    if (relationship.type === 'multiple') {
+      propertySchema.type = 'array';
+      propertySchema.items = shapeRefsSchema;
+      propertySchema['@input'] = {
+        type: 'array',
+        items: {
+          '@ref': 'local:TSRelationship'
+        }
+      };
+    } else {
+      delete propertySchema.type;
+      Object.assign(propertySchema, shapeRefsSchema);
+      propertySchema['@input'] = {
+        '@ref': 'local:TSRelationship'
+      };
+    }
+
+    propertySchema['@args'] = 'TSRelationshipArgs';
+    propertySchema['@resolver'] = {
+      name: 'takeshape:getRelated',
+      service: 'takeshape:local',
+      options: {
+        nullable: true
+      }
+    };
+    set(projectSchema, propertyPath, propertySchema);
+  });
+  return { ...projectSchema,
+    schemaVersion: '3.18.0'
+  };
+};
+
+export default migrate;

package/es/mocks.js

@@ -6,7 +6,8 @@ import { pascalCase } from '@takeshape/util';
 
 export function createMockSchema(projectId, schema = {}) {
   return { ...emptySchema(projectId, schema.dataKey ?? 'supersecret'),
-    ...schema
+    ...schema,
+    projectId
   };
 }
 /**
@@ -15,7 +16,8 @@ export function createMockSchema(projectId, schema = {}) {
 
 export function createMockSchemaWithDefaults(projectId, schema = {}) {
   return applyDefaultsToSchema({ ...emptySchema(projectId, schema.dataKey ?? 'supersecret'),
-    ...schema
+    ...schema,
+    projectId
   });
 }
 export function createMockServiceConfig(serviceKey, serviceConfig) {

package/es/project-schema/index.js

@@ -24,6 +24,7 @@ export * from './v3.15.0';
 export * from './v3.16.0';
 export * from './v3.17.0';
 export * from './v3.17.1';
+export * from './v3.18.0';
 export * from './v4.0.0';
 
 // Schema type utilities
@@ -69,5 +70,6 @@ export const isProjectSchemaV3_15_0 = createVersionPredicate('3.15.0');
 export const isProjectSchemaV3_16_0 = createVersionPredicate('3.16.0');
 export const isProjectSchemaV3_17_0 = createVersionPredicate('3.17.0');
 export const isProjectSchemaV3_17_1 = createVersionPredicate('3.17.1');
-export const isLatestProjectSchema = createVersionPredicate('3.17.1');
+export const isProjectSchemaV3_18_0 = createVersionPredicate('3.18.0');
+export const isLatestProjectSchema = createVersionPredicate('3.18.0');
 export const isProjectSchemaV4_0_0 = createVersionPredicate('4.0.0');

package/es/project-schema/migrate.js

@@ -1,6 +1,6 @@
 // This file is generated by "pnpm json2ts"
 import { migrateTo } from '../migration';
-import { isProjectSchemaV1_0_0, isProjectSchemaV3_0_0, isProjectSchemaV3_1_0, isProjectSchemaV3_2_0, isProjectSchemaV3_3_0, isProjectSchemaV3_4_0, isProjectSchemaV3_5_0, isProjectSchemaV3_5_1, isProjectSchemaV3_6_0, isProjectSchemaV3_7_0, isProjectSchemaV3_8_0, isProjectSchemaV3_9_0, isProjectSchemaV3_10_0, isProjectSchemaV3_11_0, isProjectSchemaV3_12_0, isProjectSchemaV3_12_1, isProjectSchemaV3_12_2, isProjectSchemaV3_12_3, isProjectSchemaV3_13_0, isProjectSchemaV3_14_0, isProjectSchemaV3_15_0, isProjectSchemaV3_16_0, isProjectSchemaV3_17_0, isProjectSchemaV4_0_0, isLatestProjectSchema } from './index'; // eslint-disable-next-line complexity
+import { isProjectSchemaV1_0_0, isProjectSchemaV3_0_0, isProjectSchemaV3_1_0, isProjectSchemaV3_2_0, isProjectSchemaV3_3_0, isProjectSchemaV3_4_0, isProjectSchemaV3_5_0, isProjectSchemaV3_5_1, isProjectSchemaV3_6_0, isProjectSchemaV3_7_0, isProjectSchemaV3_8_0, isProjectSchemaV3_9_0, isProjectSchemaV3_10_0, isProjectSchemaV3_11_0, isProjectSchemaV3_12_0, isProjectSchemaV3_12_1, isProjectSchemaV3_12_2, isProjectSchemaV3_12_3, isProjectSchemaV3_13_0, isProjectSchemaV3_14_0, isProjectSchemaV3_15_0, isProjectSchemaV3_16_0, isProjectSchemaV3_17_0, isProjectSchemaV3_17_1, isProjectSchemaV4_0_0, isLatestProjectSchema } from './index'; // eslint-disable-next-line complexity
 
 export async function migrateToLatestProjectSchema(context, projectSchema) {
   if (isLatestProjectSchema(projectSchema)) {
@@ -99,6 +99,10 @@ export async function migrateToLatestProjectSchema(context, projectSchema) {
     projectSchema = await migrateTo['v3.17.1'](context, projectSchema);
   }
 
+  if (isProjectSchemaV3_17_1(projectSchema)) {
+    projectSchema = await migrateTo['v3.18.0'](context, projectSchema);
+  }
+
   if (isProjectSchemaV4_0_0(projectSchema)) {
     throw new Error('You are using an unreleased schema version. Migration is not possible');
   }

package/es/project-schema/v3.18.0.js

@@ -0,0 +1 @@
+export {};

package/es/refs.js

@@ -5,7 +5,14 @@ import omit from 'lodash/fp/omit';
 import { getServiceNamespace, getServiceNamespaces } from './services';
 import { mergeObjectSchemas } from './util/merge';
 import { resolveSchema } from 'ajv/dist/compile';
-import { isIntegerLike } from '@takeshape/util';
+import { isIntegerLike, isDefined } from '@takeshape/util';
+
+/**
+ * Guard for RefItemWithPath. Tests for presence of all required props.
+ */
+export function isRefItemWithPath(ref) {
+  return Boolean(ref.typeName && ref.serviceKey && ref.path && isDefined(ref.isForeign));
+}
 const templateShapeRegex = /^(\w+)<([\w:-]+)>$/;
 /**
  * Parse a template like `PaginatedList<Post>` and return both the template and the shape name.
@@ -127,6 +134,13 @@ export function refExpressionToRefItem(context, refExpression) {
 
   return refToRefItem(context, `#/shapes/${shapeName}/schema`, template);
 }
+/**
+ * Converts a list of ref expressions into a list of ref items.
+ */
+
+export function refExpressionListToRefItemList(context, refExpressionList) {
+  return refExpressionList.map(ref => refExpressionToRefItem(context, ref));
+}
 /**
  * Sugar for converting a `refExpression` directly into a shape, without the
  * intermediate `refItem`.
@@ -289,6 +303,13 @@ export function refItemToShape(context, refItem) {
   const shapePath = refItemToShapePath(refItem);
   return get(context, shapePath);
 }
+/**
+ * Get all shapes referenced by a RefItem array.
+ */
+
+export function refItemListToShapeList(context, refItems) {
+  return refItems.map(ref => refItemToShape(context, ref)).filter(isDefined);
+}
 /**
  * Get a shape referenced by a `RefItem`, also returning the path to the new shape.
  */