@luvio/compiler 0.128.0 → 0.131.0

package/dist/codegen/graphql/type/ingest.js

@@ -17,13 +17,6 @@ const shape_ingest_paginated_1 = require("../../shape/shape-ingest-paginated");
 const constants_6 = require("../../shape/constants");
 const version_1 = require("./version");
 const INGEST_PAGINATED_METDATA = 'ingestPaginationMetadata';
-function generateObjectTypeIngest(importContext, graphqlTypeName, isCursorConnectionType) {
-    const ingestStatements = [
-        (0, utils_1.getRequestedFieldsStatement)(importContext, graphqlTypeName),
-        iterateThroughResponseKeys(importContext, graphqlTypeName, isCursorConnectionType),
-    ];
-    return ingestStatements.join('\n');
-}
 function generatePaginationFunction(importContext, astNodeParamType) {
     const paginationMetadataType = importContext.importPaginationUtil(pagination_1.Strategy.Cursor, constants_3.PAGINATION_METADATA_TYPE_IDENTIFIER);
     const graphqlStateInterface = importContext.importGraphQLArtifact('types', constants_2.TYPE_UTIL_IDENTIFIER, constants_2.GRAPHQL_INGEST_STATE_INTERFACE_IDENTIFIER);
@@ -103,74 +96,12 @@ function generatePaginationFunction(importContext, astNodeParamType) {
         }
     `;
 }
-function iterateThroughResponseKeys(importContext, graphqlTypeName, isCursorConnectionType) {
-    const getRequestedFieldImport = importContext.importGraphQLArtifact('types', constants_2.TYPE_UTIL_IDENTIFIER, constants_2.GET_REQUESTED_FIELD_IDENTIFIER);
-    const getFieldKeyImport = importContext.importGraphQLArtifact('types', constants_2.TYPE_UTIL_IDENTIFIER, constants_2.GET_SERIALIZED_KEY_FOR_FIELD_IDENTIFIER);
-    const getFieldTypeImport = importContext.importGraphQLArtifact('types', graphqlTypeName, constants_2.GET_FIELD_TYPE_IDENTIFIER);
-    const deepFreezeImport = importContext.importTypeUtil('deepFreeze');
-    const isMappedFieldImport = importContext.importGraphQLArtifact('types', graphqlTypeName, constants_2.IS_MAPPED_FIELD_IDENTIFIER);
-    const getArrayOffsetForPage = importContext.importGraphQLArtifact('types', constants_2.TYPE_UTIL_IDENTIFIER, constants_2.GET_ARRAY_OFFSET_FOR_PAGE);
-    const hasGraphQLPaginationFields = importContext.importPaginationUtil(pagination_1.Strategy.Cursor, constants_5.HAS_GRAPHQL_PAGINATION_FIELDS_IDENTIFIER);
-    let arrayItemFullPathKeyAdditionalParam = '', nonArrayFullPathKeyAdditionalParam = '', paginationOffsetCode = '';
-    if (isCursorConnectionType) {
-        arrayItemFullPathKeyAdditionalParam = ` arrayFullPathKey + '__' + (i + paginationOffset),`;
-        nonArrayFullPathKeyAdditionalParam = ` key + '__' + ${constants_2.FIELD_KEY_IDENTIFIER},`;
-        paginationOffsetCode = (0, deindent_1.default) `
-            let paginationOffset = 0;
-            if (${hasGraphQLPaginationFields}(data)) {
-                paginationOffset = ${getArrayOffsetForPage}(state, astNode, key);
-            }
-        `;
-    }
-    return (0, deindent_1.default) `
-        for(const ${constants_2.FIELD_DATA_KEY_IDENTIFIER} of Object.keys(data)){
-            const ${constants_2.FIELD_DATA_IDENTIFIER} = data[${constants_2.FIELD_DATA_KEY_IDENTIFIER}];
-            const ${constants_2.REQUESTED_FIELD_IDENTIFIER} = ${getRequestedFieldImport}(${constants_2.FIELD_DATA_KEY_IDENTIFIER}, ${constants_2.REQUESTED_FIELDS_IDENTIFIER});  
-            if(${constants_2.REQUESTED_FIELD_IDENTIFIER} === undefined) {
-                continue; // TODO: (W-11132802) We got a field back we didn't ask for. Call handleUnknownField.
-            }
-            if(${isMappedFieldImport}(${constants_2.REQUESTED_FIELD_IDENTIFIER})) {
-                continue; // Skips scalar fields that are mapped to RAML.
-            }
-            const ${constants_2.FIELD_TYPE_IDENTIFIER} = ${getFieldTypeImport}(${constants_2.REQUESTED_FIELD_IDENTIFIER});
-            const ${constants_2.FIELD_KEY_IDENTIFIER} = ${getFieldKeyImport}(${constants_2.REQUESTED_FIELD_IDENTIFIER}, state.variables, ${constants_2.FIELD_TYPE_IDENTIFIER});
-            if(fieldType === undefined) {
-                console.warn(\`Unknown Field: \${${constants_2.REQUESTED_FIELD_IDENTIFIER}}. This field or nested fields cannot participate in normalization\`);
-                ${deepFreezeImport}(${constants_2.FIELD_DATA_IDENTIFIER})
-                ${constants_2.SINK_IDENTIFIER}[${constants_2.FIELD_KEY_IDENTIFIER}] = ${constants_2.FIELD_DATA_IDENTIFIER};
-                continue;
-            }
-            ${isCursorConnectionType
-        ? `if (${constants_2.FIELD_KEY_IDENTIFIER} === '${constants_2.PAGE_INFO_IDENTIFIER}') continue; // pageInfo is always synthesized from pagination metadata`
-        : ''}
-            if (${constants_2.FIELD_DATA_IDENTIFIER} === null) {
-                ${constants_2.SINK_IDENTIFIER}[${constants_2.FIELD_KEY_IDENTIFIER}] = ${constants_2.FIELD_DATA_IDENTIFIER};
-                continue; // Don't delegate null to type ingest.
-            }
-            if(${constants_2.FIELD_TYPE_IDENTIFIER}.isArray && ${constants_2.FIELD_DATA_IDENTIFIER}.length !== undefined) {
-                const arrayLength = ${constants_2.FIELD_DATA_IDENTIFIER}.length;
-                const arraySink: any[] = new Array(arrayLength);
-                ${paginationOffsetCode}
-                for(let i = 0, len = arrayLength; i < len; i += 1) {
-                    const arrayFullPathKey = key + '__' + ${constants_2.FIELD_KEY_IDENTIFIER};
-                    ${constants_2.INGEST_FIELD_BY_TYPE_IDENTIFIER}(${constants_2.FIELD_TYPE_IDENTIFIER}.typename, arrayFullPathKey,${arrayItemFullPathKeyAdditionalParam} ${constants_2.REQUESTED_FIELD_IDENTIFIER}, arraySink, i, ${constants_2.FIELD_DATA_IDENTIFIER}[i], state);
-                }
-                ${constants_2.SINK_IDENTIFIER}[${constants_2.FIELD_KEY_IDENTIFIER}] = arraySink;
-            } else {
-                ${constants_2.INGEST_FIELD_BY_TYPE_IDENTIFIER}(${constants_2.FIELD_TYPE_IDENTIFIER}.typename, key,${nonArrayFullPathKeyAdditionalParam} ${constants_2.REQUESTED_FIELD_IDENTIFIER}, ${constants_2.SINK_IDENTIFIER}, ${constants_2.FIELD_KEY_IDENTIFIER}, ${constants_2.FIELD_DATA_IDENTIFIER}, state);
-            }   
-        }
-    `;
-}
-function generateIngest(graphqlDsl, graphqlTypeName, def, importContext, _metadata, modelInfo) {
+function generateIngest(graphqlDsl, graphqlTypeName, importContext, _metadata, modelInfo) {
     var _a;
     const { schema, typeNameToExtensions, cursorConnectionTypes } = graphqlDsl;
-    const { importGraphQLArtifact, importAdapterUtil, importTypeUtil } = importContext;
+    const { importGraphQLArtifact, importAdapterUtil } = importContext;
     const createLink = importGraphQLArtifact('types', constants_2.TYPE_UTIL_IDENTIFIER, constants_2.CREATE_LINK_IDENTIFIER);
     const graphqlStateInterface = importGraphQLArtifact('types', constants_2.TYPE_UTIL_IDENTIFIER, constants_2.GRAPHQL_INGEST_STATE_INTERFACE_IDENTIFIER);
-    const equalsObjectImport = importTypeUtil('equalsObject');
-    const hasOwnPropertyImport = importAdapterUtil('ObjectPrototypeHasOwnProperty');
-    const STABLE_JSON_STRINGIFY = importAdapterUtil('stableJSONStringify');
     const keyPrefix = importAdapterUtil('keyPrefix');
     const ttl = (0, utils_1.isTypeExtensionDefined)(typeNameToExtensions, graphqlTypeName, 'ttl')
         ? 'TTL'
@@ -189,43 +120,57 @@ function generateIngest(graphqlDsl, graphqlTypeName, def, importContext, _metada
                 newData["${constants_2.LINK_IDENTIFIER}"] = ${ingestMappedDataImport}(astNode, state);`;
         }
     }
