@luvio/compiler 0.62.3 → 0.63.2
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 +5 -5
- package/dist/codegen/adapter/adapter-browser-factory.js.map +1 -1
- package/dist/codegen/adapter/adapter-build-snapshot-context.js +3 -3
- package/dist/codegen/adapter/adapter-build-snapshot-context.js.map +1 -1
- package/dist/codegen/adapter/adapter-cache.js +4 -4
- package/dist/codegen/adapter/adapter-cache.js.map +1 -1
- package/dist/codegen/adapter/adapter-config-coercion.js +4 -4
- package/dist/codegen/adapter/adapter-config-coercion.js.map +1 -1
- package/dist/codegen/adapter/adapter-config-interface.js +3 -3
- package/dist/codegen/adapter/adapter-config-interface.js.map +1 -1
- package/dist/codegen/adapter/adapter-config-validation.js +3 -3
- package/dist/codegen/adapter/adapter-config-validation.js.map +1 -1
- package/dist/codegen/adapter/adapter-fragment.js +2 -2
- package/dist/codegen/adapter/adapter-fragment.js.map +1 -1
- package/dist/codegen/adapter/adapter-key-builder.js +2 -2
- package/dist/codegen/adapter/adapter-key-builder.js.map +1 -1
- package/dist/codegen/adapter/adapter-memory-cache-policy.js +4 -4
- package/dist/codegen/adapter/adapter-memory-cache-policy.js.map +1 -1
- package/dist/codegen/adapter/adapter-name.js +1 -1
- package/dist/codegen/adapter/adapter-name.js.map +1 -1
- package/dist/codegen/adapter/adapter-network-cache-policy.js +3 -4
- package/dist/codegen/adapter/adapter-network-cache-policy.js.map +1 -1
- package/dist/codegen/adapter/adapter-network.js +2 -2
- package/dist/codegen/adapter/adapter-network.js.map +1 -1
- package/dist/codegen/adapter/adapter-notify-change.js +4 -4
- package/dist/codegen/adapter/adapter-notify-change.js.map +1 -1
- package/dist/codegen/adapter/adapter-one-of-params.js +1 -1
- package/dist/codegen/adapter/adapter-one-of-params.js.map +1 -1
- package/dist/codegen/adapter/adapter-param-type-check.js +21 -21
- package/dist/codegen/adapter/adapter-param-type-check.js.map +1 -1
- package/dist/codegen/adapter/adapter-resource-error.js +3 -3
- package/dist/codegen/adapter/adapter-resource-error.js.map +1 -1
- package/dist/codegen/adapter/adapter-resource-success.js +3 -3
- package/dist/codegen/adapter/adapter-resource-success.js.map +1 -1
- package/dist/codegen/adapter/adapter-shape-key-param-coercion.js +5 -5
- package/dist/codegen/adapter/adapter-shape-key-param-coercion.js.map +1 -1
- package/dist/codegen/adapter/adapter-type-check.js +4 -4
- package/dist/codegen/adapter/adapter-type-check.js.map +1 -1
- package/dist/codegen/adapter/adapter-validation-config-object.js +2 -2
- package/dist/codegen/adapter/adapter-validation-config-object.js.map +1 -1
- package/dist/codegen/adapter/constants.d.ts +0 -1
- package/dist/codegen/adapter/constants.js +43 -43
- package/dist/codegen/adapter/constants.js.map +1 -1
- package/dist/codegen/adapter/create-resource-params.js +7 -7
- package/dist/codegen/adapter/create-resource-params.js.map +1 -1
- package/dist/codegen/adapter/delete/adapter-browser-factory.js +5 -5
- package/dist/codegen/adapter/delete/adapter-browser-factory.js.map +1 -1
- package/dist/codegen/adapter/delete/adapter-network.js +2 -2
- package/dist/codegen/adapter/delete/adapter-network.js.map +1 -1
- package/dist/codegen/adapter/index.js +56 -56
- package/dist/codegen/adapter/index.js.map +1 -1
- package/dist/codegen/adapter/patch-post/adapter-browser-factory.js +4 -4
- package/dist/codegen/adapter/patch-post/adapter-browser-factory.js.map +1 -1
- package/dist/codegen/adapter/patch-post/adapter-network.js +2 -2
- package/dist/codegen/adapter/patch-post/adapter-network.js.map +1 -1
- package/dist/codegen/adapter/util.js +1 -1
- package/dist/codegen/adapter/util.js.map +1 -1
- package/dist/codegen/adapter-tests/expected-responses.js +10 -10
- package/dist/codegen/adapter-tests/expected-responses.js.map +1 -1
- package/dist/codegen/adapter-tests/index.js +8 -8
- package/dist/codegen/adapter-tests/index.js.map +1 -1
- package/dist/codegen/adapter-tests/invalid-configs.js +3 -3
- package/dist/codegen/adapter-tests/invalid-configs.js.map +1 -1
- package/dist/codegen/adapter-tests/mock-payloads.js +5 -5
- package/dist/codegen/adapter-tests/mock-payloads.js.map +1 -1
- package/dist/codegen/adapter-tests/valid-configs.js +3 -3
- package/dist/codegen/adapter-tests/valid-configs.js.map +1 -1
- package/dist/codegen/adapter-utils.js +15 -15
- package/dist/codegen/adapter-utils.js.map +1 -1
- package/dist/codegen/pagination-utils/cursor-based.js +9 -9
- package/dist/codegen/pagination-utils/cursor-based.js.map +1 -1
- package/dist/codegen/resource/composite/child-envelopes.js +1 -1
- package/dist/codegen/resource/composite/child-envelopes.js.map +1 -1
- package/dist/codegen/resource/composite/create-child-resource-params.js +3 -3
- package/dist/codegen/resource/composite/create-child-resource-params.js.map +1 -1
- package/dist/codegen/resource/composite/ingest-success-child-resource-params.js +1 -1
- package/dist/codegen/resource/composite/ingest-success-child-resource-params.js.map +1 -1
- package/dist/codegen/resource/composite/ingest-success.js +2 -7
- package/dist/codegen/resource/composite/ingest-success.js.map +1 -1
- package/dist/codegen/resource/composite/non-cached-errors-object.js +1 -1
- package/dist/codegen/resource/composite/non-cached-errors-object.js.map +1 -1
- package/dist/codegen/resource/composite/response-child-cache-keys.js +4 -4
- package/dist/codegen/resource/composite/response-child-cache-keys.js.map +1 -1
- package/dist/codegen/resource/composite/select-child-resource-params.js +1 -1
- package/dist/codegen/resource/composite/select-child-resource-params.js.map +1 -1
- package/dist/codegen/resource/composite/select.js +1 -1
- package/dist/codegen/resource/composite/select.js.map +1 -1
- package/dist/codegen/resource/create-resource-request-from-representation.js +1 -1
- package/dist/codegen/resource/create-resource-request-from-representation.js.map +1 -1
- package/dist/codegen/resource/create-resource-request.js +9 -9
- package/dist/codegen/resource/create-resource-request.js.map +1 -1
- package/dist/codegen/resource/evict-success.js +1 -1
- package/dist/codegen/resource/evict-success.js.map +1 -1
- package/dist/codegen/resource/index.js +14 -14
- package/dist/codegen/resource/index.js.map +1 -1
- package/dist/codegen/resource/ingest-error.js +4 -4
- package/dist/codegen/resource/ingest-error.js.map +1 -1
- package/dist/codegen/resource/ingest-success.js +3 -10
- package/dist/codegen/resource/ingest-success.js.map +1 -1
- package/dist/codegen/resource/key-builder.js +11 -11
- package/dist/codegen/resource/key-builder.js.map +1 -1
- package/dist/codegen/resource/pagination/create-pagination-params.js +3 -2
- package/dist/codegen/resource/pagination/create-pagination-params.js.map +1 -1
- package/dist/codegen/resource/pagination/select.js +1 -1
- package/dist/codegen/resource/pagination/select.js.map +1 -1
- package/dist/codegen/resource/resource-params.js +2 -2
- package/dist/codegen/resource/resource-params.js.map +1 -1
- package/dist/codegen/resource/response-cache-keys.js +3 -3
- package/dist/codegen/resource/response-cache-keys.js.map +1 -1
- package/dist/codegen/resource/select.js +5 -5
- package/dist/codegen/resource/select.js.map +1 -1
- package/dist/codegen/shape/constants.js +1 -1
- package/dist/codegen/shape/constants.js.map +1 -1
- package/dist/codegen/shape/index.js +23 -23
- package/dist/codegen/shape/index.js.map +1 -1
- package/dist/codegen/shape/shape-cache-keys.js +22 -22
- package/dist/codegen/shape/shape-cache-keys.js.map +1 -1
- package/dist/codegen/shape/shape-deep-freeze.js +20 -20
- package/dist/codegen/shape/shape-deep-freeze.js.map +1 -1
- package/dist/codegen/shape/shape-discriminator-values-enum.js +5 -5
- package/dist/codegen/shape/shape-discriminator-values-enum.js.map +1 -1
- package/dist/codegen/shape/shape-dynamic-ingest-params.js +2 -2
- package/dist/codegen/shape/shape-dynamic-ingest-params.js.map +1 -1
- package/dist/codegen/shape/shape-dynamic-ingest.js +5 -4
- package/dist/codegen/shape/shape-dynamic-ingest.js.map +1 -1
- package/dist/codegen/shape/shape-dynamic-normalize.js +5 -4
- package/dist/codegen/shape/shape-dynamic-normalize.js.map +1 -1
- package/dist/codegen/shape/shape-dynamic-select-params.js +2 -2
- package/dist/codegen/shape/shape-dynamic-select-params.js.map +1 -1
- package/dist/codegen/shape/shape-dynamic-select.js +3 -3
- package/dist/codegen/shape/shape-dynamic-select.js.map +1 -1
- package/dist/codegen/shape/shape-dynamic-utils.js +6 -5
- package/dist/codegen/shape/shape-dynamic-utils.js.map +1 -1
- package/dist/codegen/shape/shape-equals.js +27 -27
- package/dist/codegen/shape/shape-equals.js.map +1 -1
- package/dist/codegen/shape/shape-ingest-discriminator.js +4 -4
- package/dist/codegen/shape/shape-ingest-discriminator.js.map +1 -1
- package/dist/codegen/shape/shape-ingest-paginated.js +4 -3
- package/dist/codegen/shape/shape-ingest-paginated.js.map +1 -1
- package/dist/codegen/shape/shape-ingest.js +2 -2
- package/dist/codegen/shape/shape-ingest.js.map +1 -1
- package/dist/codegen/shape/shape-key-interface.js +3 -3
- package/dist/codegen/shape/shape-key-interface.js.map +1 -1
- package/dist/codegen/shape/shape-keybuilder.js +9 -9
- package/dist/codegen/shape/shape-keybuilder.js.map +1 -1
- package/dist/codegen/shape/shape-normalize.js +17 -18
- package/dist/codegen/shape/shape-normalize.js.map +1 -1
- package/dist/codegen/shape/shape-normalized-interface.js +3 -3
- package/dist/codegen/shape/shape-normalized-interface.js.map +1 -1
- package/dist/codegen/shape/shape-select-discriminator.js +7 -7
- package/dist/codegen/shape/shape-select-discriminator.js.map +1 -1
- package/dist/codegen/shape/shape-select-paginated.js +29 -26
- package/dist/codegen/shape/shape-select-paginated.js.map +1 -1
- package/dist/codegen/shape/shape-select-utils.js +36 -36
- package/dist/codegen/shape/shape-select-utils.js.map +1 -1
- package/dist/codegen/shape/shape-select.js +11 -11
- package/dist/codegen/shape/shape-select.js.map +1 -1
- package/dist/codegen/shape/shape-ttl.js +3 -3
- package/dist/codegen/shape/shape-ttl.js.map +1 -1
- package/dist/codegen/shape/shape-type-definition.js +9 -9
- package/dist/codegen/shape/shape-type-definition.js.map +1 -1
- package/dist/codegen/shape/shape-utils-ingest.js +6 -14
- package/dist/codegen/shape/shape-utils-ingest.js.map +1 -1
- package/dist/codegen/shape/shape-utils.js +6 -6
- package/dist/codegen/shape/shape-utils.js.map +1 -1
- package/dist/codegen/shape/shape-validation.js +2 -2
- package/dist/codegen/shape/shape-validation.js.map +1 -1
- package/dist/codegen/shared/constants.js +5 -5
- package/dist/codegen/shared/constants.js.map +1 -1
- package/dist/codegen/shared/normalized-type-definition.js +14 -14
- package/dist/codegen/shared/normalized-type-definition.js.map +1 -1
- package/dist/codegen/shared/type-definition.js +20 -20
- package/dist/codegen/shared/type-definition.js.map +1 -1
- package/dist/codegen/shared/validation.js +40 -40
- package/dist/codegen/shared/validation.js.map +1 -1
- package/dist/generate.js +11 -11
- package/dist/generate.js.map +1 -1
- package/dist/intermediate/pagination.d.ts +4 -3
- package/dist/intermediate/pagination.js +1 -0
- package/dist/intermediate/pagination.js.map +1 -1
- package/dist/main.js +1 -0
- package/dist/main.js.map +1 -1
- package/dist/parse.js +1 -1
- package/dist/parse.js.map +1 -1
- package/dist/parser/annotation-adapter-tests.js +11 -11
- package/dist/parser/annotation-adapter-tests.js.map +1 -1
- package/dist/parser/annotation-adapter.js +11 -11
- package/dist/parser/annotation-adapter.js.map +1 -1
- package/dist/parser/annotation-coerceFunction.js +4 -4
- package/dist/parser/annotation-coerceFunction.js.map +1 -1
- package/dist/parser/annotation-composite.js +48 -48
- package/dist/parser/annotation-composite.js.map +1 -1
- package/dist/parser/annotation-integrity.js +5 -5
- package/dist/parser/annotation-integrity.js.map +1 -1
- package/dist/parser/annotation-key.js +17 -17
- package/dist/parser/annotation-key.js.map +1 -1
- package/dist/parser/annotation-keyPrefix.js +3 -3
- package/dist/parser/annotation-keyPrefix.js.map +1 -1
- package/dist/parser/annotation-method.js +5 -5
- package/dist/parser/annotation-method.js.map +1 -1
- package/dist/parser/annotation-opaque.js +3 -3
- package/dist/parser/annotation-opaque.js.map +1 -1
- package/dist/parser/annotation-paginated.js +37 -22
- package/dist/parser/annotation-paginated.js.map +1 -1
- package/dist/parser/annotation-paginationParams.js +30 -29
- package/dist/parser/annotation-paginationParams.js.map +1 -1
- package/dist/parser/annotation-private.js +10 -10
- package/dist/parser/annotation-private.js.map +1 -1
- package/dist/parser/annotation-resource-key.js +5 -5
- package/dist/parser/annotation-resource-key.js.map +1 -1
- package/dist/parser/annotation-ttl.js +5 -5
- package/dist/parser/annotation-ttl.js.map +1 -1
- package/dist/parser/main.js +41 -41
- package/dist/parser/main.js.map +1 -1
- package/dist/parser/overlay-resolution.js +8 -8
- package/dist/parser/overlay-resolution.js.map +1 -1
- package/dist/parser/parse.js +5 -5
- package/dist/parser/parse.js.map +1 -1
- package/dist/parser/resource.js +26 -26
- package/dist/parser/resource.js.map +1 -1
- package/dist/parser/shape-inheritance.js +16 -16
- package/dist/parser/shape-inheritance.js.map +1 -1
- package/dist/parser/shape-normalization.js +4 -4
- package/dist/parser/shape-normalization.js.map +1 -1
- package/dist/parser/shape-paginated-container.js +2 -2
- package/dist/parser/shape-paginated-container.js.map +1 -1
- package/dist/parser/shape-resolution.js +10 -10
- package/dist/parser/shape-resolution.js.map +1 -1
- package/dist/utils/annotation.js +1 -1
- package/dist/utils/annotation.js.map +1 -1
- package/dist/utils/generation.js +2 -2
- package/dist/utils/generation.js.map +1 -1
- package/dist/utils/imports.js +5 -3
- package/dist/utils/imports.js.map +1 -1
- package/package.json +3 -3
- package/resources/luvio-annotations.raml +6 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotation-paginationParams.js","sourceRoot":"","sources":["../../src/parser/annotation-paginationParams.ts"],"names":[],"mappings":";;;AACA,sCAMsB;AACtB,oDAAoD;AACpD,iEAAkG;AAClG,2DAKoC;AACpC,qCAAoC;AAEpC,MAAM,eAAe,GAAG,kBAAkB,CAAC;AAC3C,MAAM,0BAA0B,GAAG,aAAa,CAAC;AAejD,SAAgB,iCAAiC,CAC7C,SAA+B,EAC/B,eAAuB,EACvB,eAAuC,EACvC,SAA2C;IAE3C,MAAM,UAAU,GAAG,0BAAa,
|
|
1
|
+
{"version":3,"file":"annotation-paginationParams.js","sourceRoot":"","sources":["../../src/parser/annotation-paginationParams.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ exports.PRIVATE_ANNOTATION_NAME = 'private';
|
|
|
9
9
|
function validatePrivateAnnotationProperties(shape, items) {
|
|
10
10
|
const violations = items.members.reduce((acc, member) => {
|
|
11
11
|
const { line: memberLine, column: memberColumn } = member.position.start;
|
|
12
|
-
if (!aml_1.isScalarNode(member) || !aml_1.isStringScalarNode(member)) {
|
|
12
|
+
if (!(0, aml_1.isScalarNode)(member) || !(0, aml_1.isStringScalarNode)(member)) {
|
|
13
13
|
acc.push({
|
|
14
14
|
message: 'Invalid data type, expected a string',
|
|
15
15
|
line: memberLine,
|
|
@@ -18,7 +18,7 @@ function validatePrivateAnnotationProperties(shape, items) {
|
|
|
18
18
|
return acc;
|
|
19
19
|
}
|
|
20
20
|
const value = member.value.value();
|
|
21
|
-
const property = shape_1.resolveNodeShapeProperty(shape, value);
|
|
21
|
+
const property = (0, shape_1.resolveNodeShapeProperty)(shape, value);
|
|
22
22
|
if (property === undefined) {
|
|
23
23
|
acc.push({
|
|
24
24
|
message: `Invalid private property "${value}". "${value}" is not a valid property on ${shape.name.value()}`,
|
|
@@ -32,32 +32,32 @@ function validatePrivateAnnotationProperties(shape, items) {
|
|
|
32
32
|
return true;
|
|
33
33
|
}
|
|
34
34
|
violations.forEach(({ message, line, column }) => {
|
|
35
|
-
logger_1.logError(message, line, column);
|
|
35
|
+
(0, logger_1.logError)(message, line, column);
|
|
36
36
|
});
|
|
37
37
|
return false;
|
|
38
38
|
}
|
|
39
39
|
function collectPrivateAnnotation(shape) {
|
|
40
|
-
const annotation = annotation_1.getAnnotation(shape, exports.PRIVATE_ANNOTATION_NAME);
|
|
40
|
+
const annotation = (0, annotation_1.getAnnotation)(shape, exports.PRIVATE_ANNOTATION_NAME);
|
|
41
41
|
if (annotation === undefined) {
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
44
|
const items = annotation.extension;
|
|
45
45
|
const { line, column } = items.position.start;
|
|
46
|
-
if (!aml_1.isArrayNode(items)) {
|
|
47
|
-
logger_1.logError(`Invalid private annotation format, expected a array type`, line, column);
|
|
46
|
+
if (!(0, aml_1.isArrayNode)(items)) {
|
|
47
|
+
(0, logger_1.logError)(`Invalid private annotation format, expected a array type`, line, column);
|
|
48
48
|
return undefined;
|
|
49
49
|
}
|
|
50
|
-
if (!aml_1.isNodeShape(shape)) {
|
|
51
|
-
logger_1.logError(`Invalid private annotation. Private annotation must be on NodeShape.`, line, column);
|
|
50
|
+
if (!(0, aml_1.isNodeShape)(shape)) {
|
|
51
|
+
(0, logger_1.logError)(`Invalid private annotation. Private annotation must be on NodeShape.`, line, column);
|
|
52
52
|
return undefined;
|
|
53
53
|
}
|
|
54
54
|
if (!validatePrivateAnnotationProperties(shape, items)) {
|
|
55
55
|
return undefined;
|
|
56
56
|
}
|
|
57
57
|
return items.members.reduce((acc, member) => {
|
|
58
|
-
if (!aml_1.isScalarNode(member) || !aml_1.isStringScalarNode(member)) {
|
|
58
|
+
if (!(0, aml_1.isScalarNode)(member) || !(0, aml_1.isStringScalarNode)(member)) {
|
|
59
59
|
const { line: memberLine, column: memberColumn } = member.position.start;
|
|
60
|
-
logger_1.logError(`Invalid data type, expected a string`, memberLine, memberColumn);
|
|
60
|
+
(0, logger_1.logError)(`Invalid data type, expected a string`, memberLine, memberColumn);
|
|
61
61
|
return acc;
|
|
62
62
|
}
|
|
63
63
|
acc.push(member.value.value());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotation-private.js","sourceRoot":"","sources":["../../src/parser/annotation-private.ts"],"names":[],"mappings":";;;AACA,sCAA0F;AAC1F,oDAAoD;AACpD,qCAAoC;AACpC,0CAA0D;AAE7C,QAAA,uBAAuB,GAAG,SAAS,CAAC;AAEjD,SAAS,mCAAmC,CACxC,KAA2B,EAC3B,KAA2B;IAE3B,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CACnC,CAAC,GAA6D,EAAE,MAAM,EAAE,EAAE;QACtE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QACzE,IAAI,CAAC,kBAAY,
|
|
1
|
+
{"version":3,"file":"annotation-private.js","sourceRoot":"","sources":["../../src/parser/annotation-private.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,21 +6,21 @@ const annotation_1 = require("../utils/annotation");
|
|
|
6
6
|
const annotation_key_1 = require("./annotation-key");
|
|
7
7
|
const logger_1 = require("./logger");
|
|
8
8
|
function collectKeyAnnotation(operation) {
|
|
9
|
-
const annotation = annotation_1.getAnnotation(operation, annotation_key_1.KEY_ANNOTATION_NAME);
|
|
9
|
+
const annotation = (0, annotation_1.getAnnotation)(operation, annotation_key_1.KEY_ANNOTATION_NAME);
|
|
10
10
|
if (annotation === undefined) {
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
13
13
|
const keys = annotation.extension;
|
|
14
14
|
const { line, column } = keys.position.start;
|
|
15
|
-
if (!aml_1.isObjectNode(keys)) {
|
|
16
|
-
logger_1.logError(`Invalid key annotation format, expected a object type`, line, column);
|
|
15
|
+
if (!(0, aml_1.isObjectNode)(keys)) {
|
|
16
|
+
(0, logger_1.logError)(`Invalid key annotation format, expected a object type`, line, column);
|
|
17
17
|
return undefined;
|
|
18
18
|
}
|
|
19
19
|
return Object.keys(keys.properties).reduce((acc, propertyName) => {
|
|
20
20
|
const valueNode = keys.properties[propertyName];
|
|
21
|
-
if (!aml_1.isScalarNode(valueNode) || !aml_1.isStringScalarNode(valueNode)) {
|
|
21
|
+
if (!(0, aml_1.isScalarNode)(valueNode) || !(0, aml_1.isStringScalarNode)(valueNode)) {
|
|
22
22
|
const { line: valueNodeLine, column: valueNodeColumn } = valueNode.position.start;
|
|
23
|
-
logger_1.logError(`Invalid data type, expected a string`, valueNodeLine, valueNodeColumn);
|
|
23
|
+
(0, logger_1.logError)(`Invalid data type, expected a string`, valueNodeLine, valueNodeColumn);
|
|
24
24
|
return acc;
|
|
25
25
|
}
|
|
26
26
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotation-resource-key.js","sourceRoot":"","sources":["../../src/parser/annotation-resource-key.ts"],"names":[],"mappings":";;;AACA,sCAA8E;AAC9E,oDAAoD;AACpD,qDAAuD;AACvD,qCAAoC;AAGpC,SAAgB,oBAAoB,CAAC,SAA+B;IAChE,MAAM,UAAU,GAAG,0BAAa,
|
|
1
|
+
{"version":3,"file":"annotation-resource-key.js","sourceRoot":"","sources":["../../src/parser/annotation-resource-key.ts"],"names":[],"mappings":";;;AACA,sCAA8E;AAC9E,oDAAoD;AACpD,qDAAuD;AACvD,qCAAoC;AAGpC,SAAgB,oBAAoB,CAAC,SAA+B;IAChE,MAAM,UAAU,GAAG,IAAA,0BAAa,EAAC,SAAS,EAAE,oCAAmB,CAAC,CAAC;IACjE,IAAI,UAAU,KAAK,SAAS,EAAE;QAC1B,OAAO;KACV;IAED,MAAM,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC;IAClC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC7C,IAAI,CAAC,IAAA,kBAAY,EAAC,IAAI,CAAC,EAAE;QACrB,IAAA,iBAAQ,EAAC,uDAAuD,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAChF,OAAO,SAAS,CAAC;KACpB;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE;QAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAEhD,IAAI,CAAC,IAAA,kBAAY,EAAC,SAAS,CAAC,IAAI,CAAC,IAAA,wBAAkB,EAAC,SAAS,CAAC,EAAE;YAC5D,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;YAClF,IAAA,iBAAQ,EAAC,sCAAsC,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;YACjF,OAAO,GAAG,CAAC;SACd;QAED,OAAO;YACH,GAAG,GAAG;YACN,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE;SAC1C,CAAC;IACN,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC;AA3BD,oDA2BC"}
|
|
@@ -7,18 +7,18 @@ const annotation_1 = require("../utils/annotation");
|
|
|
7
7
|
const logger_1 = require("./logger");
|
|
8
8
|
exports.TTL_ANNOTATION_NAME = 'ttl';
|
|
9
9
|
function collectTTLAnnotation(shape) {
|
|
10
|
-
const annotation = annotation_1.getAnnotation(shape, exports.TTL_ANNOTATION_NAME);
|
|
10
|
+
const annotation = (0, annotation_1.getAnnotation)(shape, exports.TTL_ANNOTATION_NAME);
|
|
11
11
|
if (annotation === undefined) {
|
|
12
12
|
return;
|
|
13
13
|
}
|
|
14
14
|
const { extension } = annotation;
|
|
15
15
|
const { line, column } = extension.position.start;
|
|
16
|
-
if (!aml_1.isScalarNode(extension)) {
|
|
17
|
-
logger_1.logError(`Invalid ttl annotation format for "${shape.name.value()}", expected a number`, line, column);
|
|
16
|
+
if (!(0, aml_1.isScalarNode)(extension)) {
|
|
17
|
+
(0, logger_1.logError)(`Invalid ttl annotation format for "${shape.name.value()}", expected a number`, line, column);
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
|
-
if (!format_1.isNumeric(extension.value.value())) {
|
|
21
|
-
logger_1.logError(`Invalid ttl annotation format for "${shape.name.value()}". Expected a number, received "${extension.value.value()}"`, line, column);
|
|
20
|
+
if (!(0, format_1.isNumeric)(extension.value.value())) {
|
|
21
|
+
(0, logger_1.logError)(`Invalid ttl annotation format for "${shape.name.value()}". Expected a number, received "${extension.value.value()}"`, line, column);
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
24
24
|
return parseInt(extension.value.value(), 10);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotation-ttl.js","sourceRoot":"","sources":["../../src/parser/annotation-ttl.ts"],"names":[],"mappings":";;;AACA,4CAA4C;AAC5C,wCAA8C;AAC9C,oDAAoD;AACpD,qCAAoC;AAEvB,QAAA,mBAAmB,GAAG,KAAK,CAAC;AAEzC,SAAgB,oBAAoB,CAChC,KAA2C;IAE3C,MAAM,UAAU,GAAG,0BAAa,
|
|
1
|
+
{"version":3,"file":"annotation-ttl.js","sourceRoot":"","sources":["../../src/parser/annotation-ttl.ts"],"names":[],"mappings":";;;AACA,4CAA4C;AAC5C,wCAA8C;AAC9C,oDAAoD;AACpD,qCAAoC;AAEvB,QAAA,mBAAmB,GAAG,KAAK,CAAC;AAEzC,SAAgB,oBAAoB,CAChC,KAA2C;IAE3C,MAAM,UAAU,GAAG,IAAA,0BAAa,EAAC,KAAK,EAAE,2BAAmB,CAAC,CAAC;IAC7D,IAAI,UAAU,KAAK,SAAS,EAAE;QAC1B,OAAO;KACV;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;IACjC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;IAClD,IAAI,CAAC,IAAA,kBAAY,EAAC,SAAS,CAAC,EAAE;QAC1B,IAAA,iBAAQ,EACJ,sCAAsC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,sBAAsB,EAC9E,IAAI,EACJ,MAAM,CACT,CAAC;QACF,OAAO;KACV;IAED,IAAI,CAAC,IAAA,kBAAS,EAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE;QACrC,IAAA,iBAAQ,EACJ,sCAAsC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,mCAAmC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EACrH,IAAI,EACJ,MAAM,CACT,CAAC;QAEF,OAAO;KACV;IAED,OAAO,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;AACjD,CAAC;AA9BD,oDA8BC"}
|
package/dist/parser/main.js
CHANGED
|
@@ -22,20 +22,20 @@ const logger_1 = require("./logger");
|
|
|
22
22
|
const annotation_composite_1 = require("./annotation-composite");
|
|
23
23
|
const annotation_method_1 = require("./annotation-method");
|
|
24
24
|
function resolveDocument(model) {
|
|
25
|
-
if (aml_1.isOverlay(model)) {
|
|
26
|
-
return overlay_resolution_1.resolveOverlay(model);
|
|
25
|
+
if ((0, aml_1.isOverlay)(model)) {
|
|
26
|
+
return (0, overlay_resolution_1.resolveOverlay)(model);
|
|
27
27
|
}
|
|
28
|
-
else if (aml_1.isDocument(model)) {
|
|
28
|
+
else if ((0, aml_1.isDocument)(model)) {
|
|
29
29
|
return model;
|
|
30
30
|
}
|
|
31
|
-
logger_1.logError('Unexpected RAML type. Expected either a document or an overlay.');
|
|
31
|
+
(0, logger_1.logError)('Unexpected RAML type. Expected either a document or an overlay.');
|
|
32
32
|
return undefined;
|
|
33
33
|
}
|
|
34
34
|
function validateShape(shape, normalizableShapes) {
|
|
35
|
-
if (aml_1.isNodeShape(shape)) {
|
|
35
|
+
if ((0, aml_1.isNodeShape)(shape)) {
|
|
36
36
|
validateNodeShape(shape, normalizableShapes);
|
|
37
37
|
}
|
|
38
|
-
else if (aml_1.isUnionShape(shape)) {
|
|
38
|
+
else if ((0, aml_1.isUnionShape)(shape)) {
|
|
39
39
|
validateUnionShape(shape);
|
|
40
40
|
}
|
|
41
41
|
}
|
|
@@ -47,56 +47,56 @@ function validateNodeShape(shape, normalizableShapes) {
|
|
|
47
47
|
const { line, column } = propertyShape.position.start;
|
|
48
48
|
if (patternName !== null) {
|
|
49
49
|
if (propertyName !== '//') {
|
|
50
|
-
logger_1.logError(`Unsupported additional property pattern ${propertyName}`, line, column);
|
|
50
|
+
(0, logger_1.logError)(`Unsupported additional property pattern ${propertyName}`, line, column);
|
|
51
51
|
return;
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
else if (normalizableShapes[propertyId] && propertyShape.minCount.value() === 0) {
|
|
55
|
-
logger_1.logError(`Unsupported optional link at ${shape.name.value()}.${propertyName}`, line, column);
|
|
55
|
+
(0, logger_1.logError)(`Unsupported optional link at ${shape.name.value()}.${propertyName}`, line, column);
|
|
56
56
|
return;
|
|
57
57
|
}
|
|
58
58
|
validateShape(propertyShape.range, normalizableShapes);
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
61
|
function validateUnionShape(shape) {
|
|
62
|
-
const nonScalarShapes = shape.anyOf.filter((s) => !aml_1.isScalarShape(s) && !aml_1.isNilShape(s));
|
|
62
|
+
const nonScalarShapes = shape.anyOf.filter((s) => !(0, aml_1.isScalarShape)(s) && !(0, aml_1.isNilShape)(s));
|
|
63
63
|
// If the union contains one or more shapes that are non scalar report an error.
|
|
64
64
|
// Note: Supporting union between multiple non scalar types requires a type check to know which
|
|
65
65
|
// normalization routine need to be invoked.
|
|
66
66
|
if (nonScalarShapes.length > 1) {
|
|
67
67
|
const formattedShapes = nonScalarShapes.map((s) => s.linkTarget ? s.linkTarget.name.value() : s.name.value());
|
|
68
68
|
const { line, column } = shape.anyOf[0].position.start;
|
|
69
|
-
logger_1.logError(`Unsupported complex normalization between ${formattedShapes.join(', ')}`, line, column);
|
|
69
|
+
(0, logger_1.logError)(`Unsupported complex normalization between ${formattedShapes.join(', ')}`, line, column);
|
|
70
70
|
return;
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
function buildConfigShape(keys) {
|
|
74
74
|
const configProperties = Object.entries(keys).map(([identifier, { valueShape }]) => new amf_client_js_1.model.domain.PropertyShape().withName(identifier).withRange(valueShape).withMinCount(1));
|
|
75
|
-
return aml_1.convertNodeShapeToNodeShapeDefinition(new amf_client_js_1.model.domain.NodeShape().withProperties(configProperties), Object.create(null));
|
|
75
|
+
return (0, aml_1.convertNodeShapeToNodeShapeDefinition)(new amf_client_js_1.model.domain.NodeShape().withProperties(configProperties), Object.create(null));
|
|
76
76
|
}
|
|
77
77
|
async function parse(path) {
|
|
78
|
-
logger_1.resetLogger();
|
|
79
|
-
const model = await parse_1.parseAndValidate(path);
|
|
78
|
+
(0, logger_1.resetLogger)();
|
|
79
|
+
const model = await (0, parse_1.parseAndValidate)(path);
|
|
80
80
|
const document = resolveDocument(model);
|
|
81
81
|
if (document === undefined) {
|
|
82
82
|
return {
|
|
83
83
|
modelInfo: undefined,
|
|
84
|
-
errors: logger_1.getLogErrors(),
|
|
84
|
+
errors: (0, logger_1.getLogErrors)(),
|
|
85
85
|
};
|
|
86
86
|
}
|
|
87
87
|
const api = document.encodes;
|
|
88
|
-
const keyPrefix = annotation_keyPrefix_1.getKeyPrefix(api);
|
|
89
|
-
const rootTtl = annotation_ttl_1.collectTTLAnnotation(api);
|
|
88
|
+
const keyPrefix = (0, annotation_keyPrefix_1.getKeyPrefix)(api);
|
|
89
|
+
const rootTtl = (0, annotation_ttl_1.collectTTLAnnotation)(api);
|
|
90
90
|
const shapeCoerceFunction = {};
|
|
91
91
|
const shapes = {};
|
|
92
92
|
for (const decl of document.declares) {
|
|
93
|
-
if (aml_1.isNodeShape(decl)) {
|
|
93
|
+
if ((0, aml_1.isNodeShape)(decl)) {
|
|
94
94
|
shapes[decl.id] = decl;
|
|
95
95
|
}
|
|
96
96
|
// The coerceFunction annotation in particular might be on a Node shape
|
|
97
97
|
// or might be on a scalar shape so populating it here
|
|
98
|
-
if (aml_1.isAnyShape(decl)) {
|
|
99
|
-
const coerceFunction = annotation_coerceFunction_1.collectCoerceFunctionAnnotation(decl, document);
|
|
98
|
+
if ((0, aml_1.isAnyShape)(decl)) {
|
|
99
|
+
const coerceFunction = (0, annotation_coerceFunction_1.collectCoerceFunctionAnnotation)(decl, document);
|
|
100
100
|
if (coerceFunction !== undefined) {
|
|
101
101
|
shapeCoerceFunction[decl.name.value()] = coerceFunction;
|
|
102
102
|
}
|
|
@@ -115,61 +115,61 @@ async function parse(path) {
|
|
|
115
115
|
const compositeResources = {};
|
|
116
116
|
for (const shape of Object.values(shapes)) {
|
|
117
117
|
const shapeId = shape.id;
|
|
118
|
-
const nodeShape = shape_resolution_1.resolveShape(shape);
|
|
118
|
+
const nodeShape = (0, shape_resolution_1.resolveShape)(shape);
|
|
119
119
|
declaredShapes[shapeId] = nodeShape;
|
|
120
|
-
const keys = annotation_key_1.collectKeyAnnotation(shape);
|
|
120
|
+
const keys = (0, annotation_key_1.collectKeyAnnotation)(shape);
|
|
121
121
|
if (keys !== undefined) {
|
|
122
122
|
if (keyPrefix === '') {
|
|
123
|
-
logger_1.logError(`Missing "keyPrefix" annotation. "keyPrefix" must be defined when (key) annotation is present`);
|
|
123
|
+
(0, logger_1.logError)(`Missing "keyPrefix" annotation. "keyPrefix" must be defined when (key) annotation is present`);
|
|
124
124
|
}
|
|
125
125
|
else {
|
|
126
126
|
shapeKeys[shapeId] = keys;
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
|
-
const ttl = annotation_ttl_1.collectTTLAnnotation(shape);
|
|
129
|
+
const ttl = (0, annotation_ttl_1.collectTTLAnnotation)(shape);
|
|
130
130
|
if (ttl !== undefined) {
|
|
131
131
|
shapeTtls[shapeId] = ttl;
|
|
132
132
|
}
|
|
133
|
-
const integrity = annotation_integrity_1.collectIntegrityAnnotation(shape);
|
|
133
|
+
const integrity = (0, annotation_integrity_1.collectIntegrityAnnotation)(shape);
|
|
134
134
|
if (integrity !== undefined) {
|
|
135
135
|
shapeIntegrity[shapeId] = integrity;
|
|
136
136
|
}
|
|
137
|
-
const opaque = annotation_opaque_1.collectOpaqueAnnotation(shape);
|
|
137
|
+
const opaque = (0, annotation_opaque_1.collectOpaqueAnnotation)(shape);
|
|
138
138
|
if (opaque === true) {
|
|
139
139
|
shapeOpaque[shapeId] = true;
|
|
140
140
|
}
|
|
141
|
-
const paginated = annotation_paginated_1.collectPaginatedAnnotation(shape, keys);
|
|
141
|
+
const paginated = (0, annotation_paginated_1.collectPaginatedAnnotation)(shape, keys);
|
|
142
142
|
if (paginated) {
|
|
143
143
|
shapePaginated[shapeId] = paginated;
|
|
144
144
|
}
|
|
145
|
-
const privates = annotation_private_1.collectPrivateAnnotation(shape);
|
|
145
|
+
const privates = (0, annotation_private_1.collectPrivateAnnotation)(shape);
|
|
146
146
|
if (privates !== undefined) {
|
|
147
147
|
shapePrivate[shapeId] = privates;
|
|
148
148
|
}
|
|
149
|
-
shape_inheritance_1.resolveInheritance(shape, shapeKeys, shapeTtls, shapeInheritance, shapeDiscriminatorTypes);
|
|
149
|
+
(0, shape_inheritance_1.resolveInheritance)(shape, shapeKeys, shapeTtls, shapeInheritance, shapeDiscriminatorTypes);
|
|
150
150
|
}
|
|
151
151
|
let normalizableShapes = {};
|
|
152
152
|
for (const shape of Object.values(declaredShapes)) {
|
|
153
153
|
normalizableShapes = {
|
|
154
154
|
...normalizableShapes,
|
|
155
|
-
...shape_normalization_1.collectNormalizableShapes(shape, shapeKeys, shapeOpaque, shapeDiscriminatorTypes),
|
|
155
|
+
...(0, shape_normalization_1.collectNormalizableShapes)(shape, shapeKeys, shapeOpaque, shapeDiscriminatorTypes),
|
|
156
156
|
};
|
|
157
157
|
validateShape(shape, normalizableShapes);
|
|
158
158
|
}
|
|
159
159
|
const declaredShapeDefinitions = {};
|
|
160
160
|
Object.keys(declaredShapes).forEach((key) => {
|
|
161
161
|
const shape = declaredShapes[key];
|
|
162
|
-
declaredShapeDefinitions[key] = aml_1.convertNodeShapeToNodeShapeDefinition(shape, Object.create(null));
|
|
162
|
+
declaredShapeDefinitions[key] = (0, aml_1.convertNodeShapeToNodeShapeDefinition)(shape, Object.create(null));
|
|
163
163
|
});
|
|
164
164
|
const normalizableShapeDefinitions = {};
|
|
165
165
|
Object.keys(normalizableShapes).forEach((key) => {
|
|
166
166
|
const shape = normalizableShapes[key];
|
|
167
|
-
normalizableShapeDefinitions[key] = aml_1.convertShapeToShapeDefinition(shape, Object.create(null));
|
|
167
|
+
normalizableShapeDefinitions[key] = (0, aml_1.convertShapeToShapeDefinition)(shape, Object.create(null));
|
|
168
168
|
});
|
|
169
169
|
// Collect all method annotations - Composite resource mapping needs to know about all of them.
|
|
170
170
|
for (const endpoint of api.endPoints) {
|
|
171
171
|
for (const operation of endpoint.operations) {
|
|
172
|
-
const annotation = annotation_method_1.collectMethodAnnotation(operation);
|
|
172
|
+
const annotation = (0, annotation_method_1.collectMethodAnnotation)(operation);
|
|
173
173
|
if (annotation !== undefined) {
|
|
174
174
|
methodOperations[operation.id] = annotation;
|
|
175
175
|
}
|
|
@@ -179,18 +179,18 @@ async function parse(path) {
|
|
|
179
179
|
for (const endpoint of api.endPoints) {
|
|
180
180
|
for (const operation of endpoint.operations) {
|
|
181
181
|
const semanticMethod = methodOperations[operation.id] || operation.method.value();
|
|
182
|
-
const composite = annotation_composite_1.collectCompositeAnnotation(document, endpoint, operation, api.endPoints, semanticMethod, methodOperations);
|
|
182
|
+
const composite = (0, annotation_composite_1.collectCompositeAnnotation)(document, endpoint, operation, api.endPoints, semanticMethod, methodOperations);
|
|
183
183
|
if (composite !== undefined) {
|
|
184
184
|
compositeResources[endpoint.id] = composite;
|
|
185
185
|
}
|
|
186
186
|
}
|
|
187
187
|
}
|
|
188
|
-
const resources = resource_1.collectResources(api, document, rootTtl, shapeKeys, shapeTtls, shapeCoerceFunction, methodOperations);
|
|
188
|
+
const resources = (0, resource_1.collectResources)(api, document, rootTtl, shapeKeys, shapeTtls, shapeCoerceFunction, methodOperations);
|
|
189
189
|
if (resources.length > 0 && keyPrefix === '') {
|
|
190
|
-
logger_1.logError(`Missing "keyPrefix" annotation. "keyPrefix" must be defined when resources are present`);
|
|
190
|
+
(0, logger_1.logError)(`Missing "keyPrefix" annotation. "keyPrefix" must be defined when resources are present`);
|
|
191
191
|
return {
|
|
192
192
|
modelInfo: undefined,
|
|
193
|
-
errors: logger_1.getLogErrors(),
|
|
193
|
+
errors: (0, logger_1.getLogErrors)(),
|
|
194
194
|
};
|
|
195
195
|
}
|
|
196
196
|
// collect paginated container types
|
|
@@ -205,9 +205,9 @@ async function parse(path) {
|
|
|
205
205
|
}
|
|
206
206
|
// find the path to paginated type from resource root type
|
|
207
207
|
const { strategy } = paginationParams;
|
|
208
|
-
const paginatedContainerPath = shape_paginated_container_1.collectPaginatedContainerPath(strategy, returnShape, shapePaginated, shapeOpaque);
|
|
208
|
+
const paginatedContainerPath = (0, shape_paginated_container_1.collectPaginatedContainerPath)(strategy, returnShape, shapePaginated, shapeOpaque);
|
|
209
209
|
if (paginatedContainerPath === undefined) {
|
|
210
|
-
logger_1.logError(`Paginated resource '${resource.name}' must contain a paginated type`);
|
|
210
|
+
(0, logger_1.logError)(`Paginated resource '${resource.name}' must contain a paginated type`);
|
|
211
211
|
return;
|
|
212
212
|
}
|
|
213
213
|
paginatedContainerPath.forEach((pathNode, index) => {
|
|
@@ -233,7 +233,7 @@ async function parse(path) {
|
|
|
233
233
|
Object.entries(shapeKey).forEach(([k, { valuePath, valueShape }]) => {
|
|
234
234
|
shapeKeyFieldsDefinition[k] = {
|
|
235
235
|
valuePath,
|
|
236
|
-
valueShapeDefinition: aml_1.convertShapeToShapeDefinition(valueShape, Object.create(null)),
|
|
236
|
+
valueShapeDefinition: (0, aml_1.convertShapeToShapeDefinition)(valueShape, Object.create(null)),
|
|
237
237
|
};
|
|
238
238
|
});
|
|
239
239
|
shapeKeysDefinition[key] = shapeKeyFieldsDefinition;
|
|
@@ -254,10 +254,10 @@ async function parse(path) {
|
|
|
254
254
|
shapeCoerceFunction,
|
|
255
255
|
resources,
|
|
256
256
|
compositeResources,
|
|
257
|
-
shapeDiscriminatorTypes: shape_inheritance_1.convertShapeDiscriminatorTypes(shapeDiscriminatorTypes),
|
|
257
|
+
shapeDiscriminatorTypes: (0, shape_inheritance_1.convertShapeDiscriminatorTypes)(shapeDiscriminatorTypes),
|
|
258
258
|
shapeInheritance,
|
|
259
259
|
};
|
|
260
|
-
const errors = logger_1.getLogErrors();
|
|
260
|
+
const errors = (0, logger_1.getLogErrors)();
|
|
261
261
|
if (errors.length > 0) {
|
|
262
262
|
return { modelInfo: undefined, errors };
|
|
263
263
|
}
|
package/dist/parser/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/parser/main.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAgB7C,sCAUsB;AACtB,2EAA8E;AAC9E,iEAAoE;AACpE,qDAAwD;AACxD,iEAAsD;AACtD,2DAA8D;AAC9D,iEAAoE;AACpE,6DAAgE;AAChE,qDAAwD;AACxD,6DAAsD;AACtD,mCAA2C;AAC3C,yCAA8C;AAC9C,2EAA4E;AAC5E,2DAI6B;AAC7B,+DAAkE;AAClE,yDAAkD;AAClD,qCAA2E;AAE3E,iEAAoE;AACpE,2DAA8D;AAyB9D,SAAS,eAAe,CAAC,KAA4B;IACjD,IAAI,eAAS,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/parser/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,14 +45,14 @@ function resolveParameterExamples(baseParams, overlayParams) {
|
|
|
45
45
|
}
|
|
46
46
|
function resolveDeclares(base, overlay) {
|
|
47
47
|
for (const declaration of overlay.declares) {
|
|
48
|
-
if (aml_1.isCustomDomainProperty(declaration)) {
|
|
48
|
+
if ((0, aml_1.isCustomDomainProperty)(declaration)) {
|
|
49
49
|
// Overlays can define new annotation types, if it's the case let add the annotation
|
|
50
50
|
// type to the base.
|
|
51
51
|
base.withDeclares([...base.declares, declaration]);
|
|
52
52
|
}
|
|
53
|
-
else if (aml_1.isAnyShape(declaration)) {
|
|
53
|
+
else if ((0, aml_1.isAnyShape)(declaration)) {
|
|
54
54
|
const shapeName = declaration.name.value();
|
|
55
|
-
const baseShape = base.declares.find((decl) => aml_1.isAnyShape(decl) && decl.name.value() === shapeName);
|
|
55
|
+
const baseShape = base.declares.find((decl) => (0, aml_1.isAnyShape)(decl) && decl.name.value() === shapeName);
|
|
56
56
|
if (baseShape) {
|
|
57
57
|
// If the base document also define the same shape then merge the shapes together
|
|
58
58
|
// in the base document.
|
|
@@ -69,14 +69,14 @@ function resolveEncodes(base, overlay) {
|
|
|
69
69
|
var _a, _b, _c, _d;
|
|
70
70
|
const baseApi = base.encodes;
|
|
71
71
|
const overlayApi = overlay.encodes;
|
|
72
|
-
if (!aml_1.isWebApi(baseApi)) {
|
|
72
|
+
if (!(0, aml_1.isWebApi)(baseApi)) {
|
|
73
73
|
const { line: baseApiLine, column: baseApiColumn } = baseApi.position.start;
|
|
74
|
-
logger_1.logError(`Unexpected encodes property.`, baseApiLine, baseApiColumn);
|
|
74
|
+
(0, logger_1.logError)(`Unexpected encodes property.`, baseApiLine, baseApiColumn);
|
|
75
75
|
return;
|
|
76
76
|
}
|
|
77
|
-
if (!aml_1.isWebApi(overlayApi)) {
|
|
77
|
+
if (!(0, aml_1.isWebApi)(overlayApi)) {
|
|
78
78
|
const { line: overlayApiLine, column: overlayApiColumn } = overlayApi.position.start;
|
|
79
|
-
logger_1.logError(`Unexpected encodes property.`, overlayApiLine, overlayApiColumn);
|
|
79
|
+
(0, logger_1.logError)(`Unexpected encodes property.`, overlayApiLine, overlayApiColumn);
|
|
80
80
|
return;
|
|
81
81
|
}
|
|
82
82
|
mergeCustomDomainProperties(baseApi, overlayApi);
|
|
@@ -84,7 +84,7 @@ function resolveEncodes(base, overlay) {
|
|
|
84
84
|
const baseEndpoint = baseApi.endPoints.find((endPoint) => endPoint.path.value() === overlayEndpoint.path.value());
|
|
85
85
|
if (baseEndpoint === undefined) {
|
|
86
86
|
const { line, column } = overlayEndpoint.position.start;
|
|
87
|
-
logger_1.logError(`Endpoint '${overlayEndpoint.relativePath}' is not allowed to be added in overlay.`, line, column);
|
|
87
|
+
(0, logger_1.logError)(`Endpoint '${overlayEndpoint.relativePath}' is not allowed to be added in overlay.`, line, column);
|
|
88
88
|
return;
|
|
89
89
|
}
|
|
90
90
|
if (overlayEndpoint.name.value()) {
|
|
@@ -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;;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,
|
|
1
|
+
{"version":3,"file":"overlay-resolution.js","sourceRoot":"","sources":["../../src/parser/overlay-resolution.ts"],"names":[],"mappings":"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"}
|
package/dist/parser/parse.js
CHANGED
|
@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
14
14
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
15
|
if (mod && mod.__esModule) return mod;
|
|
16
16
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
18
|
__setModuleDefault(result, mod);
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
@@ -35,7 +35,7 @@ const RAML_LOADER = {
|
|
|
35
35
|
accepts(resource) {
|
|
36
36
|
return (resource === annotation_1.LUVIO_ANNOTATIONS_RESOURCE ||
|
|
37
37
|
(resource.startsWith(files_1.AMF_RESOURCE_PREFIX) &&
|
|
38
|
-
fs_1.default.existsSync(files_1.ramlResourceToPath(resource))));
|
|
38
|
+
fs_1.default.existsSync((0, files_1.ramlResourceToPath)(resource))));
|
|
39
39
|
},
|
|
40
40
|
fetch(resource) {
|
|
41
41
|
let source, targetResource = resource;
|
|
@@ -45,7 +45,7 @@ const RAML_LOADER = {
|
|
|
45
45
|
targetResource = annotation_1.LUVIO_ANNOTATIONS_PATH;
|
|
46
46
|
}
|
|
47
47
|
else if (targetResource.startsWith(files_1.AMF_RESOURCE_PREFIX)) {
|
|
48
|
-
const resourcePath = files_1.ramlResourceToPath(targetResource);
|
|
48
|
+
const resourcePath = (0, files_1.ramlResourceToPath)(targetResource);
|
|
49
49
|
source = fs_1.default.readFileSync(resourcePath, 'utf-8');
|
|
50
50
|
}
|
|
51
51
|
const content = new amf.client.remote.Content(source, targetResource);
|
|
@@ -63,7 +63,7 @@ async function parse(path) {
|
|
|
63
63
|
await init();
|
|
64
64
|
const environment = new amf.client.environment.Environment().addClientLoader(RAML_LOADER);
|
|
65
65
|
const parser = new amf.Raml10Parser(environment);
|
|
66
|
-
return parser.parseFileAsync(files_1.pathToRamlResource(path));
|
|
66
|
+
return parser.parseFileAsync((0, files_1.pathToRamlResource)(path));
|
|
67
67
|
}
|
|
68
68
|
async function validate(path) {
|
|
69
69
|
const model = await parse(path);
|
|
@@ -83,7 +83,7 @@ async function validate(path) {
|
|
|
83
83
|
}
|
|
84
84
|
// only includes file name and node name
|
|
85
85
|
const node = targetNode.substring(targetNode.search(/[^/]*.raml/));
|
|
86
|
-
logger_1.logError(`${message.trim()}. Target Node: ${node}`, position.start.line, position.start.column);
|
|
86
|
+
(0, logger_1.logError)(`${message.trim()}. Target Node: ${node}`, position.start.line, position.start.column);
|
|
87
87
|
});
|
|
88
88
|
}
|
|
89
89
|
async function parseAndValidate(path) {
|
package/dist/parser/parse.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/parser/parse.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAqC;AACrC,4CAAoB;AACpB,gDAAwB;AAExB,qCAAoC;AACpC,0CAA6F;AAC7F,oDAAyF;AAEzF,MAAM,yBAAyB,GAAG,YAAE,CAAC,YAAY,CAAC,mCAAsB,EAAE,OAAO,CAAC,CAAC;AAEnF,MAAM,sBAAsB,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,wCAAwC,CAAC,CAAC;AAEjG,MAAM,WAAW,GAAgC;IAC7C,OAAO,CAAC,QAAgB;QACpB,OAAO,CACH,QAAQ,KAAK,uCAA0B;YACvC,CAAC,QAAQ,CAAC,UAAU,CAAC,2BAAmB,CAAC;gBACrC,YAAE,CAAC,UAAU,CAAC,0BAAkB,
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/parser/parse.ts"],"names":[],"mappings":"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"}
|