diff --git a/examples/tsc-compliance/package.json b/examples/tsc-compliance/package.json
index 72610e54c..b92e10b9d 100644
--- a/examples/tsc-compliance/package.json
+++ b/examples/tsc-compliance/package.json
@@ -10,7 +10,8 @@
   },
   "dependencies": {
     "@aws-amplify/data-schema": "*",
-    "aws-amplify": "*"
+    "aws-amplify": "*",
+    "aws-cdk-lib": "^2.127.0"
   },
   "keywords": [],
   "author": "",
diff --git a/package-lock.json b/package-lock.json
index 1f9ffcb3d..b44c036a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "@types/prettier": "^3.0.0",
         "@typescript-eslint/eslint-plugin": "^6.7.4",
         "@typescript-eslint/parser": "^6.7.4",
-        "aws-amplify": "^6.0.29",
+        "aws-amplify": "unstable",
         "eslint": "^8.50.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-import": "^2.28.1",
@@ -50,7 +50,8 @@
       "license": "ISC",
       "dependencies": {
         "@aws-amplify/data-schema": "*",
-        "aws-amplify": "*"
+        "aws-amplify": "*",
+        "aws-cdk-lib": "^2.127.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -308,21 +309,6 @@
       "integrity": "sha512-aPYLmcdS7eHUftTQOyPZRdoMWrvuk4m0LwO6dB9fwKqJTngnizWAeP0AS+tMincPhdZEahRyX0ju9Czvdm/zkQ==",
       "dev": true
     },
