@takeshape/schema 10.4.9 → 10.6.1

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

@@ -4,21 +4,19 @@ const migrate = async (_, projectSchema) => {
     ...projectSchema,
     schemaVersion: '3.36.0'
   };
-  if (result.services) {
-    result.services = mapValues(result.services, config => {
-      // Add transformVersion to OpenAPI services so we can preserve the legacy behavior
-      if (config.serviceType === 'openapi') {
-        return {
-          ...config,
-          options: {
-            ...config.options,
-            transformVersion: '1.0.0'
-          }
-        };
-      }
-      return config;
-    });
-  }
+  result.services &&= mapValues(result.services, config => {
+    // Add transformVersion to OpenAPI services so we can preserve the legacy behavior
+    if (config.serviceType === 'openapi') {
+      return {
+        ...config,
+        options: {
+          ...config.options,
+          transformVersion: '1.0.0'
+        }
+      };
+    }
+    return config;
+  });
   return result;
 };
 export default migrate;

package/es/migration/utils.js

@@ -2,5 +2,5 @@ export function formatDate(timestamp) {
   return (timestamp ? new Date(timestamp) : new Date()).toISOString();
 }
 export function normalizeSchemaVersion(version) {
-  return version === undefined ? '1' : version;
+  return version ?? '1';
 }

package/es/mocks.js

@@ -1,5 +1,5 @@
-import { emptySchema, applyDefaultsToSchema } from './schema-util';
 import { pascalCase } from '@takeshape/util';
+import { emptySchema, applyDefaultsToSchema } from './schema-util';
 
 /**
  * Like emptySchema, but for tests.

package/es/models/project-schema.js

@@ -1,6 +1,6 @@
+import omit from 'lodash/omit';
 import { atRefToRefItem, getRef, normalizeRefExpression, refExpressionToRefItem, shapeToRefItem } from '../refs';
 import { getAllRefs, getShape, getShapeById } from '../schema-util';
-import omit from 'lodash/omit';
 import { ShapeModel } from './shape';
 import { QueryModel } from './query';
 import { ServiceConfig } from './service';
@@ -48,18 +48,18 @@ export class ProjectSchema {
     return new ShapeModel(this, shapeRef);
   }
   get shapes() {
-    this._cache.shapes = this._cache.shapes ?? Object.keys(this.json.shapes).map(name => new ShapeModel(this, normalizeRefExpression(this.json, name)));
+    this._cache.shapes ??= Object.keys(this.json.shapes).map(name => new ShapeModel(this, normalizeRefExpression(this.json, name)));
     return this._cache.shapes;
   }
   get refs() {
-    this._cache.refs = this._cache.refs ?? getAllRefs(this.json);
+    this._cache.refs ??= getAllRefs(this.json);
     return this._cache.refs;
   }
   getQueryByName(queryName) {
     return new QueryModel(this, 'query', queryName);
   }
   get queries() {
-    this._cache.queries = this._cache.queries ?? Object.keys(this.json.queries).map(name => new QueryModel(this, 'query', name));
+    this._cache.queries ??= Object.keys(this.json.queries).map(name => new QueryModel(this, 'query', name));
     return this._cache.queries;
   }
   getMutationByName(mutationName) {

package/es/models/shape.js

@@ -1,7 +1,6 @@
 import { refItemToShape } from '../refs';
 import { createSchemaPropertyAccessor, createSchemaPropertyList, getShapeByRef, isCachedShape, isModelShape } from '../schema-util';
 import { isInterfaceShape } from '../interfaces';
-
 /**
  * Create a shape model from either a ref item or a ref string such as `rick:Character`
  */

package/es/refs.js

@@ -1,14 +1,14 @@
 import { isIntegerLike, isDefined, visit, isRecord } from '@takeshape/util';
-import { getRefType, isAllOfSchema, isExtendsSchema, isObjectSchema, isOneOfSchema, isRefSchema, isRefSchemaLegacy } from './types';
 import get from 'lodash/get';
 import assign from 'lodash/fp/assign';
 import omit from 'lodash/fp/omit';
-import { getServiceNamespaces } from './services';
-import { mergeObjectSchemas } from './util/merge';
 import { resolveSchema } from 'ajv/dist/compile';
 import isString from 'lodash/isString';
-import { isScalar } from './scalars';
 import { NotFoundError } from '@takeshape/errors';
