@takeshape/schema 8.225.0 → 8.227.0

package/dist/relationships.d.ts

@@ -4,7 +4,7 @@ import type { Relationship, PropertySchemaWithRelationship, LegacyRelationship,
 /**
  * Turn a LegacyRelationship into a partial PropertySchemaWithRelationship.
  */
-export declare function getRelationshipSchema(projectSchema: ProjectSchema, legacyRelationship: LegacyRelationship): PropertySchemaWithRelationship;
+export declare function getRelationshipSchema(projectSchema: ProjectSchema, relationship: LegacyRelationship | Relationship): PropertySchemaWithRelationship;
 /**
  * Get a list of refs given a property schema with a relationship resolver.
  */

package/dist/relationships.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relationships.d.ts","sourceRoot":"","sources":["../../src/relationships.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAC,MAAM,kBAAkB,CAAC;AACrF,OAAO,KAAK,EACV,YAAY,EACZ,8BAA8B,EAC9B,kBAAkB,EAClB,SAAS,EACT,eAAe,EAChB,MAAM,SAAS,CAAC;AASjB;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,aAAa,EAC5B,kBAAkB,EAAE,kBAAkB,GACrC,8BAA8B,CAkDhC;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,cAAc,EAAE,8BAA8B,GAAG,SAAS,CAWlG;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,GAAG,KAAK,EAAE,CAQhF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,EAAE,CAQnF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,GAAG,kBAAkB,CAKlH;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,KAAK,CAAC,YAAY,CAAC,CAiBnF;AAUD,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,QAAQ,GACf,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAgEnC;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,GAAG,OAAO,CAqBjF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,cAAc,EAAE,GAAG,OAAO,CAOhF"}
+{"version":3,"file":"relationships.d.ts","sourceRoot":"","sources":["../../src/relationships.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAC,MAAM,kBAAkB,CAAC;AACrF,OAAO,KAAK,EACV,YAAY,EACZ,8BAA8B,EAC9B,kBAAkB,EAClB,SAAS,EACT,eAAe,EAChB,MAAM,SAAS,CAAC;AASjB;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,kBAAkB,GAAG,YAAY,GAC9C,8BAA8B,CA0DhC;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,cAAc,EAAE,8BAA8B,GAAG,SAAS,CAWlG;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,GAAG,KAAK,EAAE,CAQhF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,EAAE,CAQnF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,GAAG,kBAAkB,CAKlH;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,KAAK,CAAC,YAAY,CAAC,CAiBnF;AAUD,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,QAAQ,GACf,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAgEnC;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,GAAG,OAAO,CAqBjF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,cAAc,EAAE,GAAG,OAAO,CAOhF"}

package/dist/relationships.js

@@ -32,7 +32,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Turn a LegacyRelationship into a partial PropertySchemaWithRelationship.
  */
-function getRelationshipSchema(projectSchema, legacyRelationship) {
+function getRelationshipSchema(projectSchema, relationship) {
   const propertySchema = {
     '@args': 'TSRelationshipArgs',
     '@resolver': {
@@ -43,22 +43,33 @@ function getRelationshipSchema(projectSchema, legacyRelationship) {
       }
     }
   };
-  const shapeRefs = legacyRelationship.shapeIds.map(shapeId => {
-    const shape = (0, _schemaUtil.getShapeById)(projectSchema, shapeId) ?? (0, _find.default)(_builtinSchema.builtInShapes, shape => shape.id === shapeId);
-    return shape && {
-      '@ref': `local:${shape.name}`
-    };
-  }).filter(_util.isDefined);
+  let isMultiple;
+  let shapeRefs;
+
+  if ('shapeIds' in relationship) {
+    shapeRefs = relationship.shapeIds.map(shapeId => {
+      const shape = (0, _schemaUtil.getShapeById)(projectSchema, shapeId) ?? (0, _find.default)(_builtinSchema.builtInShapes, shape => shape.id === shapeId);
+      return shape && {
+        '@ref': `local:${shape.name}`
+      };
+    }).filter(_util.isDefined);
+    isMultiple = relationship.type === 'multiple';
+  } else {
+    shapeRefs = relationship.refs.map(refStr => ({
+      '@ref': refStr
+    }));
+    isMultiple = relationship.isMultiple;
+  }
 
   if (!shapeRefs.length) {
-    throw new Error(`Invalid empty relationship ${JSON.stringify(legacyRelationship)}`);
+    throw new Error(`Invalid empty relationship ${JSON.stringify(relationship)}`);
   }
 
   const shapeRefsSchema = shapeRefs.length === 1 ? shapeRefs[0] : {
     oneOf: shapeRefs
   };
 
-  if (legacyRelationship.type === 'multiple') {
+  if (isMultiple) {
     return { ...propertySchema,
       type: 'array',
       items: shapeRefsSchema,

package/dist/util/merge.d.ts

@@ -2,4 +2,5 @@ import { FormConfig, ObjectSchema } from '../project-schema';
 export declare function mergeObjectSchemas(...args: Array<ObjectSchema | undefined>): ObjectSchema;
 export declare function mergeSchemaProperties(base: ObjectSchema, overrides: ObjectSchema): ObjectSchema;
 export declare function mergeFormProperties(base: FormConfig, overrides: FormConfig): FormConfig;
+export declare function mergeFormConfigs(...configs: FormConfig[]): FormConfig;
 //# sourceMappingURL=merge.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/util/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAI3D,wBAAgB,kBAAkB,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,YAAY,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,YAAY,CAgB/F;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,UAAU,CAevF"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/util/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAI3D,wBAAgB,kBAAkB,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,YAAY,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,YAAY,CAgB/F;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,UAAU,CAevF;AAED,wBAAgB,gBAAgB,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAErE"}

package/dist/util/merge.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.mergeFormConfigs = mergeFormConfigs;
 exports.mergeFormProperties = mergeFormProperties;
 exports.mergeObjectSchemas = mergeObjectSchemas;
 exports.mergeSchemaProperties = mergeSchemaProperties;
@@ -48,4 +49,11 @@ function mergeFormProperties(base, overrides) {
   }
 
   return result;
+}
+
+function mergeFormConfigs(...configs) {
+  return configs.reduce(mergeFormProperties, {
+    properties: {},
+    order: []
+  });
 }

package/es/relationships.js

@@ -9,7 +9,7 @@ import find from 'lodash/find';
  * Turn a LegacyRelationship into a partial PropertySchemaWithRelationship.
  */
 
-export function getRelationshipSchema(projectSchema, legacyRelationship) {
+export function getRelationshipSchema(projectSchema, relationship) {
   const propertySchema = {
     '@args': 'TSRelationshipArgs',
     '@resolver': {
@@ -20,22 +20,33 @@ export function getRelationshipSchema(projectSchema, legacyRelationship) {
       }
     }
   };
-  const shapeRefs = legacyRelationship.shapeIds.map(shapeId => {
-    const shape = getShapeById(projectSchema, shapeId) ?? find(builtInShapes, shape => shape.id === shapeId);
-    return shape && {
-      '@ref': `local:${shape.name}`
-    };
-  }).filter(isDefined);
+  let isMultiple;
+  let shapeRefs;
+
+  if ('shapeIds' in relationship) {
+    shapeRefs = relationship.shapeIds.map(shapeId => {
+      const shape = getShapeById(projectSchema, shapeId) ?? find(builtInShapes, shape => shape.id === shapeId);
+      return shape && {
+        '@ref': `local:${shape.name}`
+      };
+    }).filter(isDefined);
+    isMultiple = relationship.type === 'multiple';
+  } else {
+    shapeRefs = relationship.refs.map(refStr => ({
+      '@ref': refStr
+    }));
+    isMultiple = relationship.isMultiple;
+  }
 
   if (!shapeRefs.length) {
-    throw new Error(`Invalid empty relationship ${JSON.stringify(legacyRelationship)}`);
+    throw new Error(`Invalid empty relationship ${JSON.stringify(relationship)}`);
   }
 
   const shapeRefsSchema = shapeRefs.length === 1 ? shapeRefs[0] : {
     oneOf: shapeRefs
   };
 
-  if (legacyRelationship.type === 'multiple') {
+  if (isMultiple) {
     return { ...propertySchema,
       type: 'array',
       items: shapeRefsSchema,

package/es/util/merge.js

@@ -33,4 +33,10 @@ export function mergeFormProperties(base, overrides) {
   }
 
   return result;
+}
+export function mergeFormConfigs(...configs) {
+  return configs.reduce(mergeFormProperties, {
+    properties: {},
+    order: []
+  });
 }

package/package.json

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