@aws-amplify/api 6.0.1-console-preview.d807e55.0 → 6.0.1-console-preview.5f040a2.0

package/lib/API.d.ts

@@ -1,42 +1,5 @@
-import { AWSAppSyncRealTimeProvider, GraphQLOptions, GraphQLResult, GraphQLQuery, GraphQLSubscription } from '@aws-amplify/api-graphql';
-import { graphql as v6graphql, cancel as v6cancel, isCancelError as v6isCancelError } from '@aws-amplify/api-graphql/internals';
-import { Observable } from 'rxjs';
-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>;
-    /**
-     * 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;
-    cancel: typeof v6cancel;
-    isCancelError: typeof v6isCancelError;
-}>;
-export declare const API: APIClass;
-export {};
+export declare function generateClient<T extends Record<any, any> = never>(): V6Client<T>;

package/lib/API.js

@@ -1,37 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+var api_graphql_1 = require("@aws-amplify/api-graphql");
 var internals_1 = require("@aws-amplify/api-graphql/internals");
-var InternalAPI_1 = require("./internals/InternalAPI");
+var 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';
-    };
-    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,
-            cancel: internals_1.cancel,
-            isCancelError: internals_1.isCancelError,
-        };
-        return client;
-    };
-    return APIClass;
-}(InternalAPI_1.InternalAPIClass));
-exports.APIClass = APIClass;
-exports.API = new APIClass(null);
+function generateClient() {
+    var _a;
+    return _a = {},
+        _a[api_graphql_1.__amplify] = core_1.Amplify,
+        _a.graphql = internals_1.graphql,
+        _a.cancel = internals_1.cancel,
+        _a.isCancelError = internals_1.isCancelError,
+        _a;
+}
+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":";;;AASA,gEAI4C;AAE5C,uDAA2D;AAE3D;;;;GAIG;AACH;IAA8B,oCAAgB;IAA9C;;IA0CA,CAAC;IAzCO,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;YAClB,MAAM,EAAE,kBAAQ;YAChB,aAAa,EAAE,yBAAe;SAC9B,CAAC;QAEF,OAAO,MAAqB,CAAC;IAC9B,CAAC;IACF,eAAC;AAAD,CAAC,AA1CD,CAA8B,8BAAgB,GA0C7C;AA1CY,4BAAQ;AA0DR,QAAA,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"API.js","sourceRoot":"","sources":["../src/API.ts"],"names":[],"mappings":";;AAAA,qEAAqE;AACrE,sCAAsC;AACtC,wDAA+D;AAC/D,gEAI4C;AAC5C,0CAA4C;AAE5C;;GAEG;AACH,SAAgB,cAAc;;IAG7B;QACC,GAAC,uBAAS,IAAG,cAAO;QACpB,UAAO,GAAE,mBAAS;QAClB,SAAM,GAAE,kBAAQ;QAChB,gBAAa,GAAE,yBAAe;WAC7B;AACH,CAAC;AATD,wCASC"}

package/lib/index.d.ts

@@ -1,10 +1,5 @@
 export { GraphQLQuery, GraphQLSubscription } from './types';
+export { generateClient } from './API';
 export { GraphQLAuthError } from '@aws-amplify/api-graphql';
 export type { GraphQLResult, GraphQLReturnType, } from '@aws-amplify/api-graphql';
-declare const generateClient: <T extends Record<any, any> = never>() => {
-    cancel: typeof import("@aws-amplify/api-graphql/lib-esm/internals").cancel;
-    graphql: typeof import("@aws-amplify/api-graphql/lib-esm/internals").graphql;
-    isCancelError: typeof import("@aws-amplify/api-graphql/lib-esm/internals").isCancelError;
-};
-export { generateClient };
 export { get, put, post, del, head, patch, isCancelError, } from '@aws-amplify/api-rest';

package/lib/index.js

@@ -3,10 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 var API_1 = require("./API");
+exports.generateClient = API_1.generateClient;
 var api_graphql_1 = require("@aws-amplify/api-graphql");
 exports.GraphQLAuthError = api_graphql_1.GraphQLAuthError;
-var generateClient = API_1.API.generateClient;
-exports.generateClient = generateClient;
 var api_rest_1 = require("@aws-amplify/api-rest");
 exports.get = api_rest_1.get;
 exports.put = api_rest_1.put;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;AAKtC,6BAA4B;AAE5B,wDAA4D;AAAnD,yCAAA,gBAAgB,CAAA;AAOzB,IAAM,cAAc,GAAG,SAAG,CAAC,cAAc,CAAC;AAEjC,wCAAc;AAEvB,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"}
+{"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.js

@@ -4,6 +4,14 @@ var tslib_1 = require("tslib");
 var internals_1 = require("@aws-amplify/api-graphql/internals");
 var core_1 = require("@aws-amplify/core");
 var 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.
+ */
 var logger = new utils_1.ConsoleLogger('API');
 /**
  * @deprecated
@@ -33,7 +41,7 @@ var InternalAPIClass = /** @class */ (function () {
     };
     InternalAPIClass.prototype.graphql = function (options, additionalHeaders, 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 this._graphqlApi.graphql(core_1.Amplify, options, additionalHeaders, apiUserAgentDetails);
     };
     return InternalAPIClass;
 }());

