@takeshape/schema 10.4.9 → 10.6.1

package/dist/unions.js

@@ -9,12 +9,12 @@ exports.isUnionSchema = isUnionSchema;
 exports.oneOfToObject = oneOfToObject;
 exports.transformOneOf = transformOneOf;
 exports.wrapOneOfObjects = exports.unwrapOneOfObjects = void 0;
-var _refs = require("./refs");
 var _util = require("@takeshape/util");
 var _omit = _interopRequireDefault(require("lodash/omit"));
+var _errors = require("@takeshape/errors");
+var _refs = require("./refs");
 var _contentSchemaTransform = require("./content-schema-transform");
 var _utils = require("./types/utils");
-var _errors = require("@takeshape/errors");
 var _schemaUtil = require("./schema-util");
 var _templates = require("./template-shapes/templates");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/util/api-indexing.d.ts

@@ -1,5 +1,5 @@
-import type { ShapeLoaders, ProjectSchemaJSON } from '../project-schema';
 import type { Maybe } from '@takeshape/util';
+import type { ShapeLoaders, ProjectSchemaJSON } from '../project-schema';
 import type { GetQueryIndexingConfig, ListQueryIndexingConfig } from '../types';
 export declare function serviceHasIndexedShapes(schema: ProjectSchemaJSON, serviceId: string): boolean;
 export declare function getIndexedServices(projectSchema: ProjectSchemaJSON, configs: ShapeLoaders[keyof ShapeLoaders]): string[];

