@aws-amplify/api-graphql 4.0.18-unstable.7d95fa1.0 → 4.0.18-unstable.7e4eff3.0

package/dist/esm/internals/operations/custom.d.ts

@@ -0,0 +1,60 @@
+import { AmplifyServer } from '@aws-amplify/core/internals/adapter-core';
+import { AuthModeParams, ClientWithModels, GraphQLOptionsV6, ListArgs, QueryArgs } from '../../types';
+import { ModelIntrospectionSchema, CustomOperation } from '@aws-amplify/core/internals/utils';
+/**
+ * Builds an operation function, embedded with all client and context data, that
+ * can be attached to a client as a custom query or mutation.
+ *
+ * If we have this source schema:
+ *
+ * ```typescript
+ * a.schema({
+ *   echo: a.query()
+ *     .arguments({input: a.string().required()})
+ *     .returns(a.string())
+ * })
+ * ```
+ *
+ * Our model intro schema will contain an entry like this:
+ *
+ * ```ts
+ * {
+ *   queries: {
+ *     echo: {
+ *       name: "echo",
+ *       isArray: false,
+ *       type: 'String',
+ *       isRequired: false,
+ *       arguments: {
+ *         input: {
+ *           name: 'input',
+ *           isArray: false,
+ *           type: String,
+ *           isRequired: true
+ *         }
+ *       }
+ *     }
+ *   }
+ * }
+ * ```
+ *
+ * The `echo` object is used to build the `echo' method that goes here:
+ *
+ * ```typescript
+ * const client = generateClent()
+ * const { data } = await client.queries.echo({input: 'a string'});
+ * //                                    ^
+ * //                                    |
+ * //                                    +-- This one right here.
+ * //
+ * ```
+ *
+ *
+ * @param client The client to run graphql queries through.
+ * @param modelIntrospection The model introspection schema the op comes from.
+ * @param operationType The broad category of graphql operation.
+ * @param operation The operation definition from the introspection schema.
+ * @param useContext Whether the function needs to accept an SSR context.
+ * @returns The operation function to attach to query, mutations, etc.
+ */
+export declare function customOpFactory(client: ClientWithModels, modelIntrospection: ModelIntrospectionSchema, operationType: 'query' | 'mutation', operation: CustomOperation, useContext: boolean): ((contextSpec: AmplifyServer.ContextSpec & GraphQLOptionsV6<unknown, string>, arg?: QueryArgs, options?: AuthModeParams & ListArgs) => Promise<any>) | ((arg?: QueryArgs, options?: AuthModeParams & ListArgs) => Promise<any>);

package/dist/esm/internals/operations/custom.mjs

