@aws-amplify/data-schema 1.8.1 → 1.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-schema",
-  "version": "1.8.1",
+  "version": "1.9.1",
   "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()}")`;
   }
 
@@ -507,6 +510,16 @@ function customOperationToGql(
     const { aiModel, systemPrompt, inferenceConfiguration } =
       typeDef.data.input;
 
+    // This is done to escape newlines in potentially multi-line system prompts
+    // e.g.
+    // generateStuff: a.generation({
+    //   aiModel: a.ai.model('Claude 3 Haiku'),
+    //   systemPrompt: `Generate a haiku
+    //   make it multiline`,
+    // }),
+    //
+    // It doesn't affect non multi-line string inputs for system prompts
+    const escapedSystemPrompt = systemPrompt.replace(/\r?\n/g, '\\n');
     const inferenceConfigurationEntries = Object.entries(
       inferenceConfiguration ?? {},
     );
@@ -516,7 +529,7 @@ function customOperationToGql(
             .map(([key, value]) => `${key}: ${value}`)
             .join(', ')} }`
         : '';
-    gqlHandlerContent += `@generation(aiModel: "${aiModel.resourcePath}", systemPrompt: "${systemPrompt}"${inferenceConfigurationGql}) `;
+    gqlHandlerContent += `@generation(aiModel: "${aiModel.resourcePath}", systemPrompt: "${escapedSystemPrompt}"${inferenceConfigurationGql}) `;
   }
 
   const gqlField = `${callSignature}: ${returnTypeName} ${gqlHandlerContent}${authString}`;

package/src/ai/ConversationSchemaTypes.ts

@@ -13,7 +13,16 @@ export const createConversationField = (
 
   const args: Record<string, string> = {
     aiModel: aiModel.resourcePath,
-    systemPrompt,
+    // This is done to escape newlines in potentially multi-line system prompts
+    // e.g.
+    // realtorChat: a.conversation({
+    //   aiModel: a.ai.model('Claude 3 Haiku'),
+    //   systemPrompt: `You are a helpful real estate assistant
+    //   Respond in the poetic form of haiku.`,
+    // }),
+    //
+    // It doesn't affect non multi-line string inputs for system prompts
+    systemPrompt: systemPrompt.replace(/\r?\n/g, '\\n'),
   };
 
   if (handler) {