@luvio/compiler 0.138.3 → 0.138.5
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/codegen/graphql/graphql-dsl.d.ts +1 -1
- package/dist/codegen/graphql/source-printer/graphql-type-source-printer.d.ts +1 -1
- package/dist/codegen/graphql/utils/types.d.ts +1 -1
- package/dist/codegen/pagination-utils/cursor-based.js +22 -10
- package/dist/codegen/pagination-utils/cursor-based.js.map +1 -1
- package/dist/intermediate/adapter-annotation.d.ts +1 -1
- package/dist/intermediate/inheritance.d.ts +2 -2
- package/dist/intermediate/model-info.d.ts +5 -5
- package/dist/intermediate/pagination.d.ts +4 -4
- package/dist/intermediate/resource.d.ts +3 -3
- package/dist/intermediate/shape-key.d.ts +3 -3
- package/dist/intermediate/utils.d.ts +1 -1
- package/dist/parser/annotation-key.d.ts +1 -1
- package/dist/parser/main.d.ts +3 -3
- package/dist/parser/overlay-resolution.js +1 -2
- package/dist/parser/overlay-resolution.js.map +1 -1
- package/dist/parser/parse.js +5 -1
- package/dist/parser/parse.js.map +1 -1
- package/dist/parser/shape-inheritance.d.ts +1 -1
- package/dist/plugin.d.ts +1 -1
- package/dist/utils/imports.js.map +1 -1
- package/package.json +4 -4
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { GraphQLSchema, GraphQLScalarType } from '@luvio/graphql-parser';
|
|
2
2
|
import type { GraphQLTypeExtension, LuvioGraphQLDSL, LuvioGraphQLDSLParams } from '../../intermediate/graphql';
|
|
3
|
-
|
|
3
|
+
type GraphQLTypeExtensions = Record<string, GraphQLTypeExtension>;
|
|
4
4
|
export declare class GraphQLDSL implements LuvioGraphQLDSL {
|
|
5
5
|
schema: Readonly<GraphQLSchema>;
|
|
6
6
|
schemaName: Readonly<string>;
|
|
@@ -7,7 +7,7 @@ import type { GraphQLResource } from '../../../intermediate/resource';
|
|
|
7
7
|
import type { ModelInfo } from '../../../main';
|
|
8
8
|
import type { CompilerPlugin } from '../../../plugin';
|
|
9
9
|
export declare const GRAPHQL_OBJECT_TYPENAME = "typeName";
|
|
10
|
-
export
|
|
10
|
+
export type GraphQLTypeGenerationResult = Record<string, string>;
|
|
11
11
|
export declare class GraphQLTypeSourcePrinter implements GraphQLTypePrinter {
|
|
12
12
|
generate(graphQLResource: GraphQLResource, compilerBaseOutputDir: path.ParsedPath, metadata: GraphQLCodegenMetadata, modelInfo: ModelInfo, plugin?: CompilerPlugin): GraphQLTypeGenerationResult;
|
|
13
13
|
createGraphQLTypeImportContext(compilerBaseOutputDir: path.ParsedPath, defName: string, plugin?: CompilerPlugin): {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { GraphQLSchema, GraphQLInterfaceType, GraphQLObjectType, TypeNode, ObjectTypeDefinitionNode, FieldDefinitionNode, InterfaceTypeDefinitionNode, GraphQLUnionType, UnionTypeDefinitionNode } from '@luvio/graphql-parser';
|
|
2
2
|
import type { ShapeTtls } from '../../../intermediate/model-info';
|
|
3
|
-
export
|
|
3
|
+
export type NormalizableTypes = Record<string, GraphQLInterfaceType | GraphQLObjectType<any, any> | GraphQLUnionType>;
|
|
4
4
|
export declare function resolveTypeName(typeNode: TypeNode): string;
|
|
5
5
|
export declare function resolveFieldTypeName(schema: GraphQLSchema, field: any): string | null;
|
|
6
6
|
/**
|
|
@@ -293,17 +293,29 @@ const OPTIMIZE_PAGINATION = (0, deindent_1.default) `
|
|
|
293
293
|
afterArgName: string,
|
|
294
294
|
variables: any,
|
|
295
295
|
): void {
|
|
296
|
-
if (typeof metadata === 'object' && metadata !== null
|
|
296
|
+
if (typeof metadata === 'object' && metadata !== null) {
|
|
297
|
+
const requestedAfterCursor = variables[afterArgName];
|
|
298
|
+
const afterCursorOffset = offsetFromToken(metadata, requestedAfterCursor);
|
|
297
299
|
// optimize only if after cursor is unspecified in the request or it's already loaded in metadata
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
const
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
300
|
+
if(afterCursorOffset >= 0) {
|
|
301
|
+
const requestedItems = variables[firstArgName];
|
|
302
|
+
const atMostOffset = afterCursorOffset + requestedItems; // The largest offset we care about for this page.
|
|
303
|
+
const lastTokenAndOffset = tokenForAtMost(metadata, atMostOffset);
|
|
304
|
+
if (lastTokenAndOffset !== undefined) {
|
|
305
|
+
const [token, offset] = lastTokenAndOffset;
|
|
306
|
+
const isSubpage = atMostOffset === offset; // We already have all the cursors we seem to need
|
|
307
|
+
const isExactPagination = atMostOffset === offset + requestedItems; // Using the last cursor we have to paginate
|
|
308
|
+
|
|
309
|
+
if(!(isSubpage || isExactPagination)) { // If we're asking for more than we have, only request what we're missing.
|
|
310
|
+
const existingItems = afterCursorOffset === 0 ? offset + 1: offset - afterCursorOffset;
|
|
311
|
+
const itemsToRequest = requestedItems - existingItems;
|
|
312
|
+
variables[firstArgName + '${constants_2.PAGINATION_OPTIMIZATION_ORIGINAL_VARIABLE_SUFFIX}'] = requestedItems;
|
|
313
|
+
variables[firstArgName] = itemsToRequest;
|
|
314
|
+
variables[afterArgName + '${constants_2.PAGINATION_OPTIMIZATION_ORIGINAL_VARIABLE_SUFFIX}'] = requestedAfterCursor;
|
|
315
|
+
variables[afterArgName] = token;
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
}
|
|
307
319
|
}
|
|
308
320
|
}
|
|
309
321
|
`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor-based.js","sourceRoot":"","sources":["../../../src/codegen/pagination-utils/cursor-based.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA4C;AAC5C,iDAAqD;AACrD,mDAAyE;AACzE,yDAOmC;AACnC,2CAiBqB;AAER,QAAA,8BAA8B,GAAG,eAAe,CAAC;AACjD,QAAA,6BAA6B,GAAG,cAAc,CAAC;AAE5D,MAAM,KAAK,GAAG,IAAA,kBAAQ,EAAA;kBACJ,+CAAmC;kBACnC,sCAA8B;kBAC9B,qCAA6B;;;UAGrC,mCAAuB;UACvB,iCAAqB;UACrB,oCAAwB;UACxB,wCAA4B;UAC5B,gCAAoB;;;mBAGX,yCAA6B;;mBAE7B,gDAAoC,KAAK,8CAAkC;;;;mBAI3E,yCAA6B;;;8CAGF,yCAA6B;uBACpD,kDAAsC;;;;;uBAKtC,oCAAwB;;;;;CAK9C,CAAC;AAEF,MAAM,iBAAiB,GAAG,IAAA,kBAAQ,EAAA;sBACZ,wCAA4B,IAAI,0CAA8B,KAAK,+CAAmC;;;;;yBAKnG,0CAA8B;;;CAGtD,CAAC;AAEF,MAAM,iBAAiB,GAAG,IAAA,kBAAQ,EAAA;sCACI,0CAA8B,KAAK,+CAAmC,+BAA+B,qCAA6B;qCACnI,0CAA8B;;;;kBAIjD,0CAA8B;6BACnB,+BAAmB;;;;;;CAM/C,CAAC;AAEF,MAAM,eAAe,GAAG,IAAA,kBAAQ,EAAA;;UAEtB,0CAA8B,KAAK,+CAAmC;;;;gCAIhD,0CAA8B,IAAI,+BAAmB;;;;;;;;CAQpF,CAAC;AAEF,MAAM,UAAU,GAAG,IAAA,kBAAQ,EAAA;;UAEjB,0CAA8B,KAAK,+CAAmC;;SAEvE,sCAA8B,MAAM,qCAA6B;gCAC1C,0CAA8B,IAAI,+BAAmB;;;qCAGhD,0CAA8B;;;;;CAKlE,CAAC;AAEF,MAAM,cAAc,GAAG,IAAA,kBAAQ,EAAA;;UAErB,0CAA8B,KAAK,+CAAmC;;;SAGvE,sCAA8B,MAAM,qCAA6B;;;;;;gCAM1C,0CAA8B,IAAI,+BAAmB;;;;;iCAKpD,0CAA8B;;CAE9D,CAAC;AAEF,MAAM,iBAAiB,GAAG,IAAA,kBAAQ,EAAA;;UAExB,0CAA8B,KAAK,+CAAmC;;;qCAG3C,0CAA8B;;;;;;6BAMtC,0CAA8B;6BAC9B,+BAAmB;;;;;;;;;;;;;;;;CAgB/C,CAAC;AAEF,MAAM,cAAc,GAAG,IAAA,kBAAQ,EAAA;sBACT,qCAAyB;4BACnB,+CAAmC;4BACnC,+CAAmC;SACtD,+CAAmC;;;;;;;;;;CAU3C,CAAC;AAEF,MAAM,6BAA6B,GAAG,IAAA,kBAAQ,EAAA;sBACxB,oDAAwC;;;;;;;;;;;;CAY7D,CAAC;AAEF,MAAM,0BAA0B,GAAG,IAAA,kBAAQ,EAAA;;;;sBAIrB,iDAAqC,+CAA+C,+CAAmC;oCACzG,+CAAmC;;;;;;;;;CAStE,CAAC;AAEF,MAAM,yBAAyB,GAAG,IAAA,kBAAQ,EAAA;;UAEhC,0CAA8B,KAAK,+CAAmC;;;;iDAI/B,0CAA8B;;;;;;;8CAOjC,0CAA8B;;;;;;CAM3E,CAAC;AAEF,MAAM,eAAe,GAAG,IAAA,kBAAQ,EAAA;sBACV,sCAA0B;oBAC5B,+CAAmC;;;;sCAIjB,+BAAmB;;;;;kBAKvC,+BAAmB;;;;CAIpC,CAAC;AAEF,MAAM,gBAAgB,GAAG,IAAA,kBAAQ,EAAA;sBACX,uCAA2B;;;;;qBAK5B,+CAAmC;;;;;8CAKV,+BAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;cA2BnD,gCAAoB;;;CAGjC,CAAC;AAEF,MAAM,UAAU,GAAG,IAAA,kBAAQ,EAAA;sBACL,iCAAqB;;;;;;;;;;;;;;;;CAgB1C,CAAC;AAEF,MAAM,mBAAmB,GAAG,IAAA,kBAAQ,EAAA;sBACd,0CAA8B;oBAChC,+CAAmC
|
|
1
|
+
{"version":3,"file":"cursor-based.js","sourceRoot":"","sources":["../../../src/codegen/pagination-utils/cursor-based.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ShapeDefinition, NodeShapeDefinition } from './definitions';
|
|
2
2
|
import type { ModelInfo } from './model-info';
|
|
3
|
-
export
|
|
3
|
+
export type ShapeInheritance = {
|
|
4
4
|
[shapeId: string]: InheritanceDefinition;
|
|
5
5
|
};
|
|
6
6
|
export interface InheritanceDefinition {
|
|
@@ -17,7 +17,7 @@ interface ShapeDiscriminatorDefinitionIntermediate {
|
|
|
17
17
|
};
|
|
18
18
|
type: 'string' | 'number';
|
|
19
19
|
}
|
|
20
|
-
export
|
|
20
|
+
export type ShapeDiscriminatorTypesIntermediate = {
|
|
21
21
|
[shapeId: string]: ShapeDiscriminatorDefinitionIntermediate;
|
|
22
22
|
};
|
|
23
23
|
export declare function isDiscriminatorShape(shape: ShapeDefinition, modelInfo: ModelInfo): boolean;
|
|
@@ -6,19 +6,19 @@ import type { CompositeResourceMap } from './composite-resource';
|
|
|
6
6
|
import type { ShapePaginated, ShapePaginatedContainer } from './pagination';
|
|
7
7
|
import type { GraphQLShapeContext } from './graphql';
|
|
8
8
|
import type { UpdateAvailableAnnotation } from './annotation-update-available';
|
|
9
|
-
export
|
|
9
|
+
export type ShapeTtls = {
|
|
10
10
|
[shapeId: string]: number;
|
|
11
11
|
};
|
|
12
|
-
export
|
|
12
|
+
export type ShapeIntegrity = {
|
|
13
13
|
[shapeId: string]: string[];
|
|
14
14
|
};
|
|
15
|
-
export
|
|
15
|
+
export type ShapeOpaque = {
|
|
16
16
|
[shapeId: string]: true;
|
|
17
17
|
};
|
|
18
|
-
export
|
|
18
|
+
export type ShapePrivate = {
|
|
19
19
|
[shapeId: string]: string[];
|
|
20
20
|
};
|
|
21
|
-
export
|
|
21
|
+
export type ShapeCoerceFunction = {
|
|
22
22
|
[shapeId: string]: string;
|
|
23
23
|
};
|
|
24
24
|
export interface ModelInfo {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ShapeDefinition } from './definitions';
|
|
2
|
-
export
|
|
3
|
-
export
|
|
2
|
+
export type ShapePaginated = Record<string, PaginatedType>;
|
|
3
|
+
export type ShapePaginatedContainer = Record<string, PaginatedContainerShape>;
|
|
4
4
|
export interface PaginatedContainerShape {
|
|
5
5
|
strategy: Strategy;
|
|
6
6
|
propertyName: string;
|
|
@@ -28,7 +28,7 @@ export interface CursorPaginationParams extends BasePaginationParams {
|
|
|
28
28
|
strategy: Strategy.Cursor | Strategy.SyntheticCursor;
|
|
29
29
|
token: string;
|
|
30
30
|
}
|
|
31
|
-
export
|
|
31
|
+
export type PaginationParams = CursorPaginationParams;
|
|
32
32
|
/** Paginated Type **/
|
|
33
33
|
export declare enum PaginatedTypeProperty {
|
|
34
34
|
Items = "items",
|
|
@@ -54,5 +54,5 @@ export interface CursorPaginatedType extends BasedPaginatedType {
|
|
|
54
54
|
count?: string;
|
|
55
55
|
};
|
|
56
56
|
}
|
|
57
|
-
export
|
|
57
|
+
export type PaginatedType = CursorPaginatedType;
|
|
58
58
|
export {};
|
|
@@ -5,7 +5,7 @@ import type { NodeShapeDefinition, ParameterDefinition } from './definitions';
|
|
|
5
5
|
import type { MockPayload } from './mock-payload';
|
|
6
6
|
import type { StringMap } from './utils';
|
|
7
7
|
import type { LuvioGraphQLDSL } from './graphql';
|
|
8
|
-
export
|
|
8
|
+
export type HTTPStatusCode = 200 | 201 | 304 | 400 | 404 | 500;
|
|
9
9
|
export interface ResourceReturnShapeDefinition {
|
|
10
10
|
statusCode: HTTPStatusCode;
|
|
11
11
|
returnShape: NodeShapeDefinition;
|
|
@@ -52,7 +52,7 @@ export interface BaseResource {
|
|
|
52
52
|
/** Whether CreateResourceRequestFromRepresentation can be generated for this resource */
|
|
53
53
|
refresheable: boolean;
|
|
54
54
|
}
|
|
55
|
-
export
|
|
55
|
+
export type ResourceType = 'Rest' | 'GraphQL';
|
|
56
56
|
export interface RestResource extends BaseResource {
|
|
57
57
|
resourceType: 'Rest';
|
|
58
58
|
}
|
|
@@ -60,7 +60,7 @@ export interface GraphQLResource extends BaseResource {
|
|
|
60
60
|
resourceType: 'GraphQL';
|
|
61
61
|
graphqlDSL: LuvioGraphQLDSL;
|
|
62
62
|
}
|
|
63
|
-
export
|
|
63
|
+
export type Resource = RestResource | GraphQLResource;
|
|
64
64
|
export declare function isPurePost(resource: Resource): boolean;
|
|
65
65
|
export declare const CONFIG_PROPERTY_URL_PARAMS = "urlParams";
|
|
66
66
|
export declare const CONFIG_PROPERTY_QUERY_PARAMS = "queryParams";
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import type { NodeShapeDefinition, ShapeDefinition } from './definitions';
|
|
2
|
-
export
|
|
2
|
+
export type ShapeKeyFieldsDefinition = {
|
|
3
3
|
[key: string]: {
|
|
4
4
|
valuePath: string;
|
|
5
5
|
valueShapeDefinition: ShapeDefinition;
|
|
6
6
|
};
|
|
7
7
|
};
|
|
8
|
-
export
|
|
8
|
+
export type ShapeKeysDefinition = {
|
|
9
9
|
[shapeId: string]: ShapeKeyFieldsDefinition;
|
|
10
10
|
};
|
|
11
|
-
export
|
|
11
|
+
export type ShapeKeyConfigs = {
|
|
12
12
|
[shapeId: string]: NodeShapeDefinition;
|
|
13
13
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ScalarShapeDefinition, ShapeDefinition, NodeShapeDefinition, ArrayShapeDefinition, UnionShapeDefinition } from './definitions';
|
|
2
|
-
export
|
|
2
|
+
export type StringMap = {
|
|
3
3
|
[key: string]: string;
|
|
4
4
|
};
|
|
5
5
|
export declare function isJavascriptNumberShape(shape: ScalarShapeDefinition): boolean;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { model as amf } from 'amf-client-js';
|
|
2
2
|
import type { ShapeKeyFields, ShapeKeys } from './main';
|
|
3
3
|
export declare const KEY_ANNOTATION_NAME = "key";
|
|
4
|
-
export
|
|
4
|
+
export type resolvedPathNode = {
|
|
5
5
|
shape: amf.domain.Shape;
|
|
6
6
|
resolvedValueIsUnionShape: boolean;
|
|
7
7
|
};
|
package/dist/parser/main.d.ts
CHANGED
|
@@ -4,17 +4,17 @@ import type { ParseError, ParseWarning } from './logger';
|
|
|
4
4
|
export interface Parser {
|
|
5
5
|
parse(): Promise<ParseResults>;
|
|
6
6
|
}
|
|
7
|
-
export
|
|
7
|
+
export type ShapeKeyFields = {
|
|
8
8
|
[key: string]: {
|
|
9
9
|
valuePath: string;
|
|
10
10
|
valueShape: amf.domain.Shape;
|
|
11
11
|
resolvedValueIsUnionShape: boolean;
|
|
12
12
|
};
|
|
13
13
|
};
|
|
14
|
-
export
|
|
14
|
+
export type ShapeKeys = {
|
|
15
15
|
[shapeId: string]: ShapeKeyFields;
|
|
16
16
|
};
|
|
17
|
-
export
|
|
17
|
+
export type ParseResults = {
|
|
18
18
|
modelInfo: ModelInfo;
|
|
19
19
|
errors: undefined;
|
|
20
20
|
warnings?: ParseWarning[];
|
|
@@ -10,7 +10,6 @@ function mergeCustomDomainProperties(base, overlay) {
|
|
|
10
10
|
]);
|
|
11
11
|
}
|
|
12
12
|
function resolveShape(baseShape, overlayShape) {
|
|
13
|
-
var _a;
|
|
14
13
|
if (overlayShape.displayName.value()) {
|
|
15
14
|
baseShape.withDisplayName(overlayShape.displayName.value());
|
|
16
15
|
}
|
|
@@ -18,7 +17,7 @@ function resolveShape(baseShape, overlayShape) {
|
|
|
18
17
|
baseShape.withDescription(overlayShape.description.value());
|
|
19
18
|
}
|
|
20
19
|
// add named examples from types
|
|
21
|
-
const examples =
|
|
20
|
+
const examples = overlayShape === null || overlayShape === void 0 ? void 0 : overlayShape.examples;
|
|
22
21
|
if (examples && examples.length > 0) {
|
|
23
22
|
const baseNode = baseShape;
|
|
24
23
|
if (baseNode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overlay-resolution.js","sourceRoot":"","sources":["../../src/parser/overlay-resolution.ts"],"names":[],"mappings":";;;AACA,sCAAwF;AACxF,qCAAoC;AAEpC,SAAS,2BAA2B,CAChC,IAA8B,EAC9B,OAAiC;IAEjC,IAAI,CAAC,0BAA0B,CAAC;QAC5B,GAAG,IAAI,CAAC,sBAAsB;QAC9B,GAAG,OAAO,CAAC,sBAAsB;KACpC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,YAAY,CAAC,SAA2B,EAAE,YAA8B
|
|
1
|
+
{"version":3,"file":"overlay-resolution.js","sourceRoot":"","sources":["../../src/parser/overlay-resolution.ts"],"names":[],"mappings":";;;AACA,sCAAwF;AACxF,qCAAoC;AAEpC,SAAS,2BAA2B,CAChC,IAA8B,EAC9B,OAAiC;IAEjC,IAAI,CAAC,0BAA0B,CAAC;QAC5B,GAAG,IAAI,CAAC,sBAAsB;QAC9B,GAAG,OAAO,CAAC,sBAAsB;KACpC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,YAAY,CAAC,SAA2B,EAAE,YAA8B;IAC7E,IAAI,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE;QAClC,SAAS,CAAC,eAAe,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC;KAC/D;IAED,IAAI,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE;QAClC,SAAS,CAAC,eAAe,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC;KAC/D;IAED,gCAAgC;IAChC,MAAM,QAAQ,GAAI,YAAqC,aAArC,YAAY,uBAAZ,YAAY,CAA2B,QAAQ,CAAC;IAClE,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,MAAM,QAAQ,GAAG,SAAiC,CAAC;QACnD,IAAI,QAAQ,EAAE;YACV,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;SACnC;KACJ;IAED,2BAA2B,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,wBAAwB,CAC7B,UAA8C,EAC9C,aAAiD;;IAEjD,IAAI,UAAU,KAAK,SAAS,IAAI,aAAa,KAAK,SAAS,EAAE;QACzD,OAAO;KACV;IAED,KAAK,MAAM,gBAAgB,IAAI,aAAa,EAAE;QAC1C,MAAM,UAAU,GAAG,MAAA,UAAU,CAAC,IAAI,CAC9B,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,CAC1E,0CAAE,MAA8B,CAAC;QAElC,MAAM,iBAAiB,GAAG;YACtB,GAAG,gBAAgB,CAAC,QAAQ;YAC5B,GAAG,CAAC,MAAA,MAAC,gBAAgB,CAAC,MAA+B,0CAAE,QAAQ,mCAAI,EAAE,CAAC;SACzE,CAAC;QACF,IAAI,UAAU,KAAK,SAAS,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1D,UAAU,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;SAC9C;KACJ;AACL,CAAC;AAED,SAAS,eAAe,CACpB,IAA2B,EAC3B,OAA8D;IAE9D,KAAK,MAAM,WAAW,IAAI,OAAO,CAAC,QAAQ,EAAE;QACxC,IAAI,IAAA,4BAAsB,EAAC,WAAW,CAAC,EAAE;YACrC,oFAAoF;YACpF,oBAAoB;YACpB,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;SACtD;aAAM,IAAI,IAAA,gBAAU,EAAC,WAAW,CAAC,EAAE;YAChC,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,gBAAU,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,SAAS,CAChC,CAAC;YAElC,IAAI,SAAS,EAAE;gBACX,iFAAiF;gBACjF,wBAAwB;gBACxB,YAAY,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;aACxC;iBAAM;gBACH,gDAAgD;gBAChD,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;aACtD;SACJ;KACJ;AACL,CAAC;AAED,SAAS,cAAc,CACnB,IAA2B,EAC3B,OAA8D;;IAE9D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC7B,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAEnC,IAAI,CAAC,IAAA,cAAQ,EAAC,OAAO,CAAC,EAAE;QACpB,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;QAC5E,IAAA,iBAAQ,EAAC,8BAA8B,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;QACrE,OAAO;KACV;IAED,IAAI,CAAC,IAAA,cAAQ,EAAC,UAAU,CAAC,EAAE;QACvB,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC;QACrF,IAAA,iBAAQ,EAAC,8BAA8B,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;QAC3E,OAAO;KACV;IAED,2BAA2B,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEjD,KAAK,MAAM,eAAe,IAAI,UAAU,CAAC,SAAS,EAAE;QAChD,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CACvC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,CACvE,CAAC;QAEF,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC;YACxD,IAAA,iBAAQ,EACJ,aAAa,eAAe,CAAC,YAAY,0CAA0C,EACnF,IAAI,EACJ,MAAM,CACT,CAAC;YACF,OAAO;SACV;QAED,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE;YAC9B,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;SACvD;QAED,2BAA2B,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAE3D,KAAK,MAAM,gBAAgB,IAAI,eAAe,CAAC,UAAU,EAAE;YACvD,MAAM,aAAa,GAAG,YAAY,CAAC,UAAU,CAAC,IAAI,CAC9C,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,CAC7E,CAAC;YAEH,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE;gBAC/B,aAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;aACzD;YAED,2BAA2B,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;YAE7D,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,gBAAgB,CAAC;YACrD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC;YAE/C,uCAAuC;YACvC,wBAAwB,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,eAAe,EAAE,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,eAAe,CAAC,CAAC;YAExF,kCAAkC;YAClC,wBAAwB,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,CAAC,CAAC;YAExE,2CAA2C;YAC3C,IAAI,cAAc,IAAI,WAAW,EAAE;gBAC/B,KAAK,MAAM,cAAc,IAAI,cAAc,CAAC,QAAQ,EAAE;oBAClD,MAAM,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CACzC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,CACpE,CAAC;oBAEF,MAAM,eAAe,GAAG;wBACpB,GAAG,cAAc,CAAC,QAAQ;wBAC1B,GAAG,CAAC,MAAA,MAAC,cAAc,CAAC,MAA+B,0CAAE,QAAQ,mCAAI,EAAE,CAAC;qBACvE,CAAC;oBACF,IAAI,WAAW,KAAK,SAAS,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzD,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;qBAC7C;iBACJ;aACJ;YAED,6CAA6C;YAC7C,KAAK,MAAM,eAAe,IAAI,gBAAgB,CAAC,SAAS,EAAE;gBACtD,MAAM,YAAY,GAAG,aAAa,CAAC,SAAS,CAAC,IAAI,CAC7C,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,CACvE,CAAC;gBAEF,IAAI,YAAY,KAAK,SAAS,EAAE;oBAC5B,KAAK,MAAM,cAAc,IAAI,eAAe,CAAC,QAAQ,EAAE;wBACnD,MAAM,WAAW,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAC1C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,CACpE,CAAC;wBAEF,MAAM,eAAe,GAAG;4BACpB,GAAG,cAAc,CAAC,QAAQ;4BAC1B,GAAG,CAAC,MAAA,MAAC,cAAc,CAAC,MAA+B,0CAAE,QAAQ,mCAAI,EAAE,CAAC;yBACvE,CAAC;wBACF,IAAI,WAAW,KAAK,SAAS,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;4BACzD,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;yBAC7C;qBACJ;iBACJ;aACJ;SACJ;QAED,8CAA8C;QAC9C,wBAAwB,CAAC,YAAY,CAAC,UAAU,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;KACjF;AACL,CAAC;AAED,kDAAkD;AAClD,EAAE;AACF,oCAAoC;AACpC,0FAA0F;AAC1F,SAAgB,cAAc,CAAC,OAA6B;IACxD,6FAA6F;IAC7F,6BAA6B;IAC7B,MAAM,+BAA+B,GACjC,OAAgE,CAAC;IAErE,0FAA0F;IAC1F,qDAAqD;IACrD,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,gBAAU,CAAC,CAAC;IACnD,IAAI,IAAI,KAAK,SAAS,EAAE;QACpB,IAAA,iBAAQ,EACJ,0FAA0F,CAC7F,CAAC;QACF,OAAO;KACV;IAED,oEAAoE;IACpE,eAAe,CAAC,IAAI,EAAE,+BAA+B,CAAC,CAAC;IACvD,cAAc,CAAC,IAAI,EAAE,+BAA+B,CAAC,CAAC;IAEtD,OAAO,IAAI,CAAC;AAChB,CAAC;AArBD,wCAqBC"}
|
package/dist/parser/parse.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist/parser/parse.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/parser/parse.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/parser/parse.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export interface ShapeDiscriminatorDefinition {
|
|
|
11
11
|
};
|
|
12
12
|
type: 'string' | 'number';
|
|
13
13
|
}
|
|
14
|
-
export
|
|
14
|
+
export type ShapeDiscriminatorTypes = {
|
|
15
15
|
[shapeId: string]: ShapeDiscriminatorDefinition;
|
|
16
16
|
};
|
|
17
17
|
export declare function resolveInheritance(shape: amf.domain.NodeShape, shapeKeys: ShapeKeys, shapeTtls: ShapeTtls, shapeInheritance: ShapeInheritance, shapeDiscriminatorTypes: ShapeDiscriminatorTypes): void;
|
package/dist/plugin.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ParseError, ParseWarning } from './parser/logger';
|
|
2
2
|
import type { ModelInfo } from './intermediate/model-info';
|
|
3
3
|
import type { createCodeGenerationContext } from './utils/generation';
|
|
4
|
-
export
|
|
4
|
+
export type PluginResult = {
|
|
5
5
|
hasErrors: true;
|
|
6
6
|
errors: ParseError[];
|
|
7
7
|
warnings?: ParseWarning[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/utils/imports.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/utils/imports.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@luvio/compiler",
|
|
3
|
-
"version": "0.138.
|
|
3
|
+
"version": "0.138.5",
|
|
4
4
|
"description": "Luvio Compiler",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -23,12 +23,12 @@
|
|
|
23
23
|
"test:debug": "node --inspect-brk ../../../node_modules/jest/bin/jest.js --config ./jest.config.js --runInBand"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@luvio/graphql-parser": "^0.138.
|
|
26
|
+
"@luvio/graphql-parser": "^0.138.5",
|
|
27
27
|
"amf-client-js": "4.2.0"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@luvio/adapter-test-library": "^0.138.
|
|
31
|
-
"@luvio/engine": "^0.138.
|
|
30
|
+
"@luvio/adapter-test-library": "^0.138.5",
|
|
31
|
+
"@luvio/engine": "^0.138.5"
|
|
32
32
|
},
|
|
33
33
|
"volta": {
|
|
34
34
|
"extends": "../../../package.json"
|