@luvio/compiler 0.50.0 → 0.53.1

package/dist/codegen/shape/shape-select.js

@@ -3,386 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSelect = exports.generateSelectFunction = exports.SHAPE_SELECT_IDENTIFIER = void 0;
-const composite_resource_1 = require("../../intermediate/composite-resource");
-const inheritance_1 = require("../../intermediate/inheritance");
-const utils_1 = require("../../intermediate/utils");
+exports.generateSelect = exports.generateSelectFunction = void 0;
 const deindent_1 = __importDefault(require("../../utils/deindent"));
-const constants_1 = require("../adapter/constants");
-const shape_select_discriminator_1 = require("./shape-select-discriminator");
-exports.SHAPE_SELECT_IDENTIFIER = 'select';
-function filterPrivateProperties(nodeShape, modelInfo) {
-    const privates = modelInfo.shapePrivate[nodeShape.id];
-    // Nothing to filter
-    if (privates === undefined) {
-        return nodeShape.properties;
-    }
-    return nodeShape.properties.filter((property) => {
-        const name = property.name;
-        return privates.includes(name) === false;
-    });
-}
-function selectShape(shape, state) {
-    if (shape.isLink) {
-        return selectLink(shape, state);
-    }
-    if (utils_1.isNodeShape(shape)) {
-        return selectObject(shape, state);
-    }
-    else if (utils_1.isScalarShape(shape) || utils_1.isNilShape(shape)) {
-        return selectScalar(state);
-    }
-    else if (utils_1.isArrayShape(shape)) {
-        return selectArray(shape, state);
-    }
-    else if (utils_1.isUnionShape(shape)) {
-        return selectUnion(shape, state);
-    }
-    else if (utils_1.isAnyShape(shape)) {
-        return selectAny(state);
-    }
-    throw new Error(`Unsupported shape "${shape.name}"`);
-}
-function selectAny(state) {
-    return deindent_1.default `
-        {
-            name: ${state.propertyName},
-            kind: 'Object',
-            // any
-        }
-    `;
-}
-function selectUnion(shape, state) {
-    let nullableScalar = null;
-    let nonScalar = null;
-    shape.anyOf.forEach((anyOf) => {
-        if (utils_1.isScalarShape(anyOf) || utils_1.isNilShape(anyOf)) {
-            if (utils_1.isNilShape(anyOf)) {
-                nullableScalar = anyOf;
-            }
-            return;
-        }
-        nonScalar = anyOf;
-    });
-    // Union pointing to another shape
-    if (nonScalar !== null && nullableScalar !== null) {
-        return selectShape(nonScalar, {
-            ...state,
-            nullable: true,
-        });
-    }
-    // We have a union between scalars
-    if (nonScalar === null) {
-        return selectShape(shape.anyOf[0], {
-            ...state,
-        });
-    }
-    // We have a union between non-null scalar and a link shape.
-    // The only way we can codegen this today is with a greedy, deep selector
-    return deindent_1.default `
-        {
-            kind: 'Object',
-            name: ${state.propertyName},
-            // Complex union deep
-        }
-    `;
-}
-function selectArray(shape, state) {
-    return selectShape(shape.items, {
-        ...state,
-        isArray: true,
-    });
-}
-function selectInheritedLink(shape, state) {
-    const { importContext } = state;
-    const linkName = shape.linkLabel;
-    const isNormalizable = state.modelInfo.normalizableShapeDefinitions[shape.id];
-    if (isNormalizable) {
-        return deindent_1.default `
-            {
-                kind: 'Link',
-                name: ${state.propertyName},
-                fragment: ${importContext.importRamlArtifact(shape.linkTarget.id, shape_select_discriminator_1.SHAPE_SELECT_CHILDREN_IDENTIFIER)}()
-            }
-        `;
-    }
-    const selectionsIdentifier = `${linkName}__unionSelections`;
-    const hoistStatement = deindent_1.default `
-        const ${selectionsIdentifier} = ${importContext.importRamlArtifact(shape.linkTarget.id, shape_select_discriminator_1.SHAPE_SELECT_CHILDREN_IDENTIFIER)}()
-    `;
-    state.hoist.push(hoistStatement);
-    const statements = [
-        `kind: 'Object'`,
-        `name: ${state.propertyName}`,
-        `discriminator: ${selectionsIdentifier}.discriminator`,
-        `union: true`,
-        `nullable: ${state.nullable}`,
-        `unionSelections: ${selectionsIdentifier}.unionSelections`,
-    ].filter((item) => item !== undefined);
-    return deindent_1.default `
-        {
-            ${statements.join(',\n')}
-        }
-    `;
-}
-function selectInlineObject(shape, state) {
-    const { importContext } = state;
-    const shapeName = shape.name;
-    const linkIsOpaque = state.modelInfo.shapeOpaque[shape.id];
-    const linkPrivateProps = state.modelInfo.shapePrivate[shape.id];
-    let statements = [`name: ${state.propertyName}`, `kind: 'Object'`];
-    const selectionsIdentifier = `${shapeName}__selections`;
-    const opaqueIdentifier = `${shapeName}__opaque`;
-    const hoistStatement = deindent_1.default `
-        const {
-            selections: ${selectionsIdentifier},
-            opaque: ${opaqueIdentifier},
-        } = ${importContext.importRamlArtifact(shape.id, exports.SHAPE_SELECT_IDENTIFIER)}()
-    `;
-    // Theres a chance we've already imported this shape, lets reuse if thats the case
-    if (state.hoist.indexOf(hoistStatement) === -1) {
-        state.hoist.push(hoistStatement);
-    }
-    statements = [
-        ...statements,
-        state.nullable === true ? 'nullable: true' : undefined,
-        state.isMap === true ? 'map: true' : undefined,
-        state.isArray === true ? 'plural: true' : undefined,
-        linkIsOpaque === true && linkPrivateProps === undefined
-            ? undefined
-            : `selections: ${selectionsIdentifier}`,
-        linkIsOpaque === true && linkPrivateProps === undefined
-            ? `opaque: ${opaqueIdentifier}`
-            : undefined,
-        state.optional === true ? 'required: false' : undefined,
-    ];
-    return deindent_1.default `
-        {
-            ${statements.filter((value) => value !== undefined).join(',\n')}
-        }
-    `;
-}
-function selectNormalizable(shape, state) {
-    const { importContext, dynamicParamsIdentifier, propertyName, hoist } = state;
-    let statements = [`name: ${state.propertyName}`, `kind: 'Link'`];
-    statements = [
-        ...statements,
-        state.nullable === true ? 'nullable: true' : undefined,
-        state.isMap === true ? 'map: true' : undefined,
-        state.isArray === true ? 'plural: true' : undefined,
-        `fragment: ${importContext.importRamlArtifact(shape.id, exports.SHAPE_SELECT_IDENTIFIER)}()`,
-    ];
-    const filteredStatements = statements.filter((value) => value !== undefined).join(',\n');
-    if (dynamicParamsIdentifier !== null) {
-        const formattedPropertyName = propertyName.replace(/'/g, '');
-        const dynamicParamIdentifier = `${dynamicParamsIdentifier}.${formattedPropertyName}`;
-        const propertySelectionIdentifier = `${formattedPropertyName}PathSelection`;
-        hoist.push(deindent_1.default `
-                const ${propertySelectionIdentifier}: ${constants_1.ADAPTER_PATH_SELECTION_IDENTIFIER} = ${dynamicParamIdentifier} === undefined ? {
-                    ${filteredStatements}
-                } : ${dynamicParamIdentifier};
-            `);
-        return deindent_1.default `
-            ${propertySelectionIdentifier}
-        `;
-    }
-    return deindent_1.default `
-        {
-            ${filteredStatements}
-        }
-    `;
-}
-function selectLink(shape, state) {
-    const linkTarget = shape.linkTarget;
-    if (inheritance_1.isDiscriminatorShape(linkTarget, state.modelInfo)) {
-        return selectInheritedLink(shape, state);
-    }
-    if (state.modelInfo.normalizableShapeDefinitions[shape.id]) {
-        return selectNormalizable(linkTarget, state);
-    }
-    return selectInlineObject(linkTarget, state);
-}
-function selectScalar(state) {
-    if (state.isMap) {
-        return deindent_1.default `
-            {
-                ${[`name: ${state.propertyName}`, `kind: 'Scalar'`, `map: true`].join(',\n')}
-            }
-        `;
-    }
-    if (state.isArray) {
-        return deindent_1.default `
-            {
-                ${[`name: ${state.propertyName}`, `kind: 'Scalar'`, `plural: true`].join(',\n')}
-            }
-        `;
-    }
-    return deindent_1.default `
-        {
-            ${[
-        `name: ${state.propertyName}`,
-        `kind: 'Scalar'`,
-        ...(state.optional === true ? [`required: false`] : []),
-    ].join(',\n')}
-        }
-    `;
-}
-function selectObject(shape, state) {
-    var _a;
-    const privates = (_a = state.modelInfo.shapePrivate[shape.id]) !== null && _a !== void 0 ? _a : [];
-    state.hoistPrivate.push(...privates);
-    const statements = filterPrivateProperties(shape, state.modelInfo).map((propertyShape) => {
-        const propertyName = propertyShape.name;
-        const patternName = propertyShape.patternName;
-        const propertyValueShape = propertyShape.range;
-        const isOptional = propertyShape.isOptional;
-        if (patternName !== null) {
-            // unknown keys
-            if (state.propertyName === '') {
-                // empty top level object in RAML?
-                return '';
-            }
-            // for now we just use the "map" property on Links and Scalars
-            const isMap = !!state.modelInfo.normalizableShapeDefinitions[shape.id] ||
-                utils_1.isScalarShape(propertyValueShape);
-            return selectShape(propertyValueShape, {
-                propertyName: state.propertyName,
-                modelInfo: state.modelInfo,
-                isMap,
-                isArray: state.isArray,
-                rootShape: state.rootShape,
-                nullable: state.nullable,
-                optional: state.optional,
-                hoist: state.hoist,
-                hoistPrivate: state.hoistPrivate,
-                importContext: state.importContext,
-                dynamicParamsIdentifier: state.dynamicParamsIdentifier,
-            });
-        }
-        return selectShape(propertyValueShape, {
-            propertyName: `'${propertyName}'`,
-            modelInfo: state.modelInfo,
-            isMap: state.isMap,
-            isArray: state.isArray,
-            rootShape: state.rootShape,
-            nullable: state.nullable,
-            optional: isOptional,
-            hoist: state.hoist,
-            hoistPrivate: state.hoistPrivate,
-            importContext: state.importContext,
-            dynamicParamsIdentifier: state.dynamicParamsIdentifier,
-        });
-    });
-    return statements.join(',\n');
-}
-function getPropertyKind(property) {
-    let propertyRange = property.range;
-    if (utils_1.isUnionShape(propertyRange)) {
-        // Filter out non-scalars
-        const nonScalar = propertyRange.anyOf.find((union) => {
-            return !utils_1.isScalarShape(union) && !utils_1.isNilShape(union);
-        });
-        // If the entire union is a scalar, report the type as a Scalar
-        if (nonScalar === undefined) {
-            return 'Scalar';
-        }
-    }
-    return utils_1.isScalarShape(propertyRange) ? 'Scalar' : 'Object';
-}
-function selectOpaque(nodeShape, state) {
-    const { modelInfo, hoistPrivate } = state;
-    const privates = modelInfo.shapePrivate[nodeShape.id];
-    // We don't have to filter anything
-    if (privates === undefined) {
-        return `
-            opaque: true
-        `;
-    }
-    const statements = filterPrivateProperties(nodeShape, modelInfo).map((property) => {
-        const name = property.name;
-        const kind = getPropertyKind(property);
-        const selection = [
-            `name: '${name}'`,
-            `kind: '${kind}'`,
-            ...(kind === 'Object' ? [`opaque: true`] : []),
-            ...(property.isOptional === true ? [`required: false`] : []),
-        ];
-        return deindent_1.default `
-            {
-                ${selection.join(',\n')}
-            }
-        `;
-    });
-    hoistPrivate.push(...privates);
-    return deindent_1.default `
-        selections: [
-            ${statements.join(',\n')}
-        ]
-    `;
-}
-function selectInherited(nodeShape, state) {
-    var _a;
-    const { modelInfo, importContext, hoist, hoistPrivate, dynamicParamsIdentifier } = state;
-    const parent = inheritance_1.getParentShape(nodeShape, modelInfo);
-    const parentName = parent.shapeName;
-    const parentImport = importContext.importRamlArtifact(parent.shapeId, exports.SHAPE_SELECT_IDENTIFIER);
-    const parentSelectionsIdentifier = `${parentName}Selections`;
-    const privates = (_a = modelInfo.shapePrivate[parent.shapeId]) !== null && _a !== void 0 ? _a : [];
-    hoist.push(deindent_1.default `
-            const { selections: ${parentSelectionsIdentifier} } = ${parentImport}();
-        `);
-    hoistPrivate.push(...privates);
-    const code = selectObject(nodeShape, {
-        rootShape: nodeShape,
-        propertyName: '',
-        modelInfo,
-        isMap: false,
-        isArray: false,
-        nullable: false,
-        optional: false,
-        hoist,
-        hoistPrivate,
-        importContext,
-        dynamicParamsIdentifier,
-    });
-    return deindent_1.default `
-        selections: [
-            ...${parentSelectionsIdentifier},
-            ${code}
-        ]
-    `;
-}
-function selectNonOpaque(nodeShape, state) {
-    const { modelInfo, importContext, hoist, hoistPrivate, dynamicParamsIdentifier } = state;
-    if (inheritance_1.hasInheritance(nodeShape, modelInfo)) {
-        return selectInherited(nodeShape, state);
-    }
-    const code = selectShape(nodeShape, {
-        rootShape: nodeShape,
-        propertyName: '',
-        modelInfo,
-        isMap: false,
-        isArray: false,
-        nullable: false,
-        optional: false,
-        hoist,
-        hoistPrivate,
-        importContext,
-        dynamicParamsIdentifier,
-    });
-    return deindent_1.default `
-        selections: [
-            ${code}
-        ]
-    `;
-}
+const composite_resource_1 = require("../../intermediate/composite-resource");
+const constants_1 = require("./constants");
+const constants_2 = require("../adapter/constants");
+const shape_select_utils_1 = require("./shape-select-utils");
+const constants_3 = require("../pagination-utils/constants");
 function generateSelectFunction(params) {
     const { shapeConfig, dynamicParamsIdentifier } = params;
     const { shape, modelInfo, importContext } = shapeConfig;
     const isOpaque = modelInfo.shapeOpaque[shape.id];
     const fragmentIdentifier = isOpaque
-        ? constants_1.ADAPTER_BASE_FRAGMENT_IMPORT
-        : constants_1.ADAPTER_FRAGMENT_SELECTION_IMPORT;
+        ? constants_2.ADAPTER_BASE_FRAGMENT_IMPORT
+        : constants_2.ADAPTER_FRAGMENT_SELECTION_IMPORT;
     if (composite_resource_1.isCompositeContainerShape(shape, modelInfo)) {
         return {
             code: deindent_1.default `
@@ -406,7 +40,7 @@ function generateSelectFunction(params) {
         hoistPrivate: privates,
         importContext,
     };
-    const code = isOpaque ? selectOpaque(shape, state) : selectNonOpaque(shape, state);
+    const code = isOpaque ? shape_select_utils_1.selectOpaque(shape, state) : shape_select_utils_1.selectNonOpaque(shape, state);
     const privateArray = privates.map((p) => `'${p}'`).join(', \n');
     return {
         code: deindent_1.default `
@@ -414,10 +48,9 @@ function generateSelectFunction(params) {
 
             return {
                 kind: 'Fragment',
-                private: ${deindent_1.default `
-                [
-                ${privateArray}
-                ]`},
+                private: [
+                    ${privateArray}
+                ],
                 ${code}
             };
         `,
@@ -426,15 +59,26 @@ function generateSelectFunction(params) {
 }
 exports.generateSelectFunction = generateSelectFunction;
 function generateSelect(shapeConfig) {
-    const { shape } = shapeConfig;
+    const { shape, modelInfo, importContext } = shapeConfig;
     const functionIdentifier = `${shape.name}Select`;
     const { code, returnInterface } = generateSelectFunction({
         shapeConfig,
         dynamicParamsIdentifier: null,
         functionIdentifier: `${shape.name}Select`,
     });
+    const shapePaginated = modelInfo.shapePaginated[shape.id];
+    if (shapePaginated !== undefined) {
+        const paginationParamsType = importContext.importPaginationUtil(shapePaginated.strategy, constants_3.PAGINATION_PARAMS_INTERFACE_IDENTIFIER);
+        // TODO (W-9770603): make pagination param (PAGINATION_PARAMS_IDENTIFIER) as optional for now
+        // update it to required when all existing adapters adopt the new annotation
+        return deindent_1.default `
+            export const ${constants_1.SHAPE_SELECT_IDENTIFIER} = function ${functionIdentifier}(${constants_3.PAGINATION_PARAMS_IDENTIFIER}?: ${paginationParamsType}): ${returnInterface} {
+                ${code}
+            }
+        `;
+    }
     return deindent_1.default `
-        export const ${exports.SHAPE_SELECT_IDENTIFIER} = function ${functionIdentifier}(): ${returnInterface} {
+        export const ${constants_1.SHAPE_SELECT_IDENTIFIER} = function ${functionIdentifier}(): ${returnInterface} {
             ${code}
         }
     `;

package/dist/codegen/shape/shape-select.js.map

@@ -1 +1 @@
-{"version":3,"file":"shape-select.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-select.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shape-select.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-select.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA4C;AAC5C,8EAAkF;AAClF,2CAAsD;AACtD,oDAG8B;AAE9B,6DAAkF;AAClF,6DAGuC;AAQvC,SAAgB,sBAAsB,CAAC,MAAoB;IACvD,MAAM,EAAE,WAAW,EAAE,uBAAuB,EAAE,GAAG,MAAM,CAAC;IACxD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,WAAW,CAAC;IACxD,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACjD,MAAM,kBAAkB,GAAG,QAAQ;QAC/B,CAAC,CAAC,wCAA4B;QAC9B,CAAC,CAAC,6CAAiC,CAAC;IAExC,IAAI,8CAAyB,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;QAC7C,OAAO;YACH,IAAI,EAAE,kBAAQ,CAAA;;aAEb;YACD,eAAe,EAAE,kBAAkB;SACtC,CAAC;KACL;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,MAAM,KAAK,GAAgB;QACvB,SAAS,EAAE,KAAK;QAChB,uBAAuB;QACvB,SAAS;QACT,YAAY,EAAE,EAAE;QAChB,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,KAAK;QACf,QAAQ,EAAE,KAAK;QACf,KAAK;QACL,YAAY,EAAE,QAAQ;QACtB,aAAa;KAChB,CAAC;IAEF,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,iCAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,oCAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAEnF,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhE,OAAO;QACH,IAAI,EAAE,kBAAQ,CAAA;cACR,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;;;;;sBAKT,YAAY;;kBAEhB,IAAI;;SAEb;QACD,eAAe,EAAE,kBAAkB;KACtC,CAAC;AACN,CAAC;AApDD,wDAoDC;AAED,SAAgB,cAAc,CAAC,WAA+B;IAC1D,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,WAAW,CAAC;IACxD,MAAM,kBAAkB,GAAG,GAAG,KAAK,CAAC,IAAI,QAAQ,CAAC;IAEjD,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,sBAAsB,CAAC;QACrD,WAAW;QACX,uBAAuB,EAAE,IAAI;QAC7B,kBAAkB,EAAE,GAAG,KAAK,CAAC,IAAI,QAAQ;KAC5C,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC1D,IAAI,cAAc,KAAK,SAAS,EAAE;QAC9B,MAAM,oBAAoB,GAAG,aAAa,CAAC,oBAAoB,CAC3D,cAAc,CAAC,QAAQ,EACvB,kDAAsC,CACzC,CAAC;QAEF,6FAA6F;QAC7F,4EAA4E;QAC5E,OAAO,kBAAQ,CAAA;2BACI,mCAAuB,eAAe,kBAAkB,IAAI,wCAA4B,MAAM,oBAAoB,MAAM,eAAe;kBAChJ,IAAI;;SAEb,CAAC;KACL;IAED,OAAO,kBAAQ,CAAA;uBACI,mCAAuB,eAAe,kBAAkB,OAAO,eAAe;cACvF,IAAI;;KAEb,CAAC;AACN,CAAC;AA/BD,wCA+BC"}

package/dist/codegen/shape/shape-utils-ingest.js

@@ -115,9 +115,6 @@ function generateIngestFunction(shapeConfig, normalizeMethodName) {
             }
 
             if (${TTL_TO_USE_IDENTIFIER} !== undefined) {
-                // TODO: W-9805041: Remove storeSetExpiration instances
-                ${constants_2.LUVIO_IDENTIFIER}.storeSetExpiration(${constants_3.KEY_IDENTIFIER}, ${TIMESTAMP_IDENTIFIER} + ${TTL_TO_USE_IDENTIFIER});
-
                 const ${STORE_METADATA_PARAMS_IDENTIFIER} = {
                     ttl: ${TTL_TO_USE_IDENTIFIER},
                     namespace: "${modelInfo.keyPrefix}",

package/dist/codegen/shape/shape-utils-ingest.js.map

@@ -1 +1 @@
-{"version":3,"file":"shape-utils-ingest.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-utils-ingest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shape-utils-ingest.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-utils-ingest.ts"],"names":[],"mappings":"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"}

package/dist/codegen/shared/constants.d.ts

@@ -3,3 +3,5 @@ export declare const LUVIO_STORE_IDENTIFIER = "store";
 export declare const LUVIO_IMPORT: string;
 export declare const LUVIO_STORE_IMPORT: string;
 export declare const LUVIO_STORE_LINK_IMPORT: string;
+export declare const CACHE_KEY_NAMESPACE_DELIMITER = "::";
+export declare const CACHE_KEY_FIELD_DELIMITER = ":";

package/dist/codegen/shared/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LUVIO_STORE_LINK_IMPORT = exports.LUVIO_STORE_IMPORT = exports.LUVIO_IMPORT = exports.LUVIO_STORE_IDENTIFIER = exports.LUVIO_IDENTIFIER = void 0;
+exports.CACHE_KEY_FIELD_DELIMITER = exports.CACHE_KEY_NAMESPACE_DELIMITER = exports.LUVIO_STORE_LINK_IMPORT = exports.LUVIO_STORE_IMPORT = exports.LUVIO_IMPORT = exports.LUVIO_STORE_IDENTIFIER = exports.LUVIO_IDENTIFIER = void 0;
 const imports_1 = require("../../utils/imports");
 // Identifiers
 exports.LUVIO_IDENTIFIER = 'luvio';
@@ -9,4 +9,7 @@ exports.LUVIO_STORE_IDENTIFIER = 'store';
 exports.LUVIO_IMPORT = imports_1.namedImport('@luvio/engine', 'Luvio');
 exports.LUVIO_STORE_IMPORT = imports_1.namedImport('@luvio/engine', 'Store');
 exports.LUVIO_STORE_LINK_IMPORT = imports_1.namedImport('@luvio/engine', 'StoreLink');
+// cache key delimiters (shared between resource and shape key builders)
+exports.CACHE_KEY_NAMESPACE_DELIMITER = '::';
+exports.CACHE_KEY_FIELD_DELIMITER = ':';
 //# sourceMappingURL=constants.js.map

package/dist/codegen/shared/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/codegen/shared/constants.ts"],"names":[],"mappings":";;;AAAA,iDAAkD;AAElD,cAAc;AACD,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,sBAAsB,GAAG,OAAO,CAAC;AAE9C,iBAAiB;AACJ,QAAA,YAAY,GAAG,qBAAW,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AACrD,QAAA,kBAAkB,GAAG,qBAAW,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AAC3D,QAAA,uBAAuB,GAAG,qBAAW,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/codegen/shared/constants.ts"],"names":[],"mappings":";;;AAAA,iDAAkD;AAElD,cAAc;AACD,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,sBAAsB,GAAG,OAAO,CAAC;AAE9C,iBAAiB;AACJ,QAAA,YAAY,GAAG,qBAAW,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AACrD,QAAA,kBAAkB,GAAG,qBAAW,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AAC3D,QAAA,uBAAuB,GAAG,qBAAW,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;AAEjF,wEAAwE;AAC3D,QAAA,6BAA6B,GAAG,IAAI,CAAC;AACrC,QAAA,yBAAyB,GAAG,GAAG,CAAC"}

package/dist/parser/annotation-paginated.d.ts

@@ -1,5 +1,6 @@
 import { model as amf } from 'amf-client-js';
 import { PaginatedType, Strategy } from '../intermediate/pagination';
-export declare function collectPaginatedAnnotation(shape: amf.domain.Shape): PaginatedType | undefined;
+import { ShapeKeyFields } from './main';
+export declare function collectPaginatedAnnotation(shape: amf.domain.Shape, shapeKeys: ShapeKeyFields | undefined): PaginatedType | undefined;
 export declare function getStrategyName(node: amf.domain.ObjectNode): Strategy | undefined;
 export declare function collectDeclaredProperty(properties: Record<string, string>, semanticName: string, annotationNode: amf.domain.ObjectNode, required?: boolean): void;

package/dist/parser/annotation-paginated.js

@@ -6,7 +6,7 @@ const aml_1 = require("../utils/aml");
 const annotation_1 = require("../utils/annotation");
 const logger_1 = require("./logger");
 const PAGINATED_ANNOTATION_NAME = 'paginated';
-function collectPaginatedAnnotation(shape) {
+function collectPaginatedAnnotation(shape, shapeKeys) {
     const paginated = annotation_1.getAnnotation(shape, PAGINATED_ANNOTATION_NAME);
     if (paginated === undefined) {
         return;
@@ -28,12 +28,12 @@ function collectPaginatedAnnotation(shape) {
     }
     switch (strategyName) {
         case pagination_1.Strategy.Cursor: {
-            return collectCursorPaginated(shape, paginatedExtension);
+            return collectCursorPaginated(shape, paginatedExtension, shapeKeys);
         }
     }
 }
 exports.collectPaginatedAnnotation = collectPaginatedAnnotation;
-function collectCursorPaginated(shape, annotationNode) {
+function collectCursorPaginated(shape, annotationNode, shapeKeys) {
     const declaredTypeProperties = {};
     collectDeclaredProperty(declaredTypeProperties, pagination_1.PaginatedTypeProperty.Items, annotationNode);
     collectDeclaredProperty(declaredTypeProperties, pagination_1.CursorPaginatedTypeProperty.Token, annotationNode);
@@ -45,12 +45,19 @@ function collectCursorPaginated(shape, annotationNode) {
         strategy: pagination_1.Strategy.Cursor,
     };
     const metadata = {};
+    const cursorPaginatedTypePropertyValues = Object.values(pagination_1.CursorPaginatedTypeProperty);
     // validate the types of declared properties
-    // TODO(W-9865469): validate pagination properties are not declared on luvio.key
     shape.properties.forEach((property) => {
         const propName = property.name.value();
         const semanticName = declaredTypeProperties[propName];
         const { range } = property;
+        if ((semanticName === pagination_1.PaginatedTypeProperty.Items ||
+            cursorPaginatedTypePropertyValues.includes(semanticName)) &&
+            isPropertyUsedInKey(propName, shapeKeys)) {
+            const { line, column } = range.position.start;
+            logger_1.logError(`Invalid value for (luvio.paginated) annotation, ${propName} is used in (luvio.key). Should this property be included on the (luvio.key)?`, line, column);
+            return;
+        }
         switch (semanticName) {
             case pagination_1.PaginatedTypeProperty.Items: {
                 if (!aml_1.isArrayShape(range)) {
@@ -103,6 +110,15 @@ function isNullableTokenShape(node) {
         return !aml_1.isScalarShape(each) && !aml_1.isNilShape(each);
     }) === undefined);
 }
+function isPropertyUsedInKey(propertyName, shapeKeys) {
+    if (shapeKeys !== undefined) {
+        const matchingKeyProperty = Object.values(shapeKeys).find((shapeValue) => shapeValue.valuePath === propertyName);
+        if (matchingKeyProperty !== undefined) {
+            return true;
+        }
+    }
+    return false;
+}
 function getStrategyName(node) {
     const strategyNode = node.properties[pagination_1.PaginatedTypeProperty.Strategy];
     if (strategyNode === undefined) {

package/dist/parser/annotation-paginated.js.map

@@ -1 +1 @@
-{"version":3,"file":"annotation-paginated.js","sourceRoot":"","sources":["../../src/parser/annotation-paginated.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"annotation-paginated.js","sourceRoot":"","sources":["../../src/parser/annotation-paginated.ts"],"names":[],"mappings":"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"}

package/dist/parser/annotation-paginationParams.js

@@ -115,6 +115,11 @@ function collectPageSizeParam(paginationParams, param) {
             const defaultSize = parseInt(defaultValue.value.value(), 10);
             paginationParams.defaultSize = defaultSize;
         }
+        else {
+            const { line, column } = position.start;
+            logger_1.logError(`pageSize parameter must have a default value when it is optional`, line, column);
+            return;
+        }
     }
     paginationParams.pageSize = name.value();
 }