update conversation route return type to model

aws-amplify · Jul 24, 2024 · c7f80b1 · c7f80b1
1 parent 27bf11b
commit c7f80b1
Show file tree

Hide file tree

Showing 6 changed files with 326 additions and 289 deletions.
diff --git a/packages/appsync-modelgen-plugin/schemas/introspection/1/ModelIntrospectionSchema.json b/packages/appsync-modelgen-plugin/schemas/introspection/1/ModelIntrospectionSchema.json
@@ -190,6 +190,18 @@
                         "nonModel"
                     ],
                     "additionalProperties": false
+                },
+                {
+                    "type": "object",
+                    "properties": {
+                        "interface": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "interface"
+                    ],
+                    "additionalProperties": false
                 }
             ]
         },

diff --git a/...gin/src/__tests__/visitors/__snapshots__/appsync-model-introspection-visitor.test.ts.snap b/...gin/src/__tests__/visitors/__snapshots__/appsync-model-introspection-visitor.test.ts.snap
@@ -4,7 +4,15 @@ exports[`Conversation Route Introspection Visitor Metadata snapshot should gener
 "{
     \\"version\\": 1,
     \\"models\\": {},
-    \\"enums\\": {},
+    \\"enums\\": {
+        \\"ConversationMessageSender\\": {
+            \\"name\\": \\"ConversationMessageSender\\",
+            \\"values\\": [
+                \\"user\\",
+                \\"assistant\\"
+            ]
+        }
+    },
     \\"nonModels\\": {},
     \\"conversations\\": {
         \\"pirateChat\\": {
@@ -251,7 +259,9 @@ exports[`Conversation Route Introspection Visitor Metadata snapshot should gener
                 \\"send\\": {
                     \\"name\\": \\"pirateChat\\",
                     \\"isArray\\": false,
-                    \\"type\\": \\"String\\",
+                    \\"type\\": {
+                        \\"model\\": \\"ConversationMessagePirateChat\\"
+                    },
                     \\"isRequired\\": false,
                     \\"arguments\\": {
                         \\"sessionId\\": {

diff --git a/...ppsync-modelgen-plugin/src/__tests__/visitors/appsync-model-introspection-visitor.test.ts b/...ppsync-modelgen-plugin/src/__tests__/visitors/appsync-model-introspection-visitor.test.ts
@@ -30,8 +30,22 @@ const getVisitor = (schema: string, settings: any = {}, directives: readonly Dir
 
 describe('Conversation Route Introspection Visitor', () => {
   const schema = /* GraphQL */ `
+    enum ConversationMessageSender {
+      user
+      assistant
+    }
+
+    interface ConversationMessage {
+      id: ID!
+      sessionId: ID!
+      sender: ConversationMessageSender
+      content: String
+      context: AWSJSON
+      uiComponents: [AWSJSON]
+    }
+
     type Mutation {
-      pirateChat(sessionId: ID, content: String): String
+      pirateChat(sessionId: ID, content: String): ConversationMessage
       @conversation(aiModel: "Claude3Haiku", functionName: "conversation-handler")
     }
   `;

diff --git a/packages/appsync-modelgen-plugin/src/interfaces/introspection/model-schema.ts b/packages/appsync-modelgen-plugin/src/interfaces/introspection/model-schema.ts
@@ -108,7 +108,8 @@ export type InputFieldType = ScalarType
 export type FieldType = ScalarType
   | { enum: string }
   | { model: string }
-  | { nonModel: string };
+  | { nonModel: string }
+  | { interface: string };
 export type FieldAttribute = ModelAttribute;
 /**
  * Input Definition

diff --git a/packages/appsync-modelgen-plugin/src/validate-cjs.js b/packages/appsync-modelgen-plugin/src/validate-cjs.js