+    const isFragmentApplicableImport = importContext.importGraphQLArtifact('types', graphqlTypeName, constants_2.IS_FRAGMENT_APPLICABLE_IDENTIFIER);
+    const isMappedFieldImport = importContext.importGraphQLArtifact('types', graphqlTypeName, constants_2.IS_MAPPED_FIELD_IDENTIFIER);
     const isCursorConnectionType = cursorConnectionTypes.includes(graphqlTypeName);
+    const ingestMethod = isCursorConnectionType
+        ? importGraphQLArtifact('types', constants_2.TYPE_UTIL_IDENTIFIER, constants_2.INGEST_CURSOR_CONNECTION_TYPE)
+        : importGraphQLArtifact('types', constants_2.TYPE_UTIL_IDENTIFIER, constants_2.INGEST_NON_CURSOR_CONNECTION_TYPE);
+    let hasGraphQLPaginationFields = 'undefined';
+    if (isCursorConnectionType) {
+        hasGraphQLPaginationFields = importContext.importPaginationUtil(pagination_1.Strategy.Cursor, constants_5.HAS_GRAPHQL_PAGINATION_FIELDS_IDENTIFIER);
+    }
+    const getFieldTypeImport = importContext.importGraphQLArtifact('types', graphqlTypeName, constants_2.GET_FIELD_TYPE_IDENTIFIER);
     return (0, deindent_1.default) `
         ${isCursorConnectionType ? generatePaginationFunction(importContext, astNodeParamType) : ''}
 
         export function ingest(astNode: ${astNodeParamType}, state: ${graphqlStateInterface}<${interface_1.PARTIAL_INTERFACE_IDENTIFIER}>) {
-            const { path, data, ${constants_1.LUVIO_IDENTIFIER}, ${constants_1.LUVIO_STORE_IDENTIFIER}, ${constants_2.TIMESTAMP_IDENTIFIER} } = state;
+            const { path, data, ${constants_1.LUVIO_IDENTIFIER} } = state;
             const key = ${constants_2.KEY_BUILDER_IDENTIFIER}(${constants_1.LUVIO_IDENTIFIER}, path, data);
-            const ${constants_2.SINK_IDENTIFIER}: Record<string,any> = {};
             
-            // ingest field data
-            ${generateObjectTypeIngest(importContext, graphqlTypeName, isCursorConnectionType)}
-
-            // merge existing cache data and new request response data
-            const newData: ${normalizedGraphQLTypeImport} = {data: ${constants_2.SINK_IDENTIFIER}};
-            ${ramlIngestBlock}
-            const existingData = ${constants_1.LUVIO_STORE_IDENTIFIER}.readEntry<${normalizedGraphQLTypeImport}>(key);
-            ${isCursorConnectionType
-        ? `${INGEST_PAGINATED_METDATA}(astNode, state, key, ${constants_2.SINK_IDENTIFIER} as ${interface_1.PARTIAL_INTERFACE_IDENTIFIER}, existingData as ${normalizedGraphQLTypeImport});`
+            return ${ingestMethod}<
+                ${isCursorConnectionType ? '' : `${astNodeParamType},`}
+                ${graphqlStateInterface}<${interface_1.PARTIAL_INTERFACE_IDENTIFIER}>
+            >(
+                astNode,
+                state,
+                {
+                    key,
+                    isFragmentApplicable: ${isFragmentApplicableImport},
+                    isMappedFieldImport: ${isMappedFieldImport},
+                    getFieldType: ${getFieldTypeImport},
+                    ${constants_2.INGEST_FIELD_BY_TYPE_IDENTIFIER},
+                    ${isCursorConnectionType
+        ? `hasGraphQLPaginationFields: ${hasGraphQLPaginationFields},`
         : ''}
-            if (existingData !== undefined && existingData !== null && ${hasOwnPropertyImport}.call(existingData, "__type") === false) {
-                const mergedData = mergeData(existingData as ${normalizedGraphQLTypeImport}, newData as ${normalizedGraphQLTypeImport});
-                if(!${equalsObjectImport}(existingData as ${normalizedGraphQLTypeImport}, mergedData as ${normalizedGraphQLTypeImport}, (propA, propB) => ${STABLE_JSON_STRINGIFY}(propA) === ${STABLE_JSON_STRINGIFY}(propB))) { // naive impl
-                    ${constants_1.LUVIO_IDENTIFIER}.storePublish(key, mergedData);
-                } 
-            } else {
-                ${constants_1.LUVIO_IDENTIFIER}.storePublish(key, newData);
-            }
-
-            const storeMetadataParams = {
-                ttl: ${ttl},
-                namespace: ${keyPrefix},
-                representationName: "${graphqlTypeName}",
-                version: ${version_1.SHAPE_VERSION_IDENTIFIER}
-            };
-            ${constants_1.LUVIO_IDENTIFIER}.publishStoreMetadata(key, storeMetadataParams);
-
-            return ${createLink}(key);
+                    ${isCursorConnectionType
+        ? `ingestPaginatedMetadata: ${INGEST_PAGINATED_METDATA},`
+        : ''}
+                    ${ramlIngestBlock.length > 0
+        ? `ramlIngestBlock(newData: ${normalizedGraphQLTypeImport}) {
+                                ${ramlIngestBlock}
+                           },`
+        : ''}
+                    createLink: ${createLink},
+                    mergeData,
+                    storeMetadataParams: {
+                        ttl: ${ttl},
+                        namespace: ${keyPrefix},
+                        representationName: "${graphqlTypeName}",
+                        version: ${version_1.SHAPE_VERSION_IDENTIFIER}
+                    },
+                }
+            );
         }
     `;
 }

