npm - @aws-amplify/data-schema - Versions diffs - 1.17.5 → 1.19.0 - Mend

@aws-amplify/data-schema 1.17.5 → 1.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

package/dist/cjs/runtime/internals/ai/conversationMessageDeserializers.js CHANGED Viewed

@@ -9,6 +9,9 @@ const deserializeContent = (content) => content.map((block) => {
     if (block.image) {
         return deserializeImageBlock(block);
     }
+    if (block.document) {
+        return deserializeDocumentBlock(block);
+    }
     if (block.toolUse) {
         return deserializeToolUseBlock(block);
     }
@@ -27,6 +30,15 @@ const deserializeImageBlock = ({ image }) => ({
         },
     },
 });
+const deserializeDocumentBlock = ({ document }) => ({
+    document: {
+        ...document,
+        source: {
+            ...document.source,
+            bytes: (0, util_base64_1.fromBase64)(document.source.bytes),
+        },
+    },
+});
 const deserializeJsonBlock = ({ json }) => ({
     json: JSON.parse(json),
 });

package/dist/cjs/runtime/internals/ai/conversationMessageDeserializers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"conversationMessageDeserializers.js","sources":["../../../../../src/runtime/internals/ai/conversationMessageDeserializers.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.deserializeContent = void 0;\nconst util_base64_1 = require(\"@smithy/util-base64\");\nconst deserializeContent = (content) => content.map((block) => {\n if (block.image) {\n return deserializeImageBlock(block);\n }\n if (block.toolUse) {\n return deserializeToolUseBlock(block);\n }\n if (block.toolResult) {\n return deserializeToolResultBlock(block);\n }\n return removeNullsFromBlock(block);\n});\nexports.deserializeContent = deserializeContent;\nconst deserializeImageBlock = ({ image }) => ({\n image: {\n ...image,\n source: {\n ...image.source,\n bytes: (0, util_base64_1.fromBase64)(image.source.bytes),\n },\n },\n});\nconst deserializeJsonBlock = ({ json }) => ({\n json: JSON.parse(json),\n});\nconst deserializeToolUseBlock = ({ toolUse }) => ({\n toolUse: {\n ...toolUse,\n input: JSON.parse(toolUse.input),\n },\n});\nconst deserializeToolResultBlock = ({ toolResult, }) => ({\n toolResult: {\n toolUseId: toolResult.toolUseId,\n content: toolResult.content.map((toolResultBlock) => {\n if (toolResultBlock.image) {\n return deserializeImageBlock(toolResultBlock);\n }\n if (toolResultBlock.json) {\n return deserializeJsonBlock(toolResultBlock);\n }\n return removeNullsFromBlock(toolResultBlock);\n }),\n },\n});\nconst removeNullsFromBlock = (block) => Object.fromEntries(Object.entries(block).filter(([_, v]) => v !== null));\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,kBAAkB,GAAG,KAAK,CAAC,CAAC;AACpC,MAAM,aAAa,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AACrD,MAAM,kBAAkB,GAAG,CAAC,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,KAAK;AAC/D,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE;AACrB,QAAQ,OAAO,qBAAqB,CAAC,KAAK,CAAC,CAAC;AAC5C,KAAK;AACL,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE;AACvB,QAAQ,OAAO,uBAAuB,CAAC,KAAK,CAAC,CAAC;AAC9C,KAAK;AACL,IAAI,IAAI,KAAK,CAAC,UAAU,EAAE;AAC1B,QAAQ,OAAO,0BAA0B,CAAC,KAAK,CAAC,CAAC;AACjD,KAAK;AACL,IAAI,OAAO,oBAAoB,CAAC,KAAK,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC;AACH,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;AAChD,MAAM,qBAAqB,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM;AAC9C,IAAI,KAAK,EAAE;AACX,QAAQ,GAAG,KAAK;AAChB,QAAQ,MAAM,EAAE;AAChB,YAAY,GAAG,KAAK,CAAC,MAAM;AAC3B,YAAY,KAAK,EAAE,IAAI,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;AACpE,SAAS;AACT,KAAK;AACL,CAAC,CAAC,CAAC;AACH,MAAM,oBAAoB,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM;AAC5C,IAAI,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;AAC1B,CAAC,CAAC,CAAC;AACH,MAAM,uBAAuB,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM;AAClD,IAAI,OAAO,EAAE;AACb,QAAQ,GAAG,OAAO;AAClB,QAAQ,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;AACxC,KAAK;AACL,CAAC,CAAC,CAAC;AACH,MAAM,0BAA0B,GAAG,CAAC,EAAE,UAAU,GAAG,MAAM;AACzD,IAAI,UAAU,EAAE;AAChB,QAAQ,SAAS,EAAE,UAAU,CAAC,SAAS;AACvC,QAAQ,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,eAAe,KAAK;AAC7D,YAAY,IAAI,eAAe,CAAC,KAAK,EAAE;AACvC,gBAAgB,OAAO,qBAAqB,CAAC,eAAe,CAAC,CAAC;AAC9D,aAAa;AACb,YAAY,IAAI,eAAe,CAAC,IAAI,EAAE;AACtC,gBAAgB,OAAO,oBAAoB,CAAC,eAAe,CAAC,CAAC;AAC7D,aAAa;AACb,YAAY,OAAO,oBAAoB,CAAC,eAAe,CAAC,CAAC;AACzD,SAAS,CAAC;AACV,KAAK;AACL,CAAC,CAAC,CAAC;AACH,MAAM,oBAAoB,GAAG,CAAC,KAAK,KAAK,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;;"}
1	+ {"version":3,"file":"conversationMessageDeserializers.js","sources":["../../../../../src/runtime/internals/ai/conversationMessageDeserializers.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.deserializeContent = void 0;\nconst util_base64_1 = require(\"@smithy/util-base64\");\nconst deserializeContent = (content) => content.map((block) => {\n if (block.image) {\n return deserializeImageBlock(block);\n }\n if (block.document) {\n return deserializeDocumentBlock(block);\n }\n if (block.toolUse) {\n return deserializeToolUseBlock(block);\n }\n if (block.toolResult) {\n return deserializeToolResultBlock(block);\n }\n return removeNullsFromBlock(block);\n});\nexports.deserializeContent = deserializeContent;\nconst deserializeImageBlock = ({ image }) => ({\n image: {\n ...image,\n source: {\n ...image.source,\n bytes: (0, util_base64_1.fromBase64)(image.source.bytes),\n },\n },\n});\nconst deserializeDocumentBlock = ({ document }) => ({\n document: {\n ...document,\n source: {\n ...document.source,\n bytes: (0, util_base64_1.fromBase64)(document.source.bytes),\n },\n },\n});\nconst deserializeJsonBlock = ({ json }) => ({\n json: JSON.parse(json),\n});\nconst deserializeToolUseBlock = ({ toolUse }) => ({\n toolUse: {\n ...toolUse,\n input: JSON.parse(toolUse.input),\n },\n});\nconst deserializeToolResultBlock = ({ toolResult, }) => ({\n toolResult: {\n toolUseId: toolResult.toolUseId,\n content: toolResult.content.map((toolResultBlock) => {\n if (toolResultBlock.image) {\n return deserializeImageBlock(toolResultBlock);\n }\n if (toolResultBlock.json) {\n return deserializeJsonBlock(toolResultBlock);\n }\n return removeNullsFromBlock(toolResultBlock);\n }),\n },\n});\nconst removeNullsFromBlock = (block) => Object.fromEntries(Object.entries(block).filter(([_, v]) => v !== null));\n"],"names":[],"mappings":"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"}