@@ -0,0 +1,287 @@
+import { authModeParams, getCustomHeaders, flattenItems, initializeModel } from '../APIClient.mjs';
+
+/**
+ * Builds an operation function, embedded with all client and context data, that
+ * can be attached to a client as a custom query or mutation.
+ *
+ * If we have this source schema:
+ *
+ * ```typescript
+ * a.schema({
+ *   echo: a.query()
+ *     .arguments({input: a.string().required()})
+ *     .returns(a.string())
+ * })
+ * ```
+ *
+ * Our model intro schema will contain an entry like this:
+ *
+ * ```ts
+ * {
+ *   queries: {
+ *     echo: {
+ *       name: "echo",
+ *       isArray: false,
+ *       type: 'String',
+ *       isRequired: false,
+ *       arguments: {
+ *         input: {
+ *           name: 'input',
+ *           isArray: false,
+ *           type: String,
+ *           isRequired: true
+ *         }
+ *       }
+ *     }
+ *   }
+ * }
+ * ```
+ *
+ * The `echo` object is used to build the `echo' method that goes here:
+ *
+ * ```typescript
+ * const client = generateClent()
+ * const { data } = await client.queries.echo({input: 'a string'});
+ * //                                    ^
+ * //                                    |
+ * //                                    +-- This one right here.
+ * //
+ * ```
+ *
+ *
+ * @param client The client to run graphql queries through.
+ * @param modelIntrospection The model introspection schema the op comes from.
+ * @param operationType The broad category of graphql operation.
+ * @param operation The operation definition from the introspection schema.
+ * @param useContext Whether the function needs to accept an SSR context.
+ * @returns The operation function to attach to query, mutations, etc.
+ */
+function customOpFactory(client, modelIntrospection, operationType, operation, useContext) {
+    const opWithContext = async (contextSpec, arg, options) => {
+        return _op(client, modelIntrospection, operationType, operation, arg, options, contextSpec);
+    };
+    const op = async (arg, options) => {
+        return _op(client, modelIntrospection, operationType, operation, arg, options);
+    };
+    return useContext ? opWithContext : op;
+}
+/**
+ * Runtime test and type guard to check whether `o[field]` is a `String`.
+ *
+ * ```typescript
+ * if (hasStringField(o, 'prop')) {
+ *   const s = o.prop;
+ *   //    ^? const s: string
+ * }
+ * ```
+ *
+ * @param o Object to inspect
+ * @param field Field to look for
+ * @returns Boolean: `true` if the `o[field]` is a `string`
+ */
+function hasStringField(o, field) {
+    return typeof o[field] === 'string';
+}
+/**
+ * Generates "outer" arguments string for a custom operation. For example,
+ * in this operation:
+ *
+ * ```graphql
+ * query MyQuery(InputString: String!) {
+ *   echoString(InputString: $InputString)
+ * }
+ * ```
+ *
+ * This function returns the top/outer level arguments as a string:
+ *
+ * ```json
+ * "InputString: String!"
+ * ```
+ *
+ * @param operation Operation object from model introspection schema.
+ * @returns "outer" arguments string
+ */
+function outerArguments(operation) {
+    const args = Object.entries(operation.arguments)
+        .map(([k, v]) => {
+        const baseType = v.type + (v.isRequired ? '!' : '');
+        const finalType = v.isArray
+            ? `[${baseType}]${v.isArrayNullable ? '' : '!'}`
+            : baseType;
+        return `$${k}: ${finalType}`;
+    })
+        .join(', ');
+    return args.length > 0 ? `(${args})` : '';
+}
+/**
+ * Generates "inner" arguments string for a custom operation. For example,
+ * in this operation:
+ *
+ * ```graphql
+ * query MyQuery(InputString: String!) {
+ *   echoString(InputString: $InputString)
+ * }
+ * ```
+ *
+ * This function returns the inner arguments as a string:
+ *
+ * ```json
+ * "InputString: $InputString"
+ * ```
+ *
+ * @param operation Operation object from model introspection schema.
+ * @returns "outer" arguments string
+ */
+function innerArguments(operation) {
+    const args = Object.entries(operation.arguments)
+        .map(([k, v]) => `${k}: $${k}`)
+        .join(', ');
+    return args.length > 0 ? `(${args})` : '';
+}
+/**
+ * Accepts a Model or NonModel from generated introspection schema and
+ * generates the selection set string.
+ *
+ * @param nonModel Model or nonModel object from introspection schema.
+ * @returns String selection set.
+ */
+function modelishTypeSelectionSet(nonModel) {
+    return Object.values(nonModel.fields)
+        .filter(field => hasStringField(field, 'type') ||
+        hasStringField(field.type, 'nonModel') ||
+        hasStringField(field.type, 'enum'))
+        .map(field => field.name)
+        .join(' ');
+}
+/**
+ * Generates the selection set string for a custom operation. This is slightly
+ * different than the selection set generation for models. If the custom op returns
+ * a primitive or enum types, it doen't require a selection set at all.
+ *
+ * E.g., the graphql might look like this:
+ *
+ * ```graphql
+ * query MyQuery {
+ *   echoString(inputString: "whatever")
+ * }
+ * #                                     ^
+ * #                                     |
+ * #                                     +-- no selection set
+ * ```
+ *
+ * Non-primitive return type selection set generation will be similar to other
+ * model operations.
+ *
+ * @param modelIntrospection The full code-generated introspection schema.
+ * @param operation The operation object from the schema.
+ * @returns The selection set as a string.
+ */
+function operationSelectionSet(modelIntrospection, operation) {
+    if (hasStringField(operation, 'type') ||
+        hasStringField(operation.type, 'enum')) {
+        return '';
+    }
+    else if (hasStringField(operation.type, 'nonModel')) {
+        const model = modelIntrospection.nonModels[operation.type.nonModel];
+        return `{${modelishTypeSelectionSet(model)}}`;
+    }
+    else if (hasStringField(operation.type, 'model')) {
+        const nonModel = modelIntrospection.models[operation.type.model];
+        return `{${modelishTypeSelectionSet(nonModel)}}`;
+    }
+    else {
+        return '';
+    }
+}
+/**
+ * Maps an arguments objec to graphql variables, removing superfluous args and
+ * screaming loudly when required args are missing.
+ *
+ * @param operation The operation to construct graphql request variables for.
+ * @param args The arguments to map variables from.
+ * @returns The graphql variables object.
+ */
+function operationVariables(operation, args = {}) {
+    const variables = {};
+    for (const argDef of Object.values(operation.arguments)) {
+        if (typeof args[argDef.name] !== 'undefined') {
+            variables[argDef.name] = args[argDef.name];
+        }
+        else if (argDef.isRequired) {
+            // At this point, the variable is both required and missing: We don't need
+            // to continue. The operation is expected to fail.
+            throw new Error(`${operation.name} requires arguments '${argDef.name}'`);
+        }
+    }
+    return variables;
+}
+/**
+ * Executes an operation from the given model intro schema against a client, returning
+ * a fully instantiated model when relevant.
+ *
+ * @param client The client to operate `graphql()` calls through.
+ * @param modelIntrospection The model intro schema to construct requests from.
+ * @param operationType The high level graphql operation type.
+ * @param operation The specific operation name, args, return type details.
+ * @param args The arguments to provide to the operation as variables.
+ * @param options Request options like headers, etc.
+ * @param context SSR context if relevant.
+ * @returns Result from the graphql request, model-instantiated when relevant.
+ */
+async function _op(client, modelIntrospection, operationType, operation, args, options, context) {
+    const { name: operationName } = operation;
+    const auth = authModeParams(client, options);
+    const headers = getCustomHeaders(client, options?.headers);
+    const outerArgsString = outerArguments(operation);
+    const innerArgsString = innerArguments(operation);
+    const selectionSet = operationSelectionSet(modelIntrospection, operation);
+    const returnTypeModelName = hasStringField(operation.type, 'model')
+        ? operation.type.model
+        : undefined;
+    const query = `
+		${operationType.toLocaleLowerCase()}${outerArgsString} {
+			${operationName}${innerArgsString} ${selectionSet}
+		}
+	`;
+    const variables = operationVariables(operation, args);
+    try {
+        const { data, extensions } = context
+            ? (await client.graphql(context, {
+                ...auth,
+                query,
+                variables,
+            }, headers))
+            : (await client.graphql({
+                ...auth,
+                query,
+                variables,
+            }, headers));
+        // flatten response
+        if (data) {
+            const [key] = Object.keys(data);
+            const flattenedResult = flattenItems(data)[key];
+            // TODO: custom selection set. current selection set is default selection set only
+            // custom selection set requires data-schema-type + runtime updates above.
+            const [initialized] = returnTypeModelName
+                ? initializeModel(client, returnTypeModelName, [flattenedResult], modelIntrospection, auth.authMode, auth.authToken, !!context)
+                : [flattenedResult];
+            return { data: initialized, extensions };
+        }
+        else {
+            return { data: null, extensions };
+        }
+    }
+    catch (error) {
+        if (error.errors) {
+            // graphql errors pass through
+            return error;
+        }
+        else {
+            // non-graphql errors re re-thrown
+            throw error;
+        }
+    }
+}
+
+export { customOpFactory };
+//# sourceMappingURL=custom.mjs.map

