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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-api-v6-models.ce6e561.0+ce6e561",
+	"version": "4.0.1-api-v6-models.572a7b5.0+572a7b5",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -52,15 +52,14 @@
 	],
 	"dependencies": {
 		"@aws-amplify/amplify-api-next-types-alpha": "^0.2.0",
-		"@aws-amplify/api-rest": "4.0.1-api-v6-models.ce6e561.0+ce6e561",
-		"@aws-amplify/auth": "6.0.1-api-v6-models.ce6e561.0+ce6e561",
-		"@aws-amplify/core": "6.0.1-api-v6-models.ce6e561.0+ce6e561",
+		"@aws-amplify/api-rest": "4.0.1-api-v6-models.572a7b5.0+572a7b5",
+		"@aws-amplify/auth": "6.0.1-api-v6-models.572a7b5.0+572a7b5",
+		"@aws-amplify/core": "6.0.1-api-v6-models.572a7b5.0+572a7b5",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
 		"tslib": "^2.6.1",
-		"url": "0.11.0",
-		"uuid": "^3.2.1"
+		"url": "0.11.0"
 	},
 	"size-limit": [
 		{
@@ -127,5 +126,5 @@
 			"<rootDir>/__tests__"
 		]
 	},
-	"gitHead": "ce6e56137612ed959a3fb114a966b0bc9d54ecfc"
+	"gitHead": "572a7b56d9e87ca779038254de3d68b5c607af07"
 }

package/src/Providers/AWSAppSyncRealTimeProvider/index.ts

@@ -3,20 +3,20 @@
 import { Observable, SubscriptionLike } 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 {
 	GraphQLAuthMode,
 	CustomUserAgentDetails,
-	Logger,
 	NonRetryableError,
 	USER_AGENT_HEADER,
 	getAmplifyUserAgent,
 	isNonRetryableError,
 	jitteredExponentialRetry,
 	DocumentType,
+	amplifyUuid,
+	AmplifyUrl,
 } from '@aws-amplify/core/internals/utils';
 
 import {
@@ -47,7 +47,7 @@ import {
 	ReconnectionMonitor,
 } from '../../utils/ReconnectionMonitor';
 
-const logger = new Logger('AWSAppSyncRealTimeProvider');
+const logger = new ConsoleLogger('AWSAppSyncRealTimeProvider');
 
 const dispatchApiEvent = payload => {
 	Hub.dispatch('api', payload, 'PubSub', AMPLIFY_SYMBOL);
@@ -210,7 +210,7 @@ export class AWSAppSyncRealTimeProvider {
 				observer.complete();
 			} else {
 				let subscriptionStartActive = false;
-				const subscriptionId = uuid();
+				const subscriptionId = amplifyUuid();
 				const startSubscription = () => {
 					if (!subscriptionStartActive) {
 						subscriptionStartActive = true;
@@ -968,7 +968,7 @@ export class AWSAppSyncRealTimeProvider {
 			{
 				headers: request.headers,
 				method: request.method,
-				url: new URL(request.url),
+				url: new AmplifyUrl(request.url),
 				body: request.data,
 			},
 			{

package/src/internals/InternalGraphQLAPI.ts

@@ -9,12 +9,12 @@ import {
 	OperationTypeNode,
 } from 'graphql';
 import { Observable } from 'rxjs';
-import { AmplifyClassV6 } from '@aws-amplify/core';
+import { AmplifyClassV6, ConsoleLogger } from '@aws-amplify/core';
 import {
 	GraphQLAuthMode,
 	CustomUserAgentDetails,
-	ConsoleLogger as Logger,
 	getAmplifyUserAgent,
+	AmplifyUrl,
 } from '@aws-amplify/core/internals/utils';
 import {
 	GraphQLAuthError,
@@ -33,7 +33,7 @@ import { resolveConfig, resolveLibraryOptions } from '../utils';
 
 const USER_AGENT_HEADER = 'x-amz-user-agent';
 
-const logger = new Logger('GraphQLAPI');
+const logger = new ConsoleLogger('GraphQLAPI');
 
 export const graphqlOperation = (
 	query,
@@ -304,7 +304,7 @@ export class InternalGraphQLAPIClass {
 		let response;
 		try {
 			const { body: responseBody } = await this._api.post({
-				url: new URL(endpoint),
+				url: new AmplifyUrl(endpoint),
 				options: {
 					headers,
 					body,

package/src/internals/generateModelsProperty.ts

@@ -129,7 +129,7 @@ export function generateModelsProperty<T extends Record<any, any> = never>(
 								const flattenedResult = flattenItems(data)[key];
 
 								if (options?.selectionSet) {
-									return flattenedResult;
+									return { data: flattenedResult, extensions };
 								} else {
 									// TODO: refactor to avoid destructuring here
 									const [initialized] = initializeModel(