package/dist/cjs/runtime/internals/ai/conversationMessageSerializers.js CHANGED Viewed

@@ -11,6 +11,9 @@ const serializeContent = (content) => content.map((block) => {
     if (block.image) {
         return serializeImageBlock(block);
     }
+    if (block.document) {
+        return serializeDocumentBlock(block);
+    }
     if (block.toolResult) {
         return serializeToolResultBlock(block);
     }
@@ -38,6 +41,15 @@ const serializeImageBlock = ({ image }) => ({
         },
     },
 });
+const serializeDocumentBlock = ({ document, }) => ({
+    document: {
+        ...document,
+        source: {
+            ...document.source,
+            bytes: (0, util_base64_1.toBase64)(document.source.bytes),
+        },
+    },
+});
 const serializeJsonBlock = ({ json }) => ({
     json: JSON.stringify(json),
 });

package/dist/cjs/runtime/internals/ai/conversationMessageSerializers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"conversationMessageSerializers.js","sources":["../../../../../src/runtime/internals/ai/conversationMessageSerializers.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.serializeToolConfiguration = exports.serializeContent = exports.serializeAiContext = void 0;\nconst util_base64_1 = require(\"@smithy/util-base64\");\nconst serializeAiContext = (aiContext) => JSON.stringify(aiContext);\nexports.serializeAiContext = serializeAiContext;\nconst serializeContent = (content) => content.map((block) => {\n if (block.image) {\n return serializeImageBlock(block);\n }\n if (block.toolResult) {\n return serializeToolResultBlock(block);\n }\n return block;\n});\nexports.serializeContent = serializeContent;\nconst serializeToolConfiguration = ({ tools }) => ({\n tools: Object.entries(tools).map(([name, tool]) => ({\n toolSpec: {\n name,\n description: tool.description,\n inputSchema: {\n json: JSON.stringify(tool.inputSchema.json),\n },\n },\n })),\n});\nexports.serializeToolConfiguration = serializeToolConfiguration;\nconst serializeImageBlock = ({ image }) => ({\n image: {\n ...image,\n source: {\n ...image.source,\n bytes: (0, util_base64_1.toBase64)(image.source.bytes),\n },\n },\n});\nconst serializeJsonBlock = ({ json }) => ({\n json: JSON.stringify(json),\n});\nconst serializeToolResultBlock = ({ toolResult, }) => ({\n toolResult: {\n ...toolResult,\n content: toolResult.content.map((toolResultBlock) => {\n if (toolResultBlock.image) {\n return serializeImageBlock(toolResultBlock);\n }\n if (toolResultBlock.json) {\n return serializeJsonBlock(toolResultBlock);\n }\n return toolResultBlock;\n }),\n },\n});\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,0BAA0B,GAAG,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,GAAG,KAAK,CAAC,CAAC;AACpG,MAAM,aAAa,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AACrD,MAAM,kBAAkB,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AACpE,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;AAChD,MAAM,gBAAgB,GAAG,CAAC,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,KAAK;AAC7D,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE;AACrB,QAAQ,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAC1C,KAAK;AACL,IAAI,IAAI,KAAK,CAAC,UAAU,EAAE;AAC1B,QAAQ,OAAO,wBAAwB,CAAC,KAAK,CAAC,CAAC;AAC/C,KAAK;AACL,IAAI,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC,CAAC;AACH,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;AAC5C,MAAM,0BAA0B,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM;AACnD,IAAI,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM;AACxD,QAAQ,QAAQ,EAAE;AAClB,YAAY,IAAI;AAChB,YAAY,WAAW,EAAE,IAAI,CAAC,WAAW;AACzC,YAAY,WAAW,EAAE;AACzB,gBAAgB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;AAC3D,aAAa;AACb,SAAS;AACT,KAAK,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AACH,OAAO,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;AAChE,MAAM,mBAAmB,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM;AAC5C,IAAI,KAAK,EAAE;AACX,QAAQ,GAAG,KAAK;AAChB,QAAQ,MAAM,EAAE;AAChB,YAAY,GAAG,KAAK,CAAC,MAAM;AAC3B,YAAY,KAAK,EAAE,IAAI,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;AAClE,SAAS;AACT,KAAK;AACL,CAAC,CAAC,CAAC;AACH,MAAM,kBAAkB,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM;AAC1C,IAAI,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;AAC9B,CAAC,CAAC,CAAC;AACH,MAAM,wBAAwB,GAAG,CAAC,EAAE,UAAU,GAAG,MAAM;AACvD,IAAI,UAAU,EAAE;AAChB,QAAQ,GAAG,UAAU;AACrB,QAAQ,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,eAAe,KAAK;AAC7D,YAAY,IAAI,eAAe,CAAC,KAAK,EAAE;AACvC,gBAAgB,OAAO,mBAAmB,CAAC,eAAe,CAAC,CAAC;AAC5D,aAAa;AACb,YAAY,IAAI,eAAe,CAAC,IAAI,EAAE;AACtC,gBAAgB,OAAO,kBAAkB,CAAC,eAAe,CAAC,CAAC;AAC3D,aAAa;AACb,YAAY,OAAO,eAAe,CAAC;AACnC,SAAS,CAAC;AACV,KAAK;AACL,CAAC,CAAC;;"}
1	+ {"version":3,"file":"conversationMessageSerializers.js","sources":["../../../../../src/runtime/internals/ai/conversationMessageSerializers.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.serializeToolConfiguration = exports.serializeContent = exports.serializeAiContext = void 0;\nconst util_base64_1 = require(\"@smithy/util-base64\");\nconst serializeAiContext = (aiContext) => JSON.stringify(aiContext);\nexports.serializeAiContext = serializeAiContext;\nconst serializeContent = (content) => content.map((block) => {\n if (block.image) {\n return serializeImageBlock(block);\n }\n if (block.document) {\n return serializeDocumentBlock(block);\n }\n if (block.toolResult) {\n return serializeToolResultBlock(block);\n }\n return block;\n});\nexports.serializeContent = serializeContent;\nconst serializeToolConfiguration = ({ tools }) => ({\n tools: Object.entries(tools).map(([name, tool]) => ({\n toolSpec: {\n name,\n description: tool.description,\n inputSchema: {\n json: JSON.stringify(tool.inputSchema.json),\n },\n },\n })),\n});\nexports.serializeToolConfiguration = serializeToolConfiguration;\nconst serializeImageBlock = ({ image }) => ({\n image: {\n ...image,\n source: {\n ...image.source,\n bytes: (0, util_base64_1.toBase64)(image.source.bytes),\n },\n },\n});\nconst serializeDocumentBlock = ({ document, }) => ({\n document: {\n ...document,\n source: {\n ...document.source,\n bytes: (0, util_base64_1.toBase64)(document.source.bytes),\n },\n },\n});\nconst serializeJsonBlock = ({ json }) => ({\n json: JSON.stringify(json),\n});\nconst serializeToolResultBlock = ({ toolResult, }) => ({\n toolResult: {\n ...toolResult,\n content: toolResult.content.map((toolResultBlock) => {\n if (toolResultBlock.image) {\n return serializeImageBlock(toolResultBlock);\n }\n if (toolResultBlock.json) {\n return serializeJsonBlock(toolResultBlock);\n }\n return toolResultBlock;\n }),\n },\n});\n"],"names":[],"mappings":"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"}

