@aws-amplify/data-schema 1.2.0 → 1.2.2

package/dist/cjs/runtime/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/runtime/utils/index.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.findIndexByFields = exports.resolvePKFields = void 0;\nvar resolvePKFields_1 = require(\"./resolvePKFields\");\nObject.defineProperty(exports, \"resolvePKFields\", { enumerable: true, get: function () { return resolvePKFields_1.resolvePKFields; } });\nvar findIndexByFields_1 = require(\"./findIndexByFields\");\nObject.defineProperty(exports, \"findIndexByFields\", { enumerable: true, get: function () { return findIndexByFields_1.findIndexByFields; } });\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,eAAe,GAAG,KAAK,CAAC,CAAC;AAC7D,IAAI,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACrD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,iBAAiB,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,iBAAiB,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC;AACxI,IAAI,mBAAmB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AACzD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,mBAAmB,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC;;"}
+{"version":3,"file":"index.js","sources":["../../../../src/runtime/utils/index.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.capitalize = exports.resolveOwnerFields = exports.findIndexByFields = exports.resolvePKFields = void 0;\nvar resolvePKFields_1 = require(\"./resolvePKFields\");\nObject.defineProperty(exports, \"resolvePKFields\", { enumerable: true, get: function () { return resolvePKFields_1.resolvePKFields; } });\nvar findIndexByFields_1 = require(\"./findIndexByFields\");\nObject.defineProperty(exports, \"findIndexByFields\", { enumerable: true, get: function () { return findIndexByFields_1.findIndexByFields; } });\nvar resolveOwnerFields_1 = require(\"./resolveOwnerFields\");\nObject.defineProperty(exports, \"resolveOwnerFields\", { enumerable: true, get: function () { return resolveOwnerFields_1.resolveOwnerFields; } });\nvar stringTransformation_1 = require(\"./stringTransformation\");\nObject.defineProperty(exports, \"capitalize\", { enumerable: true, get: function () { return stringTransformation_1.capitalize; } });\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,eAAe,GAAG,KAAK,CAAC,CAAC;AAC/G,IAAI,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACrD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,iBAAiB,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,iBAAiB,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC;AACxI,IAAI,mBAAmB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AACzD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,mBAAmB,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9I,IAAI,oBAAoB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAC3D,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,oBAAoB,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,oBAAoB,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;AACjJ,IAAI,sBAAsB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAC/D,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,sBAAsB,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;;"}

package/dist/cjs/runtime/utils/stringTransformation.js

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.capitalize = void 0;
+/**
+ * @param s string to capitalize
+ * @returns capitalized string
+ */
+function capitalize(s) {
+    return `${s[0].toUpperCase()}${s.slice(1)}`;
+}
+exports.capitalize = capitalize;
+//# sourceMappingURL=stringTransformation.js.map

package/dist/cjs/runtime/utils/stringTransformation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stringTransformation.js","sources":["../../../../src/runtime/utils/stringTransformation.ts"],"sourcesContent":["\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.capitalize = void 0;\n/**\n * @param s string to capitalize\n * @returns capitalized string\n */\nfunction capitalize(s) {\n    return `${s[0].toUpperCase()}${s.slice(1)}`;\n}\nexports.capitalize = capitalize;\n"],"names":[],"mappings":";;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,CAAC;AAC5B;AACA;AACA;AACA;AACA,SAAS,UAAU,CAAC,CAAC,EAAE;AACvB,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AACD,OAAO,CAAC,UAAU,GAAG,UAAU;;"}

package/dist/esm/MappedTypes/MapIndexes.d.ts

@@ -1,11 +1,20 @@
 import { ModelIndexType } from '../ModelIndex';
 type ModelIndexTypeShape = ModelIndexType<any, any, any, any, any>;
-export type PrimaryIndexFieldsToIR<IdxFields extends ReadonlyArray<string>, ResolvedFields> = IdxFields extends readonly [infer PK, ...infer SK] ? {
+export type PrimaryIndexFieldsToIR<IdxFields extends ReadonlyArray<string>, ResolvedFields> = IdxFields extends readonly [
+    infer PK,
+    ...infer SK extends never | readonly string[]
+] ? {
     pk: PK extends keyof ResolvedFields ? {
         [Key in PK]: Exclude<ResolvedFields[PK], null> & (string | number);
     } : never;
     sk: unknown extends SK ? never : ResolvedSortKeyFields<SK, ResolvedFields>;
+    compositeSk: SK['length'] extends 0 | 1 ? never : CompositeSkFieldName<ArrayShift<SK>, SK[0]>;
 } : never;
+type ArrayShift<Arr extends ReadonlyArray<any>> = Arr extends readonly [
+    infer _Shift,
+    ...infer Rest
+] ? Rest : never;
+type CompositeSkFieldName<SK, Result extends string = ''> = SK extends readonly [infer A extends string, ...infer B extends string[]] ? CompositeSkFieldName<B, `${Result}${Capitalize<A>}`> : Result;
 /**
  * Maps array of ModelIndexType to SecondaryIndexIrShape (defined in in data-schema-types)
  * */
@@ -29,13 +38,14 @@ export type SecondaryIndexToIR<Idxs extends ReadonlyArray<ModelIndexTypeShape>,
  *
  * @remarks - the IR type alias is defined as SecondaryIndexIrShape in data-schema-types
  */
-type SingleIndexIrFromType<Idx extends ModelIndexTypeShape, ResolvedFields> = Idx extends ModelIndexType<any, infer PK extends string, infer SK, infer QueryField extends string | never, any> ? {
-    defaultQueryFieldSuffix: `${QueryFieldLabelFromTuple<SK, Capitalize<PK>>}`;
+type SingleIndexIrFromType<Idx extends ModelIndexTypeShape, ResolvedFields> = Idx extends ModelIndexType<any, infer PK extends string, infer SK extends readonly string[], infer QueryField extends string | never, any> ? {
+    defaultQueryFieldSuffix: QueryFieldLabelFromTuple<SK, Capitalize<PK>>;
     queryField: QueryField;
     pk: PK extends keyof ResolvedFields ? {
         [Key in PK]: Exclude<ResolvedFields[PK], null>;
     } : never;
     sk: unknown extends SK ? never : ResolvedSortKeyFields<SK, ResolvedFields>;
+    compositeSk: SK['length'] extends 0 | 1 ? never : CompositeSkFieldName<ArrayShift<SK>, SK[0]>;
 } : never;
 /**
  * @typeParam SK - tuple of SortKey field names, e.g. ['viewCount', 'createdAt']

package/dist/esm/ModelType.d.ts

@@ -94,6 +94,7 @@ export declare function model<T extends ModelFields>(fields: T): ModelType<{
             id: string;
         };
         sk: never;
+        compositeSk: never;
     };
     secondaryIndexes: [];
     authorization: [];

package/dist/esm/runtime/client/index.d.ts

@@ -289,7 +289,7 @@ type SizeFilter = {
 /**
  * Filters options that can be used on string-like fields.
  */
-type StringFilter<T extends string = string> = {
+export type StringFilter<T extends string = string> = {
     attributeExists?: boolean;
     beginsWith?: string;
     between?: [string, string];
@@ -303,7 +303,7 @@ type StringFilter<T extends string = string> = {
     notContains?: string;
     size?: SizeFilter;
 };
-type NumericFilter = {
+export type NumericFilter = {
     attributeExists?: boolean;
     between?: [number, number];
     eq?: number;
@@ -318,8 +318,52 @@ type BooleanFilters = {
     eq?: boolean;
     ne?: boolean;
 };
+/**
+ * A composite SK (in an identifier or secondaryIndex) resolves to this type for
+ * list queries and index queries
+ *
+ * @example
+ * Given
+ * ```ts
+ * MyModel: a
+  .model({
+    pk: a.string().required(),
+    sk1: a.string().required(),
+    sk2: a.integer().required(),
+  })
+  .identifier(['pk', 'sk1', 'sk2']),
+ * ```
+ * Expected list options:
+ * ```ts
+ * {
+ *   pk?: string
+ *   sk1Sk2?: ModelPrimaryCompositeKeyConditionInput
+ * }
+ * ```
+ * Where ModelPrimaryCompositeKeyConditionInput resolves to:
+ * ```ts
+ * {
+ *   eq: {sk1: string; sk2: number};
+ *   le: {sk1: string; sk2: number};
+ *   lt: {sk1: string; sk2: number};
+ *   ge: {sk1: string; sk2: number};
+ *   gt: {sk1: string; sk2: number};
+ *   between: [ {sk1: string; sk2: number} ];
+ *   beginsWith: {sk1: string; sk2: number};
+ * }
+ * ```
+ * */
+export type ModelPrimaryCompositeKeyInput<SkIr extends Record<string, string | number>> = {
+    eq?: SkIr;
+    le?: SkIr;
+    lt?: SkIr;
+    ge?: SkIr;
+    gt?: SkIr;
+    between?: [SkIr];
+    beginsWith?: SkIr;
+};
 type ModelFilter<Model extends Record<any, any>> = LogicalFilters<Model> & {
-    [K in keyof Model as Model[K] extends LazyLoader<any, any> ? never : K]?: Model[K] extends boolean ? BooleanFilters : Model[K] extends number ? NumericFilter : StringFilter;
+    [K in keyof Model as Model[K] extends LazyLoader<any, any> ? never : K]?: boolean extends Model[K] ? BooleanFilters : number extends Model[K] ? NumericFilter : StringFilter;
 };
 export type ModelSortDirection = 'ASC' | 'DESC';
 type ModelMetaShape = {
@@ -524,6 +568,7 @@ export interface PrimaryIndexIrShape {
     sk: {
         [key: string]: string | number;
     } | never;
+    compositeSk: never | string;
 }
 /**
  * SecondaryIndex field types and query methods
@@ -532,21 +577,25 @@ export interface SecondaryIndexIrShape extends PrimaryIndexIrShape {
     defaultQueryFieldSuffix: string;
     queryField: string;
 }
-type IndexQueryMethodsFromIR<SecondaryIdxTuple extends SecondaryIndexIrShape[], ModelName extends string, Model extends Record<string, unknown>, Enums extends Record<string, string>, Res = unknown> = SecondaryIdxTuple extends [
+export type IndexQueryMethodsFromIR<SecondaryIdxTuple extends SecondaryIndexIrShape[], ModelName extends string, Model extends Record<string, unknown>, Enums extends Record<string, string>, Res = unknown> = SecondaryIdxTuple extends [
     infer A extends SecondaryIndexIrShape,
     ...infer B extends SecondaryIndexIrShape[]
 ] ? IndexQueryMethodsFromIR<B, ModelName, Model, Enums, IndexQueryMethodSignature<A, ModelName, Model, Enums> & Res> : Res;
-type ListPkOptions<ModelMeta extends ModelMetaShape, Enums extends Record<string, string>> = ModelMeta['identifier']['sk'] extends never ? unknown : Prettify<Partial<IndexQueryInput<ModelMeta['identifier'], Enums>> & {
+export type ListPkOptions<ModelMeta extends ModelMetaShape, Enums extends Record<string, string>> = ModelMeta['identifier']['sk'] extends never ? unknown : Prettify<Partial<IndexQueryInput<ModelMeta['identifier'], Enums>> & {
     sortDirection?: ModelSortDirection;
 }>;
 /**
  * Accepts a PrimaryIndexIr or SecondaryIndexIr and returns resolved parameters
  */
-type IndexQueryInput<Idx extends PrimaryIndexIrShape, Enums extends Record<string, string>> = {
+export type IndexQueryInput<Idx extends PrimaryIndexIrShape, Enums extends Record<string, string>> = {
     [PKField in keyof Idx['pk']]: Idx['pk'][PKField] extends `${deferredRefResolvingPrefix}${infer R}` ? Enums[R] : Idx['pk'][PKField];
-} & {
+} & (Idx['compositeSk'] extends never ? {
     [SKField in keyof Idx['sk']]+?: number extends Idx['sk'][SKField] ? NumericFilter : Idx['sk'][SKField] extends `${deferredRefResolvingPrefix}${infer R}` ? StringFilter<Enums[R]> : StringFilter<Idx['sk'][SKField] & string>;
-};
+} : {
+    [CompositeSk in Idx['compositeSk']]+?: ModelPrimaryCompositeKeyInput<{
+        [SKField in keyof Idx['sk']]: Idx['sk'][SKField] extends `${deferredRefResolvingPrefix}${infer _R}` ? string : Idx['sk'][SKField];
+    }>;
+});
 type IndexQueryMethodSignature<Idx extends SecondaryIndexIrShape, ModelName extends string, Model extends Record<string, unknown>, Enums extends Record<string, string>> = Record<IsEmptyStringOrNever<Idx['queryField']> extends false ? Idx['queryField'] : `list${ModelName}By${Idx['defaultQueryFieldSuffix']}`, <FlatModel extends Record<string, unknown> = ResolvedModel<Model>, SelectionSet extends ReadonlyArray<ModelPath<FlatModel>> = never[]>(input: IndexQueryInput<Idx, Enums>, options?: {
     filter?: ModelFilter<Model>;
     sortDirection?: ModelSortDirection;

package/dist/esm/runtime/internals/APIClient.mjs

@@ -1,4 +1,5 @@
 import { resolveOwnerFields } from '../utils/resolveOwnerFields.mjs';
+import { capitalize } from '../utils/stringTransformation.mjs';
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 const connectionType = {
@@ -6,6 +7,39 @@ const connectionType = {
     HAS_MANY: 'HAS_MANY',
     BELONGS_TO: 'BELONGS_TO',
 };
+// When generating an SK's KeyConditionInput name, string-like types map to String
+const skGraphQlFieldTypeMap = {
+    ID: 'ID',
+    String: 'String',
+    AWSDate: 'String',
+    AWSTime: 'String',
+    AWSDateTime: 'String',
+    AWSTimestamp: 'String',
+    AWSEmail: 'String',
+    AWSPhone: 'String',
+    AWSURL: 'String',
+    AWSIPAddress: 'String',
+    AWSJSON: 'String',
+    Boolean: 'Boolean',
+    Int: 'Int',
+    Float: 'Float',
+};
+// move to util
+const resolvedSkName = (sk) => {
+    if (sk.length === 1) {
+        return sk[0];
+    }
+    else {
+        return sk.reduce((acc, curr, idx) => {
+            if (idx === 0) {
+                return curr;
+            }
+            else {
+                return acc + capitalize(curr);
+            }
+        }, '');
+    }
+};
 /**
  *
  * @param GraphQL response object
@@ -426,7 +460,7 @@ function generateSelectionSet(modelIntrospection, modelName, selectionSet) {
 }
 function generateGraphQLDocument(modelIntrospection, modelName, modelOperation, listArgs, indexMeta) {
     const modelDefinition = modelIntrospection.models[modelName];
-    const { name, pluralName, fields, primaryKeyInfo: { isCustomPrimaryKey, primaryKeyFieldName, sortKeyFieldNames, }, } = modelDefinition;
+    const { name, pluralName, fields, primaryKeyInfo: { isCustomPrimaryKey, primaryKeyFieldName, sortKeyFieldNames, }, attributes, } = modelDefinition;
     // Use pascal case of the model name to generate the operations and the arguments.
     // This is required to be in sync with the resources generated by the GraphQL transformers.
     const namePascalCase = name.charAt(0).toUpperCase() + name.slice(1);
@@ -441,13 +475,38 @@ function generateGraphQLDocument(modelIntrospection, modelName, modelOperation,
     else if (indexMeta) {
         const { queryField, pk, sk = [] } = indexMeta;
         graphQLFieldName = queryField;
-        const skQueryArgs = sk.reduce((acc, fieldName) => {
-            const fieldType = Object.prototype.hasOwnProperty.call(fields[fieldName].type, 'enum')
-                ? 'String' // AppSync schema sets `ModelStringKeyConditionInput` as the type of the enum field that's used as SK
-                : fields[fieldName].type;
-            acc[fieldName] = `Model${fieldType}KeyConditionInput`;
-            return acc;
-        }, {});
+        /**
+         * **a. Single field SK** -> single arg where name is the field name and the type is `Model${gqlFieldType}KeyConditionInput` (nullable)
+         *  Note: string-like data types e.g.,  AWSDateTime, AWSEmail, AWSPhone, etc. should map to String. See `skGraphQlFieldTypeMap` above
+         * @example
+         * ```
+         * sk1: ModelStringKeyConditionInput
+         * ```
+         *
+         * **b. Composite SK** -> single arg where the name is camelCase concatenation of all the field names that comprise the SK
+         *  and the type is `Model${modelName}${keyAttributeName}CompositeKeyConditionInput` (nullable)
+         * @example
+         * ```
+         * sk1Sk2: ModelMyModelMyModelByPkAndSk1AndSk2CompositeKeyConditionInput
+         */
+        let skQueryArgs = {};
+        if (sk.length === 1) {
+            const [skField] = sk;
+            const type = (typeof fields[skField].type === 'string'
+                ? fields[skField].type
+                : 'String');
+            const normalizedType = skGraphQlFieldTypeMap[type];
+            skQueryArgs = {
+                [skField]: `Model${normalizedType}KeyConditionInput`,
+            };
+        }
+        else if (sk.length > 1) {
+            const compositeSkArgName = resolvedSkName(sk);
+            const keyName = attributes?.find((attr) => attr?.properties?.queryField === queryField)?.properties?.name;
+            skQueryArgs = {
+                [compositeSkArgName]: `Model${capitalize(modelName)}${capitalize(keyName)}CompositeKeyConditionInput`,
+            };
+        }
         indexQueryArgs = {
             [pk]: `${Object.prototype.hasOwnProperty.call(fields[pk].type, 'enum')
                 ? fields[pk].type.enum // AppSync schema sets enum type as the type of the enum fields that's used as PK
@@ -468,17 +527,62 @@ function generateGraphQLDocument(modelIntrospection, modelName, modelOperation,
         [primaryKeyFieldName]: `${fields[primaryKeyFieldName].type}!`,
     };
     const listPkArgs = {};
+    /**
+     * Generate query field args for the SK if it's defined
+     *
+     * **1. Get queries** require each SK field to be present as a separate arg where the type is the field's GraphQL scalar type (non-nullable)
+     * @example
+     * ```
+     * sk1: String!, sk2: Int!
+     * ```
+     *
+     * **2. List queries**
+     *
+     * **a. Single field SK** -> single arg where name is the field name and the type is `Model${gqlFieldType}KeyConditionInput` (nullable)
+     *      Note: string-like data types e.g.,  AWSDateTime, AWSEmail, AWSPhone, etc. should map to String. See `skGraphQlFieldTypeMap` above
+     * @example
+     * ```
+     * sk1: ModelStringKeyConditionInput
+     * ```
+     *
+     * **b. Composite SK** -> single arg where the name is camelCase concatenation of all the field names that comprise the SK
+     *  and the type is `Model${modelName}PrimaryCompositeKeyConditionInput` (nullable)
+     * @example
+     * ```
+     * sk1Sk2: ModelMyModelPrimaryCompositeKeyConditionInput
+     * ```
+     */
     const generateSkArgs = (op) => {
-        return sortKeyFieldNames.reduce((acc, fieldName) => {
-            const fieldType = fields[fieldName].type;
-            if (op === 'get') {
-                acc[fieldName] = `${fieldType}!`;
+        if (sortKeyFieldNames.length === 0)
+            return {};
+        if (op === 'get') {
+            return sortKeyFieldNames.reduce((acc, fieldName) => {
+                const fieldType = fields[fieldName].type;
+                if (op === 'get') {
+                    acc[fieldName] = `${fieldType}!`; // ! - SK args are non-nullable in Get queries
+                }
+                return acc;
+            }, {});
+        }
+        else {
+            // list SK
+            if (sortKeyFieldNames.length === 1) {
+                // Single SK
+                const [sk] = sortKeyFieldNames;
+                const type = (typeof fields[sk].type === 'string' ? fields[sk].type : 'String');
+                const normalizedType = skGraphQlFieldTypeMap[type];
+                return {
+                    [sk]: `Model${normalizedType}KeyConditionInput`,
+                };
             }
-            else if (op === 'list') {
-                acc[fieldName] = `Model${fieldType}KeyConditionInput`;
+            else {
+                // Composite SK
+                const compositeSkArgName = resolvedSkName(sortKeyFieldNames);
+                return {
+                    [compositeSkArgName]: `Model${capitalize(modelName)}PrimaryCompositeKeyConditionInput`,
+                };
             }
-            return acc;
-        }, {});
+        }
     };
     if (isCustomPrimaryKey) {
         Object.assign(getPkArgs, generateSkArgs('get'));
@@ -562,6 +666,7 @@ function generateGraphQLDocument(modelIntrospection, modelName, modelOperation,
 }
 function buildGraphQLVariables(modelDefinition, operation, arg, modelIntrospection, indexMeta) {
     const { fields, primaryKeyInfo: { isCustomPrimaryKey, primaryKeyFieldName, sortKeyFieldNames, }, } = modelDefinition;
+    const skName = sortKeyFieldNames?.length && resolvedSkName(sortKeyFieldNames);
     let variables = {};
     // TODO: process input
     switch (operation) {
@@ -604,8 +709,13 @@ function buildGraphQLVariables(modelDefinition, operation, arg, modelIntrospecti
             }
             if (arg?.sortDirection) {
                 variables.sortDirection = arg.sortDirection;
+            }
+            if (arg && arg[primaryKeyFieldName]) {
                 variables[primaryKeyFieldName] = arg[primaryKeyFieldName];
             }
+            if (skName && arg && arg[skName]) {
+                variables[skName] = arg[skName];
+            }
             if (arg?.nextToken) {
                 variables.nextToken = arg.nextToken;
             }
@@ -615,9 +725,10 @@ function buildGraphQLVariables(modelDefinition, operation, arg, modelIntrospecti
             break;
         case 'INDEX_QUERY': {
             const { pk, sk = [] } = indexMeta;
+            const indexQuerySkName = sk?.length && resolvedSkName(sk);
             variables[pk] = arg[pk];
-            for (const skField of sk) {
-                variables[skField] = arg[skField];
+            if (indexQuerySkName && arg && arg[indexQuerySkName]) {
+                variables[indexQuerySkName] = arg[indexQuerySkName];
             }
             if (arg?.filter) {
                 variables.filter = arg.filter;