@aws-amplify/api 5.4.5 → 6.0.1-console-preview.047a1dd.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,7 +1,6 @@
-import { AWSAppSyncRealTimeProvider } from '@aws-amplify/pubsub';
-import { GraphQLOptions, GraphQLResult } from '@aws-amplify/api-graphql';
+import { AWSAppSyncRealTimeProvider, GraphQLOptions, GraphQLResult, GraphQLQuery, GraphQLSubscription } from '@aws-amplify/api-graphql';
+import { graphql as v6graphql } from '@aws-amplify/api-graphql/internals';
 import Observable from 'zen-observable-ts';
-import { GraphQLQuery, GraphQLSubscription } from './types';
 import { InternalAPIClass } from './internals/InternalAPI';
 /**
  * @deprecated
@@ -23,5 +22,19 @@ export declare class APIClass extends InternalAPIClass {
         provider: AWSAppSyncRealTimeProvider;
         value: GraphQLResult<T>;
     }> : Promise<GraphQLResult<any>> | Observable<object>;
+    /**
+     * Generates an API client that can work with models or raw GraphQL
+     */
+    generateClient<T extends Record<any, any> = never>(): V6Client<T>;
 }
+declare type FilteredKeys<T> = {
+    [P in keyof T]: T[P] extends never ? never : P;
+}[keyof T];
+declare type ExcludeNeverFields<O> = {
+    [K in FilteredKeys<O>]: O[K];
+};
+declare type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
+    graphql: typeof v6graphql;
+}>;
 export declare const API: APIClass;
+export {};

package/lib/API.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var core_1 = require("@aws-amplify/core");
+var internals_1 = require("@aws-amplify/api-graphql/internals");
 var InternalAPI_1 = require("./internals/InternalAPI");
-var logger = new core_1.ConsoleLogger('API');
 /**
  * @deprecated
  * Use RestApi or GraphQLAPI to reduce your application bundle size
@@ -20,9 +19,17 @@ var APIClass = /** @class */ (function (_super) {
     APIClass.prototype.graphql = function (options, additionalHeaders) {
         return _super.prototype.graphql.call(this, options, additionalHeaders);
     };
+    /**
+     * Generates an API client that can work with models or raw GraphQL
+     */
+    APIClass.prototype.generateClient = function () {
+        var client = {
+            graphql: internals_1.graphql,
+        };
+        return client;
+    };
     return APIClass;
 }(InternalAPI_1.InternalAPIClass));
 exports.APIClass = APIClass;
 exports.API = new APIClass(null);
-core_1.Amplify.register(exports.API);
 //# 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":";;;AASA,gEAA0E;AAE1E,uDAA2D;AAE3D;;;;GAIG;AACH;IAA8B,oCAAgB;IAA9C;;IAwCA,CAAC;IAvCO,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;IAED;;OAEG;IACH,iCAAc,GAAd;QACC,IAAM,MAAM,GAAkB;YAC7B,OAAO,EAAE,mBAAS;SAClB,CAAC;QAEF,OAAO,MAAqB,CAAC;IAC9B,CAAC;IACF,eAAC;AAAD,CAAC,AAxCD,CAA8B,8BAAgB,GAwC7C;AAxCY,4BAAQ;AAsDR,QAAA,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC"}

package/lib/index.d.ts

@@ -1,4 +1,8 @@
 export { GraphQLQuery, GraphQLSubscription } from './types';
-export { API, APIClass } from './API';
-export { graphqlOperation, GraphQLAuthError, GRAPHQL_AUTH_MODE, } from '@aws-amplify/api-graphql';
+import { API, APIClass } from './API';
+export { graphqlOperation, GraphQLAuthError, GraphQLAuthMode, } from '@aws-amplify/api-graphql';
 export type { GraphQLResult } from '@aws-amplify/api-graphql';
+declare const generateClient: <T extends Record<any, any> = never>() => {
+    graphql: typeof import("@aws-amplify/api-graphql/lib-esm/internals").graphql;
+};
+export { API, APIClass, generateClient };