package/dist/codegen/graphql/type/ingest.js.map

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

package/dist/codegen/graphql/type/key.js

@@ -32,6 +32,11 @@ function generateKey(def, importContext, schemaName) {
             export function ${constants_2.KEY_BUILDER_IDENTIFIER}(${constants_3.LUVIO_IDENTIFIER}: ${constants_3.LUVIO_IMPORT}, path: ${constants_1.ADAPTER_INGEST_PATH_INTERFACE_IDENTIFIER}, data: ${interface_1.PARTIAL_INTERFACE_IDENTIFIER}) {
                 return path.fullPath;
             }
+
+            // W-12356727: To be switched over once path.fullPath is a structured key.
+            // export function ${constants_2.STRUCTURED_KEY_BUILDER_IDENTIFIER}(${constants_3.LUVIO_IDENTIFIER}: ${constants_3.LUVIO_IMPORT}, path: ${constants_1.ADAPTER_INGEST_PATH_INTERFACE_IDENTIFIER}, data: ${interface_1.PARTIAL_INTERFACE_IDENTIFIER}): ${constants_3.LUVIO_NORMALIZED_KEY_METADATA_IMPORT} {
+            //     return path.fullPath;
+            // }
         `;
     }
     const { name } = idNode;
@@ -40,6 +45,17 @@ function generateKey(def, importContext, schemaName) {
         export function ${constants_2.KEY_BUILDER_IDENTIFIER}(${constants_3.LUVIO_IDENTIFIER}: ${constants_3.LUVIO_IMPORT}, path: ${constants_1.ADAPTER_INGEST_PATH_INTERFACE_IDENTIFIER}, data: ${interface_1.PARTIAL_INTERFACE_IDENTIFIER}) {
             return ${KEY_PREFIX} + '::${schemaName}::' + name + '::' + data.${name.value};
         }
+
+        export function ${constants_2.STRUCTURED_KEY_BUILDER_IDENTIFIER}(${constants_3.LUVIO_IDENTIFIER}: ${constants_3.LUVIO_IMPORT}, path: ${constants_1.ADAPTER_INGEST_PATH_INTERFACE_IDENTIFIER}, data: ${interface_1.PARTIAL_INTERFACE_IDENTIFIER}): ${constants_3.LUVIO_NORMALIZED_KEY_METADATA_IMPORT} {
+            return ${constants_3.LUVIO_IDENTIFIER}.${constants_3.LUVIO_BUILD_STRUCTURED_KEY_METHOD_IDENTIFIER}(
+                ${KEY_PREFIX},
+                name,
+                {
+                    ${name.value}: data.${name.value},
+                    schemaName: name,
+                }
+            );
+        }
     `;
 }
 exports.generateKey = generateKey;

package/dist/codegen/graphql/type/key.js.map