+import { getServiceNamespaces } from './services';
+import { mergeObjectSchemas } from './util/merge';
+import { isScalar } from './scalars';
+import { getRefType, isAllOfSchema, isExtendsSchema, isObjectSchema, isOneOfSchema, isRefSchema, isRefSchemaLegacy } from './types';
 
 /**
  * This interface describes a parsed `@ref` or `$ref`.

package/es/relationships.js

@@ -1,10 +1,10 @@
 import { isDefined } from '@takeshape/util';
+import find from 'lodash/find';
 import { isPropertySchemaWithRelationship } from './types';
 import { getShapeById, isModelShape } from './schema-util';
 import { getRefShapeName, followRef } from './refs';
 import { isUnionSchema } from './unions';
 import { builtInShapes } from './builtin-schema';
-import find from 'lodash/find';
 
 /**
  * Turn a LegacyRelationship into a partial PropertySchemaWithRelationship.
@@ -130,9 +130,7 @@ export function getRelationship(propertySchema) {
   };
 }
 function addRelationship(relationships, id, env) {
-  if (!relationships[id]) {
-    relationships[id] = [];
-  }
+  relationships[id] ||= [];
   relationships[id].push(env);
 }
 export function findExistingRelationships(projectSchema, shapes) {

package/es/schema-transform.js

@@ -1,6 +1,6 @@
 import { visit } from '@takeshape/util';
-import { isObjectSchema } from './types';
 import pickBy from 'lodash/pickBy';
+import { isObjectSchema } from './types';
 function createPropertiesPredicate(propertyNames) {
   const byShape = new Map();
   for (const name of propertyNames) {

package/es/schema-util.js

@@ -6,6 +6,12 @@ import curry from 'lodash/fp/curry';
 import orderBy from 'lodash/fp/orderBy';
 import uniq from 'lodash/uniq';
 import { deepClone, visit, pascalCase, ensureArray } from '@takeshape/util';
+import isEqual from 'lodash/isEqual';
+import isString from 'lodash/isString';
+import { NotFoundError } from '@takeshape/errors';
+import isArray from 'lodash/isArray';
+import some from 'lodash/some';
+import invariant from 'tiny-invariant';
 import { defaultWorkflow, getStatusField } from './workflows';
 import { CURRENT_API_VERSION, CURRENT_SCHEMA_VERSION } from './versions';
 import { workflowsEnabled } from './api-version';
@@ -13,14 +19,8 @@ import { builtInShapes, builtInForms } from './builtin-schema';
 import { getArgsType, isObjectSchema, isAllOfSchema, isOneOfSchema, isExtendsSchema, isArraySchema, isServiceResolver, isGraphqlResolver, isRefSchema } from './types/utils';
 import { getStoredServiceConfig } from './services';
 import { createTemplateShapeName, dereferenceObjectSchema, dereferenceSchema, getRef, getRefOrItemsRef, getRefShapeName, parseReturnShape, refExpressionToRefItem, refItemToShape, refItemToNamespacedShapeName, refItemToShapeSchema, atRefToRefItem, refToRefItem, parseTemplateShape, returnShapeToSchema, serializePropertyRef } from './refs';
-import isEqual from 'lodash/isEqual';
-import isString from 'lodash/isString';
 import { isUnionSchema } from './unions';
 import { mergeFormProperties, mergeSchemaProperties, getArgs } from './util';
-import { NotFoundError } from '@takeshape/errors';
-import isArray from 'lodash/isArray';
-import some from 'lodash/some';
-import invariant from 'tiny-invariant';
 export const SERVICE_OBJECT_PATTERN_NAME = 'pattern:service-object';
 export function isBuiltinShape(shapeName) {
   return Boolean(builtInShapes[shapeName]);
@@ -133,7 +133,7 @@ export function pathBetween(fromShape, toShape, projectSchema, depthLimit = 4) {
           pathBetweenHelper(referenced.schema, pathSoFar, new Set([...seen, referenced.name]), depth);
         }
       }
-    } else if (pathSoFar.length + 1 < shortestPathLength && (schema.oneOf || schema.allOf || schema.properties)) {
+    } else if (pathSoFar.length + 1 < shortestPathLength && (schema.oneOf ?? schema.allOf ?? schema.properties)) {
       if (schema.oneOf) {
         for (const itemSchema of schema.oneOf) {
           pathBetweenHelper(itemSchema, pathSoFar, seen, depth);
@@ -651,7 +651,7 @@ export function getRelevantShapes(projectSchema, params) {
     byId = false,
     includeDependencies = true
   } = params;
-  if (shapeNames?.length || shapeIds?.length) {
+  if (Boolean(shapeNames?.length) || Boolean(shapeIds?.length)) {
     const ids = new Set(shapeIds);
     const names = new Set(shapeNames);
     const shapes = {};
@@ -1143,7 +1143,7 @@ export const schemaMatchesShapeName = (workingCopy, schemaWithRef, shapeName) =>
 export const shapeHasArrayPropOfShape = (projectSchema, shape, shapeName) => {
   if (shape && isObjectSchema(shape.schema)) {
     for (const propName in shape.schema.properties) {
-      if (Object.prototype.hasOwnProperty.call(shape.schema.properties, propName)) {
+      if (Object.hasOwn(shape.schema.properties, propName)) {
         const propSchema = shape.schema.properties[propName];
         if (propSchema.items && isRefSchema(propSchema.items) && schemaMatchesShapeName(projectSchema, propSchema.items, shapeName)) {
           return true;

package/es/services.js

@@ -2,12 +2,12 @@ import { isDefined, mergeWithArrayMerge } from '@takeshape/util';
 import { createAjv } from '@takeshape/json-schema';
 import { SchemaValidationError } from '@takeshape/errors';
 import isNull from 'lodash/isNull';
+import uniq from 'lodash/uniq';
+import isEmpty from 'lodash/isEmpty';
 import { isEncryptedServiceConfig, isServiceAuthentication } from './types/utils';
 import { getServiceInfo, SERVICE_OBJECT_PATTERN_NAME } from './schema-util';
 import { latestSchemaJson } from './schemas';
 import { formatError } from './validate';
-import uniq from 'lodash/uniq';
-import isEmpty from 'lodash/isEmpty';
 
 /**
  * Decrypt an encrypted authentication JSON string

package/es/taxonomies.js

@@ -7,7 +7,7 @@ function weakMemoize(fn) {
 }
 export function getFirstStringFieldV3(shape, projectSchema) {
   const forms = projectSchema.forms?.[shape.name];
-  if (!forms || !forms.default) {
+  if (!forms?.default) {
     return null;
   }
   const schemaProperties = createSchemaPropertyAccessor(projectSchema, shape);

package/es/template-shapes/templates.js

@@ -1,13 +1,13 @@
-import { TemplateVerbs } from './types';
-import { listTypePrefix } from '../migration';
 import { deepClone, formatShapeName, isDefined, visit } from '@takeshape/util';
 import keyBy from 'lodash/keyBy';
+import get from 'lodash/get';
+import { listTypePrefix } from '../migration';
 import { createShape, getShapeDependencies, isCachedShape } from '../schema-util';
 import { getFlattenedTemplateShapeName, getRef, getRefShapeName, refItemToAtRef, refItemToNamespacedShapeName } from '../refs';
-import { getWhereSearchArg } from './where';
 import { mergeObjectSchemas, mergeSchemaProperties } from '../util';
 import { createInputSchema } from '../create-input-schema';
-import get from 'lodash/get';
+import { getWhereSearchArg } from './where';
+import { TemplateVerbs } from './types';
 export const TSGetArgs = getIDQueryArgs('TSGetArgs');
 export const TSGetSingletonArgs = getIDQueryArgs('TSGetSingletonArgs');
 export const TSListArgs = getShapeListQueryArgs('TSListArgs', true);

package/es/template-shapes/where.js

@@ -1,9 +1,9 @@
 import unset from 'lodash/unset';
 import isFunction from 'lodash/isFunction';
-import { createSchemaPropertyList, createShape, getAllRefsInShapes, isCachedShape } from '../schema-util';
 import uniqBy from 'lodash/uniqBy';
 import md5 from 'blueimp-md5';
 import { pascalCase, isDefined, formatShapeName } from '@takeshape/util';
+import { createSchemaPropertyList, createShape, getAllRefsInShapes, isCachedShape } from '../schema-util';
 import { workflowsEnabled } from '../api-version';
 import { followRef, getRef, getRefOrItemsRef, hasRefProperty, hasResolvableRef, refItemToShape, refItemToNamespacedShapeName } from '../refs';
 import { enumerateOneOfKeys, isUnionSchema } from '../unions';
@@ -226,7 +226,7 @@ function skipField({
   isIndexedShape
 }) {
   const isRelationship = isPropertySchemaWithRelationship(prop);
-  return Boolean(prop['@sensitive'] || prop['@resolver'] && !isIndexedShape && !isRelationship || isRelationship && exceededRelationshipDepth || (name === '_enabled' || name === '_enabledAt') && workflowsEnabled);
+  return Boolean(prop['@sensitive'] ?? (Boolean(prop['@resolver'] && !isIndexedShape && !isRelationship) || Boolean(isRelationship && exceededRelationshipDepth) || Boolean((name === '_enabled' || name === '_enabledAt') && workflowsEnabled)));
 }
 export function getFields(typeName, shapes, context) {
   const {
@@ -321,7 +321,7 @@ export function getPropertyComparisonType(name, prop, shapeName, context) {
       } else if (fieldType === 'object' || fieldType === 'array' && prop.items?.type === 'object') {
         const properties = prop.items?.properties ?? prop.properties;
         if (properties) {
-          props = props ?? {};
+          props ??= {};
           const fieldContext = {
             ...context,
             conflictingProperties: undefined // non-union objects have no conflicts

package/es/types/utils.js

@@ -1,13 +1,12 @@
 import { isRecord } from '@takeshape/util';
-import { ArgsType, RefType } from './types';
 import isPlainObject from 'lodash/isPlainObject';
 import isString from 'lodash/isString';
 import isArray from 'lodash/isArray';
 import has from 'lodash/has';
-import { latestSchemaJson } from '../schemas';
 import isUndefined from 'lodash/isUndefined';
+import { latestSchemaJson } from '../schemas';
 import { isCachedShape } from '../schema-util';
-
+import { ArgsType, RefType } from './types';
 /** Resolver Type Utils **/
 
 /**

package/es/unions.js

@@ -1,9 +1,9 @@
-import { getRef, refItemToNamespacedShapeName } from './refs';
 import { camelCase, isRecord } from '@takeshape/util';
 import omit from 'lodash/omit';
+import { BadDataError } from '@takeshape/errors';
+import { getRef, refItemToNamespacedShapeName } from './refs';
 import { getContentTransform, toName } from './content-schema-transform';
 import { isRefSchema } from './types/utils';
-import { BadDataError } from '@takeshape/errors';
 import { getShapeById } from './schema-util';
 import { getOutputShapeName } from './template-shapes/templates';
 export function enumerateOneOfKeys(projectSchema, oneOf) {

package/es/util/api-indexing.js

@@ -1,5 +1,5 @@
-import { isServiceResolver } from '../types';
 import { ensureArray } from '@takeshape/util';
+import { isServiceResolver } from '../types';
 import { getResolverServices } from '../services';
 import { getIdField, isCachedShape } from '../schema-util';
 import { getQuery } from '../refs';

package/es/util/detect-cycles.js

@@ -1,5 +1,5 @@
-import { getRef, refItemToShape } from '../refs';
 import { value } from '@takeshape/util';
+import { getRef, refItemToShape } from '../refs';
 function immutableSetAdd(set, str) {
   const result = new Set(set);
   result.add(str);

package/es/util/form-config.js

@@ -14,11 +14,9 @@ export function normalizeForms(projectSchema) {
   const storeSourceForm = (shapeName, formConfig, propName) => {
     // Leave original forms intact for backwards compatibility
     if (!forms[shapeName]) {
-      if (!normalizedForms[shapeName]) {
-        normalizedForms[shapeName] = {
-          default: deepClone(formConfig)
-        };
-      }
+      normalizedForms[shapeName] ||= {
+        default: deepClone(formConfig)
+      };
 
       // Remove prop now that it has been normalized
       // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
@@ -52,9 +50,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;

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

@@ -1,5 +1,5 @@
-import { dereferenceSchema, getRef, refItemToAtRef } from '../refs';
 import { isDefined, setIsEqual } from '@takeshape/util';
+import { dereferenceSchema, getRef, refItemToAtRef } from '../refs';
 import { isObjectSchema } from '../types';
 
 /**

package/es/util/merge.js

@@ -6,9 +6,9 @@ import unset from 'lodash/unset';
 import set from 'lodash/set';
 import last from 'lodash/last';
 import omit from 'lodash/omit';
-import { isExtendsSchema, isObjectSchema } from '../types';
 import invariant from 'tiny-invariant';
 import pickBy from 'lodash/pickBy';
+import { isExtendsSchema, isObjectSchema } from '../types';
 export function mergeObjectSchemas(...args) {
   return args.filter(isDefined).reduce(mergeSchemaProperties, {
     type: 'object',
@@ -140,7 +140,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]];
@@ -192,9 +192,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/es/validate.js

@@ -1,4 +1,3 @@
-import { legacyProjectSchemaImportOptionalProps, projectSchemaImportOptionalProps } from './types/types';
 import { JSONPath } from 'jsonpath-plus';
 import { createAjv } from '@takeshape/json-schema';
 import { SchemaValidationError } from '@takeshape/errors';
@@ -6,6 +5,16 @@ import coerce from 'semver/functions/coerce';
 import neq from 'semver/functions/neq';
 import lt from 'semver/functions/lt';
 import isUndefined from 'lodash/isUndefined';
+import { DEFAULT_MIN_SCHEDULE_TRIGGER_INTERVAL, ensureArray, isIntegerLike, isRecord, value } from '@takeshape/util';
+import uniqBy from 'lodash/uniqBy';
+import initial from 'lodash/initial';
+import last from 'lodash/last';
+import get from 'lodash/get';
+import size from 'lodash/size';
+import isEqual from 'lodash/isEqual';
+import pick from 'lodash/pick';
+import pMap from 'p-map';
+import { flatten } from 'lodash';
 import { CURRENT_SCHEMA_VERSION, LEGACY_SCHEMA_VERSION, LEGACY_API_VERSION } from './versions';
 import { defaultWorkflow } from './workflows';
 import { allProjectSchemas } from './schemas';
@@ -18,17 +27,8 @@ import { refItemToNamespacedShapeName, getRefShapeName, parsePropertyRef, proper
 import { scalars } from './scalars';
 import { isUnionSchema } from './unions';
 import { isEnumLikeSchema } from './enum';
-import { DEFAULT_MIN_SCHEDULE_TRIGGER_INTERVAL, ensureArray, isIntegerLike, isRecord, value } from '@takeshape/util';
-import uniqBy from 'lodash/uniqBy';
-import initial from 'lodash/initial';
-import last from 'lodash/last';
 import { getRelationship } from './relationships';
-import get from 'lodash/get';
-import size from 'lodash/size';
-import isEqual from 'lodash/isEqual';
-import pick from 'lodash/pick';
-import pMap from 'p-map';
-import { flatten } from 'lodash';
+import { legacyProjectSchemaImportOptionalProps, projectSchemaImportOptionalProps } from './types/types';
 import { isLatestProjectSchemaJSON } from './project-schema';
 const builtInShapeNames = new Set([...Object.keys(builtInShapes), ...scalars, 'object']);
 function findDuplicates(items) {
@@ -133,8 +133,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 => {
@@ -185,6 +183,7 @@ function validateResolver(projectSchema, basePath, baseResolver) {
         const parsed = parsePropertyRef(resolver.to);
         if (parsed) {
           const error = delegateResolverMissingConfig(parsed, resolver);
+          // eslint-disable-next-line max-depth
           if (error) {
             errors.push(error);
           }

package/es/workflows.js

@@ -34,7 +34,10 @@ export function findWorkflowStep(workflow, keyOrName) {
   };
 }
 export 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "10.4.9",
+  "version": "10.6.1",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -28,9 +28,9 @@
     "p-reduce": "^2.1.0",
     "semver": "^7.3.2",
     "tiny-invariant": "^1.2.0",
-    "@takeshape/errors": "10.4.9",
-    "@takeshape/json-schema": "10.4.9",
-    "@takeshape/util": "10.4.9"
+    "@takeshape/errors": "10.6.1",
+    "@takeshape/json-schema": "10.6.1",
+    "@takeshape/util": "10.6.1"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",
@@ -46,8 +46,8 @@
     "meow": "^9.0.0",
     "p-map": "^5.0.0",
     "shortid": "^2.2.15",
-    "@takeshape/infra": "10.4.9",
-    "@takeshape/typescript-jest-junit-reporter": "10.4.9"
+    "@takeshape/infra": "10.6.1",
+    "@takeshape/typescript-jest-junit-reporter": "10.6.1"
   },
   "engines": {
     "node": ">=18"