package/lib/index.js

@@ -8,5 +8,6 @@ exports.APIClass = API_1.APIClass;
 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 generateClient = API_1.API.generateClient;
+exports.generateClient = generateClient;
 //# 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,6BAAsC;AAW7B,cAXA,SAAG,CAWA;AAAE,mBAXA,cAAQ,CAWA;AAVtB,wDAIkC;AAHjC,yCAAA,gBAAgB,CAAA;AAChB,yCAAA,gBAAgB,CAAA;AAMjB,IAAM,cAAc,GAAG,SAAG,CAAC,cAAc,CAAC;AAElB,wCAAc"}

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 { AWSAppSyncRealTimeProvider, GraphQLOperation, GraphQLOptions, GraphQLResult, OperationTypeNode, GraphQLQuery, GraphQLSubscription } from '@aws-amplify/api-graphql';
+import { CustomUserAgentDetails } from '@aws-amplify/core/internals/utils';
 import Observable from 'zen-observable-ts';
-import { GraphQLQuery, GraphQLSubscription } from '../types';
 /**
  * @deprecated
  * Use RestApi or GraphQLAPI to reduce your application bundle size
@@ -14,83 +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/types").ICache;
     /**
      * 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
@@ -104,13 +33,6 @@ export declare class InternalAPIClass {
      * @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

@@ -3,10 +3,9 @@ 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');
+var utils_1 = require("@aws-amplify/core/internals/utils");
+var logger = new utils_1.ConsoleLogger('API');
 /**
  * @deprecated
  * Use RestApi or GraphQLAPI to reduce your application bundle size
@@ -18,100 +17,21 @@ var InternalAPIClass = /** @class */ (function () {
      * @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;
+        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 () {
         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);
+        return api_rest_1.isCancel(error);
     };
     /**
      * Cancels an inflight request for either a GraphQL request or a Rest API request.
@@ -120,33 +40,7 @@ var InternalAPIClass = /** @class */ (function () {
      * @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)];
-            });
-        });
+        return api_rest_1.cancel(request, message);
     };
     /**
      * to get the operation type
@@ -156,12 +50,11 @@ var InternalAPIClass = /** @class */ (function () {
         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);
+        var apiUserAgentDetails = tslib_1.__assign({ category: utils_1.Category.API, action: utils_1.ApiAction.GraphQl }, customUserAgentDetails);
         return this._graphqlApi.graphql(options, additionalHeaders, apiUserAgentDetails);
     };
     return InternalAPIClass;
 }());
 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,gEAA6E;AAC7E,kDAAyD;AACzD,0CAA0C;AAC1C,2DAK2C;AAG3C,IAAM,MAAM,GAAG,IAAI,qBAAM,CAAC,KAAK,CAAC,CAAC;AACjC;;;;GAIG;AACH;IAUC;;;OAGG;IACH,0BAAY,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,wCAAa,GAApB;QACC,OAAO,aAAa,CAAC;IACtB,CAAC;IAED;;;;OAIG;IACH,mCAAQ,GAAR,UAAS,KAAU;QAClB,OAAO,mBAAQ,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IACD;;;;;OAKG;IACH,iCAAM,GAAN,UAAO,OAAqB,EAAE,OAAgB;QAC7C,OAAO,iBAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,kDAAuB,GAAvB,UAAwB,SAA2B;QAClD,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAqBD,kCAAO,GAAP,UACC,OAAuB,EACvB,iBAA6C,EAC7C,sBAA+C;QAE/C,IAAM,mBAAmB,sBACxB,QAAQ,EAAE,gBAAQ,CAAC,GAAG,EACtB,MAAM,EAAE,iBAAS,CAAC,OAAO,IACtB,sBAAsB,CACzB,CAAC;QAEF,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAC9B,OAAO,EACP,iBAAiB,EACjB,mBAAmB,CACnB,CAAC;IACH,CAAC;IACF,uBAAC;AAAD,CAAC,AAtFD,IAsFC;AAtFY,4CAAgB;AAwFhB,QAAA,WAAW,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC"}

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, GraphQLAuthMode, 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,wDAOkC;AANjC,yCAAA,gBAAgB,CAAA;AAChB,yCAAA,gBAAgB,CAAA"}

