@takeshape/schema 11.45.5 → 11.46.0

package/dist/esm/src/models/shape.js

@@ -1,7 +1,7 @@
+import { isInterfaceShape } from "../interfaces.js";
 import { refItemToShape } from "../refs.js";
 import { createSchemaPropertyAccessor, createSchemaPropertyList, getShapeByRef } from "../schema-util.js";
 import { isCachedShape, isModelShape } from "../types/index.js";
-import { isInterfaceShape } from "../interfaces.js";
 /**
  * Create a shape model from either a ref item or a ref string such as `rick:Character`
  */
@@ -24,7 +24,7 @@ export class ShapeModel {
         else {
             const rawShape = refItemToShape(_projectSchemaModel.json, refArg);
             if (!rawShape) {
-                throw new Error(`Error creating shape model: ref item argument could not be resolved to a shape`);
+                throw new Error("Error creating shape model: ref item argument could not be resolved to a shape");
             }
             this._rawShape = rawShape;
             this._shapeRefItem = refArg;

package/dist/esm/src/project-schema/index.js

@@ -59,6 +59,7 @@ export * from "./v3.47.0.js";
 export * from "./v3.48.0.js";
 export * from "./v3.49.0.js";
 export * from "./v3.50.0.js";
+export * from "./v3.51.0.js";
 export * from "./v4.0.0.js";
 // Schema type utilities
 function createVersionPredicate(expectedVersion) {
@@ -132,5 +133,6 @@ export const isProjectSchemaJSONV3_47_0 = createVersionPredicate("3.47.0");
 export const isProjectSchemaJSONV3_48_0 = createVersionPredicate("3.48.0");
 export const isProjectSchemaJSONV3_49_0 = createVersionPredicate("3.49.0");
 export const isProjectSchemaJSONV3_50_0 = createVersionPredicate("3.50.0");
-export const isLatestProjectSchemaJSON = createVersionPredicate("3.50.0");
+export const isProjectSchemaJSONV3_51_0 = createVersionPredicate("3.51.0");
+export const isLatestProjectSchemaJSON = createVersionPredicate("3.51.0");
 export const isProjectSchemaJSONV4_0_0 = createVersionPredicate("4.0.0");

package/dist/esm/src/project-schema/migrate.js

@@ -1,6 +1,5 @@
 import { migrateTo } from "../migration/index.js";
-import { isProjectSchemaJSONV1_0_0, isProjectSchemaJSONV3_0_0, isProjectSchemaJSONV3_1_0, isProjectSchemaJSONV3_2_0, isProjectSchemaJSONV3_3_0, isProjectSchemaJSONV3_4_0, isProjectSchemaJSONV3_5_0, isProjectSchemaJSONV3_5_1, isProjectSchemaJSONV3_6_0, isProjectSchemaJSONV3_7_0, isProjectSchemaJSONV3_8_0, isProjectSchemaJSONV3_9_0, isProjectSchemaJSONV3_10_0, isProjectSchemaJSONV3_11_0, isProjectSchemaJSONV3_12_0, isProjectSchemaJSONV3_12_1, isProjectSchemaJSONV3_12_2, isProjectSchemaJSONV3_12_3, isProjectSchemaJSONV3_13_0, isProjectSchemaJSONV3_14_0, isProjectSchemaJSONV3_15_0, isProjectSchemaJSONV3_16_0, isProjectSchemaJSONV3_17_0, isProjectSchemaJSONV3_17_1, isProjectSchemaJSONV3_18_0, isProjectSchemaJSONV3_18_1, isProjectSchemaJSONV3_18_2, isProjectSchemaJSONV3_19_0, isProjectSchemaJSONV3_20_0, isProjectSchemaJSONV3_21_0, isProjectSchemaJSONV3_22_0, isProjectSchemaJSONV3_23_0, isProjectSchemaJSONV3_24_0, isProjectSchemaJSONV3_25_0, isProjectSchemaJSONV3_26_0, isProjectSchemaJSONV3_27_0, isProjectSchemaJSONV3_28_0, isProjectSchemaJSONV3_29_0, isProjectSchemaJSONV3_30_0, isProjectSchemaJSONV3_31_0, isProjectSchemaJSONV3_32_0, isProjectSchemaJSONV3_33_0, isProjectSchemaJSONV3_34_0, isProjectSchemaJSONV3_35_0, isProjectSchemaJSONV3_36_0, isProjectSchemaJSONV3_37_0, isProjectSchemaJSONV3_38_0, isProjectSchemaJSONV3_39_0, isProjectSchemaJSONV3_40_0, isProjectSchemaJSONV3_41_0, isProjectSchemaJSONV3_42_0, isProjectSchemaJSONV3_43_0, isProjectSchemaJSONV3_44_0, isProjectSchemaJSONV3_45_0, isProjectSchemaJSONV3_46_0, isProjectSchemaJSONV3_47_0, isProjectSchemaJSONV3_48_0, isProjectSchemaJSONV3_49_0, isProjectSchemaJSONV4_0_0, isLatestProjectSchemaJSON } from "./index.js";
-// eslint-disable-next-line complexity
+import { isProjectSchemaJSONV1_0_0, isProjectSchemaJSONV3_0_0, isProjectSchemaJSONV3_1_0, isProjectSchemaJSONV3_2_0, isProjectSchemaJSONV3_3_0, isProjectSchemaJSONV3_4_0, isProjectSchemaJSONV3_5_0, isProjectSchemaJSONV3_5_1, isProjectSchemaJSONV3_6_0, isProjectSchemaJSONV3_7_0, isProjectSchemaJSONV3_8_0, isProjectSchemaJSONV3_9_0, isProjectSchemaJSONV3_10_0, isProjectSchemaJSONV3_11_0, isProjectSchemaJSONV3_12_0, isProjectSchemaJSONV3_12_1, isProjectSchemaJSONV3_12_2, isProjectSchemaJSONV3_12_3, isProjectSchemaJSONV3_13_0, isProjectSchemaJSONV3_14_0, isProjectSchemaJSONV3_15_0, isProjectSchemaJSONV3_16_0, isProjectSchemaJSONV3_17_0, isProjectSchemaJSONV3_17_1, isProjectSchemaJSONV3_18_0, isProjectSchemaJSONV3_18_1, isProjectSchemaJSONV3_18_2, isProjectSchemaJSONV3_19_0, isProjectSchemaJSONV3_20_0, isProjectSchemaJSONV3_21_0, isProjectSchemaJSONV3_22_0, isProjectSchemaJSONV3_23_0, isProjectSchemaJSONV3_24_0, isProjectSchemaJSONV3_25_0, isProjectSchemaJSONV3_26_0, isProjectSchemaJSONV3_27_0, isProjectSchemaJSONV3_28_0, isProjectSchemaJSONV3_29_0, isProjectSchemaJSONV3_30_0, isProjectSchemaJSONV3_31_0, isProjectSchemaJSONV3_32_0, isProjectSchemaJSONV3_33_0, isProjectSchemaJSONV3_34_0, isProjectSchemaJSONV3_35_0, isProjectSchemaJSONV3_36_0, isProjectSchemaJSONV3_37_0, isProjectSchemaJSONV3_38_0, isProjectSchemaJSONV3_39_0, isProjectSchemaJSONV3_40_0, isProjectSchemaJSONV3_41_0, isProjectSchemaJSONV3_42_0, isProjectSchemaJSONV3_43_0, isProjectSchemaJSONV3_44_0, isProjectSchemaJSONV3_45_0, isProjectSchemaJSONV3_46_0, isProjectSchemaJSONV3_47_0, isProjectSchemaJSONV3_48_0, isProjectSchemaJSONV3_49_0, isProjectSchemaJSONV3_50_0, isProjectSchemaJSONV4_0_0, isLatestProjectSchemaJSON } from "./index.js";
 export async function migrateToLatestProjectSchema(context, projectSchema) {
     if (isLatestProjectSchemaJSON(projectSchema)) {
         return projectSchema;
@@ -179,6 +178,9 @@ export async function migrateToLatestProjectSchema(context, projectSchema) {
     if (isProjectSchemaJSONV3_49_0(projectSchema)) {
         projectSchema = await migrateTo["v3.50.0"](context, projectSchema);
     }
+    if (isProjectSchemaJSONV3_50_0(projectSchema)) {
+        projectSchema = await migrateTo["v3.51.0"](context, projectSchema);
+    }
     if (isProjectSchemaJSONV4_0_0(projectSchema)) {
         throw new Error("You are using an unreleased schema version. Migration is not possible");
     }

package/dist/esm/src/project-schema/v3.51.0.js

@@ -0,0 +1,7 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+export {};

package/dist/esm/src/refs.js

@@ -1,15 +1,15 @@
-import { isIntegerLike, isDefined, visit, isRecord } from "@takeshape/util";
-import get from "lodash/get.js";
+import { NotFoundError } from "@takeshape/errors";
+import { isDefined, isIntegerLike, isRecord, visit } from "@takeshape/util";
+import compact from "lodash/compact.js";
 import assign from "lodash/fp/assign.js";
 import omit from "lodash/fp/omit.js";
+import get from "lodash/get.js";
 import isString from "lodash/isString.js";
-import { NotFoundError } from "@takeshape/errors";
-import compact from "lodash/compact.js";
-import { getServiceNamespaces } from "./services/util.js";
-import { mergeDeepObjectSchemas, mergeObjectSchemas } from "./util/merge.js";
-import { getToolRef } from "./util/ai-tools.js";
 import { isScalar } from "./scalars.js";
+import { getServiceNamespaces } from "./services/util.js";
 import { getRefType, isAllOfSchema, isExtendsSchema, isObjectSchema, isOneOfSchema, isRefSchema, isRefSchemaLegacy } from "./types/index.js";
+import { getToolRef } from "./util/ai-tools.js";
+import { mergeDeepObjectSchemas, mergeObjectSchemas } from "./util/merge.js";
 /**
  * Guard for RefItemWithPath. Tests for presence of all required props.
  */
@@ -34,7 +34,11 @@ export function parseReturnShape(projectSchema, shape) {
             if (!ref) {
                 throw new Error(`Could not parse ${JSON.stringify(shape.items)}: invalid ref`);
             }
-            return { isArray: true, ref, shapeName: refItemToNamespacedShapeName(ref) };
+            return {
+                isArray: true,
+                ref,
+                shapeName: refItemToNamespacedShapeName(ref)
+            };
         }
         if (typeof shape.items.type !== "string") {
             throw new Error(`Could not parse ${JSON.stringify(shape.items)}: invalid type`);
@@ -53,7 +57,9 @@ export function returnShapeToSchema(projectSchema, returnShape) {
         if (isScalar(returnShape) || returnShape === "object") {
             return { type: returnShape };
         }
-        return { "@ref": refItemToAtRef(refExpressionToRefItem(projectSchema, returnShape)) };
+        return {
+            "@ref": refItemToAtRef(refExpressionToRefItem(projectSchema, returnShape))
+        };
     }
     return returnShape;
 }
@@ -112,7 +118,7 @@ export function refExpressionToRefItem(context, refExpression) {
  * Converts a list of ref expressions into a list of ref items.
  */
 export function refExpressionListToRefItemList(context, refExpressionList) {
-    return refExpressionList.map(ref => refExpressionToRefItem(context, ref));
+    return refExpressionList.map((ref) => refExpressionToRefItem(context, ref));
 }
 /**
  * Sugar for converting a `refExpression` directly into a shape, without the
@@ -244,7 +250,7 @@ export function getOneOfRefs(context, propertySchema, schemaPath = []) {
     const oneOf = propertySchema.oneOf ?? propertySchema.items?.oneOf;
     const path = propertySchema.oneOf ? schemaPath : [...schemaPath, "items"];
     if (oneOf) {
-        return compact(oneOf.map(one => {
+        return compact(oneOf.map((one) => {
             return getRefWithPath(context, one, path);
         }));
     }
@@ -294,7 +300,7 @@ export function refItemToShape(context, refItem) {
  * Get all shapes referenced by a RefItem array.
  */
 export function refItemListToShapeList(context, refItems) {
-    return refItems.map(ref => refItemToShape(context, ref)).filter(isDefined);
+    return refItems.map((ref) => refItemToShape(context, ref)).filter(isDefined);
 }
 /**
  * Get a shape referenced by a `RefItem`, also returning the path to the new shape.
@@ -366,10 +372,10 @@ export function hasResolvableRef(context, schema) {
         return Boolean(refItemToShapeSchema(context, getRef(context, schema)));
     }
     if (isAllOfSchema(schema)) {
-        return Boolean(schema.allOf.find(s => hasResolvableRef(context, s)));
+        return Boolean(schema.allOf.find((s) => hasResolvableRef(context, s)));
     }
     if (isOneOfSchema(schema)) {
-        return Boolean(schema.oneOf.find(s => hasResolvableRef(context, s)));
+        return Boolean(schema.oneOf.find((s) => hasResolvableRef(context, s)));
     }
     return false;
 }
@@ -377,7 +383,7 @@ function isSelfReferential(path, shapeName) {
     if (path[0] !== "shapes" || path[1] !== shapeName) {
         return false;
     }
-    const index = path.findIndex(part => part === "allOf" || part === "extends");
+    const index = path.findIndex((part) => part === "allOf" || part === "extends");
     return index !== -1 && isIntegerLike(path[Number(index) + 1]);
 }
 /**
@@ -435,7 +441,7 @@ export function dereferenceObjectSchema(context, shapeOrFieldSchema, schemaPath
     return schema;
 }
 export function createGetNamespace(context) {
-    return serviceId => context.services?.[serviceId]?.namespace;
+    return (serviceId) => context.services?.[serviceId]?.namespace;
 }
 export function parsePropertyRef(refStr) {
     const [serviceId, coordinate] = splitAtRef(refStr);
@@ -444,7 +450,11 @@ export function parsePropertyRef(refStr) {
         return { serviceId, shapeName: "Query", propertyName: coordinateParts[0] };
     }
     if (coordinateParts.length === 2) {
-        return { serviceId, shapeName: coordinateParts[0], propertyName: coordinateParts[1] };
+        return {
+            serviceId,
+            shapeName: coordinateParts[0],
+            propertyName: coordinateParts[1]
+        };
     }
 }
 export function serializePropertyRef({ shapeName, propertyName, serviceId }) {
@@ -521,7 +531,7 @@ export function getAllPropertyRefs(projectSchema) {
     const parentIsResolver = (path, resolverName) => {
         const parent = get(projectSchema, path.slice(0, -1));
         return (isRecord(parent) &&
-            (Array.isArray(resolverName) ? resolverName.some(name => name === parent.name) : parent.name === resolverName));
+            (Array.isArray(resolverName) ? resolverName.some((name) => name === parent.name) : parent.name === resolverName));
     };
     const parentIsGenerateState = (path) => {
         if (path[0] !== "ai-experimental" || path[path.length - 2] !== "execution") {
@@ -583,7 +593,7 @@ export function normalizeRefs(projectSchema, property) {
     if (property.oneOf) {
         return {
             ...updatedProperty,
-            oneOf: property.oneOf.map(item => normalizeRefs(projectSchema, item))
+            oneOf: property.oneOf.map((item) => normalizeRefs(projectSchema, item))
         };
     }
     // Convert $ref to @ref

package/dist/esm/src/relationships.js

@@ -1,11 +1,11 @@
 import { isDefined } from "@takeshape/util";
-import find from "lodash/find.js";
 import camelCase from "lodash/camelCase.js";
+import find from "lodash/find.js";
 import uniq from "lodash/uniq.js";
-import { isPropertySchemaWithRelationship, isModelShape, isObjectSchema } from "./types/index.js";
-import { getRefShapeName, followRef } from "./refs.js";
-import { isUnionSchema } from "./unions.js";
 import { builtInShapes } from "./builtin-schema.js";
+import { followRef, getRefShapeName } from "./refs.js";
+import { isModelShape, isObjectSchema, isPropertySchemaWithRelationship } from "./types/index.js";
+import { isUnionSchema } from "./unions.js";
 import { getShapeById } from "./util/shapes.js";
 /**
  * Turn a LegacyRelationship into a partial PropertySchemaWithRelationship.
@@ -25,8 +25,8 @@ export function getRelationshipSchema(projectSchema, relationship) {
     let shapeRefs;
     if ("shapeIds" in relationship) {
         shapeRefs = relationship.shapeIds
-            .map(shapeId => {
-            const shape = getShapeById(projectSchema, shapeId) ?? find(builtInShapes, shape => shape.id === shapeId);
+            .map((shapeId) => {
+            const shape = getShapeById(projectSchema, shapeId) ?? find(builtInShapes, (shape) => shape.id === shapeId);
             return (shape && {
                 "@ref": `local:${shape.name}`
             });
@@ -35,7 +35,7 @@ export function getRelationshipSchema(projectSchema, relationship) {
         isMultiple = relationship.type === "multiple";
     }
     else {
-        shapeRefs = relationship.refs.map(refStr => ({ "@ref": refStr }));
+        shapeRefs = relationship.refs.map((refStr) => ({ "@ref": refStr }));
         isMultiple = relationship.isMultiple;
     }
     if (!shapeRefs.length) {
@@ -70,7 +70,7 @@ export function getRelationshipShapeRefs(propertySchema) {
     let refs = [];
     const schema = propertySchema.items ?? propertySchema;
     if (schema.oneOf) {
-        refs = schema.oneOf.map(schema => schema["@ref"]).filter(isDefined);
+        refs = schema.oneOf.map((schema) => schema["@ref"]).filter(isDefined);
     }
     else if (schema["@ref"]) {
         refs = [schema["@ref"]];
@@ -82,7 +82,7 @@ export function getRelationshipShapeRefs(propertySchema) {
  */
 export function getRelationshipShapes(shapes, refs) {
     return refs
-        .map(ref => {
+        .map((ref) => {
         const shapeName = ref.split(":")[1];
         const shape = shapes[shapeName];
         return shape ? shape : undefined;
@@ -94,7 +94,7 @@ export function getRelationshipShapes(shapes, refs) {
  */
 export function getRelationshipShapeIds(shapes, refs) {
     return refs
-        .map(ref => {
+        .map((ref) => {
         const shapeName = ref.split(":")[1];
         const shape = shapes[shapeName];
         return shape ? shape.id : undefined;
@@ -137,7 +137,7 @@ export 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 shapeIds = new Set(shapeArray.map((shape) => shape.id));
     const findRelationships = (schema, path, parentShapeName) => {
         const relationship = getRelationship(schema);
         if (relationship) {
@@ -211,7 +211,7 @@ export function isEqualRelationship(a, b) {
         return false;
     }
     const refSet = new Set(refsA);
-    return refsB.every(ref => refSet.has(ref));
+    return refsB.every((ref) => refSet.has(ref));
 }
 /**
  * Test whether an array of PropertySchemas have unequal relationships
@@ -223,10 +223,10 @@ export function hasUnequalRelationships(relationships) {
     }));
 }
 function getRelatedShapeIds(relationships) {
-    return uniq(relationships.map(rel => (rel.hasBackreference ? rel.shapeId : undefined)).filter(isDefined));
+    return uniq(relationships.map((rel) => (rel.hasBackreference ? rel.shapeId : undefined)).filter(isDefined));
 }
 function getShapes(projectSchema, shapeIds) {
-    return shapeIds.map(shapeId => getShapeById(projectSchema, shapeId)).filter(isDefined);
+    return shapeIds.map((shapeId) => getShapeById(projectSchema, shapeId)).filter(isDefined);
 }
 /**
  * Adds backreference fields to the schema.
@@ -236,7 +236,7 @@ export function addRelatedFields(projectSchema, allRelationships) {
         const shape = getShapeById(projectSchema, shapeId);
         if (shape && isObjectSchema(shape.schema)) {
             const relatedShapeIds = getRelatedShapeIds(shapeRelationships);
-            const relatedShapeNames = getShapes(projectSchema, relatedShapeIds).map(shape => shape.name);
+            const relatedShapeNames = getShapes(projectSchema, relatedShapeIds).map((shape) => shape.name);
             if (relatedShapeNames.length) {
                 let shapeName;
                 if (relatedShapeNames.length === 1) {
@@ -251,14 +251,16 @@ export function addRelatedFields(projectSchema, allRelationships) {
                         name: shapeName,
                         title: shapeName,
                         schema: {
-                            oneOf: relatedShapeNames.map(name => ({ "@ref": `local:${name}` }))
+                            oneOf: relatedShapeNames.map((name) => ({
+                                "@ref": `local:${name}`
+                            }))
                         }
                     };
                 }
                 // _references, a list of all backreferences across all fields on this shape.
                 // It lists all the items that have references to the current item.
                 // It is for convenience.
-                if (shapeRelationships.some(rel => rel.hasBackreference)) {
+                if (shapeRelationships.some((rel) => rel.hasBackreference)) {
                     shape.schema.properties._references = {
                         "@args": `TSListArgs<local:${shapeName}>`,
                         "@ref": `PaginatedList<local:${shapeName}>`,
@@ -268,8 +270,8 @@ export function addRelatedFields(projectSchema, allRelationships) {
                             args: {
                                 ops: [
                                     { path: "$", mapping: "$args" },
-                                    { path: `baseWhere._references.eq`, mapping: "$source._id" },
-                                    { path: `baseWhere._shapeId.in`, value: relatedShapeIds }
+                                    { path: "baseWhere._references.eq", mapping: "$source._id" },
+                                    { path: "baseWhere._shapeId.in", value: relatedShapeIds }
                                 ]
                             }
                         }
@@ -292,8 +294,11 @@ export function addRelatedFields(projectSchema, allRelationships) {
                             args: {
                                 ops: [
                                     { path: "$", mapping: "$args" },
-                                    { path: `baseWhere.${filterField}.eq`, mapping: "$source._id" },
-                                    { path: `baseWhere._shapeId.eq`, value: relatedShape.id }
+                                    {
+                                        path: `baseWhere.${filterField}.eq`,
+                                        mapping: "$source._id"
+                                    },
+                                    { path: "baseWhere._shapeId.eq", value: relatedShape.id }
                                 ]
                             }
                         }

package/dist/esm/src/runtime-schema.js

@@ -1,14 +1,14 @@
 import { SchemaBuildError } from "@takeshape/errors";
-import compose from "lodash/fp/compose.js";
 import { deepClone } from "@takeshape/util";
-import set from "lodash/set.js";
+import compose from "lodash/fp/compose.js";
 import isError from "lodash/isError.js";
-import { isModelShape } from "./types/index.js";
-import { applyDefaultsToSchema, createShape } from "./schema-util.js";
-import { addRelatedFields, findExistingRelationships } from "./relationships.js";
-import { flattenTemplates } from "./flatten-templates.js";
+import set from "lodash/set.js";
 import { addAiQueries } from "./agents.js";
+import { flattenTemplates } from "./flatten-templates.js";
+import { addRelatedFields, findExistingRelationships } from "./relationships.js";
+import { applyDefaultsToSchema, createShape } from "./schema-util.js";
 import { resolveSchemaShapeDependencies } from "./service-dependencies.js";
+import { isModelShape } from "./types/index.js";
 export function applyLegacyCompatibilityTweaks(projectSchema) {
     const newSchema = deepClone(projectSchema);
     let hasSearchableShapes = false;
@@ -16,8 +16,12 @@ export function applyLegacyCompatibilityTweaks(projectSchema) {
         if (isModelShape(shape)) {
             hasSearchableShapes = true;
             // Magic _contentTypeId field used for V1 compatibility
-            set(shape, ["schema", "properties", "_contentTypeId"], { type: "string" });
-            set(shape, ["schema", "properties", "_contentTypeName"], { type: "string" });
+            set(shape, ["schema", "properties", "_contentTypeId"], {
+                type: "string"
+            });
+            set(shape, ["schema", "properties", "_contentTypeName"], {
+                type: "string"
+            });
             if (shape.model?.type !== "single") {
                 newSchema.queries[`search${shapeName}Index`] = {
                     shape: `SearchResults<${shapeName}>`,
@@ -43,7 +47,10 @@ export function applyLegacyCompatibilityTweaks(projectSchema) {
     }
     if (hasSearchableShapes) {
         // A placeholder shape for the TSSearchable interface
-        newSchema.shapes.TSSearchable = createShape("TSSearchable", { type: "object", properties: {} });
+        newSchema.shapes.TSSearchable = createShape("TSSearchable", {
+            type: "object",
+            properties: {}
+        });
         newSchema.queries.search = {
             shape: "SearchResults<TSSearchable>",
             resolver: {

package/dist/esm/src/schema-transform.js

@@ -1,8 +1,8 @@
 import { visit } from "@takeshape/util";
 import pickBy from "lodash/pickBy.js";
+import { getContentTransform } from "./content-schema-transform.js";
 import { isObjectSchema } from "./types/index.js";
 import { createUnwrapTransform, createWrapTransform, isUnionSchema } from "./unions.js";
-import { getContentTransform } from "./content-schema-transform.js";
 function createPropertiesPredicate(propertyNames) {
     const byShape = new Map();
     for (const name of propertyNames) {
@@ -22,7 +22,7 @@ function createPropertiesPredicate(propertyNames) {
 }
 export function removePropertiesTransform(propertyNames) {
     const isBlacklisted = createPropertiesPredicate(propertyNames);
-    return projectSchema => {
+    return (projectSchema) => {
         visit(projectSchema, ["schema"], (value, path) => {
             if (path.length === 3 && path[0] === "shapes" && path[2] === "schema") {
                 const shapeSchema = value;
@@ -30,7 +30,7 @@ export function removePropertiesTransform(propertyNames) {
                     const { properties, required } = shapeSchema;
                     shapeSchema.properties = pickBy(properties, (_, name) => !isBlacklisted(path[1], name));
                     if (required) {
-                        shapeSchema.required = required.filter(name => !isBlacklisted(path[1], name));
+                        shapeSchema.required = required.filter((name) => !isBlacklisted(path[1], name));
                     }
                 }
             }

package/dist/esm/src/schema-util.js

@@ -1,22 +1,22 @@
-import mapValues from "lodash/mapValues.js";
-import keyBy from "lodash/keyBy.js";
+import { deepClone, ensureArray, pascalCase, visit } from "@takeshape/util";
 import curry from "lodash/fp/curry.js";
 import orderBy from "lodash/fp/orderBy.js";
-import uniq from "lodash/uniq.js";
-import { deepClone, visit, pascalCase, ensureArray } from "@takeshape/util";
-import isString from "lodash/isString.js";
 import isArray from "lodash/isArray.js";
+import isString from "lodash/isString.js";
+import keyBy from "lodash/keyBy.js";
+import mapValues from "lodash/mapValues.js";
 import some from "lodash/some.js";
-import { defaultWorkflow, getStatusField } from "./workflows.js";
-import { CURRENT_API_VERSION, CURRENT_SCHEMA_VERSION } from "./versions.js";
+import uniq from "lodash/uniq.js";
 import { workflowsEnabled } from "./api-version.js";
-import { builtInShapes, builtInForms } from "./builtin-schema.js";
-import { createTemplateShapeName, dereferenceObjectSchema, dereferenceSchema, getRef, getRefOrItemsRef, getRefShapeName, parseReturnShape, refExpressionToRefItem, refItemToShape, refItemToNamespacedShapeName, refItemToShapeSchema, atRefToRefItem, refToRefItem, parseTemplateShape, returnShapeToSchema, serializePropertyRef } from "./refs.js";
+import { builtInForms, builtInShapes } from "./builtin-schema.js";
+import { SERVICE_OBJECT_PATTERN_NAME } from "./constants.js";
+import { atRefToRefItem, createTemplateShapeName, dereferenceObjectSchema, dereferenceSchema, getRef, getRefOrItemsRef, getRefShapeName, parseReturnShape, parseTemplateShape, refExpressionToRefItem, refItemToNamespacedShapeName, refItemToShape, refItemToShapeSchema, refToRefItem, returnShapeToSchema, serializePropertyRef } from "./refs.js";
+import { getArgsType, isAllOfSchema, isArraySchema, isCachedShape, isExtendsSchema, isGraphqlResolver, isModelShape, isObjectSchema, isOneOfSchema, isRefSchema } from "./types/index.js";
 import { isUnionSchema } from "./unions.js";
-import { mergeFormProperties, mergeSchemaProperties } from "./util/merge.js";
 import { getArgs } from "./util/has-arg.js";
-import { getArgsType, isObjectSchema, isAllOfSchema, isOneOfSchema, isExtendsSchema, isArraySchema, isGraphqlResolver, isRefSchema, isModelShape, isCachedShape } from "./types/index.js";
-import { SERVICE_OBJECT_PATTERN_NAME } from "./constants.js";
+import { mergeFormProperties, mergeSchemaProperties } from "./util/merge.js";
+import { CURRENT_API_VERSION, CURRENT_SCHEMA_VERSION } from "./versions.js";
+import { defaultWorkflow, getStatusField } from "./workflows.js";
 export function isBuiltinShape(shapeName) {
     return Boolean(builtInShapes[shapeName]);
 }
@@ -386,17 +386,17 @@ const requiredBuiltinShapes = ["Asset", "TSRelationship", "TSStaticSite", "TSUse
  */
 export function getBuiltinsUsed(projectSchema) {
     const builtinsUsed = {};
-    const shapeNames = uniq(requiredBuiltinShapes.concat(getAllRefs(projectSchema, refItem => refItem.serviceKey === "local" && isBuiltinShape(refItem.typeName)).map(refItemToNamespacedShapeName)));
+    const shapeNames = uniq(requiredBuiltinShapes.concat(getAllRefs(projectSchema, (refItem) => refItem.serviceKey === "local" && isBuiltinShape(refItem.typeName)).map(refItemToNamespacedShapeName)));
     const schemaWithAllBuiltins = {
         ...emptySchema("project-id"),
         shapes: builtInShapes
     };
-    shapeNames.forEach(builtinShapeName => {
+    for (const builtinShapeName of shapeNames) {
         builtinsUsed[builtinShapeName] = builtInShapes[builtinShapeName];
-        getShapeDependencies(schemaWithAllBuiltins, builtInShapes[builtinShapeName]).forEach(depShapeName => {
+        for (const depShapeName of getShapeDependencies(schemaWithAllBuiltins, builtInShapes[builtinShapeName])) {
             builtinsUsed[depShapeName] = builtInShapes[depShapeName];
-        });
-    });
+        }
+    }
     return builtinsUsed;
 }
 export function applyDefaultsToSchema(projectSchema) {
@@ -405,7 +405,9 @@ export function applyDefaultsToSchema(projectSchema) {
         ...projectSchema,
         workflows: {
             ...projectSchema.workflows,
-            ...(workflowsEnabled(projectSchema.apiVersion) && { default: defaultWorkflow })
+            ...(workflowsEnabled(projectSchema.apiVersion) && {
+                default: defaultWorkflow
+            })
         },
         queries: {
             ...builtInQueriesAndMutations.queries,
@@ -415,7 +417,7 @@ export function applyDefaultsToSchema(projectSchema) {
             ...builtInQueriesAndMutations.mutations,
             ...projectSchema.mutations
         },
-        shapes: mapValues({ ...builtinsUsed, ...projectSchema.shapes }, shape => {
+        shapes: mapValues({ ...builtinsUsed, ...projectSchema.shapes }, (shape) => {
             const builtInShape = builtinsUsed[shape.name];
             if (builtInShape && builtInShape !== shape) {
                 shape = {
@@ -428,7 +430,10 @@ export function applyDefaultsToSchema(projectSchema) {
         forms: mapValues({ ...builtInForms, ...projectSchema.forms }, (formsConfig, shapeName) => {
             const builtInFormsConfig = builtInForms[shapeName];
             if (builtInFormsConfig && builtInFormsConfig !== formsConfig) {
-                formsConfig = { ...formsConfig, default: mergeFormProperties(formsConfig.default, builtInFormsConfig.default) };
+                formsConfig = {
+                    ...formsConfig,
+                    default: mergeFormProperties(formsConfig.default, builtInFormsConfig.default)
+                };
             }
             return formsConfig;
         })
@@ -481,16 +486,19 @@ const createShapeToPropertySchema = (projectSchema, definitions, definitionNames
                     };
                     propSchema.required = ["_shapeId"];
                 }
-                propSchema.oneOf.forEach(schema => {
+                for (const schema of propSchema.oneOf) {
                     handleSchema(schema);
-                });
+                }
                 return;
             }
             // Add workflow validation
             if (propSchema["@workflow"]) {
                 const workflowName = propSchema["@workflow"];
                 const workflow = projectSchema.workflows[workflowName] || defaultWorkflow;
-                propSchema.oneOf = workflow.steps.map(step => ({ enum: [step.key, step.name], title: step.title }));
+                propSchema.oneOf = workflow.steps.map((step) => ({
+                    enum: [step.key, step.name],
+                    title: step.title
+                }));
             }
             const refItem = getRef(projectSchema, propSchema);
             if (refItem) {
@@ -525,9 +533,9 @@ const createShapeToPropertySchema = (projectSchema, definitions, definitionNames
         if (shape.title) {
             shapeSchemaCopy.title = shape.title;
         }
-        Object.values(shapeSchemaCopy.properties).forEach(schema => {
+        for (const schema of Object.values(shapeSchemaCopy.properties)) {
             handleSchema(schema);
-        });
+        }
         return shapeSchemaCopy;
     };
     return rewriteRefs;
@@ -771,7 +779,7 @@ export function getFullyQualifiedShapeName(schema) {
  * @param schema
  */
 export function getStorageKey(schema) {
-    const first = findMapping(schema, mapping => mapping.startsWith("shapedb:"));
+    const first = findMapping(schema, (mapping) => mapping.startsWith("shapedb:"));
     return first ? splitMapping(first)[1] : undefined;
 }
 export function getPropertyService(schema) {
@@ -814,7 +822,7 @@ export function getShapesById(projectSchema) {
  * @returns A `string` array with all the shapes that are in namespaces.
  */
 export function getAllNamespaceShapes(projectSchema) {
-    const isServiceRef = refItem => Boolean(refItem.serviceNamespace);
+    const isServiceRef = (refItem) => Boolean(refItem.serviceNamespace);
     return uniq(getAllValidRefs(projectSchema, isServiceRef).map(refItemToNamespacedShapeName));
 }
 /**
@@ -837,11 +845,11 @@ export function getNamespacedShapeNameList(projectSchema) {
     const namespacedShapeNames = new Set(getAllNamespaceShapes(projectSchema));
     // Add all namespaced shapes to the schema if they are not already present,
     // e.g. Shopify_Product
-    namespacedShapeNames.forEach(name => {
+    for (const name of namespacedShapeNames) {
         if (!existingShapeNames.has(name)) {
             requiredShapeNames.add(name);
         }
-    });
+    }
     return requiredShapeNames;
 }
 /**
@@ -887,7 +895,7 @@ export const createSchemaPropertyList = curry((context, shapeOrSchema) => {
                 .sort(([nameA], [nameB]) => {
                 const indexA = comparatorArray.indexOf(nameA);
                 const indexB = comparatorArray.indexOf(nameB);
-                return (indexA > -1 ? indexA : Infinity) - (indexB > -1 ? indexB : Infinity);
+                return ((indexA > -1 ? indexA : Number.POSITIVE_INFINITY) - (indexB > -1 ? indexB : Number.POSITIVE_INFINITY));
             }));
         }
         return self;
@@ -1030,12 +1038,12 @@ export function queryToPropertySchema(projectSchema, query) {
 export function getQueriesShape(projectSchema, operation) {
     return createShape(pascalCase(operation), {
         type: "object",
-        properties: mapValues(projectSchema[operation === "query" ? "queries" : "mutations"], query => queryToPropertySchema(projectSchema, query))
+        properties: mapValues(projectSchema[operation === "query" ? "queries" : "mutations"], (query) => queryToPropertySchema(projectSchema, query))
     });
 }
 export function fieldMappingContainsKey(fieldMapping, key) {
     if (isArray(fieldMapping)) {
-        return some(fieldMapping, mapping => parseMapping(mapping).key === key);
+        return some(fieldMapping, (mapping) => parseMapping(mapping).key === key);
     }
     return parseMapping(fieldMapping).key === key;
 }