package/dist/esm/internals/operations/custom.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom.mjs","sources":["../../../../src/internals/operations/custom.ts"],"sourcesContent":["import { initializeModel, flattenItems, authModeParams, getCustomHeaders, } from '../APIClient';\n/**\n * Builds an operation function, embedded with all client and context data, that\n * can be attached to a client as a custom query or mutation.\n *\n * If we have this source schema:\n *\n * ```typescript\n * a.schema({\n *   echo: a.query()\n *     .arguments({input: a.string().required()})\n *     .returns(a.string())\n * })\n * ```\n *\n * Our model intro schema will contain an entry like this:\n *\n * ```ts\n * {\n *   queries: {\n *     echo: {\n *       name: \"echo\",\n *       isArray: false,\n *       type: 'String',\n *       isRequired: false,\n *       arguments: {\n *         input: {\n *           name: 'input',\n *           isArray: false,\n *           type: String,\n *           isRequired: true\n *         }\n *       }\n *     }\n *   }\n * }\n * ```\n *\n * The `echo` object is used to build the `echo' method that goes here:\n *\n * ```typescript\n * const client = generateClent()\n * const { data } = await client.queries.echo({input: 'a string'});\n * //                                    ^\n * //                                    |\n * //                                    +-- This one right here.\n * //\n * ```\n *\n *\n * @param client The client to run graphql queries through.\n * @param modelIntrospection The model introspection schema the op comes from.\n * @param operationType The broad category of graphql operation.\n * @param operation The operation definition from the introspection schema.\n * @param useContext Whether the function needs to accept an SSR context.\n * @returns The operation function to attach to query, mutations, etc.\n */\nexport function customOpFactory(client, modelIntrospection, operationType, operation, useContext) {\n    const opWithContext = async (contextSpec, arg, options) => {\n        return _op(client, modelIntrospection, operationType, operation, arg, options, contextSpec);\n    };\n    const op = async (arg, options) => {\n        return _op(client, modelIntrospection, operationType, operation, arg, options);\n    };\n    return useContext ? opWithContext : op;\n}\n/**\n * Runtime test and type guard to check whether `o[field]` is a `String`.\n *\n * ```typescript\n * if (hasStringField(o, 'prop')) {\n *   const s = o.prop;\n *   //    ^? const s: string\n * }\n * ```\n *\n * @param o Object to inspect\n * @param field Field to look for\n * @returns Boolean: `true` if the `o[field]` is a `string`\n */\nfunction hasStringField(o, field) {\n    return typeof o[field] === 'string';\n}\n/**\n * Generates \"outer\" arguments string for a custom operation. For example,\n * in this operation:\n *\n * ```graphql\n * query MyQuery(InputString: String!) {\n *   echoString(InputString: $InputString)\n * }\n * ```\n *\n * This function returns the top/outer level arguments as a string:\n *\n * ```json\n * \"InputString: String!\"\n * ```\n *\n * @param operation Operation object from model introspection schema.\n * @returns \"outer\" arguments string\n */\nfunction outerArguments(operation) {\n    const args = Object.entries(operation.arguments)\n        .map(([k, v]) => {\n        const baseType = v.type + (v.isRequired ? '!' : '');\n        const finalType = v.isArray\n            ? `[${baseType}]${v.isArrayNullable ? '' : '!'}`\n            : baseType;\n        return `$${k}: ${finalType}`;\n    })\n        .join(', ');\n    return args.length > 0 ? `(${args})` : '';\n}\n/**\n * Generates \"inner\" arguments string for a custom operation. For example,\n * in this operation:\n *\n * ```graphql\n * query MyQuery(InputString: String!) {\n *   echoString(InputString: $InputString)\n * }\n * ```\n *\n * This function returns the inner arguments as a string:\n *\n * ```json\n * \"InputString: $InputString\"\n * ```\n *\n * @param operation Operation object from model introspection schema.\n * @returns \"outer\" arguments string\n */\nfunction innerArguments(operation) {\n    const args = Object.entries(operation.arguments)\n        .map(([k, v]) => `${k}: $${k}`)\n        .join(', ');\n    return args.length > 0 ? `(${args})` : '';\n}\n/**\n * Accepts a Model or NonModel from generated introspection schema and\n * generates the selection set string.\n *\n * @param nonModel Model or nonModel object from introspection schema.\n * @returns String selection set.\n */\nfunction modelishTypeSelectionSet(nonModel) {\n    return Object.values(nonModel.fields)\n        .filter(field => hasStringField(field, 'type') ||\n        hasStringField(field.type, 'nonModel') ||\n        hasStringField(field.type, 'enum'))\n        .map(field => field.name)\n        .join(' ');\n}\n/**\n * Generates the selection set string for a custom operation. This is slightly\n * different than the selection set generation for models. If the custom op returns\n * a primitive or enum types, it doen't require a selection set at all.\n *\n * E.g., the graphql might look like this:\n *\n * ```graphql\n * query MyQuery {\n *   echoString(inputString: \"whatever\")\n * }\n * #                                     ^\n * #                                     |\n * #                                     +-- no selection set\n * ```\n *\n * Non-primitive return type selection set generation will be similar to other\n * model operations.\n *\n * @param modelIntrospection The full code-generated introspection schema.\n * @param operation The operation object from the schema.\n * @returns The selection set as a string.\n */\nfunction operationSelectionSet(modelIntrospection, operation) {\n    if (hasStringField(operation, 'type') ||\n        hasStringField(operation.type, 'enum')) {\n        return '';\n    }\n    else if (hasStringField(operation.type, 'nonModel')) {\n        const model = modelIntrospection.nonModels[operation.type.nonModel];\n        return `{${modelishTypeSelectionSet(model)}}`;\n    }\n    else if (hasStringField(operation.type, 'model')) {\n        const nonModel = modelIntrospection.models[operation.type.model];\n        return `{${modelishTypeSelectionSet(nonModel)}}`;\n    }\n    else {\n        return '';\n    }\n}\n/**\n * Maps an arguments objec to graphql variables, removing superfluous args and\n * screaming loudly when required args are missing.\n *\n * @param operation The operation to construct graphql request variables for.\n * @param args The arguments to map variables from.\n * @returns The graphql variables object.\n */\nfunction operationVariables(operation, args = {}) {\n    const variables = {};\n    for (const argDef of Object.values(operation.arguments)) {\n        if (typeof args[argDef.name] !== 'undefined') {\n            variables[argDef.name] = args[argDef.name];\n        }\n        else if (argDef.isRequired) {\n            // At this point, the variable is both required and missing: We don't need\n            // to continue. The operation is expected to fail.\n            throw new Error(`${operation.name} requires arguments '${argDef.name}'`);\n        }\n    }\n    return variables;\n}\n/**\n * Executes an operation from the given model intro schema against a client, returning\n * a fully instantiated model when relevant.\n *\n * @param client The client to operate `graphql()` calls through.\n * @param modelIntrospection The model intro schema to construct requests from.\n * @param operationType The high level graphql operation type.\n * @param operation The specific operation name, args, return type details.\n * @param args The arguments to provide to the operation as variables.\n * @param options Request options like headers, etc.\n * @param context SSR context if relevant.\n * @returns Result from the graphql request, model-instantiated when relevant.\n */\nasync function _op(client, modelIntrospection, operationType, operation, args, options, context) {\n    const { name: operationName } = operation;\n    const auth = authModeParams(client, options);\n    const headers = getCustomHeaders(client, options?.headers);\n    const outerArgsString = outerArguments(operation);\n    const innerArgsString = innerArguments(operation);\n    const selectionSet = operationSelectionSet(modelIntrospection, operation);\n    const returnTypeModelName = hasStringField(operation.type, 'model')\n        ? operation.type.model\n        : undefined;\n    const query = `\n\t\t${operationType.toLocaleLowerCase()}${outerArgsString} {\n\t\t\t${operationName}${innerArgsString} ${selectionSet}\n\t\t}\n\t`;\n    const variables = operationVariables(operation, args);\n    try {\n        const { data, extensions } = context\n            ? (await client.graphql(context, {\n                ...auth,\n                query,\n                variables,\n            }, headers))\n            : (await client.graphql({\n                ...auth,\n                query,\n                variables,\n            }, headers));\n        // flatten response\n        if (data) {\n            const [key] = Object.keys(data);\n            const flattenedResult = flattenItems(data)[key];\n            // TODO: custom selection set. current selection set is default selection set only\n            // custom selection set requires data-schema-type + runtime updates above.\n            const [initialized] = returnTypeModelName\n                ? initializeModel(client, returnTypeModelName, [flattenedResult], modelIntrospection, auth.authMode, auth.authToken, !!context)\n                : [flattenedResult];\n            return { data: initialized, extensions };\n        }\n        else {\n            return { data: null, extensions };\n        }\n    }\n    catch (error) {\n        if (error.errors) {\n            // graphql errors pass through\n            return error;\n        }\n        else {\n            // non-graphql errors re re-thrown\n            throw error;\n        }\n    }\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/internals/server/generateClientWithAmplifyInstance.mjs

@@ -2,7 +2,10 @@ import '../InternalGraphQLAPI.mjs';
 import { graphql, cancel, isCancelError } from '../v6.mjs';
 import '../generateClient.mjs';
 import { generateModelsProperty } from './generateModelsProperty.mjs';
-import { __amplify, __authMode, __authToken } from '../../types/index.mjs';
+import { __amplify, __authMode, __authToken, __headers } from '../../types/index.mjs';
+import { isApiGraphQLConfig } from '../utils/isApiGraphQLProviderConfig.mjs';
+import { generateEnumsProperty } from '../utils/generateEnumsProperty.mjs';
+import { generateCustomQueriesProperty, generateCustomMutationsProperty } from '../generateCustomOperationsProperty.mjs';
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
@@ -22,11 +25,18 @@ function generateClientWithAmplifyInstance(params) {
         [__amplify]: params.amplify,
         [__authMode]: params.authMode,
         [__authToken]: params.authToken,
+        [__headers]: params.headers,
         graphql,
         cancel,
         isCancelError,
     };
-    client.models = generateModelsProperty(client, params);
+    const apiGraphqlConfig = params.config?.API?.GraphQL;
+    if (isApiGraphQLConfig(apiGraphqlConfig)) {
+        client.models = generateModelsProperty(client, params);
+        client.enums = generateEnumsProperty(apiGraphqlConfig);
+        client.queries = generateCustomQueriesProperty(client, apiGraphqlConfig);
+        client.mutations = generateCustomMutationsProperty(client, apiGraphqlConfig);
+    }
     return client;
 }
 

package/dist/esm/internals/server/generateClientWithAmplifyInstance.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generateClientWithAmplifyInstance.mjs","sources":["../../../../src/internals/server/generateClientWithAmplifyInstance.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { graphql, cancel, isCancelError } from '..';\nimport { generateModelsProperty } from './generateModelsProperty';\nimport { __amplify, __authMode, __authToken, } from '../../types';\n/**\n * @private\n *\n * Used internally by `adapter-nextjs` package.\n *\n * Creates a client that can be used to make GraphQL requests, using a provided `AmplifyClassV6`\n * compatible context object for config and auth fetching.\n *\n * @param params\n * @returns\n */\nexport function generateClientWithAmplifyInstance(params) {\n    const client = {\n        [__amplify]: params.amplify,\n        [__authMode]: params.authMode,\n        [__authToken]: params.authToken,\n        graphql,\n        cancel,\n        isCancelError,\n    };\n    client.models = generateModelsProperty(client, params);\n    return client;\n}\n"],"names":[],"mappings":";;;;;;AAAA;AACA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,iCAAiC,CAAC,MAAM,EAAE;AAC1D,IAAI,MAAM,MAAM,GAAG;AACnB,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO;AACnC,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ;AACrC,QAAQ,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS;AACvC,QAAQ,OAAO;AACf,QAAQ,MAAM;AACd,QAAQ,aAAa;AACrB,KAAK,CAAC;AACN,IAAI,MAAM,CAAC,MAAM,GAAG,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC3D,IAAI,OAAO,MAAM,CAAC;AAClB;;;;"}
+{"version":3,"file":"generateClientWithAmplifyInstance.mjs","sources":["../../../../src/internals/server/generateClientWithAmplifyInstance.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { graphql, cancel, isCancelError } from '..';\nimport { generateModelsProperty } from './generateModelsProperty';\nimport { __amplify, __authMode, __authToken, __headers, } from '../../types';\nimport { isApiGraphQLConfig } from '../utils/isApiGraphQLProviderConfig';\nimport { generateEnumsProperty } from '../utils/generateEnumsProperty';\nimport { generateCustomMutationsProperty, generateCustomQueriesProperty, } from '../generateCustomOperationsProperty';\n/**\n * @private\n *\n * Used internally by `adapter-nextjs` package.\n *\n * Creates a client that can be used to make GraphQL requests, using a provided `AmplifyClassV6`\n * compatible context object for config and auth fetching.\n *\n * @param params\n * @returns\n */\nexport function generateClientWithAmplifyInstance(params) {\n    const client = {\n        [__amplify]: params.amplify,\n        [__authMode]: params.authMode,\n        [__authToken]: params.authToken,\n        [__headers]: params.headers,\n        graphql,\n        cancel,\n        isCancelError,\n    };\n    const apiGraphqlConfig = params.config?.API?.GraphQL;\n    if (isApiGraphQLConfig(apiGraphqlConfig)) {\n        client.models = generateModelsProperty(client, params);\n        client.enums = generateEnumsProperty(apiGraphqlConfig);\n        client.queries = generateCustomQueriesProperty(client, apiGraphqlConfig);\n        client.mutations = generateCustomMutationsProperty(client, apiGraphqlConfig);\n    }\n    return client;\n}\n"],"names":[],"mappings":";;;;;;;;;AAAA;AACA;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,iCAAiC,CAAC,MAAM,EAAE;AAC1D,IAAI,MAAM,MAAM,GAAG;AACnB,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO;AACnC,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ;AACrC,QAAQ,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS;AACvC,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO;AACnC,QAAQ,OAAO;AACf,QAAQ,MAAM;AACd,QAAQ,aAAa;AACrB,KAAK,CAAC;AACN,IAAI,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC;AACzD,IAAI,IAAI,kBAAkB,CAAC,gBAAgB,CAAC,EAAE;AAC9C,QAAQ,MAAM,CAAC,MAAM,GAAG,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC/D,QAAQ,MAAM,CAAC,KAAK,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;AAC/D,QAAQ,MAAM,CAAC,OAAO,GAAG,6BAA6B,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AACjF,QAAQ,MAAM,CAAC,SAAS,GAAG,+BAA+B,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AACrF,KAAK;AACL,IAAI,OAAO,MAAM,CAAC;AAClB;;;;"}

package/dist/esm/types/index.d.ts

@@ -1,5 +1,5 @@
 import { AmplifyClassV6, ResourcesConfig } from '@aws-amplify/core';
-import { ModelTypes, CustomHeaders, EnumTypes } from '@aws-amplify/data-schema-types';
+import { EnumTypes, ModelTypes, CustomHeaders, CustomQueries, CustomMutations } from '@aws-amplify/data-schema-types';
 import { Source, DocumentNode, GraphQLError } from 'graphql';
 export { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
@@ -295,6 +295,8 @@ export type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
     isCancelError: (error: any) => boolean;
     models: ModelTypes<T>;
     enums: EnumTypes<T>;
+    queries: CustomQueries<T>;
+    mutations: CustomMutations<T>;
 }>;
 export type V6ClientSSRRequest<T extends Record<any, any> = never> = ExcludeNeverFields<{
     [__amplify]: AmplifyClassV6;
@@ -305,6 +307,9 @@ export type V6ClientSSRRequest<T extends Record<any, any> = never> = ExcludeNeve
     cancel: (promise: Promise<any>, message?: string) => boolean;
     isCancelError: (error: any) => boolean;
     models: ModelTypes<T, 'REQUEST'>;
+    enums: EnumTypes<T>;
+    queries: CustomQueries<T, 'REQUEST'>;
+    mutations: CustomMutations<T, 'REQUEST'>;
 }>;
 export type V6ClientSSRCookies<T extends Record<any, any> = never> = ExcludeNeverFields<{
     [__amplify]: AmplifyClassV6;
@@ -315,6 +320,9 @@ export type V6ClientSSRCookies<T extends Record<any, any> = never> = ExcludeNeve
     cancel: (promise: Promise<any>, message?: string) => boolean;
     isCancelError: (error: any) => boolean;
     models: ModelTypes<T, 'COOKIES'>;
+    enums: EnumTypes<T>;
+    queries: CustomQueries<T, 'COOKIES'>;
+    mutations: CustomMutations<T, 'COOKIES'>;
 }>;
 export type GraphQLMethod = <FALLBACK_TYPES = unknown, TYPED_GQL_STRING extends string = string>(options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>, additionalHeaders?: CustomHeaders | undefined) => GraphQLResponseV6<FALLBACK_TYPES, TYPED_GQL_STRING>;
 export type GraphQLMethodSSR = <FALLBACK_TYPES = unknown, TYPED_GQL_STRING extends string = string>(contextSpec: AmplifyServer.ContextSpec, options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>, additionalHeaders?: CustomHeaders | undefined) => GraphQLResponseV6<FALLBACK_TYPES, TYPED_GQL_STRING>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.18-unstable.7d95fa1.0+7d95fa1",
+	"version": "4.0.18-unstable.7e4eff3.0+7e4eff3",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/esm/index.mjs",
@@ -71,7 +71,7 @@
 	},
 	"homepage": "https://aws-amplify.github.io/",
 	"devDependencies": {
-		"@aws-amplify/data-schema": "^0.13.2",
+		"@aws-amplify/data-schema": "^0.13.6",
 		"@rollup/plugin-typescript": "11.1.5",
 		"rollup": "^4.9.6",
 		"typescript": "5.0.2"
@@ -84,9 +84,9 @@
 		"server"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.18-unstable.7d95fa1.0+7d95fa1",
-		"@aws-amplify/core": "6.0.18-unstable.7d95fa1.0+7d95fa1",
-		"@aws-amplify/data-schema-types": "^0.7.2",
+		"@aws-amplify/api-rest": "4.0.18-unstable.7e4eff3.0+7e4eff3",
+		"@aws-amplify/core": "6.0.18-unstable.7e4eff3.0+7e4eff3",
+		"@aws-amplify/data-schema-types": "^0.7.5",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
@@ -101,5 +101,5 @@
 			"limit": "91.7 kB"
 		}
 	],