package/lib-esm/API.d.ts

@@ -1,7 +1,6 @@
-import { AWSAppSyncRealTimeProvider } from '@aws-amplify/pubsub';
-import { GraphQLOptions, GraphQLResult } from '@aws-amplify/api-graphql';
+import { AWSAppSyncRealTimeProvider, GraphQLOptions, GraphQLResult, GraphQLQuery, GraphQLSubscription } from '@aws-amplify/api-graphql';
+import { graphql as v6graphql } from '@aws-amplify/api-graphql/internals';
 import Observable from 'zen-observable-ts';
-import { GraphQLQuery, GraphQLSubscription } from './types';
 import { InternalAPIClass } from './internals/InternalAPI';
 /**
  * @deprecated
@@ -23,5 +22,19 @@ export declare class APIClass extends InternalAPIClass {
         provider: AWSAppSyncRealTimeProvider;
         value: GraphQLResult<T>;
     }> : Promise<GraphQLResult<any>> | Observable<object>;
+    /**
+     * Generates an API client that can work with models or raw GraphQL
+     */
+    generateClient<T extends Record<any, any> = never>(): V6Client<T>;
 }
+declare type FilteredKeys<T> = {
+    [P in keyof T]: T[P] extends never ? never : P;
+}[keyof T];
+declare type ExcludeNeverFields<O> = {
+    [K in FilteredKeys<O>]: O[K];
+};
+declare type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
+    graphql: typeof v6graphql;
+}>;
 export declare const API: APIClass;
+export {};

package/lib-esm/API.js

@@ -1,7 +1,6 @@
 import { __extends } from "tslib";
-import { Amplify, ConsoleLogger as Logger } from '@aws-amplify/core';
+import { graphql as v6graphql } from '@aws-amplify/api-graphql/internals';
 import { InternalAPIClass } from './internals/InternalAPI';