package/dist/esm/ClientSchema/Core/ClientCustomOperations.d.ts CHANGED Viewed

@@ -6,8 +6,8 @@ import type { AppSyncResolverHandler } from 'aws-lambda';
 import type { CustomType } from '../../CustomType';
 import type { FieldTypesOfCustomType } from '../../MappedTypes/ResolveSchema';
 import type { ResolveRef } from '../utilities/ResolveRef';
-import type { EnumType } from '../../EnumType';
 import { ClientSchemaProperty } from './ClientSchemaProperty';
+import type { ResolveFields } from '../utilities';
 type CustomOperationSubType<Op extends CustomOperationParamShape> = `custom${Op['typeName']}`;
 /**
  * Derives the signature and types for a lambda handler for a particular
@@ -27,7 +27,7 @@ export interface ClientCustomOperation<RefBag extends Record<any, any>, Op exten
      * }
      * ```
      */
-    functionHandler: AppSyncResolverHandler<CustomOpArguments<Op>, Op['handlers'] extends UltimateFunctionHandlerAsyncType ? void : LambdaReturnType<CustomOpReturnType<Op, RefBag>>>;
+    functionHandler: AppSyncResolverHandler<CustomOpArguments<Op, RefBag>, Op['handlers'] extends UltimateFunctionHandlerAsyncType ? void : LambdaReturnType<CustomOpReturnType<Op, RefBag>>>;
     /**
      * The `context.arguments` type for lambda function implementations.
      *
@@ -40,7 +40,7 @@ export interface ClientCustomOperation<RefBag extends Record<any, any>, Op exten
      * }
      * ```
      */