package/lib/internals/InternalAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"InternalAPI.js","sourceRoot":"","sources":["../../src/internals/InternalAPI.ts"],"names":[],"mappings":";;;AAWA,gEAA6E;AAC7E,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;;;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,AApED,IAoEC;AApEY,4CAAgB;AAsEhB,QAAA,WAAW,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"InternalAPI.js","sourceRoot":"","sources":["../../src/internals/InternalAPI.ts"],"names":[],"mappings":";;;AAWA,gEAA6E;AAC7E,0CAAmD;AACnD,2DAK2C;AAG3C;;;;;;;GAOG;AAEH,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;;;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,cAAO,EACP,OAAO,EACP,iBAAiB,EACjB,mBAAmB,CACnB,CAAC;IACH,CAAC;IACF,uBAAC;AAAD,CAAC,AArED,IAqEC;AArEY,4CAAgB;AAuEhB,QAAA,WAAW,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC"}

package/lib/server.d.ts

@@ -1 +1,9 @@
+export { GraphQLQuery, GraphQLSubscription } from './types';
+import { AmplifyServer } from '@aws-amplify/core/internals/adapter-core';
+import { V6Client } from '@aws-amplify/api-graphql';
+export type { GraphQLResult, GraphQLReturnType, } from '@aws-amplify/api-graphql';
+/**
+ * Generates an API client that can work with models or raw GraphQL
+ */
+export declare function generateClient<T extends Record<any, any> = never>(contextSpec: AmplifyServer.ContextSpec): V6Client<T>;
 export { get, put, post, del, head, patch, isCancelError, } from '@aws-amplify/api-rest/server';

package/lib/server.js

@@ -2,6 +2,22 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
+var internals_1 = require("@aws-amplify/api-graphql/internals");
+var adapter_core_1 = require("@aws-amplify/core/internals/adapter-core");
+var api_graphql_1 = require("@aws-amplify/api-graphql");
+/**
+ * Generates an API client that can work with models or raw GraphQL
+ */
+function generateClient(contextSpec) {
+    var _a;
+    return _a = {},
+        _a[api_graphql_1.__amplify] = adapter_core_1.getAmplifyServerContext(contextSpec).amplify,
+        _a.graphql = internals_1.graphql,
+        _a.cancel = internals_1.cancel,
+        _a.isCancelError = internals_1.isCancelError,
+        _a;
+}
+exports.generateClient = generateClient;
 var server_1 = require("@aws-amplify/api-rest/server");
 exports.get = server_1.get;
 exports.put = server_1.put;

package/lib/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;AAEtC,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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;AAGtC,gEAI4C;AAC5C,yEAGkD;AAElD,wDAA+D;AAO/D;;GAEG;AACH,SAAgB,cAAc,CAC7B,WAAsC;;IAEtC;QACC,GAAC,uBAAS,IAAG,sCAAuB,CAAC,WAAW,CAAC,CAAC,OAAO;QACzD,UAAO,sBAAA;QACP,SAAM,qBAAA;QACN,gBAAa,4BAAA;WACZ;AACH,CAAC;AATD,wCASC;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-esm/API.d.ts