-var logger = new Logger('API');
 /**
  * @deprecated
  * Use RestApi or GraphQLAPI to reduce your application bundle size
@@ -18,9 +17,17 @@ var APIClass = /** @class */ (function (_super) {
     APIClass.prototype.graphql = function (options, additionalHeaders) {
         return _super.prototype.graphql.call(this, options, additionalHeaders);
     };
+    /**
+     * Generates an API client that can work with models or raw GraphQL
+     */
+    APIClass.prototype.generateClient = function () {
+        var client = {
+            graphql: v6graphql,
+        };
+        return client;
+    };
     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":";AASA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D;;;;GAIG;AACH;IAA8B,4BAAgB;IAA9C;;IAwCA,CAAC;IAvCO,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;IAED;;OAEG;IACH,iCAAc,GAAd;QACC,IAAM,MAAM,GAAkB;YAC7B,OAAO,EAAE,SAAS;SAClB,CAAC;QAEF,OAAO,MAAqB,CAAC;IAC9B,CAAC;IACF,eAAC;AAAD,CAAC,AAxCD,CAA8B,gBAAgB,GAwC7C;;AAcD,MAAM,CAAC,IAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC"}

package/lib-esm/index.d.ts

@@ -1,4 +1,8 @@
 export { GraphQLQuery, GraphQLSubscription } from './types';
-export { API, APIClass } from './API';
-export { graphqlOperation, GraphQLAuthError, GRAPHQL_AUTH_MODE, } from '@aws-amplify/api-graphql';
+import { API, APIClass } from './API';
+export { graphqlOperation, GraphQLAuthError, GraphQLAuthMode, } from '@aws-amplify/api-graphql';
 export type { GraphQLResult } from '@aws-amplify/api-graphql';
+declare const generateClient: <T extends Record<any, any> = never>() => {
+    graphql: typeof import("@aws-amplify/api-graphql/lib-esm/internals").graphql;
+};
+export { API, APIClass, generateClient };

package/lib-esm/index.js

@@ -1,5 +1,7 @@
 // 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';
+import { API, APIClass } from './API';
+export { graphqlOperation, GraphQLAuthError, } from '@aws-amplify/api-graphql';
+var generateClient = API.generateClient;
+export { API, APIClass, generateClient };
 //# 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,GAAG,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EACN,gBAAgB,EAChB,gBAAgB,GAEhB,MAAM,0BAA0B,CAAC;AAIlC,IAAM,cAAc,GAAG,GAAG,CAAC,cAAc,CAAC;AAE1C,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC"}

package/lib-esm/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 { AWSAppSyncRealTimeProvider, GraphQLOperation, GraphQLOptions, GraphQLResult, OperationTypeNode, GraphQLQuery, GraphQLSubscription } from '@aws-amplify/api-graphql';
+import { CustomUserAgentDetails } from '@aws-amplify/core/internals/utils';
 import Observable from 'zen-observable-ts';
-import { GraphQLQuery, GraphQLSubscription } from '../types';
 /**
  * @deprecated
  * Use RestApi or GraphQLAPI to reduce your application bundle size
@@ -14,83 +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/types").ICache;
     /**
      * 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
@@ -104,13 +33,6 @@ export declare class InternalAPIClass {
      * @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-esm/internals/InternalAPI.js

@@ -1,9 +1,8 @@
-import { __assign, __awaiter, __generator } from "tslib";
+import { __assign } from "tslib";
 import { InternalGraphQLAPIClass } from '@aws-amplify/api-graphql/internals';
-import { RestAPIClass } from '@aws-amplify/api-rest';
-import { Auth } from '@aws-amplify/auth';
-import { Cache } from '@aws-amplify/cache';
-import { Amplify, ApiAction, Category, Credentials, ConsoleLogger as Logger, } from '@aws-amplify/core';
+import { cancel, isCancel } from '@aws-amplify/api-rest';
+import { Cache } from '@aws-amplify/core';
+import { ApiAction, Category, ConsoleLogger as Logger, } from '@aws-amplify/core/internals/utils';
 var logger = new Logger('API');
 /**
  * @deprecated
@@ -16,100 +15,21 @@ var InternalAPIClass = /** @class */ (function () {
      * @param {Object} options - Configuration object for API
      */
     function InternalAPIClass(options) {
-        this.Auth = Auth;
         this.Cache = Cache;
-        this.Credentials = Credentials;
         this._options = options;
-        this._restApi = new RestAPIClass(options);
         this._graphqlApi = new InternalGraphQLAPIClass(options);
         logger.debug('API Options', this._options);
     }
     InternalAPIClass.prototype.getModuleName = function () {
         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 __assign(__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, 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, 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, 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, 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, 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, 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);
+        return isCancel(error);
     };
     /**
      * Cancels an inflight request for either a GraphQL request or a Rest API request.
@@ -118,33 +38,7 @@ var InternalAPIClass = /** @class */ (function () {
      * @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: Category.API,
-            action: action,
-        };
-        var initParams = __assign(__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 __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this._restApi.endpoint(apiName)];
-            });
-        });
+        return cancel(request, message);
     };
     /**
      * to get the operation type
@@ -161,5 +55,4 @@ var InternalAPIClass = /** @class */ (function () {
 }());
 export { InternalAPIClass };
 export var InternalAPI = new InternalAPIClass(null);
-Amplify.register(InternalAPI);
 //# sourceMappingURL=InternalAPI.js.map