-    "node_modules/@arktype/schema": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/@arktype/schema/-/schema-0.0.7.tgz",
-      "integrity": "sha512-awo14Oi98bn6pEgN7soiXvD+mQzidLgzABVO7Tpbw6xtU7+XRWp6JucSEmWLASC+fcoK0QSJxdoC+rm3iIKarQ==",
-      "dev": true,
-      "dependencies": {
-        "@arktype/util": "0.0.33"
-      }
-    },
-    "node_modules/@arktype/schema/node_modules/@arktype/util": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@arktype/util/-/util-0.0.33.tgz",
-      "integrity": "sha512-MYbrLHf0tVYjxI84m0mMRISmKKVoPzv25B1/X05nePUcyPqROoDBn+hYhHpB0GqnJZQOr8UG1CyMuxjFeVbTNg==",
-      "dev": true
-    },
     "node_modules/@arktype/util": {
       "version": "0.0.16",
       "resolved": "https://registry.npmjs.org/@arktype/util/-/util-0.0.16.tgz",
@@ -330,9 +316,9 @@
       "dev": true
     },
     "node_modules/@aws-amplify/analytics": {
-      "version": "7.0.28",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/analytics/-/analytics-7.0.28.tgz",
-      "integrity": "sha512-hfzRVyKhseiizpnYz61mT78xyfPMeTp4I0lMvffBA7HTfh1tNhO9iDZqOZJmFBfxpEG/kEc0fXYl/X8u+Z8U9w==",
+      "version": "7.0.29-unstable.6d4366e.0",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/analytics/-/analytics-7.0.29-unstable.6d4366e.0.tgz",
+      "integrity": "sha512-IOZmQJ+y1idamC8Opserw85t6Rh8yZRlQCaAygWq5nBQEStqRZzP39fggMBaPAhYXvD2xBPhLNPU66dr7oJBJg==",
       "dependencies": {
         "@aws-sdk/client-firehose": "3.398.0",
         "@aws-sdk/client-kinesis": "3.398.0",
@@ -341,27 +327,27 @@
         "tslib": "^2.5.0"
       },
       "peerDependencies": {
-        "@aws-amplify/core": "^6.0.0"
+        "@aws-amplify/core": "6.0.29-unstable.6d4366e.0+6d4366e"
       }
     },
     "node_modules/@aws-amplify/api": {
-      "version": "6.0.29",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/api/-/api-6.0.29.tgz",
-      "integrity": "sha512-YPmsweI4MewKGnx+vqjXaikpv5KnXg0722Y6DxAewBEB6n3S+xfN87C0WONODDgd0v3yjebCS3/pVTyaGcLaJw==",
+      "version": "6.0.30-unstable.6d4366e.0",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/api/-/api-6.0.30-unstable.6d4366e.0.tgz",
+      "integrity": "sha512-w00FLy1EJ8DDjr7msa5ilNG4BK4Z8FSibx9NyDw0h1JZgO+dCDHrWYnZFp6J8q3365YGKcjo+xMQaxpmVX7c9w==",
       "dependencies": {
-        "@aws-amplify/api-graphql": "4.0.29",
-        "@aws-amplify/api-rest": "4.0.28",
+        "@aws-amplify/api-graphql": "4.0.30-unstable.6d4366e.0+6d4366e",
+        "@aws-amplify/api-rest": "4.0.29-unstable.6d4366e.0+6d4366e",
         "tslib": "^2.5.0"
       }
     },
     "node_modules/@aws-amplify/api-graphql": {
-      "version": "4.0.29",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/api-graphql/-/api-graphql-4.0.29.tgz",
-      "integrity": "sha512-VjgAMYxqs028s/y0F4neVJ7IPEQAvyacF6ftlH2cHL64HH/7ekeaFXMt87Eyl/r48lia8zyN3lRZCuw6dm6JIA==",
+      "version": "4.0.30-unstable.6d4366e.0",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/api-graphql/-/api-graphql-4.0.30-unstable.6d4366e.0.tgz",
+      "integrity": "sha512-hhaMNv9fMbuJnya6+XZAHe3JFYUdlGrZB1GiyK3qmxvn7xA8WybdDo71ndoPeu8U15sM+3+BGSgKgPR9ikwnwA==",
       "dependencies": {
-        "@aws-amplify/api-rest": "4.0.28",
-        "@aws-amplify/core": "6.0.28",
-        "@aws-amplify/data-schema": "^0.16.1",
+        "@aws-amplify/api-rest": "4.0.29-unstable.6d4366e.0+6d4366e",
+        "@aws-amplify/core": "6.0.29-unstable.6d4366e.0+6d4366e",
+        "@aws-amplify/data-schema": "^0.17.0",
         "@aws-sdk/types": "3.387.0",
         "graphql": "15.8.0",
         "rxjs": "^7.8.1",
@@ -370,14 +356,14 @@
       }
     },
     "node_modules/@aws-amplify/api-rest": {
-      "version": "4.0.28",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/api-rest/-/api-rest-4.0.28.tgz",
-      "integrity": "sha512-X02Lbe9+7razFLZBi09GjP1Sb8vr2Ii4DOL8dk+G/CN4QyeWCYXs+2dcfHiouoSJNWIaPCMG4R0RgmWHUrgnVg==",
+      "version": "4.0.29-unstable.6d4366e.0",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/api-rest/-/api-rest-4.0.29-unstable.6d4366e.0.tgz",
+      "integrity": "sha512-rrmhwAD0RGnhozzkIA9YxCf/hzVCWluh0p6+ypoSqAaxG1Cx2d+WcFHMorbRaeJ6F70mfrQDunaTq295bXS0/A==",
       "dependencies": {
         "tslib": "^2.5.0"
       },
       "peerDependencies": {
-        "@aws-amplify/core": "^6.0.0"
+        "@aws-amplify/core": "6.0.29-unstable.6d4366e.0+6d4366e"
       }
     },
     "node_modules/@aws-amplify/appsync-modelgen-plugin": {
@@ -454,20 +440,20 @@
       }
     },
     "node_modules/@aws-amplify/auth": {
-      "version": "6.0.28",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/auth/-/auth-6.0.28.tgz",
-      "integrity": "sha512-XFiRpViTMiXBbFhQRde+w0Jwb4YMk8i9ThvNVbKuclQ2EN6WpuUCQv3PsL8/wMkAHna2b4RXLagkmEiRKyPL8A==",
+      "version": "6.0.30-unstable.6d4366e.0",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/auth/-/auth-6.0.30-unstable.6d4366e.0.tgz",
+      "integrity": "sha512-Ppldg3UTozw+yur/At//OfBlrt0GvBvOKybhye4ZnLYhKnSWXgPmE3iz3gj/8YMM6VtPNYa9hnM51o8BGQvoww==",
       "dependencies": {
         "tslib": "^2.5.0"
       },
       "peerDependencies": {
-        "@aws-amplify/core": "^6.0.0"
+        "@aws-amplify/core": "6.0.29-unstable.6d4366e.0+6d4366e"
       }
     },
     "node_modules/@aws-amplify/core": {
-      "version": "6.0.28",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-6.0.28.tgz",
-      "integrity": "sha512-bjp/MgIkFmB7JleBRhFQ9C7tD+Y294F+XXKkpvxGnR1WlPdz2h1P51fCk0j3kpKJRVeo7VyVMTAY21QiWHBS6g==",
+      "version": "6.0.29-unstable.6d4366e.0",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/core/-/core-6.0.29-unstable.6d4366e.0.tgz",
+      "integrity": "sha512-olL3Zxj3XiFGEmr7KEcgkaEet+SWOaaNE8yKZmdq9K0UKKnEllpt3wYlSQDSJzZ0gRBrtWnoU2gKsnEE6le0aw==",
       "dependencies": {
         "@aws-crypto/sha256-js": "5.2.0",
         "@aws-sdk/types": "3.398.0",
@@ -500,11 +486,11 @@
       "link": true
     },
     "node_modules/@aws-amplify/datastore": {
-      "version": "5.0.29",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/datastore/-/datastore-5.0.29.tgz",
-      "integrity": "sha512-5TwvWxnvWN5+Pd5xaOowc/apmlyhv3KvL2dkHQdI/koBtboqibU7zcfC+LNhqjzZLdd2Pd2lXb7HTftxf3kIxQ==",
+      "version": "5.0.30-unstable.6d4366e.0",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/datastore/-/datastore-5.0.30-unstable.6d4366e.0.tgz",
+      "integrity": "sha512-hYfrF7/ECn9qyHGJRfNvUKGCYxpbr62twRgykxp3ZOYpQtniOu+Ic7CBC7f86x/wtzKQAJcMGUrgQH1QB3IawA==",
       "dependencies": {
-        "@aws-amplify/api": "6.0.29",
+        "@aws-amplify/api": "6.0.30-unstable.6d4366e.0+6d4366e",
         "buffer": "4.9.2",
         "idb": "5.0.6",
         "immer": "9.0.6",
@@ -512,7 +498,7 @@
         "ulid": "^2.3.0"
       },
       "peerDependencies": {
-        "@aws-amplify/core": "^6.0.0"
+        "@aws-amplify/core": "6.0.29-unstable.6d4366e.0+6d4366e"
       }
     },
     "node_modules/@aws-amplify/graphql-directives": {
@@ -892,21 +878,21 @@
       }
     },
     "node_modules/@aws-amplify/notifications": {
-      "version": "2.0.28",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/notifications/-/notifications-2.0.28.tgz",
-      "integrity": "sha512-XnB1/V4lQxtk46iJsD6EhXXwVmz08IZYQne/JAK8+3k1GDFVvjZlpSMITqh0y8QrrrPzQCAGdffme5XK0ERXrQ==",
+      "version": "2.0.29-unstable.6d4366e.0",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/notifications/-/notifications-2.0.29-unstable.6d4366e.0.tgz",
+      "integrity": "sha512-ObFN9we/PcizyzJqIArkBOEnBm9bc6Ud21nf3YdVnxcsLM9pmbYQaM5axYrAEJn9zjcl6kbWF3VH15tXxAh4fQ==",
       "dependencies": {
         "lodash": "^4.17.21",
         "tslib": "^2.5.0"
       },
       "peerDependencies": {
-        "@aws-amplify/core": "^6.0.0"
+        "@aws-amplify/core": "6.0.29-unstable.6d4366e.0+6d4366e"
       }
     },
     "node_modules/@aws-amplify/storage": {
-      "version": "6.0.28",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/storage/-/storage-6.0.28.tgz",
-      "integrity": "sha512-OBd1FLW8b9GrGY00XWFyusW3ElbK7VUa+Qewk04OAEOTS4+bwwTZSjO/vIOB5VmRB4w+1K5EwaJIMva7T9kn0A==",
+      "version": "6.0.29-unstable.6d4366e.0",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/storage/-/storage-6.0.29-unstable.6d4366e.0.tgz",
+      "integrity": "sha512-2MSjDrr8RYDb8Y0Zl23Dwpr7bCC/5bGwXEkOwv/6u11B/CilCkLJqXDhp2yt/jyA5kZcxX8pXUaH1CUC6B3/Ng==",
       "dependencies": {
         "@aws-sdk/types": "3.398.0",
         "@smithy/md5-js": "2.0.7",
@@ -915,7 +901,7 @@
         "tslib": "^2.5.0"
       },
       "peerDependencies": {
-        "@aws-amplify/core": "^6.0.0"
+        "@aws-amplify/core": "6.0.29-unstable.6d4366e.0+6d4366e"
       }
     },
     "node_modules/@aws-amplify/storage/node_modules/@aws-sdk/types": {
@@ -933,20 +919,17 @@
     "node_modules/@aws-cdk/asset-awscli-v1": {
       "version": "2.2.202",
       "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.202.tgz",
-      "integrity": "sha512-JqlF0D4+EVugnG5dAsNZMqhu3HW7ehOXm5SDMxMbXNDMdsF0pxtQKNHRl52z1U9igsHmaFpUgSGjbhAJ+0JONg==",
-      "peer": true
+      "integrity": "sha512-JqlF0D4+EVugnG5dAsNZMqhu3HW7ehOXm5SDMxMbXNDMdsF0pxtQKNHRl52z1U9igsHmaFpUgSGjbhAJ+0JONg=="
     },
     "node_modules/@aws-cdk/asset-kubectl-v20": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@aws-cdk/asset-kubectl-v20/-/asset-kubectl-v20-2.1.2.tgz",
-      "integrity": "sha512-3M2tELJOxQv0apCIiuKQ4pAbncz9GuLwnKFqxifWfe77wuMxyTRPmxssYHs42ePqzap1LT6GDcPygGs+hHstLg==",
-      "peer": true
+      "integrity": "sha512-3M2tELJOxQv0apCIiuKQ4pAbncz9GuLwnKFqxifWfe77wuMxyTRPmxssYHs42ePqzap1LT6GDcPygGs+hHstLg=="
     },
     "node_modules/@aws-cdk/asset-node-proxy-agent-v6": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.0.3.tgz",
