@aws-amplify/api-graphql 4.0.1-api-v6-models.ce6e561.0 → 4.0.1-api-v6-models.572a7b5.0

package/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.js

@@ -4,16 +4,15 @@ import { __assign, __awaiter, __generator, __read } from "tslib";
 import { Observable } from 'rxjs';
 import { GraphQLError } from 'graphql';
 import * as url from 'url';
-import { v4 as uuid } from 'uuid';
 import { Buffer } from 'buffer';
-import { Hub, fetchAuthSession } from '@aws-amplify/core';
+import { Hub, fetchAuthSession, ConsoleLogger } from '@aws-amplify/core';
 import { signRequest } from '@aws-amplify/core/internals/aws-client-utils';
-import { Logger, NonRetryableError, USER_AGENT_HEADER, getAmplifyUserAgent, isNonRetryableError, jitteredExponentialRetry, } from '@aws-amplify/core/internals/utils';
+import { NonRetryableError, USER_AGENT_HEADER, getAmplifyUserAgent, isNonRetryableError, jitteredExponentialRetry, amplifyUuid, AmplifyUrl, } from '@aws-amplify/core/internals/utils';
 import { CONTROL_MSG, ConnectionState, } from '../../types/PubSub';
 import { AMPLIFY_SYMBOL, AWS_APPSYNC_REALTIME_HEADERS, CONNECTION_INIT_TIMEOUT, DEFAULT_KEEP_ALIVE_TIMEOUT, DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT, MAX_DELAY_MS, MESSAGE_TYPES, NON_RETRYABLE_CODES, SOCKET_STATUS, START_ACK_TIMEOUT, SUBSCRIPTION_STATUS, CONNECTION_STATE_CHANGE, } from '../constants';
 import { ConnectionStateMonitor, CONNECTION_CHANGE, } from '../../utils/ConnectionStateMonitor';
 import { ReconnectEvent, ReconnectionMonitor, } from '../../utils/ReconnectionMonitor';
-var logger = new Logger('AWSAppSyncRealTimeProvider');
+var logger = new ConsoleLogger('AWSAppSyncRealTimeProvider');
 var dispatchApiEvent = function (payload) {
     Hub.dispatch('api', payload, 'PubSub', AMPLIFY_SYMBOL);
 };
@@ -95,7 +94,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
             }
             else {
                 var subscriptionStartActive_1 = false;
-                var subscriptionId_1 = uuid();
+                var subscriptionId_1 = amplifyUuid();
                 var startSubscription_1 = function () {
                     if (!subscriptionStartActive_1) {
                         subscriptionStartActive_1 = true;
@@ -776,7 +775,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
                         signed_params = signRequest({
                             headers: request.headers,
                             method: request.method,
-                            url: new URL(request.url),
+                            url: new AmplifyUrl(request.url),
                             body: request.data,
                         }, {
                             // TODO: What do we need to do to remove these !'s?

package/lib-esm/internals/InternalGraphQLAPI.js

@@ -2,14 +2,15 @@ import { __assign, __awaiter, __generator, __read } from "tslib";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { print, parse, GraphQLError, } from 'graphql';
-import { ConsoleLogger as Logger, getAmplifyUserAgent, } from '@aws-amplify/core/internals/utils';
+import { ConsoleLogger } from '@aws-amplify/core';
+import { getAmplifyUserAgent, AmplifyUrl, } from '@aws-amplify/core/internals/utils';
 import { GraphQLAuthError, } from '../types';
 import { isCancelError as isCancelErrorREST } from '@aws-amplify/api-rest';
 import { post, cancel as cancelREST, updateRequestToBeCancellable, } from '@aws-amplify/api-rest/internals';
 import { AWSAppSyncRealTimeProvider } from '../Providers/AWSAppSyncRealTimeProvider';
 import { resolveConfig, resolveLibraryOptions } from '../utils';
 var USER_AGENT_HEADER = 'x-amz-user-agent';
-var logger = new Logger('GraphQLAPI');
+var logger = new ConsoleLogger('GraphQLAPI');
 export var graphqlOperation = function (query, variables, authToken) {
     if (variables === void 0) { variables = {}; }
     return ({
@@ -235,7 +236,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                     case 9:
                         _m.trys.push([9, 12, , 13]);
                         return [4 /*yield*/, this._api.post({
-                                url: new URL(endpoint),
+                                url: new AmplifyUrl(endpoint),
                                 options: {
                                     headers: headers,
                                     body: body,

package/lib-esm/internals/generateModelsProperty.js

@@ -100,7 +100,7 @@ export function generateModelsProperty(client, params) {
                                     _b = __read(Object.keys(data), 1), key_2 = _b[0];
                                     flattenedResult = flattenItems(data)[key_2];
                                     if (options === null || options === void 0 ? void 0 : options.selectionSet) {
-                                        return [2 /*return*/, flattenedResult];
+                                        return [2 /*return*/, { data: flattenedResult, extensions: extensions }];
                                     }
                                     else {
                                         _c = __read(initializeModel(client, name_1, [flattenedResult], modelIntrospection), 1), initialized = _c[0];