@luvio/compiler 0.50.0 → 0.53.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/codegen/adapter/adapter-browser-factory.js +2 -2
- package/dist/codegen/adapter/adapter-browser-factory.js.map +1 -1
- package/dist/codegen/adapter/adapter-fragment.js +8 -8
- package/dist/codegen/adapter/adapter-fragment.js.map +1 -1
- package/dist/codegen/adapter/constants.d.ts +2 -0
- package/dist/codegen/adapter/constants.js +3 -1
- package/dist/codegen/adapter/constants.js.map +1 -1
- package/dist/codegen/pagination-utils/constants.d.ts +4 -0
- package/dist/codegen/pagination-utils/constants.js +8 -0
- package/dist/codegen/pagination-utils/constants.js.map +1 -0
- package/dist/codegen/pagination-utils/cursor-based.d.ts +0 -2
- package/dist/codegen/pagination-utils/cursor-based.js +27 -23
- package/dist/codegen/pagination-utils/cursor-based.js.map +1 -1
- package/dist/codegen/resource/composite/ingest-success.js +2 -2
- package/dist/codegen/resource/composite/ingest-success.js.map +1 -1
- package/dist/codegen/resource/composite/select-child-resource-params.js +2 -2
- package/dist/codegen/resource/composite/select-child-resource-params.js.map +1 -1
- package/dist/codegen/resource/constants.d.ts +2 -0
- package/dist/codegen/resource/constants.js +7 -0
- package/dist/codegen/resource/constants.js.map +1 -0
- package/dist/codegen/resource/ingest-success.js +3 -7
- package/dist/codegen/resource/ingest-success.js.map +1 -1
- package/dist/codegen/resource/key-builder.js +2 -1
- package/dist/codegen/resource/key-builder.js.map +1 -1
- package/dist/codegen/resource/pagination/create-pagination-params.d.ts +4 -0
- package/dist/codegen/resource/pagination/create-pagination-params.js +52 -0
- package/dist/codegen/resource/pagination/create-pagination-params.js.map +1 -0
- package/dist/codegen/resource/pagination/select.d.ts +3 -0
- package/dist/codegen/resource/pagination/select.js +23 -0
- package/dist/codegen/resource/pagination/select.js.map +1 -0
- package/dist/codegen/resource/select.d.ts +0 -1
- package/dist/codegen/resource/select.js +14 -7
- package/dist/codegen/resource/select.js.map +1 -1
- package/dist/codegen/shape/constants.d.ts +5 -0
- package/dist/codegen/shape/constants.js +6 -1
- package/dist/codegen/shape/constants.js.map +1 -1
- package/dist/codegen/shape/shape-dynamic-select.d.ts +1 -1
- package/dist/codegen/shape/shape-dynamic-select.js.map +1 -1
- package/dist/codegen/shape/shape-keybuilder.js +3 -1
- package/dist/codegen/shape/shape-keybuilder.js.map +1 -1
- package/dist/codegen/shape/shape-normalize.js +4 -8
- package/dist/codegen/shape/shape-normalize.js.map +1 -1
- package/dist/codegen/shape/shape-select-discriminator.js +2 -2
- package/dist/codegen/shape/shape-select-discriminator.js.map +1 -1
- package/dist/codegen/shape/shape-select-utils.d.ts +19 -0
- package/dist/codegen/shape/shape-select-utils.js +381 -0
- package/dist/codegen/shape/shape-select-utils.js.map +1 -0
- package/dist/codegen/shape/shape-select.d.ts +0 -1
- package/dist/codegen/shape/shape-select.js +25 -381
- package/dist/codegen/shape/shape-select.js.map +1 -1
- package/dist/codegen/shape/shape-utils-ingest.js +0 -3
- package/dist/codegen/shape/shape-utils-ingest.js.map +1 -1
- package/dist/codegen/shared/constants.d.ts +2 -0
- package/dist/codegen/shared/constants.js +4 -1
- package/dist/codegen/shared/constants.js.map +1 -1
- package/dist/parser/annotation-paginated.d.ts +2 -1
- package/dist/parser/annotation-paginated.js +20 -4
- package/dist/parser/annotation-paginated.js.map +1 -1
- package/dist/parser/annotation-paginationParams.js +5 -0
- package/dist/parser/annotation-paginationParams.js.map +1 -1
- package/dist/parser/main.js +1 -1
- package/dist/parser/main.js.map +1 -1
- package/dist/utils/shape.d.ts +3 -0
- package/dist/utils/shape.js +9 -1
- package/dist/utils/shape.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../../src/codegen/resource/pagination/select.ts"],"names":[],"mappings":";;;;;;AAAA,uEAA+C;AAG/C,yEAAiF;AACjF,gEAG0C;AAC1C,4CAAsF;AACtF,sDAAwE;AACxE,uDAAsE;AAGtE,SAAgB,wBAAwB,CACpC,aAA4B,EAC5B,gBAAkC,EAClC,qBAA6B,EAC7B,UAAkB;IAElB,MAAM,oBAAoB,GAAG,aAAa,CAAC,oBAAoB,CAC3D,gBAAgB,CAAC,QAAQ,EACzB,kDAAsC,CACzC,CAAC;IAEF,OAAO,kBAAQ,CAAA;0BACO,sCAA0B,IAAI,4BAAgB,KAAK,wBAAY,KAAK,sCAA0B,KAAK,qBAAqB,MAAM,uCAA2B;oBAC/J,wCAA4B,KAAK,oBAAoB,MAAM,8DAAmC,IAAI,sCAA0B;qBAC3H,UAAU,IAAI,wCAA4B;;KAE1D,CAAC;AACN,CAAC;AAjBD,4DAiBC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { ModelInfo } from '../../intermediate/model-info';
|
|
2
2
|
import { Resource } from '../../intermediate/resource';
|
|
3
3
|
import { ImportContext } from '../../utils/imports';
|
|
4
|
-
export declare const RESOURCE_SELECT_IDENTIFIER = "select";
|
|
5
4
|
export declare function generateSelect(importContext: ImportContext, resource: Resource, modelInfo: ModelInfo): string;
|
|
@@ -3,20 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.generateSelect =
|
|
6
|
+
exports.generateSelect = void 0;
|
|
7
7
|
const deindent_1 = __importDefault(require("../../utils/deindent"));
|
|
8
8
|
const constants_1 = require("../adapter/constants");
|
|
9
9
|
const constants_2 = require("../shared/constants");
|
|
10
|
-
const
|
|
10
|
+
const constants_3 = require("../shape/constants");
|
|
11
11
|
const shape_select_discriminator_1 = require("../shape/shape-select-discriminator");
|
|
12
12
|
const select_1 = require("./composite/select");
|
|
13
13
|
const select_child_resource_params_1 = require("./composite/select-child-resource-params");
|
|
14
|
+
const create_pagination_params_1 = require("./pagination/create-pagination-params");
|
|
15
|
+
const select_2 = require("./pagination/select");
|
|
14
16
|
const resource_params_1 = require("./resource-params");
|
|
15
|
-
|
|
16
|
-
const RESOURCE_PARAMS_IDENTIFIER = 'params';
|
|
17
|
+
const constants_4 = require("./constants");
|
|
17
18
|
function generateSelect(importContext, resource, modelInfo) {
|
|
18
19
|
const { importRamlArtifact } = importContext;
|
|
19
|
-
const { id: resourceId, endPointId, returnShape } = resource;
|
|
20
|
+
const { id: resourceId, endPointId, returnShape, paginationParams } = resource;
|
|
20
21
|
if (returnShape === undefined) {
|
|
21
22
|
return '';
|
|
22
23
|
}
|
|
@@ -29,10 +30,16 @@ function generateSelect(importContext, resource, modelInfo) {
|
|
|
29
30
|
const returnShapeId = returnShape.id;
|
|
30
31
|
const typeSelect = modelInfo.shapeDiscriminatorTypes[returnShapeId]
|
|
31
32
|
? importRamlArtifact(returnShapeId, shape_select_discriminator_1.SHAPE_SELECT_CHILDREN_IDENTIFIER)
|
|
32
|
-
: importRamlArtifact(returnShapeId,
|
|
33
|
+
: importRamlArtifact(returnShapeId, constants_3.SHAPE_SELECT_IDENTIFIER);
|
|
33
34
|
const resourceRequestConfig = importRamlArtifact(resourceId, resource_params_1.RESOURCE_PARAMS_INTERFACE);
|
|
35
|
+
if (paginationParams !== undefined) {
|
|
36
|
+
return [
|
|
37
|
+
create_pagination_params_1.generateCreatePaginationParams(importContext, paginationParams, resourceRequestConfig),
|
|
38
|
+
select_2.generatePaginationSelect(importContext, paginationParams, resourceRequestConfig, typeSelect),
|
|
39
|
+
].join('\n\n');
|
|
40
|
+
}
|
|
34
41
|
return deindent_1.default `
|
|
35
|
-
export function ${
|
|
42
|
+
export function ${constants_4.RESOURCE_SELECT_IDENTIFIER}(${constants_2.LUVIO_IDENTIFIER}: ${constants_2.LUVIO_IMPORT}, ${constants_4.RESOURCE_PARAMS_IDENTIFIER}: ${resourceRequestConfig}): ${constants_1.ADAPTER_FRAGMENT_IDENTIFIER} {
|
|
36
43
|
return ${typeSelect}();
|
|
37
44
|
}
|
|
38
45
|
`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/codegen/resource/select.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/codegen/resource/select.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA4C;AAI5C,oDAAmE;AACnE,mDAAqE;AACrE,kDAA6D;AAC7D,oFAAuF;AACvF,+CAA6D;AAC7D,2FAA6F;AAC7F,oFAAuF;AACvF,gDAA+D;AAC/D,uDAA8D;AAC9D,2CAAqF;AAErF,SAAgB,cAAc,CAC1B,aAA4B,EAC5B,QAAkB,EAClB,SAAoB;IAEpB,MAAM,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC;IAC7C,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,gBAAgB,EAAE,GAAG,QAAQ,CAAC;IAE/E,IAAI,WAAW,KAAK,SAAS,EAAE;QAC3B,OAAO,EAAE,CAAC;KACb;IAED,IAAI,SAAS,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE;QAC1C,OAAO;YACH,gEAAiC,CAC7B,aAAa,EACb,QAAQ,EACR,SAAS,CAAC,kBAAkB,CAAC,UAAU,CAAC,EACxC,WAAW,EACX,SAAS,CACZ;YACD,gCAAuB,CAAC,aAAa,EAAE,QAAQ,CAAC;SACnD,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAClB;IAED,MAAM,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC;IACrC,MAAM,UAAU,GAAG,SAAS,CAAC,uBAAuB,CAAC,aAAa,CAAC;QAC/D,CAAC,CAAC,kBAAkB,CAAC,aAAa,EAAE,6DAAgC,CAAC;QACrE,CAAC,CAAC,kBAAkB,CAAC,aAAa,EAAE,mCAAuB,CAAC,CAAC;IAEjE,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,UAAU,EAAE,2CAAyB,CAAC,CAAC;IAExF,IAAI,gBAAgB,KAAK,SAAS,EAAE;QAChC,OAAO;YACH,yDAA8B,CAAC,aAAa,EAAE,gBAAgB,EAAE,qBAAqB,CAAC;YACtF,iCAAwB,CACpB,aAAa,EACb,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,CACb;SACJ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAClB;IAED,OAAO,kBAAQ,CAAA;0BACO,sCAA0B,IAAI,4BAAgB,KAAK,wBAAY,KAAK,sCAA0B,KAAK,qBAAqB,MAAM,uCAA2B;qBAC9J,UAAU;;KAE1B,CAAC;AACN,CAAC;AAjDD,wCAiDC"}
|
|
@@ -3,3 +3,8 @@ export declare const EXISTING_RECORD_IDENTIFIER = "existingRecord";
|
|
|
3
3
|
export declare const INCOMING_RECORD_IDENTIFIER = "incomingRecord";
|
|
4
4
|
export declare const INPUT_IDENTIFIER = "input";
|
|
5
5
|
export declare const KEY_IDENTIFIER = "key";
|
|
6
|
+
/** shape-select */
|
|
7
|
+
export declare const SHAPE_SELECT_IDENTIFIER = "select";
|
|
8
|
+
export declare const READER_IDENTIFIER = "reader";
|
|
9
|
+
export declare const SINK_IDENTIFIER = "sink";
|
|
10
|
+
export declare const SOURCE_IDENTIFIER = "source";
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* Shared Identifiers */
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.KEY_IDENTIFIER = exports.INPUT_IDENTIFIER = exports.INCOMING_RECORD_IDENTIFIER = exports.EXISTING_RECORD_IDENTIFIER = void 0;
|
|
4
|
+
exports.SOURCE_IDENTIFIER = exports.SINK_IDENTIFIER = exports.READER_IDENTIFIER = exports.SHAPE_SELECT_IDENTIFIER = exports.KEY_IDENTIFIER = exports.INPUT_IDENTIFIER = exports.INCOMING_RECORD_IDENTIFIER = exports.EXISTING_RECORD_IDENTIFIER = void 0;
|
|
5
5
|
/** shape-ingest */
|
|
6
6
|
exports.EXISTING_RECORD_IDENTIFIER = 'existingRecord';
|
|
7
7
|
exports.INCOMING_RECORD_IDENTIFIER = 'incomingRecord';
|
|
8
8
|
exports.INPUT_IDENTIFIER = 'input';
|
|
9
9
|
exports.KEY_IDENTIFIER = 'key';
|
|
10
|
+
/** shape-select */
|
|
11
|
+
exports.SHAPE_SELECT_IDENTIFIER = 'select';
|
|
12
|
+
exports.READER_IDENTIFIER = 'reader';
|
|
13
|
+
exports.SINK_IDENTIFIER = 'sink';
|
|
14
|
+
exports.SOURCE_IDENTIFIER = 'source';
|
|
10
15
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/codegen/shape/constants.ts"],"names":[],"mappings":";AAAA,wBAAwB;;;AAExB,mBAAmB;AACN,QAAA,0BAA0B,GAAG,gBAAgB,CAAC;AAC9C,QAAA,0BAA0B,GAAG,gBAAgB,CAAC;AAC9C,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,cAAc,GAAG,KAAK,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/codegen/shape/constants.ts"],"names":[],"mappings":";AAAA,wBAAwB;;;AAExB,mBAAmB;AACN,QAAA,0BAA0B,GAAG,gBAAgB,CAAC;AAC9C,QAAA,0BAA0B,GAAG,gBAAgB,CAAC;AAC9C,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,cAAc,GAAG,KAAK,CAAC;AAEpC,mBAAmB;AACN,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,eAAe,GAAG,MAAM,CAAC;AACzB,QAAA,iBAAiB,GAAG,QAAQ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-dynamic-select.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-dynamic-select.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"shape-dynamic-select.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-dynamic-select.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA4C;AAE5C,iDAAwD;AACxD,+EAAsE;AACtE,+EAAyE;AAE5D,QAAA,+BAA+B,GAAG,eAAe,CAAC;AAC/D,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAEnC,SAAgB,0BAA0B,CAAC,WAA+B;IACtE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC;IAExD,MAAM,YAAY,GAAG,sDAAwB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAChE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACtB,OAAO,EAAE,CAAC;KACb;IAED,MAAM,kBAAkB,GAAG,UAAU,KAAK,CAAC,IAAI,QAAQ,CAAC;IACxD,MAAM,gBAAgB,GAAG,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,mDAAqB,CAAC,CAAC;IAE3F,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,qCAAsB,CAAC;QACrD,kBAAkB;QAClB,WAAW;QACX,uBAAuB,EAAE,iBAAiB;KAC7C,CAAC,CAAC;IAEH,OAAO,kBAAQ,CAAA;uBACI,uCAA+B,eAAe,kBAAkB,IAAI,iBAAiB,KAAK,gBAAgB,MAAM,eAAe;cACxI,IAAI;;KAEb,CAAC;AACN,CAAC;AAtBD,gEAsBC"}
|
|
@@ -8,6 +8,7 @@ const inheritance_1 = require("../../intermediate/inheritance");
|
|
|
8
8
|
const union_1 = require("../../intermediate/union");
|
|
9
9
|
const utils_1 = require("../../intermediate/utils");
|
|
10
10
|
const deindent_1 = __importDefault(require("../../utils/deindent"));
|
|
11
|
+
const constants_1 = require("../shared/constants");
|
|
11
12
|
const shape_key_interface_1 = require("./shape-key-interface");
|
|
12
13
|
const shape_representation_type_1 = require("./shape-representation-type");
|
|
13
14
|
const KEY_BUILDER_FROM_TYPE_ARGUMENT_IDENTIFIER = 'object';
|
|
@@ -53,9 +54,10 @@ function generateShapeKeyBuilder(shapeConfig) {
|
|
|
53
54
|
}
|
|
54
55
|
`
|
|
55
56
|
: '';
|
|
57
|
+
const joinedProperties = propertyLookups.join(` + '${constants_1.CACHE_KEY_FIELD_DELIMITER}' + `);
|
|
56
58
|
return deindent_1.default `
|
|
57
59
|
export function ${exports.SHAPE_KEY_BUILDER_IDENTIFIER}(config: ${keyParams}): string {
|
|
58
|
-
return ${KEY_PREFIX} + ${
|
|
60
|
+
return ${KEY_PREFIX} + '${constants_1.CACHE_KEY_NAMESPACE_DELIMITER}' + ${shape_representation_type_1.REPRESENTATION_TYPE_IDENTIFIER} + '${constants_1.CACHE_KEY_FIELD_DELIMITER}' + ${joinedProperties};
|
|
59
61
|
}
|
|
60
62
|
|
|
61
63
|
export function ${exports.SHAPE_KEY_BUILDER_FROM_TYPE_IDENTIFIER}(${KEY_BUILDER_FROM_TYPE_ARGUMENT_IDENTIFIER}: ${shapeName}): string {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-keybuilder.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-keybuilder.ts"],"names":[],"mappings":";;;;;;AACA,gEAAgF;AAEhF,oDAAmE;AACnE,oDAAkF;AAClF,oEAA4C;
|
|
1
|
+
{"version":3,"file":"shape-keybuilder.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-keybuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const definitions_1 = require("../../intermediate/definitions");
|
|
|
8
8
|
const inheritance_1 = require("../../intermediate/inheritance");
|
|
9
9
|
const utils_1 = require("../../intermediate/utils");
|
|
10
10
|
const deindent_1 = __importDefault(require("../../utils/deindent"));
|
|
11
|
+
const shape_1 = require("../../utils/shape");
|
|
11
12
|
const constants_1 = require("../adapter/constants");
|
|
12
13
|
const constants_2 = require("../shared/constants");
|
|
13
14
|
const shape_deep_freeze_1 = require("./shape-deep-freeze");
|
|
@@ -17,12 +18,6 @@ exports.SHAPE_NORMALIZE_IDENTIFIER = 'normalize';
|
|
|
17
18
|
const TIMESTAMP_IDENTIFIER = 'timestamp';
|
|
18
19
|
const TTL_IDENTIFIER = 'ttl';
|
|
19
20
|
const INGEST_PATH_IDENTIFIER = 'path';
|
|
20
|
-
function isNormalizable(shapeId, { modelInfo }) {
|
|
21
|
-
return shapeId in modelInfo.normalizableShapeDefinitions;
|
|
22
|
-
}
|
|
23
|
-
function isOpaque(shapeId, { modelInfo }) {
|
|
24
|
-
return shapeId in modelInfo.shapeOpaque;
|
|
25
|
-
}
|
|
26
21
|
function normalizeObject(valueShape, state) {
|
|
27
22
|
const statements = valueShape.properties.map((propertyShape) => {
|
|
28
23
|
const propertyName = propertyShape.name;
|
|
@@ -34,7 +29,7 @@ function normalizeObject(valueShape, state) {
|
|
|
34
29
|
return generateAnyTypeFreeze(state, propertyShape);
|
|
35
30
|
}
|
|
36
31
|
// If this property of the shape is not normalizable do nothing.
|
|
37
|
-
if (!isNormalizable(propertyValueShape.id, state)) {
|
|
32
|
+
if (!shape_1.isNormalizable(propertyValueShape.id, state.modelInfo)) {
|
|
38
33
|
return '';
|
|
39
34
|
}
|
|
40
35
|
if (patternName !== null) {
|
|
@@ -188,8 +183,9 @@ function normalizeProperties(shape, state) {
|
|
|
188
183
|
return '';
|
|
189
184
|
}
|
|
190
185
|
function normalizeShape(shape, state) {
|
|
186
|
+
const { modelInfo } = state;
|
|
191
187
|
// No need to normalize scalar types. Return an empty normalization string.
|
|
192
|
-
if (!isNormalizable(shape.id,
|
|
188
|
+
if (!shape_1.isNormalizable(shape.id, modelInfo) || shape_1.isOpaque(shape.id, modelInfo)) {
|
|
193
189
|
return '';
|
|
194
190
|
}
|
|
195
191
|
// If the shape is a link, the normalization is delegated to the other shape normalization
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-normalize.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-normalize.ts"],"names":[],"mappings":";;;;;;AAAA,gEAOwC;AACxC,gEAAsE;AAEtE,oDAMkC;AAClC,oEAA4C;AAE5C,oDAAgF;AAChF,mDAK6B;AAE7B,2DAAmE;AACnE,iDAAyD;AACzD,6EAAqF;AAExE,QAAA,0BAA0B,GAAG,WAAW,CAAC;AAEtD,MAAM,oBAAoB,GAAG,WAAW,CAAC;AACzC,MAAM,cAAc,GAAG,KAAK,CAAC;AAE7B,MAAM,sBAAsB,GAAG,MAAM,CAAC;AA4CtC,SAAS,
|
|
1
|
+
{"version":3,"file":"shape-normalize.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-normalize.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const deindent_1 = __importDefault(require("../../utils/deindent"));
|
|
|
9
9
|
const format_1 = require("../../utils/format");
|
|
10
10
|
const inheritance_2 = require("../../utils/inheritance");
|
|
11
11
|
const constants_1 = require("../adapter/constants");
|
|
12
|
-
const
|
|
12
|
+
const constants_2 = require("./constants");
|
|
13
13
|
exports.SHAPE_SELECT_CHILDREN_IDENTIFIER = 'selectChildren';
|
|
14
14
|
const DISCRIMINATOR_VALUES_IDENTIFIER = 'DiscriminatorValues';
|
|
15
15
|
function generateSelect(shapeConfig) {
|
|
@@ -20,7 +20,7 @@ function generateSelect(shapeConfig) {
|
|
|
20
20
|
const unionSelections = Object.keys(discriminator.references).map((prop) => {
|
|
21
21
|
const shape = discriminator.references[prop];
|
|
22
22
|
const ref = shape.name;
|
|
23
|
-
const childSelectIdentifier = importContext.importRamlArtifact(shape.id,
|
|
23
|
+
const childSelectIdentifier = importContext.importRamlArtifact(shape.id, constants_2.SHAPE_SELECT_IDENTIFIER);
|
|
24
24
|
const identifier = format_1.camelCase(`${ref}-selections`);
|
|
25
25
|
const hoistStatement = deindent_1.default `
|
|
26
26
|
const ${identifier} = ${childSelectIdentifier}()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-select-discriminator.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-select-discriminator.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAsE;AACtE,oEAA4C;AAC5C,+CAA+C;AAC/C,yDAAqF;AACrF,oDAA6F;AAE7F,
|
|
1
|
+
{"version":3,"file":"shape-select-discriminator.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-select-discriminator.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAsE;AACtE,oEAA4C;AAC5C,+CAA+C;AAC/C,yDAAqF;AACrF,oDAA6F;AAE7F,2CAAsD;AAEzC,QAAA,gCAAgC,GAAG,gBAAgB,CAAC;AAEjE,MAAM,+BAA+B,GAAG,qBAAqB,CAAC;AAE9D,SAAS,cAAc,CAAC,WAA+B;IACnD,MAAM,EAAE,aAAa,EAAE,GAAG,WAAW,CAAC;IACtC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC;IACzC,MAAM,aAAa,GAAG,SAAS,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAClE,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACvE,MAAM,KAAK,GAAG,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,MAAM,qBAAqB,GAAG,aAAa,CAAC,kBAAkB,CAC1D,KAAK,CAAC,EAAE,EACR,mCAAuB,CAC1B,CAAC;QACF,MAAM,UAAU,GAAG,kBAAS,CAAC,GAAG,GAAG,aAAa,CAAC,CAAC;QAClD,MAAM,cAAc,GAAG,kBAAQ,CAAA;oBACnB,UAAU,MAAM,qBAAqB;SAChD,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3B,OAAO,kBAAQ,CAAA;eACR,wDAA0C,CACzC,+BAA+B,EAC/B,IAAI,EACJ,aAAa,CAAC,IAAI,CACrB,MAAM,UAAU;SACpB,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,kBAAQ,CAAA;;;;8BAIJ,aAAa,CAAC,yBAAyB;;kBAEnD,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC;;;KAGxC,CAAC;IAEF,MAAM,kBAAkB,GAAG,GAAG,KAAK,CAAC,IAAI,gBAAgB,CAAC;IAEzD,OAAO,kBAAQ,CAAA;uBACI,wCAAgC,eAAe,kBAAkB,OAAO,iEAAqD;cACtI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;;qBAEV,aAAa;;KAE7B,CAAC;AACN,CAAC;AAED,SAAgB,2BAA2B,CAAC,WAA+B;IACvE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC;IACzC,IAAI,kCAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;QACxC,OAAO,cAAc,CAAC,WAAW,CAAC,CAAC;KACtC;IAED,OAAO,EAAE,CAAC;AACd,CAAC;AAPD,kEAOC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { ImportContext } from '../../utils/imports';
|
|
2
|
+
import { ModelInfo } from '../../intermediate/model-info';
|
|
3
|
+
import { NodeShapeDefinition, ShapeDefinition } from '../../intermediate/definitions';
|
|
4
|
+
export interface SelectState {
|
|
5
|
+
rootShape: ShapeDefinition;
|
|
6
|
+
modelInfo: ModelInfo;
|
|
7
|
+
propertyName: string;
|
|
8
|
+
isMap: boolean;
|
|
9
|
+
isArray: boolean;
|
|
10
|
+
nullable: boolean;
|
|
11
|
+
optional: boolean;
|
|
12
|
+
hoist: string[];
|
|
13
|
+
hoistPrivate: string[];
|
|
14
|
+
importContext: ImportContext;
|
|
15
|
+
dynamicParamsIdentifier: string | null;
|
|
16
|
+
}
|
|
17
|
+
export declare function selectShape(shape: ShapeDefinition, state: SelectState): string;
|
|
18
|
+
export declare function selectOpaque(nodeShape: NodeShapeDefinition, state: SelectState): string;
|
|
19
|
+
export declare function selectNonOpaque(nodeShape: NodeShapeDefinition, state: SelectState): string;
|