@takeshape/schema 10.2.0 → 10.2.6

package/es/relationships.js

@@ -114,14 +114,13 @@ export function getLegacyRelationship(projectSchema, relationship) {
  * Get relationship details from a PropertySchema.
  */
 export function getRelationship(propertySchema) {
-  var _propertySchema$Back, _propertySchema$Back2;
   propertySchema = propertySchema['@output'] ?? propertySchema;
   if (!isPropertySchemaWithRelationship(propertySchema)) {
     return;
   }
   const isMultiple = propertySchema.type === 'array';
-  const hasBackreference = Boolean((_propertySchema$Back = propertySchema['@backreference']) === null || _propertySchema$Back === void 0 ? void 0 : _propertySchema$Back.enabled);
-  const backreferenceName = (_propertySchema$Back2 = propertySchema['@backreference']) === null || _propertySchema$Back2 === void 0 ? void 0 : _propertySchema$Back2.name;
+  const hasBackreference = Boolean(propertySchema['@backreference']?.enabled);
+  const backreferenceName = propertySchema['@backreference']?.name;
   const refs = getRelationshipShapeRefs(propertySchema);
   return {
     isMultiple,
@@ -144,17 +143,15 @@ export function findExistingRelationships(projectSchema, shapes) {
   const findRelationships = (schema, path, parentShapeName) => {
     const relationship = getRelationship(schema);
     if (relationship) {
-      var _schema$Backreferenc;
       const relatedShapeIds = getRelationshipShapeIds(shapes, relationship.refs);
-      const relatedName = (_schema$Backreferenc = schema['@backreference']) === null || _schema$Backreferenc === void 0 ? void 0 : _schema$Backreferenc.name;
+      const relatedName = schema['@backreference']?.name;
       for (const shapeId of relatedShapeIds) {
         if (shapeIds.has(shapeId)) {
-          var _schema$Backreferenc2;
           addRelationship(relationships, shapeId, {
             relatedName,
             path: path.slice(1),
             shapeId: path[0],
-            hasBackreference: Boolean((_schema$Backreferenc2 = schema['@backreference']) === null || _schema$Backreferenc2 === void 0 ? void 0 : _schema$Backreferenc2.enabled),
+            hasBackreference: Boolean(schema['@backreference']?.enabled),
             schema,
             shapeName: parentShapeName
           });
@@ -211,11 +208,11 @@ export function isEqualRelationship(a, b) {
   if (!relationshipA && !relationshipB) {
     return true;
   }
-  const refsA = relationshipA === null || relationshipA === void 0 ? void 0 : relationshipA.refs;
+  const refsA = relationshipA?.refs;
   if (!refsA) {
     return false;
   }
-  const refsB = relationshipB === null || relationshipB === void 0 ? void 0 : relationshipB.refs;
+  const refsB = relationshipB?.refs;
   if (!refsB || refsA.length !== refsB.length) {
     return false;
   }

package/es/schema-transform.js

@@ -14,7 +14,7 @@ function createPropertiesPredicate(propertyNames) {
   }
   return (shapeName, name) => {
     const blacklist = byShape.get(byShape.has(shapeName) ? shapeName : '*');
-    return Boolean(blacklist === null || blacklist === void 0 ? void 0 : blacklist.has(name));
+    return Boolean(blacklist?.has(name));
   };
 }
 export function removePropertiesTransform(propertyNames) {

package/es/schema-util.js

@@ -77,7 +77,7 @@ export function getServiceInfo(projectSchema, shape) {
       } = serviceConfig;
       const generators = {};
       const tag = value['@tag'];
-      if (tag !== null && tag !== void 0 && tag.startsWith(SERVICE_OBJECT_PATTERN_NAME)) {
+      if (tag?.startsWith(SERVICE_OBJECT_PATTERN_NAME)) {
         const idFieldName = getServiceIdFieldName(key);
         const version = tag.substr(tag.lastIndexOf(':') + 1);
         generators[SERVICE_OBJECT_PATTERN_NAME] = {
@@ -246,14 +246,13 @@ export function getCommonBuiltInProperties(shape) {
 }
 export const DEFAULT_ID_FIELD = 'id';
 export function getIdField(obj) {
-  return (obj === null || obj === void 0 ? void 0 : obj.idField) ?? DEFAULT_ID_FIELD;
+  return obj?.idField ?? DEFAULT_ID_FIELD;
 }
 
 /**
  * Get properties necessary for cached / remote data to work with the TSSearchable interface.
  */
 function getCachedBuiltInProperties(projectSchema, shape, properties) {
-  var _properties$idField;
   const idField = getIdField(shape.cache);
 
   // TODO Implement `searchSummary` and `_shapeId` here, and remove `getRemoteShapeTSSearchableFields`
@@ -262,7 +261,7 @@ function getCachedBuiltInProperties(projectSchema, shape, properties) {
       title: 'Id',
       type: 'string',
       ...properties._id,
-      ...((_properties$idField = properties[idField]) !== null && _properties$idField !== void 0 && _properties$idField['@mapping'] ? {
+      ...(properties[idField]?.['@mapping'] ? {
         '@mapping': properties[idField]['@mapping']
       } : {})
     }
@@ -362,6 +361,14 @@ export let BuiltInPropertiesProfile = /*#__PURE__*/function (BuiltInPropertiesPr
   BuiltInPropertiesProfile[BuiltInPropertiesProfile["None"] = 2] = "None";
   return BuiltInPropertiesProfile;
 }({});
+const BUILT_IN_PROPERTY_NAMES = {
+  [BuiltInPropertiesProfile.Model]: getBuiltInPropertyNames(BuiltInPropertiesProfile.Model),
+  [BuiltInPropertiesProfile.Cached]: getBuiltInPropertyNames(BuiltInPropertiesProfile.Cached),
+  [BuiltInPropertiesProfile.None]: getBuiltInPropertyNames(BuiltInPropertiesProfile.None)
+};
+export const isBuiltInPropertyName = (name, profile = BuiltInPropertiesProfile.Model) => {
+  return BUILT_IN_PROPERTY_NAMES[profile].has(name);
+};
 
 /**
  * Get the profile to use for loading built-in properties
@@ -488,8 +495,7 @@ export function isModelShape(shape) {
   return Boolean(shape.model);
 }
 export function isCachedShape(shape) {
-  var _shape$cache;
-  return ((_shape$cache = shape.cache) === null || _shape$cache === void 0 ? void 0 : _shape$cache.enabled) === true && shape.loaders !== undefined;
+  return shape.cache?.enabled === true && shape.loaders !== undefined;
 }
 export function getArgsReference(projectSchema, argsSchema) {
   const args = getArgs(argsSchema);
@@ -645,7 +651,7 @@ export function getRelevantShapes(projectSchema, params) {
     byId = false,
     includeDependencies = true
   } = params;
-  if (shapeNames !== null && shapeNames !== void 0 && shapeNames.length || shapeIds !== null && shapeIds !== void 0 && shapeIds.length) {
+  if (shapeNames?.length || shapeIds?.length) {
     const ids = new Set(shapeIds);
     const names = new Set(shapeNames);
     const shapes = {};
@@ -835,7 +841,7 @@ export function getStorageKey(schema) {
 }
 export function getPropertyService(schema) {
   const first = getFirstMapping(schema);
-  const split = first === null || first === void 0 ? void 0 : first.split(':');
+  const split = first?.split(':');
   return split ? `${split[0]}:${split[1]}` : undefined;
 }
 export function emptySchema(projectId) {
@@ -1021,12 +1027,10 @@ class SchemaPropertyAccessor {
     return this.properties.get(propertyName);
   }
   findValue(predicate) {
-    var _this$entries$find;
-    return (_this$entries$find = this.entries.find(predicate)) === null || _this$entries$find === void 0 ? void 0 : _this$entries$find[1];
+    return this.entries.find(predicate)?.[1];
   }
   findName(predicate) {
-    var _this$entries$find2;
-    return (_this$entries$find2 = this.entries.find(predicate)) === null || _this$entries$find2 === void 0 ? void 0 : _this$entries$find2[0];
+    return this.entries.find(predicate)?.[0];
   }
   getKey(propertyName) {
     const value = this.properties.get(propertyName);

package/es/services.js

@@ -65,11 +65,10 @@ const serviceConfigValidator = createServiceConfigValidator();
  * Validates a `ServiceConfig` validator based on the JSON-schema.
  */
 export function validateServiceConfig(maybeServiceConfig) {
-  var _serviceConfigValidat;
   if (serviceConfigValidator(maybeServiceConfig)) {
     return maybeServiceConfig;
   }
-  throw new SchemaValidationError('ServiceConfig was invalid', (_serviceConfigValidat = serviceConfigValidator.errors) === null || _serviceConfigValidat === void 0 ? void 0 : _serviceConfigValidat.map(formatError));
+  throw new SchemaValidationError('ServiceConfig was invalid', serviceConfigValidator.errors?.map(formatError));
 }
 
 /**
@@ -115,8 +114,7 @@ export function prepareServiceUpdate(encryptFn, decryptFn, projectSchema, servic
  * Get a service config from a project schema.
  */
 export function getStoredServiceConfig(projectSchema, serviceKey) {
-  var _projectSchema$servic;
-  return (_projectSchema$servic = projectSchema.services) === null || _projectSchema$servic === void 0 ? void 0 : _projectSchema$servic[serviceKey];
+  return projectSchema.services?.[serviceKey];
 }
 
 /**
@@ -133,8 +131,7 @@ export function getServiceNamespaces(context) {
   } = context;
   if (services) {
     Object.keys(services).forEach(serviceKey => {
-      var _services$serviceKey;
-      const namespace = (_services$serviceKey = services[serviceKey]) === null || _services$serviceKey === void 0 ? void 0 : _services$serviceKey.namespace;
+      const namespace = services[serviceKey]?.namespace;
       if (namespace) {
         namespaces.set(namespace, serviceKey);
       }

package/es/taxonomies.js

@@ -6,8 +6,7 @@ function weakMemoize(fn) {
   return memoized;
 }
 export function getFirstStringFieldV3(shape, projectSchema) {
-  var _projectSchema$forms;
-  const forms = (_projectSchema$forms = projectSchema.forms) === null || _projectSchema$forms === void 0 ? void 0 : _projectSchema$forms[shape.name];
+  const forms = projectSchema.forms?.[shape.name];
   if (!forms || !forms.default) {
     return null;
   }
@@ -15,19 +14,13 @@ export function getFirstStringFieldV3(shape, projectSchema) {
   const {
     order
   } = forms.default;
-  const name = order.find(name => {
-    var _schemaProperties$get;
-    return ((_schemaProperties$get = schemaProperties.getValue(name)) === null || _schemaProperties$get === void 0 ? void 0 : _schemaProperties$get.type) === 'string';
-  });
+  const name = order.find(name => schemaProperties.getValue(name)?.type === 'string');
   return name ? {
     name,
     key: schemaProperties.getKey(name)
   } : null;
 }
-export const getTaxonomyField = weakMemoize((shape, projectSchema) => {
-  var _shape$model;
-  return ((_shape$model = shape.model) === null || _shape$model === void 0 ? void 0 : _shape$model.type) === 'taxonomy' ? getFirstStringFieldV3(shape, projectSchema) : null;
-});
+export const getTaxonomyField = weakMemoize((shape, projectSchema) => shape.model?.type === 'taxonomy' ? getFirstStringFieldV3(shape, projectSchema) : null);
 export const getTaxonomies = weakMemoize(projectSchema => {
   const {
     shapes

package/es/template-shapes/templates.js

@@ -168,8 +168,7 @@ const idSchema = {
 };
 export function getIDQueryArgs(templateName) {
   return (context, shape) => {
-    var _shape$model;
-    const schema = ((_shape$model = shape.model) === null || _shape$model === void 0 ? void 0 : _shape$model.type) !== 'single' ? mergeSchemaProperties(idSchema, localeProps) : localeProps;
+    const schema = shape.model?.type !== 'single' ? mergeSchemaProperties(idSchema, localeProps) : localeProps;
     const shapeName = getFlattenedTemplateShapeName(shape.name, templateName);
     return {
       shapeName,

package/es/template-shapes/where.js

@@ -211,7 +211,7 @@ function getTypeName(name, prop, shapeName, context) {
   }
   if (type === 'object' || type === 'array') {
     const prefix = `TS${relationshipDepth >= MAX_RELATIONSHIP_DEPTH ? 'Shallow' : ''}Where`;
-    const fieldName = `${conflictingProperties !== null && conflictingProperties !== void 0 && conflictingProperties.has(name) ? '_' : ''}${formatShapeName(name)}`;
+    const fieldName = `${conflictingProperties?.has(name) ? '_' : ''}${formatShapeName(name)}`;
     const refItem = getRefOrItemsRef(projectSchema, prop);
     const suffix = refItem ? refItemToNamespacedShapeName(refItem) : `${shapeName}${fieldName}`;
     return `${prefix}${suffix}`;
@@ -302,7 +302,6 @@ export function getPropertyComparisonType(name, prop, shapeName, context) {
   }
   if (!shapeCache.has(typeName) && !projectSchema.shapes[typeName]) {
     shapeCache.set(typeName, () => {
-      var _prop$items;
       let props;
       const propOrItems = prop.items ?? prop;
       if (isId(name)) {
@@ -319,9 +318,8 @@ export function getPropertyComparisonType(name, prop, shapeName, context) {
           ...context,
           booleanOperators: false
         });
-      } else if (fieldType === 'object' || fieldType === 'array' && ((_prop$items = prop.items) === null || _prop$items === void 0 ? void 0 : _prop$items.type) === 'object') {
-        var _prop$items2;
-        const properties = ((_prop$items2 = prop.items) === null || _prop$items2 === void 0 ? void 0 : _prop$items2.properties) ?? prop.properties;
+      } else if (fieldType === 'object' || fieldType === 'array' && prop.items?.type === 'object') {
+        const properties = prop.items?.properties ?? prop.properties;
         if (properties) {
           props = props ?? {};
           const fieldContext = {
@@ -334,10 +332,9 @@ export function getPropertyComparisonType(name, prop, shapeName, context) {
           }
         }
       } else {
-        var _prop$items3;
         // Treat non-object arrays as their base type
         let type;
-        if (typeof ((_prop$items3 = prop.items) === null || _prop$items3 === void 0 ? void 0 : _prop$items3.type) === 'string') {
+        if (typeof prop.items?.type === 'string') {
           type = prop.items.type;
         } else {
           type = fieldType;
@@ -351,7 +348,7 @@ export function getPropertyComparisonType(name, prop, shapeName, context) {
     });
   }
   if (shapeCache.has(typeName) || projectSchema.shapes[typeName]) {
-    const fieldName = `${conflictingProperties !== null && conflictingProperties !== void 0 && conflictingProperties.has(name) ? `${shapeName}_` : ''}${name}`;
+    const fieldName = `${conflictingProperties?.has(name) ? `${shapeName}_` : ''}${name}`;
     return {
       [fieldName]: {
         '@ref': `local:${typeName}`

package/es/types/utils.js

@@ -20,7 +20,7 @@ export function isServiceResolver(resolver) {
   return isRecord(resolver) && isString(resolver.name) && isString(resolver.service);
 }
 export function isComposeResolver(resolver) {
-  return Boolean(isArray(resolver === null || resolver === void 0 ? void 0 : resolver.compose) && resolver.compose.length && resolver.compose.every(isBasicResolver));
+  return Boolean(isArray(resolver?.compose) && resolver.compose.length && resolver.compose.every(isBasicResolver));
 }
 const {
   definitions: {
@@ -186,8 +186,7 @@ export function isAnyServiceConfig(maybeConfig) {
   return maybeConfig && isString(maybeConfig.title) && isString(maybeConfig.id) && isString(maybeConfig.provider) && isString(maybeConfig.serviceType) && isString(maybeConfig.authenticationType);
 }
 export function isGraphQLServiceConfig(maybeConfig) {
-  var _maybeConfig$options;
-  return isAnyServiceConfig(maybeConfig) && maybeConfig.serviceType === 'graphql' && isString((_maybeConfig$options = maybeConfig.options) === null || _maybeConfig$options === void 0 ? void 0 : _maybeConfig$options.endpoint);
+  return isAnyServiceConfig(maybeConfig) && maybeConfig.serviceType === 'graphql' && isString(maybeConfig.options?.endpoint);
 }
 export function isRESTServiceConfig(maybeConfig) {
   return isAnyServiceConfig(maybeConfig) && maybeConfig.serviceType === 'rest';
@@ -211,25 +210,25 @@ export function isServiceConfigWithCustomAuthentication(maybeServiceConfig) {
 /** Authentication Utils **/
 
 export function isServiceAuthentication(maybeAuthentication) {
-  return maybeAuthentication === null || maybeAuthentication === void 0 ? void 0 : maybeAuthentication.type;
+  return maybeAuthentication?.type;
 }
 export function isBearerAuthentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'bearer';
+  return authentication?.type === 'bearer';
 }
 export function isBasicAuthentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'basic';
+  return authentication?.type === 'basic';
 }
 export function isSearchParamsAuthentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'searchParams';
+  return authentication?.type === 'searchParams';
 }
 export function isOAuth2Authentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'oauth2';
+  return authentication?.type === 'oauth2';
 }
 export function isOAuth2BearerAuthentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'oauth2Bearer';
+  return authentication?.type === 'oauth2Bearer';
 }
 export function isCustomAuthentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'custom';
+  return authentication?.type === 'custom';
 }
 
 /** Miscellaneous Utils **/
@@ -262,8 +261,7 @@ export const getRefType = refSchema => {
   }
 };
 export function isPropertySchemaWithRelationship(schema) {
-  var _schema$Resolver;
-  return ((_schema$Resolver = schema['@resolver']) === null || _schema$Resolver === void 0 ? void 0 : _schema$Resolver.name) === 'shapedb:getRelated';
+  return schema['@resolver']?.name === 'shapedb:getRelated';
 }
 export function listCachedShapes(shapes) {
   return Object.values(shapes).filter(isCachedShape);

package/es/unions.js

@@ -32,8 +32,7 @@ function getOneOf(schema) {
   return schema.oneOf;
 }
 export function isUnionSchema(schema) {
-  var _schema$oneOf;
-  return Boolean((_schema$oneOf = schema.oneOf) === null || _schema$oneOf === void 0 ? void 0 : _schema$oneOf.every(isRefSchema));
+  return Boolean(schema.oneOf?.every(isRefSchema));
 }
 export function oneOfToObject(projectSchema, schema) {
   const properties = {};

package/es/util/api-indexing.js

@@ -5,9 +5,8 @@ import { getIdField, isCachedShape } from '../schema-util';
 import { getQuery } from '../refs';
 export function serviceHasIndexedShapes(schema, serviceId) {
   for (const shape of Object.values(schema.shapes ?? {})) {
-    var _shape$loaders;
     const indexingEnabled = isCachedShape(shape);
-    const listConfigs = (_shape$loaders = shape.loaders) === null || _shape$loaders === void 0 ? void 0 : _shape$loaders.list;
+    const listConfigs = shape.loaders?.list;
     if (indexingEnabled && listConfigs) {
       for (const {
         query: queryRef
@@ -23,8 +22,8 @@ export function serviceHasIndexedShapes(schema, serviceId) {
 }
 export function getIndexedServices(projectSchema, configs) {
   return ensureArray(configs).reduce((services, queryConfig) => {
-    const resolved = queryConfig !== null && queryConfig !== void 0 && queryConfig.query ? getQuery(projectSchema, queryConfig.query) : undefined;
-    return resolved !== null && resolved !== void 0 && resolved.query ? [...services, ...getResolverServices(resolved.query.resolver)] : services;
+    const resolved = queryConfig?.query ? getQuery(projectSchema, queryConfig.query) : undefined;
+    return resolved?.query ? [...services, ...getResolverServices(resolved.query.resolver)] : services;
   }, []);
 }
 function flattenListQueryConfigs(base, queryConfig, maybeConfigArray) {

package/es/util/form-config.js

@@ -65,7 +65,6 @@ const cache = new WeakMap();
  * Find the form config for a given shape name and the form key.
  */
 export function findShapeFormConfig(projectSchema, shapeName, formName) {
-  var _normalizedForms$shap;
   if (!projectSchema.forms) {
     return;
   }
@@ -74,5 +73,5 @@ export function findShapeFormConfig(projectSchema, shapeName, formName) {
     normalizedForms = normalizeForms(projectSchema);
     cache.set(projectSchema, normalizedForms);
   }
-  return (_normalizedForms$shap = normalizedForms[shapeName]) === null || _normalizedForms$shap === void 0 ? void 0 : _normalizedForms$shap[formName];
+  return normalizedForms[shapeName]?.[formName];
 }

package/es/util/has-arg.js

@@ -3,12 +3,11 @@ export function getArgs(prop) {
   return '@args' in prop ? prop['@args'] : 'args' in prop ? prop.args : undefined;
 }
 export function hasArg(projectSchema, prop, argPath) {
-  var _projectSchema$shapes;
   const args = getArgs(prop);
   if (!args) {
     return false;
   }
-  const schema = typeof args === 'string' ? (_projectSchema$shapes = projectSchema.shapes[args]) === null || _projectSchema$shapes === void 0 ? void 0 : _projectSchema$shapes.schema : args;
+  const schema = typeof args === 'string' ? projectSchema.shapes[args]?.schema : args;
   const pathArray = Array.isArray(argPath) ? argPath : argPath.split('.');
   return Boolean(findSchemaAtPath(projectSchema, schema, pathArray));
 }

package/es/util/merge.js

@@ -172,7 +172,7 @@ function attemptToMerge(base, parent, head, change) {
   }
   if (isObjectSchema(toSchema) && isObjectSchema(fromSchema)) {
     const baseShape = findChangedShape(parent, change);
-    const baseSchema = baseShape === null || baseShape === void 0 ? void 0 : baseShape.schema;
+    const baseSchema = baseShape?.schema;
     return {
       ...rebaseShapeProperties(toShape, fromShape, baseShape),
       schema: change.op === 'update' && baseSchema && isObjectSchema(baseSchema) ? rebaseSchemaProperties(toSchema, baseSchema, fromSchema) : mergeSchemaProperties(toSchema, fromSchema)
@@ -185,7 +185,7 @@ function attemptToMerge(base, parent, head, change) {
     if (toObj && isObjectSchema(toObj) && fromObj && isObjectSchema(fromObj) && toSchema.extends.slice(0, toSchema.extends.length - 1).every((item, i) => isEqual(item, fromExtends[i]))) {
       let mergedObjSchema;
       const baseShape = findChangedShape(parent, change);
-      const baseSchema = baseShape === null || baseShape === void 0 ? void 0 : baseShape.schema;
+      const baseSchema = baseShape?.schema;
       if (change.op === 'update' && baseSchema && isExtendsSchema(baseSchema)) {
         const baseObj = last(baseSchema.extends);
         if (baseObj && isObjectSchema(baseObj)) {
@@ -217,13 +217,11 @@ function applyChange(base, parent, head, change) {
         return;
       }
     } else if (change.section === 'forms') {
-      var _base$forms, _base$forms$shapeName, _head$forms, _head$forms$shapeName;
       const shapeName = change.path[1];
-      const toForm = (_base$forms = base.forms) === null || _base$forms === void 0 ? void 0 : (_base$forms$shapeName = _base$forms[shapeName]) === null || _base$forms$shapeName === void 0 ? void 0 : _base$forms$shapeName.default;
-      const fromForm = (_head$forms = head.forms) === null || _head$forms === void 0 ? void 0 : (_head$forms$shapeName = _head$forms[shapeName]) === null || _head$forms$shapeName === void 0 ? void 0 : _head$forms$shapeName.default;
+      const toForm = base.forms?.[shapeName]?.default;
+      const fromForm = head.forms?.[shapeName]?.default;
       if (toForm && fromForm) {
-        var _parent$forms, _parent$forms$shapeNa;
-        const baseForm = (_parent$forms = parent.forms) === null || _parent$forms === void 0 ? void 0 : (_parent$forms$shapeNa = _parent$forms[shapeName]) === null || _parent$forms$shapeNa === void 0 ? void 0 : _parent$forms$shapeNa.default;
+        const baseForm = parent.forms?.[shapeName]?.default;
         set(base, change.path, {
           default: baseForm ? rebaseFormProperties(toForm, baseForm, fromForm) : mergeFormConfigs(toForm, fromForm)
         });

package/es/validate.js

@@ -138,15 +138,14 @@ function enumerateBasicResolvers(resolver, path) {
 function validateResolver(projectSchema, basePath, baseResolver) {
   const errors = [];
   const isValidShapeName = shapeName => {
-    var _shape$cache;
     if (!shapeName) {
       return false;
     }
     const shape = getShape(projectSchema, shapeName);
-    if (shape !== null && shape !== void 0 && shape.model) {
+    if (shape?.model) {
       return true;
     }
-    return Boolean((shape === null || shape === void 0 ? void 0 : (_shape$cache = shape.cache) === null || _shape$cache === void 0 ? void 0 : _shape$cache.enabled) && shape.loaders);
+    return Boolean(shape?.cache?.enabled && shape.loaders);
   };
   const delegateResolverMissingConfig = (parsed, resolver) => {
     if (parsed.serviceId === 'local') {
@@ -163,8 +162,7 @@ function validateResolver(projectSchema, basePath, baseResolver) {
   const getNamespace = createGetNamespace(projectSchema);
   for (const [resolver, path] of enumerateBasicResolvers(baseResolver, basePath)) {
     if (isBasicResolver(resolver)) {
-      var _projectSchema$servic;
-      if ('service' in resolver && resolver.service !== 'shapedb' && resolver.service !== 'takeshape' && !((_projectSchema$servic = projectSchema.services) !== null && _projectSchema$servic !== void 0 && _projectSchema$servic[resolver.service])) {
+      if ('service' in resolver && resolver.service !== 'shapedb' && resolver.service !== 'takeshape' && !projectSchema.services?.[resolver.service]) {
         errors.push({
           type: 'notFound',
           path: path.concat(['service']),
@@ -349,7 +347,6 @@ async function validateShapeJoins(context, projectSchema) {
   return flatten(await Promise.all(promises));
 }
 function validateShapeLoaders(context, projectSchema, shape) {
-  var _shape$cache2;
   const errors = [];
   if (shape.loaders) {
     const getNamespace = createGetNamespace(projectSchema);
@@ -380,9 +377,8 @@ function validateShapeLoaders(context, projectSchema, shape) {
       }
     }
   }
-  if ((_shape$cache2 = shape.cache) !== null && _shape$cache2 !== void 0 && _shape$cache2.triggers) {
-    var _context$entitlements;
-    const min = ((_context$entitlements = context.entitlements) === null || _context$entitlements === void 0 ? void 0 : _context$entitlements.minScheduleTriggerInterval) ?? DEFAULT_MIN_SCHEDULE_TRIGGER_INTERVAL;
+  if (shape.cache?.triggers) {
+    const min = context.entitlements?.minScheduleTriggerInterval ?? DEFAULT_MIN_SCHEDULE_TRIGGER_INTERVAL;
     for (let i = 0; i < shape.cache.triggers.length; i++) {
       const trigger = shape.cache.triggers[i];
       if (trigger.type === 'schedule' && trigger.interval < min) {
@@ -536,7 +532,7 @@ async function validateRefs(context, projectSchema) {
         message: `Invalid ref "${get(projectSchema, item.path)}"`
       });
     } else if (mustBeInterface(item)) {
-      const context = (layer === null || layer === void 0 ? void 0 : layer.schema) ?? projectSchema;
+      const context = layer?.schema ?? projectSchema;
       const shape = get(context, item.path.slice(0, 2));
       errors.push(...validateShapeImplementsInterface(context, shape, item, item.path));
     }
@@ -629,9 +625,8 @@ function matchesInterface(shape, interfaceShape, path) {
         message: `"${shape.name}.${name}" must match "${interfaceShape.name}.${name}"`
       });
     } else {
-      var _schema$required, _interfaceSchema$requ;
-      const propRequired = Boolean((_schema$required = schema.required) === null || _schema$required === void 0 ? void 0 : _schema$required.includes(name));
-      const interfacePropRequired = Boolean((_interfaceSchema$requ = interfaceSchema.required) === null || _interfaceSchema$requ === void 0 ? void 0 : _interfaceSchema$requ.includes(name));
+      const propRequired = Boolean(schema.required?.includes(name));
+      const interfacePropRequired = Boolean(interfaceSchema.required?.includes(name));
       if (interfacePropRequired !== propRequired) {
         errors.push({
           type: 'conflict',
@@ -671,8 +666,7 @@ function validateShapeImplementsInterface(projectSchema, shape, interfaceRefItem
 function validateInterfaceImplementations(projectSchema) {
   const errors = [];
   for (const shape of Object.values(projectSchema.shapes)) {
-    var _shape$interfaces;
-    if ((_shape$interfaces = shape.interfaces) !== null && _shape$interfaces !== void 0 && _shape$interfaces.length) {
+    if (shape.interfaces?.length) {
       if (!isObjectSchema(shape.schema) && !isExtendsSchema(shape.schema)) {
         return [{
           path: ['shapes', shape.name, 'schema'],
@@ -739,8 +733,7 @@ function isValidateReferencesContext(context) {
 }
 const ajv = createAjv();
 function validateStructure(schemaVersion, context, schema, ref) {
-  var _coerce, _ajv$errors;
-  const versionStr = (_coerce = coerce(schemaVersion)) === null || _coerce === void 0 ? void 0 : _coerce.format();
+  const versionStr = coerce(schemaVersion)?.format();
   const relevantSchemas = allProjectSchemas.filter(metaSchema => metaSchema.$id.endsWith(`v${versionStr}#`));
   for (const relevantSchema of relevantSchemas) {
     if (!ajv.getSchema(relevantSchema.$id)) {
@@ -748,7 +741,7 @@ function validateStructure(schemaVersion, context, schema, ref) {
     }
   }
   ajv.validate(`https://schema.takeshape.io/project-schema/v${versionStr}#${ref ?? ''}`, schema);
-  let errors = ((_ajv$errors = ajv.errors) === null || _ajv$errors === void 0 ? void 0 : _ajv$errors.map(formatError)) ?? [];
+  let errors = ajv.errors?.map(formatError) ?? [];
   const {
     suppressErrorPaths
   } = context;
@@ -905,12 +898,11 @@ function createRoleInputValidator() {
  * type's properties suitable for importing.
  */
 export function validateRoleInput(maybeRoleInput) {
-  var _validate$errors;
   const validate = createRoleInputValidator();
   if (validate(maybeRoleInput)) {
     return maybeRoleInput;
   }
-  throw new SchemaValidationError('RoleInput was invalid', (_validate$errors = validate.errors) === null || _validate$errors === void 0 ? void 0 : _validate$errors.map(formatError));
+  throw new SchemaValidationError('RoleInput was invalid', validate.errors?.map(formatError));
 }
 
 /**
@@ -936,12 +928,11 @@ function createRoleImportValidator() {
  * Validates and returns a `RoleImport` array, which is a collection of `RoleInput`s.
  */
 export function ensureValidRoleImport(maybeRoles) {
-  var _validate$errors2;
   const validate = createRoleImportValidator();
   if (validate(maybeRoles)) {
     return maybeRoles;
   }
-  throw new SchemaValidationError('Roles were invalid', (_validate$errors2 = validate.errors) === null || _validate$errors2 === void 0 ? void 0 : _validate$errors2.map(formatError));
+  throw new SchemaValidationError('Roles were invalid', validate.errors?.map(formatError));
 }
 /**
  * Only use when validating an imported schema! ignore fields optional when importing

package/es/workflows.js

@@ -17,8 +17,7 @@ export const defaultWorkflow = {
   }]
 };
 export function getWorkflow(projectSchema, shapeId) {
-  var _getShapeById;
-  const workflow = (_getShapeById = getShapeById(projectSchema, shapeId)) === null || _getShapeById === void 0 ? void 0 : _getShapeById.workflow;
+  const workflow = getShapeById(projectSchema, shapeId)?.workflow;
   if (workflow) {
     return projectSchema.workflows[workflow] ?? defaultWorkflow;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "10.2.0",
+  "version": "10.2.6",
   "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.2.0",
-    "@takeshape/json-schema": "10.2.0",
-    "@takeshape/util": "10.2.0"
+    "@takeshape/errors": "10.2.6",
+    "@takeshape/json-schema": "10.2.6",
+    "@takeshape/util": "10.2.6"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",
@@ -46,11 +46,11 @@
     "meow": "^9.0.0",
     "p-map": "^5.0.0",
     "shortid": "^2.2.15",
-    "@takeshape/infra": "10.2.0",
-    "@takeshape/typescript-jest-junit-reporter": "10.2.0"
+    "@takeshape/typescript-jest-junit-reporter": "10.2.6",
+    "@takeshape/infra": "10.2.6"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "scripts": {
     "build": "pnpm build:js && pnpm build:es && pnpm build:types && pnpm build:json && pnpm build:copy",