@luvio/compiler 0.140.3 → 0.141.0
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 +15 -8
- package/dist/codegen/shape/shape-cache-keys.js.map +1 -1
- package/dist/codegen/shape/shape-normalize.js +9 -4
- package/dist/codegen/shape/shape-normalize.js.map +1 -1
- package/dist/codegen/shape/shape-select-utils.js +1 -0
- package/dist/codegen/shape/shape-select-utils.js.map +1 -1
- package/dist/parser/main.js +3 -1
- package/dist/parser/main.js.map +1 -1
- package/package.json +5 -5
|
@@ -109,7 +109,7 @@ function generateObject(shape, modelInfo, importContext, propertyName) {
|
|
|
109
109
|
return;
|
|
110
110
|
}
|
|
111
111
|
// have to see if the pattern response is normalizable
|
|
112
|
-
const responseCacheKeyLines = generateShape(propertyShape.range, modelInfo, importContext, propertyName);
|
|
112
|
+
const responseCacheKeyLines = generateShape(propertyShape.range, modelInfo, importContext, propertyName, propertyShape.isOptional);
|
|
113
113
|
const fallbackPrefix = responseCacheKeyLines.length > 0
|
|
114
114
|
? `${ROOT_KEY_IDENTIFIER} + "__${propertyName}"`
|
|
115
115
|
: ROOT_KEY_IDENTIFIER;
|
|
@@ -132,14 +132,14 @@ function generateObject(shape, modelInfo, importContext, propertyName) {
|
|
|
132
132
|
lines.push(code);
|
|
133
133
|
return;
|
|
134
134
|
}
|
|
135
|
-
const nestedProps = generateShape(propertyShape.range, modelInfo, importContext, shapeName);
|
|
135
|
+
const nestedProps = generateShape(propertyShape.range, modelInfo, importContext, shapeName, propertyShape.isOptional);
|
|
136
136
|
for (const nestedProp of nestedProps) {
|
|
137
137
|
lines.push(nestedProp);
|
|
138
138
|
}
|
|
139
139
|
});
|
|
140
140
|
return lines;
|
|
141
141
|
}
|
|
142
|
-
function generateArray(shape, importContext, propertyName) {
|
|
142
|
+
function generateArray(shape, importContext, propertyName, isOptionalArray) {
|
|
143
143
|
// if this isn't a link then nothing to do here
|
|
144
144
|
if (shape.items.isLink === false) {
|
|
145
145
|
return [];
|
|
@@ -150,12 +150,19 @@ function generateArray(shape, importContext, propertyName) {
|
|
|
150
150
|
// note we pass a no-op path factory because if we got here then the shape
|
|
151
151
|
// is normalizable and the array items will have a key builder
|
|
152
152
|
const fallbackKeyBuilder = `() => ''`;
|
|
153
|
-
|
|
153
|
+
let code = (0, deindent_1.default) `
|
|
154
154
|
const ${propertyIdentifier}_length = ${propertyPath}.length;
|
|
155
155
|
for (let ${loopIteratorVar} = 0; ${loopIteratorVar} < ${propertyIdentifier}_length; ${loopIteratorVar}++) {
|
|
156
156
|
${ROOT_KEY_SET_IDENTIFIER}.merge(${cacheKeysIdentifier}(${constants_1.LUVIO_IDENTIFIER}, ${propertyPath}[i], ${fallbackKeyBuilder}));
|
|
157
157
|
}
|
|
158
158
|
`;
|
|
159
|
+
if (isOptionalArray) {
|
|
160
|
+
code = (0, deindent_1.default) `
|
|
161
|
+
if (${propertyPath} !== undefined) {
|
|
162
|
+
${code}
|
|
163
|
+
}
|
|
164
|
+
`;
|
|
165
|
+
}
|
|
159
166
|
return [code];
|
|
160
167
|
}
|
|
161
168
|
function generateUnion(valueShape, modelInfo, importContext, propertyName) {
|
|
@@ -166,7 +173,7 @@ function generateUnion(valueShape, modelInfo, importContext, propertyName) {
|
|
|
166
173
|
}
|
|
167
174
|
// the union is composed of a single non scalar shape with n scalar shapes.
|
|
168
175
|
const nonScalarShape = nonScalarShapes[0];
|
|
169
|
-
const nonScalarCacheKeyLine = generateShape(nonScalarShape, modelInfo, importContext, propertyName)[0];
|
|
176
|
+
const nonScalarCacheKeyLine = generateShape(nonScalarShape, modelInfo, importContext, propertyName, false)[0];
|
|
170
177
|
if (nonScalarCacheKeyLine === undefined) {
|
|
171
178
|
return [];
|
|
172
179
|
}
|
|
@@ -197,7 +204,7 @@ function generateLink(linkShape, importContext, propertyName) {
|
|
|
197
204
|
`;
|
|
198
205
|
return code;
|
|
199
206
|
}
|
|
200
|
-
function generateShape(shape, modelInfo, importContext, propertyName) {
|
|
207
|
+
function generateShape(shape, modelInfo, importContext, propertyName, isOptional) {
|
|
201
208
|
// non-normalized types don't have any nested keys
|
|
202
209
|
if (!(0, shape_1.isNormalizable)(shape.id, modelInfo) || (0, shape_1.isOpaque)(shape.id, modelInfo)) {
|
|
203
210
|
return [];
|
|
@@ -211,7 +218,7 @@ function generateShape(shape, modelInfo, importContext, propertyName) {
|
|
|
211
218
|
return generateObject(shape, modelInfo, importContext, propertyName);
|
|
212
219
|
}
|
|
213
220
|
else if ((0, utils_1.isArrayShape)(shape)) {
|
|
214
|
-
return generateArray(shape, importContext, propertyName);
|
|
221
|
+
return generateArray(shape, importContext, propertyName, isOptional);
|
|
215
222
|
}
|
|
216
223
|
else if ((0, utils_1.isUnionShape)(shape)) {
|
|
217
224
|
return generateUnion(shape, modelInfo, importContext, propertyName);
|
|
@@ -219,7 +226,7 @@ function generateShape(shape, modelInfo, importContext, propertyName) {
|
|
|
219
226
|
return [];
|
|
220
227
|
}
|
|
221
228
|
function generateRoot(shape, modelInfo, importContext) {
|
|
222
|
-
const nested = generateShape(shape, modelInfo, importContext, INPUT_IDENTIFIER);
|
|
229
|
+
const nested = generateShape(shape, modelInfo, importContext, INPUT_IDENTIFIER, false);
|
|
223
230
|
const nestedCode = nested.join('\n\n');
|
|
224
231
|
return (0, deindent_1.default) `
|
|
225
232
|
const ${ROOT_KEY_SET_IDENTIFIER}: ${constants_1.LUVIO_DURABLE_STORE_KEY_METADATA_MAP_IMPORT} = new ${constants_1.LUVIO_STORE_KEY_MAP_IMPORT}();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-cache-keys.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-cache-keys.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shape-cache-keys.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-cache-keys.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,9 +18,7 @@ const TTL_IDENTIFIER = 'ttl';
|
|
|
18
18
|
const INGEST_PATH_IDENTIFIER = 'path';
|
|
19
19
|
function normalizeObject(valueShape, state) {
|
|
20
20
|
const statements = valueShape.properties.map((propertyShape) => {
|
|
21
|
-
const propertyName = propertyShape
|
|
22
|
-
const patternName = propertyShape.patternName;
|
|
23
|
-
const propertyValueShape = propertyShape.range;
|
|
21
|
+
const { name: propertyName, patternName, range: propertyValueShape, isOptional, } = propertyShape;
|
|
24
22
|
// If this property of the shape is not normalizable do nothing.
|
|
25
23
|
if (!(0, shape_1.isNormalizable)(propertyValueShape.id, state.modelInfo)) {
|
|
26
24
|
return '';
|
|
@@ -58,7 +56,7 @@ function normalizeObject(valueShape, state) {
|
|
|
58
56
|
else {
|
|
59
57
|
const propertyIdentifier = `${state.propertyIdentifier}_${propertyName}`;
|
|
60
58
|
const idIdentifier = `${propertyIdentifier}_id`;
|
|
61
|
-
|
|
59
|
+
let normalizedProperty = normalizeShape(propertyShape.range, {
|
|
62
60
|
modelInfo: state.modelInfo,
|
|
63
61
|
cacheKeyIdentifier: idIdentifier,
|
|
64
62
|
objectIdentifier: state.propertyIdentifier,
|
|
@@ -70,6 +68,13 @@ function normalizeObject(valueShape, state) {
|
|
|
70
68
|
importContext: state.importContext,
|
|
71
69
|
dynamicParamsIdentifier: state.dynamicParamsIdentifier,
|
|
72
70
|
});
|
|
71
|
+
if (isOptional) {
|
|
72
|
+
normalizedProperty = (0, deindent_1.default) `
|
|
73
|
+
if (${propertyIdentifier} !== undefined) {
|
|
74
|
+
${normalizedProperty}
|
|
75
|
+
}
|
|
76
|
+
`;
|
|
77
|
+
}
|
|
73
78
|
return (0, deindent_1.default) `
|
|
74
79
|
const ${propertyIdentifier} = ${state.propertyIdentifier}.${propertyName};
|
|
75
80
|
const ${idIdentifier} = ${state.cacheKeyIdentifier} + '__${propertyName}';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape-normalize.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-normalize.ts"],"names":[],"mappings":";;;;;;AAMA,gEAAsE;AAEtE,oDAMkC;AAClC,oEAA4C;AAE5C,6CAA6D;AAC7D,oDAAgF;AAChF,mDAK6B;AAE7B,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,eAAe,CAAC,UAA+B,EAAE,KAAqB;IAC3E,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;QAC3D,MAAM,
|
|
1
|
+
{"version":3,"file":"shape-normalize.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-normalize.ts"],"names":[],"mappings":"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"}
|
|
@@ -174,6 +174,7 @@ function selectNormalizable(shape, state) {
|
|
|
174
174
|
state.nullable === true ? 'nullable: true' : undefined,
|
|
175
175
|
state.isMap === true ? 'map: true' : undefined,
|
|
176
176
|
state.isArray === true ? 'plural: true' : undefined,
|
|
177
|
+
state.isArray === true && state.optional === true ? 'required: false' : undefined,
|
|
177
178
|
`fragment: ${selectFunction}(${selectParams.join(', ')})`,
|
|
178
179
|
];
|
|
179
180
|
const filteredStatements = statements.filter(Boolean).join(',\n');
|
|
@@ -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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"}
|
package/dist/parser/main.js
CHANGED
|
@@ -52,7 +52,9 @@ function validateNodeShape(shape, normalizableShapes) {
|
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
-
else if (normalizableShapes[propertyId] &&
|
|
55
|
+
else if (normalizableShapes[propertyId] &&
|
|
56
|
+
propertyShape.minCount.value() === 0 &&
|
|
57
|
+
!(0, aml_1.isArrayShape)(propertyShape.range)) {
|
|
56
58
|
(0, logger_1.logError)(`Unsupported optional link at ${shape.name.value()}.${propertyName}`, line, column);
|
|
57
59
|
return;
|
|
58
60
|
}
|
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,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/parser/main.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.141.0",
|
|
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.141.0",
|
|
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.141.0",
|
|
31
|
+
"@luvio/engine": "^0.141.0",
|
|
32
|
+
"@luvio/graphql": "^0.141.0"
|
|
33
33
|
},
|
|
34
34
|
"volta": {
|
|
35
35
|
"extends": "../../../package.json"
|