@@ -1,42 +1,5 @@
-import { AWSAppSyncRealTimeProvider, GraphQLOptions, GraphQLResult, GraphQLQuery, GraphQLSubscription } from '@aws-amplify/api-graphql';
-import { graphql as v6graphql, cancel as v6cancel, isCancelError as v6isCancelError } from '@aws-amplify/api-graphql/internals';
-import { Observable } from 'rxjs';
-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>;
-    /**
-     * 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;
-    cancel: typeof v6cancel;
-    isCancelError: typeof v6isCancelError;
-}>;
-export declare const API: APIClass;
-export {};
+export declare function generateClient<T extends Record<any, any> = never>(): V6Client<T>;

package/lib-esm/API.js

@@ -1,35 +1,18 @@
-import { __extends } from "tslib";
+// 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 { InternalAPIClass } from './internals/InternalAPI';
+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';
-    };
-    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,
-            cancel: v6cancel,
-            isCancelError: v6isCancelError,
-        };
-        return client;
-    };
-    return APIClass;
-}(InternalAPIClass));
-export { APIClass };
-export var API = new APIClass(null);
+export function generateClient() {
+    var _a;
+    return _a = {},
+        _a[__amplify] = Amplify,
+        _a.graphql = v6graphql,
+        _a.cancel = v6cancel,
+        _a.isCancelError = v6isCancelError,
+        _a;
+}
 //# sourceMappingURL=API.js.map

package/lib-esm/API.js.map

@@ -1 +1 @@
-{"version":3,"file":"API.js","sourceRoot":"","sources":["../src/API.ts"],"names":[],"mappings":";AASA,OAAO,EACN,OAAO,IAAI,SAAS,EACpB,MAAM,IAAI,QAAQ,EAClB,aAAa,IAAI,eAAe,GAChC,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D;;;;GAIG;AACH;IAA8B,4BAAgB;IAA9C;;IA0CA,CAAC;IAzCO,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;YAClB,MAAM,EAAE,QAAQ;YAChB,aAAa,EAAE,eAAe;SAC9B,CAAC;QAEF,OAAO,MAAqB,CAAC;IAC9B,CAAC;IACF,eAAC;AAAD,CAAC,AA1CD,CAA8B,gBAAgB,GA0C7C;;AAgBD,MAAM,CAAC,IAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,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;QACC,GAAC,SAAS,IAAG,OAAO;QACpB,UAAO,GAAE,SAAS;QAClB,SAAM,GAAE,QAAQ;QAChB,gBAAa,GAAE,eAAe;WAC7B;AACH,CAAC"}

package/lib-esm/index.d.ts

@@ -1,10 +1,5 @@
 export { GraphQLQuery, GraphQLSubscription } from './types';
+export { generateClient } from './API';
 export { GraphQLAuthError } from '@aws-amplify/api-graphql';
 export type { GraphQLResult, GraphQLReturnType, } from '@aws-amplify/api-graphql';
-declare const generateClient: <T extends Record<any, any> = never>() => {
-    cancel: typeof import("@aws-amplify/api-graphql/lib-esm/internals").cancel;
-    graphql: typeof import("@aws-amplify/api-graphql/lib-esm/internals").graphql;
-    isCancelError: typeof import("@aws-amplify/api-graphql/lib-esm/internals").isCancelError;
-};
-export { generateClient };
 export { get, put, post, del, head, patch, isCancelError, } from '@aws-amplify/api-rest';

package/lib-esm/index.js

@@ -1,8 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { API } from './API';
+export { generateClient } from './API';
 export { GraphQLAuthError } from '@aws-amplify/api-graphql';
-var generateClient = API.generateClient;
-export { generateClient };
 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;AAKtC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAO5D,IAAM,cAAc,GAAG,GAAG,CAAC,cAAc,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,OAAO,EACN,GAAG,EACH,GAAG,EACH,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,KAAK,EACL,aAAa,GACb,MAAM,uBAAuB,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"}

package/lib-esm/internals/InternalAPI.js

@@ -1,7 +1,15 @@
 import { __assign } from "tslib";
 import { InternalGraphQLAPIClass } from '@aws-amplify/api-graphql/internals';
-import { Cache } from '@aws-amplify/core';
+import { Amplify, Cache } from '@aws-amplify/core';
 import { ApiAction, Category, ConsoleLogger as Logger, } from '@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.
+ */
 var logger = new Logger('API');
 /**
  * @deprecated
@@ -31,7 +39,7 @@ var InternalAPIClass = /** @class */ (function () {
     };
     InternalAPIClass.prototype.graphql = function (options, additionalHeaders, customUserAgentDetails) {
         var apiUserAgentDetails = __assign({ category: Category.API, action: ApiAction.GraphQl }, customUserAgentDetails);
-        return this._graphqlApi.graphql(options, additionalHeaders, apiUserAgentDetails);
+        return this._graphqlApi.graphql(Amplify, options, additionalHeaders, apiUserAgentDetails);
     };
     return InternalAPIClass;
 }());

