@takeshape/schema 9.38.1 → 9.40.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/content-schema-transform.d.ts +1 -1
- package/dist/content-schema-transform.d.ts.map +1 -1
- package/dist/content-schema-transform.js +1 -1
- package/dist/migration/index.d.ts +1 -0
- package/dist/migration/index.d.ts.map +1 -1
- package/dist/migration/index.js +4 -1
- package/dist/migration/to/v3.32.0.d.ts +5 -0
- package/dist/migration/to/v3.32.0.d.ts.map +1 -0
- package/dist/migration/to/v3.32.0.js +107 -0
- package/dist/migration/types.d.ts +1 -3
- package/dist/migration/types.d.ts.map +1 -1
- package/dist/mocks.d.ts +3 -2
- package/dist/mocks.d.ts.map +1 -1
- package/dist/mocks.js +14 -0
- package/dist/project-schema/index.d.ts +4 -1
- package/dist/project-schema/index.d.ts.map +1 -1
- package/dist/project-schema/index.js +20 -3
- package/dist/project-schema/latest.d.ts +79 -88
- package/dist/project-schema/latest.d.ts.map +1 -1
- package/dist/project-schema/migrate.d.ts.map +1 -1
- package/dist/project-schema/migrate.js +4 -0
- package/dist/project-schema/v3.31.0.d.ts +1 -1
- package/dist/project-schema/v3.31.0.d.ts.map +1 -1
- package/dist/project-schema/v3.32.0.d.ts +1440 -0
- package/dist/project-schema/v3.32.0.d.ts.map +1 -0
- package/dist/project-schema/v3.32.0.js +5 -0
- package/dist/refs.d.ts +20 -1
- package/dist/refs.d.ts.map +1 -1
- package/dist/refs.js +90 -17
- package/dist/schema-util.d.ts +12 -10
- package/dist/schema-util.d.ts.map +1 -1
- package/dist/schema-util.js +31 -23
- package/dist/schemas/index.d.ts +2 -2
- package/dist/schemas/index.d.ts.map +1 -1
- package/dist/schemas/index.js +6 -4
- package/dist/schemas/index.ts +4 -2
- package/dist/schemas/project-schema/latest.json +59 -67
- package/dist/schemas/project-schema/v3.31.0.json +1 -4
- package/dist/schemas/project-schema/v3.32.0.json +3081 -0
- package/dist/schemas/project-schema.json +3 -0
- package/dist/template-shapes/templates.js +1 -1
- package/dist/template-shapes/where.js +2 -2
- package/dist/types/types.d.ts +6 -4
- package/dist/types/types.d.ts.map +1 -1
- package/dist/types/utils.d.ts +4 -2
- package/dist/types/utils.d.ts.map +1 -1
- package/dist/types/utils.js +22 -1
- package/dist/util/api-indexing.d.ts +4 -5
- package/dist/util/api-indexing.d.ts.map +1 -1
- package/dist/util/api-indexing.js +25 -16
- package/dist/util/merge.js +1 -1
- package/dist/util/patch-schema.d.ts.map +1 -1
- package/dist/util/patch-schema.js +1 -1
- package/dist/validate.d.ts.map +1 -1
- package/dist/validate.js +97 -31
- package/es/content-schema-transform.js +1 -1
- package/es/migration/index.js +3 -1
- package/es/migration/to/v3.32.0.js +98 -0
- package/es/mocks.js +12 -0
- package/es/project-schema/index.js +3 -1
- package/es/project-schema/migrate.js +5 -1
- package/es/project-schema/v3.32.0.js +1 -0
- package/es/refs.js +78 -17
- package/es/schema-util.js +24 -17
- package/es/schemas/index.js +4 -3
- package/es/schemas/index.ts +4 -2
- package/es/schemas/project-schema/latest.json +59 -67
- package/es/schemas/project-schema/v3.31.0.json +1 -4
- package/es/schemas/project-schema/v3.32.0.json +3081 -0
- package/es/schemas/project-schema.json +3 -0
- package/es/template-shapes/templates.js +2 -2
- package/es/template-shapes/where.js +3 -3
- package/es/types/utils.js +15 -0
- package/es/util/api-indexing.js +23 -16
- package/es/util/merge.js +1 -1
- package/es/util/patch-schema.js +1 -1
- package/es/validate.js +96 -31
- package/examples/latest/betzino.json +1 -1
- package/examples/latest/blog-schema.json +1 -1
- package/examples/latest/brewery-schema.json +1 -1
- package/examples/latest/complex-project-schema.json +1 -1
- package/examples/latest/complex-schema.json +1 -1
- package/examples/latest/fabric-ecommerce.json +1 -1
- package/examples/latest/frank-and-fred-schema.json +1 -1
- package/examples/latest/klirr-schema.json +1 -1
- package/examples/latest/massive-schema.json +1 -1
- package/examples/latest/mill-components-schema.json +1 -1
- package/examples/latest/one-earth.json +1 -1
- package/examples/latest/pet-oneof-array.json +1 -1
- package/examples/latest/post-schema.json +1 -1
- package/examples/latest/pruned-shopify-product-schema.json +1 -1
- package/examples/latest/real-world-schema.json +1 -1
- package/examples/latest/recursive-repeater-schema.json +1 -1
- package/examples/latest/recursive-schema.json +1 -1
- package/examples/latest/rick-and-morty-ast.json +1 -1
- package/examples/latest/rick-and-morty-graphql.json +1 -1
- package/examples/latest/rick-and-morty-rest.json +1 -1
- package/examples/latest/schema-with-repeater-draftjs.json +1 -1
- package/examples/latest/shape-books-v3_2_0.json +1 -1
- package/examples/latest/shape-books.json +1 -1
- package/examples/latest/shopify-lookbook.json +1 -1
- package/examples/latest/shopify-product-2022-07.json +1 -1
- package/examples/latest/shopify-product-2023-04.json +1 -1
- package/examples/latest/shopify-store-with-widget.json +1 -1
- package/examples/latest/stripe-product-runtime-schema.json +22 -23
- package/examples/latest/stripe-starter-resolved.json +1 -1
- package/examples/latest/user-schema-no-required.json +1 -1
- package/examples/latest/user-schema-with-defaults.json +1 -1
- package/package.json +5 -5
|
@@ -448,7 +448,7 @@ function getShapeListQueryArgs(templateName, legacyArgs) {
|
|
|
448
448
|
} = context;
|
|
449
449
|
const isAllShapes = shape.name === 'TSSearchable';
|
|
450
450
|
const shapeName = isAllShapes ? templateName : (0, _refs.getFlattenedTemplateShapeName)(shape.name, templateName);
|
|
451
|
-
const shapes = isAllShapes ? Object.values(projectSchema.shapes).filter(s => s.model !== undefined || (0, _schemaUtil.
|
|
451
|
+
const shapes = isAllShapes ? Object.values(projectSchema.shapes).filter(s => s.model !== undefined || (0, _schemaUtil.isCachedShape)(s)) : [shape];
|
|
452
452
|
const {
|
|
453
453
|
schema,
|
|
454
454
|
dependencies
|
|
@@ -325,7 +325,7 @@ function getFields(typeName, shapes, context) {
|
|
|
325
325
|
name,
|
|
326
326
|
prop,
|
|
327
327
|
workflowsEnabled: (0, _apiVersion.workflowsEnabled)(projectSchema.apiVersion),
|
|
328
|
-
isIndexedShape: (0, _schemaUtil.
|
|
328
|
+
isIndexedShape: (0, _schemaUtil.isCachedShape)(shape),
|
|
329
329
|
exceededRelationshipDepth: exceededRelationshipDepth(relationshipDepth)
|
|
330
330
|
})).getNodes();
|
|
331
331
|
|
|
@@ -365,7 +365,7 @@ function getPropertyComparisonType(name, prop, shapeName, context) {
|
|
|
365
365
|
name,
|
|
366
366
|
prop,
|
|
367
367
|
workflowsEnabled: (0, _apiVersion.workflowsEnabled)(projectSchema.apiVersion),
|
|
368
|
-
isIndexedShape: (0, _schemaUtil.
|
|
368
|
+
isIndexedShape: (0, _schemaUtil.isCachedShape)(projectSchema.shapes[shapeName]),
|
|
369
369
|
exceededRelationshipDepth: exceededRelationshipDepth(relationshipDepth)
|
|
370
370
|
})) {
|
|
371
371
|
return undefined;
|
package/dist/types/types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { SetRequired, Merge, PartialDeep, SetOptional } from 'type-fest';
|
|
2
|
-
import type { 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, ProjectSchemaV3_11_0, ProjectSchemaV3_12_0, ProjectSchemaV3_12_1, ProjectSchemaV3_12_2, ProjectSchemaV3_12_3, ProjectSchemaV3_13_0, ProjectSchemaV3_14_0, ProjectSchemaV3_15_0, ProjectSchemaV3_16_0, ProjectSchemaV3_17_0, ProjectSchemaV3_17_1, ProjectSchemaV3_18_0, ProjectSchemaV3_18_1, ProjectSchemaV3_18_2, ProjectSchemaV3_19_0, ProjectSchemaV3_20_0, ProjectSchemaV3_21_0, ProjectSchemaV3_22_0, ProjectSchemaV3_23_0, ProjectSchemaV3_24_0, ProjectSchemaV3_25_0, ProjectSchemaV3_26_0, ProjectSchemaV3_27_0, ProjectSchemaV3_28_0, ProjectSchemaV3_29_0, ProjectSchemaV3_30_0, ProjectSchemaV3_31_0, Query, PropertySchema, StoredServiceMap, ServiceConfig, OAuth2Authentication, CustomAuthentication, ServiceAuthentication, AnyProjectSchema, Ref,
|
|
2
|
+
import type { 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, ProjectSchemaV3_11_0, ProjectSchemaV3_12_0, ProjectSchemaV3_12_1, ProjectSchemaV3_12_2, ProjectSchemaV3_12_3, ProjectSchemaV3_13_0, ProjectSchemaV3_14_0, ProjectSchemaV3_15_0, ProjectSchemaV3_16_0, ProjectSchemaV3_17_0, ProjectSchemaV3_17_1, ProjectSchemaV3_18_0, ProjectSchemaV3_18_1, ProjectSchemaV3_18_2, ProjectSchemaV3_19_0, ProjectSchemaV3_20_0, ProjectSchemaV3_21_0, ProjectSchemaV3_22_0, ProjectSchemaV3_23_0, ProjectSchemaV3_24_0, ProjectSchemaV3_25_0, ProjectSchemaV3_26_0, ProjectSchemaV3_27_0, ProjectSchemaV3_28_0, ProjectSchemaV3_29_0, ProjectSchemaV3_30_0, ProjectSchemaV3_31_0, ProjectSchemaV3_32_0, Query, PropertySchema, StoredServiceMap, ServiceConfig, OAuth2Authentication, CustomAuthentication, ServiceAuthentication, AnyProjectSchema, Ref, CachedFragmentConfig, ListQueryLoaderConfig, GetQueryLoaderConfig, Shape } from '../project-schema';
|
|
3
3
|
import type { Overwrite } from '@takeshape/util';
|
|
4
4
|
import { SERVICE_OBJECT_PATTERN_NAME } from '../schema-util';
|
|
5
5
|
import { XMLParser } from 'fast-xml-parser';
|
|
@@ -8,7 +8,7 @@ import { XMLParser } from 'fast-xml-parser';
|
|
|
8
8
|
* only type used in most runtime code. Updating this to a new version should
|
|
9
9
|
* trigger type errors that clue you in to code that needs review.
|
|
10
10
|
*/
|
|
11
|
-
export type ProjectSchemaV3X = ProjectSchemaV3_31_0 | ProjectSchemaV3_30_0 | ProjectSchemaV3_29_0 | ProjectSchemaV3_28_0 | ProjectSchemaV3_27_0 | ProjectSchemaV3_26_0 | ProjectSchemaV3_25_0 | ProjectSchemaV3_24_0 | ProjectSchemaV3_23_0 | ProjectSchemaV3_22_0 | ProjectSchemaV3_21_0 | ProjectSchemaV3_20_0 | ProjectSchemaV3_19_0 | ProjectSchemaV3_18_2 | ProjectSchemaV3_18_1 | ProjectSchemaV3_18_0 | ProjectSchemaV3_17_1 | ProjectSchemaV3_17_0 | ProjectSchemaV3_16_0 | ProjectSchemaV3_15_0 | ProjectSchemaV3_14_0 | ProjectSchemaV3_13_0 | ProjectSchemaV3_12_3 | ProjectSchemaV3_12_2 | ProjectSchemaV3_12_1 | ProjectSchemaV3_12_0 | ProjectSchemaV3_11_0 | 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;
|
|
11
|
+
export type ProjectSchemaV3X = ProjectSchemaV3_32_0 | ProjectSchemaV3_31_0 | ProjectSchemaV3_30_0 | ProjectSchemaV3_29_0 | ProjectSchemaV3_28_0 | ProjectSchemaV3_27_0 | ProjectSchemaV3_26_0 | ProjectSchemaV3_25_0 | ProjectSchemaV3_24_0 | ProjectSchemaV3_23_0 | ProjectSchemaV3_22_0 | ProjectSchemaV3_21_0 | ProjectSchemaV3_20_0 | ProjectSchemaV3_19_0 | ProjectSchemaV3_18_2 | ProjectSchemaV3_18_1 | ProjectSchemaV3_18_0 | ProjectSchemaV3_17_1 | ProjectSchemaV3_17_0 | ProjectSchemaV3_16_0 | ProjectSchemaV3_15_0 | ProjectSchemaV3_14_0 | ProjectSchemaV3_13_0 | ProjectSchemaV3_12_3 | ProjectSchemaV3_12_2 | ProjectSchemaV3_12_1 | ProjectSchemaV3_12_0 | ProjectSchemaV3_11_0 | 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;
|
|
12
12
|
export type ProjectSchemaWithVersion = ProjectSchemaV3_23_0 | ProjectSchemaV3_22_0 | ProjectSchemaV3_21_0 | ProjectSchemaV3_20_0 | ProjectSchemaV3_19_0 | ProjectSchemaV3_18_2 | ProjectSchemaV3_18_1 | ProjectSchemaV3_18_0 | ProjectSchemaV3_17_1 | ProjectSchemaV3_17_0 | ProjectSchemaV3_16_0 | ProjectSchemaV3_15_0 | ProjectSchemaV3_14_0 | ProjectSchemaV3_13_0 | ProjectSchemaV3_12_3 | ProjectSchemaV3_12_2 | ProjectSchemaV3_12_1 | ProjectSchemaV3_12_0 | ProjectSchemaV3_11_0 | 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 | ProjectSchemaV1_0_0;
|
|
13
13
|
export declare const projectSchemaImportOptionalProps: readonly ["projectId", "locales", "defaultLocale", "author"];
|
|
14
14
|
export declare const legacyProjectSchemaImportOptionalProps: readonly ["created", "updated", "version", "dataKey"];
|
|
@@ -201,11 +201,13 @@ export interface RelationshipEnv {
|
|
|
201
201
|
schema: PropertySchema;
|
|
202
202
|
shapeName: string;
|
|
203
203
|
}
|
|
204
|
-
export type
|
|
204
|
+
export type CachedShape = SetRequired<Shape, 'loaders' | 'cache'>;
|
|
205
|
+
export type CachedShapeMap = Record<string, CachedShape>;
|
|
206
|
+
export type ListQueryIndexingConfig = CachedFragmentConfig & ListQueryLoaderConfig & {
|
|
205
207
|
shapeName: string;
|
|
206
208
|
idField: string;
|
|
207
209
|
};
|
|
208
|
-
export type GetQueryIndexingConfig =
|
|
210
|
+
export type GetQueryIndexingConfig = CachedFragmentConfig & GetQueryLoaderConfig & {
|
|
209
211
|
shapeName: string;
|
|
210
212
|
idField: string;
|
|
211
213
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,WAAW,CAAC;AAC5E,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,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,KAAK,EACL,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,EACrB,gBAAgB,EAChB,GAAG,EACH,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types/types.ts"],"names":[],"mappings":"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"}
|
package/dist/types/utils.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { ProjectSchema, DirectiveMappingArray, DirectiveMappingMap, DirectiveConfig, ParameterSerializeOptions, ParameterSerializeContentOptions, ParameterSerializeStyleOptions, BasicResolver, ComposeResolver, GraphqlResolver, TakeshapeResolver, ShapedbResolver, RestResolver, AwsLambdaResolver, UtilResolver, ObjectSchema, ReturnShapeArraySchema, ShapeSchemaEnum, RefSchema, RefSchemaLegacy, PropertySchema, AnyServiceConfig, ServiceAuthentication, BearerAuthentication, BasicAuthentication, OAuth2Authentication, OAuth2BearerAuthentication, SearchParamsAuthentication, CustomAuthentication, ParameterOp, ParameterOpNested, ParameterOpMapping, ParameterOpValue, ParameterOpOp, ParameterSerializeStyleOptionsForSearchParams, ParameterSerializeStyleOptionsForPathParams, OneOfSchema, AllOfSchema, ExtendsSchema, ServiceResolver, ReturnShape } from '../project-schema';
|
|
1
|
+
import type { ProjectSchema, DirectiveMappingArray, DirectiveMappingMap, DirectiveConfig, ParameterSerializeOptions, ParameterSerializeContentOptions, ParameterSerializeStyleOptions, BasicResolver, ComposeResolver, GraphqlResolver, TakeshapeResolver, ShapedbResolver, RestResolver, AwsLambdaResolver, UtilResolver, ObjectSchema, ReturnShapeArraySchema, ShapeSchemaEnum, RefSchema, RefSchemaLegacy, PropertySchema, AnyServiceConfig, ServiceAuthentication, BearerAuthentication, BasicAuthentication, OAuth2Authentication, OAuth2BearerAuthentication, SearchParamsAuthentication, CustomAuthentication, ParameterOp, ParameterOpNested, ParameterOpMapping, ParameterOpValue, ParameterOpOp, ParameterSerializeStyleOptionsForSearchParams, ParameterSerializeStyleOptionsForPathParams, OneOfSchema, AllOfSchema, ExtendsSchema, ServiceResolver, ReturnShape, ShapeMap } from '../project-schema';
|
|
2
2
|
import type { Maybe } from '@takeshape/util';
|
|
3
|
-
import type { ShopifyServiceConfig, RESTServiceConfig, GraphQLServiceConfig, OpenAPIServiceConfig, EncryptedServiceConfig, SchemaWithArgs, SchemaWithRef, ServiceConfigWithOAuth2Authentication, ServiceConfigWithCustomAuthentication, LatestProjectSchemaWithServices, ProjectSchemaV3X, PropertySchemaWithRelationship } from './types';
|
|
3
|
+
import type { ShopifyServiceConfig, RESTServiceConfig, GraphQLServiceConfig, OpenAPIServiceConfig, EncryptedServiceConfig, SchemaWithArgs, SchemaWithRef, ServiceConfigWithOAuth2Authentication, ServiceConfigWithCustomAuthentication, LatestProjectSchemaWithServices, ProjectSchemaV3X, PropertySchemaWithRelationship, CachedShape } from './types';
|
|
4
4
|
import { ArgsType, RefType } from './types';
|
|
5
5
|
/** Resolver Type Utils **/
|
|
6
6
|
/**
|
|
@@ -105,4 +105,6 @@ export declare const getArgsType: (argsSchema: SchemaWithArgs) => Maybe<ArgsType
|
|
|
105
105
|
*/
|
|
106
106
|
export declare const getRefType: (refSchema: SchemaWithRef) => Maybe<RefType>;
|
|
107
107
|
export declare function isPropertySchemaWithRelationship(schema: PropertySchema): schema is PropertySchemaWithRelationship;
|
|
108
|
+
export declare function listCachedShapes(shapes: ShapeMap): CachedShape[];
|
|
109
|
+
export declare function getCachedShapeMap(shapes: ShapeMap): Record<string, CachedShape>;
|
|
108
110
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/types/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,qBAAqB,EACrB,mBAAmB,EACnB,eAAe,EACf,yBAAyB,EACzB,gCAAgC,EAChC,8BAA8B,EAC9B,aAAa,EACb,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,sBAAsB,EACtB,eAAe,EACf,SAAS,EACT,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACrB,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,0BAA0B,EAC1B,0BAA0B,EAC1B,oBAAoB,EACpB,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,6CAA6C,EAC7C,2CAA2C,EAC3C,WAAW,EACX,WAAW,EACX,aAAa,EACb,eAAe,EACf,WAAW,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/types/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/types/utils.js
CHANGED
|
@@ -3,7 +3,9 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
6
|
+
exports.getArgsType = void 0;
|
|
7
|
+
exports.getCachedShapeMap = getCachedShapeMap;
|
|
8
|
+
exports.getRefType = void 0;
|
|
7
9
|
exports.isAllOfSchema = isAllOfSchema;
|
|
8
10
|
exports.isAnyServiceConfig = isAnyServiceConfig;
|
|
9
11
|
exports.isArraySchema = isArraySchema;
|
|
@@ -52,6 +54,7 @@ exports.isShopifyServiceConfig = isShopifyServiceConfig;
|
|
|
52
54
|
exports.isTakeshapeResolver = isTakeshapeResolver;
|
|
53
55
|
exports.isUtilResolver = isUtilResolver;
|
|
54
56
|
exports.isV3XSchema = isV3XSchema;
|
|
57
|
+
exports.listCachedShapes = listCachedShapes;
|
|
55
58
|
|
|
56
59
|
var _util = require("@takeshape/util");
|
|
57
60
|
|
|
@@ -73,6 +76,8 @@ var _satisfies = _interopRequireDefault(require("semver/functions/satisfies"));
|
|
|
73
76
|
|
|
74
77
|
var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
|
|
75
78
|
|
|
79
|
+
var _schemaUtil = require("../schema-util");
|
|
80
|
+
|
|
76
81
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
77
82
|
|
|
78
83
|
/** Resolver Type Utils **/
|
|
@@ -400,4 +405,20 @@ function isPropertySchemaWithRelationship(schema) {
|
|
|
400
405
|
var _schema$Resolver;
|
|
401
406
|
|
|
402
407
|
return ((_schema$Resolver = schema['@resolver']) === null || _schema$Resolver === void 0 ? void 0 : _schema$Resolver.name) === 'shapedb:getRelated';
|
|
408
|
+
}
|
|
409
|
+
|
|
410
|
+
function listCachedShapes(shapes) {
|
|
411
|
+
return Object.values(shapes).filter(_schemaUtil.isCachedShape);
|
|
412
|
+
}
|
|
413
|
+
|
|
414
|
+
function getCachedShapeMap(shapes) {
|
|
415
|
+
const results = {};
|
|
416
|
+
|
|
417
|
+
for (const shape of Object.values(shapes)) {
|
|
418
|
+
if ((0, _schemaUtil.isCachedShape)(shape)) {
|
|
419
|
+
results[shape.name] = shape;
|
|
420
|
+
}
|
|
421
|
+
}
|
|
422
|
+
|
|
423
|
+
return results;
|
|
403
424
|
}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import type { ProjectSchema } from '../project-schema';
|
|
1
|
+
import type { ShapeLoaders, ProjectSchema } from '../project-schema';
|
|
2
2
|
import type { Maybe } from '@takeshape/util';
|
|
3
3
|
import type { GetQueryIndexingConfig, ListQueryIndexingConfig } from '../types';
|
|
4
|
-
import { IndexedShapeQueriesConfig } from '../project-schema';
|
|
5
4
|
export declare function serviceHasIndexedShapes(schema: ProjectSchema, serviceId: string): boolean;
|
|
6
|
-
export declare function getIndexedServices(projectSchema: ProjectSchema, configs:
|
|
7
|
-
type Getter<T> = (context: Pick<ProjectSchema, '
|
|
5
|
+
export declare function getIndexedServices(projectSchema: ProjectSchema, configs: ShapeLoaders[keyof ShapeLoaders]): string[];
|
|
6
|
+
type Getter<T> = (context: Pick<ProjectSchema, 'shapes'>, shapeName: string) => T;
|
|
8
7
|
export declare const getListQueryIndexConfigs: Getter<ListQueryIndexingConfig[]>;
|
|
9
|
-
export declare const getGetQueryIndexConfig: Getter<GetQueryIndexingConfig
|
|
8
|
+
export declare const getGetQueryIndexConfig: Getter<Maybe<GetQueryIndexingConfig>>;
|
|
10
9
|
export {};
|
|
11
10
|
//# sourceMappingURL=api-indexing.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-indexing.d.ts","sourceRoot":"","sources":["../../../src/util/api-indexing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"api-indexing.d.ts","sourceRoot":"","sources":["../../../src/util/api-indexing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAoD,MAAM,mBAAmB,CAAC;AACtH,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAC,sBAAsB,EAAE,uBAAuB,EAAC,MAAM,UAAU,CAAC;AAO9E,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAgBzF;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM,YAAY,CAAC,YAMzG;AAoBD,KAAK,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC,CAAC;AA4BlF,eAAO,MAAM,wBAAwB,mCAAoC,CAAC;AAC1E,eAAO,MAAM,sBAAsB,uCAAmC,CAAC"}
|
|
@@ -14,17 +14,24 @@ var _util = require("@takeshape/util");
|
|
|
14
14
|
|
|
15
15
|
var _services = require("../services");
|
|
16
16
|
|
|
17
|
+
var _schemaUtil = require("../schema-util");
|
|
18
|
+
|
|
19
|
+
var _refs = require("../refs");
|
|
20
|
+
|
|
17
21
|
function serviceHasIndexedShapes(schema, serviceId) {
|
|
18
|
-
for (const
|
|
19
|
-
|
|
22
|
+
for (const shape of Object.values(schema.shapes ?? {})) {
|
|
23
|
+
var _shape$loaders;
|
|
24
|
+
|
|
25
|
+
const indexingEnabled = (0, _schemaUtil.isCachedShape)(shape);
|
|
26
|
+
const listConfigs = (_shape$loaders = shape.loaders) === null || _shape$loaders === void 0 ? void 0 : _shape$loaders.list;
|
|
20
27
|
|
|
21
|
-
if (listConfigs) {
|
|
28
|
+
if (indexingEnabled && listConfigs) {
|
|
22
29
|
for (const {
|
|
23
|
-
|
|
30
|
+
query: queryRef
|
|
24
31
|
} of (0, _util.ensureArray)(listConfigs)) {
|
|
25
|
-
const
|
|
32
|
+
const resolved = (0, _refs.getQuery)(schema, queryRef);
|
|
26
33
|
|
|
27
|
-
if (
|
|
34
|
+
if (resolved && (0, _types.isServiceResolver)(resolved.query.resolver) && resolved.query.resolver.service === serviceId) {
|
|
28
35
|
return true;
|
|
29
36
|
}
|
|
30
37
|
}
|
|
@@ -36,9 +43,8 @@ function serviceHasIndexedShapes(schema, serviceId) {
|
|
|
36
43
|
|
|
37
44
|
function getIndexedServices(projectSchema, configs) {
|
|
38
45
|
return (0, _util.ensureArray)(configs).reduce((services, queryConfig) => {
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
return query ? [...services, ...(0, _services.getResolverServices)(query.resolver)] : services;
|
|
46
|
+
const resolved = queryConfig !== null && queryConfig !== void 0 && queryConfig.query ? (0, _refs.getQuery)(projectSchema, queryConfig.query) : undefined;
|
|
47
|
+
return resolved !== null && resolved !== void 0 && resolved.query ? [...services, ...(0, _services.getResolverServices)(resolved.query.resolver)] : services;
|
|
42
48
|
}, []);
|
|
43
49
|
}
|
|
44
50
|
|
|
@@ -52,27 +58,30 @@ function flattenListQueryConfigs(base, queryConfig, maybeConfigArray) {
|
|
|
52
58
|
|
|
53
59
|
function getQueryIndexConfigHelper(op) {
|
|
54
60
|
return ({
|
|
55
|
-
|
|
61
|
+
shapes
|
|
56
62
|
}, shapeName) => {
|
|
57
|
-
const
|
|
63
|
+
const {
|
|
64
|
+
cache,
|
|
65
|
+
loaders
|
|
66
|
+
} = shapes[shapeName] ?? {};
|
|
58
67
|
|
|
59
|
-
if (
|
|
60
|
-
const idField =
|
|
68
|
+
if (cache && loaders) {
|
|
69
|
+
const idField = cache.idField ?? 'id';
|
|
61
70
|
|
|
62
71
|
if (op === 'list') {
|
|
63
72
|
return flattenListQueryConfigs({
|
|
64
73
|
shapeName,
|
|
65
74
|
idField
|
|
66
|
-
},
|
|
75
|
+
}, cache.fragment, loaders.list);
|
|
67
76
|
}
|
|
68
77
|
|
|
69
|
-
const queryConfig =
|
|
78
|
+
const queryConfig = loaders.get;
|
|
70
79
|
|
|
71
80
|
if (queryConfig) {
|
|
72
81
|
return {
|
|
73
82
|
idField,
|
|
74
83
|
shapeName,
|
|
75
|
-
...
|
|
84
|
+
...cache.fragment,
|
|
76
85
|
...queryConfig
|
|
77
86
|
};
|
|
78
87
|
}
|
package/dist/util/merge.js
CHANGED
|
@@ -136,7 +136,7 @@ function mergeFormConfigs(...configs) {
|
|
|
136
136
|
});
|
|
137
137
|
}
|
|
138
138
|
|
|
139
|
-
const mergeableSections = ['shapes', 'mutations', 'queries', 'forms', 'services'
|
|
139
|
+
const mergeableSections = ['shapes', 'mutations', 'queries', 'forms', 'services'];
|
|
140
140
|
|
|
141
141
|
const isMergeableSection = str => {
|
|
142
142
|
return mergeableSections.includes(str);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch-schema.d.ts","sourceRoot":"","sources":["../../../src/util/patch-schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"patch-schema.d.ts","sourceRoot":"","sources":["../../../src/util/patch-schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAKvD,wBAAgB,YAAY,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,EACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,SAAS,GAC3C,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAenB;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,aAAa,EAAE,aAAa,EAAE,CAAC,EAAE,MAAM,EAAE,mBAAmB,GAAG,CAAC,CAcrG"}
|
|
@@ -12,7 +12,7 @@ var _omit = _interopRequireDefault(require("lodash/omit"));
|
|
|
12
12
|
|
|
13
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
14
14
|
|
|
15
|
-
const schemaUpdateMergedKeys = ['queries', 'mutations', 'shapes', 'workflows', 'forms', 'services'
|
|
15
|
+
const schemaUpdateMergedKeys = ['queries', 'mutations', 'shapes', 'workflows', 'forms', 'services'];
|
|
16
16
|
|
|
17
17
|
function shallowMerge(original, update) {
|
|
18
18
|
const result = { ...original
|
package/dist/validate.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,WAAW,EAAC,MAAM,KAAK,CAAC;AACvD,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAmB,mBAAmB,EAAE,UAAU,EAAc,MAAM,eAAe,CAAC;AAClG,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,WAAW,EAAC,MAAM,KAAK,CAAC;AACvD,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAmB,mBAAmB,EAAE,UAAU,EAAc,MAAM,eAAe,CAAC;AAClG,OAAO,KAAK,EAEV,gBAAgB,EAChB,aAAa,EAqBd,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAwB,yBAAyB,EAAC,MAAM,mBAAmB,CAAC;AA0CnF,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AA46BtC,MAAM,MAAM,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,qBAAqB,KAAK,sBAAsB,CAAC;CACxF;AACD,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;AAEpE,MAAM,WAAW,eAAgB,SAAQ,qBAAqB;IAC5D,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,MAAM,yBAAyB,GAAG,WAAW,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;AAiKrF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,qBAA0B,GAAG,sBAAsB,CAmB9G;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CA6B5G;AAED,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAgBzE;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,OAAO,GAAG,SAAS,CAQpE;AAgBD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,CAQrE;AAED,MAAM,MAAM,mCAAmC,GAC3C;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GAC7D;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,yBAAyB,EAAE,CAAA;CAAC,CAAC;AAE3E;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,OAAO,GAAG,mCAAmC,CAIrG;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,OAAO,GAAG,mBAAmB,CAQxF"}
|
package/dist/validate.js
CHANGED
|
@@ -74,6 +74,8 @@ var _get = _interopRequireDefault(require("lodash/get"));
|
|
|
74
74
|
|
|
75
75
|
var _gte = _interopRequireDefault(require("semver/functions/gte"));
|
|
76
76
|
|
|
77
|
+
var _lte = _interopRequireDefault(require("semver/functions/lte"));
|
|
78
|
+
|
|
77
79
|
var _size = _interopRequireDefault(require("lodash/size"));
|
|
78
80
|
|
|
79
81
|
var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
|
|
@@ -260,10 +262,24 @@ function validateResolver(projectSchema, basePath, baseResolver) {
|
|
|
260
262
|
};
|
|
261
263
|
|
|
262
264
|
const isValidShapeName = shapeName => {
|
|
263
|
-
var _indexedShapes;
|
|
265
|
+
var _indexedShapes, _modernShape$cache;
|
|
266
|
+
|
|
267
|
+
if (!shapeName) {
|
|
268
|
+
return false;
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
const shape = projectSchema.shapes[shapeName];
|
|
272
|
+
|
|
273
|
+
if (shape !== null && shape !== void 0 && shape.model) {
|
|
274
|
+
return true;
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
if ((_indexedShapes = projectSchema.indexedShapes) !== null && _indexedShapes !== void 0 && _indexedShapes[shapeName]) {
|
|
278
|
+
return true;
|
|
279
|
+
}
|
|
264
280
|
|
|
265
|
-
const
|
|
266
|
-
return Boolean((
|
|
281
|
+
const modernShape = shape;
|
|
282
|
+
return Boolean((modernShape === null || modernShape === void 0 ? void 0 : (_modernShape$cache = modernShape.cache) === null || _modernShape$cache === void 0 ? void 0 : _modernShape$cache.enabled) && modernShape.loaders);
|
|
267
283
|
};
|
|
268
284
|
|
|
269
285
|
const delegateResolverMissingConfig = (parsed, resolver) => {
|
|
@@ -495,6 +511,49 @@ function validateIndexedShapeConfig(projectSchema, shapeName, config) {
|
|
|
495
511
|
return errors;
|
|
496
512
|
}
|
|
497
513
|
|
|
514
|
+
function validateShapeLoaders(projectSchema, shape) {
|
|
515
|
+
const errors = [];
|
|
516
|
+
|
|
517
|
+
if ('loaders' in shape) {
|
|
518
|
+
var _loaders, _loaders2;
|
|
519
|
+
|
|
520
|
+
const getNamespace = (0, _refs.createGetNamespace)(projectSchema);
|
|
521
|
+
const listLoader = (_loaders = shape.loaders) === null || _loaders === void 0 ? void 0 : _loaders.list;
|
|
522
|
+
|
|
523
|
+
if (listLoader) {
|
|
524
|
+
(0, _util.ensureArray)(listLoader).forEach((config, i) => {
|
|
525
|
+
const ref = (0, _refs.parsePropertyRef)(config.query);
|
|
526
|
+
const query = ref && (0, _get.default)(projectSchema, (0, _refs.propertyRefItemToPath)(getNamespace, ref));
|
|
527
|
+
|
|
528
|
+
if (!query) {
|
|
529
|
+
errors.push({
|
|
530
|
+
path: Array.isArray(listLoader) ? ['shapes', shape.name, 'loaders', 'list', i, 'query'] : ['shapes', shape.name, 'loaders', 'list', 'query'],
|
|
531
|
+
type: 'notFound',
|
|
532
|
+
message: `Invalid query "${config.query}"`
|
|
533
|
+
});
|
|
534
|
+
}
|
|
535
|
+
});
|
|
536
|
+
}
|
|
537
|
+
|
|
538
|
+
const getLoader = (_loaders2 = shape.loaders) === null || _loaders2 === void 0 ? void 0 : _loaders2.get;
|
|
539
|
+
|
|
540
|
+
if (getLoader) {
|
|
541
|
+
const ref = (0, _refs.parsePropertyRef)(getLoader.query);
|
|
542
|
+
const query = ref && (0, _get.default)(projectSchema, (0, _refs.propertyRefItemToPath)(getNamespace, ref));
|
|
543
|
+
|
|
544
|
+
if (!query) {
|
|
545
|
+
errors.push({
|
|
546
|
+
path: ['shapes', shape.name, 'loaders', 'get', 'query'],
|
|
547
|
+
type: 'notFound',
|
|
548
|
+
message: `Invalid query "${getLoader.query}"`
|
|
549
|
+
});
|
|
550
|
+
}
|
|
551
|
+
}
|
|
552
|
+
}
|
|
553
|
+
|
|
554
|
+
return errors;
|
|
555
|
+
}
|
|
556
|
+
|
|
498
557
|
function visitProperties(projectSchema, callback) {
|
|
499
558
|
(0, _jsonpathPlus.JSONPath)('$..properties.*', projectSchema, (property, _type, {
|
|
500
559
|
path: propertyPath
|
|
@@ -504,50 +563,57 @@ function visitProperties(projectSchema, callback) {
|
|
|
504
563
|
}
|
|
505
564
|
|
|
506
565
|
function validateIndexedShapes(projectSchema) {
|
|
507
|
-
|
|
566
|
+
const errors = [];
|
|
567
|
+
const version = getSemver(projectSchema.schemaVersion);
|
|
508
568
|
|
|
509
|
-
if ((0, _gt.default)(
|
|
569
|
+
if ((0, _gt.default)(version, '3.12.0') && (0, _lte.default)(version, '3.31.0')) {
|
|
510
570
|
const {
|
|
511
571
|
indexedShapes
|
|
512
572
|
} = projectSchema;
|
|
513
573
|
|
|
514
574
|
if (indexedShapes) {
|
|
515
575
|
(0, _forOwn.default)(indexedShapes, (config, shapeName) => {
|
|
516
|
-
errors
|
|
576
|
+
errors.push(...validateIndexedShapeConfig(projectSchema, shapeName, config));
|
|
517
577
|
});
|
|
518
578
|
}
|
|
519
|
-
}
|
|
520
|
-
|
|
521
|
-
if ((0, _gt.default)(getSemver(projectSchema.schemaVersion), '3.26.0')) {
|
|
579
|
+
} else if ((0, _gt.default)(version, '3.31.0')) {
|
|
522
580
|
const {
|
|
523
|
-
|
|
581
|
+
shapes
|
|
524
582
|
} = projectSchema;
|
|
525
583
|
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
visitProperties(projectSchema, (property, propertyPath) => {
|
|
529
|
-
const indexed = property['@indexed'];
|
|
584
|
+
for (const shape of Object.values(shapes)) {
|
|
585
|
+
const newErrors = validateShapeLoaders(projectSchema, shape);
|
|
530
586
|
|
|
531
|
-
|
|
532
|
-
|
|
587
|
+
if (newErrors.length) {
|
|
588
|
+
errors.push(...newErrors);
|
|
589
|
+
}
|
|
590
|
+
}
|
|
591
|
+
}
|
|
533
592
|
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
message: 'Nested indexes may only appear next to fields of type: "array"'
|
|
539
|
-
});
|
|
540
|
-
}
|
|
541
|
-
}
|
|
542
|
-
});
|
|
593
|
+
if ((0, _gt.default)(version, '3.26.0')) {
|
|
594
|
+
let nestedCount = 0;
|
|
595
|
+
visitProperties(projectSchema, (property, propertyPath) => {
|
|
596
|
+
const indexed = property['@indexed'];
|
|
543
597
|
|
|
544
|
-
if (
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
598
|
+
if ((0, _util.isRecord)(indexed) && indexed.nested) {
|
|
599
|
+
nestedCount += 1;
|
|
600
|
+
|
|
601
|
+
if (property.type !== 'array') {
|
|
602
|
+
errors.push({
|
|
603
|
+
path: propertyPath,
|
|
604
|
+
type: 'location',
|
|
605
|
+
message: 'Nested indexes may only appear next to fields of type: "array"'
|
|
606
|
+
});
|
|
607
|
+
}
|
|
550
608
|
}
|
|
609
|
+
});
|
|
610
|
+
|
|
611
|
+
if (nestedCount > 50) {
|
|
612
|
+
errors.push({
|
|
613
|
+
path: ['shapes'],
|
|
614
|
+
type: 'tooMany',
|
|
615
|
+
message: `${nestedCount} nested indexes found`
|
|
616
|
+
});
|
|
551
617
|
}
|
|
552
618
|
}
|
|
553
619
|
|
|
@@ -96,7 +96,7 @@ export function getContentTransform({
|
|
|
96
96
|
const result = {};
|
|
97
97
|
const assigned = new Set();
|
|
98
98
|
forEach(schema.properties, (fieldSchema, name) => {
|
|
99
|
-
const sourceKeys = ensureArray(sourceKeyTransform(name, fieldSchema));
|
|
99
|
+
const sourceKeys = ensureArray(sourceKeyTransform(name, fieldSchema, obj));
|
|
100
100
|
|
|
101
101
|
for (const sourceKey of sourceKeys) {
|
|
102
102
|
const value = prepare(fieldSchema, obj === null || obj === void 0 ? void 0 : obj[sourceKey], name);
|
package/es/migration/index.js
CHANGED
|
@@ -37,6 +37,7 @@ import migrateToV3_28_0 from './to/v3.28.0';
|
|
|
37
37
|
import migrateToV3_29_0 from './to/v3.29.0';
|
|
38
38
|
import migrateToV3_30_0 from './to/v3.30.0';
|
|
39
39
|
import migrateToV3_31_0 from './to/v3.31.0';
|
|
40
|
+
import migrateToV3_32_0 from './to/v3.32.0';
|
|
40
41
|
export const migrateTo = {
|
|
41
42
|
'v3.0.0': migrateToV3_0_0,
|
|
42
43
|
'v3.1.0': migrateToV3_1_0,
|
|
@@ -76,7 +77,8 @@ export const migrateTo = {
|
|
|
76
77
|
'v3.28.0': migrateToV3_28_0,
|
|
77
78
|
'v3.29.0': migrateToV3_29_0,
|
|
78
79
|
'v3.30.0': migrateToV3_30_0,
|
|
79
|
-
'v3.31.0': migrateToV3_31_0
|
|
80
|
+
'v3.31.0': migrateToV3_31_0,
|
|
81
|
+
'v3.32.0': migrateToV3_32_0
|
|
80
82
|
};
|
|
81
83
|
export * from './utils';
|
|
82
84
|
export const listTypePrefix = 'PaginatedList';
|