@takeshape/schema 10.2.0 → 10.2.4

package/dist/types/utils.js

@@ -77,7 +77,7 @@ function isServiceResolver(resolver) {
   return (0, _util.isRecord)(resolver) && (0, _isString.default)(resolver.name) && (0, _isString.default)(resolver.service);
 }
 function isComposeResolver(resolver) {
-  return Boolean((0, _isArray.default)(resolver === null || resolver === void 0 ? void 0 : resolver.compose) && resolver.compose.length && resolver.compose.every(isBasicResolver));
+  return Boolean((0, _isArray.default)(resolver?.compose) && resolver.compose.length && resolver.compose.every(isBasicResolver));
 }
 const {
   definitions: {
@@ -243,8 +243,7 @@ function isAnyServiceConfig(maybeConfig) {
   return maybeConfig && (0, _isString.default)(maybeConfig.title) && (0, _isString.default)(maybeConfig.id) && (0, _isString.default)(maybeConfig.provider) && (0, _isString.default)(maybeConfig.serviceType) && (0, _isString.default)(maybeConfig.authenticationType);
 }
 function isGraphQLServiceConfig(maybeConfig) {
-  var _maybeConfig$options;
-  return isAnyServiceConfig(maybeConfig) && maybeConfig.serviceType === 'graphql' && (0, _isString.default)((_maybeConfig$options = maybeConfig.options) === null || _maybeConfig$options === void 0 ? void 0 : _maybeConfig$options.endpoint);
+  return isAnyServiceConfig(maybeConfig) && maybeConfig.serviceType === 'graphql' && (0, _isString.default)(maybeConfig.options?.endpoint);
 }
 function isRESTServiceConfig(maybeConfig) {
   return isAnyServiceConfig(maybeConfig) && maybeConfig.serviceType === 'rest';
@@ -268,25 +267,25 @@ function isServiceConfigWithCustomAuthentication(maybeServiceConfig) {
 /** Authentication Utils **/
 
 function isServiceAuthentication(maybeAuthentication) {
-  return maybeAuthentication === null || maybeAuthentication === void 0 ? void 0 : maybeAuthentication.type;
+  return maybeAuthentication?.type;
 }
 function isBearerAuthentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'bearer';
+  return authentication?.type === 'bearer';
 }
 function isBasicAuthentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'basic';
+  return authentication?.type === 'basic';
 }
 function isSearchParamsAuthentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'searchParams';
+  return authentication?.type === 'searchParams';
 }
 function isOAuth2Authentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'oauth2';
+  return authentication?.type === 'oauth2';
 }
 function isOAuth2BearerAuthentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'oauth2Bearer';