package/lib-esm/internals/InternalAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"InternalAPI.js","sourceRoot":"","sources":["../../src/internals/InternalAPI.ts"],"names":[],"mappings":";AAWA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,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;;;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,AApED,IAoEC;;AAED,MAAM,CAAC,IAAM,WAAW,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"InternalAPI.js","sourceRoot":"","sources":["../../src/internals/InternalAPI.ts"],"names":[],"mappings":";AAWA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACN,SAAS,EACT,QAAQ,EACR,aAAa,IAAI,MAAM,GAEvB,MAAM,mCAAmC,CAAC;AAG3C;;;;;;;GAOG;AAEH,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;;;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,OAAO,EACP,iBAAiB,EACjB,mBAAmB,CACnB,CAAC;IACH,CAAC;IACF,uBAAC;AAAD,CAAC,AArED,IAqEC;;AAED,MAAM,CAAC,IAAM,WAAW,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC"}

package/lib-esm/server.d.ts

@@ -1 +1,9 @@
+export { GraphQLQuery, GraphQLSubscription } from './types';
+import { AmplifyServer } from '@aws-amplify/core/internals/adapter-core';
+import { V6Client } from '@aws-amplify/api-graphql';
+export type { GraphQLResult, GraphQLReturnType, } from '@aws-amplify/api-graphql';
+/**
+ * Generates an API client that can work with models or raw GraphQL
+ */
+export declare function generateClient<T extends Record<any, any> = never>(contextSpec: AmplifyServer.ContextSpec): V6Client<T>;
 export { get, put, post, del, head, patch, isCancelError, } from '@aws-amplify/api-rest/server';

package/lib-esm/server.js

@@ -1,4 +1,19 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import { graphql, cancel, isCancelError, } from '@aws-amplify/api-graphql/internals';
+import { getAmplifyServerContext, } from '@aws-amplify/core/internals/adapter-core';
+import { __amplify } from '@aws-amplify/api-graphql';
+/**
+ * Generates an API client that can work with models or raw GraphQL
+ */
+export function generateClient(contextSpec) {
+    var _a;
+    return _a = {},
+        _a[__amplify] = getAmplifyServerContext(contextSpec).amplify,
+        _a.graphql = graphql,
+        _a.cancel = cancel,
+        _a.isCancelError = isCancelError,
+        _a;
+}
 export { get, put, post, del, head, patch, isCancelError, } from '@aws-amplify/api-rest/server';
 //# sourceMappingURL=server.js.map

package/lib-esm/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;AAEtC,OAAO,EACN,GAAG,EACH,GAAG,EACH,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,KAAK,EACL,aAAa,GACb,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;AAGtC,OAAO,EACN,OAAO,EACP,MAAM,EACN,aAAa,GACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAEN,uBAAuB,GACvB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,SAAS,EAAY,MAAM,0BAA0B,CAAC;AAO/D;;GAEG;AACH,MAAM,UAAU,cAAc,CAC7B,WAAsC;;IAEtC;QACC,GAAC,SAAS,IAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC,OAAO;QACzD,UAAO,UAAA;QACP,SAAM,SAAA;QACN,gBAAa,gBAAA;WACZ;AACH,CAAC;AAED,OAAO,EACN,GAAG,EACH,GAAG,EACH,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,KAAK,EACL,aAAa,GACb,MAAM,8BAA8B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api",
-	"version": "6.0.1-console-preview.d807e55.0+d807e55",
+	"version": "6.0.1-console-preview.5f040a2.0+5f040a2",
 	"description": "Api category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -24,7 +24,6 @@
 	},
 	"scripts": {
 		"test": "npm run lint && jest -w 1 --coverage",
-		"test:size": "size-limit",
 		"build-with-test": "npm test && npm run build",
 		"build:cjs": "node ./build es5 && webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm": "node ./build es6",
@@ -59,18 +58,10 @@
 		"server"
 	],
 	"dependencies": {
-		"@aws-amplify/api-graphql": "4.0.1-console-preview.d807e55.0+d807e55",
-		"@aws-amplify/api-rest": "4.0.1-console-preview.d807e55.0+d807e55",
+		"@aws-amplify/api-graphql": "4.0.1-console-preview.5f040a2.0+5f040a2",
+		"@aws-amplify/api-rest": "4.0.1-console-preview.5f040a2.0+5f040a2",
 		"tslib": "^2.6.1"
 	},
