@aws-amplify/data-schema 1.8.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-schema",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -64,7 +64,7 @@
     "jest": "^29.7.0",
     "jest-tsd": "^0.2.2",
     "rimraf": "^5.0.5",
-    "rollup": "^4.9.6",
+    "rollup": "^4.22.4",
     "ts-jest": "^29.1.1",
     "turbo": "^1.10.14",
     "typescript": "^5.1.6"

package/src/ModelField.ts

@@ -8,6 +8,11 @@ import type { brandSymbol } from './util/Brand.js';
  */
 export const __auth = Symbol('__auth');
 
+/**
+ * Used by `.default()` to represent a generated field (SQL).
+ */
+export const __generated = Symbol('__generated');
+
 const brandName = 'modelField';
 
 export enum ModelFieldType {
@@ -44,7 +49,7 @@ type FieldData = {
   required: boolean;
   array: boolean;
   arrayRequired: boolean;
-  default: undefined | ModelFieldTypeParamOuter;
+  default: undefined | symbol | ModelFieldTypeParamOuter;
   authorization: Authorization<any, any, any>[];
 };
 
@@ -110,7 +115,7 @@ export type ModelField<
      * @param value the default value
      */
     default(
-      value: ModelFieldTypeParamOuter,
+      value?: ModelFieldTypeParamOuter,
     ): ModelField<T, UsedMethod | 'default'>;
     /**
      * Configures field-level authorization rules. Pass in an array of authorizations `(allow => allow.____)` to mix and match
@@ -178,7 +183,7 @@ function _field<T extends ModelFieldTypeParamOuter>(fieldType: ModelFieldType) {
       return this;
     },
     default(val) {
-      data.default = val;
+      data.default = typeof val === 'undefined' ? __generated : val;
       _meta.lastInvokedMethod = 'default';
 
       return this;

package/src/SchemaProcessor.ts

@@ -5,6 +5,7 @@ import {
   string,
   type BaseModelField,
   ModelFieldType,
+  __generated,
 } from './ModelField';
 import {
   ModelRelationshipTypes,
@@ -198,7 +199,9 @@ function scalarFieldToGql(
     }
   }
 
-  if (_default !== undefined) {
+  if (_default === __generated) {
+    field += ` @default`;
+  } else if (_default !== undefined) {
     field += ` @default(value: "${_default?.toString()}")`;
   }
 

package/src/ai/ConversationType.ts

@@ -68,12 +68,14 @@ export interface ConversationRoute {
 }
 
 // conversation types
-export interface ConversationSendMessageInput {
+interface ConversationSendMessageInputObject {
   content: ConversationSendMessageInputContent[];
   aiContext?: string | Record<string, any>;
   toolConfiguration?: ToolConfiguration;
 }
 
+export type ConversationSendMessageInput = ConversationSendMessageInputObject | string;
+
 interface ConversationListMessagesInput {
   limit?: number;
   nextToken?: string | null;
@@ -83,6 +85,11 @@ type ConversationOnMessageHandler = (message: ConversationMessage) => void;
 
 export interface Conversation {
   id: string;
+  createdAt: string;
+  updatedAt: string;
+
+  metadata?: Record<string, any>;
+  name?: string;
   /**
    * @experimental
    *

package/src/runtime/internals/ai/convertItemToConversation.ts

@@ -17,9 +17,13 @@ export const convertItemToConversation = (
   client: BaseClient,
   modelIntrospection: ModelIntrospectionSchema,
   conversationId: string,
+  conversationCreatedAt: string,
+  conversationUpdatedAt: string,
   conversationRouteName: string,
   conversationMessageModel: SchemaModel,
   getInternals: ClientInternalsGetter,
+  conversationMetadata?: Record<string, any>,
+  conversationName?: string,
 ): Conversation => {
   if (!conversationId) {
     throw new Error(
@@ -28,6 +32,10 @@ export const convertItemToConversation = (
   }
   return {
     id: conversationId,
+    createdAt: conversationCreatedAt,
+    updatedAt: conversationUpdatedAt,
+    metadata: conversationMetadata,
+    name: conversationName,
     onMessage: createOnMessageFunction(
       client as BaseBrowserClient,
       modelIntrospection,

package/src/runtime/internals/ai/createCreateConversationFunction.ts

@@ -41,9 +41,13 @@ export const createCreateConversationFunction =
         client,
         modelIntrospection,
         data?.id,
+        data?.createdAt,
+        data?.updatedAt,
         conversationRouteName,
         conversationMessageModel,
         getInternals,
+        data?.metadata,
+        data?.name,
       ),
       errors,
     };

package/src/runtime/internals/ai/createDeleteConversationFunction.ts

@@ -44,9 +44,13 @@ export const createDeleteConversationFunction =
             client,
             modelIntrospection,
             data?.id,
+            data?.createdAt,
+            data?.updatedAt,
             conversationRouteName,
             conversationMessageModel,
             getInternals,
+            data?.metadata,
+            data?.name,
           )
         : data,
       errors,

package/src/runtime/internals/ai/createGetConversationFunction.ts

@@ -44,9 +44,13 @@ export const createGetConversationFunction =
             client,
             modelIntrospection,
             data.id,
+            data.createdAt,
+            data.updatedAt,
             conversationRouteName,
             conversationMessageModel,
             getInternals,
+            data?.metadata,
+            data?.name,
           )
         : data,
       errors,

package/src/runtime/internals/ai/createListConversationsFunction.ts

@@ -41,9 +41,13 @@ export const createListConversationsFunction =
           client,
           modelIntrospection,
           datum.id,
+          datum.createdAt,
+          datum.updatedAt,
           conversationRouteName,
           conversationMessageModel,
           getInternals,
+          datum?.metadata,
+          datum?.name,
         );
       }),
       nextToken,