@takeshape/schema 9.80.4 → 9.81.0

package/dist/relationships.js

@@ -12,23 +12,14 @@ exports.getRelationshipShapeRefs = getRelationshipShapeRefs;
 exports.getRelationshipShapes = getRelationshipShapes;
 exports.hasUnequalRelationships = hasUnequalRelationships;
 exports.isEqualRelationship = isEqualRelationship;
-
 var _util = require("@takeshape/util");
-
 var _types = require("./types");
-
 var _schemaUtil = require("./schema-util");
-
 var _refs = require("./refs");
-
 var _unions = require("./unions");
-
 var _builtinSchema = require("./builtin-schema");
-
 var _find = _interopRequireDefault(require("lodash/find"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * Turn a LegacyRelationship into a partial PropertySchemaWithRelationship.
  */
@@ -45,7 +36,6 @@ function getRelationshipSchema(projectSchema, relationship) {
   };
   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);
@@ -60,17 +50,15 @@ function getRelationshipSchema(projectSchema, relationship) {
     }));
     isMultiple = relationship.isMultiple;
   }
-
   if (!shapeRefs.length) {
     throw new Error(`Invalid empty relationship ${JSON.stringify(relationship)}`);
   }
-
   const shapeRefsSchema = shapeRefs.length === 1 ? shapeRefs[0] : {
     oneOf: shapeRefs
   };
