@aws-amplify/api-graphql 2.3.9-unstable.7 → 2.3.10-unstable.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/dist/aws-amplify-api-graphql.js +10 -6
- package/dist/aws-amplify-api-graphql.js.map +1 -1
- package/dist/aws-amplify-api-graphql.min.js +3 -3
- package/dist/aws-amplify-api-graphql.min.js.map +1 -1
- package/lib/GraphQLAPI.d.ts +3 -2
- package/lib/GraphQLAPI.js +6 -5
- package/lib/GraphQLAPI.js.map +1 -1
- package/lib/types/index.d.ts +1 -0
- package/lib/types/index.js.map +1 -1
- package/lib-esm/GraphQLAPI.d.ts +3 -2
- package/lib-esm/GraphQLAPI.js +7 -6
- package/lib-esm/GraphQLAPI.js.map +1 -1
- package/lib-esm/types/index.d.ts +1 -0
- package/lib-esm/types/index.js.map +1 -1
- package/package.json +7 -7
- package/src/GraphQLAPI.ts +17 -9
- package/src/types/index.ts +1 -0
package/lib/GraphQLAPI.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { OperationTypeNode } from 'graphql';
|
|
2
2
|
import Observable from 'zen-observable-ts';
|
|
3
3
|
import { GraphQLOptions, GraphQLResult, GraphQLOperation } from './types';
|
|
4
|
-
export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string) => {
|
|
4
|
+
export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string, userAgentSuffix?: string) => {
|
|
5
5
|
query: any;
|
|
6
6
|
variables: {};
|
|
7
7
|
authToken: string;
|
|
8
|
+
userAgentSuffix: string;
|
|
8
9
|
};
|
|
9
10
|
/**
|
|
10
11
|
* Export Cloud Logic APIs
|
|
@@ -48,7 +49,7 @@ export declare class GraphQLAPIClass {
|
|
|
48
49
|
* @param [additionalHeaders] - headers to merge in after any `graphql_headers` set in the config
|
|
49
50
|
* @returns An Observable if the query is a subscription query, else a promise of the graphql result.
|
|
50
51
|
*/
|
|
51
|
-
graphql<T = any>({ query: paramQuery, variables, authMode, authToken }: GraphQLOptions, additionalHeaders?: {
|
|
52
|
+
graphql<T = any>({ query: paramQuery, variables, authMode, authToken, userAgentSuffix, }: GraphQLOptions, additionalHeaders?: {
|
|
52
53
|
[key: string]: string;
|
|
53
54
|
}): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>>;
|
|
54
55
|
private _graphql;
|
package/lib/GraphQLAPI.js
CHANGED
|
@@ -98,12 +98,13 @@ var types_1 = require("./types");
|
|
|
98
98
|
var api_rest_1 = require("@aws-amplify/api-rest");
|
|
99
99
|
var USER_AGENT_HEADER = 'x-amz-user-agent';
|
|
100
100
|
var logger = new core_1.ConsoleLogger('GraphQLAPI');
|
|
101
|
-
exports.graphqlOperation = function (query, variables, authToken) {
|
|
101
|
+
exports.graphqlOperation = function (query, variables, authToken, userAgentSuffix) {
|
|
102
102
|
if (variables === void 0) { variables = {}; }
|
|
103
103
|
return ({
|
|
104
104
|
query: query,
|
|
105
105
|
variables: variables,
|
|
106
106
|
authToken: authToken,
|
|
107
|
+
userAgentSuffix: userAgentSuffix,
|
|
107
108
|
});
|
|
108
109
|
};
|
|
109
110
|
/**
|
|
@@ -277,7 +278,7 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
277
278
|
* @returns An Observable if the query is a subscription query, else a promise of the graphql result.
|
|
278
279
|
*/
|
|
279
280
|
GraphQLAPIClass.prototype.graphql = function (_a, additionalHeaders) {
|
|
280
|
-
var paramQuery = _a.query, _b = _a.variables, variables = _b === void 0 ? {} : _b, authMode = _a.authMode, authToken = _a.authToken;
|
|
281
|
+
var paramQuery = _a.query, _b = _a.variables, variables = _b === void 0 ? {} : _b, authMode = _a.authMode, authToken = _a.authToken, userAgentSuffix = _a.userAgentSuffix;
|
|
281
282
|
var query = typeof paramQuery === 'string'
|
|
282
283
|
? graphql_1.parse(paramQuery)
|
|
283
284
|
: graphql_1.parse(graphql_1.print(paramQuery));
|
|
@@ -293,7 +294,7 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
293
294
|
case 'mutation':
|
|
294
295
|
var cancellableToken = this._api.getCancellableToken();
|
|
295
296
|
var initParams = { cancellableToken: cancellableToken };
|
|
296
|
-
var responsePromise = this._graphql({ query: query, variables: variables, authMode: authMode }, headers, initParams);
|
|
297
|
+
var responsePromise = this._graphql({ query: query, variables: variables, authMode: authMode, userAgentSuffix: userAgentSuffix }, headers, initParams);
|
|
297
298
|
this._api.updateRequestToBeCancellable(responsePromise, cancellableToken);
|
|
298
299
|
return responsePromise;
|
|
299
300
|
case 'subscription':
|
|
@@ -303,7 +304,7 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
303
304
|
}
|
|
304
305
|
};
|
|
305
306
|
GraphQLAPIClass.prototype._graphql = function (_a, additionalHeaders, initParams) {
|
|
306
|
-
var query = _a.query, variables = _a.variables, authMode = _a.authMode;
|
|
307
|
+
var query = _a.query, variables = _a.variables, authMode = _a.authMode, userAgentSuffix = _a.userAgentSuffix;
|
|
307
308
|
if (additionalHeaders === void 0) { additionalHeaders = {}; }
|
|
308
309
|
if (initParams === void 0) { initParams = {}; }
|
|
309
310
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -346,7 +347,7 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
346
347
|
return [4 /*yield*/, graphql_headers({ query: query, variables: variables })];
|
|
347
348
|
case 9:
|
|
348
349
|
headers = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), additionalHeaders]), (!customGraphqlEndpoint && (_k = {},
|
|
349
|
-
_k[USER_AGENT_HEADER] = core_1.
|
|
350
|
+
_k[USER_AGENT_HEADER] = core_1.getAmplifyUserAgent(userAgentSuffix),
|
|
350
351
|
_k))]);
|
|
351
352
|
body = {
|
|
352
353
|
query: graphql_1.print(query),
|
package/lib/GraphQLAPI.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphQLAPI.js","sourceRoot":"","sources":["../src/GraphQLAPI.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;GAWG;AACH,mCAOiB;AAEjB,0CAM2B;AAC3B,+DAAyC;AACzC,2DAAqC;AACrC,6DAAuC;AACvC,iCAKiB;AACjB,kDAAmD;AACnD,IAAM,iBAAiB,GAAG,kBAAkB,CAAC;AAE7C,IAAM,MAAM,GAAG,IAAI,oBAAM,CAAC,YAAY,CAAC,CAAC;AAE3B,QAAA,gBAAgB,GAAG,UAC/B,KAAK,EACL,SAAc,EACd,SAAkB;
|
|
1
|
+
{"version":3,"file":"GraphQLAPI.js","sourceRoot":"","sources":["../src/GraphQLAPI.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;GAWG;AACH,mCAOiB;AAEjB,0CAM2B;AAC3B,+DAAyC;AACzC,2DAAqC;AACrC,6DAAuC;AACvC,iCAKiB;AACjB,kDAAmD;AACnD,IAAM,iBAAiB,GAAG,kBAAkB,CAAC;AAE7C,IAAM,MAAM,GAAG,IAAI,oBAAM,CAAC,YAAY,CAAC,CAAC;AAE3B,QAAA,gBAAgB,GAAG,UAC/B,KAAK,EACL,SAAc,EACd,SAAkB,EAClB,eAAwB;IAFxB,0BAAA,EAAA,cAAc;IAGV,OAAA,CAAC;QACL,KAAK,OAAA;QACL,SAAS,WAAA;QACT,SAAS,WAAA;QACT,eAAe,iBAAA;KACf,CAAC;AALG,CAKH,CAAC;AAEH;;GAEG;AACH;IAWC;;;OAGG;IACH,yBAAY,OAAO;QAVX,SAAI,GAAG,IAAI,CAAC;QAEpB,SAAI,GAAG,cAAI,CAAC;QACZ,UAAK,GAAG,eAAK,CAAC;QACd,gBAAW,GAAG,kBAAW,CAAC;QAOzB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,uCAAa,GAApB;QACC,OAAO,YAAY,CAAC;IACrB,CAAC;IAED;;;;OAIG;IACH,mCAAS,GAAT,UAAU,OAAO;QAChB,IAAM,kBAA6C,EAA3C,WAAQ,EAAR,6BAAQ,EAAE,kCAAiC,CAAC;QACpD,IAAI,GAAG,yBAAQ,YAAY,GAAK,GAAG,CAAE,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,GAAG,KAAA,EAAE,CAAC,CAAC;QAE/C,IAAI,GAAG,CAAC,oBAAoB,CAAC,EAAE;YAC9B,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE;gBAC5B,MAAM,EAAE,GAAG,CAAC,oBAAoB,CAAC;gBACjC,MAAM,EAAE,EAAE;aACV,CAAC,CAAC;SACH;QAED,IACC,OAAO,GAAG,CAAC,eAAe,KAAK,WAAW;YAC1C,OAAO,GAAG,CAAC,eAAe,KAAK,UAAU,EACxC;YACD,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YACpD,GAAG,CAAC,eAAe,GAAG,SAAS,CAAC;SAChC;QAED,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAEtD,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED;;;OAGG;IACH,wCAAc,GAAd;QACC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,IAAI,GAAG,IAAI,qBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1C,iDAAiD;YACjD,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAEzC,OAAO,IAAI,CAAC;SACZ;aAAM;YACN,OAAO,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;SAC5C;IACF,CAAC;IAEa,0CAAgB,GAA9B,UACC,yBAA0B,EAC1B,iBAAiD;QAAjD,kCAAA,EAAA,sBAAiD;;;;;;wBAE3C,KACL,IAAI,CAAC,QAAQ,EADN,8BAA8B,oCAAA,EAAsB,MAAM,wBAAA,CACnD;wBACT,kBAAkB,GACvB,yBAAyB,IAAI,8BAA8B,IAAI,SAAS,CAAC;wBACtE,OAAO,GAAG,EAAE,CAAC;wBAET,KAAA,kBAAkB,CAAA;;iCACpB,SAAS,CAAC,CAAV,wBAAS;iCAST,SAAS,CAAC,CAAV,wBAAS;iCAMT,gBAAgB,CAAC,CAAjB,wBAAgB;iCAuBhB,2BAA2B,CAAC,CAA5B,yBAA2B;iCAU3B,YAAY,CAAC,CAAb,yBAAY;;;;wBA/ChB,IAAI,CAAC,MAAM,EAAE;4BACZ,MAAM,IAAI,KAAK,CAAC,wBAAgB,CAAC,UAAU,CAAC,CAAC;yBAC7C;wBACD,OAAO,GAAG;4BACT,aAAa,EAAE,IAAI;4BACnB,WAAW,EAAE,MAAM;yBACnB,CAAC;wBACF,yBAAM;4BAEgB,qBAAM,IAAI,CAAC,kBAAkB,EAAE,EAAA;;wBAA/C,aAAa,GAAG,SAA+B;wBACrD,IAAI,CAAC,aAAa,EAAE;4BACnB,MAAM,IAAI,KAAK,CAAC,wBAAgB,CAAC,cAAc,CAAC,CAAC;yBACjD;wBACD,yBAAM;;;wBAGD,KAAK,SAAA,CAAC;wBAEY,qBAAM,eAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAA;;wBAApD,aAAa,GAAG,SAAoC;6BACtD,aAAa,EAAb,wBAAa;wBAChB,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;;4BAER,qBAAM,cAAI,CAAC,wBAAwB,EAAE,EAAA;;wBAAnD,WAAW,GAAG,SAAqC;wBACzD,IAAI,WAAW,EAAE;4BAChB,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;yBAC1B;;;wBAEF,IAAI,CAAC,KAAK,EAAE;4BACX,MAAM,IAAI,KAAK,CAAC,wBAAgB,CAAC,gBAAgB,CAAC,CAAC;yBACnD;wBACD,OAAO,GAAG;4BACT,aAAa,EAAE,KAAK;yBACpB,CAAC;;;;wBAEF,MAAM,IAAI,KAAK,CAAC,wBAAgB,CAAC,eAAe,CAAC,CAAC;6BAEnD,yBAAM;;;wBAGW,qBAAM,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAA;;wBAA1C,OAAO,GAAG,SAAgC;wBAChD,OAAO,GAAG;4BACT,aAAa,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,WAAW,EAAE;yBACrD,CAAC;;;;wBAEF,MAAM,IAAI,KAAK,CAAC,wBAAgB,CAAC,eAAe,CAAC,CAAC;6BAEnD,yBAAM;;wBAEN,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE;4BACrC,MAAM,IAAI,KAAK,CAAC,wBAAgB,CAAC,aAAa,CAAC,CAAC;yBAChD;wBACD,OAAO,GAAG;4BACT,aAAa,EAAE,iBAAiB,CAAC,aAAa;yBAC9C,CAAC;wBACF,yBAAM;;wBAEN,OAAO,GAAG;4BACT,aAAa,EAAE,IAAI;yBACnB,CAAC;wBACF,yBAAM;6BAGR,sBAAO,OAAO,EAAC;;;;KACf;IAED;;;OAGG;IACH,iDAAuB,GAAvB,UAAwB,SAA2B;QAClD,IAAM,GAAG,GAAG,eAAK,CAAC,SAAS,CAAC,CAAC;QAC7B,IAAM,WAAW,GAChB,GAAG,CAAC,WAAqD,CAAC;QACrD,IAAA,2BAA4C,EAAzC,+BAAyC,CAAC;QAEnD,OAAO,aAAa,CAAC;IACtB,CAAC;IAED;;;;;;OAMG;IACH,iCAAO,GAAP,UACC,EAMiB,EACjB,iBAA6C;YAN5C,qBAAiB,EACjB,iBAAc,EAAd,mCAAc,EACd,sBAAQ,EACR,wBAAS,EACT,oCAAe;QAIhB,IAAM,KAAK,GACV,OAAO,UAAU,KAAK,QAAQ;YAC7B,CAAC,CAAC,eAAK,CAAC,UAAU,CAAC;YACnB,CAAC,CAAC,eAAK,CAAC,eAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QAEvB,IAAA,uGAEL,EAFM,UAAiB,EAAjB,sCAEN,CAAC;QACM,IAAA,sCAAwB,CACS;QAEzC,IAAM,OAAO,GAAG,iBAAiB,IAAI,EAAE,CAAC;QAExC,iFAAiF;QACjF,IAAI,SAAS,EAAE;YACd,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;SAClC;QAED,QAAQ,aAAa,EAAE;YACtB,KAAK,OAAO,CAAC;YACb,KAAK,UAAU;gBACd,IAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACzD,IAAM,UAAU,GAAG,EAAE,gBAAgB,kBAAA,EAAE,CAAC;gBACxC,IAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CACpC,EAAE,KAAK,OAAA,EAAE,SAAS,WAAA,EAAE,QAAQ,UAAA,EAAE,eAAe,iBAAA,EAAE,EAC/C,OAAO,EACP,UAAU,CACV,CAAC;gBACF,IAAI,CAAC,IAAI,CAAC,4BAA4B,CACrC,eAAe,EACf,gBAAgB,CAChB,CAAC;gBACF,OAAO,eAAe,CAAC;YACxB,KAAK,cAAc;gBAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC,EAAE,KAAK,OAAA,EAAE,SAAS,WAAA,EAAE,QAAQ,UAAA,EAAE,EAAE,OAAO,CAAC,CAAC;YACxE;gBACC,MAAM,IAAI,KAAK,CAAC,6BAA2B,aAAe,CAAC,CAAC;SAC7D;IACF,CAAC;IAEa,kCAAQ,GAAtB,UACC,EAA+D,EAC/D,iBAAsB,EACtB,UAAe;YAFb,gBAAK,EAAE,wBAAS,EAAE,sBAAQ,EAAE,oCAAe;QAC7C,kCAAA,EAAA,sBAAsB;QACtB,2BAAA,EAAA,eAAe;;;;;;;6BAEX,CAAC,IAAI,CAAC,IAAI,EAAV,wBAAU;wBACb,qBAAM,IAAI,CAAC,cAAc,EAAE,EAAA;;wBAA3B,SAA2B,CAAC;;;wBAGvB,KAMF,IAAI,CAAC,QAAQ,EALI,MAAM,wBAAA,EACG,sBAAsB,iCAAA,EACnD,uBAA4B,EAA5B,eAAe,mBAAG,cAAM,OAAA,CAAC,EAAE,CAAC,EAAJ,CAAI,KAAA,EACV,qBAAqB,sBAAA,EACV,oBAAoB,iCAAA,CAChC;;wBAGb,KAAA,CAAC,qBAAqB,CAAA;iCAAtB,wBAAsB;wBACxB,qBAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EAAA;;wBAAzD,KAAA,CAAC,SAAwD,CAAC,CAAA;;;gEADxD,IACyD;wBACxD,KAAA,qBAAqB,CAAA;iCAArB,wBAAqB;6BACvB,oBAAoB,EAApB,wBAAoB;wBAClB,qBAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EAAA;;wBAAxD,KAAA,SAAwD,CAAA;;;wBACxD,KAAA,EAAE,aAAa,EAAE,IAAI,EAAE,CAAA;;;wBAF1B,KAAA,IAE2B,CAAA;;;gEAHzB,IAG0B;wBACzB,qBAAM,eAAe,CAAC,EAAE,KAAK,OAAA,EAAE,SAAS,WAAA,EAAE,CAAC,EAAA;;wBAP1C,OAAO,qFAOT,CAAC,SAA2C,CAAC,KAC7C,iBAAiB,IACjB,CAAC,CAAC,qBAAqB;gCACzB,GAAC,iBAAiB,IAAG,0BAAmB,CAAC,eAAe,CAAC;mCACzD,CAAC,EACF;wBAEK,IAAI,GAAG;4BACZ,KAAK,EAAE,eAAK,CAAC,KAAqB,CAAC;4BACnC,SAAS,WAAA;yBACT,CAAC;wBAEI,IAAI,GAAG,MAAM,CAAC,MAAM,CACzB;4BACC,OAAO,SAAA;4BACP,IAAI,MAAA;4BACJ,iBAAiB,EAAE;gCAClB,OAAO,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa;gCAC3D,MAAM,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB;6BAC9D;yBACD,EACD,UAAU,CACV,CAAC;wBAEI,QAAQ,GAAG,qBAAqB,IAAI,sBAAsB,CAAC;wBAEjE,IAAI,CAAC,QAAQ,EAAE;4BACR,KAAK,GAAG,IAAI,sBAAY,CAAC,+BAA+B,CAAC,CAAC;4BAEhE,MAAM;gCACL,IAAI,EAAE,EAAE;gCACR,MAAM,EAAE,CAAC,KAAK,CAAC;6BACf,CAAC;yBACF;;;;wBAIW,qBAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAA;;wBAA/C,QAAQ,GAAG,SAAoC,CAAC;;;;wBAEhD,iDAAiD;wBACjD,qDAAqD;wBACrD,wDAAwD;wBACxD,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAG,CAAC,EAAE;4BAC5B,MAAM,KAAG,CAAC;yBACV;wBACD,QAAQ,GAAG;4BACV,IAAI,EAAE,EAAE;4BACR,MAAM,EAAE,CAAC,IAAI,sBAAY,CAAC,KAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAG,CAAC,CAAC;yBACpE,CAAC;;;wBAGK,MAAM,GAAK,QAAQ,OAAb,CAAc;wBAE5B,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;4BAC5B,MAAM,QAAQ,CAAC;yBACf;wBAED,sBAAO,QAAQ,EAAC;;;;KAChB;IAED;;;;OAIG;IACH,kCAAQ,GAAR,UAAS,KAAK;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,gCAAM,GAAN,UAAO,OAAqB,EAAE,OAAgB;QAC7C,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACH,wCAAc,GAAd,UAAe,OAAqB;QACnC,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAEO,2CAAiB,GAAzB,UACC,EAKiB,EACjB,iBAAsB;YALrB,gBAAK,EACL,wBAAS,EACT,uCAAmC,EACnC,wBAAS;QAEV,kCAAA,EAAA,sBAAsB;QAEhB,IAAA,kBAMW,EALhB,8BAA0B,EAC1B,uDAAmD,EACnD,kEAA8B,EAC9B,8BAA0B,EAC1B,uBAA4B,EAA5B,mEACgB,CAAC;QAClB,IAAM,kBAAkB,GACvB,yBAAyB,IAAI,8BAA8B,IAAI,SAAS,CAAC;QAE1E,IAAI,gBAAM,IAAI,OAAO,gBAAM,CAAC,SAAS,KAAK,UAAU,EAAE;YACrD,OAAO,gBAAM,CAAC,SAAS,CAAC,EAAE,EAAE;gBAC3B,QAAQ,EAAE,oDAA6C;gBACvD,sBAAsB,wBAAA;gBACtB,kBAAkB,oBAAA;gBAClB,MAAM,QAAA;gBACN,KAAK,EAAE,eAAK,CAAC,KAAqB,CAAC;gBACnC,MAAM,QAAA;gBACN,SAAS,WAAA;gBACT,eAAe,iBAAA;gBACf,iBAAiB,mBAAA;gBACjB,SAAS,WAAA;aACT,CAAC,CAAC;SACH;aAAM;YACN,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC1D,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAC7D;IACF,CAAC;IAED;;OAEG;IACH,4CAAkB,GAAlB;QAAA,iBAaC;QAZA,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE;aAC3B,IAAI,CAAC,UAAA,WAAW;YAChB,IAAI,CAAC,WAAW;gBAAE,OAAO,KAAK,CAAC;YAC/B,IAAM,IAAI,GAAG,KAAI,CAAC,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACjD,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC;YAE9C,OAAO,IAAI,CAAC;QACb,CAAC,CAAC;aACD,KAAK,CAAC,UAAA,GAAG;YACT,MAAM,CAAC,IAAI,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;YAC7C,OAAO,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IACF,sBAAC;AAAD,CAAC,AAlYD,IAkYC;AAlYY,0CAAe;AAoYf,QAAA,UAAU,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;AACpD,cAAO,CAAC,QAAQ,CAAC,kBAAU,CAAC,CAAC"}
|
package/lib/types/index.d.ts
CHANGED
package/lib/types/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;AAcA,0CAAsD;AAC7C,4BADA,wBAAiB,CACA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;AAcA,0CAAsD;AAC7C,4BADA,wBAAiB,CACA;AAkB1B,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC3B,wDAAoC,CAAA;IACpC,uDAAmC,CAAA;IACnC,qDAAiC,CAAA;IACjC,yDAAqC,CAAA;IACrC,6DAAyC,CAAA;AAC1C,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAM3B"}
|
package/lib-esm/GraphQLAPI.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { OperationTypeNode } from 'graphql';
|
|
2
2
|
import Observable from 'zen-observable-ts';
|
|
3
3
|
import { GraphQLOptions, GraphQLResult, GraphQLOperation } from './types';
|
|
4
|
-
export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string) => {
|
|
4
|
+
export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string, userAgentSuffix?: string) => {
|
|
5
5
|
query: any;
|
|
6
6
|
variables: {};
|
|
7
7
|
authToken: string;
|
|
8
|
+
userAgentSuffix: string;
|
|
8
9
|
};
|
|
9
10
|
/**
|
|
10
11
|
* Export Cloud Logic APIs
|
|
@@ -48,7 +49,7 @@ export declare class GraphQLAPIClass {
|
|
|
48
49
|
* @param [additionalHeaders] - headers to merge in after any `graphql_headers` set in the config
|
|
49
50
|
* @returns An Observable if the query is a subscription query, else a promise of the graphql result.
|
|
50
51
|
*/
|
|
51
|
-
graphql<T = any>({ query: paramQuery, variables, authMode, authToken }: GraphQLOptions, additionalHeaders?: {
|
|
52
|
+
graphql<T = any>({ query: paramQuery, variables, authMode, authToken, userAgentSuffix, }: GraphQLOptions, additionalHeaders?: {
|
|
52
53
|
[key: string]: string;
|
|
53
54
|
}): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>>;
|
|
54
55
|
private _graphql;
|
package/lib-esm/GraphQLAPI.js
CHANGED
|
@@ -85,7 +85,7 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
85
85
|
* and limitations under the License.
|
|
86
86
|
*/
|
|
87
87
|
import { print, parse, GraphQLError, } from 'graphql';
|
|
88
|
-
import { Amplify, ConsoleLogger as Logger,
|
|
88
|
+
import { Amplify, ConsoleLogger as Logger, Credentials, getAmplifyUserAgent, INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER, } from '@aws-amplify/core';
|
|
89
89
|
import PubSub from '@aws-amplify/pubsub';
|
|
90
90
|
import Auth from '@aws-amplify/auth';
|
|
91
91
|
import Cache from '@aws-amplify/cache';
|
|
@@ -93,12 +93,13 @@ import { GraphQLAuthError, } from './types';
|
|
|
93
93
|
import { RestClient } from '@aws-amplify/api-rest';
|
|
94
94
|
var USER_AGENT_HEADER = 'x-amz-user-agent';
|
|
95
95
|
var logger = new Logger('GraphQLAPI');
|
|
96
|
-
export var graphqlOperation = function (query, variables, authToken) {
|
|
96
|
+
export var graphqlOperation = function (query, variables, authToken, userAgentSuffix) {
|
|
97
97
|
if (variables === void 0) { variables = {}; }
|
|
98
98
|
return ({
|
|
99
99
|
query: query,
|
|
100
100
|
variables: variables,
|
|
101
101
|
authToken: authToken,
|
|
102
|
+
userAgentSuffix: userAgentSuffix,
|
|
102
103
|
});
|
|
103
104
|
};
|
|
104
105
|
/**
|
|
@@ -272,7 +273,7 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
272
273
|
* @returns An Observable if the query is a subscription query, else a promise of the graphql result.
|
|
273
274
|
*/
|
|
274
275
|
GraphQLAPIClass.prototype.graphql = function (_a, additionalHeaders) {
|
|
275
|
-
var paramQuery = _a.query, _b = _a.variables, variables = _b === void 0 ? {} : _b, authMode = _a.authMode, authToken = _a.authToken;
|
|
276
|
+
var paramQuery = _a.query, _b = _a.variables, variables = _b === void 0 ? {} : _b, authMode = _a.authMode, authToken = _a.authToken, userAgentSuffix = _a.userAgentSuffix;
|
|
276
277
|
var query = typeof paramQuery === 'string'
|
|
277
278
|
? parse(paramQuery)
|
|
278
279
|
: parse(print(paramQuery));
|
|
@@ -288,7 +289,7 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
288
289
|
case 'mutation':
|
|
289
290
|
var cancellableToken = this._api.getCancellableToken();
|
|
290
291
|
var initParams = { cancellableToken: cancellableToken };
|
|
291
|
-
var responsePromise = this._graphql({ query: query, variables: variables, authMode: authMode }, headers, initParams);
|
|
292
|
+
var responsePromise = this._graphql({ query: query, variables: variables, authMode: authMode, userAgentSuffix: userAgentSuffix }, headers, initParams);
|
|
292
293
|
this._api.updateRequestToBeCancellable(responsePromise, cancellableToken);
|
|
293
294
|
return responsePromise;
|
|
294
295
|
case 'subscription':
|
|
@@ -298,7 +299,7 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
298
299
|
}
|
|
299
300
|
};
|
|
300
301
|
GraphQLAPIClass.prototype._graphql = function (_a, additionalHeaders, initParams) {
|
|
301
|
-
var query = _a.query, variables = _a.variables, authMode = _a.authMode;
|
|
302
|
+
var query = _a.query, variables = _a.variables, authMode = _a.authMode, userAgentSuffix = _a.userAgentSuffix;
|
|
302
303
|
if (additionalHeaders === void 0) { additionalHeaders = {}; }
|
|
303
304
|
if (initParams === void 0) { initParams = {}; }
|
|
304
305
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -341,7 +342,7 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
341
342
|
return [4 /*yield*/, graphql_headers({ query: query, variables: variables })];
|
|
342
343
|
case 9:
|
|
343
344
|
headers = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), additionalHeaders]), (!customGraphqlEndpoint && (_k = {},
|
|
344
|
-
_k[USER_AGENT_HEADER] =
|
|
345
|
+
_k[USER_AGENT_HEADER] = getAmplifyUserAgent(userAgentSuffix),
|
|
345
346
|
_k))]);
|
|
346
347
|
body = {
|
|
347
348
|
query: print(query),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphQLAPI.js","sourceRoot":"","sources":["../src/GraphQLAPI.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAGN,KAAK,EACL,KAAK,EACL,YAAY,GAEZ,MAAM,SAAS,CAAC;AAEjB,OAAO,EACN,OAAO,EACP,aAAa,IAAI,MAAM,EACvB,
|
|
1
|
+
{"version":3,"file":"GraphQLAPI.js","sourceRoot":"","sources":["../src/GraphQLAPI.ts"],"names":[],"mappings":"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"}
|
package/lib-esm/types/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAkB7B,MAAM,CAAN,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC3B,wDAAoC,CAAA;IACpC,uDAAmC,CAAA;IACnC,qDAAiC,CAAA;IACjC,yDAAqC,CAAA;IACrC,6DAAyC,CAAA;AAC1C,CAAC,EANW,gBAAgB,KAAhB,gBAAgB,QAM3B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/api-graphql",
|
|
3
|
-
"version": "2.3.
|
|
3
|
+
"version": "2.3.10-unstable.5+dfe6461aa",
|
|
4
4
|
"description": "Api-graphql category of aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -44,11 +44,11 @@
|
|
|
44
44
|
"@types/zen-observable": "^0.8.0"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@aws-amplify/api-rest": "2.0.
|
|
48
|
-
"@aws-amplify/auth": "4.5.
|
|
49
|
-
"@aws-amplify/cache": "4.0.
|
|
50
|
-
"@aws-amplify/core": "4.5.
|
|
51
|
-
"@aws-amplify/pubsub": "4.4.
|
|
47
|
+
"@aws-amplify/api-rest": "2.0.46-unstable.5+dfe6461aa",
|
|
48
|
+
"@aws-amplify/auth": "4.5.10-unstable.5+dfe6461aa",
|
|
49
|
+
"@aws-amplify/cache": "4.0.48-unstable.5+dfe6461aa",
|
|
50
|
+
"@aws-amplify/core": "4.5.10-unstable.5+dfe6461aa",
|
|
51
|
+
"@aws-amplify/pubsub": "4.4.7-unstable.5+dfe6461aa",
|
|
52
52
|
"graphql": "15.8.0",
|
|
53
53
|
"uuid": "^3.2.1",
|
|
54
54
|
"zen-observable-ts": "0.8.19"
|
|
@@ -97,5 +97,5 @@
|
|
|
97
97
|
"lib-esm"
|
|
98
98
|
]
|
|
99
99
|
},
|
|
100
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "dfe6461aab6e26cdb259358b9399c48f03c44a8e"
|
|
101
101
|
}
|
package/src/GraphQLAPI.ts
CHANGED
|
@@ -22,8 +22,8 @@ import Observable from 'zen-observable-ts';
|
|
|
22
22
|
import {
|
|
23
23
|
Amplify,
|
|
24
24
|
ConsoleLogger as Logger,
|
|
25
|
-
Constants,
|
|
26
25
|
Credentials,
|
|
26
|
+
getAmplifyUserAgent,
|
|
27
27
|
INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER,
|
|
28
28
|
} from '@aws-amplify/core';
|
|
29
29
|
import PubSub from '@aws-amplify/pubsub';
|
|
@@ -43,11 +43,13 @@ const logger = new Logger('GraphQLAPI');
|
|
|
43
43
|
export const graphqlOperation = (
|
|
44
44
|
query,
|
|
45
45
|
variables = {},
|
|
46
|
-
authToken?: string
|
|
46
|
+
authToken?: string,
|
|
47
|
+
userAgentSuffix?: string
|
|
47
48
|
) => ({
|
|
48
49
|
query,
|
|
49
50
|
variables,
|
|
50
51
|
authToken,
|
|
52
|
+
userAgentSuffix,
|
|
51
53
|
});
|
|
52
54
|
|
|
53
55
|
/**
|
|
@@ -224,7 +226,13 @@ export class GraphQLAPIClass {
|
|
|
224
226
|
* @returns An Observable if the query is a subscription query, else a promise of the graphql result.
|
|
225
227
|
*/
|
|
226
228
|
graphql<T = any>(
|
|
227
|
-
{
|
|
229
|
+
{
|
|
230
|
+
query: paramQuery,
|
|
231
|
+
variables = {},
|
|
232
|
+
authMode,
|
|
233
|
+
authToken,
|
|
234
|
+
userAgentSuffix,
|
|
235
|
+
}: GraphQLOptions,
|
|
228
236
|
additionalHeaders?: { [key: string]: string }
|
|
229
237
|
): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>> {
|
|
230
238
|
const query =
|
|
@@ -233,7 +241,7 @@ export class GraphQLAPIClass {
|
|
|
233
241
|
: parse(print(paramQuery));
|
|
234
242
|
|
|
235
243
|
const [operationDef = {}] = query.definitions.filter(
|
|
236
|
-
|
|
244
|
+
def => def.kind === 'OperationDefinition'
|
|
237
245
|
);
|
|
238
246
|
const { operation: operationType } =
|
|
239
247
|
operationDef as OperationDefinitionNode;
|
|
@@ -251,7 +259,7 @@ export class GraphQLAPIClass {
|
|
|
251
259
|
const cancellableToken = this._api.getCancellableToken();
|
|
252
260
|
const initParams = { cancellableToken };
|
|
253
261
|
const responsePromise = this._graphql<T>(
|
|
254
|
-
{ query, variables, authMode },
|
|
262
|
+
{ query, variables, authMode, userAgentSuffix },
|
|
255
263
|
headers,
|
|
256
264
|
initParams
|
|
257
265
|
);
|
|
@@ -268,7 +276,7 @@ export class GraphQLAPIClass {
|
|
|
268
276
|
}
|
|
269
277
|
|
|
270
278
|
private async _graphql<T = any>(
|
|
271
|
-
{ query, variables, authMode }: GraphQLOptions,
|
|
279
|
+
{ query, variables, authMode, userAgentSuffix }: GraphQLOptions,
|
|
272
280
|
additionalHeaders = {},
|
|
273
281
|
initParams = {}
|
|
274
282
|
): Promise<GraphQLResult<T>> {
|
|
@@ -294,7 +302,7 @@ export class GraphQLAPIClass {
|
|
|
294
302
|
...(await graphql_headers({ query, variables })),
|
|
295
303
|
...additionalHeaders,
|
|
296
304
|
...(!customGraphqlEndpoint && {
|
|
297
|
-
[USER_AGENT_HEADER]:
|
|
305
|
+
[USER_AGENT_HEADER]: getAmplifyUserAgent(userAgentSuffix),
|
|
298
306
|
}),
|
|
299
307
|
};
|
|
300
308
|
|
|
@@ -421,14 +429,14 @@ export class GraphQLAPIClass {
|
|
|
421
429
|
*/
|
|
422
430
|
_ensureCredentials() {
|
|
423
431
|
return this.Credentials.get()
|
|
424
|
-
.then(
|
|
432
|
+
.then(credentials => {
|
|
425
433
|
if (!credentials) return false;
|
|
426
434
|
const cred = this.Credentials.shear(credentials);
|
|
427
435
|
logger.debug('set credentials for api', cred);
|
|
428
436
|
|
|
429
437
|
return true;
|
|
430
438
|
})
|
|
431
|
-
.catch(
|
|
439
|
+
.catch(err => {
|
|
432
440
|
logger.warn('ensure credentials error', err);
|
|
433
441
|
return false;
|
|
434
442
|
});
|