package/lib-esm/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,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EACN,SAAS,EACT,QAAQ,EACR,aAAa,IAAI,MAAM,GAEvB,MAAM,mCAAmC,CAAC;AAG3C,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;AACjC;;;;GAIG;AACH;IAUC;;;OAGG;IACH,0BAAY,OAAO;QANnB,UAAK,GAAG,KAAK,CAAC;QAOb,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,IAAI,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACxD,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,wCAAa,GAApB;QACC,OAAO,aAAa,CAAC;IACtB,CAAC;IAED;;;;OAIG;IACH,mCAAQ,GAAR,UAAS,KAAU;QAClB,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IACD;;;;;OAKG;IACH,iCAAM,GAAN,UAAO,OAAqB,EAAE,OAAgB;QAC7C,OAAO,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,kDAAuB,GAAvB,UAAwB,SAA2B;QAClD,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAqBD,kCAAO,GAAP,UACC,OAAuB,EACvB,iBAA6C,EAC7C,sBAA+C;QAE/C,IAAM,mBAAmB,cACxB,QAAQ,EAAE,QAAQ,CAAC,GAAG,EACtB,MAAM,EAAE,SAAS,CAAC,OAAO,IACtB,sBAAsB,CACzB,CAAC;QAEF,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAC9B,OAAO,EACP,iBAAiB,EACjB,mBAAmB,CACnB,CAAC;IACH,CAAC;IACF,uBAAC;AAAD,CAAC,AAtFD,IAsFC;;AAED,MAAM,CAAC,IAAM,WAAW,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC"}

package/lib-esm/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, GraphQLAuthMode, GraphQLQuery, GraphQLSubscription, } from '@aws-amplify/api-graphql';

package/lib-esm/types/index.js

@@ -5,5 +5,5 @@
  * 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, GRAPHQL_AUTH_MODE, } from '@aws-amplify/api-graphql';
+export { graphqlOperation, GraphQLAuthError, } from '@aws-amplify/api-graphql';
 //# sourceMappingURL=index.js.map

package/lib-esm/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,OAAO,EACN,gBAAgB,EAChB,gBAAgB,EAEhB,iBAAiB,GACjB,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;AAEtC;;;;GAIG;AACH,OAAO,EACN,gBAAgB,EAChB,gBAAgB,GAKhB,MAAM,0BAA0B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api",
-	"version": "5.4.5",
+	"version": "6.0.1-console-preview.047a1dd.0+047a1dd",
 	"description": "Api category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -35,7 +35,7 @@
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 91.93"
+		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 88"
 	},
 	"repository": {
 		"type": "git",
@@ -48,7 +48,8 @@
 	},
 	"homepage": "https://aws-amplify.github.io/",
 	"devDependencies": {
-		"@types/zen-observable": "^0.8.0"
+		"@types/zen-observable": "^0.8.0",
+		"typescript": "5.1.6"
 	},
 	"files": [
 		"lib",
@@ -58,16 +59,16 @@
 		"internals"
 	],
 	"dependencies": {
-		"@aws-amplify/api-graphql": "3.4.11",
-		"@aws-amplify/api-rest": "3.5.5",
-		"tslib": "^1.8.0"
+		"@aws-amplify/api-graphql": "4.0.1-console-preview.047a1dd.0+047a1dd",
+		"@aws-amplify/api-rest": "4.0.1-console-preview.047a1dd.0+047a1dd",
+		"tslib": "^2.6.1"
 	},
 	"size-limit": [
 		{
 			"name": "API (top-level class)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Amplify, API }",
-			"limit": "90.28 kB"
+			"limit": "93.82 kB"
 		}
 	],
 	"jest": {
@@ -114,5 +115,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "c3a06153e3ffe05dd65485a22b1f99aabe9b3d83"
+	"gitHead": "047a1dd83d54c8f3ee74e0766d96c6a3b9f97f90"
 }

package/src/API.ts

@@ -1,13 +1,16 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { AWSAppSyncRealTimeProvider } from '@aws-amplify/pubsub';
-import { GraphQLOptions, GraphQLResult } from '@aws-amplify/api-graphql';
-import { Amplify, ConsoleLogger as Logger } from '@aws-amplify/core';
+import {
+	AWSAppSyncRealTimeProvider,
+	GraphQLOptions,
+	GraphQLResult,
+	GraphQLQuery,
+	GraphQLSubscription,
+} from '@aws-amplify/api-graphql';
+import { graphql as v6graphql } from '@aws-amplify/api-graphql/internals';
 import Observable from 'zen-observable-ts';