-
   if (isMultiple) {
-    return { ...propertySchema,
+    return {
+      ...propertySchema,
       type: 'array',
       items: shapeRefsSchema,
       '@input': {
@@ -81,36 +69,32 @@ function getRelationshipSchema(projectSchema, relationship) {
       }
     };
   }
-
-  return { ...propertySchema,
+  return {
+    ...propertySchema,
     ...shapeRefsSchema,
     '@input': {
       '@ref': 'local:TSRelationship'
     }
   };
 }
+
 /**
  * Get a list of refs given a property schema with a relationship resolver.
  */
-
-
 function getRelationshipShapeRefs(propertySchema) {
   let refs = [];
   const schema = propertySchema.items ?? propertySchema;
-
   if (schema.oneOf) {
     refs = schema.oneOf.map(schema => schema['@ref']).filter(_util.isDefined);
   } else if (schema['@ref']) {
     refs = [schema['@ref']];
   }
-
   return refs;
 }
+
 /**
  * Get a list of shapes given a property schema with a relationship resolver.
  */
-
-
 function getRelationshipShapes(shapes, refs) {
   return refs.map(ref => {
     const shapeName = ref.split(':')[1];
@@ -118,11 +102,10 @@ function getRelationshipShapes(shapes, refs) {
     return shape ? shape : undefined;
   }).filter(_util.isDefined);
 }
+
 /**
  * Get a list of shape ids given a property schema with a relationship resolver.
  */
-
-
 function getRelationshipShapeIds(shapes, refs) {
   return refs.map(ref => {
     const shapeName = ref.split(':')[1];
@@ -130,31 +113,26 @@ function getRelationshipShapeIds(shapes, refs) {
     return shape ? shape.id : undefined;
   }).filter(_util.isDefined);
 }
+
 /**
  * Turn a Relationship into a LegacyRelationship object.
  */
-
-
 function getLegacyRelationship(projectSchema, relationship) {
   return {
     type: relationship.isMultiple ? 'multiple' : 'single',
     shapeIds: getRelationshipShapeIds(projectSchema.shapes, relationship.refs)
   };
 }
+
 /**
  * Get relationship details from a PropertySchema.
  */
-
-
 function getRelationship(propertySchema) {
   var _propertySchema$Back, _propertySchema$Back2;
-
   propertySchema = propertySchema['@output'] ?? propertySchema;
-
   if (!(0, _types.isPropertySchemaWithRelationship)(propertySchema)) {
     return;
   }
-
   const isMultiple = propertySchema.type === 'array';
   const hasBackreference = Boolean((_propertySchema$Back = propertySchema['@backreference']) === null || _propertySchema$Back === void 0 ? void 0 : _propertySchema$Back.enabled);
   const backreferenceName = (_propertySchema$Back2 = propertySchema['@backreference']) === null || _propertySchema$Back2 === void 0 ? void 0 : _propertySchema$Back2.name;
@@ -166,34 +144,26 @@ function getRelationship(propertySchema) {
     backreferenceName
   };
 }
-
 function addRelationship(relationships, id, env) {
   if (!relationships[id]) {
     relationships[id] = [];
   }
-
   relationships[id].push(env);
 }
-
 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) => {
     const relationship = getRelationship(schema);
-
     if (relationship) {
       var _schema$Backreferenc;
-
       const relatedShapeIds = getRelationshipShapeIds(shapes, relationship.refs);
       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),
@@ -205,24 +175,18 @@ function findExistingRelationships(projectSchema, shapes) {
         }
       }
     }
-
     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 (!relationship) {
       if (prop.properties) {
         for (const name of Object.keys(prop.properties)) {
@@ -237,7 +201,6 @@ function findExistingRelationships(projectSchema, shapes) {
       }
     }
   };
-
   for (const shape of shapeArray) {
     if ((0, _schemaUtil.isModelShape)(shape)) {
       const {
@@ -248,42 +211,35 @@ function findExistingRelationships(projectSchema, shapes) {
       findRelationships(schema, [id], name);
     }
   }
-
   return relationships;
 }
+
 /**
  * Test whether two PropertySchemas have equal realtionships
  */
-
-
 function isEqualRelationship(a, b) {
   const relationshipA = getRelationship(a);
-  const relationshipB = getRelationship(b); // non-relationships are considered equal in that they are both equal that regard
+  const relationshipB = getRelationship(b);
 
+  // non-relationships are considered equal in that they are both equal that regard
   if (!relationshipA && !relationshipB) {
     return true;
   }
-
   const refsA = relationshipA === null || relationshipA === void 0 ? void 0 : relationshipA.refs;
-
   if (!refsA) {
     return false;
   }
-
   const refsB = relationshipB === null || relationshipB === void 0 ? void 0 : relationshipB.refs;
-
   if (!refsB || refsA.length !== refsB.length) {
     return false;
   }
-
   const refSet = new Set(refsA);
   return refsB.every(ref => refSet.has(ref));
 }
+
 /**
  * Test whether an array of PropertySchemas have unequal relationships
  */
-
-
 function hasUnequalRelationships(relationships) {
   return Boolean(relationships.find((propertySchema, index, allRelationships) => {
     const nextPropertySchema = allRelationships[index + 1];

package/dist/scalars.js

@@ -7,7 +7,6 @@ exports.isScalar = isScalar;
 exports.scalars = void 0;
 const scalars = ['string', 'boolean', 'integer', 'number'];
 exports.scalars = scalars;
-
 function isScalar(str) {
   return Array.from(scalars).includes(str);
 }

package/dist/schema-transform.js

@@ -4,49 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.removePropertiesTransform = removePropertiesTransform;
-
 var _util = require("@takeshape/util");
-
 var _types = require("./types");
-
 var _pickBy = _interopRequireDefault(require("lodash/pickBy"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function createPropertiesPredicate(propertyNames) {
   const byShape = new Map();
-
   for (const name of propertyNames) {
     const [shapeName, propName] = name.split('.');
     const blacklist = byShape.get(shapeName);
-
     if (!blacklist) {
       byShape.set(shapeName, new Set([propName]));
     } else {
       blacklist.add(propName);
     }
   }
-
   return (shapeName, name) => {
     const blacklist = byShape.get(byShape.has(shapeName) ? shapeName : '*');
     return Boolean(blacklist === null || blacklist === void 0 ? void 0 : blacklist.has(name));
   };
 }
-
 function removePropertiesTransform(propertyNames) {
   const isBlacklisted = createPropertiesPredicate(propertyNames);
   return projectSchema => {
     (0, _util.visit)(projectSchema, ['schema'], (value, path) => {
       if (path.length === 3 && path[0] === 'shapes' && path[2] === 'schema') {
         const shapeSchema = value;
-
         if ((0, _types.isObjectSchema)(shapeSchema)) {
           const {
             properties,
             required
           } = shapeSchema;
           shapeSchema.properties = (0, _pickBy.default)(properties, (_, name) => !isBlacklisted(path[1], name));
-
           if (required) {
             shapeSchema.required = required.filter(name => !isBlacklisted(path[1], name));
           }