-    args: CustomOpArguments<Op>;
+    args: CustomOpArguments<Op, RefBag>;
     /**
      * The return type expected by a lambda function handler.
      *
@@ -61,10 +61,13 @@ export interface ClientCustomOperation<RefBag extends Record<any, any>, Op exten
 }
 /**
  * Digs out custom operation arguments, mapped to the intended graphql types.
+ * using the existing ResolveFields utility type. This handles:
+ * - Basic scalar fields
+ * - Enum types
+ * - Custom types (including nested structures)
+ * - Reference types
  */
-type CustomOpArguments<Shape extends CustomOperationParamShape> = Shape['arguments'] extends null ? never : ResolveFieldRequirements<{
-    [FieldName in keyof Shape['arguments']]: Shape['arguments'][FieldName] extends BaseModelField<infer R> ? R : Shape['arguments'][FieldName] extends EnumType<infer Values> ? Values[number] | null : never;
-}>;
+type CustomOpArguments<Shape extends CustomOperationParamShape, RefBag extends Record<string, any> = any> = Shape['arguments'] extends null ? never : ResolveFields<RefBag, Shape['arguments']>;
 /**
  * Removes `null | undefined` from the return type if the operation is a subscription,
  * since subs don't fire on empty/non-existent values.

package/dist/esm/CustomOperation.d.ts CHANGED Viewed

@@ -12,7 +12,7 @@ declare const mutationBrand = "mutationCustomOperation";
 declare const subscriptionBrand = "subscriptionCustomOperation";
 declare const generationBrand = "generationCustomOperation";
 type CustomOperationBrand = typeof queryBrand | typeof mutationBrand | typeof subscriptionBrand | typeof generationBrand;
-type CustomArguments = Record<string, BaseModelField | EnumType>;
+type CustomArguments = Record<string, BaseModelField | EnumType | CustomType<any> | RefType<any, any>>;
 type SubscriptionSource = RefType<any, any>;
 type InternalSubscriptionSource = InternalRef;
 type CustomReturnType = RefType<any> | CustomType<any>;

package/dist/esm/SchemaProcessor.mjs CHANGED Viewed

@@ -252,10 +252,15 @@ function customOperationToGql(typeName, typeDef, authorization, isCustom = false
             refererTypeName: typeName,
         });
     }
-    if (Object.keys(fieldArgs).length > 0) {
-        const { gqlFields, implicitTypes: implied } = processFields(typeName, fieldArgs, {}, {});
-        callSignature += `(${gqlFields.join(', ')})`;
-        implicitTypes.push(...implied);
+    const { inputTypes, argDefinitions, collectedEnums } = generateInputTypes(typeName, fieldArgs, getRefType);
+    // Handle collected enums
+    for (const [enumName, enumDef] of collectedEnums) {
+        if (!implicitTypes.some(([name]) => name === enumName)) {
+            implicitTypes.push([enumName, enumDef]);
+        }
+    }
+    if (argDefinitions.length > 0) {
+        callSignature += `(${argDefinitions.join(', ')})`;
     }
     const handler = handlers && handlers[0];
     const brand = handler && getBrand(handler);
@@ -330,6 +335,7 @@ function customOperationToGql(typeName, typeDef, authorization, isCustom = false
         customTypeAuthRules,
         lambdaFunctionDefinition,
         customSqlDataSourceStrategy,
+        inputTypes,
     };
 }
 /**
@@ -853,6 +859,134 @@ const mergeCustomTypeAuthRules = (existing, added) => {
         existing[typeName] = authRules;
     }
 };
+/**
+ * Generates input types for custom operations in the schema.
+ *
+ * Processes operation arguments to create corresponding input types,
+ * handling referenced and inline custom types, enums, and nested structures.
+ * Manages circular references and prevents duplicate processing.
+ *
+ **/
+function generateInputTypes(operationName, args, getRefType) {
+    const inputTypes = [];
+    const argDefinitions = [];
+    const collectedEnums = new Map();
+    const processedTypes = new Set(); // Track processed types to avoid duplicates
+    const processNonScalarFields = (fields, originalTypeName, isParentRef = false, parentChain = []) => {
+        const processedFields = {};
+        for (const [fieldName, fieldDef] of Object.entries(fields)) {
+            if (isRefField(fieldDef)) {
+                const refType = getRefType(fieldDef.data.link, originalTypeName);
+                if (refType.type === 'CustomType') {
+                    const nestedInputTypeName = `${fieldDef.data.link}Input`;
+                    processedFields[fieldName] = {
+                        data: { type: 'ref', link: nestedInputTypeName },
+                    };
+                    // Process the nested type if it hasn't been processed and isn't a circular reference
+                    if (!parentChain.includes(nestedInputTypeName) &&
+                        !processedTypes.has(nestedInputTypeName)) {
+                        processedTypes.add(nestedInputTypeName);
+                        const nestedFields = processNonScalarFields(refType.def.data.fields, fieldDef.data.link, true, [...parentChain, nestedInputTypeName]);
+                        inputTypes.push({
+                            name: nestedInputTypeName,
+                            fields: nestedFields,
+                        });
+                    }
+                }
+                else if (refType.type === 'Enum') {
+                    processedFields[fieldName] = {
+                        data: { type: 'ref', link: fieldDef.data.link },
+                    };
+                }
+                else {
+                    throw new Error(`Unsupported reference type '${refType.type}' for field '${fieldName}'. ` +
+                        `Only references to CustomType and Enum are supported.`);
+                }
+            }
+            else if (isCustomType(fieldDef)) {
+                // Handle inline custom types
+                const nestedInputTypeName = `${capitalize(originalTypeName)}${capitalize(fieldName)}Input`;
+                processedFields[fieldName] = {
+                    data: { type: 'ref', link: nestedInputTypeName },
+                };
+                if (!processedTypes.has(nestedInputTypeName)) {
+                    processedTypes.add(nestedInputTypeName);
+                    const nestedFields = processNonScalarFields(fieldDef.data.fields, `${capitalize(originalTypeName)}${capitalize(fieldName)}`, isParentRef, [...parentChain, nestedInputTypeName]);
+                    inputTypes.push({
+                        name: nestedInputTypeName,
+                        fields: nestedFields,
+                    });
+                }
+            }
+            else if (isEnumType(fieldDef)) {
+                // Handle enum types
+                const enumName = `${capitalize(originalTypeName)}${capitalize(fieldName)}`;
+                if (!collectedEnums.has(enumName) && !isParentRef) {
+                    collectedEnums.set(enumName, fieldDef);
+                }
+                processedFields[fieldName] = { data: { type: 'ref', link: enumName } };
+            }
+            else {
+                processedFields[fieldName] = fieldDef;
+            }
+        }
+        return processedFields;
+    };
+    // Process top-level arguments
+    for (const [argName, argDef] of Object.entries(args)) {
+        if (isRefField(argDef)) {
+            const refType = getRefType(argDef.data.link, operationName);
+            if (refType.type === 'CustomType') {
+                const inputTypeName = `${argDef.data.link}Input`;
+                argDefinitions.push(`${argName}: ${inputTypeName}`);
+                // Process the input type if it hasn't been processed yet
+                if (!processedTypes.has(inputTypeName)) {
+                    processedTypes.add(inputTypeName);
+                    const fields = processNonScalarFields(refType.def.data.fields, argDef.data.link, true, [inputTypeName]);
+                    inputTypes.push({
+                        name: inputTypeName,
+                        fields,
+                    });
+                }
+            }
+            else if (refType.type === 'Enum') {
+                argDefinitions.push(`${argName}: ${argDef.data.link}`);
+            }
+            else {
+                throw new Error(`Unsupported reference type '${refType.type}' for argument '${argName}' in '${operationName}'. ` +
+                    `Only references to CustomType and Enum are supported.`);
+            }
+        }
+        else if (isEnumType(argDef)) {
+            // Handle top-level enum arguments
+            const enumName = `${capitalize(operationName)}${capitalize(argName)}`;
+            if (!collectedEnums.has(enumName)) {
+                collectedEnums.set(enumName, argDef);
+            }
+            argDefinitions.push(`${argName}: ${enumName}`);
+        }
+        else if (isCustomType(argDef)) {
+            // Handle top-level custom type arguments
+            const inputTypeName = `${capitalize(operationName)}${capitalize(argName)}Input`;
+            argDefinitions.push(`${argName}: ${inputTypeName}`);
+            if (!processedTypes.has(inputTypeName)) {
+                processedTypes.add(inputTypeName);
+                const fields = processNonScalarFields(argDef.data.fields, `${capitalize(operationName)}${capitalize(argName)}`, false, [inputTypeName]);
+                inputTypes.push({
+                    name: inputTypeName,
+                    fields,
+                });
+            }
+        }
+        else if (isScalarField(argDef)) {
+            argDefinitions.push(`${argName}: ${scalarFieldToGql(argDef.data)}`);
+        }
+        else {
+            throw new Error(`Unsupported argument type for ${argName}`);
+        }
+    }
+    return { inputTypes, argDefinitions, collectedEnums };
+}
 const schemaPreprocessor = (schema) => {
     const gqlModels = [];
     const customQueries = [];
@@ -884,6 +1018,7 @@ const schemaPreprocessor = (schema) => {
     const topLevelTypes = sortTopLevelTypes(Object.entries(schema.data.types));
     const { schemaAuth, functionSchemaAccess } = extractFunctionSchemaAccess(schema.data.authorization);
     const getRefType = getRefTypeForSchema(schema);
+    const uniqueInputTypes = new Map();
     for (const [typeName, typeDef] of topLevelTypes) {
         const mostRelevantAuthRules = typeDef.data?.authorization?.length > 0
             ? typeDef.data.authorization
@@ -916,7 +1051,13 @@ const schemaPreprocessor = (schema) => {
             else if (isCustomOperation(typeDef)) {
                 // TODO: add generation route logic.
                 const { typeName: opType } = typeDef.data;
-                const { gqlField, implicitTypes, customTypeAuthRules, jsFunctionForField, lambdaFunctionDefinition, customSqlDataSourceStrategy, } = transformCustomOperations(typeDef, typeName, mostRelevantAuthRules, databaseType, getRefType);
+                const { gqlField, implicitTypes, customTypeAuthRules, jsFunctionForField, lambdaFunctionDefinition, customSqlDataSourceStrategy, inputTypes, } = transformCustomOperations(typeDef, typeName, mostRelevantAuthRules, databaseType, getRefType);
+                // Process input types without duplicates
+                for (const { name, fields } of inputTypes) {
+                    if (!uniqueInputTypes.has(name)) {
+                        uniqueInputTypes.set(name, fields);
+                    }
+                }
                 topLevelTypes.push(...implicitTypes);
                 mergeCustomTypeAuthRules(customTypeInheritedAuthRules, customTypeAuthRules);
                 if (customTypeAuthRules) {
@@ -1006,6 +1147,12 @@ const schemaPreprocessor = (schema) => {
             gqlModels.push(model);
         }
     }
+    // Generate input types after processing all custom operations
+    for (const [name, fields] of uniqueInputTypes) {
+        const { gqlFields } = processFields(name, fields, {}, {}, undefined, undefined, undefined, databaseEngine);
+        const inputTypeDefinition = `input ${name} {\n  ${gqlFields.join('\n  ')}\n}`;
+        gqlModels.push(inputTypeDefinition);
+    }
     const customOperations = {
         queries: customQueries,
         mutations: customMutations,
@@ -1200,7 +1347,7 @@ function transformCustomOperations(typeDef, typeName, authRules, databaseType, g
         opType, typeName);
     }
     const isCustom = Boolean(jsFunctionForField);
-    const { gqlField, implicitTypes, customTypeAuthRules, lambdaFunctionDefinition, customSqlDataSourceStrategy, } = customOperationToGql(typeName, typeDef, authRules, isCustom, databaseType, getRefType);
+    const { gqlField, implicitTypes, customTypeAuthRules, lambdaFunctionDefinition, customSqlDataSourceStrategy, inputTypes, } = customOperationToGql(typeName, typeDef, authRules, isCustom, databaseType, getRefType);
     return {
         gqlField,
         implicitTypes,
@@ -1208,6 +1355,7 @@ function transformCustomOperations(typeDef, typeName, authRules, databaseType, g
         jsFunctionForField,
         lambdaFunctionDefinition,
         customSqlDataSourceStrategy,
+        inputTypes,
     };
 }
 function generateCustomOperationTypes({ queries, mutations, subscriptions, }) {