-import { GraphQLQuery, GraphQLSubscription } from './types';
 import { InternalAPIClass } from './internals/InternalAPI';
 
-const logger = new Logger('API');
 /**
  * @deprecated
  * Use RestApi or GraphQLAPI to reduce your application bundle size
@@ -42,7 +45,29 @@ export class APIClass extends InternalAPIClass {
 	): Promise<GraphQLResult<any>> | Observable<object> {
 		return super.graphql(options, additionalHeaders);
 	}
+
+	/**
+	 * Generates an API client that can work with models or raw GraphQL
+	 */
+	generateClient<T extends Record<any, any> = never>(): V6Client<T> {
+		const client: V6Client<any> = {
+			graphql: v6graphql,
+		};
+
+		return client as V6Client<T>;
+	}
 }
 
+type FilteredKeys<T> = {
+	[P in keyof T]: T[P] extends never ? never : P;
+}[keyof T];
+type ExcludeNeverFields<O> = {
+	[K in FilteredKeys<O>]: O[K];
+};
+
+// If no T is passed, ExcludeNeverFields removes "models" from the client
+declare type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
+	graphql: typeof v6graphql;
+}>;
+
 export const API = new APIClass(null);
-Amplify.register(API);

package/src/index.ts

@@ -1,12 +1,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+// TODO(v6): revisit exports
+
 export { GraphQLQuery, GraphQLSubscription } from './types';
-export { API, APIClass } from './API';
+import { API, APIClass } from './API';
 export {
 	graphqlOperation,
 	GraphQLAuthError,
-	GRAPHQL_AUTH_MODE,
+	GraphQLAuthMode,
 } from '@aws-amplify/api-graphql';
 
 export type { GraphQLResult } from '@aws-amplify/api-graphql';
+
+const generateClient = API.generateClient;
+
+export { API, APIClass, generateClient };

package/src/internals/InternalAPI.ts

@@ -1,26 +1,24 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import {
+	AWSAppSyncRealTimeProvider,
 	GraphQLOperation,
 	GraphQLOptions,
 	GraphQLResult,
 	OperationTypeNode,
+	GraphQLQuery,
+	GraphQLSubscription,
 } from '@aws-amplify/api-graphql';
 import { InternalGraphQLAPIClass } from '@aws-amplify/api-graphql/internals';
-import { RestAPIClass } from '@aws-amplify/api-rest';
-import { Auth } from '@aws-amplify/auth';
-import { Cache } from '@aws-amplify/cache';
+import { cancel, isCancel } from '@aws-amplify/api-rest';
+import { Cache } from '@aws-amplify/core';
 import {
-	Amplify,
 	ApiAction,
 	Category,
-	Credentials,
-	CustomUserAgentDetails,
 	ConsoleLogger as Logger,
-} from '@aws-amplify/core';
-import { AWSAppSyncRealTimeProvider } from '@aws-amplify/pubsub';
+	CustomUserAgentDetails,
+} from '@aws-amplify/core/internals/utils';
 import Observable from 'zen-observable-ts';
-import { GraphQLQuery, GraphQLSubscription } from '../types';
 
 const logger = new Logger('API');
 /**
@@ -34,12 +32,9 @@ export class InternalAPIClass {
 	 * @param {Object} options - Configuration object for API
 	 */
 	private _options;
-	private _restApi: RestAPIClass;
 	private _graphqlApi: InternalGraphQLAPIClass;
 
-	Auth = Auth;
 	Cache = Cache;
-	Credentials = Credentials;
 
 	/**
 	 * Initialize API with AWS configuration
@@ -47,7 +42,6 @@ export class InternalAPIClass {
 	 */
 	constructor(options) {
 		this._options = options;
-		this._restApi = new RestAPIClass(options);
 		this._graphqlApi = new InternalGraphQLAPIClass(options);
 		logger.debug('API Options', this._options);
 	}
