@aws-amplify/api-graphql 4.0.1-api-v6-models.3eb7748.0 → 4.0.1-api-v6-models.9493d4d.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-api-v6-models.3eb7748.0+3eb7748",
+	"version": "4.0.1-api-v6-models.9493d4d.0+9493d4d",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -52,9 +52,9 @@
 	],
 	"dependencies": {
 		"@aws-amplify/amplify-api-next-types-alpha": "^0.2.0",
-		"@aws-amplify/api-rest": "4.0.1-api-v6-models.3eb7748.0+3eb7748",
-		"@aws-amplify/auth": "6.0.1-api-v6-models.3eb7748.0+3eb7748",
-		"@aws-amplify/core": "6.0.1-api-v6-models.3eb7748.0+3eb7748",
+		"@aws-amplify/api-rest": "4.0.1-api-v6-models.9493d4d.0+9493d4d",
+		"@aws-amplify/auth": "6.0.1-api-v6-models.9493d4d.0+9493d4d",
+		"@aws-amplify/core": "6.0.1-api-v6-models.9493d4d.0+9493d4d",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
@@ -126,5 +126,5 @@
 			"<rootDir>/__tests__"
 		]
 	},
-	"gitHead": "3eb7748aee2fcdea705c93904d1f30ff596649fa"
+	"gitHead": "9493d4d9a9fb9bfa104c0cf56e5a1d3154daa088"
 }

package/src/internals/APIClient.ts

@@ -164,7 +164,7 @@ type OperationPrefix =
 	(typeof graphQLOperationsInfo)[ModelOperation]['operationPrefix'];
 
 const graphQLDocumentsCache = new Map<string, Map<ModelOperation, string>>();
-const SELECTION_SET_ALL_NESTED = '*';
+const SELECTION_SET_WILDCARD = '*';
 
 function defaultSelectionSetForModel(modelDefinition: any): string[] {
 	// fields that are explicitly part of the graphql schema; not
@@ -208,78 +208,70 @@ export function customSelectionSetToIR(
 	selectionSet: string[]
 ): Record<string, string | object> {
 	const modelDefinition = modelIntrospection[modelName];
-	const { fields } = modelDefinition;
-
-	const intermediateSelectionSet: Record<string, string | object> = {};
+	const { fields: modelFields } = modelDefinition;
 
-	for (const f of selectionSet) {
-		const nested = f.includes('.');
+	return selectionSet.reduce((resultObj, path) => {
+		const [fieldName, nested, ...rest] = path.split('.');
 
 		if (nested) {
-			const [modelFieldName, selectedField] = f.split('.');
-
-			const relatedModel = fields[modelFieldName]?.type?.model;
+			const relatedModel = modelFields[fieldName]?.type?.model;
 
 			if (!relatedModel) {
 				// TODO: may need to change this to support custom types
-				throw Error(`${modelFieldName} is not a model field`);
+				throw Error(`${fieldName} is not a model field`);
 			}
 
-			if (selectedField === SELECTION_SET_ALL_NESTED) {
-				const relatedModelDefinition = modelIntrospection[relatedModel];
-
-				const defaultSelectionSet = defaultSelectionSetForModel(
-					relatedModelDefinition
-				);
+			const relatedModelDefinition = modelIntrospection[relatedModel];
 
-				const reduced = defaultSelectionSet.reduce((acc, curVal) => {
-					acc[curVal] = FIELD_IR;
-					return acc;
-				}, {});
+			const selectionSet =
+				nested === SELECTION_SET_WILDCARD
+					? defaultSelectionSetIR(relatedModelDefinition)
+					: // if we have a path like 'field.anotherField' recursively build up selection set IR
+					  customSelectionSetToIR(modelIntrospection, relatedModel, [
+							[nested, ...rest].join('.'),
+					  ]);
 
-				if (fields[modelFieldName]?.isArray) {
-					intermediateSelectionSet[modelFieldName] = {
-						items: reduced,
-					};
-				} else {
-					intermediateSelectionSet[modelFieldName] = reduced;
-				}
-			} else {
-				const getNestedSelSet = customSelectionSetToIR(
-					modelIntrospection,
-					relatedModel,
-					[selectedField]
-				);
+			if (modelFields[fieldName]?.isArray) {
+				const existing = resultObj[fieldName] || {
+					items: {},
+				};
+				const merged = { ...existing.items, ...selectionSet };
 
-				if (fields[modelFieldName]?.isArray) {
-					const existing = (intermediateSelectionSet as any)[
-						modelFieldName
-					] || { items: {} };
-					const merged = { ...existing.items, ...getNestedSelSet };
+				resultObj[fieldName] = { items: merged };
+				return resultObj;
+			}
 
-					intermediateSelectionSet[modelFieldName] = { items: merged };
-				} else {
-					const existingItems =
-						(intermediateSelectionSet as any)[modelFieldName] || {};
-					const merged = { ...existingItems, ...getNestedSelSet };
+			const existingItems = resultObj[fieldName] || {};
+			const merged = { ...existingItems, ...selectionSet };
 
-					intermediateSelectionSet[modelFieldName] = merged;
-				}
-			}
-		} else {
-			const exists = Boolean(fields[f]);
+			resultObj[fieldName] = merged;
+			return resultObj;
+		}
 
-			if (!exists) {
-				throw Error(`${f} is not a field of model ${modelName}`);
-			}
+		const exists = Boolean(modelFields[fieldName]);
 
-			intermediateSelectionSet[f] = FIELD_IR;
+		if (!exists) {
+			throw Error(`${fieldName} is not a field of model ${modelName}`);
 		}
-	}
 
-	return intermediateSelectionSet;
+		resultObj[fieldName] = FIELD_IR;
+		return resultObj;
+	}, {});
 }
 
+const defaultSelectionSetIR = relatedModelDefinition => {
+	const defaultSelectionSet = defaultSelectionSetForModel(
+		relatedModelDefinition
+	);
+
+	const reduced = defaultSelectionSet.reduce((acc, curVal) => {
+		acc[curVal] = FIELD_IR;
+		return acc;
+	}, {});
+
+	return reduced;
+};
+
 /**
  * Stringifies selection set IR
  * * @example