-	"gitHead": "7d95fa1c2cfdeef75e71a235dbfc616b44773d75"
+	"gitHead": "7e4eff3be3ec25520332330461ca2cefbf7bdbb7"
 }

package/src/internals/generateClient.ts

@@ -1,11 +1,20 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { Hub } from '@aws-amplify/core';
-import { EnumTypes, ModelTypes } from '@aws-amplify/data-schema-types';
 import { graphql, cancel, isCancelError } from './v6';
+import {
+	EnumTypes,
+	ModelTypes,
+	CustomQueries,
+	CustomMutations,
+} from '@aws-amplify/data-schema-types';
 import { generateEnumsProperty } from './utils/generateEnumsProperty';
 import { generateModelsProperty } from './utils/generateModelsProperty';
 import { isApiGraphQLConfig } from './utils/isApiGraphQLProviderConfig';
+import {
+	generateCustomQueriesProperty,
+	generateCustomMutationsProperty,
+} from './generateCustomOperationsProperty';
 import {
 	V6Client,
 	__amplify,
@@ -38,6 +47,8 @@ export function generateClient<T extends Record<any, any> = never>(
 		isCancelError,
 		models: emptyProperty as ModelTypes<never>,
 		enums: emptyProperty as EnumTypes<never>,
+		queries: emptyProperty as CustomQueries<never>,
+		mutations: emptyProperty as CustomMutations<never>,
 	} as any;
 
 	const apiGraphqlConfig = params.amplify.getConfig().API?.GraphQL;
@@ -45,6 +56,11 @@ export function generateClient<T extends Record<any, any> = never>(
 	if (isApiGraphQLConfig(apiGraphqlConfig)) {
 		client.models = generateModelsProperty<T>(client, apiGraphqlConfig);
 		client.enums = generateEnumsProperty<T>(apiGraphqlConfig);
+		client.queries = generateCustomQueriesProperty<T>(client, apiGraphqlConfig);
+		client.mutations = generateCustomMutationsProperty<T>(
+			client,
+			apiGraphqlConfig,
+		);
 	} else {
 		// This happens when the `Amplify.configure()` call gets evaluated after the `generateClient()` call.
 		//
@@ -75,6 +91,14 @@ const generateModelsPropertyOnAmplifyConfigure = (clientRef: any) => {
 		if (isApiGraphQLConfig(apiGraphQLConfig)) {
 			clientRef.models = generateModelsProperty(clientRef, apiGraphQLConfig);
 			clientRef.enums = generateEnumsProperty(apiGraphQLConfig);
+			clientRef.queries = generateCustomQueriesProperty(
+				clientRef,
+				apiGraphQLConfig,
+			);
+			clientRef.mutations = generateCustomMutationsProperty(
+				clientRef,
+				apiGraphQLConfig,
+			);
 		}
 	});
 };

package/src/internals/generateCustomOperationsProperty.ts

@@ -0,0 +1,89 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { CustomQueries, CustomMutations } from '@aws-amplify/data-schema-types';
+import { V6Client, __authMode, __authToken, __amplify } from '../types';
+
+import { customOpFactory } from './operations/custom';
+import {
+	ModelIntrospectionSchema,
+	GraphQLProviderConfig,
+} from '@aws-amplify/core/internals/utils';
+
+type OpTypes = 'queries' | 'mutations';
+
+type CustomOpsProperty<
+	T extends Record<any, any>,
+	OpType extends OpTypes,
+> = OpType extends 'queries' ? CustomQueries<T> : CustomMutations<T>;
+
+const operationTypeMap = {
+	queries: 'query',
+	mutations: 'mutation',
+} as const;
+
+export function generateCustomOperationsProperty<
+	T extends Record<any, any>,
+	OpType extends OpTypes,
+>(
+	client: V6Client<Record<string, any>>,
+	config: GraphQLProviderConfig['GraphQL'],
+	operationsType: OpType,
+): OpType extends 'queries' ? CustomQueries<T> : CustomMutations<T> {
+	// some bundlers end up with `Amplify.configure` being called *after* generate client.
+	// if that occurs, we need to *not error* while we wait. handling for late configuration
+	// occurs in `generateClient()`. we do not need to subscribe to Hub events here.
+	if (!config) {
+		return {} as CustomOpsProperty<T, OpType>;
+	}
+
+	const modelIntrospection: ModelIntrospectionSchema | undefined =
+		config.modelIntrospection;
+
+	// model intro schema might be absent if there's not actually a configured GraphQL API
+	if (!modelIntrospection) {
+		return {} as CustomOpsProperty<T, OpType>;
+	}
+
+	// custom operations will be absent from model intro schema if no custom ops
+	// are present on the source schema.
+	const operations = modelIntrospection[operationsType];
+	if (!operations) {
+		return {} as CustomOpsProperty<T, OpType>;
+	}
+
+	const ops = {} as CustomOpsProperty<T, OpType>;
+	const useContext = client[__amplify] === null;
+	for (const operation of Object.values(operations)) {
+		(ops as any)[operation.name] = customOpFactory(
+			client,
+			modelIntrospection,
+			operationTypeMap[operationsType],
+			operation,
+			useContext
+		);
+	}
+
+	return ops;
+}
+
+export function generateCustomMutationsProperty<T extends Record<any, any>>(
+	client: V6Client<Record<string, any>>,
+	config: GraphQLProviderConfig['GraphQL'],
+) {
+	return generateCustomOperationsProperty<T, 'mutations'>(
+		client,
+		config,
+		'mutations',
+	);
+}
+
+export function generateCustomQueriesProperty<T extends Record<any, any>>(
+	client: V6Client<Record<string, any>>,
+	config: GraphQLProviderConfig['GraphQL'],
+) {
+	return generateCustomOperationsProperty<T, 'queries'>(
+		client,
+		config,
+		'queries',
+	);
+}