@@ -56,148 +50,13 @@ export class InternalAPIClass {
 		return 'InternalAPI';
 	}
 
-	/**
-	 * Configure API part with aws configurations
-	 * @param {Object} config - Configuration of the API
-	 * @return {Object} - The current configuration
-	 */
-	configure(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;
-
-		const restAPIConfig = this._restApi.configure(this._options);
-		const graphQLAPIConfig = this._graphqlApi.configure(this._options);
-
-		return { ...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.
-	 */
-	get(
-		apiName: string,
-		path: string,
-		init: { [key: string]: any }
-	): Promise<any> {
-		return this._restApi.get(
-			apiName,
-			path,
-			this.getInitWithCustomUserAgentDetails(init, 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.
-	 */
-	post(
-		apiName: string,
-		path: string,
-		init: { [key: string]: any }
-	): Promise<any> {
-		return this._restApi.post(
-			apiName,
-			path,
-			this.getInitWithCustomUserAgentDetails(init, 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.
-	 */
-	put(
-		apiName: string,
-		path: string,
-		init: { [key: string]: any }
-	): Promise<any> {
-		return this._restApi.put(
-			apiName,
-			path,
-			this.getInitWithCustomUserAgentDetails(init, 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.
-	 */
-	patch(
-		apiName: string,
-		path: string,
-		init: { [key: string]: any }
-	): Promise<any> {
-		return this._restApi.patch(
-			apiName,
-			path,
-			this.getInitWithCustomUserAgentDetails(init, 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.
-	 */
-	del(
-		apiName: string,
-		path: string,
-		init: { [key: string]: any }
-	): Promise<any> {
-		return this._restApi.del(
-			apiName,
-			path,
-			this.getInitWithCustomUserAgentDetails(init, 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.
-	 */
-	head(
-		apiName: string,
-		path: string,
-		init: { [key: string]: any }
-	): Promise<any> {
-		return this._restApi.head(
-			apiName,
-			path,
-			this.getInitWithCustomUserAgentDetails(init, 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
 	 */
 	isCancel(error: any): boolean {
-		return this._restApi.isCancel(error);
+		return isCancel(error);
 	}
 	/**
 	 * Cancels an inflight request for either a GraphQL request or a Rest API request.
@@ -206,33 +65,7 @@ export class InternalAPIClass {
 	 * @return If the request was cancelled
 	 */
 	cancel(request: Promise<any>, message?: string): boolean {
-		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;
-	}
-
-	private getInitWithCustomUserAgentDetails(
-		init: { [key: string]: any },
-		action: ApiAction
-	) {
-		const customUserAgentDetails: CustomUserAgentDetails = {
-			category: Category.API,
-			action,
-		};
-		const initParams = { ...init, customUserAgentDetails };
-		return initParams;
-	}
-
-	/**
-	 * Getting endpoint for API
-	 * @param apiName - The name of the api
-	 * @return The endpoint of the api
-	 */
-	async endpoint(apiName: string): Promise<string> {
-		return this._restApi.endpoint(apiName);
+		return cancel(request, message);
 	}
 
 	/**
@@ -282,4 +115,3 @@ export class InternalAPIClass {
 }
 
 export const InternalAPI = new InternalAPIClass(null);
-Amplify.register(InternalAPI);

package/src/types/index.ts

@@ -10,13 +10,7 @@ export {
 	graphqlOperation,
 	GraphQLAuthError,
 	GraphQLResult,
-	GRAPHQL_AUTH_MODE,
+	GraphQLAuthMode,
+	GraphQLQuery,
+	GraphQLSubscription,
 } from '@aws-amplify/api-graphql';
-
-// Opaque type used for determining the graphql query type
-declare const queryType: unique symbol;
-
-export type GraphQLQuery<T> = T & { readonly [queryType]: 'query' };
-export type GraphQLSubscription<T> = T & {
-	readonly [queryType]: 'subscription';
-};