@luvio/compiler 0.157.4 → 0.158.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/shape/shape-cache-keys.js +6 -3
- package/dist/codegen/shape/shape-cache-keys.js.map +1 -1
- package/dist/codegen/shape/shape-equals.js +47 -34
- package/dist/codegen/shape/shape-equals.js.map +1 -1
- package/dist/codegen/shape/shape-normalize.js +5 -3
- package/dist/codegen/shape/shape-normalize.js.map +1 -1
- package/dist/codegen/shape/shape-select-utils.js +16 -1
- package/dist/codegen/shape/shape-select-utils.js.map +1 -1
- package/dist/codegen/shared/validation.js +1 -1
- package/dist/codegen/shared/validation.js.map +1 -1
- package/dist/intermediate/utils.d.ts +1 -0
- package/dist/intermediate/utils.js +5 -1
- package/dist/intermediate/utils.js.map +1 -1
- package/dist/parser/main.js +14 -8
- package/dist/parser/main.js.map +1 -1
- package/dist/utils/aml.d.ts +1 -0
- package/dist/utils/aml.js +5 -1
- package/dist/utils/aml.js.map +1 -1
- package/package.json +5 -5
|
@@ -165,7 +165,7 @@ function generateArray(shape, importContext, propertyName, isOptionalArray) {
|
|
|
165
165
|
return [code];
|
|
166
166
|
}
|
|
167
167
|
function generateUnion(valueShape, modelInfo, importContext, propertyName) {
|
|
168
|
-
const nonScalarShapes = valueShape.anyOf.filter((shape) => !(0, utils_1.isScalarShape)(shape) && !(0, utils_1.isNilShape)(shape));
|
|
168
|
+
const nonScalarShapes = valueShape.anyOf.filter((shape) => !(0, utils_1.isScalarShape)(shape) && !(0, utils_1.isNilShape)(shape) && !(0, utils_1.isArrayShape)(shape));
|
|
169
169
|
// If union is only between simple type, no normalization is needed.
|
|
170
170
|
if (nonScalarShapes.length === 0) {
|
|
171
171
|
return [];
|
|
@@ -177,11 +177,14 @@ function generateUnion(valueShape, modelInfo, importContext, propertyName) {
|
|
|
177
177
|
return [];
|
|
178
178
|
}
|
|
179
179
|
const propertyPath = buildPathFromPropertyName(propertyName);
|
|
180
|
+
// I don't think this outerVarName is actually being used anywhere?
|
|
180
181
|
const outerVarName = `${buildVarNameFromPropertyName(propertyName)}__outer`;
|
|
182
|
+
const isNonScalarArray = (0, utils_1.isArrayShape)(nonScalarShape) && !(0, utils_1.isScalarArrayShape)(nonScalarShape);
|
|
181
183
|
const inScalarShapeShape = [
|
|
182
|
-
`${propertyPath}
|
|
184
|
+
`${isNonScalarArray ? `` : `!Array.isArray(${propertyPath}) && `}`,
|
|
185
|
+
`${propertyPath} !== null && `,
|
|
183
186
|
`typeof ${propertyPath} === 'object'`,
|
|
184
|
-
].join('
|
|
187
|
+
].join('');
|
|
185
188
|
const code = (0, deindent_1.default) `
|
|
186
189
|
let ${outerVarName} = {};
|
|
187
190
|
if (${inScalarShapeShape}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-cache-keys.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-cache-keys.ts"],"names":[],"mappings":";;;;;;AACA,oEAA4C;AAC5C,mDAM6B;AAC7B,2EAA6E;AAC7E,yDAA4E;AAO5E,gEAKwC;AAGxC,6CAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"shape-cache-keys.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-cache-keys.ts"],"names":[],"mappings":"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"}
|
|
@@ -152,46 +152,59 @@ function equalsArrayShape(arrayShape, state) {
|
|
|
152
152
|
`;
|
|
153
153
|
}
|
|
154
154
|
function equalsUnionShape(unionShape, state) {
|
|
155
|
-
const
|
|
156
|
-
const
|
|
157
|
-
if (
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
${
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
${
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
else if ((0, utils_1.isArrayShape)(nonScalarShape)) {
|
|
171
|
-
return (0, deindent_1.default) `
|
|
172
|
-
(() => {
|
|
173
|
-
if (${state.existingIdentifier} === null || ${state.incomingIdentifier} === null) {
|
|
174
|
-
return ${state.existingIdentifier} === ${state.incomingIdentifier};
|
|
155
|
+
const nonScalarShape = unionShape.anyOf.find((shape) => !(0, utils_1.isScalarShape)(shape) && !(0, utils_1.isNilShape)(shape) && !(0, utils_1.isArrayShape)(shape));
|
|
156
|
+
const arrayShape = unionShape.anyOf.find((shape) => (0, utils_1.isArrayShape)(shape));
|
|
157
|
+
if (arrayShape && (0, utils_1.isArrayShape)(arrayShape)) {
|
|
158
|
+
return (0, deindent_1.default) `
|
|
159
|
+
(() => {
|
|
160
|
+
if (${state.existingIdentifier} === null || ${state.incomingIdentifier} === null) {
|
|
161
|
+
return ${state.existingIdentifier} === ${state.incomingIdentifier};
|
|
162
|
+
}
|
|
163
|
+
if(Array.isArray(${state.existingIdentifier}) && Array.isArray(${state.incomingIdentifier})){
|
|
164
|
+
${equalsArrayShape(arrayShape, state)}
|
|
165
|
+
} else {
|
|
166
|
+
if (!(${nonScalarShape
|
|
167
|
+
? equalsNonScalarShape(nonScalarShape, state, unionShape.id)
|
|
168
|
+
: equalsScalar(state)})) {
|
|
169
|
+
return false;
|
|
175
170
|
}
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|| (
|
|
184
|
-
${state.existingIdentifier} != null &&
|
|
185
|
-
${state.incomingIdentifier} != null &&
|
|
186
|
-
${equalsLink(nonScalarShape, state)}
|
|
187
|
-
)
|
|
188
|
-
`;
|
|
189
|
-
}
|
|
171
|
+
}
|
|
172
|
+
return true;
|
|
173
|
+
})()
|
|
174
|
+
`;
|
|
175
|
+
}
|
|
176
|
+
else if (nonScalarShape) {
|
|
177
|
+
return equalsNonScalarShape(nonScalarShape, state, unionShape.id);
|
|
190
178
|
}
|
|
191
179
|
else {
|
|
192
180
|
return equalsScalar(state);
|
|
193
181
|
}
|
|
194
182
|
}
|
|
183
|
+
function equalsNonScalarShape(shape, state, id) {
|
|
184
|
+
const { normalizableShapeDefinitions } = state.modelInfo;
|
|
185
|
+
if (id in normalizableShapeDefinitions) {
|
|
186
|
+
return (0, deindent_1.default) `
|
|
187
|
+
${equalsScalar(state)}
|
|
188
|
+
|| (
|
|
189
|
+
${state.existingIdentifier} != null &&
|
|
190
|
+
${state.incomingIdentifier} != null &&
|
|
191
|
+
(${state.existingIdentifier} as any).__ref != null &&
|
|
192
|
+
(${state.incomingIdentifier} as any).__ref != null &&
|
|
193
|
+
${equalsLink(shape, state)}
|
|
194
|
+
)
|
|
195
|
+
`;
|
|
196
|
+
}
|
|
197
|
+
else {
|
|
198
|
+
return (0, deindent_1.default) `
|
|
199
|
+
${equalsScalar(state)}
|
|
200
|
+
|| (
|
|
201
|
+
${state.existingIdentifier} != null &&
|
|
202
|
+
${state.incomingIdentifier} != null &&
|
|
203
|
+
${equalsLink(shape, state)}
|
|
204
|
+
)
|
|
205
|
+
`;
|
|
206
|
+
}
|
|
207
|
+
}
|
|
195
208
|
function equalsShape(shape, state) {
|
|
196
209
|
let equalityCheck;
|
|
197
210
|
if (shape.linkTarget !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-equals.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-equals.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shape-equals.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-equals.ts"],"names":[],"mappings":"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"}
|
|
@@ -110,7 +110,7 @@ function normalizeArray(valueShape, state) {
|
|
|
110
110
|
`;
|
|
111
111
|
}
|
|
112
112
|
function normalizeUnion(valueShape, state) {
|
|
113
|
-
const nonScalarShapes = valueShape.anyOf.filter((shape) => !(0, utils_1.isScalarShape)(shape) && !(0, utils_1.isNilShape)(shape));
|
|
113
|
+
const nonScalarShapes = valueShape.anyOf.filter((shape) => !(0, utils_1.isScalarShape)(shape) && !(0, utils_1.isNilShape)(shape) && !(0, utils_1.isScalarArrayShape)(shape));
|
|
114
114
|
// If union is only between simple type, no normalization is needed.
|
|
115
115
|
if (nonScalarShapes.length === 0) {
|
|
116
116
|
return '';
|
|
@@ -118,10 +118,12 @@ function normalizeUnion(valueShape, state) {
|
|
|
118
118
|
// the union is composed of a single non scalar shape with n scalar shapes.
|
|
119
119
|
const nonScalarShape = nonScalarShapes[0];
|
|
120
120
|
const normalizedUnion = normalizeShape(nonScalarShape, state);
|
|
121
|
+
const isNonScalarArray = (0, utils_1.isArrayShape)(nonScalarShape) && !(0, utils_1.isScalarArrayShape)(nonScalarShape);
|
|
121
122
|
const inScalarShapeShape = [
|
|
122
|
-
`${state.propertyIdentifier}
|
|
123
|
+
`${isNonScalarArray ? `` : `!Array.isArray(${state.propertyIdentifier}) && `}`,
|
|
124
|
+
`${state.propertyIdentifier} !== null && `,
|
|
123
125
|
`typeof ${state.propertyIdentifier} === 'object'`,
|
|
124
|
-
].join('
|
|
126
|
+
].join('');
|
|
125
127
|
return (0, deindent_1.default) `
|
|
126
128
|
if (${inScalarShapeShape}) {
|
|
127
129
|
${normalizedUnion}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-normalize.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-normalize.ts"],"names":[],"mappings":";;;;;;AAMA,gEAAsE;AAEtE,
|
|
1
|
+
{"version":3,"file":"shape-normalize.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-normalize.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,15 +46,30 @@ function selectAny(state) {
|
|
|
46
46
|
function selectUnion(shape, state) {
|
|
47
47
|
let nullableScalar = null;
|
|
48
48
|
let nonScalar = null;
|
|
49
|
+
let arrayScalar = null;
|
|
49
50
|
shape.anyOf.forEach((anyOf) => {
|
|
50
|
-
if ((0, utils_1.isScalarShape)(anyOf) || (0, utils_1.isNilShape)(anyOf)) {
|
|
51
|
+
if ((0, utils_1.isScalarShape)(anyOf) || (0, utils_1.isNilShape)(anyOf) || (0, utils_1.isArrayShape)(anyOf)) {
|
|
51
52
|
if ((0, utils_1.isNilShape)(anyOf)) {
|
|
52
53
|
nullableScalar = anyOf;
|
|
53
54
|
}
|
|
55
|
+
if ((0, utils_1.isArrayShape)(anyOf)) {
|
|
56
|
+
arrayScalar = anyOf;
|
|
57
|
+
}
|
|
54
58
|
return;
|
|
55
59
|
}
|
|
56
60
|
nonScalar = anyOf;
|
|
57
61
|
});
|
|
62
|
+
// Somewhat hard-coded due to this bug - W-18474136
|
|
63
|
+
if (nonScalar !== null && nullableScalar !== null && arrayScalar !== null) {
|
|
64
|
+
return (0, deindent_1.default) `
|
|
65
|
+
{
|
|
66
|
+
kind: 'Object',
|
|
67
|
+
name: ${state.propertyName},
|
|
68
|
+
nullable: true,
|
|
69
|
+
// Complex union deep
|
|
70
|
+
}
|
|
71
|
+
`;
|
|
72
|
+
}
|
|
58
73
|
// Union pointing to another shape
|
|
59
74
|
if (nonScalar !== null && nullableScalar !== null) {
|
|
60
75
|
return selectShape(nonScalar, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-select-utils.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-select-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"shape-select-utils.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-select-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -163,7 +163,7 @@ function validatePresent(state) {
|
|
|
163
163
|
}
|
|
164
164
|
function validateNormalizableReference(state) {
|
|
165
165
|
return (0, deindent_1.default) `
|
|
166
|
-
if (typeof ${state.objectIdentifier} !== 'object') {
|
|
166
|
+
if (typeof ${state.objectIdentifier} !== 'object' || Array.isArray(${state.objectIdentifier})) {
|
|
167
167
|
return new TypeError('Expected "object" but received "' + typeof ${state.objectIdentifier} + '" (at "' + ${state.pathIdentifier} + '")');
|
|
168
168
|
}
|
|
169
169
|
`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/codegen/shared/validation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/codegen/shared/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,5 +12,6 @@ export declare function isNilShape(node: ShapeDefinition): boolean;
|
|
|
12
12
|
export declare function isScalarShape(node: ShapeDefinition): node is ScalarShapeDefinition;
|
|
13
13
|
export declare function isNodeShape(node: ShapeDefinition): node is NodeShapeDefinition;
|
|
14
14
|
export declare function isArrayShape(node: ShapeDefinition): node is ArrayShapeDefinition;
|
|
15
|
+
export declare function isScalarArrayShape(node: ShapeDefinition): node is ArrayShapeDefinition;
|
|
15
16
|
export declare function isUnionShape(node: ShapeDefinition): node is UnionShapeDefinition;
|
|
16
17
|
export declare function isAnyShape(node: ShapeDefinition): boolean;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isAnyShape = exports.isUnionShape = exports.isArrayShape = exports.isNodeShape = exports.isScalarShape = exports.isNilShape = exports.isNumberScalarShape = exports.isDoubleScalarShape = exports.isIntegerScalarShape = exports.isBooleanScalarShape = exports.isStringScalarShape = exports.isJavascriptNumberShape = void 0;
|
|
3
|
+
exports.isAnyShape = exports.isUnionShape = exports.isScalarArrayShape = exports.isArrayShape = exports.isNodeShape = exports.isScalarShape = exports.isNilShape = exports.isNumberScalarShape = exports.isDoubleScalarShape = exports.isIntegerScalarShape = exports.isBooleanScalarShape = exports.isStringScalarShape = exports.isJavascriptNumberShape = void 0;
|
|
4
4
|
const aml_1 = require("../utils/aml");
|
|
5
5
|
const definitions_1 = require("./definitions");
|
|
6
6
|
function isJavascriptNumberShape(shape) {
|
|
@@ -47,6 +47,10 @@ function isArrayShape(node) {
|
|
|
47
47
|
return node.shapeType === definitions_1.ShapeTypes.ArrayShape;
|
|
48
48
|
}
|
|
49
49
|
exports.isArrayShape = isArrayShape;
|
|
50
|
+
function isScalarArrayShape(node) {
|
|
51
|
+
return isArrayShape(node) && node.items.shapeType === definitions_1.ShapeTypes.ScalarShape;
|
|
52
|
+
}
|
|
53
|
+
exports.isScalarArrayShape = isScalarArrayShape;
|
|
50
54
|
function isUnionShape(node) {
|
|
51
55
|
return node.shapeType === definitions_1.ShapeTypes.UnionShape;
|
|
52
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/intermediate/utils.ts"],"names":[],"mappings":";;;AAAA,sCAUsB;AAQtB,+CAA2C;AAI3C,SAAgB,uBAAuB,CAAC,KAA4B;IAChE,OAAO,oBAAoB,CAAC,KAAK,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACnG,CAAC;AAFD,0DAEC;AAED,SAAgB,mBAAmB,CAAC,IAA2B;IAC3D,OAAO,IAAI,CAAC,QAAQ,KAAK,sBAAgB,CAAC;AAC9C,CAAC;AAFD,kDAEC;AAED,SAAgB,oBAAoB,CAAC,IAA2B;IAC5D,OAAO,IAAI,CAAC,QAAQ,KAAK,uBAAiB,CAAC;AAC/C,CAAC;AAFD,oDAEC;AAED,SAAgB,oBAAoB,CAAC,IAA2B;IAC5D,OAAO,IAAI,CAAC,QAAQ,KAAK,uBAAiB,CAAC;AAC/C,CAAC;AAFD,oDAEC;AAED,SAAgB,mBAAmB,CAAC,IAA2B;IAC3D,OAAO,IAAI,CAAC,QAAQ,KAAK,sBAAgB,CAAC;AAC9C,CAAC;AAFD,kDAEC;AAED,SAAgB,mBAAmB,CAAC,IAA2B;IAC3D,OAAO,CACH,IAAI,CAAC,QAAQ,KAAK,sBAAgB;QAClC,IAAI,CAAC,QAAQ,KAAK,4BAAsB;QACxC,IAAI,CAAC,QAAQ,KAAK,0BAAoB;QACtC,IAAI,CAAC,QAAQ,KAAK,2BAAqB;QACvC,IAAI,CAAC,QAAQ,KAAK,4BAAsB,CAC3C,CAAC;AACN,CAAC;AARD,kDAQC;AAED,SAAgB,UAAU,CAAC,IAAqB;IAC5C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,QAAQ,CAAC;AAClD,CAAC;AAFD,gCAEC;AAED,SAAgB,aAAa,CAAC,IAAqB;IAC/C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,WAAW,CAAC;AACrD,CAAC;AAFD,sCAEC;AAED,SAAgB,WAAW,CAAC,IAAqB;IAC7C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,SAAS,CAAC;AACnD,CAAC;AAFD,kCAEC;AAED,SAAgB,YAAY,CAAC,IAAqB;IAC9C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,UAAU,CAAC;AACpD,CAAC;AAFD,oCAEC;AAED,SAAgB,YAAY,CAAC,IAAqB;IAC9C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,UAAU,CAAC;AACpD,CAAC;AAFD,oCAEC;AAED,SAAgB,UAAU,CAAC,IAAqB;IAC5C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,QAAQ,CAAC;AAClD,CAAC;AAFD,gCAEC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/intermediate/utils.ts"],"names":[],"mappings":";;;AAAA,sCAUsB;AAQtB,+CAA2C;AAI3C,SAAgB,uBAAuB,CAAC,KAA4B;IAChE,OAAO,oBAAoB,CAAC,KAAK,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACnG,CAAC;AAFD,0DAEC;AAED,SAAgB,mBAAmB,CAAC,IAA2B;IAC3D,OAAO,IAAI,CAAC,QAAQ,KAAK,sBAAgB,CAAC;AAC9C,CAAC;AAFD,kDAEC;AAED,SAAgB,oBAAoB,CAAC,IAA2B;IAC5D,OAAO,IAAI,CAAC,QAAQ,KAAK,uBAAiB,CAAC;AAC/C,CAAC;AAFD,oDAEC;AAED,SAAgB,oBAAoB,CAAC,IAA2B;IAC5D,OAAO,IAAI,CAAC,QAAQ,KAAK,uBAAiB,CAAC;AAC/C,CAAC;AAFD,oDAEC;AAED,SAAgB,mBAAmB,CAAC,IAA2B;IAC3D,OAAO,IAAI,CAAC,QAAQ,KAAK,sBAAgB,CAAC;AAC9C,CAAC;AAFD,kDAEC;AAED,SAAgB,mBAAmB,CAAC,IAA2B;IAC3D,OAAO,CACH,IAAI,CAAC,QAAQ,KAAK,sBAAgB;QAClC,IAAI,CAAC,QAAQ,KAAK,4BAAsB;QACxC,IAAI,CAAC,QAAQ,KAAK,0BAAoB;QACtC,IAAI,CAAC,QAAQ,KAAK,2BAAqB;QACvC,IAAI,CAAC,QAAQ,KAAK,4BAAsB,CAC3C,CAAC;AACN,CAAC;AARD,kDAQC;AAED,SAAgB,UAAU,CAAC,IAAqB;IAC5C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,QAAQ,CAAC;AAClD,CAAC;AAFD,gCAEC;AAED,SAAgB,aAAa,CAAC,IAAqB;IAC/C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,WAAW,CAAC;AACrD,CAAC;AAFD,sCAEC;AAED,SAAgB,WAAW,CAAC,IAAqB;IAC7C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,SAAS,CAAC;AACnD,CAAC;AAFD,kCAEC;AAED,SAAgB,YAAY,CAAC,IAAqB;IAC9C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,UAAU,CAAC;AACpD,CAAC;AAFD,oCAEC;AAED,SAAgB,kBAAkB,CAAC,IAAqB;IACpD,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,wBAAU,CAAC,WAAW,CAAC;AACjF,CAAC;AAFD,gDAEC;AAED,SAAgB,YAAY,CAAC,IAAqB;IAC9C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,UAAU,CAAC;AACpD,CAAC;AAFD,oCAEC;AAED,SAAgB,UAAU,CAAC,IAAqB;IAC5C,OAAO,IAAI,CAAC,SAAS,KAAK,wBAAU,CAAC,QAAQ,CAAC;AAClD,CAAC;AAFD,gCAEC"}
|
package/dist/parser/main.js
CHANGED
|
@@ -72,18 +72,24 @@ function validateNodeShape(shape, normalizableShapes) {
|
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
74
|
function validateUnionShape(shape) {
|
|
75
|
-
|
|
76
|
-
const
|
|
77
|
-
// If the union contains one or more shapes that are non scalar report an error.
|
|
75
|
+
const nonScalarShapes = shape.anyOf.filter((s) => !(0, aml_1.isScalarShape)(s) && !(0, aml_1.isNilShape)(s) && !(0, aml_1.isScalarArrayShape)(s));
|
|
76
|
+
const arrayShapes = shape.anyOf.filter((s) => (0, aml_1.isArrayShape)(s));
|
|
77
|
+
// If the union contains one or more shapes that are non scalar report an error, or more than one array.
|
|
78
78
|
// Note: Supporting union between multiple non scalar types requires a type check to know which
|
|
79
79
|
// normalization routine need to be invoked.
|
|
80
|
-
if (
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
80
|
+
if (arrayShapes.length > 1) {
|
|
81
|
+
formatError('Unsupported multiple arrays between', shape, arrayShapes);
|
|
82
|
+
}
|
|
83
|
+
else if (nonScalarShapes.length > 1) {
|
|
84
|
+
formatError('Unsupported complex normalization between', shape, nonScalarShapes);
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
+
function formatError(message, shape, invalidShapes) {
|
|
88
|
+
var _a;
|
|
89
|
+
const formattedShapes = invalidShapes.map((s) => s.linkTarget ? s.linkTarget.name.value() : s.name.value());
|
|
90
|
+
const startPosition = (_a = shape.anyOf[0].position) === null || _a === void 0 ? void 0 : _a.start;
|
|
91
|
+
(0, logger_1.logError)(`${message} ${formattedShapes.join(', ')}`, startPosition === null || startPosition === void 0 ? void 0 : startPosition.line, startPosition === null || startPosition === void 0 ? void 0 : startPosition.column);
|
|
92
|
+
}
|
|
87
93
|
function buildConfigShape(keys) {
|
|
88
94
|
const configProperties = Object.entries(keys).map(([identifier, { valueShape }]) => new amf_client_js_1.model.domain.PropertyShape().withName(identifier).withRange(valueShape).withMinCount(1));
|
|
89
95
|
return (0, aml_1.convertNodeShapeToNodeShapeDefinition)(new amf_client_js_1.model.domain.NodeShape().withProperties(configProperties), Object.create(null));
|
package/dist/parser/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/parser/main.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/parser/main.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/aml.d.ts
CHANGED
|
@@ -25,6 +25,7 @@ export declare function isAnyShape(node: amf.domain.DomainElement): node is amf.
|
|
|
25
25
|
export declare function isNilShape(node: amf.domain.DomainElement): node is amf.domain.NilShape;
|
|
26
26
|
export declare function isScalarShape(node: amf.domain.DomainElement): node is amf.domain.ScalarShape;
|
|
27
27
|
export declare function isArrayShape(node: amf.domain.DomainElement): node is amf.domain.ArrayShape;
|
|
28
|
+
export declare function isScalarArrayShape(node: amf.domain.DomainElement): node is amf.domain.ArrayShape;
|
|
28
29
|
export declare function isUnionShape(node: amf.domain.DomainElement): node is amf.domain.UnionShape;
|
|
29
30
|
export declare function isFileShape(node: amf.domain.DomainElement): node is amf.domain.FileShape;
|
|
30
31
|
export declare function isStringScalarShape(node: amf.domain.ScalarShape): boolean;
|
package/dist/utils/aml.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseExampleValue = exports.convertParameterToParamterDefinition = exports.convertPropertyShapeToPropertyShapeDefinition = exports.convertNodeShapeToNodeShapeDefinition = exports.convertShapeToShapeDefinition = exports.isJavascriptNumberShape = exports.resolveShape = exports.isNumberScalarShape = exports.isDoubleScalarShape = exports.isIntegerScalarShape = exports.isBooleanScalarShape = exports.isStringScalarShape = exports.isFileShape = exports.isUnionShape = exports.isArrayShape = exports.isScalarShape = exports.isNilShape = exports.isAnyShape = exports.isNodeShape = exports.isWebApi = exports.isCustomDomainProperty = exports.isLongScalarShape = exports.isBooleanScalarNode = exports.isStringScalarNode = exports.isScalarNode = exports.isArrayNode = exports.isObjectNode = exports.isOverlay = exports.isDocument = exports.BIGINT_DATA_TYPE = exports.NUMBER_int16_DATA_TYPE = exports.NUMBER_int8_DATA_TYPE = exports.NUMBER_int_DATA_TYPE = exports.NUMBER_float_DATA_TYPE = exports.NUMBER_DATA_TYPE = exports.DOUBLE_DATA_TYPE = exports.INTEGER_DATA_TYPE = exports.BOOLEAN_DATA_TYPE = exports.STRING_DATA_TYPE = void 0;
|
|
3
|
+
exports.parseExampleValue = exports.convertParameterToParamterDefinition = exports.convertPropertyShapeToPropertyShapeDefinition = exports.convertNodeShapeToNodeShapeDefinition = exports.convertShapeToShapeDefinition = exports.isJavascriptNumberShape = exports.resolveShape = exports.isNumberScalarShape = exports.isDoubleScalarShape = exports.isIntegerScalarShape = exports.isBooleanScalarShape = exports.isStringScalarShape = exports.isFileShape = exports.isUnionShape = exports.isScalarArrayShape = exports.isArrayShape = exports.isScalarShape = exports.isNilShape = exports.isAnyShape = exports.isNodeShape = exports.isWebApi = exports.isCustomDomainProperty = exports.isLongScalarShape = exports.isBooleanScalarNode = exports.isStringScalarNode = exports.isScalarNode = exports.isArrayNode = exports.isObjectNode = exports.isOverlay = exports.isDocument = exports.BIGINT_DATA_TYPE = exports.NUMBER_int16_DATA_TYPE = exports.NUMBER_int8_DATA_TYPE = exports.NUMBER_int_DATA_TYPE = exports.NUMBER_float_DATA_TYPE = exports.NUMBER_DATA_TYPE = exports.DOUBLE_DATA_TYPE = exports.INTEGER_DATA_TYPE = exports.BOOLEAN_DATA_TYPE = exports.STRING_DATA_TYPE = void 0;
|
|
4
4
|
const amf_client_js_1 = require("amf-client-js");
|
|
5
5
|
const definitions_1 = require("../intermediate/definitions");
|
|
6
6
|
exports.STRING_DATA_TYPE = 'http://www.w3.org/2001/XMLSchema#string';
|
|
@@ -76,6 +76,10 @@ function isArrayShape(node) {
|
|
|
76
76
|
return node instanceof amf_client_js_1.model.domain.ArrayShape;
|
|
77
77
|
}
|
|
78
78
|
exports.isArrayShape = isArrayShape;
|
|
79
|
+
function isScalarArrayShape(node) {
|
|
80
|
+
return node instanceof amf_client_js_1.model.domain.ArrayShape && node.items instanceof amf_client_js_1.model.domain.ScalarShape;
|
|
81
|
+
}
|
|
82
|
+
exports.isScalarArrayShape = isScalarArrayShape;
|
|
79
83
|
function isUnionShape(node) {
|
|
80
84
|
return node instanceof amf_client_js_1.model.domain.UnionShape;
|
|
81
85
|
}
|
package/dist/utils/aml.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aml.js","sourceRoot":"","sources":["../../src/utils/aml.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"aml.js","sourceRoot":"","sources":["../../src/utils/aml.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.
|
|
3
|
+
"version": "0.158.1",
|
|
4
4
|
"description": "Luvio Compiler",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -23,13 +23,13 @@
|
|
|
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.
|
|
26
|
+
"@luvio/graphql-parser": "^0.158.1",
|
|
27
27
|
"amf-client-js": "4.2.0"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@luvio/adapter-test-library": "^0.
|
|
31
|
-
"@luvio/engine": "^0.
|
|
32
|
-
"@luvio/graphql": "^0.
|
|
30
|
+
"@luvio/adapter-test-library": "^0.158.1",
|
|
31
|
+
"@luvio/engine": "^0.158.1",
|
|
32
|
+
"@luvio/graphql": "^0.158.1"
|
|
33
33
|
},
|
|
34
34
|
"volta": {
|
|
35
35
|
"extends": "../../../package.json"
|