@@ -1 +1 @@
-{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../../src/codegen/graphql/type/key.ts"],"names":[],"mappings":";;;;;;AAMA,uEAA+C;AAE/C,uDAAmF;AACnF,2CAAqD;AACrD,2CAA2D;AAC3D,sDAAwE;AAExE,SAAgB,UAAU,CACtB,GAAqF;IAErF,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAqB,EAAE;QACpC,OAAO,SAAS,CAAC;KACpB;IACD,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACvB,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,OAAO,SAAS,CAAC;KACpB;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACzB,OAAO,CACH,KAAK,CAAC,IAAI,KAAK,iBAAiB;YAChC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa;YACjC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW;YACpC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CACtC,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC;AAlBD,gCAkBC;AAED,SAAgB,WAAW,CACvB,GAA2D,EAC3D,aAA4B,EAC5B,UAAkB;IAElB,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAE/B,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,OAAO,IAAA,kBAAQ,EAAA;8BACO,kCAAsB,IAAI,4BAAgB,KAAK,wBAAY,WAAW,oDAAwC,WAAW,wCAA4B;;;SAG1K,CAAC;KACL;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACxB,MAAM,UAAU,GAAG,aAAa,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAChE,OAAO,IAAA,kBAAQ,EAAA;0BACO,kCAAsB,IAAI,4BAAgB,KAAK,wBAAY,WAAW,oDAAwC,WAAW,wCAA4B;qBAC1J,UAAU,SAAS,UAAU,4BAA4B,IAAI,CAAC,KAAK;;KAEnF,CAAC;AACN,CAAC;AAtBD,kCAsBC"}
+{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../../src/codegen/graphql/type/key.ts"],"names":[],"mappings":";;;;;;AAMA,uEAA+C;AAE/C,uDAAmF;AACnF,2CAAwF;AACxF,2CAA2D;AAC3D,sDAKgC;AAEhC,SAAgB,UAAU,CACtB,GAAqF;IAErF,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAqB,EAAE;QACpC,OAAO,SAAS,CAAC;KACpB;IACD,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACvB,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,OAAO,SAAS,CAAC;KACpB;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACzB,OAAO,CACH,KAAK,CAAC,IAAI,KAAK,iBAAiB;YAChC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa;YACjC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW;YACpC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CACtC,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC;AAlBD,gCAkBC;AAED,SAAgB,WAAW,CACvB,GAA2D,EAC3D,aAA4B,EAC5B,UAAkB;IAElB,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAE/B,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,OAAO,IAAA,kBAAQ,EAAA;8BACO,kCAAsB,IAAI,4BAAgB,KAAK,wBAAY,WAAW,oDAAwC,WAAW,wCAA4B;;;;;iCAKlJ,6CAAiC,IAAI,4BAAgB,KAAK,wBAAY,WAAW,oDAAwC,WAAW,wCAA4B,MAAM,gDAAoC;;;SAGlO,CAAC;KACL;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACxB,MAAM,UAAU,GAAG,aAAa,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAChE,OAAO,IAAA,kBAAQ,EAAA;0BACO,kCAAsB,IAAI,4BAAgB,KAAK,wBAAY,WAAW,oDAAwC,WAAW,wCAA4B;qBAC1J,UAAU,SAAS,UAAU,4BAA4B,IAAI,CAAC,KAAK;;;0BAG9D,6CAAiC,IAAI,4BAAgB,KAAK,wBAAY,WAAW,oDAAwC,WAAW,wCAA4B,MAAM,gDAAoC;qBAC/M,4BAAgB,IAAI,wDAA4C;kBACnE,UAAU;;;sBAGN,IAAI,CAAC,KAAK,UAAU,IAAI,CAAC,KAAK;;;;;KAK/C,CAAC;AACN,CAAC;AAtCD,kCAsCC"}

package/dist/codegen/resource/graphql/key-builder.d.ts

@@ -2,3 +2,4 @@ import type { ImportContext } from '../../../utils/imports';
 import type { GraphQLResource } from '../../../intermediate/resource';
 export declare function generateGraphQLKeyBuilder(importContext: ImportContext, resource: GraphQLResource): string;
 export declare function generateGraphQLKey(importContext: ImportContext, returnShapeName: string): string;
+export declare function generateGraphQLStructuredKey(importContext: ImportContext, returnShapeName: string): string;

package/dist/codegen/resource/graphql/key-builder.js

@@ -3,23 +3,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateGraphQLKey = exports.generateGraphQLKeyBuilder = void 0;
+exports.generateGraphQLStructuredKey = exports.generateGraphQLKey = exports.generateGraphQLKeyBuilder = void 0;
 const deindent_1 = __importDefault(require("../../../utils/deindent"));
 const resource_params_1 = require("./resource-params");
 const key_builder_1 = require("../key-builder");
 const constants_1 = require("../../shared/constants");
 function generateGraphQLKeyBuilder(importContext, resource) {
     let code;
+    let structuredKeyCode;
     const { id: resourceId, returnShape } = resource;
     const resourceRequestConfig = importContext.importRamlArtifact(resourceId, resource_params_1.RESOURCE_PARAMS_INTERFACE);
     code =
         returnShape !== undefined //TODO: cleanup in W-11069204
             ? generateGraphQLKey(importContext, returnShape === null || returnShape === void 0 ? void 0 : returnShape.name)
             : '';
+    structuredKeyCode =
+        returnShape !== undefined //TODO: cleanup in W-11069204
+            ? generateGraphQLStructuredKey(importContext, returnShape === null || returnShape === void 0 ? void 0 : returnShape.name)
+            : '';
     return (0, deindent_1.default) `
             export function ${key_builder_1.RESOURCE_KEY_BUILDER_IDENTIFIER}(${constants_1.LUVIO_IDENTIFIER}: ${constants_1.LUVIO_IMPORT}, params: ${resourceRequestConfig}): string {
                 return ${code}
             }
+
+            export function ${key_builder_1.RESOURCE_STRUCTURED_KEY_BUILDER_IDENTIFIER}(${constants_1.LUVIO_IDENTIFIER}: ${constants_1.LUVIO_IMPORT}, params: ${resourceRequestConfig}): ${constants_1.LUVIO_NORMALIZED_KEY_METADATA_IMPORT} {
+                return ${structuredKeyCode}
+            }
         `;
 }
 exports.generateGraphQLKeyBuilder = generateGraphQLKeyBuilder;
@@ -32,4 +41,16 @@ function generateGraphQLKey(importContext, returnShapeName) {
     `;
 }
 exports.generateGraphQLKey = generateGraphQLKey;
+function generateGraphQLStructuredKey(importContext, returnShapeName) {
+    const { importAdapterUtil } = importContext;
+    const KEY_PREFIX = importAdapterUtil('keyPrefix');
+    return (0, deindent_1.default) `
+        ${constants_1.LUVIO_IDENTIFIER}.${constants_1.LUVIO_BUILD_STRUCTURED_KEY_METHOD_IDENTIFIER}(
+            ${KEY_PREFIX},
+            '${returnShapeName}',
+            {}
+        )
+    `;
+}
+exports.generateGraphQLStructuredKey = generateGraphQLStructuredKey;
 //# sourceMappingURL=key-builder.js.map

package/dist/codegen/resource/graphql/key-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"key-builder.js","sourceRoot":"","sources":["../../../../src/codegen/resource/graphql/key-builder.ts"],"names":[],"mappings":";;;;;;AAAA,uEAA+C;AAE/C,uDAA8D;AAC9D,gDAAiE;AAGjE,sDAIgC;AAEhC,SAAgB,yBAAyB,CACrC,aAA4B,EAC5B,QAAyB;IAEzB,IAAI,IAAI,CAAC;IACT,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;IAEjD,MAAM,qBAAqB,GAAG,aAAa,CAAC,kBAAkB,CAC1D,UAAU,EACV,2CAAyB,CAC5B,CAAC;IAEF,IAAI;QACA,WAAW,KAAK,SAAS,CAAC,6BAA6B;YACnD,CAAC,CAAC,kBAAkB,CAAC,aAAa,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC;YACtD,CAAC,CAAC,EAAE,CAAC;IAEb,OAAO,IAAA,kBAAQ,EAAA;8BACW,6CAA+B,IAAI,4BAAgB,KAAK,wBAAY,aAAa,qBAAqB;yBAC3G,IAAI;;SAEpB,CAAC;AACV,CAAC;AAtBD,8DAsBC;AAED,mEAAmE;AACnE,SAAgB,kBAAkB,CAAC,aAA4B,EAAE,eAAuB;IACpF,MAAM,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC;IAC5C,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAClD,OAAO,IAAA,kBAAQ,EAAA;cACL,UAAU,OAAO,yCAA6B,QAAQ,eAAe;KAC9E,CAAC;AACN,CAAC;AAND,gDAMC"}
+{"version":3,"file":"key-builder.js","sourceRoot":"","sources":["../../../../src/codegen/resource/graphql/key-builder.ts"],"names":[],"mappings":";;;;;;AAAA,uEAA+C;AAE/C,uDAA8D;AAC9D,gDAGwB;AAGxB,sDAMgC;AAEhC,SAAgB,yBAAyB,CACrC,aAA4B,EAC5B,QAAyB;IAEzB,IAAI,IAAI,CAAC;IACT,IAAI,iBAAiB,CAAC;IACtB,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;IAEjD,MAAM,qBAAqB,GAAG,aAAa,CAAC,kBAAkB,CAC1D,UAAU,EACV,2CAAyB,CAC5B,CAAC;IAEF,IAAI;QACA,WAAW,KAAK,SAAS,CAAC,6BAA6B;YACnD,CAAC,CAAC,kBAAkB,CAAC,aAAa,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC;YACtD,CAAC,CAAC,EAAE,CAAC;IACb,iBAAiB;QACb,WAAW,KAAK,SAAS,CAAC,6BAA6B;YACnD,CAAC,CAAC,4BAA4B,CAAC,aAAa,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC;YAChE,CAAC,CAAC,EAAE,CAAC;IAEb,OAAO,IAAA,kBAAQ,EAAA;8BACW,6CAA+B,IAAI,4BAAgB,KAAK,wBAAY,aAAa,qBAAqB;yBAC3G,IAAI;;;8BAGC,wDAA0C,IAAI,4BAAgB,KAAK,wBAAY,aAAa,qBAAqB,MAAM,gDAAoC;yBAChK,iBAAiB;;SAEjC,CAAC;AACV,CAAC;AA/BD,8DA+BC;AAED,mEAAmE;AACnE,SAAgB,kBAAkB,CAAC,aAA4B,EAAE,eAAuB;IACpF,MAAM,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC;IAC5C,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAClD,OAAO,IAAA,kBAAQ,EAAA;cACL,UAAU,OAAO,yCAA6B,QAAQ,eAAe;KAC9E,CAAC;AACN,CAAC;AAND,gDAMC;AAED,SAAgB,4BAA4B,CACxC,aAA4B,EAC5B,eAAuB;IAEvB,MAAM,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC;IAC5C,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAClD,OAAO,IAAA,kBAAQ,EAAA;UACT,4BAAgB,IAAI,wDAA4C;cAC5D,UAAU;eACT,eAAe;;;KAGzB,CAAC;AACN,CAAC;AAbD,oEAaC"}

package/dist/codegen/resource/key-builder.d.ts

@@ -2,5 +2,7 @@ import type { ModelInfo } from '../../intermediate/model-info';
 import type { Resource } from '../../intermediate/resource';
 import type { ImportContext } from '../../utils/imports';
 export declare const RESOURCE_KEY_BUILDER_IDENTIFIER = "keyBuilder";
+export declare const RESOURCE_STRUCTURED_KEY_BUILDER_IDENTIFIER: string;
 export declare function generateKeyFallback(importContext: ImportContext, returnShapeName: string, resource: Resource): string;
+export declare function generateStructuredKeyFallback(importContext: ImportContext, returnShapeName: string): string;
 export declare function generateKeyBuilder(importContext: ImportContext, resource: Resource, modelInfo: ModelInfo): string;

package/dist/codegen/resource/key-builder.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateKeyBuilder = exports.generateKeyFallback = exports.RESOURCE_KEY_BUILDER_IDENTIFIER = void 0;
+exports.generateKeyBuilder = exports.generateStructuredKeyFallback = exports.generateKeyFallback = exports.RESOURCE_STRUCTURED_KEY_BUILDER_IDENTIFIER = exports.RESOURCE_KEY_BUILDER_IDENTIFIER = void 0;
 const resource_1 = require("../../intermediate/resource");
 const utils_1 = require("../../intermediate/utils");
 const deindent_1 = __importDefault(require("../../utils/deindent"));
@@ -13,6 +13,7 @@ const util_1 = require("../adapter/util");
 const constants_1 = require("../shared/constants");
 const RESOURCE_PARAMS_IDENTIFIER = 'params';
 exports.RESOURCE_KEY_BUILDER_IDENTIFIER = 'keyBuilder';
+exports.RESOURCE_STRUCTURED_KEY_BUILDER_IDENTIFIER = exports.RESOURCE_KEY_BUILDER_IDENTIFIER + constants_1.LUVIO_STRUCTURED_KEY_SUFFIX;
 function generatePostBodyKeyParamNodeShape(shape, context) {
     const { importContext } = context;
     const { importAdapterUtil } = importContext;
@@ -104,6 +105,35 @@ function generateKey(importContext, returnShapeId, keys) {
         });
     `;
 }
+function generateStructuredKeyFallback(importContext, returnShapeName) {
+    const { importAdapterUtil } = importContext;
+    const KEY_PREFIX = importAdapterUtil('keyPrefix');
+    const STABLE_JSON_STRINGIFY = importAdapterUtil('stableJSONStringify');
+    return `${constants_1.LUVIO_IDENTIFIER}.${constants_1.LUVIO_BUILD_STRUCTURED_KEY_METHOD_IDENTIFIER}(
+            ${KEY_PREFIX},
+            "${returnShapeName}",
+            JSON.parse(${STABLE_JSON_STRINGIFY}(params) as string)
+        );
+    `;
+}
+exports.generateStructuredKeyFallback = generateStructuredKeyFallback;
+function generateStructuredKey(importContext, returnShapeId, keys) {
+    const structuredKeyBuilderIdentifier = importContext.importRamlArtifact(returnShapeId, exports.RESOURCE_KEY_BUILDER_IDENTIFIER + constants_1.LUVIO_STRUCTURED_KEY_SUFFIX);
+    const keyBuilderConfigProperties = Object.keys(keys).map((name) => {
+        const keyValue = keys[name];
+        // if the annotation is a string literal or null then print it as is
+        if ((keyValue.startsWith('"') && keyValue.endsWith('"')) || keyValue === 'null') {
+            return `${name}: ` + keyValue;
+        }
+        // else assume it is indexing into the config object
+        return `${name}: ${RESOURCE_PARAMS_IDENTIFIER}.${keys[name]}`;
+    });
+    return (0, deindent_1.default) `
+        ${structuredKeyBuilderIdentifier}(${constants_1.LUVIO_IDENTIFIER}, {
+            ${keyBuilderConfigProperties.join(',\n')}
+        });
+    `;
+}
 function generateKeyBuilder(importContext, resource, modelInfo) {
     const { shapeKeysDefinition } = modelInfo;
     const { id: resourceId, method, returnShape } = resource;
@@ -123,10 +153,17 @@ function generateKeyBuilder(importContext, resource, modelInfo) {
     const code = resource.keys === undefined || shapeKeysDefinition[responseShapeId] === undefined
         ? generateKeyFallback(importContext, responseShapeName, resource)
         : generateKey(importContext, responseShapeId, resource.keys);
+    const structuredKeyCode = resource.keys === undefined || shapeKeysDefinition[responseShapeId] === undefined
+        ? generateStructuredKeyFallback(importContext, responseShapeName)
+        : generateStructuredKey(importContext, responseShapeId, resource.keys);
     return (0, deindent_1.default) `
         export function ${exports.RESOURCE_KEY_BUILDER_IDENTIFIER}(${constants_1.LUVIO_IDENTIFIER}: ${constants_1.LUVIO_IMPORT}, params: ${resourceRequestConfig}): string {
             return ${code}
         }
+
+        export function ${exports.RESOURCE_STRUCTURED_KEY_BUILDER_IDENTIFIER}(${constants_1.LUVIO_IDENTIFIER}: ${constants_1.LUVIO_IMPORT}, params: ${resourceRequestConfig}): ${constants_1.LUVIO_NORMALIZED_KEY_METADATA_IMPORT} {
+            return ${structuredKeyCode}
+        }
     `;
 }
 exports.generateKeyBuilder = generateKeyBuilder;

package/dist/codegen/resource/key-builder.js.map

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

package/dist/codegen/shape/graphql/key-builder.d.ts

@@ -1,5 +1,6 @@
 import type { CodegenShapeConfig } from '../index';
 export declare const SHAPE_KEY_BUILDER_IDENTIFIER = "keyBuilder";
 export declare const SHAPE_KEY_BUILDER_FROM_TYPE_IDENTIFIER = "keyBuilderFromType";
+export declare const SHAPE_STRUCTURED_KEY_BUILDER_FROM_TYPE_IDENTIFIER: string;
 export declare const SHAPE_PAGINATION_KEY_BUILDER_IDENTIFIER = "paginationKeyBuilder";
 export declare function generateGraphQLInteropShapeKeyBuilder(shapeConfig: CodegenShapeConfig): string;

package/dist/codegen/shape/graphql/key-builder.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateGraphQLInteropShapeKeyBuilder = exports.SHAPE_PAGINATION_KEY_BUILDER_IDENTIFIER = exports.SHAPE_KEY_BUILDER_FROM_TYPE_IDENTIFIER = exports.SHAPE_KEY_BUILDER_IDENTIFIER = void 0;
+exports.generateGraphQLInteropShapeKeyBuilder = exports.SHAPE_PAGINATION_KEY_BUILDER_IDENTIFIER = exports.SHAPE_STRUCTURED_KEY_BUILDER_FROM_TYPE_IDENTIFIER = exports.SHAPE_KEY_BUILDER_FROM_TYPE_IDENTIFIER = exports.SHAPE_KEY_BUILDER_IDENTIFIER = void 0;
 const deindent_1 = __importDefault(require("../../../utils/deindent"));
 const constants_1 = require("../../shared/constants");
 const shape_representation_type_1 = require("../shape-representation-type");
 const KEY_BUILDER_FROM_TYPE_ARGUMENT_IDENTIFIER = 'object';
 exports.SHAPE_KEY_BUILDER_IDENTIFIER = 'keyBuilder';
 exports.SHAPE_KEY_BUILDER_FROM_TYPE_IDENTIFIER = 'keyBuilderFromType';
+exports.SHAPE_STRUCTURED_KEY_BUILDER_FROM_TYPE_IDENTIFIER = exports.SHAPE_KEY_BUILDER_FROM_TYPE_IDENTIFIER + constants_1.LUVIO_STRUCTURED_KEY_SUFFIX;
 exports.SHAPE_PAGINATION_KEY_BUILDER_IDENTIFIER = 'paginationKeyBuilder';
 function generateGraphQLInteropShapeKeyBuilder(shapeConfig) {
     const { shape, importContext } = shapeConfig;
@@ -20,6 +21,14 @@ function generateGraphQLInteropShapeKeyBuilder(shapeConfig) {
         export function ${exports.SHAPE_KEY_BUILDER_FROM_TYPE_IDENTIFIER}(${constants_1.LUVIO_IDENTIFIER}: ${constants_1.LUVIO_IMPORT}, ${KEY_BUILDER_FROM_TYPE_ARGUMENT_IDENTIFIER}: ${shapeName}): string {
             return ${KEY_PREFIX} + '${constants_1.CACHE_KEY_NAMESPACE_DELIMITER}' + ${shape_representation_type_1.REPRESENTATION_TYPE_IDENTIFIER};
         }
+
+        export function ${exports.SHAPE_STRUCTURED_KEY_BUILDER_FROM_TYPE_IDENTIFIER}(${constants_1.LUVIO_IDENTIFIER}: ${constants_1.LUVIO_IMPORT}, ${KEY_BUILDER_FROM_TYPE_ARGUMENT_IDENTIFIER}: ${shapeName}): ${constants_1.LUVIO_NORMALIZED_KEY_METADATA_IMPORT} {
+            return ${constants_1.LUVIO_IDENTIFIER}.${constants_1.LUVIO_BUILD_STRUCTURED_KEY_METHOD_IDENTIFIER}(
+                ${KEY_PREFIX},
+                ${shape_representation_type_1.REPRESENTATION_TYPE_IDENTIFIER},
+                {},
+            );
+        }
     `;
 }
 exports.generateGraphQLInteropShapeKeyBuilder = generateGraphQLInteropShapeKeyBuilder;

package/dist/codegen/shape/graphql/key-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"key-builder.js","sourceRoot":"","sources":["../../../../src/codegen/shape/graphql/key-builder.ts"],"names":[],"mappings":";;;;;;AAAA,uEAA+C;AAC/C,sDAIgC;AAEhC,4EAA8E;AAC9E,MAAM,yCAAyC,GAAG,QAAQ,CAAC;AAC9C,QAAA,4BAA4B,GAAG,YAAY,CAAC;AAC5C,QAAA,sCAAsC,GAAG,oBAAoB,CAAC;AAC9D,QAAA,uCAAuC,GAAG,sBAAsB,CAAC;AAE9E,SAAgB,qCAAqC,CAAC,WAA+B;IACjF,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,WAAW,CAAC;IAE7C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;IAC7B,MAAM,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC;IAC5C,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAClD,OAAO,IAAA,kBAAQ,EAAA;0BACO,8CAAsC,IAAI,4BAAgB,KAAK,wBAAY,KAAK,yCAAyC,KAAK,SAAS;qBAC5I,UAAU,OAAO,yCAA6B,OAAO,0DAA8B;;KAEnG,CAAC;AACN,CAAC;AAXD,sFAWC"}
+{"version":3,"file":"key-builder.js","sourceRoot":"","sources":["../../../../src/codegen/shape/graphql/key-builder.ts"],"names":[],"mappings":";;;;;;AAAA,uEAA+C;AAC/C,sDAOgC;AAEhC,4EAA8E;AAC9E,MAAM,yCAAyC,GAAG,QAAQ,CAAC;AAC9C,QAAA,4BAA4B,GAAG,YAAY,CAAC;AAC5C,QAAA,sCAAsC,GAAG,oBAAoB,CAAC;AAC9D,QAAA,iDAAiD,GAC1D,8CAAsC,GAAG,uCAA2B,CAAC;AAC5D,QAAA,uCAAuC,GAAG,sBAAsB,CAAC;AAE9E,SAAgB,qCAAqC,CAAC,WAA+B;IACjF,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,WAAW,CAAC;IAE7C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;IAC7B,MAAM,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC;IAC5C,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAClD,OAAO,IAAA,kBAAQ,EAAA;0BACO,8CAAsC,IAAI,4BAAgB,KAAK,wBAAY,KAAK,yCAAyC,KAAK,SAAS;qBAC5I,UAAU,OAAO,yCAA6B,OAAO,0DAA8B;;;0BAG9E,yDAAiD,IAAI,4BAAgB,KAAK,wBAAY,KAAK,yCAAyC,KAAK,SAAS,MAAM,gDAAoC;qBACjM,4BAAgB,IAAI,wDAA4C;kBACnE,UAAU;kBACV,0DAA8B;;;;KAI3C,CAAC;AACN,CAAC;AAnBD,sFAmBC"}

package/dist/codegen/shape/shape-key-interface.js

@@ -7,6 +7,8 @@ exports.generateShapeKeyInterface = exports.SHAPE_KEY_PARAMS_INTERFACE_IDENTIFIE
 const inheritance_1 = require("../../intermediate/inheritance");
 const deindent_1 = __importDefault(require("../../utils/deindent"));
 const type_definition_1 = require("../shared/type-definition");
+const constants_1 = require("../adapter/constants");
+const constants_2 = require("../shared/constants");
 exports.SHAPE_KEY_PARAMS_INTERFACE_IDENTIFIER = 'KeyParams';
 function generateKeyConfigDefinition(importContext, shape, modelInfo) {
     const { shapeKeyConfigs } = modelInfo;
@@ -17,12 +19,17 @@ function generateShapeKeyInterface(shapeConfig) {
     const { shape, modelInfo, importContext } = shapeConfig;
     const { shapeKeysDefinition } = modelInfo;
     const shapeId = shape.id;
+    const shapeName = shape.name;
     const keys = shapeKeysDefinition[shapeId];
     if (keys === undefined || (0, inheritance_1.hasInheritance)(shape, modelInfo)) {
         return '';
     }
     return (0, deindent_1.default) `
-        export interface ${exports.SHAPE_KEY_PARAMS_INTERFACE_IDENTIFIER} ${generateKeyConfigDefinition(importContext, shape, shapeConfig.modelInfo)}
+        export interface ${exports.SHAPE_KEY_PARAMS_INTERFACE_IDENTIFIER} extends ${constants_1.ADAPTER_CONFIG_SHAPE_INTERFACE_IDENTIFIER} ${generateKeyConfigDefinition(importContext, shape, shapeConfig.modelInfo)}
+
+        export type ${shapeName}${constants_2.LUVIO_NORMALIZED_KEY_METADATA_TYPE_IDENTIFIER} = ${exports.SHAPE_KEY_PARAMS_INTERFACE_IDENTIFIER} & ${constants_2.LUVIO_NORMALIZED_KEY_METADATA_IMPORT};
+
+        export type Partial${shapeName}${constants_2.LUVIO_NORMALIZED_KEY_METADATA_TYPE_IDENTIFIER} = Partial<${exports.SHAPE_KEY_PARAMS_INTERFACE_IDENTIFIER}> & ${constants_2.LUVIO_NORMALIZED_KEY_METADATA_IMPORT};
     `;
 }
 exports.generateShapeKeyInterface = generateShapeKeyInterface;

package/dist/codegen/shape/shape-key-interface.js.map

@@ -1 +1 @@
-{"version":3,"file":"shape-key-interface.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-key-interface.ts"],"names":[],"mappings":";;;;;;AACA,gEAAgE;AAEhE,oEAA4C;AAC5C,+DAAmE;AAItD,QAAA,qCAAqC,GAAG,WAAW,CAAC;AAEjE,SAAS,2BAA2B,CAChC,aAA4B,EAC5B,KAAsB,EACtB,SAAoB;IAEpB,MAAM,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;IACtC,MAAM,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC9C,OAAO,IAAA,wCAAsB,EAAC,aAAa,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AACzE,CAAC;AAED,SAAgB,yBAAyB,CAAC,WAA+B;IACrE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,WAAW,CAAC;IACxD,MAAM,EAAE,mBAAmB,EAAE,GAAG,SAAS,CAAC;IAC1C,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE1C,IAAI,IAAI,KAAK,SAAS,IAAI,IAAA,4BAAc,EAAC,KAAK,EAAE,SAAS,CAAC,EAAE;QACxD,OAAO,EAAE,CAAC;KACb;IAED,OAAO,IAAA,kBAAQ,EAAA;2BACQ,6CAAqC,IAAI,2BAA2B,CACvF,aAAa,EACb,KAAK,EACL,WAAW,CAAC,SAAS,CACxB;KACA,CAAC;AACN,CAAC;AAjBD,8DAiBC"}
+{"version":3,"file":"shape-key-interface.js","sourceRoot":"","sources":["../../../src/codegen/shape/shape-key-interface.ts"],"names":[],"mappings":";;;;;;AACA,gEAAgE;AAEhE,oEAA4C;AAC5C,+DAAmE;AAGnE,oDAAiF;AACjF,mDAG6B;AAEhB,QAAA,qCAAqC,GAAG,WAAW,CAAC;AAEjE,SAAS,2BAA2B,CAChC,aAA4B,EAC5B,KAAsB,EACtB,SAAoB;IAEpB,MAAM,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;IACtC,MAAM,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC9C,OAAO,IAAA,wCAAsB,EAAC,aAAa,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AACzE,CAAC;AAED,SAAgB,yBAAyB,CAAC,WAA+B;IACrE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,WAAW,CAAC;IACxD,MAAM,EAAE,mBAAmB,EAAE,GAAG,SAAS,CAAC;IAC1C,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC;IACzB,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;IAC7B,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE1C,IAAI,IAAI,KAAK,SAAS,IAAI,IAAA,4BAAc,EAAC,KAAK,EAAE,SAAS,CAAC,EAAE;QACxD,OAAO,EAAE,CAAC;KACb;IAED,OAAO,IAAA,kBAAQ,EAAA;2BACQ,6CAAqC,YAAY,qDAAyC,IAAI,2BAA2B,CAC5I,aAAa,EACb,KAAK,EACL,WAAW,CAAC,SAAS,CACxB;;sBAEiB,SAAS,GAAG,yDAA6C,MAAM,6CAAqC,MAAM,gDAAoC;;6BAEvI,SAAS,GAAG,yDAA6C,cAAc,6CAAqC,OAAO,gDAAoC;KAC/K,CAAC;AACN,CAAC;AAtBD,8DAsBC"}

package/dist/codegen/shape/shape-keybuilder.d.ts

@@ -1,5 +1,8 @@
 import type { CodegenShapeConfig } from './index';
 export declare const SHAPE_KEY_BUILDER_IDENTIFIER = "keyBuilder";
+export declare const SHAPE_STRUCTURED_KEY_BUILDER_IDENTIFIER: string;
 export declare const SHAPE_KEY_BUILDER_FROM_TYPE_IDENTIFIER = "keyBuilderFromType";
+export declare const SHAPE_STRUCTURED_KEY_BUILDER_FROM_TYPE_IDENTIFIER: string;
 export declare const SHAPE_PAGINATION_KEY_BUILDER_IDENTIFIER = "paginationKeyBuilder";
+export declare const SHAPE_PAGINATION_STRUCTURED_KEY_BUILDER_IDENTIFIER: string;
 export declare function generateKeyBuilder(shapeConfig: CodegenShapeConfig): string;