@takeshape/schema 11.45.5 → 11.47.1

package/dist/esm/src/schemas/project-schema/v3.6.0.json

@@ -464,7 +464,7 @@
       "title": "Workflow Map",
       "type": "object",
       "patternProperties": {
-        "[0-9A-Za-z_-]+": {"$ref": "#/definitions/workflow"}
+        "[0-9A-Za-z_-]+": { "$ref": "#/definitions/workflow" }
       }
     },
     "formConfig": {

package/dist/esm/src/schemas/project-schema/v3.7.0.json

@@ -464,7 +464,7 @@
       "title": "Workflow Map",
       "type": "object",
       "patternProperties": {
-        "[0-9A-Za-z_-]+": {"$ref": "#/definitions/workflow"}
+        "[0-9A-Za-z_-]+": { "$ref": "#/definitions/workflow" }
       }
     },
     "formConfig": {

package/dist/esm/src/schemas/project-schema/v3.8.0.json

@@ -477,7 +477,7 @@
       "title": "Workflow Map",
       "type": "object",
       "patternProperties": {
-        "[0-9A-Za-z_-]+": {"$ref": "#/definitions/workflow"}
+        "[0-9A-Za-z_-]+": { "$ref": "#/definitions/workflow" }
       }
     },
     "formConfig": {

package/dist/esm/src/schemas/project-schema/v3.9.0.json

@@ -477,7 +477,7 @@
       "title": "Workflow Map",
       "type": "object",
       "patternProperties": {
-        "[0-9A-Za-z_-]+": {"$ref": "#/definitions/workflow"}
+        "[0-9A-Za-z_-]+": { "$ref": "#/definitions/workflow" }
       }
     },
     "formConfig": {

package/dist/esm/src/schemas/project-schema/v4.0.0.json

@@ -154,7 +154,7 @@
             },
             "items": {
               "oneOf": [
-                {"$ref": "#/definitions/refSchema"},
+                { "$ref": "#/definitions/refSchema" },
                 {
                   "type": "object",
                   "properties": {
@@ -199,7 +199,7 @@
     "allOfSchema": {
       "title": "AllOfSchema",
       "allOf": [
-        {"$ref": "#/definitions/propertySchema"},
+        { "$ref": "#/definitions/propertySchema" },
         {
           "type": "object",
           "properties": {
@@ -253,7 +253,7 @@
     "oneOfSchema": {
       "title": "OneOfSchema",
       "allOf": [
-        {"$ref": "#/definitions/propertySchema"},
+        { "$ref": "#/definitions/propertySchema" },
         {
           "type": "object",
           "properties": {
@@ -284,10 +284,10 @@
       "title": "Shape Schema",
       "type": "object",
       "oneOf": [
-        {"$ref": "#/definitions/shapeSchemaAllOf"},
-        {"$ref": "#/definitions/shapeSchemaOneOf"},
-        {"$ref": "#/definitions/shapeSchemaEnum"},
-        {"$ref": "#/definitions/objectSchema"}
+        { "$ref": "#/definitions/shapeSchemaAllOf" },
+        { "$ref": "#/definitions/shapeSchemaOneOf" },
+        { "$ref": "#/definitions/shapeSchemaEnum" },
+        { "$ref": "#/definitions/objectSchema" }
       ]
     },
     "queryMap": {
@@ -302,11 +302,11 @@
     },
     "args": {
       "title": "Args",
-      "oneOf": [{"type": "string"}, {"$ref": "#/definitions/objectSchema"}]
+      "oneOf": [{ "type": "string" }, { "$ref": "#/definitions/objectSchema" }]
     },
     "returnShape": {
       "title": "Return Shape",
-      "oneOf": [{"type": "string"}, {"$ref": "#/definitions/returnShapeArraySchema"}]
+      "oneOf": [{ "type": "string" }, { "$ref": "#/definitions/returnShapeArraySchema" }]
     },
     "directiveConfigItem": {
       "title": "Directive Config Item",
@@ -471,7 +471,9 @@
         "paths": {
           "type": "object",
           "patternProperties": {
-            "^[^\\n\\r]*$": {"$ref": "#/definitions/parameterSerializeOptions"}
+            "^[^\\n\\r]*$": {
+              "$ref": "#/definitions/parameterSerializeOptions"
+            }
           }
         }
       },
@@ -837,13 +839,13 @@
       "title": "Directive Mapping Array Item",
       "description": "A tuple with a string key and a directive config to evaluate",
       "type": "array",
-      "items": [{"type": "string"}, {"$ref": "#/definitions/directiveConfig"}]
+      "items": [{ "type": "string" }, { "$ref": "#/definitions/directiveConfig" }]
     },
     "directiveMappingArray": {
       "title": "Directive Mapping Array",
       "description": "An array of key / value or directive config tuples",
       "type": "array",
-      "items": {"$ref": "#/definitions/directiveMappingArrayItem"}
+      "items": { "$ref": "#/definitions/directiveMappingArrayItem" }
     },
     "basicResolver": {
       "title": "BasicResolver",
@@ -946,7 +948,7 @@
       "title": "TakeshapeResolver",
       "type": "object",
       "properties": {
-        "if": {"type": "string"},
+        "if": { "type": "string" },
         "id": {
           "type": "string",
           "pattern": "^(?=[a-zA-Z])[-_a-zA-Z0-9]+$"
@@ -1046,7 +1048,7 @@
       "title": "GraphqlResolver",
       "type": "object",
       "properties": {
-        "if": {"type": "string"},
+        "if": { "type": "string" },
         "id": {
           "type": "string",
           "pattern": "^(?=[a-zA-Z])[-_a-zA-Z0-9]+$"
@@ -1071,13 +1073,13 @@
           "title": "GraphqlResolverOptions",
           "type": "object",
           "properties": {
-            "selectionSet": {"type": "string"},
-            "unboxParentSelectionSet": {"type": "boolean"},
-            "ignoreErrors": {"type": "boolean"},
-            "skipWhenMissingArgs": {"type": "boolean"},
-            "ttl": {"type": "number"},
-            "timeout": {"type": "number"},
-            "retry": {"oneOf": [{"type": "number"}, {"type": "object"}]}
+            "selectionSet": { "type": "string" },
+            "unboxParentSelectionSet": { "type": "boolean" },
+            "ignoreErrors": { "type": "boolean" },
+            "skipWhenMissingArgs": { "type": "boolean" },
+            "ttl": { "type": "number" },
+            "timeout": { "type": "number" },
+            "retry": { "oneOf": [{ "type": "number" }, { "type": "object" }] }
           },
           "additionalProperties": true
         },
@@ -1109,7 +1111,7 @@
       "title": "RestResolver",
       "type": "object",
       "properties": {
-        "if": {"type": "string"},
+        "if": { "type": "string" },
         "id": {
           "type": "string",
           "pattern": "^(?=[a-zA-Z])[-_a-zA-Z0-9]+$"
@@ -1137,10 +1139,10 @@
           "title": "RestResolverOptions",
           "type": "object",
           "properties": {
-            "trailingSlash": {"type": "boolean"},
-            "ttl": {"type": "number"},
-            "timeout": {"type": "number"},
-            "retry": {"oneOf": [{"type": "number"}, {"type": "object"}]}
+            "trailingSlash": { "type": "boolean" },
+            "ttl": { "type": "number" },
+            "timeout": { "type": "number" },
+            "retry": { "oneOf": [{ "type": "number" }, { "type": "object" }] }
           },
           "additionalProperties": true
         },
@@ -1191,7 +1193,7 @@
       "title": "AwsLambdaResolver",
       "type": "object",
       "properties": {
-        "if": {"type": "string"},
+        "if": { "type": "string" },
         "id": {
           "type": "string",
           "pattern": "^(?=[a-zA-Z])[-_a-zA-Z0-9]+$"
@@ -1282,7 +1284,7 @@
     },
     "resolver": {
       "title": "Resolver",
-      "oneOf": [{"$ref": "#/definitions/basicResolver"}, {"$ref": "#/definitions/composeResolver"}]
+      "oneOf": [{ "$ref": "#/definitions/basicResolver" }, { "$ref": "#/definitions/composeResolver" }]
     },
     "query": {
       "title": "Query JSON",
@@ -2287,7 +2289,7 @@
     "layers": {
       "type": "array",
       "items": {
-        "oneOf": [{"type": "string"}, {"$ref": "#/definitions/layerConfig"}]
+        "oneOf": [{ "type": "string" }, { "$ref": "#/definitions/layerConfig" }]
       }
     },
     "dataKey": {

package/dist/esm/src/schemas/project-schema.json

@@ -180,6 +180,9 @@
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.50.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.51.0#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v4.0.0#"
     }

package/dist/esm/src/schemas/user-schema.json

@@ -47,12 +47,5 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "id",
-    "email",
-    "fullName",
-    "created",
-    "updated",
-    "firstTime"
-  ]
-}
+  "required": ["id", "email", "fullName", "created", "updated", "firstTime"]
+}

package/dist/esm/src/service-dependencies.js

@@ -1,14 +1,14 @@
-import { addAll, mapSet, deepClone } from "@takeshape/util";
+import { addAll, deepClone, mapSet } from "@takeshape/util";
 import get from "lodash/get.js";
-import set from "lodash/set.js";
 import isObject from "lodash/isObject.js";
 import pick from "lodash/pick.js";
-import { isExtendsSchema, isObjectSchema, isProjectSchemaWithServices } from "./types/index.js";
-import { createGetNamespace, dereferenceObjectSchema, getAllPropertyRefs, getRef, getRefShapeName, propertyRefItemToPath, refExpressionToRefItem, refItemToNamespacedShapeName } from "./refs.js";
+import set from "lodash/set.js";
 import { getImplementationShapeNameMap, isInterfaceShape, pruneUnusedInterfaces } from "./interfaces.js";
-import { getAllRefsInQuery, getArgsReference, getAllNamespaceShapes, isValidRefItem, visitSchemaProperties } from "./schema-util.js";
+import { createGetNamespace, dereferenceObjectSchema, getAllPropertyRefs, getRef, getRefShapeName, propertyRefItemToPath, refExpressionToRefItem, refItemToNamespacedShapeName } from "./refs.js";
+import { getAllNamespaceShapes, getAllRefsInQuery, getArgsReference, isValidRefItem, visitSchemaProperties } from "./schema-util.js";
+import { isExtendsSchema, isObjectSchema, isProjectSchemaWithServices } from "./types/index.js";
 function getGraphQLServiceShapeMap(layers) {
-    return Object.assign({}, ...Object.values(layers).map(layer => layer.schema?.shapes ?? {}));
+    return Object.assign({}, ...Object.values(layers).map((layer) => layer.schema?.shapes ?? {}));
 }
 function schemaExtendsShape(context, shapeName, schema) {
     return (isExtendsSchema(schema) &&
@@ -16,7 +16,7 @@ function schemaExtendsShape(context, shapeName, schema) {
 }
 function getMissingPropertyRefs(projectSchema, getNamespace) {
     const propertyRefs = getAllPropertyRefs(projectSchema);
-    return propertyRefs.filter(ref => {
+    return propertyRefs.filter((ref) => {
         const path = propertyRefItemToPath(getNamespace, ref);
         return !get(projectSchema, path);
     });
@@ -46,7 +46,7 @@ function getShapeRefs(services, serviceSchemas, propertyRefs) {
     return results;
 }
 function interfacesToShapeNames(projectSchema, shapeRefArray) {
-    return shapeRefArray.map(shapeRef => refItemToNamespacedShapeName(refExpressionToRefItem(projectSchema, shapeRef)));
+    return shapeRefArray.map((shapeRef) => refItemToNamespacedShapeName(refExpressionToRefItem(projectSchema, shapeRef)));
 }
 /**
  * Add all referenced shape names to the refSet meant to be used as a callback to visitSchemaProperties
@@ -115,7 +115,7 @@ export function resolveSchemaShapeDependencies(projectSchema, serviceLayers) {
             collectDependencies(requiredShapeNames);
             // Collect interfaces that requiredShapeNames implement
             const interfaceNames = new Set();
-            const requiredShapes = mapSet(requiredShapeNames, shapeName => newSchema.shapes[shapeName] ?? remoteShapeMap[shapeName]);
+            const requiredShapes = mapSet(requiredShapeNames, (shapeName) => newSchema.shapes[shapeName] ?? remoteShapeMap[shapeName]);
             for (const shape of requiredShapes) {
                 if (shape?.interfaces) {
                     addAll(interfaceNames, interfacesToShapeNames(projectSchema, shape.interfaces));
@@ -123,7 +123,10 @@ export function resolveSchemaShapeDependencies(projectSchema, serviceLayers) {
             }
             // Collect implementations for interfaces in requiredShapeNames
             const implementationNames = new Set();
-            const implementations = getImplementationShapeNameMap({ ...newSchema.shapes, ...remoteShapeMap });
+            const implementations = getImplementationShapeNameMap({
+                ...newSchema.shapes,
+                ...remoteShapeMap
+            });
             for (const shape of requiredShapes) {
                 if (isInterfaceShape(shape) && implementations[shape.name]) {
                     addAll(implementationNames, implementations[shape.name]);
@@ -136,7 +139,10 @@ export function resolveSchemaShapeDependencies(projectSchema, serviceLayers) {
             addAll(requiredShapeNames, implementationNames);
             // Populate a ShapeMap with the remote shapes we've gathered
             // A combined context which prefers remote shapes for use when merging/inlining
-            const mergingContext = { services: newSchema.services, shapes: { ...newSchema.shapes, ...remoteShapeMap } };
+            const mergingContext = {
+                services: newSchema.services,
+                shapes: { ...newSchema.shapes, ...remoteShapeMap }
+            };
             for (const name of requiredShapeNames) {
                 const localShape = newSchema.shapes[name];
                 const remoteShape = remoteShapeMap[name];

package/dist/esm/src/services/services.js

@@ -1,12 +1,12 @@
-import { mergeWithArrayMerge } from "@takeshape/util";
-import { createAjv } from "@takeshape/json-schema";
 import { SchemaValidationError } from "@takeshape/errors";
-import isNull from "lodash/isNull.js";
+import { createAjv } from "@takeshape/json-schema";
+import { mergeWithArrayMerge } from "@takeshape/util";
 import isEqual from "lodash/isEqual.js";
-import { isEncryptedServiceConfig, isServiceAuthentication, isServiceResolver } from "../types/utils.js";
-import { createSchemaPropertyList, getGeneratorVersion, getServiceIdFieldName, getShapeDependencies, pathBetween } from "../schema-util.js";
+import isNull from "lodash/isNull.js";
 import { SERVICE_OBJECT_PATTERN_NAME } from "../constants.js";
+import { createSchemaPropertyList, getGeneratorVersion, getServiceIdFieldName, getShapeDependencies, pathBetween } from "../schema-util.js";
 import { latestSchemaJson } from "../schemas/index.js";
+import { isEncryptedServiceConfig, isServiceAuthentication, isServiceResolver } from "../types/utils.js";
 import { formatError } from "../validate.js";
 import { getStoredServiceConfig } from "./util.js";
 /**
@@ -58,7 +58,6 @@ export function validateServiceConfig(maybeServiceConfig) {
  * Prepare a `ServiceConfig` object update, validating the overall structure
  * and encrypting the `ServiceAuthentication` object.
  */
-// eslint-disable-next-line max-params
 export function prepareServiceUpdate(encryptFn, decryptFn, projectSchema, serviceConfigUpdate, serviceKey) {
     const storedServiceConfig = getStoredServiceConfig(projectSchema, serviceKey);
     let newServiceConfig = serviceConfigUpdate;
@@ -68,6 +67,7 @@ export function prepareServiceUpdate(encryptFn, decryptFn, projectSchema, servic
     }
     const { authentication, authenticationType } = newServiceConfig;
     if (authenticationType === "none" || isNull(authentication)) {
+        // biome-ignore lint/performance/noDelete: Property presence may matter here
         delete newServiceConfig.authentication;
     }
     else if (authentication !== undefined) {
@@ -92,15 +92,16 @@ export function prepareServiceUpdate(encryptFn, decryptFn, projectSchema, servic
     return serviceConfig;
 }
 export function getServiceObjectFields(projectSchema, shape, provider) {
-    return (getServiceInfo(projectSchema, shape)[provider] ?? []).filter(serviceInfo => serviceInfo.generators[SERVICE_OBJECT_PATTERN_NAME]);
+    return (getServiceInfo(projectSchema, shape)[provider] ?? []).filter((serviceInfo) => serviceInfo.generators[SERVICE_OBJECT_PATTERN_NAME]);
 }
 // Returns info for all services found in shape, keyed by provider
 export function getServiceInfo(projectSchema, shape) {
     const result = {};
     // Get inline dependencies by not following refs with @resolver
-    const inlineDepShapes = getShapeDependencies(projectSchema, shape, prop => !prop["@resolver"]).map(name => projectSchema.shapes[name]);
+    const inlineDepShapes = getShapeDependencies(projectSchema, shape, (prop) => !prop["@resolver"]).map((name) => projectSchema.shapes[name]);
     const shapesToCheck = [shape, ...inlineDepShapes];
-    shapesToCheck.forEach(thisShape => {
+    for (const thisShape of shapesToCheck) {
+        // biome-ignore lint/complexity/noForEach: Types for createSchemaPropertyList do not include the iterator
         createSchemaPropertyList(projectSchema, thisShape).forEach(([key, value]) => {
             const resolver = value["@resolver"];
             if (!isServiceResolver(resolver)) {
@@ -131,7 +132,7 @@ export function getServiceInfo(projectSchema, shape) {
             };
             if (Array.isArray(result[provider])) {
                 // Dedupe service info
-                if (!result[provider].find(existingServiceInfo => isEqual(existingServiceInfo, serviceInfo))) {
+                if (!result[provider].find((existingServiceInfo) => isEqual(existingServiceInfo, serviceInfo))) {
                     result[provider].push(serviceInfo);
                 }
             }
@@ -139,6 +140,6 @@ export function getServiceInfo(projectSchema, shape) {
                 result[provider] = [serviceInfo];
             }
         });
-    });
+    }
     return result;
 }

package/dist/esm/src/services/util.js

@@ -1,6 +1,6 @@
+import { isDefined } from '@takeshape/util';
 import isEmpty from 'lodash/isEmpty.js';
 import uniq from 'lodash/uniq.js';
-import { isDefined } from '@takeshape/util';
 /**
  * Get a service config from a project schema.
  */
@@ -18,12 +18,12 @@ export function getServiceNamespaces(context) {
     const namespaces = new Map();
     const { services } = context;
     if (services) {
-        Object.keys(services).forEach(serviceKey => {
+        for (const serviceKey of Object.keys(services)) {
             const namespace = services[serviceKey]?.namespace;
             if (namespace) {
                 namespaces.set(namespace, serviceKey);
             }
-        });
+        }
     }
     return namespaces;
 }
@@ -32,5 +32,5 @@ export function isMissingAuth(service) {
 }
 export function getResolverServices(resolver) {
     const resolverArray = 'compose' in resolver ? resolver.compose : [resolver];
-    return uniq(resolverArray.map(resolver => ('service' in resolver ? resolver.service : undefined)).filter(isDefined));
+    return uniq(resolverArray.map((resolver) => ('service' in resolver ? resolver.service : undefined)).filter(isDefined));
 }

package/dist/esm/src/template-shapes/templates.js

@@ -1,15 +1,15 @@
 import { deepClone, formatShapeName, isDefined, visit } from "@takeshape/util";
-import keyBy from "lodash/keyBy.js";
 import get from "lodash/get.js";
-import { createShape, getShapeDependencies } from "../schema-util.js";
-import { getFlattenedTemplateShapeName, getRef, getRefShapeName, refItemToAtRef, refItemToNamespacedShapeName } from "../refs.js";
-import { listTypePrefix } from "../migration/index.js";
-import { mergeObjectSchemas, mergeSchemaProperties } from "../util/merge.js";
+import keyBy from "lodash/keyBy.js";
 import { createInputSchema } from "../create-input-schema.js";
+import { listTypePrefix } from "../migration/index.js";
+import { getFlattenedTemplateShapeName, getRef, getRefShapeName, refItemToAtRef, refItemToNamespacedShapeName } from "../refs.js";
+import { createShape, getShapeDependencies } from "../schema-util.js";
 import { isCachedShape } from "../types/index.js";
-import { getWhereSearchArg } from "./where.js";
+import { mergeObjectSchemas, mergeSchemaProperties } from "../util/merge.js";
+import { getInputShapeName, getMutationInputShapeName } from "./names.js";
 import { TemplateVerbs } from "./types.js";
-import { getMutationInputShapeName, getInputShapeName } from "./names.js";
+import { getWhereSearchArg } from "./where.js";
 export const TSGetArgs = getIDQueryArgs("TSGetArgs");
 export const TSGetSingletonArgs = getIDQueryArgs("TSGetSingletonArgs");
 export const TSListArgs = getShapeListQueryArgs("TSListArgs", true);
@@ -112,7 +112,10 @@ export function getSearchResultsShape(context, shape) {
             [shapeName]: createShape(shapeName, {
                 type: "object",
                 properties: {
-                    results: { type: "array", items: { "@ref": `local:${shape.name}` } },
+                    results: {
+                        type: "array",
+                        items: { "@ref": `local:${shape.name}` }
+                    },
                     total: { type: "integer" }
                 },
                 required: ["results", "total"]
@@ -162,6 +165,7 @@ function rewriteRefs(context, shapeSchema, rewriteShapeName) {
                     ? refItemToAtRef(refItem)
                     : `local:${rewriteShapeName(refItemToNamespacedShapeName(refItem))}`;
                 if (value.$ref) {
+                    // biome-ignore lint/performance/noDelete: Property presence may matter here
                     delete value.$ref;
                 }
             }
@@ -206,7 +210,7 @@ export function getMutationArgs(templateName, verb) {
                 ...(verb !== TemplateVerbs.Delete &&
                     keyBy(getShapeDependencies(projectSchema, 
                     // get the shape dependencies of the shape with the @input swapped
-                    createShape(inputShape.name, rewrittenSchema), propSchema => {
+                    createShape(inputShape.name, rewrittenSchema), (propSchema) => {
                         if (propSchema["@resolver"]) {
                             return false;
                         }
@@ -216,7 +220,7 @@ export function getMutationArgs(templateName, verb) {
                         }
                         return true;
                     })
-                        .map(shapeName => {
+                        .map((shapeName) => {
                         const shape = projectSchema.shapes[shapeName];
                         if (!shape) {
                             return;
@@ -232,7 +236,9 @@ export function getMutationArgs(templateName, verb) {
 }
 export function getMutationResultType(verb) {
     return (context, shape) => {
-        const shapeName = formatShapeName([verb, shape.name, "result"], { shapeNameIndex: 1 });
+        const shapeName = formatShapeName([verb, shape.name, "result"], {
+            shapeNameIndex: 1
+        });
         const result = verb === TemplateVerbs.Delete ? { type: "boolean" } : { "@ref": `local:${shape.name}` };
         return {
             shapeName,
@@ -298,7 +304,7 @@ export function getShapeListQueryArgs(templateName, legacyArgs) {
         const isAllShapes = shape.name === "TSSearchable";
         const shapeName = isAllShapes ? templateName : getFlattenedTemplateShapeName(shape.name, templateName);
         const shapes = isAllShapes
-            ? Object.values(projectSchema.shapes).filter(s => s.model !== undefined || isCachedShape(s))
+            ? Object.values(projectSchema.shapes).filter((s) => s.model !== undefined || isCachedShape(s))
             : [shape];
         const { schema, dependencies } = getWhereSearchArg(projectSchema, shapes);
         return {

package/dist/esm/src/template-shapes/where.js

@@ -1,14 +1,14 @@
-import unset from "lodash/unset.js";
+import { formatShapeName, isDefined, pascalCase } from "@takeshape/util";
+import md5 from "blueimp-md5";
 import isFunction from "lodash/isFunction.js";
 import uniqBy from "lodash/uniqBy.js";
-import md5 from "blueimp-md5";
-import { pascalCase, isDefined, formatShapeName } from "@takeshape/util";
-import { createSchemaPropertyList, createShape, getAllRefsInShapes } from "../schema-util.js";
+import unset from "lodash/unset.js";
 import { workflowsEnabled } from "../api-version.js";
-import { followRef, getRef, getRefOrItemsRef, hasRefProperty, hasResolvableRef, refItemToShape, refItemToNamespacedShapeName } from "../refs.js";
-import { enumerateOneOfKeys, isUnionSchema } from "../unions.js";
+import { followRef, getRef, getRefOrItemsRef, hasRefProperty, hasResolvableRef, refItemToNamespacedShapeName, refItemToShape } from "../refs.js";
+import { getRelationship, getRelationshipShapes, isEqualRelationship } from "../relationships.js";
+import { createSchemaPropertyList, createShape, getAllRefsInShapes } from "../schema-util.js";
 import { isCachedShape, isObjectSchema, isPropertySchemaWithRelationship } from "../types/utils.js";
-import { isEqualRelationship, getRelationship, getRelationshipShapes } from "../relationships.js";
+import { enumerateOneOfKeys, isUnionSchema } from "../unions.js";
 export const MAX_RELATIONSHIP_DEPTH = 1;
 export const exceededRelationshipDepth = (depth = 0) => depth >= MAX_RELATIONSHIP_DEPTH;
 class ShapeCache {
@@ -44,9 +44,18 @@ export const fieldTypeComparison = {
     boolean: { comparators: ["eq"], type: "boolean" },
     string: { comparators: ["eq", "in", "match", "regexp"], type: "string" },
     date: { comparators: ["eq", "lt", "lte", "gt", "gte"], type: "string" },
-    number: { comparators: ["eq", "lt", "lte", "gt", "gte", "in"], type: "number" },
-    integer: { comparators: ["eq", "lt", "lte", "gt", "gte", "in"], type: "integer" },
-    workflow: { comparators: ["eq", "lt", "lte", "gt", "gte", "in"], type: "string" },
+    number: {
+        comparators: ["eq", "lt", "lte", "gt", "gte", "in"],
+        type: "number"
+    },
+    integer: {
+        comparators: ["eq", "lt", "lte", "gt", "gte", "in"],
+        type: "integer"
+    },
+    workflow: {
+        comparators: ["eq", "lt", "lte", "gt", "gte", "in"],
+        type: "string"
+    },
     draftjs: { comparators: ["match"], type: "string" },
     mdx: { comparators: ["match"], type: "string" }
 };
@@ -135,7 +144,7 @@ function truncateNames(names) {
  */
 function getRelationshipShapeName(refs) {
     return refs
-        .map(ref => {
+        .map((ref) => {
         const shapeName = ref.split(":")[1];
         return formatShapeName(shapeName);
     })
@@ -149,7 +158,7 @@ function getTypeName(name, prop, shapeName, context) {
     const { projectSchema, relationshipDepth, conflictingProperties } = context;
     let type = getPropType(projectSchema, name, prop);
     if (isId(name)) {
-        return `TSWhereID`;
+        return "TSWhereID";
     }
     const relationship = getRelationship(prop);
     if (relationship) {
@@ -162,7 +171,7 @@ function getTypeName(name, prop, shapeName, context) {
     }
     if (isUnionSchema(prop)) {
         if (prop.oneOf.length > 1) {
-            const shapeNames = truncateNames(joinShapeNames(enumerateOneOfKeys(projectSchema, prop.oneOf).map(child => child.shapeName)));
+            const shapeNames = truncateNames(joinShapeNames(enumerateOneOfKeys(projectSchema, prop.oneOf).map((child) => child.shapeName)));
             return `TSWhere${shapeNames}Union`;
         }
         type = "object";
@@ -254,7 +263,7 @@ export function getPropertyComparisonType(name, prop, shapeName, context) {
                 });
             }
             else if (isUnionSchema(propOrItems)) {
-                const shapes = enumerateOneOfKeys(projectSchema, propOrItems.oneOf).map(option => projectSchema.shapes[option.shapeName]);
+                const shapes = enumerateOneOfKeys(projectSchema, propOrItems.oneOf).map((option) => projectSchema.shapes[option.shapeName]);
                 props = getFields(typeName, shapes, {
                     ...context,
                     booleanOperators: false
@@ -347,7 +356,7 @@ function getReferencedShape(context) {
  * Expand union shapes
  */
 function expandUnionShapes(projectSchema, shapes) {
-    return uniqBy(shapes.flatMap(shape => isUnionSchema(shape.schema) ? shape.schema.oneOf.map(getReferencedShape(projectSchema)).filter(isDefined) : shape), "name");
+    return uniqBy(shapes.flatMap((shape) => isUnionSchema(shape.schema) ? shape.schema.oneOf.map(getReferencedShape(projectSchema)).filter(isDefined) : shape), "name");
 }
 export function getWhereShape(projectSchema, selectedShapes) {
     const shapeName = selectedShapes.length === 1 ? `TSWhere${pascalCase(selectedShapes[0].name)}Input` : "TSWhereInput";

package/dist/esm/src/types/utils.js

@@ -1,8 +1,8 @@
 import { isRecord } from "@takeshape/util";
+import has from "lodash/has.js";
+import isArray from "lodash/isArray.js";
 import isPlainObject from "lodash/isPlainObject.js";
 import isString from "lodash/isString.js";
-import isArray from "lodash/isArray.js";
-import has from "lodash/has.js";
 import isUndefined from "lodash/isUndefined.js";
 import { latestSchemaJson } from "../schemas/index.js";
 import { ArgsType, RefType } from "./types.js";
@@ -57,7 +57,7 @@ export function containsResolver(resolver, predicate) {
     if (isBasicResolver(resolver)) {
         return predicate(resolver);
     }
-    return Boolean(resolver.compose.find(resolver => containsResolver(resolver, predicate)));
+    return Boolean(resolver.compose.find((resolver) => containsResolver(resolver, predicate)));
 }
 /** Directive Mapping Utils **/
 /**

package/dist/esm/src/unions.js

@@ -1,10 +1,10 @@
+import { BadDataError } from "@takeshape/errors";
 import { camelCase, isRecord } from "@takeshape/util";
 import omit from "lodash/omit.js";
-import { BadDataError } from "@takeshape/errors";
 import { getRef, refItemToNamespacedShapeName } from "./refs.js";
+import { getOutputShapeName } from "./template-shapes/names.js";
 import { isRefSchema } from "./types/utils.js";
 import { getShapeById } from "./util/shapes.js";
-import { getOutputShapeName } from "./template-shapes/names.js";
 export function enumerateOneOfKeys(projectSchema, oneOf) {
     const result = [];
     for (const child of oneOf) {
@@ -41,15 +41,14 @@ export function oneOfToObject(projectSchema, schema) {
     return { ...omit(schema, "oneOf"), type: "object", properties };
 }
 function formatKeys(keys) {
-    return keys.map(k => `"${k}"`).join(", ");
+    return keys.map((k) => `"${k}"`).join(", ");
 }
-// eslint-disable-next-line max-params
-export const createUnwrapTransform = projectSchema => (obj, schema, name, shape, next) => {
+export const createUnwrapTransform = (projectSchema) => (obj, schema, name, shape, next) => {
     if (isRecord(obj)) {
         const oneOfKeys = enumerateOneOfKeys(projectSchema, getOneOf(schema));
         const objectKeys = Object.keys(obj);
         if (objectKeys.length !== 1) {
-            const propNames = oneOfKeys.map(k => k.propName);
+            const propNames = oneOfKeys.map((k) => k.propName);
             throw new BadDataError(`Object should only specify one of the following keys: ${formatKeys(propNames)}, but found keys: ${formatKeys(objectKeys)}`);
         }
         for (const { propName, shapeId, propSchema } of oneOfKeys) {
@@ -66,8 +65,7 @@ export const createUnwrapTransform = projectSchema => (obj, schema, name, shape,
         }
     }
 };
-// eslint-disable-next-line max-params
-export const createWrapTransform = projectSchema => (obj, schema, name, shape, next) => {
+export const createWrapTransform = (projectSchema) => (obj, schema, name, shape, next) => {
     if (isRecord(obj) && typeof obj._shapeId === "string") {
         const shape = getShapeById(projectSchema, obj._shapeId);
         if (shape) {