updated for latest data-schema changes; fixed an import

aws-amplify · Apr 18, 2024 · 2566d25 · 2566d25
2 parents 83c1ab2 + 1625424
commit 2566d25
Show file tree

Hide file tree

Showing 6 changed files with 3,534 additions and 3,399 deletions.
diff --git a/packages/api-graphql/__tests__/internals/__snapshots__/generateClient.test.ts.snap b/packages/api-graphql/__tests__/internals/__snapshots__/generateClient.test.ts.snap
@@ -4092,12 +4092,12 @@ exports[`generateClient basic model operations can list() with sortDirection (AS
       "abortController": AbortController {},
       "options": {
         "body": {
-          "query": "query ($filter: ModelThingWithCustomPkFilterInput, $sortDirection: ModelSortDirection, $cpk_cluster_key: String, $cpk_sort_key: String, $limit: Int, $nextToken: String) {
+          "query": "query ($cpk_cluster_key: String, $sortDirection: ModelSortDirection, $cpk_sort_key: ModelStringKeyConditionInput, $filter: ModelThingWithCustomPkFilterInput, $limit: Int, $nextToken: String) {
   listThingWithCustomPks(
-    filter: $filter
-    sortDirection: $sortDirection
     cpk_cluster_key: $cpk_cluster_key
+    sortDirection: $sortDirection
     cpk_sort_key: $cpk_sort_key
+    filter: $filter
     limit: $limit
     nextToken: $nextToken
   ) {
@@ -4139,12 +4139,12 @@ exports[`generateClient basic model operations can list() with sortDirection (DE
       "abortController": AbortController {},
       "options": {
         "body": {
-          "query": "query ($filter: ModelThingWithCustomPkFilterInput, $sortDirection: ModelSortDirection, $cpk_cluster_key: String, $cpk_sort_key: String, $limit: Int, $nextToken: String) {
+          "query": "query ($cpk_cluster_key: String, $sortDirection: ModelSortDirection, $cpk_sort_key: ModelStringKeyConditionInput, $filter: ModelThingWithCustomPkFilterInput, $limit: Int, $nextToken: String) {
   listThingWithCustomPks(
-    filter: $filter
-    sortDirection: $sortDirection
     cpk_cluster_key: $cpk_cluster_key
+    sortDirection: $sortDirection
     cpk_sort_key: $cpk_sort_key
+    filter: $filter
     limit: $limit
     nextToken: $nextToken
   ) {

diff --git a/...l/__tests__/internals/server/__snapshots__/generateClientWithAmplifyInstance.test.ts.snap b/...l/__tests__/internals/server/__snapshots__/generateClientWithAmplifyInstance.test.ts.snap
@@ -269,9 +269,11 @@ exports[`server generateClient with cookies with request can custom query 1`] =
     {
       "authMode": undefined,
       "authToken": undefined,
-      "query": "query($argumentContent: String!) {
-    echo(argumentContent: $argumentContent) {resultContent}
-  }",
+      "query": "
+    query($argumentContent: String!) {
+      echo(argumentContent: $argumentContent) {resultContent}
+    }
+  ",
       "variables": {
         "argumentContent": "echo argumentContent value",
       },

diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json
@@ -86,7 +86,8 @@
 	"dependencies": {
 		"@aws-amplify/api-rest": "4.0.27",
 		"@aws-amplify/core": "6.0.27",
-		"@aws-amplify/data-schema": "^0.14.8",
+		"@aws-amplify/data-schema": "^0.16.0",
+		"@aws-amplify/data-schema-types": "^0.9.0",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",

diff --git a/packages/api/src/internals/InternalAPI.ts b/packages/api/src/internals/InternalAPI.ts
@@ -17,7 +17,7 @@ import {
 	CustomUserAgentDetails,
 } from '@aws-amplify/core/internals/utils';
 import { Observable } from 'rxjs';
-import { CustomHeaders } from '@aws-amplify/data-schema-types';
+import { CustomHeaders } from '@aws-amplify/data-schema/runtime';
 
 /**
  * NOTE!

diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json
@@ -335,7 +335,7 @@
 			"name": "[API] generateClient (AppSync)",
 			"path": "./dist/esm/api/index.mjs",
 			"import": "{ generateClient }",
-			"limit": "38.5 kB"
+			"limit": "39.0 kB"
 		},
 		{
 			"name": "[API] REST API handlers",