@aws-amplify/api-graphql 2.3.13-next.20 → 2.3.13-next.32
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 +32 -0
- package/lib/GraphQLAPI.js +45 -34
- package/lib/GraphQLAPI.js.map +1 -1
- package/lib-esm/GraphQLAPI.d.ts +1 -0
- package/lib-esm/GraphQLAPI.js +41 -30
- package/lib-esm/GraphQLAPI.js.map +1 -1
- package/package.json +12 -7
- package/src/GraphQLAPI.ts +10 -6
- package/build.js +0 -5
- package/dist/aws-amplify-api-graphql.js +0 -13663
- package/dist/aws-amplify-api-graphql.js.map +0 -1
- package/dist/aws-amplify-api-graphql.min.js +0 -11
- package/dist/aws-amplify-api-graphql.min.js.map +0 -1
- package/index-rn.js +0 -3
- package/index.js +0 -7
- package/lib/GraphQLAPI.d.ts +0 -80
- package/lib/index.d.ts +0 -5
- package/lib/types/index.d.ts +0 -30
- package/webpack.config.dev.js +0 -6
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,38 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [2.3.23](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@2.3.22...@aws-amplify/api-graphql@2.3.23) (2022-10-26)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @aws-amplify/api-graphql
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [2.3.22](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@2.3.21...@aws-amplify/api-graphql@2.3.22) (2022-10-25)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @aws-amplify/api-graphql
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
## [2.3.21](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@2.3.20...@aws-amplify/api-graphql@2.3.21) (2022-10-14)
|
|
23
|
+
|
|
24
|
+
**Note:** Version bump only for package @aws-amplify/api-graphql
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
## [2.3.20](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@2.3.19...@aws-amplify/api-graphql@2.3.20) (2022-10-14)
|
|
31
|
+
|
|
32
|
+
**Note:** Version bump only for package @aws-amplify/api-graphql
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
|
|
6
38
|
## [2.3.19](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@2.3.17...@aws-amplify/api-graphql@2.3.19) (2022-09-30)
|
|
7
39
|
|
|
8
40
|
|
package/lib/GraphQLAPI.js
CHANGED
|
@@ -16,8 +16,8 @@ var tslib_1 = require("tslib");
|
|
|
16
16
|
var graphql_1 = require("graphql");
|
|
17
17
|
var core_1 = require("@aws-amplify/core");
|
|
18
18
|
var pubsub_1 = require("@aws-amplify/pubsub");
|
|
19
|
-
var auth_1 =
|
|
20
|
-
var cache_1 =
|
|
19
|
+
var auth_1 = require("@aws-amplify/auth");
|
|
20
|
+
var cache_1 = require("@aws-amplify/cache");
|
|
21
21
|
var types_1 = require("./types");
|
|
22
22
|
var api_rest_1 = require("@aws-amplify/api-rest");
|
|
23
23
|
var USER_AGENT_HEADER = 'x-amz-user-agent';
|
|
@@ -41,8 +41,8 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
41
41
|
*/
|
|
42
42
|
function GraphQLAPIClass(options) {
|
|
43
43
|
this._api = null;
|
|
44
|
-
this.Auth = auth_1.
|
|
45
|
-
this.Cache = cache_1.
|
|
44
|
+
this.Auth = auth_1.Auth;
|
|
45
|
+
this.Cache = cache_1.BrowserStorageCache;
|
|
46
46
|
this.Credentials = core_1.Credentials;
|
|
47
47
|
this._options = options;
|
|
48
48
|
logger.debug('API Options', this._options);
|
|
@@ -128,13 +128,13 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
128
128
|
case 4:
|
|
129
129
|
_c.trys.push([4, 9, , 10]);
|
|
130
130
|
token = void 0;
|
|
131
|
-
return [4 /*yield*/, cache_1.
|
|
131
|
+
return [4 /*yield*/, cache_1.BrowserStorageCache.getItem('federatedInfo')];
|
|
132
132
|
case 5:
|
|
133
133
|
federatedInfo = _c.sent();
|
|
134
134
|
if (!federatedInfo) return [3 /*break*/, 6];
|
|
135
135
|
token = federatedInfo.token;
|
|
136
136
|
return [3 /*break*/, 8];
|
|
137
|
-
case 6: return [4 /*yield*/, auth_1.
|
|
137
|
+
case 6: return [4 /*yield*/, auth_1.Auth.currentAuthenticatedUser()];
|
|
138
138
|
case 7:
|
|
139
139
|
currentUser = _c.sent();
|
|
140
140
|
if (currentUser) {
|
|
@@ -216,6 +216,7 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
216
216
|
switch (operationType) {
|
|
217
217
|
case 'query':
|
|
218
218
|
case 'mutation':
|
|
219
|
+
this.createInstanceIfNotCreated();
|
|
219
220
|
var cancellableToken = this._api.getCancellableToken();
|
|
220
221
|
var initParams = { cancellableToken: cancellableToken };
|
|
221
222
|
var responsePromise = this._graphql({ query: query, variables: variables, authMode: authMode, userAgentSuffix: userAgentSuffix }, headers, initParams);
|
|
@@ -237,39 +238,34 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
237
238
|
return tslib_1.__generator(this, function (_l) {
|
|
238
239
|
switch (_l.label) {
|
|
239
240
|
case 0:
|
|
240
|
-
|
|
241
|
-
return [4 /*yield*/, this.createInstance()];
|
|
242
|
-
case 1:
|
|
243
|
-
_l.sent();
|
|
244
|
-
_l.label = 2;
|
|
245
|
-
case 2:
|
|
241
|
+
this.createInstanceIfNotCreated();
|
|
246
242
|
_b = this._options, region = _b.aws_appsync_region, appSyncGraphqlEndpoint = _b.aws_appsync_graphqlEndpoint, _c = _b.graphql_headers, graphql_headers = _c === void 0 ? function () { return ({}); } : _c, customGraphqlEndpoint = _b.graphql_endpoint, customEndpointRegion = _b.graphql_endpoint_iam_region;
|
|
247
243
|
_d = [{}];
|
|
248
244
|
_e = !customGraphqlEndpoint;
|
|
249
|
-
if (!_e) return [3 /*break*/,
|
|
245
|
+
if (!_e) return [3 /*break*/, 2];
|
|
250
246
|
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
|
|
251
|
-
case
|
|
247
|
+
case 1:
|
|
252
248
|
_e = (_l.sent());
|
|
253
|
-
_l.label =
|
|
254
|
-
case
|
|
249
|
+
_l.label = 2;
|
|
250
|
+
case 2:
|
|
255
251
|
_f = [tslib_1.__assign.apply(void 0, _d.concat([(_e)]))];
|
|
256
252
|
_g = customGraphqlEndpoint;
|
|
257
|
-
if (!_g) return [3 /*break*/,
|
|
258
|
-
if (!customEndpointRegion) return [3 /*break*/,
|
|
253
|
+
if (!_g) return [3 /*break*/, 6];
|
|
254
|
+
if (!customEndpointRegion) return [3 /*break*/, 4];
|
|
259
255
|
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
|
|
260
|
-
case
|
|
256
|
+
case 3:
|
|
261
257
|
_h = _l.sent();
|
|
262
|
-
return [3 /*break*/,
|
|
263
|
-
case
|
|
258
|
+
return [3 /*break*/, 5];
|
|
259
|
+
case 4:
|
|
264
260
|
_h = { Authorization: null };
|
|
265
|
-
_l.label =
|
|
266
|
-
case
|
|
261
|
+
_l.label = 5;
|
|
262
|
+
case 5:
|
|
267
263
|
_g = (_h);
|
|
268
|
-
_l.label =
|
|
269
|
-
case
|
|
264
|
+
_l.label = 6;
|
|
265
|
+
case 6:
|
|
270
266
|
_j = [tslib_1.__assign.apply(void 0, _f.concat([(_g)]))];
|
|
271
267
|
return [4 /*yield*/, graphql_headers({ query: query, variables: variables })];
|
|
272
|
-
case
|
|
268
|
+
case 7:
|
|
273
269
|
headers = tslib_1.__assign.apply(void 0, [tslib_1.__assign.apply(void 0, [tslib_1.__assign.apply(void 0, _j.concat([(_l.sent())])), additionalHeaders]), (!customGraphqlEndpoint && (_k = {},
|
|
274
270
|
_k[USER_AGENT_HEADER] = core_1.getAmplifyUserAgent(userAgentSuffix),
|
|
275
271
|
_k))]);
|
|
@@ -293,14 +289,14 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
293
289
|
errors: [error],
|
|
294
290
|
};
|
|
295
291
|
}
|
|
296
|
-
_l.label =
|
|
297
|
-
case
|
|
298
|
-
_l.trys.push([
|
|
292
|
+
_l.label = 8;
|
|
293
|
+
case 8:
|
|
294
|
+
_l.trys.push([8, 10, , 11]);
|
|
299
295
|
return [4 /*yield*/, this._api.post(endpoint, init)];
|
|
300
|
-
case
|
|
296
|
+
case 9:
|
|
301
297
|
response = _l.sent();
|
|
302
|
-
return [3 /*break*/,
|
|
303
|
-
case
|
|
298
|
+
return [3 /*break*/, 11];
|
|
299
|
+
case 10:
|
|
304
300
|
err_1 = _l.sent();
|
|
305
301
|
// If the exception is because user intentionally
|
|
306
302
|
// cancelled the request, do not modify the exception
|
|
@@ -312,8 +308,8 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
312
308
|
data: {},
|
|
313
309
|
errors: [new graphql_1.GraphQLError(err_1.message, null, null, null, null, err_1)],
|
|
314
310
|
};
|
|
315
|
-
return [3 /*break*/,
|
|
316
|
-
case
|
|
311
|
+
return [3 /*break*/, 11];
|
|
312
|
+
case 11:
|
|
317
313
|
errors = response.errors;
|
|
318
314
|
if (errors && errors.length) {
|
|
319
315
|
throw response;
|
|
@@ -323,6 +319,21 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
323
319
|
});
|
|
324
320
|
});
|
|
325
321
|
};
|
|
322
|
+
GraphQLAPIClass.prototype.createInstanceIfNotCreated = function () {
|
|
323
|
+
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
324
|
+
return tslib_1.__generator(this, function (_a) {
|
|
325
|
+
switch (_a.label) {
|
|
326
|
+
case 0:
|
|
327
|
+
if (!!this._api) return [3 /*break*/, 2];
|
|
328
|
+
return [4 /*yield*/, this.createInstance()];
|
|
329
|
+
case 1:
|
|
330
|
+
_a.sent();
|
|
331
|
+
_a.label = 2;
|
|
332
|
+
case 2: return [2 /*return*/];
|
|
333
|
+
}
|
|
334
|
+
});
|
|
335
|
+
});
|
|
336
|
+
};
|
|
326
337
|
/**
|
|
327
338
|
* Checks to see if an error thrown is from an api request cancellation
|
|
328
339
|
* @param {any} error - Any error
|
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,8CAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"GraphQLAPI.js","sourceRoot":"","sources":["../src/GraphQLAPI.ts"],"names":[],"mappings":"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"}
|
package/lib-esm/GraphQLAPI.d.ts
CHANGED
|
@@ -53,6 +53,7 @@ export declare class GraphQLAPIClass {
|
|
|
53
53
|
[key: string]: string;
|
|
54
54
|
}): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>>;
|
|
55
55
|
private _graphql;
|
|
56
|
+
createInstanceIfNotCreated(): Promise<void>;
|
|
56
57
|
/**
|
|
57
58
|
* Checks to see if an error thrown is from an api request cancellation
|
|
58
59
|
* @param {any} error - Any error
|
package/lib-esm/GraphQLAPI.js
CHANGED
|
@@ -14,8 +14,8 @@ import { __assign, __awaiter, __generator, __read, __rest } from "tslib";
|
|
|
14
14
|
import { print, parse, GraphQLError, } from 'graphql';
|
|
15
15
|
import { Amplify, ConsoleLogger as Logger, Credentials, getAmplifyUserAgent, INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER, } from '@aws-amplify/core';
|
|
16
16
|
import { PubSub } from '@aws-amplify/pubsub';
|
|
17
|
-
import Auth from '@aws-amplify/auth';
|
|
18
|
-
import Cache from '@aws-amplify/cache';
|
|
17
|
+
import { Auth } from '@aws-amplify/auth';
|
|
18
|
+
import { BrowserStorageCache as Cache } from '@aws-amplify/cache';
|
|
19
19
|
import { GraphQLAuthError, } from './types';
|
|
20
20
|
import { RestClient } from '@aws-amplify/api-rest';
|
|
21
21
|
var USER_AGENT_HEADER = 'x-amz-user-agent';
|
|
@@ -214,6 +214,7 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
214
214
|
switch (operationType) {
|
|
215
215
|
case 'query':
|
|
216
216
|
case 'mutation':
|
|
217
|
+
this.createInstanceIfNotCreated();
|
|
217
218
|
var cancellableToken = this._api.getCancellableToken();
|
|
218
219
|
var initParams = { cancellableToken: cancellableToken };
|
|
219
220
|
var responsePromise = this._graphql({ query: query, variables: variables, authMode: authMode, userAgentSuffix: userAgentSuffix }, headers, initParams);
|
|
@@ -235,39 +236,34 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
235
236
|
return __generator(this, function (_l) {
|
|
236
237
|
switch (_l.label) {
|
|
237
238
|
case 0:
|
|
238
|
-
|
|
239
|
-
return [4 /*yield*/, this.createInstance()];
|
|
240
|
-
case 1:
|
|
241
|
-
_l.sent();
|
|
242
|
-
_l.label = 2;
|
|
243
|
-
case 2:
|
|
239
|
+
this.createInstanceIfNotCreated();
|
|
244
240
|
_b = this._options, region = _b.aws_appsync_region, appSyncGraphqlEndpoint = _b.aws_appsync_graphqlEndpoint, _c = _b.graphql_headers, graphql_headers = _c === void 0 ? function () { return ({}); } : _c, customGraphqlEndpoint = _b.graphql_endpoint, customEndpointRegion = _b.graphql_endpoint_iam_region;
|
|
245
241
|
_d = [{}];
|
|
246
242
|
_e = !customGraphqlEndpoint;
|
|
247
|
-
if (!_e) return [3 /*break*/,
|
|
243
|
+
if (!_e) return [3 /*break*/, 2];
|
|
248
244
|
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
|
|
249
|
-
case
|
|
245
|
+
case 1:
|
|
250
246
|
_e = (_l.sent());
|
|
251
|
-
_l.label =
|
|
252
|
-
case
|
|
247
|
+
_l.label = 2;
|
|
248
|
+
case 2:
|
|
253
249
|
_f = [__assign.apply(void 0, _d.concat([(_e)]))];
|
|
254
250
|
_g = customGraphqlEndpoint;
|
|
255
|
-
if (!_g) return [3 /*break*/,
|
|
256
|
-
if (!customEndpointRegion) return [3 /*break*/,
|
|
251
|
+
if (!_g) return [3 /*break*/, 6];
|
|
252
|
+
if (!customEndpointRegion) return [3 /*break*/, 4];
|
|
257
253
|
return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
|
|
258
|
-
case
|
|
254
|
+
case 3:
|
|
259
255
|
_h = _l.sent();
|
|
260
|
-
return [3 /*break*/,
|
|
261
|
-
case
|
|
256
|
+
return [3 /*break*/, 5];
|
|
257
|
+
case 4:
|
|
262
258
|
_h = { Authorization: null };
|
|
263
|
-
_l.label =
|
|
264
|
-
case
|
|
259
|
+
_l.label = 5;
|
|
260
|
+
case 5:
|
|
265
261
|
_g = (_h);
|
|
266
|
-
_l.label =
|
|
267
|
-
case
|
|
262
|
+
_l.label = 6;
|
|
263
|
+
case 6:
|
|
268
264
|
_j = [__assign.apply(void 0, _f.concat([(_g)]))];
|
|
269
265
|
return [4 /*yield*/, graphql_headers({ query: query, variables: variables })];
|
|
270
|
-
case
|
|
266
|
+
case 7:
|
|
271
267
|
headers = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), additionalHeaders]), (!customGraphqlEndpoint && (_k = {},
|
|
272
268
|
_k[USER_AGENT_HEADER] = getAmplifyUserAgent(userAgentSuffix),
|
|
273
269
|
_k))]);
|
|
@@ -291,14 +287,14 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
291
287
|
errors: [error],
|
|
292
288
|
};
|
|
293
289
|
}
|
|
294
|
-
_l.label =
|
|
295
|
-
case
|
|
296
|
-
_l.trys.push([
|
|
290
|
+
_l.label = 8;
|
|
291
|
+
case 8:
|
|
292
|
+
_l.trys.push([8, 10, , 11]);
|
|
297
293
|
return [4 /*yield*/, this._api.post(endpoint, init)];
|
|
298
|
-
case
|
|
294
|
+
case 9:
|
|
299
295
|
response = _l.sent();
|
|
300
|
-
return [3 /*break*/,
|
|
301
|
-
case
|
|
296
|
+
return [3 /*break*/, 11];
|
|
297
|
+
case 10:
|
|
302
298
|
err_1 = _l.sent();
|
|
303
299
|
// If the exception is because user intentionally
|
|
304
300
|
// cancelled the request, do not modify the exception
|
|
@@ -310,8 +306,8 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
310
306
|
data: {},
|
|
311
307
|
errors: [new GraphQLError(err_1.message, null, null, null, null, err_1)],
|
|
312
308
|
};
|
|
313
|
-
return [3 /*break*/,
|
|
314
|
-
case
|
|
309
|
+
return [3 /*break*/, 11];
|
|
310
|
+
case 11:
|
|
315
311
|
errors = response.errors;
|
|
316
312
|
if (errors && errors.length) {
|
|
317
313
|
throw response;
|
|
@@ -321,6 +317,21 @@ var GraphQLAPIClass = /** @class */ (function () {
|
|
|
321
317
|
});
|
|
322
318
|
});
|
|
323
319
|
};
|
|
320
|
+
GraphQLAPIClass.prototype.createInstanceIfNotCreated = function () {
|
|
321
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
322
|
+
return __generator(this, function (_a) {
|
|
323
|
+
switch (_a.label) {
|
|
324
|
+
case 0:
|
|
325
|
+
if (!!this._api) return [3 /*break*/, 2];
|
|
326
|
+
return [4 /*yield*/, this.createInstance()];
|
|
327
|
+
case 1:
|
|
328
|
+
_a.sent();
|
|
329
|
+
_a.label = 2;
|
|
330
|
+
case 2: return [2 /*return*/];
|
|
331
|
+
}
|
|
332
|
+
});
|
|
333
|
+
});
|
|
334
|
+
};
|
|
324
335
|
/**
|
|
325
336
|
* Checks to see if an error thrown is from an api request cancellation
|
|
326
337
|
* @param {any} error - Any error
|
|
@@ -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,WAAW,EACX,mBAAmB,EACnB,6CAA6C,GAC7C,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,IAAI,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"GraphQLAPI.js","sourceRoot":"","sources":["../src/GraphQLAPI.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/api-graphql",
|
|
3
|
-
"version": "2.3.13-next.
|
|
3
|
+
"version": "2.3.13-next.32+4137aa79c",
|
|
4
4
|
"description": "Api-graphql category of aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -43,12 +43,17 @@
|
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@types/zen-observable": "^0.8.0"
|
|
45
45
|
},
|
|
46
|
+
"files": [
|
|
47
|
+
"lib",
|
|
48
|
+
"lib-esm",
|
|
49
|
+
"src"
|
|
50
|
+
],
|
|
46
51
|
"dependencies": {
|
|
47
|
-
"@aws-amplify/api-rest": "2.0.49-next.
|
|
48
|
-
"@aws-amplify/auth": "4.6.2-next.
|
|
49
|
-
"@aws-amplify/cache": "4.0.51-next.
|
|
50
|
-
"@aws-amplify/core": "4.6.2-next.
|
|
51
|
-
"@aws-amplify/pubsub": "4.4.10-next.
|
|
52
|
+
"@aws-amplify/api-rest": "2.0.49-next.32+4137aa79c",
|
|
53
|
+
"@aws-amplify/auth": "4.6.2-next.32+4137aa79c",
|
|
54
|
+
"@aws-amplify/cache": "4.0.51-next.32+4137aa79c",
|
|
55
|
+
"@aws-amplify/core": "4.6.2-next.32+4137aa79c",
|
|
56
|
+
"@aws-amplify/pubsub": "4.4.10-next.32+4137aa79c",
|
|
52
57
|
"graphql": "15.8.0",
|
|
53
58
|
"tslib": "^2.0.0",
|
|
54
59
|
"uuid": "^3.2.1",
|
|
@@ -98,5 +103,5 @@
|
|
|
98
103
|
"lib-esm"
|
|
99
104
|
]
|
|
100
105
|
},
|
|
101
|
-
"gitHead": "
|
|
106
|
+
"gitHead": "4137aa79c6c2362afc581d3915d77f5067ea6700"
|
|
102
107
|
}
|
package/src/GraphQLAPI.ts
CHANGED
|
@@ -27,8 +27,8 @@ import {
|
|
|
27
27
|
INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER,
|
|
28
28
|
} from '@aws-amplify/core';
|
|
29
29
|
import { PubSub } from '@aws-amplify/pubsub';
|
|
30
|
-
import Auth from '@aws-amplify/auth';
|
|
31
|
-
import Cache from '@aws-amplify/cache';
|
|
30
|
+
import { Auth } from '@aws-amplify/auth';
|
|
31
|
+
import { BrowserStorageCache as Cache } from '@aws-amplify/cache';
|
|
32
32
|
import {
|
|
33
33
|
GraphQLAuthError,
|
|
34
34
|
GraphQLOptions,
|
|
@@ -256,6 +256,7 @@ export class GraphQLAPIClass {
|
|
|
256
256
|
switch (operationType) {
|
|
257
257
|
case 'query':
|
|
258
258
|
case 'mutation':
|
|
259
|
+
this.createInstanceIfNotCreated();
|
|
259
260
|
const cancellableToken = this._api.getCancellableToken();
|
|
260
261
|
const initParams = { cancellableToken };
|
|
261
262
|
const responsePromise = this._graphql<T>(
|
|
@@ -280,10 +281,7 @@ export class GraphQLAPIClass {
|
|
|
280
281
|
additionalHeaders = {},
|
|
281
282
|
initParams = {}
|
|
282
283
|
): Promise<GraphQLResult<T>> {
|
|
283
|
-
|
|
284
|
-
await this.createInstance();
|
|
285
|
-
}
|
|
286
|
-
|
|
284
|
+
this.createInstanceIfNotCreated();
|
|
287
285
|
const {
|
|
288
286
|
aws_appsync_region: region,
|
|
289
287
|
aws_appsync_graphqlEndpoint: appSyncGraphqlEndpoint,
|
|
@@ -359,6 +357,12 @@ export class GraphQLAPIClass {
|
|
|
359
357
|
return response;
|
|
360
358
|
}
|
|
361
359
|
|
|
360
|
+
async createInstanceIfNotCreated() {
|
|
361
|
+
if (!this._api) {
|
|
362
|
+
await this.createInstance();
|
|
363
|
+
}
|
|
364
|
+
}
|
|
365
|
+
|
|
362
366
|
/**
|
|
363
367
|
* Checks to see if an error thrown is from an api request cancellation
|
|
364
368
|
* @param {any} error - Any error
|