@aws-amplify/api 5.4.6-unstable.7762f1a.0 → 6.0.0

package/README.md

@@ -0,0 +1,3 @@
+> INTERNAL USE ONLY
+
+This package contains the AWS Amplify API category and is intended for internal use only. To integrate Amplify into your app, please use [aws-amplify](https://www.npmjs.com/package/aws-amplify).

package/lib/API.d.ts

@@ -1,27 +1,5 @@
-import { AWSAppSyncRealTimeProvider } from '@aws-amplify/pubsub';
-import { GraphQLOptions, GraphQLResult } from '@aws-amplify/api-graphql';
-import Observable from 'zen-observable-ts';
-import { GraphQLQuery, GraphQLSubscription } from './types';
-import { InternalAPIClass } from './internals/InternalAPI';
+import { V6Client } from '@aws-amplify/api-graphql';
 /**
- * @deprecated
- * Use RestApi or GraphQLAPI to reduce your application bundle size
- * Export Cloud Logic APIs
+ * Generates an API client that can work with models or raw GraphQL
  */
-export declare class APIClass extends InternalAPIClass {
-    getModuleName(): string;
-    /**
-     * Executes a GraphQL operation
-     *
-     * @param options - GraphQL Options
-     * @param [additionalHeaders] - headers to merge in after any `graphql_headers` set in the config
-     * @returns An Observable if queryType is 'subscription', else a promise of the graphql result from the query.
-     */
-    graphql<T>(options: GraphQLOptions, additionalHeaders?: {
-        [key: string]: string;
-    }): T extends GraphQLQuery<T> ? Promise<GraphQLResult<T>> : T extends GraphQLSubscription<T> ? Observable<{
-        provider: AWSAppSyncRealTimeProvider;
-        value: GraphQLResult<T>;
-    }> : Promise<GraphQLResult<any>> | Observable<object>;
-}
-export declare const API: APIClass;
+export declare function generateClient<T extends Record<any, any> = never>(): V6Client<T>;

package/lib/API.js

@@ -1,28 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var core_1 = require("@aws-amplify/core");
-var InternalAPI_1 = require("./internals/InternalAPI");
-var logger = new core_1.ConsoleLogger('API');
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+const api_graphql_1 = require("@aws-amplify/api-graphql");
+const internals_1 = require("@aws-amplify/api-graphql/internals");
+const core_1 = require("@aws-amplify/core");
 /**
- * @deprecated
- * Use RestApi or GraphQLAPI to reduce your application bundle size
- * Export Cloud Logic APIs
+ * Generates an API client that can work with models or raw GraphQL
  */
-var APIClass = /** @class */ (function (_super) {
-    tslib_1.__extends(APIClass, _super);
-    function APIClass() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    APIClass.prototype.getModuleName = function () {
-        return 'API';
+function generateClient() {
+    return {
+        [api_graphql_1.__amplify]: core_1.Amplify,
+        graphql: internals_1.graphql,
+        cancel: internals_1.cancel,
+        isCancelError: internals_1.isCancelError,
     };
-    APIClass.prototype.graphql = function (options, additionalHeaders) {
-        return _super.prototype.graphql.call(this, options, additionalHeaders);
-    };
-    return APIClass;
-}(InternalAPI_1.InternalAPIClass));
-exports.APIClass = APIClass;
-exports.API = new APIClass(null);
-core_1.Amplify.register(exports.API);
+}
+exports.generateClient = generateClient;
 //# sourceMappingURL=API.js.map

package/lib/API.js.map

@@ -1 +1 @@
-{"version":3,"file":"API.js","sourceRoot":"","sources":["../src/API.ts"],"names":[],"mappings":";;;AAIA,0CAAqE;AAGrE,uDAA2D;AAE3D,IAAM,MAAM,GAAG,IAAI,oBAAM,CAAC,KAAK,CAAC,CAAC;AACjC;;;;GAIG;AACH;IAA8B,oCAAgB;IAA9C;;IA6BA,CAAC;IA5BO,gCAAa,GAApB;QACC,OAAO,KAAK,CAAC;IACd,CAAC;IAoBD,0BAAO,GAAP,UACC,OAAuB,EACvB,iBAA6C;QAE7C,OAAO,iBAAM,OAAO,YAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAClD,CAAC;IACF,eAAC;AAAD,CAAC,AA7BD,CAA8B,8BAAgB,GA6B7C;AA7BY,4BAAQ;AA+BR,QAAA,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;AACtC,cAAO,CAAC,QAAQ,CAAC,WAAG,CAAC,CAAC"}
+{"version":3,"file":"API.js","sourceRoot":"","sources":["../src/API.ts"],"names":[],"mappings":";;AAAA,qEAAqE;AACrE,sCAAsC;AACtC,0DAA+D;AAC/D,kEAI4C;AAC5C,4CAA4C;AAE5C;;GAEG;AACH,SAAgB,cAAc;IAG7B,OAAO;QACN,CAAC,uBAAS,CAAC,EAAE,cAAO;QACpB,OAAO,EAAE,mBAAS;QAClB,MAAM,EAAE,kBAAQ;QAChB,aAAa,EAAE,yBAAe;KAC9B,CAAC;AACH,CAAC;AATD,wCASC"}

package/lib/index.d.ts

@@ -1,4 +1,5 @@
 export { GraphQLQuery, GraphQLSubscription } from './types';
-export { API, APIClass } from './API';
-export { graphqlOperation, GraphQLAuthError, GRAPHQL_AUTH_MODE, } from '@aws-amplify/api-graphql';
-export type { GraphQLResult } from '@aws-amplify/api-graphql';
+export { generateClient } from './API';
+export { GraphQLAuthError } from '@aws-amplify/api-graphql';
+export type { GraphQLResult, GraphQLReturnType, } from '@aws-amplify/api-graphql';
+export { get, put, post, del, head, patch, isCancelError, } from '@aws-amplify/api-rest';

package/lib/index.js

@@ -3,10 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 var API_1 = require("./API");
-exports.API = API_1.API;
-exports.APIClass = API_1.APIClass;
+exports.generateClient = API_1.generateClient;
 var api_graphql_1 = require("@aws-amplify/api-graphql");
-exports.graphqlOperation = api_graphql_1.graphqlOperation;
 exports.GraphQLAuthError = api_graphql_1.GraphQLAuthError;
-exports.GRAPHQL_AUTH_MODE = api_graphql_1.GRAPHQL_AUTH_MODE;
+var api_rest_1 = require("@aws-amplify/api-rest");
+exports.get = api_rest_1.get;
+exports.put = api_rest_1.put;
+exports.post = api_rest_1.post;
+exports.del = api_rest_1.del;
+exports.head = api_rest_1.head;
+exports.patch = api_rest_1.patch;
+exports.isCancelError = api_rest_1.isCancelError;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;AAGtC,6BAAsC;AAA7B,oBAAA,GAAG,CAAA;AAAE,yBAAA,QAAQ,CAAA;AACtB,wDAIkC;AAHjC,yCAAA,gBAAgB,CAAA;AAChB,yCAAA,gBAAgB,CAAA;AAChB,0CAAA,iBAAiB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;AAKtC,6BAAuC;AAA9B,+BAAA,cAAc,CAAA;AAEvB,wDAA4D;AAAnD,yCAAA,gBAAgB,CAAA;AAOzB,kDAQ+B;AAP9B,yBAAA,GAAG,CAAA;AACH,yBAAA,GAAG,CAAA;AACH,0BAAA,IAAI,CAAA;AACJ,yBAAA,GAAG,CAAA;AACH,0BAAA,IAAI,CAAA;AACJ,2BAAA,KAAK,CAAA;AACL,mCAAA,aAAa,CAAA"}

package/lib/internals/InternalAPI.d.ts

@@ -1,8 +1,6 @@
-import { GraphQLOperation, GraphQLOptions, GraphQLResult, OperationTypeNode } from '@aws-amplify/api-graphql';
-import { CustomUserAgentDetails } from '@aws-amplify/core';
-import { AWSAppSyncRealTimeProvider } from '@aws-amplify/pubsub';
-import Observable from 'zen-observable-ts';
-import { GraphQLQuery, GraphQLSubscription } from '../types';
+import { AWSAppSyncRealTimeProvider, GraphQLOperation, GraphQLOptions, GraphQLResult, OperationTypeNode, GraphQLQuery, GraphQLSubscription } from '@aws-amplify/api-graphql';
+import { CustomUserAgentDetails } from '@aws-amplify/core/internals/utils';
+import { Observable } from 'rxjs';
 /**
  * @deprecated
  * Use RestApi or GraphQLAPI to reduce your application bundle size
@@ -14,103 +12,14 @@ export declare class InternalAPIClass {
      * @param {Object} options - Configuration object for API
      */
     private _options;
-    private _restApi;
     private _graphqlApi;
-    Auth: import("@aws-amplify/auth/lib-esm/Auth").AuthClass;
-    Cache: import("@aws-amplify/cache/lib-esm/types").ICache;
-    Credentials: import("@aws-amplify/core").CredentialsClass;
+    Cache: import("@aws-amplify/core/lib-esm/Cache/StorageCache").StorageCache;
     /**
      * Initialize API with AWS configuration
      * @param {Object} options - Configuration object for API
      */
     constructor(options: any);
     getModuleName(): string;
-    /**
-     * Configure API part with aws configurations
-     * @param {Object} config - Configuration of the API
-     * @return {Object} - The current configuration
-     */
-    configure(options: any): any;
-    /**
-     * Make a GET request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    get(apiName: string, path: string, init: {
-        [key: string]: any;
-    }): Promise<any>;
-    /**
-     * Make a POST request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    post(apiName: string, path: string, init: {
-        [key: string]: any;
-    }): Promise<any>;
-    /**
-     * Make a PUT request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    put(apiName: string, path: string, init: {
-        [key: string]: any;
-    }): Promise<any>;
-    /**
-     * Make a PATCH request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    patch(apiName: string, path: string, init: {
-        [key: string]: any;
-    }): Promise<any>;
-    /**
-     * Make a DEL request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    del(apiName: string, path: string, init: {
-        [key: string]: any;
-    }): Promise<any>;
-    /**
-     * Make a HEAD request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    head(apiName: string, path: string, init: {
-        [key: string]: any;
-    }): Promise<any>;
-    /**
-     * Checks to see if an error thrown is from an api request cancellation
-     * @param error - Any error
-     * @return If the error was from an api request cancellation
-     */
-    isCancel(error: any): boolean;
-    /**
-     * Cancels an inflight request for either a GraphQL request or a Rest API request.
-     * @param request - request to cancel
-     * @param [message] - custom error message
-     * @return If the request was cancelled
-     */
-    cancel(request: Promise<any>, message?: string): boolean;
-    private getInitWithCustomUserAgentDetails;
-    /**
-     * Getting endpoint for API
-     * @param apiName - The name of the api
-     * @return The endpoint of the api
-     */
-    endpoint(apiName: string): Promise<string>;
     /**
      * to get the operation type
      * @param operation

package/lib/internals/InternalAPI.js

@@ -1,167 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var internals_1 = require("@aws-amplify/api-graphql/internals");
-var api_rest_1 = require("@aws-amplify/api-rest");
-var auth_1 = require("@aws-amplify/auth");
-var cache_1 = require("@aws-amplify/cache");
-var core_1 = require("@aws-amplify/core");
-var logger = new core_1.ConsoleLogger('API');
+const internals_1 = require("@aws-amplify/api-graphql/internals");
+const core_1 = require("@aws-amplify/core");
+const utils_1 = require("@aws-amplify/core/internals/utils");
+/**
+ * NOTE!
+ *
+ * This is used only by DataStore.
+ *
+ * This can probably be pruned and/or removed. Just leaving it as much of the same
+ * state as possible for V6 to reduce number of potentially impactful changes to DataStore.
+ */
+const logger = new core_1.ConsoleLogger('API');
 /**
  * @deprecated
  * Use RestApi or GraphQLAPI to reduce your application bundle size
  * Export Cloud Logic APIs
  */
-var InternalAPIClass = /** @class */ (function () {
+class InternalAPIClass {
     /**
      * Initialize API with AWS configuration
      * @param {Object} options - Configuration object for API
      */
-    function InternalAPIClass(options) {
-        this.Auth = auth_1.Auth;
-        this.Cache = cache_1.Cache;
-        this.Credentials = core_1.Credentials;
+    constructor(options) {
+        this.Cache = core_1.Cache;
         this._options = options;
-        this._restApi = new api_rest_1.RestAPIClass(options);
         this._graphqlApi = new internals_1.InternalGraphQLAPIClass(options);
         logger.debug('API Options', this._options);
     }
-    InternalAPIClass.prototype.getModuleName = function () {
+    getModuleName() {
         return 'InternalAPI';
-    };
-    /**
-     * Configure API part with aws configurations
-     * @param {Object} config - Configuration of the API
-     * @return {Object} - The current configuration
-     */
-    InternalAPIClass.prototype.configure = function (options) {
-        this._options = Object.assign({}, this._options, options);
-        // Share Amplify instance with client for SSR
-        this._restApi.Credentials = this.Credentials;
-        this._graphqlApi.Auth = this.Auth;
-        this._graphqlApi.Cache = this.Cache;
-        this._graphqlApi.Credentials = this.Credentials;
-        var restAPIConfig = this._restApi.configure(this._options);
-        var graphQLAPIConfig = this._graphqlApi.configure(this._options);
-        return tslib_1.__assign(tslib_1.__assign({}, restAPIConfig), graphQLAPIConfig);
-    };
-    /**
-     * Make a GET request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    InternalAPIClass.prototype.get = function (apiName, path, init) {
-        return this._restApi.get(apiName, path, this.getInitWithCustomUserAgentDetails(init, core_1.ApiAction.Get));
-    };
-    /**
-     * Make a POST request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    InternalAPIClass.prototype.post = function (apiName, path, init) {
-        return this._restApi.post(apiName, path, this.getInitWithCustomUserAgentDetails(init, core_1.ApiAction.Post));
-    };
-    /**
-     * Make a PUT request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    InternalAPIClass.prototype.put = function (apiName, path, init) {
-        return this._restApi.put(apiName, path, this.getInitWithCustomUserAgentDetails(init, core_1.ApiAction.Put));
-    };
-    /**
-     * Make a PATCH request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    InternalAPIClass.prototype.patch = function (apiName, path, init) {
-        return this._restApi.patch(apiName, path, this.getInitWithCustomUserAgentDetails(init, core_1.ApiAction.Patch));
-    };
-    /**
-     * Make a DEL request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    InternalAPIClass.prototype.del = function (apiName, path, init) {
-        return this._restApi.del(apiName, path, this.getInitWithCustomUserAgentDetails(init, core_1.ApiAction.Del));
-    };
-    /**
-     * Make a HEAD request
-     * @param apiName - The api name of the request
-     * @param path - The path of the request
-     * @param [init] - Request extra params
-     * @return A promise that resolves to an object with response status and JSON data, if successful.
-     */
-    InternalAPIClass.prototype.head = function (apiName, path, init) {
-        return this._restApi.head(apiName, path, this.getInitWithCustomUserAgentDetails(init, core_1.ApiAction.Head));
-    };
-    /**
-     * Checks to see if an error thrown is from an api request cancellation
-     * @param error - Any error
-     * @return If the error was from an api request cancellation
-     */
-    InternalAPIClass.prototype.isCancel = function (error) {
-        return this._restApi.isCancel(error);
-    };
-    /**
-     * Cancels an inflight request for either a GraphQL request or a Rest API request.
-     * @param request - request to cancel
-     * @param [message] - custom error message
-     * @return If the request was cancelled
-     */
-    InternalAPIClass.prototype.cancel = function (request, message) {
-        if (this._restApi.hasCancelToken(request)) {
-            return this._restApi.cancel(request, message);
-        }
-        else if (this._graphqlApi.hasCancelToken(request)) {
-            return this._graphqlApi.cancel(request, message);
-        }
-        return false;
-    };
-    InternalAPIClass.prototype.getInitWithCustomUserAgentDetails = function (init, action) {
-        var customUserAgentDetails = {
-            category: core_1.Category.API,
-            action: action,
-        };
-        var initParams = tslib_1.__assign(tslib_1.__assign({}, init), { customUserAgentDetails: customUserAgentDetails });
-        return initParams;
-    };
-    /**
-     * Getting endpoint for API
-     * @param apiName - The name of the api
-     * @return The endpoint of the api
-     */
-    InternalAPIClass.prototype.endpoint = function (apiName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this._restApi.endpoint(apiName)];
-            });
-        });
-    };
+    }
     /**
      * to get the operation type
      * @param operation
      */
-    InternalAPIClass.prototype.getGraphqlOperationType = function (operation) {
+    getGraphqlOperationType(operation) {
         return this._graphqlApi.getGraphqlOperationType(operation);
-    };
-    InternalAPIClass.prototype.graphql = function (options, additionalHeaders, customUserAgentDetails) {
-        var apiUserAgentDetails = tslib_1.__assign({ category: core_1.Category.API, action: core_1.ApiAction.GraphQl }, customUserAgentDetails);
-        return this._graphqlApi.graphql(options, additionalHeaders, apiUserAgentDetails);
-    };
-    return InternalAPIClass;
-}());
+    }
+    graphql(options, additionalHeaders, customUserAgentDetails) {
+        const apiUserAgentDetails = {
+            category: utils_1.Category.API,
+            action: utils_1.ApiAction.GraphQl,
+            ...customUserAgentDetails,
+        };
+        return this._graphqlApi.graphql(core_1.Amplify, options, additionalHeaders, apiUserAgentDetails);
+    }
+}
 exports.InternalAPIClass = InternalAPIClass;
 exports.InternalAPI = new InternalAPIClass(null);
