@aws-amplify/api-graphql 4.0.16-unstable.5e30055.0 → 4.0.16

package/dist/esm/internals/server/generateModelsProperty.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generateModelsProperty.mjs","sources":["../../../../src/internals/server/generateModelsProperty.ts"],"sourcesContent":["import { graphQLOperationsInfo } from '../APIClient';\nimport { listFactory } from '../operations/list';\nimport { getFactory } from '../operations/get';\nexport function generateModelsProperty(client, params) {\n    const models = {};\n    const config = params.config;\n    const useContext = params.amplify === null;\n    if (!config) {\n        throw new Error('generateModelsProperty cannot retrieve Amplify config');\n    }\n    if (!config.API?.GraphQL) {\n        return {};\n    }\n    const modelIntrospection = config.API.GraphQL.modelIntrospection;\n    if (!modelIntrospection) {\n        return {};\n    }\n    const SSR_UNSUPORTED_OPS = [\n        'ONCREATE',\n        'ONUPDATE',\n        'ONDELETE',\n        'OBSERVE_QUERY',\n    ];\n    for (const model of Object.values(modelIntrospection.models)) {\n        const { name } = model;\n        models[name] = {};\n        Object.entries(graphQLOperationsInfo).forEach(([key, { operationPrefix }]) => {\n            const operation = key;\n            // subscriptions are not supported in SSR\n            if (SSR_UNSUPORTED_OPS.includes(operation))\n                return;\n            if (operation === 'LIST') {\n                models[name][operationPrefix] = listFactory(client, modelIntrospection, model, useContext);\n            }\n            else {\n                models[name][operationPrefix] = getFactory(client, modelIntrospection, model, operation, useContext);\n            }\n        });\n    }\n    return models;\n}\n"],"names":[],"mappings":";;;;AAGO,SAAS,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE;AACvD,IAAI,MAAM,MAAM,GAAG,EAAE,CAAC;AACtB,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;AACjC,IAAI,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;AAC/C,IAAI,IAAI,CAAC,MAAM,EAAE;AACjB,QAAQ,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;AACjF,KAAK;AACL,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE;AAC9B,QAAQ,OAAO,EAAE,CAAC;AAClB,KAAK;AACL,IAAI,MAAM,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC;AACrE,IAAI,IAAI,CAAC,kBAAkB,EAAE;AAC7B,QAAQ,OAAO,EAAE,CAAC;AAClB,KAAK;AACL,IAAI,MAAM,kBAAkB,GAAG;AAC/B,QAAQ,UAAU;AAClB,QAAQ,UAAU;AAClB,QAAQ,UAAU;AAClB,QAAQ,eAAe;AACvB,KAAK,CAAC;AACN,IAAI,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;AAClE,QAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;AAC/B,QAAQ,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;AAC1B,QAAQ,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,eAAe,EAAE,CAAC,KAAK;AACtF,YAAY,MAAM,SAAS,GAAG,GAAG,CAAC;AAClC;AACA,YAAY,IAAI,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC;AACtD,gBAAgB,OAAO;AACvB,YAAY,IAAI,SAAS,KAAK,MAAM,EAAE;AACtC,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;AAC3G,aAAa;AACb,iBAAiB;AACjB,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AACrH,aAAa;AACb,SAAS,CAAC,CAAC;AACX,KAAK;AACL,IAAI,OAAO,MAAM,CAAC;AAClB;;;;"}
+{"version":3,"file":"generateModelsProperty.mjs","sources":["../../../../src/internals/server/generateModelsProperty.ts"],"sourcesContent":["import { graphQLOperationsInfo } from '../APIClient';\nimport { listFactory } from '../operations/list';\nimport { indexQueryFactory } from '../operations/indexQuery';\nimport { getFactory } from '../operations/get';\nimport { getSecondaryIndexesFromSchemaModel } from '../clientUtils';\nexport function generateModelsProperty(client, params) {\n    const models = {};\n    const config = params.config;\n    const useContext = params.amplify === null;\n    if (!config) {\n        throw new Error('generateModelsProperty cannot retrieve Amplify config');\n    }\n    if (!config.API?.GraphQL) {\n        return {};\n    }\n    const modelIntrospection = config.API.GraphQL.modelIntrospection;\n    if (!modelIntrospection) {\n        return {};\n    }\n    const SSR_UNSUPORTED_OPS = [\n        'ONCREATE',\n        'ONUPDATE',\n        'ONDELETE',\n        'OBSERVE_QUERY',\n    ];\n    for (const model of Object.values(modelIntrospection.models)) {\n        const { name } = model;\n        models[name] = {};\n        Object.entries(graphQLOperationsInfo).forEach(([key, { operationPrefix }]) => {\n            const operation = key;\n            // subscriptions are not supported in SSR\n            if (SSR_UNSUPORTED_OPS.includes(operation))\n                return;\n            if (operation === 'LIST') {\n                models[name][operationPrefix] = listFactory(client, modelIntrospection, model, useContext);\n            }\n            else {\n                models[name][operationPrefix] = getFactory(client, modelIntrospection, model, operation, useContext);\n            }\n        });\n        const secondaryIdxs = getSecondaryIndexesFromSchemaModel(model);\n        for (const idx of secondaryIdxs) {\n            models[name][idx.queryField] = indexQueryFactory(client, modelIntrospection, model, idx);\n        }\n    }\n    return models;\n}\n"],"names":[],"mappings":";;;;;;AAKO,SAAS,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE;AACvD,IAAI,MAAM,MAAM,GAAG,EAAE,CAAC;AACtB,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;AACjC,IAAI,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;AAC/C,IAAI,IAAI,CAAC,MAAM,EAAE;AACjB,QAAQ,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;AACjF,KAAK;AACL,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE;AAC9B,QAAQ,OAAO,EAAE,CAAC;AAClB,KAAK;AACL,IAAI,MAAM,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC;AACrE,IAAI,IAAI,CAAC,kBAAkB,EAAE;AAC7B,QAAQ,OAAO,EAAE,CAAC;AAClB,KAAK;AACL,IAAI,MAAM,kBAAkB,GAAG;AAC/B,QAAQ,UAAU;AAClB,QAAQ,UAAU;AAClB,QAAQ,UAAU;AAClB,QAAQ,eAAe;AACvB,KAAK,CAAC;AACN,IAAI,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;AAClE,QAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;AAC/B,QAAQ,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;AAC1B,QAAQ,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,eAAe,EAAE,CAAC,KAAK;AACtF,YAAY,MAAM,SAAS,GAAG,GAAG,CAAC;AAClC;AACA,YAAY,IAAI,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC;AACtD,gBAAgB,OAAO;AACvB,YAAY,IAAI,SAAS,KAAK,MAAM,EAAE;AACtC,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;AAC3G,aAAa;AACb,iBAAiB;AACjB,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AACrH,aAAa;AACb,SAAS,CAAC,CAAC;AACX,QAAQ,MAAM,aAAa,GAAG,kCAAkC,CAAC,KAAK,CAAC,CAAC;AACxE,QAAQ,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;AACzC,YAAY,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;AACrG,SAAS;AACT,KAAK;AACL,IAAI,OAAO,MAAM,CAAC;AAClB;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.16-unstable.5e30055.0+5e30055",
+	"version": "4.0.16",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/esm/index.mjs",
@@ -71,7 +71,7 @@
 	},
 	"homepage": "https://aws-amplify.github.io/",
 	"devDependencies": {
-		"@aws-amplify/data-schema": "^0.12.11",
+		"@aws-amplify/data-schema": "^0.13.2",
 		"@rollup/plugin-typescript": "11.1.5",
 		"rollup": "^4.9.6",
 		"typescript": "5.0.2"
@@ -84,9 +84,9 @@
 		"server"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.16-unstable.5e30055.0+5e30055",
-		"@aws-amplify/core": "6.0.16-unstable.5e30055.0+5e30055",
-		"@aws-amplify/data-schema-types": "^0.6.10",
+		"@aws-amplify/api-rest": "4.0.16",
+		"@aws-amplify/core": "6.0.16",
+		"@aws-amplify/data-schema-types": "^0.7.1",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
@@ -101,5 +101,5 @@
 			"limit": "91.7 kB"
 		}
 	],
-	"gitHead": "5e30055971598cb4972a5c913af906e86c16cd3f"
+	"gitHead": "0e919f6e759cb94d03e119162b530b32d48f1357"
 }

package/src/internals/APIClient.ts

@@ -24,6 +24,7 @@ import {
 } from '../types';
 import { AmplifyServer } from '@aws-amplify/core/internals/adapter-core';
 import { CustomHeaders } from '@aws-amplify/data-schema-types';
+import type { IndexMeta } from './operations/indexQuery';
 
 type LazyLoadOptions = {
 	authMode?: GraphQLAuthMode;
@@ -51,7 +52,7 @@ export const flattenItems = (obj: Record<string, any>): Record<string, any> => {
 		if (typeof value === 'object' && !Array.isArray(value) && value !== null) {
 			if (value.items !== undefined) {
 				res[prop] = value.items.map((item: Record<string, any>) =>
-					flattenItems(item)
+					flattenItems(item),
 				);
 				return;
 			}
@@ -73,7 +74,7 @@ export function initializeModel(
 	modelIntrospection: ModelIntrospectionSchema,
 	authMode: GraphQLAuthMode | undefined,
 	authToken: string | undefined,
-	context = false
+	context = false,
 ): any[] {
 	const introModel = modelIntrospection.models[modelName];
 	const introModelFields = introModel.fields;
@@ -122,13 +123,13 @@ export function initializeModel(
 								return (acc[curVal] = record[curVal]);
 							}
 						},
-						{}
+						{},
 					);
 
 					if (context) {
 						initializedRelationalFields[fieldName] = (
 							contextSpec: AmplifyServer.ContextSpec,
-							options?: LazyLoadOptions
+							options?: LazyLoadOptions,
 						) => {
 							if (record[targetNames[0]]) {
 								return (
@@ -142,14 +143,14 @@ export function initializeModel(
 									{
 										authMode: options?.authMode || authMode,
 										authToken: options?.authToken || authToken,
-									}
+									},
 								);
 							}
 							return undefined;
 						};
 					} else {
 						initializedRelationalFields[fieldName] = (
-							options?: LazyLoadOptions
+							options?: LazyLoadOptions,
 						) => {
 							if (record[targetNames[0]]) {
 								return (client as V6Client<Record<string, any>>).models[
@@ -162,7 +163,7 @@ export function initializeModel(
 									{
 										authMode: options?.authMode || authMode,
 										authToken: options?.authToken || authToken,
-									}
+									},
 								);
 							}
 							return undefined;
@@ -194,13 +195,13 @@ export function initializeModel(
 								}
 
 								return { [field]: { eq: record[parentSK[idx - 1]] } };
-							}
+							},
 						);
 
 						if (context) {
 							initializedRelationalFields[fieldName] = (
 								contextSpec: AmplifyServer.ContextSpec,
-								options?: LazyLoadOptions
+								options?: LazyLoadOptions,
 							) => {
 								if (record[parentPk]) {
 									return (
@@ -217,7 +218,7 @@ export function initializeModel(
 							};
 						} else {
 							initializedRelationalFields[fieldName] = (
-								options?: LazyLoadOptions
+								options?: LazyLoadOptions,
 							) => {
 								if (record[parentPk]) {
 									return (client as V6Client<Record<string, any>>).models[
@@ -244,13 +245,13 @@ export function initializeModel(
 							}
 
 							return { [field]: { eq: record[parentSK[idx - 1]] } };
-						}
+						},
 					);
 
 					if (context) {
 						initializedRelationalFields[fieldName] = (
 							contextSpec: AmplifyServer.ContextSpec,
-							options?: LazyLoadOptions
+							options?: LazyLoadOptions,
 						) => {
 							if (record[parentPk]) {
 								return (
@@ -267,7 +268,7 @@ export function initializeModel(
 						};
 					} else {
 						initializedRelationalFields[fieldName] = (
-							options?: LazyLoadOptions
+							options?: LazyLoadOptions,
 						) => {
 							if (record[parentPk]) {
 								return (client as V6Client<Record<string, any>>).models[
@@ -295,16 +296,17 @@ export function initializeModel(
 }
 
 export const graphQLOperationsInfo = {
-	CREATE: { operationPrefix: 'create' as const, usePlural: false },
-	READ: { operationPrefix: 'get' as const, usePlural: false },
-	UPDATE: { operationPrefix: 'update' as const, usePlural: false },
-	DELETE: { operationPrefix: 'delete' as const, usePlural: false },
-	LIST: { operationPrefix: 'list' as const, usePlural: true },
-	ONCREATE: { operationPrefix: 'onCreate' as const, usePlural: false },
-	ONUPDATE: { operationPrefix: 'onUpdate' as const, usePlural: false },
-	ONDELETE: { operationPrefix: 'onDelete' as const, usePlural: false },
-	OBSERVE_QUERY: { operationPrefix: 'observeQuery' as const, usePlural: false },
-};
+	CREATE: { operationPrefix: 'create', usePlural: false },
+	READ: { operationPrefix: 'get', usePlural: false },
+	UPDATE: { operationPrefix: 'update', usePlural: false },
+	DELETE: { operationPrefix: 'delete', usePlural: false },
+	LIST: { operationPrefix: 'list', usePlural: true },
+	INDEX_QUERY: { operationPrefix: '', usePlural: false },
+	ONCREATE: { operationPrefix: 'onCreate', usePlural: false },
+	ONUPDATE: { operationPrefix: 'onUpdate', usePlural: false },
+	ONDELETE: { operationPrefix: 'onDelete', usePlural: false },
+	OBSERVE_QUERY: { operationPrefix: 'observeQuery', usePlural: false },
+} as const;
 export type ModelOperation = keyof typeof graphQLOperationsInfo;
 
 type OperationPrefix =
@@ -322,7 +324,7 @@ function defaultSelectionSetForModel(modelDefinition: SchemaModel): string[] {
 			({ type, name }) =>
 				(typeof type === 'string' ||
 					(typeof type === 'object' && typeof type?.enum === 'string')) &&
-				name
+				name,
 		)
 		.filter(Boolean);
 
@@ -357,11 +359,11 @@ const FIELD_IR = '';
 export function customSelectionSetToIR(
 	modelDefinitions: SchemaModels,
 	modelName: string,
-	selectionSet: string[]
+	selectionSet: string[],
 ): Record<string, string | object> {
 	const dotNotationToObject = (
 		path: string,
-		modelName: string
+		modelName: string,
 	): Record<string, any> => {
 		const [fieldName, ...rest] = path.split('.');
 
@@ -373,7 +375,8 @@ export function customSelectionSetToIR(
 			const nested = rest[0];
 			const modelDefinition = modelDefinitions[modelName];
 			const modelFields = modelDefinition.fields;
-			const relatedModel = (modelFields[fieldName]?.type as ModelFieldType)?.model;
+			const relatedModel = (modelFields[fieldName]?.type as ModelFieldType)
+				?.model;
 
 			if (!relatedModel) {
 				// TODO: may need to change this to support custom types
@@ -413,15 +416,15 @@ export function customSelectionSetToIR(
 		(resultObj, path) =>
 			deepMergeSelectionSetObjects(
 				dotNotationToObject(path, modelName),
-				resultObj
+				resultObj,
 			),
-		{} as Record<string, any>
+		{} as Record<string, any>,
 	);
 }
 
 const defaultSelectionSetIR = (relatedModelDefinition: SchemaModel) => {
 	const defaultSelectionSet = defaultSelectionSetForModel(
-		relatedModelDefinition
+		relatedModelDefinition,
 	);
 
 	const reduced = defaultSelectionSet.reduce(
@@ -429,7 +432,7 @@ const defaultSelectionSetIR = (relatedModelDefinition: SchemaModel) => {
 			acc[curVal] = FIELD_IR;
 			return acc;
 		},
-		{}
+		{},
 	);
 
 	return reduced;
@@ -451,7 +454,7 @@ const defaultSelectionSetIR = (relatedModelDefinition: SchemaModel) => {
  * `'id comments { items { post { id } } }'`
  */
 export function selectionSetIRToString(
-	obj: Record<string, string | any>
+	obj: Record<string, string | any>,
 ): string {
 	const res: string[] = [];
 
@@ -467,7 +470,7 @@ export function selectionSetIRToString(
 					'{',
 					selectionSetIRToString(value.items),
 					'}',
-					'}'
+					'}',
 				);
 			} else {
 				res.push(fieldName, '{', selectionSetIRToString(value), '}');
@@ -488,7 +491,7 @@ export function selectionSetIRToString(
  */
 function deepMergeSelectionSetObjects<T extends Record<string, any>>(
 	source: T,
-	target: T
+	target: T,
 ) {
 	const isObject = (obj: any) => obj && typeof obj === 'object';
 
@@ -509,7 +512,7 @@ function deepMergeSelectionSetObjects<T extends Record<string, any>>(
 export function generateSelectionSet(
 	modelDefinitions: SchemaModels,
 	modelName: string,
-	selectionSet?: string[]
+	selectionSet?: string[],
 ) {
 	const modelDefinition = modelDefinitions[modelName];
 
@@ -520,7 +523,7 @@ export function generateSelectionSet(
 	const selSetIr = customSelectionSetToIR(
 		modelDefinitions,
 		modelName,
-		selectionSet
+		selectionSet,
 	);
 	const selSetString = selectionSetIRToString(selSetIr);
 
@@ -531,7 +534,8 @@ export function generateGraphQLDocument(
 	modelDefinitions: SchemaModels,
 	modelName: string,
 	modelOperation: ModelOperation,
-	listArgs?: ListArgs
+	listArgs?: ListArgs | QueryArgs,
+	indexMeta?: IndexMeta,
 ): string {
 	const modelDefinition = modelDefinitions[modelName];
 
@@ -549,7 +553,33 @@ export function generateGraphQLDocument(
 	const { operationPrefix, usePlural } = graphQLOperationsInfo[modelOperation];
 
 	const { selectionSet } = listArgs || {};
-	const graphQLFieldName = `${operationPrefix}${usePlural ? pluralName : name}`;
+
+	let graphQLFieldName;
+	let indexQueryArgs: Record<string, string>;
+
+	if (operationPrefix) {
+		graphQLFieldName = `${operationPrefix}${usePlural ? pluralName : name}`;
+	} else if (indexMeta) {
+		const { queryField, pk, sk = [] } = indexMeta;
+		graphQLFieldName = queryField;
+
+		const skQueryArgs = sk.reduce((acc: Record<string, any>, fieldName) => {
+			const fieldType = fields[fieldName].type;
+			acc[fieldName] = `Model${fieldType}KeyConditionInput`;
+			return acc;
+		}, {});
+
+		indexQueryArgs = {
+			[pk]: `${fields[pk].type}!`,
+			...skQueryArgs,
+		};
+	} else {
+		throw new Error(
+			'Error generating GraphQL Document - invalid operation name',
+		);
+	}
+
+	console.log('indexQueryArgs', indexQueryArgs!);
 
 	let graphQLOperationType: 'mutation' | 'query' | 'subscription' | undefined;
 	let graphQLSelectionSet: string | undefined;
@@ -558,7 +588,7 @@ export function generateGraphQLDocument(
 	const selectionSetFields = generateSelectionSet(
 		modelDefinitions,
 		modelName,
-		selectionSet
+		selectionSet as ListArgs['selectionSet'],
 	);
 
 	switch (modelOperation) {
@@ -582,7 +612,7 @@ export function generateGraphQLDocument(
 
 								return acc;
 							},
-							{}
+							{},
 					  )
 					: {
 							[primaryKeyFieldName]: `${fields[primaryKeyFieldName].type}!`,
@@ -598,6 +628,17 @@ export function generateGraphQLDocument(
 			graphQLOperationType ?? (graphQLOperationType = 'query');
 			graphQLSelectionSet ??
 				(graphQLSelectionSet = `items { ${selectionSetFields} } nextToken __typename`);
+		case 'INDEX_QUERY':
+			graphQLArguments ??
+				(graphQLArguments = {
+					...indexQueryArgs!,
+					filter: `Model${name}FilterInput`,
+					limit: 'Int',
+					nextToken: 'String',
+				});
+			graphQLOperationType ?? (graphQLOperationType = 'query');
+			graphQLSelectionSet ??
+				(graphQLSelectionSet = `items { ${selectionSetFields} } nextToken __typename`);
 		case 'ONCREATE':
 		case 'ONUPDATE':
 		case 'ONDELETE':
@@ -611,20 +652,20 @@ export function generateGraphQLDocument(
 		case 'OBSERVE_QUERY':
 		default:
 			throw new Error(
-				'Internal error: Attempted to generate graphql document for observeQuery. Please report this error.'
+				'Internal error: Attempted to generate graphql document for observeQuery. Please report this error.',
 			);
 	}
 
 	const graphQLDocument = `${graphQLOperationType}${
 		graphQLArguments
 			? `(${Object.entries(graphQLArguments).map(
-					([fieldName, type]) => `\$${fieldName}: ${type}`
+					([fieldName, type]) => `\$${fieldName}: ${type}`,
 			  )})`
 			: ''
 	} { ${graphQLFieldName}${
 		graphQLArguments
 			? `(${Object.keys(graphQLArguments).map(
-					fieldName => `${fieldName}: \$${fieldName}`
+					fieldName => `${fieldName}: \$${fieldName}`,
 			  )})`
 			: ''
 	} { ${graphQLSelectionSet} } }`;
@@ -636,7 +677,8 @@ export function buildGraphQLVariables(
 	modelDefinition: SchemaModel,
 	operation: ModelOperation,
 	arg: QueryArgs | undefined,
-	modelIntrospection: ModelIntrospectionSchema
+	modelIntrospection: ModelIntrospectionSchema,
+	indexMeta?: IndexMeta,
 ): object {
 	const {
 		fields,
@@ -664,12 +706,16 @@ export function buildGraphQLVariables(
 				input: arg
 					? Object.fromEntries(
 							Object.entries(
-								normalizeMutationInput(arg, modelDefinition, modelIntrospection)
+								normalizeMutationInput(
+									arg,
+									modelDefinition,
+									modelIntrospection,
+								),
 							).filter(([fieldName]) => {
 								const { isReadOnly } = fields[fieldName];
 
 								return !isReadOnly;
-							})
+							}),
 					  )
 					: {},
 			};
@@ -685,7 +731,7 @@ export function buildGraphQLVariables(
 
 								return acc;
 							},
-							{}
+							{},
 					  )
 					: { [primaryKeyFieldName]: arg[primaryKeyFieldName] };
 			}
@@ -695,6 +741,25 @@ export function buildGraphQLVariables(
 			}
 			break;
 		case 'LIST':
+			if (arg?.filter) {
+				variables.filter = arg.filter;
+			}
+			if (arg?.nextToken) {
+				variables.nextToken = arg.nextToken;
+			}
+			if (arg?.limit) {
+				variables.limit = arg.limit;
+			}
+			break;
+		case 'INDEX_QUERY':
+			const { pk, sk = [] } = indexMeta!;
+
+			variables[pk] = arg![pk];
+
+			for (const skField of sk) {
+				variables[skField] = arg![skField];
+			}
+
 			if (arg?.filter) {
 				variables.filter = arg.filter;
 			}
@@ -714,7 +779,7 @@ export function buildGraphQLVariables(
 			break;
 		case 'OBSERVE_QUERY':
 			throw new Error(
-				'Internal error: Attempted to build variables for observeQuery. Please report this error.'
+				'Internal error: Attempted to build variables for observeQuery. Please report this error.',
 			);
 			break;
 		default:
@@ -742,7 +807,7 @@ export function buildGraphQLVariables(
 export function normalizeMutationInput(
 	mutationInput: QueryArgs,
 	model: SchemaModel,
-	modelIntrospection: ModelIntrospectionSchema
+	modelIntrospection: ModelIntrospectionSchema,
 ): QueryArgs {
 	const { fields } = model;
 
@@ -803,7 +868,7 @@ export function normalizeMutationInput(
  */
 export function authModeParams(
 	client: ClientWithModels,
-	options: AuthModeParams = {}
+	options: AuthModeParams = {},
 ): AuthModeParams {
 	return {
 		authMode: options.authMode || client[__authMode],
@@ -819,7 +884,7 @@ export function authModeParams(
  */
 export function getCustomHeaders(
 	client: V6Client | ClientWithModels,
-	requestHeaders?: CustomHeaders
+	requestHeaders?: CustomHeaders,
 ): CustomHeaders {
 	let headers: CustomHeaders = client[__headers] || {};
 

package/src/internals/clientUtils.ts

@@ -0,0 +1,37 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import type {
+	SchemaModel,
+	ModelAttribute,
+	SecondaryIndexAttribute,
+} from '@aws-amplify/core/internals/utils';
+
+const attributeIsSecondaryIndex = (
+	attr: ModelAttribute,
+): attr is SecondaryIndexAttribute => {
+	return (
+		attr.type === 'key' &&
+		// presence of `name` property distinguishes GSI from primary index
+		attr.properties?.name &&
+		attr.properties?.queryField &&
+		attr.properties?.fields.length > 0
+	);
+};
+
+export const getSecondaryIndexesFromSchemaModel = (model: SchemaModel) => {
+	const idxs = model.attributes
+		?.filter(attributeIsSecondaryIndex)
+		.map((attr: SecondaryIndexAttribute) => {
+			const queryField: string = attr.properties.queryField;
+			const [pk, ...sk] = attr.properties.fields;
+
+			return {
+				queryField,
+				pk,
+				sk,
+			};
+		});
+
+	return idxs || [];
+};

package/src/internals/generateModelsProperty.ts

@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 import { ModelTypes } from '@aws-amplify/data-schema-types';
 import { graphQLOperationsInfo, ModelOperation } from './APIClient';
-import { ClientGenerationParams } from './types';
 import { V6Client, __authMode, __authToken } from '../types';
-
 import { listFactory } from './operations/list';
+import { indexQueryFactory } from './operations/indexQuery';
 import { getFactory } from './operations/get';
 import { subscriptionFactory } from './operations/subscription';
 import { observeQueryFactory } from './operations/observeQuery';
 import { ModelIntrospectionSchema } from '@aws-amplify/core/internals/utils';
 import { GraphQLProviderConfig } from '@aws-amplify/core';
+import { getSecondaryIndexesFromSchemaModel } from './clientUtils';
 
 export function generateModelsProperty<T extends Record<any, any> = never>(
 	client: V6Client<Record<string, any>>,
@@ -40,14 +40,14 @@ export function generateModelsProperty<T extends Record<any, any> = never>(
 					models[name][operationPrefix] = listFactory(
 						client,
 						modelIntrospection,
-						model
+						model,
 					);
 				} else if (SUBSCRIPTION_OPS.includes(operation)) {
 					models[name][operationPrefix] = subscriptionFactory(
 						client,
 						modelIntrospection,
 						model,
-						operation
+						operation,
 					);
 				} else if (operation === 'OBSERVE_QUERY') {
 					models[name][operationPrefix] = observeQueryFactory(models, model);
@@ -56,11 +56,22 @@ export function generateModelsProperty<T extends Record<any, any> = never>(
 						client,
 						modelIntrospection,
 						model,
-						operation
+						operation,
 					);
 				}
-			}
+			},
 		);
+
+		const secondaryIdxs = getSecondaryIndexesFromSchemaModel(model);
+
+		for (const idx of secondaryIdxs) {
+			models[name][idx.queryField] = indexQueryFactory(
+				client,
+				modelIntrospection,
+				model,
+				idx,
+			);
+		}
 	}
 
 	return models;