-	"size-limit": [
-		{
-			"name": "API (top-level class)",
-			"path": "./lib-esm/index.js",
-			"import": "{ Amplify, API }",
-			"limit": "93.82 kB"
-		}
-	],
 	"jest": {
 		"globals": {
 			"ts-jest": {
@@ -115,5 +106,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "d807e554bd4c36e287ab3b4a229260fc9b851d40"
+	"gitHead": "5f040a29ecebf29374ae9b58abc661f45143ac4f"
 }

package/src/API.ts

@@ -1,81 +1,23 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import {
-	AWSAppSyncRealTimeProvider,
-	GraphQLOptions,
-	GraphQLResult,
-	GraphQLQuery,
-	GraphQLSubscription,
-} from '@aws-amplify/api-graphql';
+import { __amplify, V6Client } from '@aws-amplify/api-graphql';
 import {
 	graphql as v6graphql,
 	cancel as v6cancel,
 	isCancelError as v6isCancelError,
 } from '@aws-amplify/api-graphql/internals';
-import { Observable } from 'rxjs';
-import { InternalAPIClass } from './internals/InternalAPI';
+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
  */
-export class APIClass extends InternalAPIClass {
-	public getModuleName() {
-		return 'API';
-	}
-
-	/**
-	 * 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>;
-	graphql<T = any>(
-		options: GraphQLOptions,
-		additionalHeaders?: { [key: string]: string }
-	): 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,
-			cancel: v6cancel,
-			isCancelError: v6isCancelError,
-		};
-
-		return client as V6Client<T>;
-	}
+export function generateClient<
+	T extends Record<any, any> = never
+>(): V6Client<T> {
+	return {
+		[__amplify]: Amplify,
+		graphql: v6graphql,
+		cancel: v6cancel,
+		isCancelError: v6isCancelError,
+	};
 }
-
-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;
-	cancel: typeof v6cancel;
-	isCancelError: typeof v6isCancelError;
-}>;
-
-export const API = new APIClass(null);

package/src/index.ts

@@ -4,7 +4,7 @@
 // TODO(v6): revisit exports
 
 export { GraphQLQuery, GraphQLSubscription } from './types';
-import { API } from './API';
+export { generateClient } from './API';
 
 export { GraphQLAuthError } from '@aws-amplify/api-graphql';
 
@@ -13,10 +13,6 @@ export type {
 	GraphQLReturnType,
 } from '@aws-amplify/api-graphql';
 
-const generateClient = API.generateClient;
-
-export { generateClient };
-
 export {
 	get,
 	put,

package/src/internals/InternalAPI.ts

@@ -10,7 +10,7 @@ import {
 	GraphQLSubscription,
 } from '@aws-amplify/api-graphql';
 import { InternalGraphQLAPIClass } from '@aws-amplify/api-graphql/internals';
-import { Cache } from '@aws-amplify/core';
+import { Amplify, Cache } from '@aws-amplify/core';
 import {
 	ApiAction,
 	Category,
@@ -19,6 +19,15 @@ import {
 } from '@aws-amplify/core/internals/utils';
 import { Observable } from 'rxjs';
 
+/**
+ * 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 Logger('API');
 /**
  * @deprecated
@@ -88,6 +97,7 @@ export class InternalAPIClass {
 		};
 
 		return this._graphqlApi.graphql(
+			Amplify,
 			options,
 			additionalHeaders,
 			apiUserAgentDetails

package/src/server.ts

@@ -1,6 +1,38 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+export { GraphQLQuery, GraphQLSubscription } from './types';
+import {
+	graphql,
+	cancel,
+	isCancelError,
+} from '@aws-amplify/api-graphql/internals';
+import {
+	AmplifyServer,
+	getAmplifyServerContext,
+} from '@aws-amplify/core/internals/adapter-core';
+
+import { __amplify, V6Client } from '@aws-amplify/api-graphql';
+
+export type {
+	GraphQLResult,
+	GraphQLReturnType,
+} from '@aws-amplify/api-graphql';
+
+/**
+ * Generates an API client that can work with models or raw GraphQL
+ */
+export function generateClient<T extends Record<any, any> = never>(
+	contextSpec: AmplifyServer.ContextSpec
+): V6Client<T> {
+	return {
+		[__amplify]: getAmplifyServerContext(contextSpec).amplify,
+		graphql,
+		cancel,
+		isCancelError,
+	};
+}
+
 export {
 	get,
 	put,