package/dist/util/api-indexing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-indexing.d.ts","sourceRoot":"","sources":["../../../src/util/api-indexing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EAGlB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAC,sBAAsB,EAAE,uBAAuB,EAAC,MAAM,UAAU,CAAC;AAO9E,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAgB7F;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM,YAAY,CAAC,YAM7G;AAoBD,KAAK,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC,CAAC;AA4BtF,eAAO,MAAM,wBAAwB,mCAAoC,CAAC;AAC1E,eAAO,MAAM,sBAAsB,uCAAmC,CAAC"}
+{"version":3,"file":"api-indexing.d.ts","sourceRoot":"","sources":["../../../src/util/api-indexing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAE3C,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EAGlB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAC,sBAAsB,EAAE,uBAAuB,EAAC,MAAM,UAAU,CAAC;AAM9E,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAgB7F;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM,YAAY,CAAC,YAM7G;AAoBD,KAAK,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC,CAAC;AA4BtF,eAAO,MAAM,wBAAwB,mCAAoC,CAAC;AAC1E,eAAO,MAAM,sBAAsB,uCAAmC,CAAC"}

package/dist/util/api-indexing.js

@@ -7,8 +7,8 @@ exports.getGetQueryIndexConfig = void 0;
 exports.getIndexedServices = getIndexedServices;
 exports.getListQueryIndexConfigs = void 0;
 exports.serviceHasIndexedShapes = serviceHasIndexedShapes;
-var _types = require("../types");
 var _util = require("@takeshape/util");
+var _types = require("../types");
 var _services = require("../services");
 var _schemaUtil = require("../schema-util");
 var _refs = require("../refs");

package/dist/util/detect-cycles.d.ts

@@ -1,4 +1,4 @@
-import { ProjectSchemaJSON, PropertySchema } from '../project-schema';
+import { type ProjectSchemaJSON, type PropertySchema } from '../project-schema';
 type SchemaPredicate = (projectSchema: ProjectSchemaJSON, propSchema: PropertySchema, shapeName?: string, propName?: string) => boolean;
 /**
  * Use a basic depth-first search to determine whether a schema contains a cycle

package/dist/util/detect-cycles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detect-cycles.d.ts","sourceRoot":"","sources":["../../../src/util/detect-cycles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAUpE,KAAK,eAAe,GAAG,CACrB,aAAa,EAAE,iBAAiB,EAChC,UAAU,EAAE,cAAc,EAC1B,SAAS,CAAC,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC;AAEb;;GAEG;AACH,wBAAgB,QAAQ,CACtB,aAAa,EAAE,iBAAiB,EAChC,MAAM,EAAE,cAAc,EACtB,SAAS,GAAE,eAA6B,GACvC,OAAO,CAiDT"}
+{"version":3,"file":"detect-cycles.d.ts","sourceRoot":"","sources":["../../../src/util/detect-cycles.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAS9E,KAAK,eAAe,GAAG,CACrB,aAAa,EAAE,iBAAiB,EAChC,UAAU,EAAE,cAAc,EAC1B,SAAS,CAAC,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC;AAEb;;GAEG;AACH,wBAAgB,QAAQ,CACtB,aAAa,EAAE,iBAAiB,EAChC,MAAM,EAAE,cAAc,EACtB,SAAS,GAAE,eAA6B,GACvC,OAAO,CAiDT"}

package/dist/util/detect-cycles.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.hasCycle = hasCycle;
-var _refs = require("../refs");
 var _util = require("@takeshape/util");
+var _refs = require("../refs");
 function immutableSetAdd(set, str) {
   const result = new Set(set);
   result.add(str);

package/dist/util/find-shape-at-path.d.ts

@@ -1,4 +1,4 @@
-import { ProjectSchemaJSON, PropertySchema, ShapeJSON } from '../project-schema';
+import { type ProjectSchemaJSON, type PropertySchema, type ShapeJSON } from '../project-schema';
 /**
  *
  * @param projectSchema

package/dist/util/find-shape-at-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-shape-at-path.d.ts","sourceRoot":"","sources":["../../../src/util/find-shape-at-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,cAAc,EAAE,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAI/E;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,iBAAiB,EAChC,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,MAAM,EAAE,GAClB,cAAc,GAAG,SAAS,CA8B5B;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,aAAa,EAAE,iBAAiB,EAChC,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,MAAM,EAAE,GAClB,SAAS,GAAG,SAAS,CAMvB"}
+{"version":3,"file":"find-shape-at-path.d.ts","sourceRoot":"","sources":["../../../src/util/find-shape-at-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAAE,KAAK,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAI9F;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,iBAAiB,EAChC,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,MAAM,EAAE,GAClB,cAAc,GAAG,SAAS,CA8B5B;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,aAAa,EAAE,iBAAiB,EAChC,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,MAAM,EAAE,GAClB,SAAS,GAAG,SAAS,CAMvB"}

package/dist/util/form-config.d.ts

@@ -1,6 +1,5 @@
-import type { FormConfig, FormMap } from '../project-schema';
-import { Maybe } from '@takeshape/util';
-import { ProjectSchemaJSON } from '../project-schema';
+import { type Maybe } from '@takeshape/util';
+import { type FormConfig, type FormMap, type ProjectSchemaJSON } from '../project-schema';
 /**
  * If there any non-normal (nested) forms in the schema, create forms for referenced shapes.
  * The original forms are left intact.

package/dist/util/form-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-config.d.ts","sourceRoot":"","sources":["../../../src/util/form-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAE,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAY,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAIpD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAmDxE;AAID;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,iBAAiB,EAChC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,KAAK,CAAC,UAAU,CAAC,CAYnB"}
+{"version":3,"file":"form-config.d.ts","sourceRoot":"","sources":["../../../src/util/form-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAC,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,KAAK,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAIxF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CA+CxE;AAID;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,iBAAiB,EAChC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,KAAK,CAAC,UAAU,CAAC,CAYnB"}

package/dist/util/form-config.js

@@ -20,11 +20,9 @@ function normalizeForms(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)
-        };
-      }
+      normalizedForms[shapeName] ||= {
+        default: (0, _util.deepClone)(formConfig)
+      };
 
       // Remove prop now that it has been normalized
       // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
@@ -58,9 +56,7 @@ function normalizeForms(projectSchema) {
       normalizeNested(shapeName, forms[shapeName].default);
 
       // copy forms with no changes
-      if (!normalizedForms[shapeName]) {
-        normalizedForms[shapeName] = forms[shapeName];
-      }
+      normalizedForms[shapeName] ||= forms[shapeName];
     }
   }
   return normalizedForms;

package/dist/util/get-conflicting-properties.d.ts

@@ -1,5 +1,5 @@
-import { ShapeJSON } from '../project-schema';
-import { ServicesShapesContext } from '../refs';
+import { type ShapeJSON } from '../project-schema';
+import { type ServicesShapesContext } from '../refs';
 /**
  * Given a list of shapes find the conflicting props
  */

package/dist/util/get-conflicting-properties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-conflicting-properties.d.ts","sourceRoot":"","sources":["../../../src/util/get-conflicting-properties.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAA6D,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAsB1G;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAoCzG"}
+{"version":3,"file":"get-conflicting-properties.d.ts","sourceRoot":"","sources":["../../../src/util/get-conflicting-properties.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,KAAK,SAAS,EAAC,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAkE,KAAK,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAqBpH;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAoCzG"}

package/dist/util/get-conflicting-properties.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getConflictingProperties = getConflictingProperties;
-var _refs = require("../refs");
 var _util = require("@takeshape/util");
+var _refs = require("../refs");
 var _types = require("../types");
 /**
  * Normalize ref, oneOf and array schemas and get a list of @ref expressions

package/dist/util/get-return-shape.d.ts

@@ -1,5 +1,5 @@
-import { ProjectSchemaJSON, PropertySchema, QueryJSON, ShapeJSON } from '../project-schema';
-import { ServicesShapesContext } from '../refs';
+import { type ProjectSchemaJSON, type PropertySchema, type QueryJSON, type ShapeJSON } from '../project-schema';
+import { type ServicesShapesContext } from '../refs';
 export declare function getReturnShapeRef(context: ServicesShapesContext, propOrQuery: PropertySchema | QueryJSON): import("@takeshape/util").Maybe<import("../refs").RefItem>;
 export declare function getReturnShape(projectSchema: ProjectSchemaJSON, propOrQuery: PropertySchema | QueryJSON): ShapeJSON | undefined;
 //# sourceMappingURL=get-return-shape.d.ts.map

package/dist/util/get-return-shape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-return-shape.d.ts","sourceRoot":"","sources":["../../../src/util/get-return-shape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAC1F,OAAO,EAA2C,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAwBxF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,cAAc,GAAG,SAAS,8DAExG;AAGD,wBAAgB,cAAc,CAC5B,aAAa,EAAE,iBAAiB,EAChC,WAAW,EAAE,cAAc,GAAG,SAAS,GACtC,SAAS,GAAG,SAAS,CAQvB"}
+{"version":3,"file":"get-return-shape.d.ts","sourceRoot":"","sources":["../../../src/util/get-return-shape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAC9G,OAAO,EAA2C,KAAK,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAwB7F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,cAAc,GAAG,SAAS,8DAExG;AAGD,wBAAgB,cAAc,CAC5B,aAAa,EAAE,iBAAiB,EAChC,WAAW,EAAE,cAAc,GAAG,SAAS,GACtC,SAAS,GAAG,SAAS,CAQvB"}

package/dist/util/has-arg.d.ts

@@ -1,5 +1,5 @@
-import { Args, ProjectSchemaJSON } from '../project-schema';
-import { SchemaWithArgs } from '../types';
+import { type Args, type ProjectSchemaJSON } from '../project-schema';
+import { type SchemaWithArgs } from '../types';
 export declare function getArgs(prop: SchemaWithArgs): Args | undefined;
 export declare function hasArg(projectSchema: ProjectSchemaJSON, prop: SchemaWithArgs, argPath: string | string[]): boolean;
 //# sourceMappingURL=has-arg.d.ts.map

package/dist/util/has-arg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"has-arg.d.ts","sourceRoot":"","sources":["../../../src/util/has-arg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAC,cAAc,EAAC,MAAM,UAAU,CAAC;AAExC,wBAAgB,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAE9D;AAED,wBAAgB,MAAM,CAAC,aAAa,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAWlH"}
+{"version":3,"file":"has-arg.d.ts","sourceRoot":"","sources":["../../../src/util/has-arg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,IAAI,EAAE,KAAK,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAC,KAAK,cAAc,EAAC,MAAM,UAAU,CAAC;AAG7C,wBAAgB,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAE9D;AAED,wBAAgB,MAAM,CAAC,aAAa,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAWlH"}

package/dist/util/merge.d.ts

@@ -1,4 +1,4 @@
-import { FormConfig, ObjectSchema, ProjectSchemaJSON } from '../project-schema';
+import { type FormConfig, type ObjectSchema, type ProjectSchemaJSON } from '../project-schema';
 export declare function mergeObjectSchemas(...args: Array<ObjectSchema | undefined>): ObjectSchema;
 export declare function mergeSchemaProperties(parent: ObjectSchema, overrides: ObjectSchema): ObjectSchema;
 export declare function rebaseSchemaProperties(base: ObjectSchema, parent: ObjectSchema, head: ObjectSchema): ObjectSchema;

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,EAAE,iBAAiB,EAAY,MAAM,mBAAmB,CAAC;AAazF,wBAAgB,kBAAkB,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,YAAY,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,YAAY,CAgBjG;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,GAAG,YAAY,CAiBjH;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,UAAU,CAezF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAgBvG;AAED,wBAAgB,gBAAgB,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAErE;AAmLD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,iBAAiB,GACtB;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,SAAS,CAAA;CAAC,GAAG;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,iBAAiB,CAAA;CAAC,CAwChG"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/util/merge.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAiB,MAAM,mBAAmB,CAAC;AAE7G,wBAAgB,kBAAkB,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,YAAY,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,YAAY,CAgBjG;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,GAAG,YAAY,CAiBjH;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,UAAU,CAezF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAgBvG;AAED,wBAAgB,gBAAgB,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAErE;AAiLD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,iBAAiB,GACtB;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,SAAS,CAAA;CAAC,GAAG;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,iBAAiB,CAAA;CAAC,CAwChG"}

package/dist/util/merge.js

@@ -18,9 +18,9 @@ var _unset = _interopRequireDefault(require("lodash/unset"));
 var _set = _interopRequireDefault(require("lodash/set"));
 var _last = _interopRequireDefault(require("lodash/last"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
-var _types = require("../types");
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
 var _pickBy = _interopRequireDefault(require("lodash/pickBy"));
+var _types = require("../types");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function mergeObjectSchemas(...args) {
   return args.filter(_util.isDefined).reduce(mergeSchemaProperties, {
@@ -153,7 +153,7 @@ function compareSection(section, original, updated) {
   return changes;
 }
 function compareSections(parent, branch) {
-  return mergeableSections.flatMap(section => parent[section] || branch[section] ? compareSection(section, parent[section] ?? {}, branch[section] ?? {}) : []);
+  return mergeableSections.flatMap(section => parent[section] ?? branch[section] ? compareSection(section, parent[section] ?? {}, branch[section] ?? {}) : []);
 }
 function findChangedShape(schema, change) {
   return schema.shapes[change.path[1]];
@@ -205,9 +205,7 @@ function attemptToMerge(base, parent, head, change) {
           mergedObjSchema = rebaseSchemaProperties(toObj, baseObj, fromObj);
         }
       }
-      if (!mergedObjSchema) {
-        mergedObjSchema = mergeSchemaProperties(toObj, fromObj);
-      }
+      mergedObjSchema ||= mergeSchemaProperties(toObj, fromObj);
       return {
         ...rebaseShapeProperties(toShape, fromShape, baseShape),
         schema: {

package/dist/util/patch-schema.d.ts

@@ -1,5 +1,5 @@
-import { ProjectSchemaJSON } from '../project-schema';
-import { ProjectSchemaUpdate } from '../migration/types';
+import { type ProjectSchemaJSON } from '../project-schema';
+import { type ProjectSchemaUpdate } from '../migration/types';
 export declare function shallowMerge<T>(original: Record<string, T> | undefined, update: Record<string, T | null> | undefined): Record<string, T>;
 /**
  * Apply a schema update to a schema.

package/dist/util/patch-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"patch-schema.d.ts","sourceRoot":"","sources":["../../../src/util/patch-schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAKvD,wBAAgB,YAAY,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,EACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,SAAS,GAC3C,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAenB;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,iBAAiB,EAAE,aAAa,EAAE,CAAC,EAAE,MAAM,EAAE,mBAAmB,GAAG,CAAC,CAczG"}
+{"version":3,"file":"patch-schema.d.ts","sourceRoot":"","sources":["../../../src/util/patch-schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,KAAK,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAC,KAAK,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAI5D,wBAAgB,YAAY,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,EACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,SAAS,GAC3C,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAenB;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,iBAAiB,EAAE,aAAa,EAAE,CAAC,EAAE,MAAM,EAAE,mBAAmB,GAAG,CAAC,CAczG"}

package/dist/validate.d.ts

@@ -1,10 +1,10 @@
 import type { ErrorObject } from 'ajv';
-import type { RoleImport, RoleInput } from './auth-schemas';
-import type { ProjectSchemaImport, LayerState } from './types/types';
+import { type SchemaValidationErrorItem } from '@takeshape/errors';
+import { type Entitlements } from '@takeshape/util';
+import { type SetRequired } from 'type-fest';
 import type { AnyProjectSchemaJSON, ProjectSchemaJSON } from './project-schema';
-import { SchemaValidationErrorItem } from '@takeshape/errors';
-import { Entitlements } from '@takeshape/util';
-import { SetRequired } from 'type-fest';
+import type { ProjectSchemaImport, LayerState } from './types/types';
+import type { RoleImport, RoleInput } from './auth-schemas';
 export type SchemaValidationResult = {
     valid: true;
     schema: AnyProjectSchemaJSON;
@@ -15,22 +15,22 @@ export type SchemaValidationResult = {
     errors: SchemaValidationErrorItem[];
 };
 export declare function formatError(error: ErrorObject): SchemaValidationErrorItem;
-export interface Validation {
+export type Validation = {
     version: string;
     schemaId: string;
     isVersion: (schemaVersion?: string) => boolean;
     validate: (schema: unknown, options?: ValidateSyntaxOptions) => SchemaValidationResult;
-}
-export interface ValidateSyntaxOptions {
+};
+export type ValidateSyntaxOptions = {
     suppressErrorPaths?: string[];
     resolveLayer?: ResolveLayer;
-}
+};
 export type ResolveLayer = (layerId: string) => Promise<LayerState>;
-export interface ValidateContext extends ValidateSyntaxOptions {
+export type ValidateContext = {
     resolveLayer?: ResolveLayer;
     allowDisconnectedLayers?: boolean;
     entitlements: Entitlements;
-}
+} & ValidateSyntaxOptions;
 export type ValidateReferencesContext = SetRequired<ValidateContext, 'resolveLayer'>;
 export declare function validateSchemaSyntax(obj: unknown, options?: ValidateSyntaxOptions): SchemaValidationResult;
 /**

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,EAAC,mBAAmB,EAAE,UAAU,EAAc,MAAM,eAAe,CAAC;AAChF,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EAYlB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AA+BnF,OAAO,EAEL,YAAY,EAKb,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AA82BtC,MAAM,MAAM,sBAAsB,GAC9B;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,oBAAoB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC9D;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,qBAAqB,KAAK,sBAAsB,CAAC;CACxF;AACD,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;AAEpE,MAAM,WAAW,eAAgB,SAAQ,qBAAqB;IAC5D,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,MAAM,yBAAyB,GAAG,WAAW,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;AAmHrF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,qBAA0B,GAAG,sBAAsB,CAW9G;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAgC5G;AAED,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,OAAO,GAAG,iBAAiB,CAgB7E;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,OAAO,GAAG,SAAS,CAQpE;AAgBD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,CAQrE;AAED,MAAM,MAAM,mCAAmC,GAC3C;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC7D;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,yBAAyB,EAAE,CAAA;CAAC,CAAC;AAE3E;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,mCAAmC,CAIrG;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,OAAO,GAAG,mBAAmB,CAQxF"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,WAAW,EAAC,MAAM,KAAK,CAAC;AAGvD,OAAO,EAAwB,KAAK,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AAKxF,OAAO,EAEL,KAAK,YAAY,EAKlB,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAC,KAAK,WAAW,EAAC,MAAM,WAAW,CAAC;AA6B3C,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EAYlB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAC,mBAAmB,EAAE,UAAU,EAAc,MAAM,eAAe,CAAC;AAChF,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AA82B1D,MAAM,MAAM,sBAAsB,GAC9B;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,oBAAoB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC9D;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,MAAM,UAAU,GAAG;IACvB,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,qBAAqB,KAAK,sBAAsB,CAAC;CACxF,CAAC;AACF,MAAM,MAAM,qBAAqB,GAAG;IAClC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;AAEpE,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,YAAY,EAAE,YAAY,CAAC;CAC5B,GAAG,qBAAqB,CAAC;AAE1B,MAAM,MAAM,yBAAyB,GAAG,WAAW,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;AAmHrF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,qBAA0B,GAAG,sBAAsB,CAW9G;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAgC5G;AAED,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,OAAO,GAAG,iBAAiB,CAgB7E;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,OAAO,GAAG,SAAS,CAQpE;AAgBD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,CAQrE;AAED,MAAM,MAAM,mCAAmC,GAC3C;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC7D;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,yBAAyB,EAAE,CAAA;CAAC,CAAC;AAE3E;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,mCAAmC,CAIrG;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,OAAO,GAAG,mBAAmB,CAQxF"}

package/dist/validate.js

@@ -11,7 +11,6 @@ exports.validateProjectSchemaImport = validateProjectSchemaImport;
 exports.validateRoleInput = validateRoleInput;
 exports.validateSchema = validateSchema;
 exports.validateSchemaSyntax = validateSchemaSyntax;
-var _types = require("./types/types");
 var _jsonpathPlus = require("jsonpath-plus");
 var _jsonSchema = require("@takeshape/json-schema");
 var _errors = require("@takeshape/errors");
@@ -19,6 +18,16 @@ var _coerce = _interopRequireDefault(require("semver/functions/coerce"));
 var _neq = _interopRequireDefault(require("semver/functions/neq"));
 var _lt = _interopRequireDefault(require("semver/functions/lt"));
 var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
+var _util = require("@takeshape/util");
+var _uniqBy = _interopRequireDefault(require("lodash/uniqBy"));
+var _initial = _interopRequireDefault(require("lodash/initial"));
+var _last = _interopRequireDefault(require("lodash/last"));
+var _get = _interopRequireDefault(require("lodash/get"));
+var _size = _interopRequireDefault(require("lodash/size"));
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+var _pick = _interopRequireDefault(require("lodash/pick"));
+var _pMap = _interopRequireDefault(require("p-map"));
+var _lodash = require("lodash");
 var _versions = require("./versions");
 var _workflows = require("./workflows");
 var _schemas = require("./schemas");
@@ -31,17 +40,8 @@ var _refs = require("./refs");
 var _scalars = require("./scalars");
 var _unions = require("./unions");
 var _enum = require("./enum");
-var _util = require("@takeshape/util");
-var _uniqBy = _interopRequireDefault(require("lodash/uniqBy"));
-var _initial = _interopRequireDefault(require("lodash/initial"));
-var _last = _interopRequireDefault(require("lodash/last"));
 var _relationships = require("./relationships");
-var _get = _interopRequireDefault(require("lodash/get"));
-var _size = _interopRequireDefault(require("lodash/size"));
-var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
-var _pick = _interopRequireDefault(require("lodash/pick"));
-var _pMap = _interopRequireDefault(require("p-map"));
-var _lodash = require("lodash");
+var _types = require("./types/types");
 var _projectSchema = require("./project-schema");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const builtInShapeNames = new Set([...Object.keys(_builtinSchema.builtInShapes), ..._scalars.scalars, 'object']);
@@ -147,8 +147,6 @@ function enumerateBasicResolvers(resolver, path) {
   visit(resolver, path);
   return results;
 }
-
-// eslint-disable-next-line complexity
 function validateResolver(projectSchema, basePath, baseResolver) {
   const errors = [];
   const isValidShapeName = shapeName => {
@@ -199,6 +197,7 @@ function validateResolver(projectSchema, basePath, baseResolver) {
         const parsed = (0, _refs.parsePropertyRef)(resolver.to);
         if (parsed) {
           const error = delegateResolverMissingConfig(parsed, resolver);
+          // eslint-disable-next-line max-depth
           if (error) {
             errors.push(error);
           }

package/dist/workflows.d.ts

@@ -1,10 +1,10 @@
-import { ProjectSchemaJSON, PropertySchema, Workflow, WorkflowMap, WorkflowStep, ShapeJSON } from './project-schema';
+import { type ProjectSchemaJSON, type PropertySchema, type Workflow, type WorkflowMap, type WorkflowStep, type ShapeJSON } from './project-schema';
 export declare const defaultWorkflow: Workflow;
 export declare function getWorkflow(projectSchema: ProjectSchemaJSON, shapeId: string): Workflow;
-export interface StepContext {
+export type StepContext = {
     index: number;
     step: WorkflowStep;
-}
+};
 export declare function statusFallback(workflow: Workflow, enabled: boolean): WorkflowStep;
 export declare function findWorkflowStep(workflow: Workflow, keyOrName: string): StepContext | undefined;
 export declare function getStatusField(workflows: WorkflowMap, shape: Pick<ShapeJSON, 'workflow'>): PropertySchema;

package/dist/workflows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflows.d.ts","sourceRoot":"","sources":["../../src/workflows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAGnH,eAAO,MAAM,eAAe,EAAE,QAmB7B,CAAC;AAEF,wBAAgB,WAAW,CAAC,aAAa,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,GAAG,QAAQ,CAQvF;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,GAAG,YAAY,CAEjF;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAG/F;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,cAAc,CAOzG;AAED,MAAM,MAAM,6BAA6B,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;AAEtF,wBAAgB,YAAY,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,6BAA6B,GAAG,YAAY,EAAE,CASpH;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,6BAA6B,GAAG,MAAM,EAAE,CAQpH;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,EAAE,CAE5D"}
+{"version":3,"file":"workflows.d.ts","sourceRoot":"","sources":["../../src/workflows.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,SAAS,EACf,MAAM,kBAAkB,CAAC;AAG1B,eAAO,MAAM,eAAe,EAAE,QAmB7B,CAAC;AAEF,wBAAgB,WAAW,CAAC,aAAa,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,GAAG,QAAQ,CAQvF;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,GAAG,YAAY,CAEjF;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAG/F;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,cAAc,CAYzG;AAED,MAAM,MAAM,6BAA6B,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;AAEtF,wBAAgB,YAAY,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,6BAA6B,GAAG,YAAY,EAAE,CASpH;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,6BAA6B,GAAG,MAAM,EAAE,CAQpH;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,EAAE,CAE5D"}

package/dist/workflows.js

@@ -47,7 +47,10 @@ function findWorkflowStep(workflow, keyOrName) {
   };
 }
 function getStatusField(workflows, shape) {
-  const workflow = shape.workflow && workflows[shape.workflow] || defaultWorkflow;
+  let workflow = defaultWorkflow;
+  if (shape.workflow && workflows[shape.workflow]) {
+    workflow = workflows[shape.workflow];
+  }
   return {
     type: 'string',
     title: 'Status',

package/es/content-schema-transform.js

@@ -39,7 +39,7 @@ export function preferSourceKey(name, schema) {
 }
 export function findTransforms(pluginMap, schema, name, shape) {
   const type = getType(schema);
-  if (pluginMap && (pluginMap[type] || pluginMap['*'])) {
+  if (pluginMap && (pluginMap[type] ?? pluginMap['*'])) {
     const plugins = (pluginMap[type] ?? []).concat(pluginMap['*'] ?? []);
     return plugins.find(plugin => plugin.filter(schema, name, shape));
   }

package/es/enum.js

@@ -3,7 +3,7 @@ export function isEnumLikeSchema(schema) {
     return true;
   }
   if (schema.oneOf) {
-    return schema.oneOf.every(optionSchema => optionSchema.title !== undefined && (optionSchema.enum || optionSchema.const));
+    return schema.oneOf.every(optionSchema => optionSchema.title !== undefined && (optionSchema.enum ?? optionSchema.const));
   }
   return false;
 }

package/es/flatten-templates.js

@@ -1,7 +1,7 @@
-import { resolveTemplate, isValidTemplate } from './template-shapes';
-import { getAllRefs } from './schema-util';
 import set from 'lodash/set';
 import { deepClone } from '@takeshape/util';
+import { resolveTemplate, isValidTemplate } from './template-shapes';
+import { getAllRefs } from './schema-util';
 import { refItemToNamespacedShapeName } from './refs';
 export function flattenTemplates(projectSchema) {
   const templateRefs = getAllRefs(projectSchema, ref => Boolean(ref.template));

package/es/get-is-leaf.js

@@ -11,7 +11,7 @@ function isLeafTypeV3(projectSchema, propertySchema) {
   // If is not a structure, then is a leaf
   !['object', 'array'].includes(type) ||
   // If is relationship, then is a leaf
-  isPropertySchemaWithRelationship(propertySchema['@output'] ?? propertySchema) || propertySchema['@tag'] && scalarTags.has(propertySchema['@tag']) ||
+  isPropertySchemaWithRelationship(propertySchema['@output'] ?? propertySchema) || Boolean(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/index.js

@@ -9,12 +9,11 @@ export * from './services';
 export * from './template-shapes';
 export * from './taxonomies';
 export * from './workflows';
-export * from './builtin-schema';
 export * from './auth-schemas';
 export * from './api-version';
 export * from './migration';
 export * from './validate';
-export { builtInShapes } from './builtin-schema';
+export * from './builtin-schema';
 export * from './versions';
 export * from './mocks';
 export * from './util';
@@ -29,4 +28,5 @@ export * from './flatten-templates';
 export * from './relationships';
 export * from './create-input-schema';
 export * from './schema-transform';
-export * from './interfaces';
+export * from './interfaces';
+export {};

package/es/interfaces.js

@@ -1,7 +1,7 @@
-import { getRef, refItemToShape, refItemToNamespacedShapeName, normalizeRefExpression, shapeToRefItem, refExpressionToRefItem } from './refs';
 import mapValues from 'lodash/mapValues';
-import { isUnionSchema } from './unions';
 import { isDefined } from '@takeshape/util';
+import { getRef, refItemToShape, refItemToNamespacedShapeName, normalizeRefExpression, shapeToRefItem, refExpressionToRefItem } from './refs';
+import { isUnionSchema } from './unions';
 export function isInterfaceShape(shape) {
   return shape?.type === 'interface';
 }

package/es/layers/layers.js

@@ -1,11 +1,11 @@
 import minimatch from 'minimatch';
 import { deepClone, isDefined, isRecord } from '@takeshape/util';
 import uniq from 'lodash/uniq';
+import set from 'lodash/set';
+import { parseTemplateShape } from '../refs';
 import { getArgsReferenceWithPath, getRefOrItemsRef, dereferenceSchema, parseReturnShape, refItemToString, splitAtRef } from './refs';
 import { isAllOfSchema, isObjectSchema, isOneOfSchema, isRefSchema } from './type-utils';
 import { visitSchemaProperties } from './visitor';
-import set from 'lodash/set';
-import { parseTemplateShape } from '../refs';
 const layerDefaults = {
   namespace: '',
   visibility: []
@@ -181,9 +181,7 @@ function collectServiceRefs(flattenedSchema, getLayer) {
   return refs;
 }
 function ensureServiceLayer(flattenedSchema, layerId) {
-  if (!flattenedSchema.serviceLayers) {
-    flattenedSchema.serviceLayers = {};
-  }
+  flattenedSchema.serviceLayers ||= {};
   let serviceLayer = flattenedSchema.serviceLayers[layerId];
   if (!serviceLayer) {
     serviceLayer = {
@@ -304,9 +302,7 @@ export function flattenSchema(projectSchema, getLayer) {
       const shape = getLayer(layerId)?.shapes?.[shapeName];
       if (shape) {
         const serviceLayer = ensureServiceLayer(flattenedSchema, layerId);
-        if (!serviceLayer.shapes) {
-          serviceLayer.shapes = {};
-        }
+        serviceLayer.shapes ||= {};
         serviceLayer.shapes[shapeName] = shape;
       }
     }

package/es/layers/refs.js

@@ -1,9 +1,9 @@
-import { isAllOfSchema, isOneOfSchema, isRefSchema } from './type-utils';
-import { parseTemplateShape } from '../refs';
 import assign from 'lodash/fp/assign';
 import omit from 'lodash/fp/omit';
 import { mergeWithArrayConcat } from '@takeshape/util';
 import isEmpty from 'lodash/isEmpty';
+import { parseTemplateShape } from '../refs';
+import { isAllOfSchema, isOneOfSchema, isRefSchema } from './type-utils';
 
 /**
  * This interface describes a parsed `@ref` or `$ref`.

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

@@ -13,7 +13,7 @@ function isColor(schema) {
     type,
     properties
   } = schema;
-  return Boolean(type === 'object' && properties && properties.hsl && properties.hsv && properties.rgb && properties.hex);
+  return Boolean(type === 'object' && properties?.hsl && properties.hsv && properties.rgb && properties.hex);
 }
 function getModelType(contentType) {
   if (contentType.single) {

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

@@ -60,18 +60,16 @@ const migrate = async (_, projectSchema) => {
   if (indexedShapes) {
     for (const [name, config] of Object.entries(indexedShapes)) {
       let shape = updatedShapes[name];
-      if (!shape) {
-        shape = {
-          name,
-          id: name,
-          title: name,
-          schema: {
-            extends: [{
-              '@ref': normalizeRefExpression(projectSchema, name)
-            }]
-          }
-        };
-      }
+      shape ||= {
+        name,
+        id: name,
+        title: name,
+        schema: {
+          extends: [{
+            '@ref': normalizeRefExpression(projectSchema, name)
+          }]
+        }
+      };
       const loaders = queriesToLoaders(config.queries);
       if (loaders) {
         shape.loaders = loaders;

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

@@ -1,9 +1,9 @@
 import { deepClone } from '@takeshape/util';
-import { createSchemaPropertyAccessor, SERVICE_OBJECT_PATTERN_NAME } from '../../schema-util';
-import { getRefOrItemsRef } from '../../refs';
 import upperFirst from 'lodash/upperFirst';
 import set from 'lodash/fp/set';
 import unset from 'lodash/fp/unset';
+import { createSchemaPropertyAccessor, SERVICE_OBJECT_PATTERN_NAME } from '../../schema-util';
+import { getRefOrItemsRef } from '../../refs';
 import { getServiceObjectFields } from '../../services';
 import { CURRENT_SCHEMA_VERSION } from '../../schemas';
 
@@ -27,11 +27,9 @@ export function normalizeForms(projectSchema) {
     forms = {}
   } = projectSchema;
   const storeSourceForm = (shapeName, formConfig, propName) => {
-    if (!normalizedForms[shapeName]) {
-      normalizedForms[shapeName] = {
-        default: deepClone(formConfig)
-      };
-    }
+    normalizedForms[shapeName] ||= {
+      default: deepClone(formConfig)
+    };
     const propConfig = normalizedForms[shapeName].default.properties[propName];
     delete propConfig.properties;
     delete propConfig.order;
@@ -64,9 +62,7 @@ export function normalizeForms(projectSchema) {
       normalizeNested(shapeName, forms[shapeName].default);
 
       // copy forms with no changes
-      if (!normalizedForms[shapeName]) {
-        normalizedForms[shapeName] = forms[shapeName];
-      }
+      normalizedForms[shapeName] ||= forms[shapeName];
     }
   }
   return normalizedForms;
@@ -107,6 +103,7 @@ export function migrateInterfaceShapes(projectSchema) {
           continue;
         }
         for (const template of ['CreateArgs', 'UpdateArgs']) {
+          // eslint-disable-next-line max-depth
           if (mutation.args === `${template}<${interfaceShapeName}>`) {
             updatedProjectSchema = set(['mutations', mutationName], {
               ...mutation,