chore: bump to data-schema version ^0.18.0 (#13297)

* chore: bump to data-schema version ^0.18.0 * update yarn lock and tests associated with changed data-schema behavior * fix modelintro and fixtures
aws-amplify · Apr 26, 2024 · 64acd49 · 64acd49
1 parent b334158
commit 64acd49
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 20 deletions.
diff --git a/packages/api-graphql/__tests__/fixtures/modeled/amplifyconfiguration.ts b/packages/api-graphql/__tests__/fixtures/modeled/amplifyconfiguration.ts
@@ -1041,15 +1041,15 @@ const amplifyConfig = {
 						type: 'key',
 						properties: {
 							name: 'secondaryIndexModelsByTitle',
-							queryField: 'listByTitle',
+							queryField: 'listSecondaryIndexModelByTitle',
 							fields: ['title'],
 						},
 					},
 					{
 						type: 'key',
 						properties: {
 							name: 'secondaryIndexModelsByDescriptionAndViewCount',
-							queryField: 'listByDescriptionAndViewCount',
+							queryField: 'listSecondaryIndexModelByDescriptionAndViewCount',
 							fields: ['description', 'viewCount'],
 						},
 					},

diff --git a/packages/api-graphql/__tests__/internals/__snapshots__/generateClient.test.ts.snap b/packages/api-graphql/__tests__/internals/__snapshots__/generateClient.test.ts.snap
@@ -5292,7 +5292,7 @@ exports[`generateClient index queries PK and SK index query 1`] = `
       "options": {
         "body": {
           "query": "query ($description: String!, $viewCount: ModelIntKeyConditionInput, $filter: ModelSecondaryIndexModelFilterInput, $sortDirection: ModelSortDirection, $limit: Int, $nextToken: String) {
-  listByDescriptionAndViewCount(
+  listSecondaryIndexModelByDescriptionAndViewCount(
     description: $description
     viewCount: $viewCount
     filter: $filter
@@ -5344,7 +5344,7 @@ exports[`generateClient index queries PK and SK index query, with sort direction
       "options": {
         "body": {
           "query": "query ($description: String!, $viewCount: ModelIntKeyConditionInput, $filter: ModelSecondaryIndexModelFilterInput, $sortDirection: ModelSortDirection, $limit: Int, $nextToken: String) {
-  listByDescriptionAndViewCount(
+  listSecondaryIndexModelByDescriptionAndViewCount(
     description: $description
     viewCount: $viewCount
     filter: $filter
@@ -5397,7 +5397,7 @@ exports[`generateClient index queries PK and SK index query, with sort direction
       "options": {
         "body": {
           "query": "query ($description: String!, $viewCount: ModelIntKeyConditionInput, $filter: ModelSecondaryIndexModelFilterInput, $sortDirection: ModelSortDirection, $limit: Int, $nextToken: String) {
-  listByDescriptionAndViewCount(
+  listSecondaryIndexModelByDescriptionAndViewCount(
     description: $description
     viewCount: $viewCount
     filter: $filter
@@ -5450,7 +5450,7 @@ exports[`generateClient index queries PK-only index query 1`] = `
       "options": {
         "body": {
           "query": "query ($title: String!, $filter: ModelSecondaryIndexModelFilterInput, $sortDirection: ModelSortDirection, $limit: Int, $nextToken: String) {
-  listByTitle(
+  listSecondaryIndexModelByTitle(
     title: $title
     filter: $filter
     sortDirection: $sortDirection

diff --git a/packages/api-graphql/__tests__/internals/generateClient.test.ts b/packages/api-graphql/__tests__/internals/generateClient.test.ts
@@ -5337,9 +5337,10 @@ describe('generateClient', () => {
 
 			const client = generateClient<Schema>({ amplify: Amplify });
 
-			const { data } = await client.models.SecondaryIndexModel.listByTitle({
-				title: 'Hello World',
-			});
+			const { data } =
+				await client.models.SecondaryIndexModel.listSecondaryIndexModelByTitle({
+					title: 'Hello World',
+				});
 
 			expect(normalizePostGraphqlCalls(spy)).toMatchSnapshot();
 
@@ -5374,10 +5375,12 @@ describe('generateClient', () => {
 			const client = generateClient<Schema>({ amplify: Amplify });
 
 			const { data } =
-				await client.models.SecondaryIndexModel.listByDescriptionAndViewCount({
-					description: 'something something',
-					viewCount: { gt: 4 },
-				});
+				await client.models.SecondaryIndexModel.listSecondaryIndexModelByDescriptionAndViewCount(
+					{
+						description: 'something something',
+						viewCount: { gt: 4 },
+					},
+				);
 
 			expect(normalizePostGraphqlCalls(spy)).toMatchSnapshot();
 
@@ -5427,7 +5430,7 @@ describe('generateClient', () => {
 			const client = generateClient<Schema>({ amplify: Amplify });
 
 			const { data } =
-				await client.models.SecondaryIndexModel.listByDescriptionAndViewCount(
+				await client.models.SecondaryIndexModel.listSecondaryIndexModelByDescriptionAndViewCount(
 					{
 						description: 'match',
 						viewCount: { lt: 4 },
@@ -5476,7 +5479,7 @@ describe('generateClient', () => {
 			const client = generateClient<Schema>({ amplify: Amplify });
 
 			const { data } =
-				await client.models.SecondaryIndexModel.listByDescriptionAndViewCount(
+				await client.models.SecondaryIndexModel.listSecondaryIndexModelByDescriptionAndViewCount(
 					{
 						description: 'match',
 						viewCount: { lt: 4 },

diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json
@@ -86,7 +86,7 @@
 	"dependencies": {
 		"@aws-amplify/api-rest": "4.0.28",
 		"@aws-amplify/core": "6.0.28",
-		"@aws-amplify/data-schema": "^0.17.0",
+		"@aws-amplify/data-schema": "^0.18.0",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",

diff --git a/yarn.lock b/yarn.lock