+  return authentication?.type === 'oauth2Bearer';
 }
 function isCustomAuthentication(authentication) {
-  return (authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'custom';
+  return authentication?.type === 'custom';
 }
 
 /** Miscellaneous Utils **/
@@ -321,8 +320,7 @@ const getRefType = refSchema => {
 };
 exports.getRefType = getRefType;
 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';
 }
 function listCachedShapes(shapes) {
   return Object.values(shapes).filter(_schemaUtil.isCachedShape);

package/dist/unions.js

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

package/dist/util/api-indexing.js

@@ -14,9 +14,8 @@ var _schemaUtil = require("../schema-util");
 var _refs = require("../refs");
 function serviceHasIndexedShapes(schema, serviceId) {
   for (const shape of Object.values(schema.shapes ?? {})) {
-    var _shape$loaders;
     const indexingEnabled = (0, _schemaUtil.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
@@ -32,8 +31,8 @@ function serviceHasIndexedShapes(schema, serviceId) {
 }
 function getIndexedServices(projectSchema, configs) {
   return (0, _util.ensureArray)(configs).reduce((services, queryConfig) => {
-    const resolved = queryConfig !== null && queryConfig !== void 0 && queryConfig.query ? (0, _refs.getQuery)(projectSchema, queryConfig.query) : undefined;
-    return resolved !== null && resolved !== void 0 && resolved.query ? [...services, ...(0, _services.getResolverServices)(resolved.query.resolver)] : services;
+    const resolved = queryConfig?.query ? (0, _refs.getQuery)(projectSchema, queryConfig.query) : undefined;
+    return resolved?.query ? [...services, ...(0, _services.getResolverServices)(resolved.query.resolver)] : services;
   }, []);
 }
 function flattenListQueryConfigs(base, queryConfig, maybeConfigArray) {

package/dist/util/form-config.js

@@ -71,7 +71,6 @@ const cache = new WeakMap();
  * Find the form config for a given shape name and the form key.
  */
 function findShapeFormConfig(projectSchema, shapeName, formName) {
-  var _normalizedForms$shap;
   if (!projectSchema.forms) {
     return;
   }
@@ -80,5 +79,5 @@ 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/dist/util/has-arg.js

@@ -10,12 +10,11 @@ function getArgs(prop) {
   return '@args' in prop ? prop['@args'] : 'args' in prop ? prop.args : undefined;
 }
 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((0, _findShapeAtPath.findSchemaAtPath)(projectSchema, schema, pathArray));
 }

package/dist/util/merge.js

@@ -185,7 +185,7 @@ function attemptToMerge(base, parent, head, change) {
   }
   if ((0, _types.isObjectSchema)(toSchema) && (0, _types.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 && (0, _types.isObjectSchema)(baseSchema) ? rebaseSchemaProperties(toSchema, baseSchema, fromSchema) : mergeSchemaProperties(toSchema, fromSchema)
@@ -198,7 +198,7 @@ function attemptToMerge(base, parent, head, change) {
     if (toObj && (0, _types.isObjectSchema)(toObj) && fromObj && (0, _types.isObjectSchema)(fromObj) && toSchema.extends.slice(0, toSchema.extends.length - 1).every((item, i) => (0, _isEqual.default)(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 && (0, _types.isExtendsSchema)(baseSchema)) {
         const baseObj = (0, _last.default)(baseSchema.extends);
         if (baseObj && (0, _types.isObjectSchema)(baseObj)) {
@@ -230,13 +230,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;
         (0, _set.default)(base, change.path, {
           default: baseForm ? rebaseFormProperties(toForm, baseForm, fromForm) : mergeFormConfigs(toForm, fromForm)
         });

package/dist/validate.js

@@ -15,7 +15,7 @@ var _types = require("./types/types");
 var _jsonpathPlus = require("jsonpath-plus");
 var _jsonSchema = require("@takeshape/json-schema");
 var _errors = require("@takeshape/errors");
-var _coerce2 = _interopRequireDefault(require("semver/functions/coerce"));
+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"));
@@ -131,7 +131,7 @@ function validateWorkflows(projectSchema) {
   return errors;
 }
 function getSemver(schemaVersion) {
-  return (0, _coerce2.default)(schemaVersion) ?? _versions.LEGACY_SCHEMA_VERSION;
+  return (0, _coerce.default)(schemaVersion) ?? _versions.LEGACY_SCHEMA_VERSION;
 }
 function enumerateBasicResolvers(resolver, path) {
   const results = [];
@@ -152,15 +152,14 @@ function enumerateBasicResolvers(resolver, path) {
 function validateResolver(projectSchema, basePath, baseResolver) {
   const errors = [];
   const isValidShapeName = shapeName => {
-    var _shape$cache;
     if (!shapeName) {
       return false;
     }
     const shape = (0, _schemaUtil.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') {
@@ -177,8 +176,7 @@ function validateResolver(projectSchema, basePath, baseResolver) {
   const getNamespace = (0, _refs.createGetNamespace)(projectSchema);
   for (const [resolver, path] of enumerateBasicResolvers(baseResolver, basePath)) {
     if ((0, _utils.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']),
@@ -363,7 +361,6 @@ async function validateShapeJoins(context, projectSchema) {
   return (0, _lodash.flatten)(await Promise.all(promises));
 }
 function validateShapeLoaders(context, projectSchema, shape) {
-  var _shape$cache2;
   const errors = [];
   if (shape.loaders) {
     const getNamespace = (0, _refs.createGetNamespace)(projectSchema);
@@ -394,9 +391,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) ?? _util.DEFAULT_MIN_SCHEDULE_TRIGGER_INTERVAL;
+  if (shape.cache?.triggers) {
+    const min = context.entitlements?.minScheduleTriggerInterval ?? _util.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) {
@@ -550,7 +546,7 @@ async function validateRefs(context, projectSchema) {
         message: `Invalid ref "${(0, _get.default)(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 = (0, _get.default)(context, item.path.slice(0, 2));
       errors.push(...validateShapeImplementsInterface(context, shape, item, item.path));
     }
@@ -643,9 +639,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',
@@ -685,8 +680,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 (!(0, _utils.isObjectSchema)(shape.schema) && !(0, _utils.isExtendsSchema)(shape.schema)) {
         return [{
           path: ['shapes', shape.name, 'schema'],
@@ -753,8 +747,7 @@ function isValidateReferencesContext(context) {
 }
 const ajv = (0, _jsonSchema.createAjv)();
 function validateStructure(schemaVersion, context, schema, ref) {
-  var _coerce, _ajv$errors;
-  const versionStr = (_coerce = (0, _coerce2.default)(schemaVersion)) === null || _coerce === void 0 ? void 0 : _coerce.format();
+  const versionStr = (0, _coerce.default)(schemaVersion)?.format();
   const relevantSchemas = _schemas.allProjectSchemas.filter(metaSchema => metaSchema.$id.endsWith(`v${versionStr}#`));
   for (const relevantSchema of relevantSchemas) {
     if (!ajv.getSchema(relevantSchema.$id)) {
@@ -762,7 +755,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;
@@ -889,7 +882,7 @@ function ensureValidLatestSchemaSyntax(obj) {
   if ((0, _isUndefined.default)(schema)) {
     throw new Error(`Invalid schema: schema is undefined`);
   }
-  if ((0, _neq.default)(_versions.CURRENT_SCHEMA_VERSION, (0, _coerce2.default)(schema.schemaVersion) ?? _versions.LEGACY_SCHEMA_VERSION)) {
+  if ((0, _neq.default)(_versions.CURRENT_SCHEMA_VERSION, (0, _coerce.default)(schema.schemaVersion) ?? _versions.LEGACY_SCHEMA_VERSION)) {
     throw new Error(`Expected schemaVersion: "${_versions.CURRENT_SCHEMA_VERSION}", got "${schema.schemaVersion}"`);
   }
   return schema;
@@ -919,12 +912,11 @@ function createRoleInputValidator() {
  * type's properties suitable for importing.
  */
 function validateRoleInput(maybeRoleInput) {
-  var _validate$errors;
   const validate = createRoleInputValidator();
   if (validate(maybeRoleInput)) {
     return maybeRoleInput;
   }
-  throw new _errors.SchemaValidationError('RoleInput was invalid', (_validate$errors = validate.errors) === null || _validate$errors === void 0 ? void 0 : _validate$errors.map(formatError));
+  throw new _errors.SchemaValidationError('RoleInput was invalid', validate.errors?.map(formatError));
 }
 
 /**
@@ -950,12 +942,11 @@ function createRoleImportValidator() {
  * Validates and returns a `RoleImport` array, which is a collection of `RoleInput`s.
  */
 function ensureValidRoleImport(maybeRoles) {
-  var _validate$errors2;
   const validate = createRoleImportValidator();
   if (validate(maybeRoles)) {
     return maybeRoles;
   }
-  throw new _errors.SchemaValidationError('Roles were invalid', (_validate$errors2 = validate.errors) === null || _validate$errors2 === void 0 ? void 0 : _validate$errors2.map(formatError));
+  throw new _errors.SchemaValidationError('Roles were invalid', validate.errors?.map(formatError));
 }
 /**
  * Only use when validating an imported schema! ignore fields optional when importing

package/dist/workflows.js

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

package/es/content-schema-transform.js

@@ -84,11 +84,11 @@ export function getContentTransform({
       forEach(schema.properties, (fieldSchema, name) => {
         const sourceKeys = ensureArray(sourceKeyTransform(name, fieldSchema, obj));
         for (const sourceKey of sourceKeys) {
-          const value = prepare(fieldSchema, obj === null || obj === void 0 ? void 0 : obj[sourceKey], name);
+          const value = prepare(fieldSchema, obj?.[sourceKey], name);
           if (value !== undefined) {
             assigned.add(sourceKey);
             const transform = findTransforms(transforms, dereferenceSchema(projectSchema, fieldSchema), name);
-            const getKey = transform !== null && transform !== void 0 && transform.keyTransform ? transform.keyTransform : keyTransform;
+            const getKey = transform?.keyTransform ? transform.keyTransform : keyTransform;
             result[getKey(name, fieldSchema, sourceKey)] = value;
           }
         }
@@ -121,7 +121,7 @@ export function getContentTransform({
 }
 function transformKey(transforms, propSchema, name, transform = preferKey) {
   const schemaTransform = findTransforms(transforms, propSchema, name);
-  if (schemaTransform !== null && schemaTransform !== void 0 && schemaTransform.keyTransform) {
+  if (schemaTransform?.keyTransform) {
     transform = schemaTransform.keyTransform;
   }
   return transform(name, propSchema);
@@ -135,9 +135,8 @@ export function getPropertyInfo(context, schema, path) {
   const result = [];
   const findProperty = (currentSchema, name, rest, path) => {
     if (isObjectSchema(currentSchema)) {
-      var _currentSchema$requir;
       const propSchema = currentSchema.properties[name];
-      const isRequired = ((_currentSchema$requir = currentSchema.required) === null || _currentSchema$requir === void 0 ? void 0 : _currentSchema$requir.includes(name)) ?? false;
+      const isRequired = currentSchema.required?.includes(name) ?? false;
       if (!propSchema) {
         return;
       }

package/es/interfaces.js

@@ -3,7 +3,7 @@ import mapValues from 'lodash/mapValues';
 import { isUnionSchema } from './unions';
 import { isDefined } from '@takeshape/util';
 export function isInterfaceShape(shape) {
-  return (shape === null || shape === void 0 ? void 0 : shape.type) === 'interface';
+  return shape?.type === 'interface';
 }
 export function isInterfaceRef(context, propertySchema) {
   const ref = getRef(context, propertySchema);
@@ -36,7 +36,7 @@ export function pruneUnusedInterfaces(projectSchema, shapeMap) {
     const {
       interfaces
     } = shape;
-    if (interfaces !== null && interfaces !== void 0 && interfaces.length) {
+    if (interfaces?.length) {
       const filteredInterfaces = interfaces.filter(refExpression => shapeMap[refItemToNamespacedShapeName(refExpressionToRefItem(projectSchema, refExpression))]);
       if (interfaces.length !== filteredInterfaces.length) {
         return {
@@ -55,8 +55,7 @@ export function getImplementingShapes(context, interfaceRef) {
   const shapeMap = context.shapes;
   const implementingShapes = [];
   for (const shape of Object.values(shapeMap)) {
-    var _shape$interfaces;
-    if ((_shape$interfaces = shape.interfaces) !== null && _shape$interfaces !== void 0 && _shape$interfaces.find(interfaceRefExpression => compareRefItems(refExpressionToRefItem(context, interfaceRefExpression), interfaceRef))) {
+    if (shape.interfaces?.find(interfaceRefExpression => compareRefItems(refExpressionToRefItem(context, interfaceRefExpression), interfaceRef))) {
       implementingShapes.push(shape);
     }
   }

package/es/layers/layers.js

@@ -170,9 +170,8 @@ function collectServiceRefs(flattenedSchema, getLayer) {
     for (const ref of refs) {
       const [layerId, shapeName] = splitAtRef(ref);
       if (layerId !== 'local') {
-        var _layer$shapes;
         const layer = getLayer(layerId);
-        const shape = layer === null || layer === void 0 ? void 0 : (_layer$shapes = layer.shapes) === null || _layer$shapes === void 0 ? void 0 : _layer$shapes[shapeName];
+        const shape = layer?.shapes?.[shapeName];
         if (shape) {
           visitSchemaProperties(shape.schema, ['schema'], collectReferencedShapeNames(layerId, refs));
         }
@@ -255,7 +254,6 @@ export function flattenSchema(projectSchema, getLayer) {
     forms: {}
   };
   const filteredLayers = layers.reverse().map(layer => {
-    var _config$visibility;
     const config = typeof layer === 'string' ? {
       ...layerDefaults,
       id: layer
@@ -264,15 +262,14 @@ export function flattenSchema(projectSchema, getLayer) {
     if (!layerSchema) {
       throw new Error(`Unable to flatten schema for project ${projectSchema.projectId}. Cannot get layer ${config.id}`);
     }
-    return (_config$visibility = config.visibility) !== null && _config$visibility !== void 0 && _config$visibility.length ? filterLayer(layerSchema, config.visibility) : undefined;
+    return config.visibility?.length ? filterLayer(layerSchema, config.visibility) : undefined;
   }).filter(isDefined);
   for (const filteredLayer of filteredLayers) {
-    var _projectSchema$servic;
     const {
       layerId
     } = filteredLayer;
     // Preserve original queries
-    if ((_projectSchema$servic = projectSchema.services) !== null && _projectSchema$servic !== void 0 && _projectSchema$servic[layerId]) {
+    if (projectSchema.services?.[layerId]) {
       const serviceLayer = ensureServiceLayer(flattenedSchema, layerId);
       if (serviceLayer.queries && filteredLayer.queries) {
         Object.assign(serviceLayer.queries, filteredLayer.queries);
@@ -304,8 +301,7 @@ export function flattenSchema(projectSchema, getLayer) {
   for (const refStr of collectServiceRefs(flattenedSchema, getLayer)) {
     const [layerId, shapeName] = splitAtRef(refStr);
     if (layerId !== 'local') {
-      var _getLayer, _getLayer$shapes;
-      const shape = (_getLayer = getLayer(layerId)) === null || _getLayer === void 0 ? void 0 : (_getLayer$shapes = _getLayer.shapes) === null || _getLayer$shapes === void 0 ? void 0 : _getLayer$shapes[shapeName];
+      const shape = getLayer(layerId)?.shapes?.[shapeName];
       if (shape) {
         const serviceLayer = ensureServiceLayer(flattenedSchema, layerId);
         if (!serviceLayer.shapes) {

package/es/layers/refs.js

@@ -144,8 +144,7 @@ export const omitRefAndExtend = (targetSchema, sourceSchema) => assign(omit(['@r
 export function followRef(shapes, contentSchema) {
   const refItem = getRef(contentSchema);
   if (refItem) {
-    var _refItemToShape;
-    const referencedSchema = (_refItemToShape = refItemToShape(shapes, refItem)) === null || _refItemToShape === void 0 ? void 0 : _refItemToShape.schema;
+    const referencedSchema = refItemToShape(shapes, refItem)?.schema;
     if (referencedSchema) {
       return omitRefAndExtend(contentSchema, referencedSchema);
     }

package/es/layers/type-utils.js

@@ -8,10 +8,10 @@ import { latestSchemaJson } from '../schemas';
  * Only tests that the shape is right, not that the name is correct. That's a job for the validator.
  */
 export function isBasicResolver(resolver) {
-  return isString(resolver === null || resolver === void 0 ? void 0 : resolver.name) && isString(resolver.service);
+  return 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: {

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

@@ -183,7 +183,7 @@ const migrate = async (context, projectSchema) => {
         ...serviceConfig,
         auth
       }, serviceKey);
-      const authentication = updatedServiceConfig === null || updatedServiceConfig === void 0 ? void 0 : updatedServiceConfig.authentication;
+      const authentication = updatedServiceConfig?.authentication;
       serviceMap[serviceKey] = {
         ...updatedServiceConfig,
         authentication: authentication && isObject(authentication) ? encryptFn(authentication) : authentication

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

@@ -1,12 +1,11 @@
 import omit from 'lodash/omit';
 function hasWebhook(projectSchema, config) {
-  var _config$queries, _config$queries$singl, _projectSchema$querie, _projectSchema$servic;
-  const queryName = (_config$queries = config.queries) === null || _config$queries === void 0 ? void 0 : (_config$queries$singl = _config$queries.single) === null || _config$queries$singl === void 0 ? void 0 : _config$queries$singl.name;
+  const queryName = config.queries?.single?.name;
   if (!queryName) {
     return false;
   }
-  const resolver = projectSchema === null || projectSchema === void 0 ? void 0 : (_projectSchema$querie = projectSchema.queries[queryName]) === null || _projectSchema$querie === void 0 ? void 0 : _projectSchema$querie.resolver;
-  return resolver && 'service' in resolver && (projectSchema === null || projectSchema === void 0 ? void 0 : (_projectSchema$servic = projectSchema.services) === null || _projectSchema$servic === void 0 ? void 0 : _projectSchema$servic[resolver.service].provider) === 'shopify';
+  const resolver = projectSchema?.queries[queryName]?.resolver;
+  return resolver && 'service' in resolver && projectSchema?.services?.[resolver.service].provider === 'shopify';
 }
 const migrate = async (_, {
   indexedShapes: oldIndexedShapes,
@@ -19,7 +18,6 @@ const migrate = async (_, {
     };
   }
   const indexedShapes = Object.fromEntries(Object.entries(oldIndexedShapes).map(([shapeName, config]) => {
-    var _config$queries$all;
     const queries = {};
     const triggers = [];
     if (!config.queries) {
@@ -38,7 +36,7 @@ const migrate = async (_, {
         events: ['products/create', 'products/update', 'products/delete']
       });
     }
-    const oldPagination = (_config$queries$all = config.queries.all) === null || _config$queries$all === void 0 ? void 0 : _config$queries$all.pagination;
+    const oldPagination = config.queries.all?.pagination;
     const pagination = oldPagination === undefined ? undefined : oldPagination.type === 'cursor' ? {
       ...oldPagination,
       itemsToIndexPath: oldPagination.itemsPath,

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

@@ -19,39 +19,34 @@ const migrate = async (_, projectSchema) => {
   const ensureResolverOptions = resolver => {
     if (resolver.name.startsWith('takeshape')) {
       if (!resolver.shapeName) {
-        var _resolver$options, _resolver$options2;
-        resolver.shapeName = ((_resolver$options = resolver.options) === null || _resolver$options === void 0 ? void 0 : _resolver$options.model) ?? ((_resolver$options2 = resolver.options) === null || _resolver$options2 === void 0 ? void 0 : _resolver$options2.indexedShape) ?? '';
+        resolver.shapeName = resolver.options?.model ?? resolver.options?.indexedShape ?? '';
         omitOptions(resolver, ['model', 'indexedShape']);
       }
     }
     if (resolver.name.startsWith('graphql')) {
       if (!resolver.fieldName) {
-        var _resolver$options3;
-        resolver.fieldName = ((_resolver$options3 = resolver.options) === null || _resolver$options3 === void 0 ? void 0 : _resolver$options3.fieldName) ?? '';
+        resolver.fieldName = resolver.options?.fieldName ?? '';
         omitOptions(resolver, ['fieldName']);
       }
     }
     if (resolver.name.startsWith('awsLambda')) {
       if (!resolver.functionName) {
-        var _resolver$options4;
-        resolver.functionName = ((_resolver$options4 = resolver.options) === null || _resolver$options4 === void 0 ? void 0 : _resolver$options4.functionName) ?? '';
+        resolver.functionName = resolver.options?.functionName ?? '';
         omitOptions(resolver, ['functionName']);
       }
     }
     if (resolver.name.startsWith('rest')) {
       if (!resolver.path) {
         if (resolver.pathParams) {
-          var _resolver$options5;
           resolver.path = {
             ...resolver.pathParams,
             serialize: {
               ...resolver.pathParams.serialize,
-              template: (_resolver$options5 = resolver.options) === null || _resolver$options5 === void 0 ? void 0 : _resolver$options5.path
+              template: resolver.options?.path
             }
           };
         } else {
-          var _resolver$options6;
-          resolver.path = ((_resolver$options6 = resolver.options) === null || _resolver$options6 === void 0 ? void 0 : _resolver$options6.path) ?? '';
+          resolver.path = resolver.options?.path ?? '';
         }
         omitOptions(resolver, ['path']);
       }

package/es/models/service.js

@@ -3,9 +3,8 @@
  */
 export class ServiceConfig {
   constructor(projectSchemaModel, _serviceId) {
-    var _projectSchemaModel$j;
     this._serviceId = _serviceId;
-    if (!((_projectSchemaModel$j = projectSchemaModel.json.services) !== null && _projectSchemaModel$j !== void 0 && _projectSchemaModel$j[_serviceId])) {
+    if (!projectSchemaModel.json.services?.[_serviceId]) {
       throw new Error(`Could not create service model for ${_serviceId}`);
     }
     this._storedServiceConfig = projectSchemaModel.json.services[_serviceId];

package/es/models/shape.js

@@ -60,8 +60,7 @@ export class ShapeModel {
     return this._shapeRefItem.serviceKey;
   }
   get modelType() {
-    var _this$_rawShape$model;
-    return (_this$_rawShape$model = this._rawShape.model) === null || _this$_rawShape$model === void 0 ? void 0 : _this$_rawShape$model.type;
+    return this._rawShape.model?.type;
   }
   get interfaces() {
     return this._rawShape.interfaces;

package/es/refs.js

@@ -187,12 +187,11 @@ export function splitAtRef(atRef) {
  * the type.
  */
 export function atRefToRefItem(context, atRef, template) {
-  var _context$services;
   const [serviceKey, typeName] = splitAtRef(atRef);
   // It's possible the service doesn't have a namespace, or is local and has
   // no service config.
-  const serviceConfig = (_context$services = context.services) === null || _context$services === void 0 ? void 0 : _context$services[serviceKey];
-  const serviceNamespace = serviceConfig === null || serviceConfig === void 0 ? void 0 : serviceConfig.namespace;
+  const serviceConfig = context.services?.[serviceKey];
+  const serviceNamespace = serviceConfig?.namespace;
   return {
     typeName,
     serviceKey,
@@ -486,10 +485,7 @@ export function dereferenceObjectSchema(context, shapeOrFieldSchema, schemaPath
   return schema;
 }
 export function createGetNamespace(context) {
-  return serviceId => {
-    var _context$services2, _context$services2$se;
-    return (_context$services2 = context.services) === null || _context$services2 === void 0 ? void 0 : (_context$services2$se = _context$services2[serviceId]) === null || _context$services2$se === void 0 ? void 0 : _context$services2$se.namespace;
-  };
+  return serviceId => context.services?.[serviceId]?.namespace;
 }
 export function parsePropertyRef(refStr) {
   const index = refStr.lastIndexOf(':');