fix: update parseAWSExports

packages/core/__tests__/parseAWSExports.test.ts

@@ -27,6 +27,10 @@ describe('parseAWSExports', () => {
 			items: ['geoJSSearchExample'],
 			default: 'geoJSSearchExample',
 		},
+		geofenceCollections: {
+			items: ['geofenceCollection-dev'],
+			default: 'geofenceCollection-dev',
+		},
 		region,
 	};
 	const amazonLocationServiceV4 = {
@@ -49,6 +53,10 @@ describe('parseAWSExports', () => {
 			items: ['geoJSSearchExample'],
 			default: 'geoJSSearchExample',
 		},
+		geofenceCollections: {
+			items: ['geofenceCollection-dev'],
+			default: 'geofenceCollection-dev',
+		},
 		region,
 	};
 	const restEndpoint1 = {
@@ -189,6 +197,29 @@ describe('parseAWSExports', () => {
 		).toStrictEqual(expected);
 	});
 
+	it('should parse valid aws-exports.js for Geo', () => {
+		const expected = {
+			Geo: {
+				LocationService: amazonLocationServiceV4,
+			},
+		};
+		// aws-exports.js has geo "search_indices" in snake_case
+		expect(
+			parseAWSExports({
+				aws_project_region: 'us-west-2',
+				geo: { amazon_location_service: amazonLocationService },
+			}),
+		).toStrictEqual(expected);
+
+		// aws-exports.js has geo "searchIndices" in camelCase
+		expect(
+			parseAWSExports({
+				aws_project_region: 'us-west-2',
+				geo: { amazon_location_service: amazonLocationServiceV4 },
+			}),
+		).toStrictEqual(expected);
+	});
+
 	it('should fallback to IAM auth mode if Appsync auth type is invalid', () => {
 		expect(
 			parseAWSExports({

packages/core/src/parseAWSExports.ts

@@ -252,9 +252,12 @@ export const parseAWSExports = (
 		(amplifyConfig as any).Geo = amazon_location_service
 			? {
 					LocationService: {
+						...amazon_location_service,
 						maps: amazon_location_service.maps,
 						geofenceCollections: amazon_location_service.geofenceCollections,
-						searchIndices: amazon_location_service.search_indices,
+						searchIndices:
+							amazon_location_service.search_indices ??
+							amazon_location_service.searchIndices,
 						region: amazon_location_service.region,
 					},
 				}