@aws-amplify/data-schema 1.22.2 → 1.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-schema",
-  "version": "1.22.2",
+  "version": "1.24.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/ModelIndex.ts

@@ -2,11 +2,26 @@ import { Brand, brand } from './util';
 
 const brandName = 'modelIndexType';
 
+/**
+ * DynamoDB Global Secondary Index (GSI) projection types.
+ * - `KEYS_ONLY`: Only the index and primary keys are projected into the index.
+ * - `INCLUDE`: In addition to the attributes in KEYS_ONLY, includes specified non-key attributes.
+ * - `ALL`: All attributes from the base table are projected into the index.
+ */
+export type GSIProjectionType = 'KEYS_ONLY' | 'INCLUDE' | 'ALL';
+
+/**
+ * Configuration data for a model's secondary index.
+ */
 export type ModelIndexData = {
   partitionKey: string;
   sortKeys: readonly unknown[];
   indexName: string;
   queryField: string | null;
+  /** The projection type for the GSI. Defaults to 'ALL' if not specified. */
+  projectionType?: GSIProjectionType;
+  /** Non-key attributes to include when projectionType is 'INCLUDE'. */
+  nonKeyAttributes?: readonly string[];
 };
 
 export type InternalModelIndexType = ModelIndexType<any, any, any, any> & {
@@ -36,6 +51,13 @@ export type ModelIndexType<
     >(
       field: QF,
     ): ModelIndexType<MF, PK, SK, QF, K | 'queryField'>;
+    projection<
+      PT extends GSIProjectionType,
+      NKA extends PT extends 'INCLUDE' ? readonly string[] : never = never,
+    >(
+      type: PT,
+      ...args: PT extends 'INCLUDE' ? [nonKeyAttributes: NKA] : []
+    ): ModelIndexType<ModelFieldKeys, PK, SK, QueryField, K | 'projection'>;
   },
   K
 > &
@@ -52,6 +74,8 @@ function _modelIndex<
     sortKeys: [],
     indexName: '',
     queryField: '',
+    projectionType: 'ALL',
+    nonKeyAttributes: undefined,
   };
 
   const builder = {
@@ -70,6 +94,14 @@ function _modelIndex<
 
       return this;
     },
+    projection(type, ...args) {
+      data.projectionType = type;
+      if (type === 'INCLUDE') {
+        data.nonKeyAttributes = args[0];
+      }
+
+      return this;
+    },
     ...brand(brandName),
   } as ModelIndexType<ModelFieldKeys, PK, SK, QueryField>;
 

package/src/SchemaProcessor.ts

@@ -1117,6 +1117,8 @@ const transformedSecondaryIndexesForModel = (
     sortKeys: readonly string[],
     indexName: string,
     queryField: string | null,
+    projectionType?: string,
+    nonKeyAttributes?: readonly string[],
   ): string => {
     for (const keyName of [partitionKey, ...sortKeys]) {
       const field = modelFields[keyName];
@@ -1131,7 +1133,7 @@ const transformedSecondaryIndexesForModel = (
       }
     }
 
-    if (!sortKeys.length && !indexName && !queryField && queryField !== null) {
+    if (!sortKeys.length && !indexName && !queryField && queryField !== null && !projectionType) {
       return `@index(queryField: "${secondaryIndexDefaultQueryField(
         modelName,
         partitionKey,
@@ -1165,13 +1167,23 @@ const transformedSecondaryIndexesForModel = (
       );
     }
 
+    // Add projection attributes if specified
+    if (projectionType && projectionType !== 'ALL') {
+      if (projectionType === 'KEYS_ONLY') {
+        attributes.push(`projection: { type: KEYS_ONLY }`);
+      } else if (projectionType === 'INCLUDE' && nonKeyAttributes?.length) {
+        const nonKeyAttrsStr = nonKeyAttributes.map(attr => `"${attr}"`).join(', ');
+        attributes.push(`projection: { type: INCLUDE, nonKeyAttributes: [${nonKeyAttrsStr}] }`);
+      }
+    }
+
     return `@index(${attributes.join(', ')})`;
   };
 
   return secondaryIndexes.reduce(
     (
       acc: TransformedSecondaryIndexes,
-      { data: { partitionKey, sortKeys, indexName, queryField } },
+      { data: { partitionKey, sortKeys, indexName, queryField, projectionType, nonKeyAttributes } },
     ) => {
       acc[partitionKey] = acc[partitionKey] || [];
       acc[partitionKey].push(
@@ -1180,6 +1192,8 @@ const transformedSecondaryIndexesForModel = (
           sortKeys as readonly string[],
           indexName,
           queryField,
+          projectionType,
+          nonKeyAttributes,
         ),
       );
 

package/src/ai/ModelType.ts

@@ -18,6 +18,10 @@ const supportedModelsLookup = {
   'Claude 3.7 Sonnet': 'anthropic.claude-3-7-sonnet-20250219-v1:0',
   'Claude Opus 4': 'anthropic.claude-opus-4-20250514-v1:0',
   'Claude Sonnet 4': 'anthropic.claude-sonnet-4-20250514-v1:0',
+  // Claude 4.5 models (require global inference profiles)
+  'Claude Haiku 4.5': 'global.anthropic.claude-haiku-4-5-20251001-v1:0',
+  'Claude Sonnet 4.5': 'global.anthropic.claude-sonnet-4-5-20250929-v1:0',
+  'Claude Opus 4.5': 'global.anthropic.claude-opus-4-5-20251101-v1:0',
   // Cohere models
   'Cohere Command R': 'cohere.command-r-v1:0',
   'Cohere Command R+': 'cohere.command-r-plus-v1:0',