@takeshape/schema 8.16.0 → 8.20.2

package/lib/schemas/project-schema/v4.0.0.json

@@ -3,6 +3,7 @@
   "$id": "https://schema.takeshape.io/project-schema/v4.0.0#",
   "definitions": {
     "schemaArray": {
+      "title": "Schema Array",
       "type": "array",
       "minItems": 1,
       "items": {
@@ -10,10 +11,12 @@
       }
     },
     "nonNegativeInteger": {
+      "title": "Non Negative Integer",
       "type": "integer",
       "minimum": 0
     },
     "nonNegativeIntegerDefault0": {
+      "title": "Non Negative Integer Default 0",
       "allOf": [
         {
           "$ref": "#/definitions/nonNegativeInteger"
@@ -24,9 +27,11 @@
       ]
     },
     "simpleTypes": {
+      "title": "Simple Types",
       "enum": ["array", "boolean", "integer", "null", "number", "object", "string"]
     },
     "stringArray": {
+      "title": "String Array",
       "type": "array",
       "items": {
         "type": "string"
@@ -57,6 +62,7 @@
       "additionalProperties": false
     },
     "mappingString": {
+      "title": "Mapping String",
       "type": "string",
       "pattern": "^[\\w-]+(?::[\\w-]+)+(?:\\.[\\w-]+)+$"
     },
@@ -79,7 +85,7 @@
       "type": "object",
       "properties": {
         "@ref": {
-          "$ref": "#/definitions/ref"
+          "type": "string"
         }
       },
       "required": ["@ref"]
@@ -89,7 +95,7 @@
       "type": "object",
       "properties": {
         "$ref": {
-          "$ref": "#/definitions/ref"
+          "type": "string"
         }
       },
       "required": ["$ref"]
@@ -1220,10 +1226,6 @@
       "title": "Resolver",
       "oneOf": [{"$ref": "#/definitions/basicResolver"}, {"$ref": "#/definitions/composeResolver"}]
     },
-    "ref": {
-      "title": "Ref",
-      "type": "string"
-    },
     "query": {
       "title": "Query",
       "type": "object",

package/lib/schemas/project-schema.json

@@ -14,6 +14,7 @@
     {"$ref": "https://schema.takeshape.io/project-schema/v3.6.0#"},
     {"$ref": "https://schema.takeshape.io/project-schema/v3.7.0#"},
     {"$ref": "https://schema.takeshape.io/project-schema/v3.8.0#"},
-    {"$ref": "https://schema.takeshape.io/project-schema/v3.9.0#"}
+    {"$ref": "https://schema.takeshape.io/project-schema/v3.9.0#"},
+    {"$ref": "https://schema.takeshape.io/project-schema/v3.10.0#"}
   ]
 }

package/lib/types/types.d.ts

@@ -1,5 +1,5 @@
 import type { Merge } from 'type-fest';
-import type { ProjectSchema, ProjectSchemaV3_0_0, ProjectSchemaV3_1_0, ProjectSchemaV3_2_0, ProjectSchemaV3_3_0, ProjectSchemaV3_4_0, ProjectSchemaV3_5_0, ProjectSchemaV3_5_1, ProjectSchemaV3_6_0, ProjectSchemaV3_7_0, ProjectSchemaV3_8_0, ProjectSchemaV3_9_0, Query, ContentSchema, StoredServiceMap, ServiceConfig, OAuth2Authentication, CustomAuthentication } from '../project-schema';
+import type { ProjectSchema, ProjectSchemaV3_0_0, ProjectSchemaV3_1_0, ProjectSchemaV3_2_0, ProjectSchemaV3_3_0, ProjectSchemaV3_4_0, ProjectSchemaV3_5_0, ProjectSchemaV3_5_1, ProjectSchemaV3_6_0, ProjectSchemaV3_7_0, ProjectSchemaV3_8_0, ProjectSchemaV3_9_0, ProjectSchemaV3_10_0, Query, PropertySchema, StoredServiceMap, ServiceConfig, OAuth2Authentication, CustomAuthentication } from '../project-schema';
 import { Overwrite } from '@takeshape/util';
 import { SERVICE_OBJECT_PATTERN_NAME } from '../schema-util';
 /**
@@ -7,7 +7,7 @@ import { SERVICE_OBJECT_PATTERN_NAME } from '../schema-util';
  * only type used in most runtime code. Updating this to a new version should
  * trigger type errors that clue you in to code that needs review.
  */
-export declare type ProjectSchemaV3X = ProjectSchemaV3_9_0 | ProjectSchemaV3_8_0 | ProjectSchemaV3_7_0 | ProjectSchemaV3_6_0 | ProjectSchemaV3_5_1 | ProjectSchemaV3_5_0 | ProjectSchemaV3_4_0 | ProjectSchemaV3_3_0 | ProjectSchemaV3_2_0 | ProjectSchemaV3_1_0 | ProjectSchemaV3_0_0;
+export declare type ProjectSchemaV3X = ProjectSchemaV3_10_0 | ProjectSchemaV3_9_0 | ProjectSchemaV3_8_0 | ProjectSchemaV3_7_0 | ProjectSchemaV3_6_0 | ProjectSchemaV3_5_1 | ProjectSchemaV3_5_0 | ProjectSchemaV3_4_0 | ProjectSchemaV3_3_0 | ProjectSchemaV3_2_0 | ProjectSchemaV3_1_0 | ProjectSchemaV3_0_0;
 export interface Content {
     [name: string]: any;
     _id: string;
@@ -76,6 +76,7 @@ export declare type OpenAPIServiceConfig = Overwrite<ServiceConfig, {
         headers?: Headers;
         timeout?: number;
         retry?: AllowedRetryOptions;
+        useRestfulNames?: boolean;
     };
 }>;
 export declare type EncryptedServiceConfig = Overwrite<ServiceConfig, {
@@ -99,12 +100,12 @@ export declare enum RefType {
     $ref = "$ref"
 }
 /**
- * Stub of a ContentSchema that may contain a `$ref` or `@ref`.
+ * Stub of a PropertySchema that may contain a `$ref` or `@ref`.
  */
-export interface RefSchemaStub extends Pick<ContentSchema, RefType> {
+export interface RefSchemaStub extends Pick<PropertySchema, RefType> {
     items?: RefSchemaStub;
 }
-export declare type SchemaWithRef = ContentSchema | RefSchemaStub;
+export declare type SchemaWithRef = PropertySchema | RefSchemaStub;
 /**
  * Types of args
  */
@@ -112,12 +113,12 @@ export declare enum ArgsType {
     '@args' = "@args",
     args = "args"
 }
-export declare type SchemaWithArgs = ContentSchema | Query;
+export declare type SchemaWithArgs = PropertySchema | Query;
 /**
  * Types supporting schema iterators
  */
 export declare type SchemaPropertyName = string;
-export declare type SchemaPropertyNode = [SchemaPropertyName, ContentSchema];
+export declare type SchemaPropertyNode = [SchemaPropertyName, PropertySchema];
 export declare type SchemaPropertyIterator = SchemaPropertyNode[];
 export declare type ShopifyServiceConfig = Overwrite<ServiceConfig, {
     serviceType: 'graphql';

package/lib/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,EACV,aAAa,EACb,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,oBAAoB,EACpB,KAAK,EACL,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,2BAA2B,EAAC,MAAM,gBAAgB,CAAC;AAE3D;;;;GAIG;AACH,oBAAY,gBAAgB,GACxB,oBAAoB,GACpB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,CAAC;AAExB,MAAM,WAAW,OAAO;IACtB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,MAAM,CAAC,OAAO,2BAA2B,EAAE,gBAAgB,GAAG,SAAS,CAAC,CAAC;CACtF;AAED,oBAAY,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,CAAC,CAAC;AAEpF;;GAEG;AAEH;;;GAGG;AACH,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,oBAAY,UAAU,GAAG,MAAM,CAAC;AAChC,oBAAY,UAAU,GAAG,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AAExD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,oBAAY,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAExD,aAAK,MAAM,GACP,KAAK,GACL,MAAM,GACN,KAAK,GACL,OAAO,GACP,MAAM,GACN,QAAQ,GACR,SAAS,GACT,OAAO,GACP,KAAK,GACL,MAAM,GACN,KAAK,GACL,OAAO,GACP,MAAM,GACN,QAAQ,GACR,SAAS,GACT,OAAO,CAAC;AAEZ,oBAAY,mBAAmB,GAC3B,MAAM,GACN,OAAO,CAAC;IACN,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC,CAAC;AAEP,oBAAY,iBAAiB,GAAG,SAAS,CACvC,aAAa,EACb;IACE,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,mBAAmB,CAAC;KAC7B,CAAC;CACH,CACF,CAAC;AAEF,oBAAY,oBAAoB,GAAG,SAAS,CAC1C,aAAa,EACb;IACE,WAAW,EAAE,SAAS,CAAC;IACvB,OAAO,EAAE;QACP,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,CACF,CAAC;AAEF,oBAAY,oBAAoB,GAAG,SAAS,CAC1C,aAAa,EACb;IACE,WAAW,EAAE,SAAS,CAAC;IACvB,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,mBAAmB,CAAC;QAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,CAAC;CACH,CACF,CAAC;AAEF,oBAAY,sBAAsB,GAAG,SAAS,CAC5C,aAAa,EACb;IACE,cAAc,EAAE,MAAM,CAAC;CACxB,CACF,CAAC;AAEF,oBAAY,qCAAqC,GAAG,KAAK,CACvD,aAAa,EACb;IACE,cAAc,EAAE,oBAAoB,CAAC;CACtC,CACF,CAAC;AAEF,oBAAY,qCAAqC,GAAG,KAAK,CACvD,aAAa,EACb;IACE,cAAc,EAAE,oBAAoB,CAAC;CACtC,CACF,CAAC;AAEF,MAAM,WAAW,+BAAgC,SAAQ,aAAa;IACpE,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AAED;;GAEG;AACH,oBAAY,OAAO;IACjB,MAAM,SAAS;IACf,IAAI,SAAS;CACd;AAED;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC;IAClE,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED,oBAAY,aAAa,GAAG,cAAc,GAAG,aAAa,CAAC;AAE3D;;GAEG;AACH,oBAAY,QAAQ;IAClB,OAAO,UAAU;IACjB,IAAI,SAAS;CACd;AAED,oBAAY,cAAc,GAAG,cAAc,GAAG,KAAK,CAAC;AAEpD;;GAEG;AACH,oBAAY,kBAAkB,GAAG,MAAM,CAAC;AACxC,oBAAY,kBAAkB,GAAG,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;AACtE,oBAAY,sBAAsB,GAAG,kBAAkB,EAAE,CAAC;AAE1D,oBAAY,oBAAoB,GAAG,SAAS,CAC1C,aAAa,EACb;IACE,WAAW,EAAE,SAAS,CAAC;IACvB,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,CACF,CAAC;AAEF,oBAAY,UAAU,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC"}

package/lib/types/types.js

@@ -25,7 +25,7 @@ exports.RefType = exports.ArgsType = void 0;
  */
 let RefType;
 /**
- * Stub of a ContentSchema that may contain a `$ref` or `@ref`.
+ * Stub of a PropertySchema that may contain a `$ref` or `@ref`.
  */
 
 exports.RefType = RefType;

package/lib/types/utils.d.ts

@@ -1,4 +1,4 @@
-import type { AnyProjectSchema, ProjectSchema, ProjectSchemaV1_0_0, ProjectSchemaV3_0_0, ProjectSchemaV3_1_0, ProjectSchemaV3_2_0, ProjectSchemaV3_3_0, ProjectSchemaV3_4_0, ProjectSchemaV3_5_0, ProjectSchemaV3_5_1, ProjectSchemaV3_6_0, ProjectSchemaV3_7_0, ProjectSchemaV3_8_0, ProjectSchemaV3_9_0, DirectiveMappingArray, DirectiveMappingMap, DirectiveConfig, ParameterSerializeOptions, ParameterSerializeContentOptions, ParameterSerializeStyleOptions, BasicResolver, ComposeResolver, GraphqlResolver, TakeshapeResolver, RestResolver, AwsLambdaResolver, UtilResolver, ObjectSchema, ArraySchema, AllOfSchema, OneOfSchema, RefSchema, RefSchemaLegacy, ContentObjectSchema, ContentSchema, AnyServiceConfig, ServiceAuthentication, BearerAuthentication, BasicAuthentication, OAuth2Authentication, SearchParamsAuthentication, ParameterOp, ParameterOpNested, ParameterOpMapping, ParameterOpValue, ParameterOpOp, ParameterSerializeStyleOptionsForSearchParams, ParameterSerializeStyleOptionsForPathParams } from '../project-schema';
+import type { AnyProjectSchema, ProjectSchema, ProjectSchemaV1_0_0, ProjectSchemaV3_0_0, ProjectSchemaV3_1_0, ProjectSchemaV3_2_0, ProjectSchemaV3_3_0, ProjectSchemaV3_4_0, ProjectSchemaV3_5_0, ProjectSchemaV3_5_1, ProjectSchemaV3_6_0, ProjectSchemaV3_7_0, ProjectSchemaV3_8_0, ProjectSchemaV3_9_0, ProjectSchemaV3_10_0, DirectiveMappingArray, DirectiveMappingMap, DirectiveConfig, ParameterSerializeOptions, ParameterSerializeContentOptions, ParameterSerializeStyleOptions, BasicResolver, ComposeResolver, GraphqlResolver, TakeshapeResolver, RestResolver, AwsLambdaResolver, UtilResolver, ObjectSchema, ReturnShapeArraySchema, ShapeSchemaEnum, RefSchema, RefSchemaLegacy, PropertySchema, AnyServiceConfig, ServiceAuthentication, BearerAuthentication, BasicAuthentication, OAuth2Authentication, SearchParamsAuthentication, ParameterOp, ParameterOpNested, ParameterOpMapping, ParameterOpValue, ParameterOpOp, ParameterSerializeStyleOptionsForSearchParams, ParameterSerializeStyleOptionsForPathParams, OneOfSchema, AllOfSchema } from '../project-schema';
 import type { Maybe } from '@takeshape/util';
 import type { ShopifyServiceConfig, RESTServiceConfig, GraphQLServiceConfig, OpenAPIServiceConfig, EncryptedServiceConfig, SchemaWithArgs, SchemaWithRef, ServiceConfigWithOAuth2Authentication, ServiceConfigWithCustomAuthentication, LatestProjectSchemaWithServices, ProjectSchemaV3X } from './types';
 import { ArgsType, RefType } from './types';
@@ -26,6 +26,7 @@ export declare const isProjectSchemaV3_6: (projectSchema: AnyProjectSchema) => p
 export declare const isProjectSchemaV3_7: (projectSchema: AnyProjectSchema) => projectSchema is ProjectSchemaV3_7_0;
 export declare const isProjectSchemaV3_8: (projectSchema: AnyProjectSchema) => projectSchema is ProjectSchemaV3_8_0;
 export declare const isProjectSchemaV3_9: (projectSchema: AnyProjectSchema) => projectSchema is ProjectSchemaV3_9_0;
+export declare const isProjectSchemaV3_10: (projectSchema: AnyProjectSchema) => projectSchema is ProjectSchemaV3_10_0;
 export declare const isLatestProjectSchema: (projectSchema: AnyProjectSchema) => projectSchema is ProjectSchema;
 export declare function isV3XSchema(maybeSchema: unknown): maybeSchema is ProjectSchemaV3X;
 /**
@@ -77,12 +78,13 @@ export declare function isParameterSerializeStyleForPathParams(maybeParam: Maybe
  */
 export declare function isParameterSerializeStyleOptions(maybeStyle: ParameterSerializeOptions): maybeStyle is ParameterSerializeStyleOptions;
 /** Typeguards for different types of shape schemas **/
-export declare function isRefSchema(maybeRefSchema: ContentObjectSchema | ContentSchema): maybeRefSchema is RefSchema | RefSchemaLegacy;
-export declare function isRefSchemaLegacy(maybeRefSchema: ContentObjectSchema | ContentSchema): maybeRefSchema is RefSchemaLegacy;
-export declare function isAllOfSchema(maybeExtendableSchema: ContentObjectSchema | ContentSchema): maybeExtendableSchema is AllOfSchema;
-export declare function isOneOfSchema(maybeExclusiveOrSchema: ContentObjectSchema | ContentSchema): maybeExclusiveOrSchema is OneOfSchema;
-export declare function isArraySchema(maybeArraySchema: ContentObjectSchema | ContentSchema): maybeArraySchema is ArraySchema;
-export declare function isObjectSchema(maybeObjectSchema: ContentObjectSchema | ContentSchema): maybeObjectSchema is ObjectSchema;
+export declare function isRefSchema(propertySchema: PropertySchema): propertySchema is RefSchema | RefSchemaLegacy;
+export declare function isRefSchemaLegacy(propertySchema: PropertySchema): propertySchema is RefSchemaLegacy;
+export declare function isAllOfSchema(propertySchema: PropertySchema): propertySchema is AllOfSchema;
+export declare function isOneOfSchema(propertySchema: PropertySchema): propertySchema is OneOfSchema;
+export declare function isEnumSchema(obj: PropertySchema): obj is ShapeSchemaEnum;
+export declare function isArraySchema(propertySchema: PropertySchema): propertySchema is ReturnShapeArraySchema;
+export declare function isObjectSchema(propertySchema: PropertySchema): propertySchema is ObjectSchema;
 /** Service Config Utils **/
 /**
  * Test all required props, currently:
@@ -109,7 +111,6 @@ export declare function isOAuth2Authentication(maybeAuthentication: any): maybeA
  * @param argsSchema Any schema that may have an `args` property.
  */
 export declare const getArgsType: (argsSchema: SchemaWithArgs) => Maybe<ArgsType>;
-export declare function isContentObjectSchema(maybeSchema: ContentObjectSchema | ContentSchema): maybeSchema is ContentObjectSchema;
 /**
  * A utility to return the type of ref present on a schema.
  *

package/lib/types/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/types/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/types/utils.ts"],"names":[],"mappings":"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"}

package/lib/types/utils.js

@@ -13,11 +13,11 @@ exports.isBasicAuthentication = isBasicAuthentication;
 exports.isBasicResolver = isBasicResolver;
 exports.isBearerAuthentication = isBearerAuthentication;
 exports.isComposeResolver = isComposeResolver;
-exports.isContentObjectSchema = isContentObjectSchema;
 exports.isDirectiveConfig = isDirectiveConfig;
 exports.isDirectiveMappingArray = isDirectiveMappingArray;
 exports.isDirectiveMappingMap = isDirectiveMappingMap;
 exports.isEncryptedServiceConfig = isEncryptedServiceConfig;
+exports.isEnumSchema = isEnumSchema;
 exports.isGraphQLServiceConfig = isGraphQLServiceConfig;
 exports.isGraphqlResolver = isGraphqlResolver;
 exports.isLatestProjectSchema = void 0;
@@ -34,7 +34,7 @@ exports.isParameterSerializeContentOptions = isParameterSerializeContentOptions;
 exports.isParameterSerializeStyleForPathParams = isParameterSerializeStyleForPathParams;
 exports.isParameterSerializeStyleForSearchParams = isParameterSerializeStyleForSearchParams;
 exports.isParameterSerializeStyleOptions = isParameterSerializeStyleOptions;
-exports.isProjectSchemaV3_9 = exports.isProjectSchemaV3_8 = exports.isProjectSchemaV3_7 = exports.isProjectSchemaV3_6 = exports.isProjectSchemaV3_5_1 = exports.isProjectSchemaV3_5 = exports.isProjectSchemaV3_4 = exports.isProjectSchemaV3_3 = exports.isProjectSchemaV3_2 = exports.isProjectSchemaV3_1 = exports.isProjectSchemaV3 = exports.isProjectSchemaV1 = void 0;
+exports.isProjectSchemaV3_9 = exports.isProjectSchemaV3_8 = exports.isProjectSchemaV3_7 = exports.isProjectSchemaV3_6 = exports.isProjectSchemaV3_5_1 = exports.isProjectSchemaV3_5 = exports.isProjectSchemaV3_4 = exports.isProjectSchemaV3_3 = exports.isProjectSchemaV3_2 = exports.isProjectSchemaV3_10 = exports.isProjectSchemaV3_1 = exports.isProjectSchemaV3 = exports.isProjectSchemaV1 = void 0;
 exports.isProjectSchemaWithServices = isProjectSchemaWithServices;
 exports.isRESTServiceConfig = isRESTServiceConfig;
 exports.isRefSchema = isRefSchema;
@@ -92,7 +92,7 @@ const {
     restResolver,
     awsLambdaResolver
   }
-} = _schemas.latestMetaSchemaJson;
+} = _schemas.latestSchemaJson;
 
 function isTakeshapeResolver(resolver) {
   return takeshapeResolver.properties.name.enum.includes(resolver.name);
@@ -148,6 +148,8 @@ const isProjectSchemaV3_8 = createVersionPredicate('3.8.0');
 exports.isProjectSchemaV3_8 = isProjectSchemaV3_8;
 const isProjectSchemaV3_9 = createVersionPredicate('3.9.0');
 exports.isProjectSchemaV3_9 = isProjectSchemaV3_9;
+const isProjectSchemaV3_10 = createVersionPredicate('3.10.0');
+exports.isProjectSchemaV3_10 = isProjectSchemaV3_10;
 const isLatestProjectSchema = createVersionPredicate(_schemas.CURRENT_SCHEMA_VERSION);
 exports.isLatestProjectSchema = isLatestProjectSchema;
 
@@ -170,7 +172,7 @@ function isAnyProjectSchema(value) {
   }
 
   const maybeSchema = value;
-  return (0, _util.isObject)(value) && (0, _isString.default)(maybeSchema.projectId) && (isProjectSchemaV1(maybeSchema) || isProjectSchemaV3(maybeSchema) || isProjectSchemaV3_1(maybeSchema) || isProjectSchemaV3_2(maybeSchema) || isProjectSchemaV3_3(maybeSchema) || isProjectSchemaV3_4(maybeSchema) || isProjectSchemaV3_5(maybeSchema) || isProjectSchemaV3_5_1(maybeSchema) || isProjectSchemaV3_6(maybeSchema) || isProjectSchemaV3_7(maybeSchema) || isProjectSchemaV3_8(maybeSchema) || isProjectSchemaV3_9(maybeSchema));
+  return (0, _util.isObject)(value) && (0, _isString.default)(maybeSchema.projectId) && (isProjectSchemaV1(maybeSchema) || isProjectSchemaV3(maybeSchema) || isProjectSchemaV3_1(maybeSchema) || isProjectSchemaV3_2(maybeSchema) || isProjectSchemaV3_3(maybeSchema) || isProjectSchemaV3_4(maybeSchema) || isProjectSchemaV3_5(maybeSchema) || isProjectSchemaV3_5_1(maybeSchema) || isProjectSchemaV3_6(maybeSchema) || isProjectSchemaV3_7(maybeSchema) || isProjectSchemaV3_8(maybeSchema) || isProjectSchemaV3_9(maybeSchema) || isProjectSchemaV3_10(maybeSchema));
 }
 
 function isProjectSchemaWithServices(schema) {
@@ -268,7 +270,7 @@ const {
     parameterSerializeStyleOptionsForSearchParams,
     parameterSerializeStyleOptionsForPathParams
   }
-} = _schemas.latestMetaSchemaJson;
+} = _schemas.latestSchemaJson;
 
 function isParameterSerializeStyleForSearchParams(maybeParam) {
   return Boolean(maybeParam && parameterSerializeStyleOptionsForSearchParams.properties.style.enum.includes(maybeParam));
@@ -288,28 +290,32 @@ function isParameterSerializeStyleOptions(maybeStyle) {
 /** Typeguards for different types of shape schemas **/
 
 
-function isRefSchema(maybeRefSchema) {
-  return (0, _isString.default)(maybeRefSchema['@ref']) || (0, _isString.default)(maybeRefSchema.$ref);
+function isRefSchema(propertySchema) {
+  return (0, _isString.default)(propertySchema['@ref']) || (0, _isString.default)(propertySchema.$ref);
 }
 
-function isRefSchemaLegacy(maybeRefSchema) {
-  return (0, _isString.default)(maybeRefSchema.$ref);
+function isRefSchemaLegacy(propertySchema) {
+  return (0, _isString.default)(propertySchema.$ref);
 }
 
-function isAllOfSchema(maybeExtendableSchema) {
-  return (0, _isArray.default)(maybeExtendableSchema.allOf);
+function isAllOfSchema(propertySchema) {
+  return (0, _isArray.default)(propertySchema.allOf);
 }
 
-function isOneOfSchema(maybeExclusiveOrSchema) {
-  return (0, _isArray.default)(maybeExclusiveOrSchema.oneOf);
+function isOneOfSchema(propertySchema) {
+  return (0, _isArray.default)(propertySchema.oneOf);
 }
 
-function isArraySchema(maybeArraySchema) {
-  return maybeArraySchema.type === 'array' && (0, _util.isObject)(maybeArraySchema.items);
+function isEnumSchema(obj) {
+  return (0, _isArray.default)(obj.enum);
 }
 
-function isObjectSchema(maybeObjectSchema) {
-  return maybeObjectSchema.type === 'object' && (0, _util.isObject)(maybeObjectSchema.properties);
+function isArraySchema(propertySchema) {
+  return propertySchema.type === 'array' && (0, _util.isObject)(propertySchema.items);
+}
+
+function isObjectSchema(propertySchema) {
+  return propertySchema.type === 'object' && (0, _util.isObject)(propertySchema.properties);
 }
 /** Service Config Utils **/
 
@@ -392,12 +398,6 @@ const getArgsType = argsSchema => {
     return _types.ArgsType.args;
   }
 };
-
-exports.getArgsType = getArgsType;
-
-function isContentObjectSchema(maybeSchema) {
-  return isRefSchema(maybeSchema) || isAllOfSchema(maybeSchema) || isObjectSchema(maybeSchema);
-}
 /**
  * A utility to return the type of ref present on a schema.
  *
@@ -405,6 +405,8 @@ function isContentObjectSchema(maybeSchema) {
  */
 
 
+exports.getArgsType = getArgsType;
+
 const getRefType = refSchema => {
   if ((0, _has.default)(refSchema, '@ref')) {
     return _types.RefType['@ref'];

package/lib/unions.d.ts

@@ -1,29 +1,29 @@
-import type { ProjectSchema, ContentSchema, ObjectSchema, OneOfSchema } from './project-schema';
+import type { ProjectSchema, PropertySchema, ObjectSchema, OneOfSchema } from './project-schema';
 import type { ProjectSchemaV3X } from './types/types';
 import { PropertyTransform } from './content-schema-transform';
 export interface UnionedShape {
     propName: string;
     shapeName: string;
     shapeId: string;
-    propSchema: ContentSchema;
+    propSchema: PropertySchema;
 }
-export declare function enumerateOneOfKeys(projectSchema: ProjectSchemaV3X, oneOf: ContentSchema[]): UnionedShape[];
-export declare function isUnionSchema(schema: ContentSchema): schema is OneOfSchema;
-export declare function oneOfToObject(projectSchema: ProjectSchemaV3X, schema: ContentSchema): ObjectSchema;
+export declare function enumerateOneOfKeys(projectSchema: ProjectSchemaV3X, oneOf: PropertySchema[]): UnionedShape[];
+export declare function isUnionSchema(schema: PropertySchema): schema is OneOfSchema;
+export declare function oneOfToObject(projectSchema: ProjectSchemaV3X, schema: PropertySchema): ObjectSchema;
 export declare type TransformProcessFactory = (projectSchema: ProjectSchema) => PropertyTransform['process'];
 export declare const createUnwrapTransform: TransformProcessFactory;
 export declare const createWrapTransform: TransformProcessFactory;
-export declare function transformOneOf(process: TransformProcessFactory): (projectSchema: ProjectSchema, schema: ContentSchema, obj: Record<string, unknown>) => Record<string, unknown>;
+export declare function transformOneOf(process: TransformProcessFactory): (projectSchema: ProjectSchema, schema: PropertySchema, obj: Record<string, unknown>) => Record<string, unknown>;
 /**
  * Unwrap oneOf objects in "GraphQL oneOf" style wrapper objects
  * See https://github.com/graphql/graphql-spec/pull/825 for more on "GraphQL oneOf"
  * Opposite of `wrapOneOfObjects`
  */
-export declare const unwrapOneOfObjects: (projectSchema: ProjectSchema, schema: ContentSchema, obj: Record<string, unknown>) => Record<string, unknown>;
+export declare const unwrapOneOfObjects: (projectSchema: ProjectSchema, schema: PropertySchema, obj: Record<string, unknown>) => Record<string, unknown>;
 /**
  * Wrap oneOf objects in "GraphQL oneOf" style wrapper objects
  * See https://github.com/graphql/graphql-spec/pull/825 for more on "GraphQL oneOf"
  * Opposite of `unwrapOneOfObjects`
  */
-export declare const wrapOneOfObjects: (projectSchema: ProjectSchema, schema: ContentSchema, obj: Record<string, unknown>) => Record<string, unknown>;
+export declare const wrapOneOfObjects: (projectSchema: ProjectSchema, schema: PropertySchema, obj: Record<string, unknown>) => Record<string, unknown>;
 //# sourceMappingURL=unions.d.ts.map

package/lib/unions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unions.d.ts","sourceRoot":"","sources":["../../src/unions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC9F,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAIpD,OAAO,EAAsB,iBAAiB,EAAS,MAAM,4BAA4B,CAAC;AAK1F,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,aAAa,CAAC;CAC3B;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,gBAAgB,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,YAAY,EAAE,CAmB1G;AAUD,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,IAAI,WAAW,CAE1E;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,GAAG,YAAY,CAOlG;AAMD,oBAAY,uBAAuB,GAAG,CAAC,aAAa,EAAE,aAAa,KAAK,iBAAiB,CAAC,SAAS,CAAC,CAAC;AAGrG,eAAO,MAAM,qBAAqB,EAAE,uBA0BnC,CAAC;AAGF,eAAO,MAAM,mBAAmB,EAAE,uBASjC,CAAC;AAEF,wBAAgB,cAAc,CAAC,OAAO,EAAE,uBAAuB,mBAE5C,aAAa,UACpB,aAAa,OAChB,OAAO,MAAM,EAAE,OAAO,CAAC,KAC3B,OAAO,MAAM,EAAE,OAAO,CAAC,CAiB3B;AAED;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,kBA3BZ,aAAa,UACpB,aAAa,OAChB,OAAO,MAAM,EAAE,OAAO,CAAC,KAC3B,OAAO,MAAM,EAAE,OAAO,CAwB4C,CAAC;AAExE;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,kBAlCV,aAAa,UACpB,aAAa,OAChB,OAAO,MAAM,EAAE,OAAO,CAAC,KAC3B,OAAO,MAAM,EAAE,OAAO,CA+BwC,CAAC"}
+{"version":3,"file":"unions.d.ts","sourceRoot":"","sources":["../../src/unions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/F,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAIpD,OAAO,EAAsB,iBAAiB,EAAS,MAAM,4BAA4B,CAAC;AAK1F,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,cAAc,CAAC;CAC5B;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,gBAAgB,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,YAAY,EAAE,CAmB3G;AAUD,wBAAgB,aAAa,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,IAAI,WAAW,CAE3E;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,GAAG,YAAY,CAOnG;AAMD,oBAAY,uBAAuB,GAAG,CAAC,aAAa,EAAE,aAAa,KAAK,iBAAiB,CAAC,SAAS,CAAC,CAAC;AAGrG,eAAO,MAAM,qBAAqB,EAAE,uBA0BnC,CAAC;AAGF,eAAO,MAAM,mBAAmB,EAAE,uBASjC,CAAC;AAEF,wBAAgB,cAAc,CAAC,OAAO,EAAE,uBAAuB,mBAE5C,aAAa,UACpB,cAAc,OACjB,OAAO,MAAM,EAAE,OAAO,CAAC,KAC3B,OAAO,MAAM,EAAE,OAAO,CAAC,CAiB3B;AAED;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,kBA3BZ,aAAa,UACpB,cAAc,OACjB,OAAO,MAAM,EAAE,OAAO,CAAC,KAC3B,OAAO,MAAM,EAAE,OAAO,CAwB4C,CAAC;AAExE;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,kBAlCV,aAAa,UACpB,cAAc,OACjB,OAAO,MAAM,EAAE,OAAO,CAAC,KAC3B,OAAO,MAAM,EAAE,OAAO,CA+BwC,CAAC"}

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

@@ -1,6 +1,6 @@
-import { ProjectSchema, ContentSchema } from '../project-schema';
+import { ProjectSchema, PropertySchema } from '../project-schema';
 /**
  * Use a basic depth-first search to dertermine whether a schema contains a cycle
  */
-export declare function hasCycle(projectSchema: ProjectSchema, schema: ContentSchema, shapesSeen?: Set<string>): boolean;
+export declare function hasCycle(projectSchema: ProjectSchema, schema: PropertySchema, shapesSeen?: Set<string>): boolean;
 //# sourceMappingURL=detect-cycles.d.ts.map

package/lib/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,aAAa,EAAE,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAS/D;;GAEG;AACH,wBAAgB,QAAQ,CACtB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,aAAa,EACrB,UAAU,GAAE,GAAG,CAAC,MAAM,CAAa,GAClC,OAAO,CAoCT"}
+{"version":3,"file":"detect-cycles.d.ts","sourceRoot":"","sources":["../../../src/util/detect-cycles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAShE;;GAEG;AACH,wBAAgB,QAAQ,CACtB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,cAAc,EACtB,UAAU,GAAE,GAAG,CAAC,MAAM,CAAa,GAClC,OAAO,CAoCT"}

package/lib/util/detect-cycles.js

@@ -34,7 +34,7 @@ function hasCycle(projectSchema, schema, shapesSeen = new Set()) {
     return hasCycle(projectSchema, refShape.schema, immutableSetAdd(shapesSeen, refShape.name));
   }
 
-  const combo = schema.oneOf ?? schema.allOf ?? schema.anyOf;
+  const combo = schema.oneOf ?? schema.allOf;
 
   if (combo) {
     return combo.some(childSchema => hasCycle(projectSchema, childSchema, shapesSeen));

package/lib/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EASb,iBAAiB,EAElB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AAQnF,OAAO,EAAC,WAAW,EAAC,MAAM,KAAK,CAAC;AAqahC,oBAAY,sBAAsB,GAC9B;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC1D;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,eAAe,KAAK,sBAAsB,CAAC;CAClF;AACD,MAAM,WAAW,eAAe;IAC9B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC;CACnE;AA4ID;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,sBAAsB,CAqB9F;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAgBnE;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,OAAO,GAAG,SAAS,CAQpE;AAgBD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,CAQlE;AAqBD;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,gBAAgB,CASlF"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EASb,iBAAiB,EAElB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AAQnF,OAAO,EAAC,WAAW,EAAC,MAAM,KAAK,CAAC;AAwahC,oBAAY,sBAAsB,GAC9B;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC1D;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,eAAe,KAAK,sBAAsB,CAAC;CAClF;AACD,MAAM,WAAW,eAAe;IAC9B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC;CACnE;AA4ID;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,sBAAsB,CAqB9F;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAgBnE;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,OAAO,GAAG,SAAS,CAQpE;AAgBD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,CAQlE;AAqBD;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,gBAAgB,CASlF"}

package/lib/validate.js

@@ -224,7 +224,7 @@ function validateResolver(projectSchema, basePath, resolver) {
       }
 
       if (resolver.name.startsWith('takeshape')) {
-        var _options;
+        var _options, _indexedShapes;
 
         let shapeName;
 
@@ -238,7 +238,7 @@ function validateResolver(projectSchema, basePath, resolver) {
 
         const modelShape = shapeName ? projectSchema.shapes[shapeName] : undefined;
 
-        if (!(modelShape !== null && modelShape !== void 0 && modelShape.model)) {
+        if (!(modelShape !== null && modelShape !== void 0 && modelShape.model) && !(shapeName && (_indexedShapes = projectSchema.indexedShapes) !== null && _indexedShapes !== void 0 && _indexedShapes[shapeName])) {
           errors.push({
             type: 'notFound',
             path: basePath.concat(['options', 'model']),
@@ -364,8 +364,10 @@ function validateRefs(projectSchema, additionalShapeNames = builtInShapeNames) {
 }
 
 function validateDirectives(projectSchema, additionalShapeIds = builtInModelShapeIds) {
-  const errors = [];
-  const projectShapeIds = new Set([...getModelShapeIds(projectSchema.shapes), ...additionalShapeIds]);
+  const errors = []; // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+
+  const projectShapeIds = new Set([...getModelShapeIds(projectSchema.shapes), ...additionalShapeIds]); // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+
   (0, _schemaUtil.visitShapeProperties)(projectSchema.shapes, (schema, path) => {
     if (schema['@relationship']) {
       var _schema$Relationship;
@@ -397,7 +399,8 @@ function validateDirectives(projectSchema, additionalShapeIds = builtInModelShap
 }
 
 function validateOneOfs(projectSchema) {
-  const errors = [];
+  const errors = []; // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+
   (0, _schemaUtil.visitShapeProperties)(projectSchema.shapes, (schema, path) => {
     const oneOfPath = schema.items ? ['items', 'oneOf'] : ['oneOf'];
     schema = schema.items ? schema.items : schema;
@@ -414,7 +417,7 @@ function validateOneOfs(projectSchema) {
             message: `Invalid refs to ${shapeNames}. oneOf unions cannot reference model shapes. Use @relationship instead`
           });
         }
-      } else if (!(0, _enum.isEnumSchema)(schema)) {
+      } else if (!(0, _enum.isEnumLikeSchema)(schema)) {
         errors.push({
           type: 'json',
           path: path.concat(oneOfPath),

package/lib/workflows.d.ts

@@ -1,4 +1,4 @@
-import { ProjectSchema, ContentSchema, Workflow, WorkflowMap, WorkflowStep, Shape } from './project-schema';
+import { ProjectSchema, PropertySchema, Workflow, WorkflowMap, WorkflowStep, Shape } from './project-schema';
 export declare const defaultWorkflow: Workflow;
 export declare function getWorkflow(projectSchema: ProjectSchema, shapeId: string): Workflow;
 export interface StepContext {
@@ -7,7 +7,7 @@ export interface StepContext {
 }
 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: Shape): ContentSchema;
+export declare function getStatusField(workflows: WorkflowMap, shape: Shape): PropertySchema;
 export declare type WorkflowComparisonOperatorKey = 'lt' | 'lte' | 'gte' | 'gt' | 'eq' | 'in';
 export declare function getStepRange(steps: WorkflowStep[], index: number, op: WorkflowComparisonOperatorKey): WorkflowStep[];
 export declare function getWorkflowStepKeys(workflow: Workflow, stepKey: string, op: WorkflowComparisonOperatorKey): string[];

package/lib/workflows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflows.d.ts","sourceRoot":"","sources":["../../src/workflows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAC,MAAM,kBAAkB,CAAC;AAG1G,eAAO,MAAM,eAAe,EAAE,QAmB7B,CAAC;AAEF,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,QAAQ,CAGnF;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,KAAK,GAAG,aAAa,CAOlF;AAED,oBAAY,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,EAAC,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAC,MAAM,kBAAkB,CAAC;AAG3G,eAAO,MAAM,eAAe,EAAE,QAmB7B,CAAC;AAEF,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,QAAQ,CAGnF;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,KAAK,GAAG,cAAc,CAOnF;AAED,oBAAY,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "8.16.0",
+  "version": "8.20.2",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -21,9 +21,9 @@
     "examples"
   ],
   "dependencies": {
-    "@takeshape/errors": "8.16.0",
-    "@takeshape/json-schema": "8.16.0",
-    "@takeshape/util": "8.16.0",
+    "@takeshape/errors": "8.20.2",
+    "@takeshape/json-schema": "8.20.2",
+    "@takeshape/util": "8.20.2",
     "ajv": "^7.0.4",
     "ajv-formats": "^1.5.1",
     "lodash": "^4.17.20",
@@ -32,7 +32,7 @@
     "semver": "^7.3.2"
   },
   "devDependencies": {
-    "@takeshape/json-schema-to-typescript": "^10.1.6",
+    "@takeshape/json-schema-to-typescript": "^11.0.0",
     "@types/glob": "^7.1.3",
     "@types/lodash": "^4.14.165",
     "@types/semver": "^7.1.0",