Revert unnecessary changes for custom types and refs

aws-amplify · Jan 17, 2025 · cdb02d1 · cdb02d1
1 parent 949e6ee
commit cdb02d1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 53 deletions.
diff --git a/packages/data-schema/__tests__/CustomOperations.test.ts b/packages/data-schema/__tests__/CustomOperations.test.ts
@@ -1341,14 +1341,15 @@ describe('custom operations + custom type auth inheritance', () => {
 
   test('implicit custom type inherits auth rules from referencing op', () => {
     const s = a.schema({
-      MyQueryReturnType: a.customType({
-        fieldA: a.string(),
-        fieldB: a.integer(),
-      }),
       myQuery: a
         .query()
         .handler(a.handler.function('myFn'))
-        .returns(a.ref('MyQueryReturnType'))
+        .returns(
+          a.customType({
+            fieldA: a.string(),
+            fieldB: a.integer(),
+          }),
+        )
         .authorization((allow) => allow.publicApiKey()),
     });
 
@@ -1362,22 +1363,23 @@ describe('custom operations + custom type auth inheritance', () => {
 
   test('nested custom types inherit auth rules from top-level referencing op', () => {
     const s = a.schema({
-      MyQueryReturnType: a.customType({
-        fieldA: a.string(),
-        fieldB: a.integer(),
-        nestedCustomType: a.customType({
-          nestedA: a.string(),
-          nestedB: a.string(),
-          grandChild: a.customType({
-            grandA: a.string(),
-            grandB: a.string(),
-          }),
-        }),
-      }),
       myQuery: a
         .query()
         .handler(a.handler.function('myFn'))
-        .returns(a.ref('MyQueryReturnType'))
+        .returns(
+          a.customType({
+            fieldA: a.string(),
+            fieldB: a.integer(),
+            nestedCustomType: a.customType({
+              nestedA: a.string(),
+              nestedB: a.string(),
+              grandChild: a.customType({
+                grandA: a.string(),
+                grandB: a.string(),
+              }),
+            }),
+          }),
+        )
         .authorization((allow) => allow.publicApiKey()),
     });
 
@@ -1399,28 +1401,6 @@ describe('custom operations + custom type auth inheritance', () => {
     );
   });
 
-  test('inline custom type inherits auth rules from referencing op', () => {
-    const s = a.schema({
-      myQuery: a
-        .query()
-        .handler(a.handler.function('myFn'))
-        .returns(
-          a.customType({
-            fieldA: a.string(),
-            fieldB: a.integer(),
-          }),
-        )
-        .authorization((allow) => allow.publicApiKey()),
-    });
-
-    const result = s.transform().schema;
-
-    expect(result).toMatchSnapshot();
-    expect(result).toEqual(
-      expect.stringContaining('type MyQueryReturnType @aws_api_key\n{'),
-    );
-  });
-
   test('top-level custom type with nested top-level custom types inherits combined auth rules from referencing ops', () => {
     const s = a.schema({
       myQuery: a

diff --git a/packages/data-schema/__tests__/__snapshots__/CustomOperations.test.ts.snap b/packages/data-schema/__tests__/__snapshots__/CustomOperations.test.ts.snap
@@ -545,18 +545,6 @@ type Query {
 }"
 `;
 
-exports[`custom operations + custom type auth inheritance inline custom type inherits auth rules from referencing op 1`] = `
-"type MyQueryReturnType @aws_api_key
-{
-  fieldA: String
-  fieldB: Int
-}
-
-type Query {
-  myQuery: MyQueryReturnType @function(name: "myFn") @auth(rules: [{allow: public, provider: apiKey}])
-}"
-`;
-
 exports[`custom operations + custom type auth inheritance nested custom types inherit auth rules from top-level referencing op 1`] = `
 "type MyQueryReturnType @aws_api_key
 {

diff --git a/packages/data-schema/src/SchemaProcessor.ts b/packages/data-schema/src/SchemaProcessor.ts
@@ -1424,7 +1424,7 @@ function generateInputTypes(
           generateInputType,
           getRefType,
           authRules,
-          true,
+          false,
         );
         nestedGeneratedTypes.forEach((type) => {
           generatedTypes.add(type);