-      "integrity": "sha512-twhuEG+JPOYCYPx/xy5uH2+VUsIEhPTzDY0F1KuB+ocjWWB/KEDiOVL19nHvbPCB6fhWnkykXEMJ4HHcKvjtvg==",
-      "peer": true
+      "integrity": "sha512-twhuEG+JPOYCYPx/xy5uH2+VUsIEhPTzDY0F1KuB+ocjWWB/KEDiOVL19nHvbPCB6fhWnkykXEMJ4HHcKvjtvg=="
     },
     "node_modules/@aws-crypto/crc32": {
       "version": "3.0.0",
@@ -5068,9 +5051,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.16.2.tgz",
-      "integrity": "sha512-VGodkwtEuZ+ENPz/CpDSl091koMv8ao5jHVMbG1vNK+sbx/48/wVzP84M5xSfDAC69mAKKoEkSo+ym9bXYRK9w==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.16.4.tgz",
+      "integrity": "sha512-GkhjAaQ8oUTOKE4g4gsZ0u8K/IHU1+2WQSgS1TwTcYvL+sjbaQjNHFXbOJ6kgqGHIO1DfUhI/Sphi9GkRT9K+Q==",
       "cpu": [
         "arm"
       ],
@@ -5081,9 +5064,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.16.2.tgz",
-      "integrity": "sha512-5/W1xyIdc7jw6c/f1KEtg1vYDBWnWCsLiipK41NiaWGLG93eH2edgE6EgQJ3AGiPERhiOLUqlDSfjRK08C9xFg==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.16.4.tgz",
+      "integrity": "sha512-Bvm6D+NPbGMQOcxvS1zUl8H7DWlywSXsphAeOnVeiZLQ+0J6Is8T7SrjGTH29KtYkiY9vld8ZnpV3G2EPbom+w==",
       "cpu": [
         "arm64"
       ],
@@ -5094,9 +5077,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.16.2.tgz",
-      "integrity": "sha512-vOAKMqZSTbPfyPVu1jBiy+YniIQd3MG7LUnqV0dA6Q5tyhdqYtxacTHP1+S/ksKl6qCtMG1qQ0grcIgk/19JEA==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.16.4.tgz",
+      "integrity": "sha512-i5d64MlnYBO9EkCOGe5vPR/EeDwjnKOGGdd7zKFhU5y8haKhQZTN2DgVtpODDMxUr4t2K90wTUJg7ilgND6bXw==",
       "cpu": [
         "arm64"
       ],
@@ -5107,9 +5090,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.16.2.tgz",
-      "integrity": "sha512-aIJVRUS3Dnj6MqocBMrcXlatKm64O3ITeQAdAxVSE9swyhNyV1dwnRgw7IGKIkDQofatd8UqMSyUxuFEa42EcA==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.16.4.tgz",
+      "integrity": "sha512-WZupV1+CdUYehaZqjaFTClJI72fjJEgTXdf4NbW69I9XyvdmztUExBtcI2yIIU6hJtYvtwS6pkTkHJz+k08mAQ==",
       "cpu": [
         "x64"
       ],
@@ -5120,9 +5103,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.16.2.tgz",
-      "integrity": "sha512-/bjfUiXwy3P5vYr6/ezv//Yle2Y0ak3a+Av/BKoi76nFryjWCkki8AuVoPR7ZU/ckcvAWFo77OnFK14B9B5JsA==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.16.4.tgz",
+      "integrity": "sha512-ADm/xt86JUnmAfA9mBqFcRp//RVRt1ohGOYF6yL+IFCYqOBNwy5lbEK05xTsEoJq+/tJzg8ICUtS82WinJRuIw==",
       "cpu": [
         "arm"
       ],
@@ -5133,9 +5116,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.16.2.tgz",
-      "integrity": "sha512-S24b+tJHwpq2TNRz9T+r71FjMvyBBApY8EkYxz8Cwi/rhH6h+lu/iDUxyc9PuHf9UvyeBFYkWWcrDahai/NCGw==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.16.4.tgz",
+      "integrity": "sha512-tJfJaXPiFAG+Jn3cutp7mCs1ePltuAgRqdDZrzb1aeE3TktWWJ+g7xK9SNlaSUFw6IU4QgOxAY4rA+wZUT5Wfg==",
       "cpu": [
         "arm"
       ],
@@ -5146,9 +5129,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.16.2.tgz",
-      "integrity": "sha512-UN7VAXLyeyGbCQWiOtQN7BqmjTDw1ON2Oos4lfk0YR7yNhFEJWZiwGtvj9Ay4lsT/ueT04sh80Sg2MlWVVZ+Ug==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.16.4.tgz",
+      "integrity": "sha512-7dy1BzQkgYlUTapDTvK997cgi0Orh5Iu7JlZVBy1MBURk7/HSbHkzRnXZa19ozy+wwD8/SlpJnOOckuNZtJR9w==",
       "cpu": [
         "arm64"
       ],
@@ -5159,9 +5142,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.16.2.tgz",
-      "integrity": "sha512-ZBKvz3+rIhQjusKMccuJiPsStCrPOtejCHxTe+yWp3tNnuPWtyCh9QLGPKz6bFNFbwbw28E2T6zDgzJZ05F1JQ==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.16.4.tgz",
+      "integrity": "sha512-zsFwdUw5XLD1gQe0aoU2HVceI6NEW7q7m05wA46eUAyrkeNYExObfRFQcvA6zw8lfRc5BHtan3tBpo+kqEOxmg==",
       "cpu": [
         "arm64"
       ],
@@ -5172,9 +5155,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.16.2.tgz",
-      "integrity": "sha512-LjMMFiVBRL3wOe095vHAekL4b7nQqf4KZEpdMWd3/W+nIy5o9q/8tlVKiqMbfieDypNXLsxM9fexOxd9Qcklyg==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.16.4.tgz",
+      "integrity": "sha512-p8C3NnxXooRdNrdv6dBmRTddEapfESEUflpICDNKXpHvTjRRq1J82CbU5G3XfebIZyI3B0s074JHMWD36qOW6w==",
       "cpu": [
         "ppc64"
       ],
@@ -5185,9 +5168,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.16.2.tgz",
-      "integrity": "sha512-ohkPt0lKoCU0s4B6twro2aft+QROPdUiWwOjPNTzwTsBK5w+2+iT9kySdtOdq0gzWJAdiqsV4NFtXOwGZmIsHA==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.16.4.tgz",
+      "integrity": "sha512-Lh/8ckoar4s4Id2foY7jNgitTOUQczwMWNYi+Mjt0eQ9LKhr6sK477REqQkmy8YHY3Ca3A2JJVdXnfb3Rrwkng==",
       "cpu": [
         "riscv64"
       ],
@@ -5198,9 +5181,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.16.2.tgz",
-      "integrity": "sha512-jm2lvLc+/gqXfndlpDw05jKvsl/HKYxUEAt1h5UXcMFVpO4vGpoWmJVUfKDtTqSaHcCNw1his1XjkgR9aort3w==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.16.4.tgz",
+      "integrity": "sha512-1xwwn9ZCQYuqGmulGsTZoKrrn0z2fAur2ujE60QgyDpHmBbXbxLaQiEvzJWDrscRq43c8DnuHx3QorhMTZgisQ==",
       "cpu": [
         "s390x"
       ],
@@ -5211,9 +5194,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.16.2.tgz",
-      "integrity": "sha512-oc5/SlITI/Vj/qL4UM+lXN7MERpiy1HEOnrE+SegXwzf7WP9bzmZd6+MDljCEZTdSY84CpvUv9Rq7bCaftn1+g==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.16.4.tgz",
+      "integrity": "sha512-LuOGGKAJ7dfRtxVnO1i3qWc6N9sh0Em/8aZ3CezixSTM+E9Oq3OvTsvC4sm6wWjzpsIlOCnZjdluINKESflJLA==",
       "cpu": [
         "x64"
       ],
@@ -5224,9 +5207,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.16.2.tgz",
-      "integrity": "sha512-/2VWEBG6mKbS2itm7hzPwhIPaxfZh/KLWrYg20pCRLHhNFtF+epLgcBtwy3m07bl/k86Q3PFRAf2cX+VbZbwzQ==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.16.4.tgz",
+      "integrity": "sha512-ch86i7KkJKkLybDP2AtySFTRi5fM3KXp0PnHocHuJMdZwu7BuyIKi35BE9guMlmTpwwBTB3ljHj9IQXnTCD0vA==",
       "cpu": [
         "x64"
       ],
@@ -5237,9 +5220,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.16.2.tgz",
-      "integrity": "sha512-Wg7ANh7+hSilF0lG3e/0Oy8GtfTIfEk1327Bw8juZOMOoKmJLs3R+a4JDa/4cHJp2Gs7QfCDTepXXcyFD0ubBg==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.16.4.tgz",
+      "integrity": "sha512-Ma4PwyLfOWZWayfEsNQzTDBVW8PZ6TUUN1uFTBQbF2Chv/+sjenE86lpiEwj2FiviSmSZ4Ap4MaAfl1ciF4aSA==",
       "cpu": [
         "arm64"
       ],
@@ -5250,9 +5233,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.16.2.tgz",
-      "integrity": "sha512-J/jCDKVMWp0Y2ELnTjpQFYUCUWv1Jr+LdFrJVZtdqGyjDo0PHPa7pCamjHvJel6zBFM3doFFqAr7cmXYWBAbfw==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.16.4.tgz",
+      "integrity": "sha512-9m/ZDrQsdo/c06uOlP3W9G2ENRVzgzbSXmXHT4hwVaDQhYcRpi9bgBT0FTG9OhESxwK0WjQxYOSfv40cU+T69w==",
       "cpu": [
         "ia32"
       ],
@@ -5263,9 +5246,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.16.2.tgz",
-      "integrity": "sha512-3nIf+SJMs2ZzrCh+SKNqgLVV9hS/UY0UjT1YU8XQYFGLiUfmHYJ/5trOU1XSvmHjV5gTF/K3DjrWxtyzKKcAHA==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.16.4.tgz",
+      "integrity": "sha512-YunpoOAyGLDseanENHmbFvQSfVL5BxW3k7hhy0eN4rb3gS/ct75dVD0EXOWIqFT/nE8XYW6LP6vz6ctKRi0k9A==",
       "cpu": [
         "x64"
       ],
@@ -6670,19 +6653,9 @@
       }
     },
     "node_modules/arktype": {
-      "version": "2.0.0-dev.7",
-      "resolved": "https://registry.npmjs.org/arktype/-/arktype-2.0.0-dev.7.tgz",
-      "integrity": "sha512-TeehK+ExNsvqNoEccNOMs73LcNwR9+gX9pQsoCIvZfuxrQ24nB5MUQGweAAuNSwVX7GUUU9Ad0BWGnsvD8ST+g==",
-      "dev": true,
-      "dependencies": {
-        "@arktype/schema": "0.0.7",
-        "@arktype/util": "0.0.33"
-      }
-    },
-    "node_modules/arktype/node_modules/@arktype/util": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@arktype/util/-/util-0.0.33.tgz",
-      "integrity": "sha512-MYbrLHf0tVYjxI84m0mMRISmKKVoPzv25B1/X05nePUcyPqROoDBn+hYhHpB0GqnJZQOr8UG1CyMuxjFeVbTNg==",
+      "version": "1.0.29-alpha",
+      "resolved": "https://registry.npmjs.org/arktype/-/arktype-1.0.29-alpha.tgz",
+      "integrity": "sha512-glMLgVhIQRSkR3tymiS+POAcWVJH09sfrgic0jHnyFL8BlhHAJZX2BzdImU9zYr1y9NBqy+U93ZNrRTHXsKRDw==",
       "dev": true
     },
     "node_modules/array-buffer-byte-length": {
@@ -6844,24 +6817,24 @@
       }
     },
     "node_modules/aws-amplify": {
-      "version": "6.0.29",
-      "resolved": "https://registry.npmjs.org/aws-amplify/-/aws-amplify-6.0.29.tgz",
-      "integrity": "sha512-7dkdvBEQWuv1CynpmhSZZOliFvkMXfFHtlalIleLaKW6yR6HPj9u6pr8wzPtCraaZUSJEc3CEyAnOwqWDzbLSw==",
-      "dependencies": {
-        "@aws-amplify/analytics": "7.0.28",
-        "@aws-amplify/api": "6.0.29",
-        "@aws-amplify/auth": "6.0.28",
-        "@aws-amplify/core": "6.0.28",
-        "@aws-amplify/datastore": "5.0.29",
-        "@aws-amplify/notifications": "2.0.28",
-        "@aws-amplify/storage": "6.0.28",
+      "version": "6.0.31-unstable.6d4366e.0",
+      "resolved": "https://registry.npmjs.org/aws-amplify/-/aws-amplify-6.0.31-unstable.6d4366e.0.tgz",
+      "integrity": "sha512-8sfdxmi3Pn5jkdc/PddaF+PrW12rfr2OqlCJVp3thtlf7bJs+mLKgFL7AjUIMusI8cHma4Gl7TdxkNlvsRWtvA==",
+      "dependencies": {
+        "@aws-amplify/analytics": "7.0.29-unstable.6d4366e.0+6d4366e",
+        "@aws-amplify/api": "6.0.30-unstable.6d4366e.0+6d4366e",
+        "@aws-amplify/auth": "6.0.30-unstable.6d4366e.0+6d4366e",
+        "@aws-amplify/core": "6.0.29-unstable.6d4366e.0+6d4366e",
+        "@aws-amplify/datastore": "5.0.30-unstable.6d4366e.0+6d4366e",
+        "@aws-amplify/notifications": "2.0.29-unstable.6d4366e.0+6d4366e",
+        "@aws-amplify/storage": "6.0.29-unstable.6d4366e.0+6d4366e",
         "tslib": "^2.5.0"
       }
     },
     "node_modules/aws-cdk-lib": {
-      "version": "2.138.0",
-      "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.138.0.tgz",
-      "integrity": "sha512-BdLOd6Fkl/7PH8RahRbhYQf3zRFCxVtOdkKOAZHHqtaNkmTyfkUGMXyzyQ4rIHvR8EOy1C1x5CAufqoZuJM0gA==",
+      "version": "2.139.0",
+      "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.139.0.tgz",
+      "integrity": "sha512-G9yoc+VFwF10kpgf4omtrAVmUNPeAP708oF5fc7XlRTzoTXMmAdUJW9cRGOMtAkFY83SxiJP0wm8n5Z9tjAdUA==",
       "bundleDependencies": [
         "@balena/dockerignore",
         "case",
@@ -6875,7 +6848,6 @@
         "yaml",
         "mime-types"
       ],
-      "peer": true,
       "dependencies": {
         "@aws-cdk/asset-awscli-v1": "^2.2.202",
         "@aws-cdk/asset-kubectl-v20": "^2.1.2",
@@ -6902,14 +6874,12 @@
     "node_modules/aws-cdk-lib/node_modules/@balena/dockerignore": {
       "version": "1.0.2",
       "inBundle": true,
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/aws-cdk-lib/node_modules/ajv": {
       "version": "8.12.0",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -6925,7 +6895,6 @@
       "version": "5.0.1",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -6934,7 +6903,6 @@
       "version": "4.3.0",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -6949,7 +6917,6 @@
       "version": "2.0.0",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -6957,14 +6924,12 @@
     "node_modules/aws-cdk-lib/node_modules/balanced-match": {
       "version": "1.0.2",
       "inBundle": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/aws-cdk-lib/node_modules/brace-expansion": {
       "version": "1.1.11",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -6974,7 +6939,6 @@
       "version": "1.6.3",
       "inBundle": true,
       "license": "(MIT OR GPL-3.0-or-later)",
-      "peer": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -6983,7 +6947,6 @@
       "version": "2.0.1",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -6994,32 +6957,27 @@
     "node_modules/aws-cdk-lib/node_modules/color-name": {
       "version": "1.1.4",
       "inBundle": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/aws-cdk-lib/node_modules/concat-map": {
       "version": "0.0.1",
       "inBundle": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/aws-cdk-lib/node_modules/emoji-regex": {
       "version": "8.0.0",
       "inBundle": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/aws-cdk-lib/node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "inBundle": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/aws-cdk-lib/node_modules/fs-extra": {
       "version": "11.2.0",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -7032,14 +6990,12 @@
     "node_modules/aws-cdk-lib/node_modules/graceful-fs": {
       "version": "4.2.11",
       "inBundle": true,
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/aws-cdk-lib/node_modules/ignore": {
       "version": "5.3.1",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 4"
       }
@@ -7048,7 +7004,6 @@
       "version": "3.0.0",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -7056,14 +7011,12 @@
     "node_modules/aws-cdk-lib/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "inBundle": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/aws-cdk-lib/node_modules/jsonfile": {
       "version": "6.1.0",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -7075,7 +7028,6 @@
       "version": "1.4.1",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "*"
       }
@@ -7083,14 +7035,12 @@
     "node_modules/aws-cdk-lib/node_modules/lodash.truncate": {
       "version": "4.4.2",
       "inBundle": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/aws-cdk-lib/node_modules/lru-cache": {
       "version": "6.0.0",
       "inBundle": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -7102,7 +7052,6 @@
       "version": "1.52.0",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -7111,7 +7060,6 @@
       "version": "2.1.35",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -7123,7 +7071,6 @@
       "version": "3.1.2",
       "inBundle": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -7135,7 +7082,6 @@
       "version": "2.3.1",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -7144,7 +7090,6 @@
       "version": "2.0.2",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7153,7 +7098,6 @@
       "version": "7.6.0",
       "inBundle": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -7168,7 +7112,6 @@
       "version": "4.0.0",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -7185,7 +7128,6 @@
       "version": "4.2.3",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -7199,7 +7141,6 @@
       "version": "6.0.1",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -7211,7 +7152,6 @@
       "version": "6.8.2",
       "inBundle": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "ajv": "^8.0.1",
         "lodash.truncate": "^4.4.2",
@@ -7227,7 +7167,6 @@
       "version": "2.0.1",
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       }
@@ -7236,7 +7175,6 @@
       "version": "4.4.1",
       "inBundle": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -7244,14 +7182,12 @@
     "node_modules/aws-cdk-lib/node_modules/yallist": {
       "version": "4.0.0",
       "inBundle": true,
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/aws-cdk-lib/node_modules/yaml": {
       "version": "1.10.2",
       "inBundle": true,
       "license": "ISC",
-      "peer": true,
       "engines": {
         "node": ">= 6"
       }
@@ -8553,9 +8489,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.745",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.745.tgz",
-      "integrity": "sha512-tRbzkaRI5gbUn5DEvF0dV4TQbMZ5CLkWeTAXmpC9IrYT+GE+x76i9p+o3RJ5l9XmdQlI1pPhVtE9uNcJJ0G0EA=="
+      "version": "1.4.749",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.749.tgz",
+      "integrity": "sha512-LRMMrM9ITOvue0PoBrvNIraVmuDbJV5QC9ierz/z5VilMdPOVMjOtpICNld3PuXuTZ3CHH/UPxX9gHhAPwi+0Q=="
     },
     "node_modules/emittery": {
       "version": "0.13.1",
@@ -13273,9 +13209,9 @@
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
-      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.1.tgz",
+      "integrity": "sha512-tS24spDe/zXhWbNPErCHs/AGOzbKGHT+ybSBqmdLm8WZ1xXLWvH8Qn71QPAlqVhd0qUTWjy+Kl9JmISgDdEjsA==",
       "dev": true,
       "engines": {
         "node": "14 || >=16.14"
@@ -13558,9 +13494,9 @@
       }
     },
     "node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "version": "18.3.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.0.tgz",
+      "integrity": "sha512-wRiUsea88TjKDc4FBEn+sLvIDesp6brMbGWnJGjew2waAc9evdhja/2LvePc898HJbHw0L+MTWy7NhpnELAvLQ==",
       "dev": true
     },
     "node_modules/read-pkg": {
@@ -13790,9 +13726,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.16.2.tgz",
-      "integrity": "sha512-sxDP0+pya/Yi5ZtptF4p3avI+uWCIf/OdrfdH2Gbv1kWddLKk0U7WE3PmQokhi5JrektxsK3sK8s4hzAmjqahw==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.16.4.tgz",
+      "integrity": "sha512-kuaTJSUbz+Wsb2ATGvEknkI12XV40vIiHmLuFlejoo7HtDok/O5eDDD0UpCVY5bBX5U5RYo8wWP83H7ZsqVEnA==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -13805,22 +13741,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.16.2",
-        "@rollup/rollup-android-arm64": "4.16.2",
-        "@rollup/rollup-darwin-arm64": "4.16.2",
-        "@rollup/rollup-darwin-x64": "4.16.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.16.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.16.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.16.2",
-        "@rollup/rollup-linux-arm64-musl": "4.16.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.16.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.16.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.16.2",
-        "@rollup/rollup-linux-x64-gnu": "4.16.2",
-        "@rollup/rollup-linux-x64-musl": "4.16.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.16.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.16.2",
-        "@rollup/rollup-win32-x64-msvc": "4.16.2",
+        "@rollup/rollup-android-arm-eabi": "4.16.4",
+        "@rollup/rollup-android-arm64": "4.16.4",
+        "@rollup/rollup-darwin-arm64": "4.16.4",
+        "@rollup/rollup-darwin-x64": "4.16.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.16.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.16.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.16.4",
+        "@rollup/rollup-linux-arm64-musl": "4.16.4",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.16.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.16.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.16.4",
+        "@rollup/rollup-linux-x64-gnu": "4.16.4",
+        "@rollup/rollup-linux-x64-musl": "4.16.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.16.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.16.4",
+        "@rollup/rollup-win32-x64-msvc": "4.16.4",
         "fsevents": "~2.3.2"
       }
     },
@@ -14870,9 +14806,9 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/tsx": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.2.tgz",
-      "integrity": "sha512-BCNd4kz6fz12fyrgCTEdZHGJ9fWTGeUzXmQysh0RVocDY3h4frk05ZNCXSy4kIenF7y/QnrdiVpTsyNRn6vlAw==",
+      "version": "4.7.3",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.3.tgz",
+      "integrity": "sha512-+fQnMqIp/jxZEXLcj6WzYy9FhcS5/Dfk8y4AtzJ6ejKcKqmfTF8Gso/jtrzDggCF2zTU20gJa6n8XqPYwDAUYQ==",
       "dev": true,
       "dependencies": {
         "esbuild": "~0.19.10",
@@ -15757,7 +15693,7 @@
     },
     "packages/data-schema": {
       "name": "@aws-amplify/data-schema",
-      "version": "0.16.2",
+      "version": "0.17.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-amplify/data-schema-types": "*",
@@ -15793,8 +15729,7 @@
     },
     "packages/data-schema-types/node_modules/@aws-amplify/plugin-types": {
       "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/plugin-types/-/plugin-types-0.9.0.tgz",
-      "integrity": "sha512-dOwuyjRWKHvKSxcCwycdBTb6clRr2/soW1hL+HaXyTN69+dQanQegpS6ylmVwbPPiy9q2LCbqaw+5Np7bacLgw==",
+      "license": "Apache-2.0",
       "peerDependencies": {
         "@aws-sdk/types": "^3.465.0",
         "aws-cdk-lib": "^2.127.0",
@@ -15803,8 +15738,7 @@
     },
     "packages/data-schema-types/node_modules/@aws-sdk/types": {
       "version": "3.535.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.535.0.tgz",
-      "integrity": "sha512-aY4MYfduNj+sRR37U7XxYR8wemfbKP6lx00ze2M2uubn7mZotuVrWYAafbMSXrdEMSToE5JDhr28vArSOoLcSg==",
+      "license": "Apache-2.0",
       "peer": true,
       "dependencies": {
         "@smithy/types": "^2.12.0",
@@ -15826,7 +15760,7 @@
         "@aws-amplify/data-schema-types": "*",
         "@tsd/typescript": "^5.1.6",
         "@types/jest": "29.5.4",
-        "aws-amplify": "*",
+        "aws-amplify": "unstable",
         "jest": "^29.7.0",
         "jest-tsd": "^0.2.2",
         "ts-jest": "^29.1.1"
diff --git a/package.json b/package.json
index c336ebf26..e5df845e6 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@types/prettier": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "^6.7.4",
     "@typescript-eslint/parser": "^6.7.4",
-    "aws-amplify": "^6.0.29",
+    "aws-amplify": "unstable",
     "glob": "^10.3.10",
     "eslint": "^8.50.0",
     "eslint-config-prettier": "^9.0.0",
diff --git a/packages/data-schema/CHANGELOG.md b/packages/data-schema/CHANGELOG.md
index df73e7e3a..80670bf93 100644
--- a/packages/data-schema/CHANGELOG.md
+++ b/packages/data-schema/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @aws-amplify/data-schema
 
+## 0.17.1
+
+### Patch Changes
+
+- abfbd9d: fix: naming collision on default secondary index queryField
+
 ## 0.17.0
 
 ### Minor Changes
diff --git a/packages/data-schema/__tests__/MappedTypes/ModelMetadata.test-d.ts b/packages/data-schema/__tests__/MappedTypes/ModelMetadata.test-d.ts
index 6fdf2c460..740a7c38e 100644
--- a/packages/data-schema/__tests__/MappedTypes/ModelMetadata.test-d.ts
+++ b/packages/data-schema/__tests__/MappedTypes/ModelMetadata.test-d.ts
@@ -87,7 +87,8 @@ describe('ModelSecondaryIndexes', () => {
       Post: {
         secondaryIndexes: [
           {
-            queryField: 'listByTitle';
+            defaultQueryFieldSuffix: 'Title';
+            queryField: never;
             pk: {
               title: string;
             };
@@ -121,6 +122,7 @@ describe('ModelSecondaryIndexes', () => {
       Post: {
         secondaryIndexes: [
           {
+            defaultQueryFieldSuffix: 'TitleAndViewCount';
             queryField: 'myFavIdx';
             pk: {
               title: string;
@@ -130,7 +132,8 @@ describe('ModelSecondaryIndexes', () => {
             };
           },
           {
-            queryField: 'listByDescription';
+            defaultQueryFieldSuffix: 'Description';
+            queryField: never;
             pk: {
               description: string;
             };
diff --git a/packages/data-schema/__tests__/__snapshots__/ModelType.test.ts.snap b/packages/data-schema/__tests__/__snapshots__/ModelType.test.ts.snap
index 76746273b..07daf9243 100644
--- a/packages/data-schema/__tests__/__snapshots__/ModelType.test.ts.snap
+++ b/packages/data-schema/__tests__/__snapshots__/ModelType.test.ts.snap
@@ -514,7 +514,7 @@ exports[`secondary indexes generates a primary key AND secondary index annotatio
 exports[`secondary indexes generates a secondary index annotation 1`] = `
 "type widget @model @auth(rules: [{allow: public, provider: apiKey}])
 {
-  title: String! @index(queryField: "listByTitle")
+  title: String! @index(queryField: "listWidgetByTitle")
 }"
 `;
 
@@ -530,7 +530,7 @@ exports[`secondary indexes generates a secondary index annotation with attribute
 exports[`secondary indexes generates multiple secondary index annotations on the same field 1`] = `
 "type widget @model @auth(rules: [{allow: public, provider: apiKey}])
 {
-  title: String! @index(queryField: "listByTitle") @index(sortKeyFields: ["timestamp"], queryField: "listByTitleAndTimestamp") @index(name: "myGSI", sortKeyFields: ["description", "timestamp"], queryField: "byTitleDescTs")
+  title: String! @index(queryField: "listWidgetByTitle") @index(sortKeyFields: ["timestamp"], queryField: "listWidgetByTitleAndTimestamp") @index(name: "myGSI", sortKeyFields: ["description", "timestamp"], queryField: "byTitleDescTs")
   description: String!
   timestamp: Int!
 }"
@@ -539,8 +539,8 @@ exports[`secondary indexes generates multiple secondary index annotations on the
 exports[`secondary indexes generates secondary index annotations on different fields 1`] = `
 "type widget @model @auth(rules: [{allow: public, provider: apiKey}])
 {
-  title: String! @index(queryField: "listByTitle")
-  description: String! @index(sortKeyFields: ["timestamp"], queryField: "listByDescriptionAndTimestamp")
+  title: String! @index(queryField: "listWidgetByTitle")
+  description: String! @index(sortKeyFields: ["timestamp"], queryField: "listWidgetByDescriptionAndTimestamp")
   timestamp: Int! @index(sortKeyFields: ["description"], queryField: "byTimeStampDesc")
 }"
 `;
diff --git a/packages/data-schema/package.json b/packages/data-schema/package.json
index 707c33a77..c4a7ee496 100644
--- a/packages/data-schema/package.json
+++ b/packages/data-schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-schema",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
diff --git a/packages/data-schema/src/MappedTypes/MapSecondaryIndexes.ts b/packages/data-schema/src/MappedTypes/MapSecondaryIndexes.ts
index 4d03630cb..de65a8233 100644
--- a/packages/data-schema/src/MappedTypes/MapSecondaryIndexes.ts
+++ b/packages/data-schema/src/MappedTypes/MapSecondaryIndexes.ts
@@ -1,4 +1,3 @@
-import { IsEmptyStringOrNever } from '@aws-amplify/data-schema-types';
 import { ModelIndexType } from '../ModelIndex';
 
 type ModelIndexTypeShape = ModelIndexType<any, any, any, any, any>;
@@ -34,31 +33,28 @@ export type SecondaryIndexToIR<
  *
  * @remarks - the IR type alias is defined as SecondaryIndexIrShape in data-schema-types
  */
-type SingleIndexIrFromType<
-  Idx extends ModelIndexTypeShape,
-  ResolvedFields,
-> = Idx extends ModelIndexType<
-  any,
-  infer PK extends string,
-  infer SK,
-  infer QueryField extends string | never,
-  any
->
-  ? {
-      queryField: IsEmptyStringOrNever<QueryField> extends true
-        ? `listBy${QueryFieldLabelFromTuple<SK, Capitalize<PK>>}`
-        : QueryField;
-      pk: PK extends keyof ResolvedFields
-        ? {
-            [Key in PK]: Exclude<ResolvedFields[PK], null>;
-          }
-        : never;
-      // distribute ResolvedFields over SK
-      sk: unknown extends SK
-        ? never
-        : ResolvedSortKeyFields<SK, ResolvedFields>;
-    }
-  : never;
+type SingleIndexIrFromType<Idx extends ModelIndexTypeShape, ResolvedFields> =
+  Idx extends ModelIndexType<
+    any,
+    infer PK extends string,
+    infer SK,
+    infer QueryField extends string | never,
+    any
+  >
+    ? {
+        defaultQueryFieldSuffix: `${QueryFieldLabelFromTuple<SK, Capitalize<PK>>}`;
+        queryField: QueryField;
+        pk: PK extends keyof ResolvedFields
+          ? {
+              [Key in PK]: Exclude<ResolvedFields[PK], null>;
+            }
+          : never;
+        // distribute ResolvedFields over SK
+        sk: unknown extends SK
+          ? never
+          : ResolvedSortKeyFields<SK, ResolvedFields>;
+      }
+    : never;
 
 /**
  * @typeParam SK - tuple of SortKey field names, e.g. ['viewCount', 'createdAt']
diff --git a/packages/data-schema/src/SchemaProcessor.ts b/packages/data-schema/src/SchemaProcessor.ts
index 856816c95..8e97053e4 100644
--- a/packages/data-schema/src/SchemaProcessor.ts
+++ b/packages/data-schema/src/SchemaProcessor.ts
@@ -810,12 +810,13 @@ type TransformedSecondaryIndexes = {
  * @returns default query field name
  */
 const secondaryIndexDefaultQueryField = (
+  modelName: string,
   pk: string,
   sk?: readonly string[],
 ): string => {
   const skName = sk?.length ? 'And' + sk?.map(capitalize).join('And') : '';
 
-  const queryField = `listBy${capitalize(pk)}${skName}`;
+  const queryField = `list${capitalize(modelName)}By${capitalize(pk)}${skName}`;
 
   return queryField;
 };
@@ -825,6 +826,7 @@ const secondaryIndexDefaultQueryField = (
  * and the value is an array of transformed Amplify @index directives with all supplied attributes
  */
 const transformedSecondaryIndexesForModel = (
+  modelName: string,
   secondaryIndexes: readonly InternalModelIndexType[],
 ): TransformedSecondaryIndexes => {
   const indexDirectiveWithAttributes = (
@@ -835,6 +837,7 @@ const transformedSecondaryIndexesForModel = (
   ): string => {
     if (!sortKeys.length && !indexName && !queryField) {
       return `@index(queryField: "${secondaryIndexDefaultQueryField(
+        modelName,
         partitionKey,
       )}")`;
     }
@@ -856,6 +859,7 @@ const transformedSecondaryIndexesForModel = (
     } else {
       attributes.push(
         `queryField: "${secondaryIndexDefaultQueryField(
+          modelName,
           partitionKey,
           sortKeys,
         )}"`,
@@ -1164,6 +1168,7 @@ const schemaPreprocessor = (
       const [partitionKey] = identifier;
 
       const transformedSecondaryIndexes = transformedSecondaryIndexesForModel(
+        typeName,
         typeDef.data.secondaryIndexes,
       );
 
diff --git a/packages/data-schema/src/runtime/client/index.ts b/packages/data-schema/src/runtime/client/index.ts
index fa62ea74d..c6f27d32e 100644
--- a/packages/data-schema/src/runtime/client/index.ts
+++ b/packages/data-schema/src/runtime/client/index.ts
@@ -8,6 +8,7 @@ import {
   Equal,
   __modelMeta__,
   ExtractModelMeta,
+  IsEmptyStringOrNever,
 } from '@aws-amplify/data-schema-types';
 import type { Observable } from 'rxjs';
 
@@ -494,10 +495,11 @@ type ModelMetaShape = {
 
 // TODO: remove export. added for debugging.
 export type ModelTypesClient<
+  ModelName extends string,
   Model extends Record<string, unknown>,
   ModelMeta extends ModelMetaShape,
   FlatModel extends Record<string, unknown> = ResolvedModel<Model>,
-> = IndexQueryMethodsFromIR<ModelMeta['secondaryIndexes'], Model> & {
+> = IndexQueryMethodsFromIR<ModelMeta['secondaryIndexes'], ModelName, Model> & {
   create: (
     model: Prettify<CreateModelInput<Model, ModelMeta>>,
     options?: {
@@ -589,10 +591,11 @@ export type ModelTypesClient<
 };
 
 type ModelTypesSSRCookies<
+  ModelName extends string,
   Model extends Record<string, unknown>,
   ModelMeta extends ModelMetaShape,
   FlatModel extends Record<string, unknown> = ResolvedModel<Model>,
-> = IndexQueryMethodsFromIR<ModelMeta['secondaryIndexes'], Model> & {
+> = IndexQueryMethodsFromIR<ModelMeta['secondaryIndexes'], ModelName, Model> & {
   create: (
     model: Prettify<CreateModelInput<Model, ModelMeta>>,
     options?: {
@@ -641,10 +644,11 @@ type ModelTypesSSRCookies<
 };
 
 type ModelTypesSSRRequest<
+  ModelName extends string,
   Model extends Record<string, unknown>,
   ModelMeta extends ModelMetaShape,
   FlatModel extends Record<string, unknown> = ResolvedModel<Model>,
-> = IndexQueryMethodsFromIR<ModelMeta['secondaryIndexes'], Model> & {
+> = IndexQueryMethodsFromIR<ModelMeta['secondaryIndexes'], ModelName, Model> & {
   create: (
     // TODO: actual type
     contextSpec: any,
@@ -716,14 +720,20 @@ export type ModelTypes<
   >]: ModelName extends string
     ? Schema[ModelName] extends Record<string, unknown>
       ? Context extends 'CLIENT'
-        ? ModelTypesClient<Schema[ModelName]['type'], ModelMeta[ModelName]>
+        ? ModelTypesClient<
+            ModelName,
+            Schema[ModelName]['type'],
+            ModelMeta[ModelName]
+          >
         : Context extends 'COOKIES'
           ? ModelTypesSSRCookies<
+              ModelName,
               Schema[ModelName]['type'],
               ModelMeta[ModelName]
             >
           : Context extends 'REQUEST'
             ? ModelTypesSSRRequest<
+                ModelName,
                 Schema[ModelName]['type'],
                 ModelMeta[ModelName]
               >
@@ -853,6 +863,7 @@ export type CustomHeaders =
  * SecondaryIndex index types and query methods
  */
 export type SecondaryIndexIrShape = {
+  defaultQueryFieldSuffix: string;
   queryField: string;
   pk: { [key: string]: string | number };
   sk: { [key: string]: string | number };
@@ -860,20 +871,30 @@ export type SecondaryIndexIrShape = {
 
 type IndexQueryMethodsFromIR<
   SecondaryIdxTuple extends SecondaryIndexIrShape[],
+  ModelName extends string,
   Model extends Record<string, unknown>,
   Res = unknown, // defaulting `unknown` because it gets absorbed in an intersection, e.g. `{a: 1} & unknown` => `{a: 1}`
 > = SecondaryIdxTuple extends [
   infer A extends SecondaryIndexIrShape,
   ...infer B extends SecondaryIndexIrShape[],
 ]
-  ? IndexQueryMethodsFromIR<B, Model, IndexQueryMethodSignature<A, Model> & Res>
+  ? IndexQueryMethodsFromIR<
+      B,
+      ModelName,
+      Model,
+      IndexQueryMethodSignature<A, ModelName, Model> & Res
+    >
   : Res;
 
 type IndexQueryMethodSignature<
   Idx extends SecondaryIndexIrShape,
+  ModelName extends string,
   Model extends Record<string, unknown>,
-> = {
-  [K in Idx['queryField'] & string]: <
+> = Record<
+  IsEmptyStringOrNever<Idx['queryField']> extends false
+    ? Idx['queryField']
+    : `list${ModelName}By${Idx['defaultQueryFieldSuffix']}`,
+  <
     FlatModel extends Record<string, unknown> = ResolvedModel<Model>,
     SelectionSet extends ReadonlyArray<ModelPath<FlatModel>> = never[],
   >(
@@ -892,8 +913,8 @@ type IndexQueryMethodSignature<
       authToken?: string;
       headers?: CustomHeaders;
     },
-  ) => ListReturnValue<Prettify<ReturnValue<Model, FlatModel, SelectionSet>>>;
-};
+  ) => ListReturnValue<Prettify<ReturnValue<Model, FlatModel, SelectionSet>>>
+>;
 
 type FilteredKeys<T> = {
   [P in keyof T]: T[P] extends never ? never : P;
diff --git a/packages/integration-tests/__tests__/secondary-indexes.test-d.ts b/packages/integration-tests/__tests__/secondary-indexes.test-d.ts
index 0d16a5c30..b78832869 100644
--- a/packages/integration-tests/__tests__/secondary-indexes.test-d.ts
+++ b/packages/integration-tests/__tests__/secondary-indexes.test-d.ts
@@ -31,7 +31,7 @@ describe('secondary indexes / index queries', () => {
       // Doing the following input type validation as an alternative:
 
       // Valid key input
-      client.models.Post.listByTitle(
+      client.models.Post.listPostByTitle(
         {
           title: 'abc',
         },
@@ -58,7 +58,7 @@ describe('secondary indexes / index queries', () => {
     });
 
     test('Return type', async () => {
-      const { data: posts } = await client.models.Post.listByTitle(
+      const { data: posts } = await client.models.Post.listPostByTitle(
         {
           title: 'abc',
         },
@@ -81,7 +81,7 @@ describe('secondary indexes / index queries', () => {
     });
 
     test('Custom selection set return type', async () => {
-      const { data: posts } = await client.models.Post.listByTitle(
+      const { data: posts } = await client.models.Post.listPostByTitle(
         {
           title: 'abc',
         },
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index f805f04c0..7540cc7f1 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -16,7 +16,7 @@
     "@aws-amplify/data-schema-types": "*",
     "@tsd/typescript": "^5.1.6",
     "@types/jest": "29.5.4",
-    "aws-amplify": "*",
+    "aws-amplify": "unstable",
     "jest": "^29.7.0",
     "jest-tsd": "^0.2.2",
     "ts-jest": "^29.1.1"