-core_1.Amplify.register(exports.InternalAPI);
 //# sourceMappingURL=InternalAPI.js.map

package/lib/internals/InternalAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"InternalAPI.js","sourceRoot":"","sources":["../../src/internals/InternalAPI.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"InternalAPI.js","sourceRoot":"","sources":["../../src/internals/InternalAPI.ts"],"names":[],"mappings":";;AAWA,kEAA6E;AAC7E,4CAAkE;AAClE,6DAI2C;AAG3C;;;;;;;GAOG;AAEH,MAAM,MAAM,GAAG,IAAI,oBAAa,CAAC,KAAK,CAAC,CAAC;AACxC;;;;GAIG;AACH,MAAa,gBAAgB;IAU5B;;;OAGG;IACH,YAAY,OAAO;QANnB,UAAK,GAAG,YAAK,CAAC;QAOb,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,IAAI,mCAAuB,CAAC,OAAO,CAAC,CAAC;QACxD,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,aAAa;QACnB,OAAO,aAAa,CAAC;IACtB,CAAC;IAED;;;OAGG;IACH,uBAAuB,CAAC,SAA2B;QAClD,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAqBD,OAAO,CACN,OAAuB,EACvB,iBAA6C,EAC7C,sBAA+C;QAE/C,MAAM,mBAAmB,GAA2B;YACnD,QAAQ,EAAE,gBAAQ,CAAC,GAAG;YACtB,MAAM,EAAE,iBAAS,CAAC,OAAO;YACzB,GAAG,sBAAsB;SACzB,CAAC;QAEF,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAC9B,cAAO,EACP,OAAO,EACP,iBAAiB,EACjB,mBAAmB,CACnB,CAAC;IACH,CAAC;CACD;AArED,4CAqEC;AAEY,QAAA,WAAW,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC"}

package/lib/server.d.ts

@@ -0,0 +1,14 @@
+export { GraphQLQuery, GraphQLSubscription } from './types';
+import { V6Client, V6ClientSSR, ServerClientGenerationParams } from '@aws-amplify/api-graphql';
+export type { GraphQLResult, GraphQLReturnType, } from '@aws-amplify/api-graphql';
+/**
+ * @private
+ *
+ * Creates a client that can be used to make GraphQL requests, using a provided `AmplifyClassV6`
+ * compatible context object for config and auth fetching.
+ *
+ * @param params
+ * @returns
+ */
+export declare function generateClient<T extends Record<any, any> = never, ClientType extends V6ClientSSR<T> | V6Client<T> = V6ClientSSR<T>>(params: ServerClientGenerationParams): ClientType;
+export { get, put, post, del, head, patch, isCancelError, } from '@aws-amplify/api-rest/server';

package/lib/server.js

@@ -0,0 +1,35 @@
+"use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+const internals_1 = require("@aws-amplify/api-graphql/internals");
+const api_graphql_1 = require("@aws-amplify/api-graphql");
+/**
+ * @private
+ *
+ * Creates a client that can be used to make GraphQL requests, using a provided `AmplifyClassV6`
+ * compatible context object for config and auth fetching.
+ *
+ * @param params
+ * @returns
+ */
+function generateClient(params) {
+    const client = {
+        [api_graphql_1.__amplify]: params.amplify,
+        graphql: internals_1.graphql,
+        cancel: internals_1.cancel,
+        isCancelError: internals_1.isCancelError,
+        models: {},
+    };
+    return client;
+}
+exports.generateClient = generateClient;
+var server_1 = require("@aws-amplify/api-rest/server");
+exports.get = server_1.get;
+exports.put = server_1.put;
+exports.post = server_1.post;
+exports.del = server_1.del;
+exports.head = server_1.head;
+exports.patch = server_1.patch;
+exports.isCancelError = server_1.isCancelError;
+//# sourceMappingURL=server.js.map

package/lib/server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;AAGtC,kEAI4C;AAM5C,0DAKkC;AAOlC;;;;;;;;GAQG;AACH,SAAgB,cAAc,CAG5B,MAAoC;IACrC,MAAM,MAAM,GAAG;QACd,CAAC,uBAAS,CAAC,EAAE,MAAM,CAAC,OAAO;QAC3B,OAAO,EAAP,mBAAO;QACP,MAAM,EAAN,kBAAM;QACN,aAAa,EAAb,yBAAa;QACb,MAAM,EAAE,EAAE;KACH,CAAC;IAET,OAAO,MAAoB,CAAC;AAC7B,CAAC;AAbD,wCAaC;AAED,uDAQsC;AAPrC,uBAAA,GAAG,CAAA;AACH,uBAAA,GAAG,CAAA;AACH,wBAAA,IAAI,CAAA;AACJ,uBAAA,GAAG,CAAA;AACH,wBAAA,IAAI,CAAA;AACJ,yBAAA,KAAK,CAAA;AACL,iCAAA,aAAa,CAAA"}

package/lib/types/index.d.ts

@@ -3,11 +3,4 @@
  * generates code that relies on this import path https://github.com/aws-amplify/amplify-cli/issues/3863
  * This will be removed in future release when CLI and customers moves to recommeneded import styles.
  */
-export { graphqlOperation, GraphQLAuthError, GraphQLResult, GRAPHQL_AUTH_MODE, } from '@aws-amplify/api-graphql';
-declare const queryType: unique symbol;
-export declare type GraphQLQuery<T> = T & {
-    readonly [queryType]: 'query';
-};
-export declare type GraphQLSubscription<T> = T & {
-    readonly [queryType]: 'subscription';
-};
+export { graphqlOperation, GraphQLAuthError, GraphQLResult, GraphQLQuery, GraphQLSubscription, } from '@aws-amplify/api-graphql';

package/lib/types/index.js

@@ -10,5 +10,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var api_graphql_1 = require("@aws-amplify/api-graphql");
 exports.graphqlOperation = api_graphql_1.graphqlOperation;
 exports.GraphQLAuthError = api_graphql_1.GraphQLAuthError;
-exports.GRAPHQL_AUTH_MODE = api_graphql_1.GRAPHQL_AUTH_MODE;
 //# sourceMappingURL=index.js.map

package/lib/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;AAEtC;;;;GAIG;AACH,wDAKkC;AAJjC,yCAAA,gBAAgB,CAAA;AAChB,yCAAA,gBAAgB,CAAA;AAEhB,0CAAA,iBAAiB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;AAEtC;;;;GAIG;AACH,wDAMkC;AALjC,yCAAA,gBAAgB,CAAA;AAChB,yCAAA,gBAAgB,CAAA"}

package/lib-esm/API.d.ts

@@ -1,27 +1,5 @@
-import { AWSAppSyncRealTimeProvider } from '@aws-amplify/pubsub';
-import { GraphQLOptions, GraphQLResult } from '@aws-amplify/api-graphql';
-import Observable from 'zen-observable-ts';
-import { GraphQLQuery, GraphQLSubscription } from './types';
-import { InternalAPIClass } from './internals/InternalAPI';
+import { V6Client } from '@aws-amplify/api-graphql';
 /**
- * @deprecated
- * Use RestApi or GraphQLAPI to reduce your application bundle size
- * Export Cloud Logic APIs
+ * Generates an API client that can work with models or raw GraphQL
  */
-export declare class APIClass extends InternalAPIClass {
-    getModuleName(): string;
-    /**
-     * Executes a GraphQL operation
-     *
-     * @param options - GraphQL Options
-     * @param [additionalHeaders] - headers to merge in after any `graphql_headers` set in the config
-     * @returns An Observable if queryType is 'subscription', else a promise of the graphql result from the query.
-     */
-    graphql<T>(options: GraphQLOptions, additionalHeaders?: {
-        [key: string]: string;
-    }): T extends GraphQLQuery<T> ? Promise<GraphQLResult<T>> : T extends GraphQLSubscription<T> ? Observable<{
-        provider: AWSAppSyncRealTimeProvider;
-        value: GraphQLResult<T>;
-    }> : Promise<GraphQLResult<any>> | Observable<object>;
-}
-export declare const API: APIClass;
+export declare function generateClient<T extends Record<any, any> = never>(): V6Client<T>;

package/lib-esm/API.js

@@ -1,26 +1,17 @@
-import { __extends } from "tslib";
-import { Amplify, ConsoleLogger as Logger } from '@aws-amplify/core';
-import { InternalAPIClass } from './internals/InternalAPI';
-var logger = new Logger('API');
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { __amplify } from '@aws-amplify/api-graphql';
+import { graphql as v6graphql, cancel as v6cancel, isCancelError as v6isCancelError, } from '@aws-amplify/api-graphql/internals';
+import { Amplify } from '@aws-amplify/core';
 /**
- * @deprecated
- * Use RestApi or GraphQLAPI to reduce your application bundle size
- * Export Cloud Logic APIs
+ * Generates an API client that can work with models or raw GraphQL
  */
-var APIClass = /** @class */ (function (_super) {
-    __extends(APIClass, _super);
-    function APIClass() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    APIClass.prototype.getModuleName = function () {
-        return 'API';
+export function generateClient() {
+    return {
+        [__amplify]: Amplify,
+        graphql: v6graphql,
+        cancel: v6cancel,
+        isCancelError: v6isCancelError,
     };
-    APIClass.prototype.graphql = function (options, additionalHeaders) {
-        return _super.prototype.graphql.call(this, options, additionalHeaders);
-    };
-    return APIClass;
-}(InternalAPIClass));
-export { APIClass };
-export var API = new APIClass(null);
-Amplify.register(API);
+}
 //# sourceMappingURL=API.js.map

package/lib-esm/API.js.map

@@ -1 +1 @@
-{"version":3,"file":"API.js","sourceRoot":"","sources":["../src/API.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;AACjC;;;;GAIG;AACH;IAA8B,4BAAgB;IAA9C;;IA6BA,CAAC;IA5BO,gCAAa,GAApB;QACC,OAAO,KAAK,CAAC;IACd,CAAC;IAoBD,0BAAO,GAAP,UACC,OAAuB,EACvB,iBAA6C;QAE7C,OAAO,iBAAM,OAAO,YAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAClD,CAAC;IACF,eAAC;AAAD,CAAC,AA7BD,CAA8B,gBAAgB,GA6B7C;;AAED,MAAM,CAAC,IAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;AACtC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"API.js","sourceRoot":"","sources":["../src/API.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;AACtC,OAAO,EAAE,SAAS,EAAY,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EACN,OAAO,IAAI,SAAS,EACpB,MAAM,IAAI,QAAQ,EAClB,aAAa,IAAI,eAAe,GAChC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C;;GAEG;AACH,MAAM,UAAU,cAAc;IAG7B,OAAO;QACN,CAAC,SAAS,CAAC,EAAE,OAAO;QACpB,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,QAAQ;QAChB,aAAa,EAAE,eAAe;KAC9B,CAAC;AACH,CAAC"}

package/lib-esm/index.d.ts

@@ -1,4 +1,5 @@
 export { GraphQLQuery, GraphQLSubscription } from './types';
-export { API, APIClass } from './API';
-export { graphqlOperation, GraphQLAuthError, GRAPHQL_AUTH_MODE, } from '@aws-amplify/api-graphql';
-export type { GraphQLResult } from '@aws-amplify/api-graphql';
+export { generateClient } from './API';
+export { GraphQLAuthError } from '@aws-amplify/api-graphql';
+export type { GraphQLResult, GraphQLReturnType, } from '@aws-amplify/api-graphql';
+export { get, put, post, del, head, patch, isCancelError, } from '@aws-amplify/api-rest';

package/lib-esm/index.js

@@ -1,5 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-export { API, APIClass } from './API';
-export { graphqlOperation, GraphQLAuthError, GRAPHQL_AUTH_MODE, } from '@aws-amplify/api-graphql';
+export { generateClient } from './API';
+export { GraphQLAuthError } from '@aws-amplify/api-graphql';
+export { get, put, post, del, head, patch, isCancelError, } from '@aws-amplify/api-rest';
 //# sourceMappingURL=index.js.map

package/lib-esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;AAGtC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EACN,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,GACjB,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;AAKtC,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAO5D,OAAO,EACN,GAAG,EACH,GAAG,EACH,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,KAAK,EACL,aAAa,GACb,MAAM,uBAAuB,CAAC"}