@aws-amplify/core 6.0.2-unstable.51ed7b4.0 → 6.0.2-unstable.a5eb335.0

package/dist/cjs/Platform/version.js

@@ -3,5 +3,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // generated by genversion
-exports.version = '6.0.2-unstable.51ed7b4.0+51ed7b4';
+exports.version = '6.0.2-unstable.a5eb335.0+a5eb335';
 //# sourceMappingURL=version.js.map

package/dist/cjs/Platform/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sources":["../../../src/Platform/version.ts"],"sourcesContent":["\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.version = void 0;\n// generated by genversion\nexports.version = '6.0.2-unstable.51ed7b4.0+51ed7b4';\n"],"names":[],"mappings":";;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC;AACzB;AACA,OAAO,CAAC,OAAO,GAAG,kCAAkC;;"}
+{"version":3,"file":"version.js","sources":["../../../src/Platform/version.ts"],"sourcesContent":["\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.version = void 0;\n// generated by genversion\nexports.version = '6.0.2-unstable.a5eb335.0+a5eb335';\n"],"names":[],"mappings":";;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC;AACzB;AACA,OAAO,CAAC,OAAO,GAAG,kCAAkC;;"}

package/dist/cjs/singleton/Auth/types.js

@@ -2,7 +2,5 @@
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// From https://github.com/awslabs/aws-jwt-verify/blob/main/src/safe-json-parse.ts
-// From https://github.com/awslabs/aws-jwt-verify/blob/main/src/jwt-model.ts
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=types.js.map

package/dist/cjs/singleton/Auth/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sources":["../../../../src/singleton/Auth/types.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\n// From https://github.com/awslabs/aws-jwt-verify/blob/main/src/safe-json-parse.ts\n// From https://github.com/awslabs/aws-jwt-verify/blob/main/src/jwt-model.ts\nObject.defineProperty(exports, \"__esModule\", { value: true });\n"],"names":[],"mappings":";;AACA;AACA;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;;"}
+{"version":3,"file":"types.js","sources":["../../../../src/singleton/Auth/types.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;;"}

package/dist/esm/Platform/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.0.2-unstable.51ed7b4.0+51ed7b4";
+export declare const version = "6.0.2-unstable.a5eb335.0+a5eb335";

package/dist/esm/Platform/version.mjs

@@ -1,5 +1,5 @@
 // generated by genversion
-const version = '6.0.2-unstable.51ed7b4.0+51ed7b4';
+const version = '6.0.2-unstable.a5eb335.0+a5eb335';
 
 export { version };
 //# sourceMappingURL=version.mjs.map

package/dist/esm/Platform/version.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"version.mjs","sources":["../../../src/Platform/version.ts"],"sourcesContent":["// generated by genversion\nexport const version = '6.0.2-unstable.51ed7b4.0+51ed7b4';\n"],"names":[],"mappings":"AAAA;AACY,MAAC,OAAO,GAAG;;;;"}
+{"version":3,"file":"version.mjs","sources":["../../../src/Platform/version.ts"],"sourcesContent":["// generated by genversion\nexport const version = '6.0.2-unstable.a5eb335.0+a5eb335';\n"],"names":[],"mappings":"AAAA;AACY,MAAC,OAAO,GAAG;;;;"}

package/dist/esm/libraryUtils.d.ts

@@ -6,7 +6,7 @@ export { amplifyUuid } from './utils/amplifyUuid';
 export { AmplifyUrl, AmplifyUrlSearchParams } from './utils/amplifyUrl';
 export { decodeJWT, assertTokenProviderConfig, assertIdentityPoolIdConfig, assertOAuthConfig, } from './singleton/Auth/utils';
 export { isTokenExpired } from './singleton/Auth';
-export { GraphQLAuthMode, DocumentType } from './singleton/API/types';
+export { AssociationBelongsTo, AssociationHasMany, AssociationHasOne, DocumentType, GraphQLAuthMode, ModelFieldType, ModelIntrospectionSchema, SchemaModel, SchemaModels, } from './singleton/API/types';
 export { Signer } from './Signer';
 export { JWT, StrictUnion, CognitoIdentityPoolConfig, JwtPayload, AuthStandardAttributeKey, AuthVerifiableAttributeKey, AWSCredentials, } from './singleton/Auth/types';
 export { Platform, getAmplifyUserAgentObject, getAmplifyUserAgent, } from './Platform';

package/dist/esm/singleton/API/types.d.ts

@@ -128,11 +128,12 @@ export type Field = {
     attributes?: FieldAttribute[];
     association?: AssociationType;
 };
+export type ModelFieldType = {
+    model: string;
+};
 export type FieldType = 'ID' | 'String' | 'Int' | 'Float' | 'AWSDate' | 'AWSTime' | 'AWSDateTime' | 'AWSTimestamp' | 'AWSEmail' | 'AWSURL' | 'AWSIPAddress' | 'Boolean' | 'AWSJSON' | 'AWSPhone' | {
     enum: string;
-} | {
-    model: string;
-} | {
+} | ModelFieldType | {
     nonModel: string;
 };
 export type FieldAttribute = ModelAttribute;

package/dist/esm/singleton/Auth/types.d.ts

@@ -1,3 +1,4 @@
+import { AtLeastOne } from '../types';
 interface JwtPayloadStandardFields {
     exp?: number;
     iss?: string;
@@ -55,7 +56,8 @@ export type AuthVerifiableAttributeKey = 'email' | 'phone_number';
 export type AuthConfigUserAttributes = Partial<Record<AuthStandardAttributeKey, {
     required: boolean;
 }>>;
-export type AuthConfig = StrictUnion<AuthIdentityPoolConfig | AuthUserPoolConfig | AuthUserPoolAndIdentityPoolConfig>;
+export type AuthConfig = AtLeastOne<CognitoProviderConfig>;
+export type CognitoProviderConfig = StrictUnion<AuthIdentityPoolConfig | AuthUserPoolConfig | AuthUserPoolAndIdentityPoolConfig>;
 type UnionKeys<T> = T extends T ? keyof T : never;
 type StrictUnionHelper<T, TAll> = T extends any ? T & Partial<Record<Exclude<UnionKeys<TAll>, keyof T>, never>> : never;
 export type StrictUnion<T> = StrictUnionHelper<T, T>;

package/dist/esm/singleton/Auth/utils/index.d.ts

@@ -1,5 +1,9 @@
-import { JWT, CognitoUserPoolWithOAuthConfig, CognitoUserPoolConfig, CognitoUserPoolAndIdentityPoolConfig, CognitoIdentityPoolConfig, StrictUnion } from '../types';
+import { AuthConfig, JWT, CognitoUserPoolConfig, CognitoUserPoolAndIdentityPoolConfig, CognitoIdentityPoolConfig, StrictUnion, OAuthConfig } from '../types';
 export declare function assertTokenProviderConfig(cognitoConfig?: StrictUnion<CognitoUserPoolConfig | CognitoUserPoolAndIdentityPoolConfig | CognitoIdentityPoolConfig>): asserts cognitoConfig is CognitoUserPoolAndIdentityPoolConfig | CognitoUserPoolConfig;
-export declare function assertOAuthConfig(cognitoConfig?: CognitoUserPoolConfig | CognitoUserPoolAndIdentityPoolConfig): asserts cognitoConfig is CognitoUserPoolWithOAuthConfig;
+export declare function assertOAuthConfig(cognitoConfig?: AuthConfig['Cognito']): asserts cognitoConfig is AuthConfig['Cognito'] & {
+    loginWith: {
+        oauth: OAuthConfig;
+    };
+};
 export declare function assertIdentityPoolIdConfig(cognitoConfig?: StrictUnion<CognitoUserPoolConfig | CognitoUserPoolAndIdentityPoolConfig | CognitoIdentityPoolConfig>): asserts cognitoConfig is CognitoIdentityPoolConfig;
 export declare function decodeJWT(token: string): JWT;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "6.0.2-unstable.51ed7b4.0+51ed7b4",
+	"version": "6.0.2-unstable.a5eb335.0+a5eb335",
 	"description": "Core category of aws-amplify",
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/esm/index.mjs",
@@ -60,7 +60,7 @@
 		"uuid": "^9.0.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/react-native": "1.0.2-unstable.51ed7b4.0+51ed7b4",
+		"@aws-amplify/react-native": "1.0.2-unstable.a5eb335.0+a5eb335",
 		"@rollup/plugin-typescript": "11.1.5",
 		"@types/js-cookie": "3.0.2",
 		"genversion": "^2.2.0",
@@ -234,5 +234,5 @@
 			"dist"
 		]
 	},
-	"gitHead": "51ed7b4ecb1a47b6a17635011169056bec518df9"
+	"gitHead": "a5eb33543190fc91fe840eb65e86eaf4c541c3c7"
 }

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '6.0.2-unstable.51ed7b4.0+51ed7b4';
+export const version = '6.0.2-unstable.a5eb335.0+a5eb335';

package/src/libraryUtils.ts

@@ -31,7 +31,17 @@ export {
 	assertOAuthConfig,
 } from './singleton/Auth/utils';
 export { isTokenExpired } from './singleton/Auth';
-export { GraphQLAuthMode, DocumentType } from './singleton/API/types';
+export {
+	AssociationBelongsTo,
+	AssociationHasMany,
+	AssociationHasOne,
+	DocumentType,
+	GraphQLAuthMode,
+	ModelFieldType,
+	ModelIntrospectionSchema,
+	SchemaModel,
+	SchemaModels,
+} from './singleton/API/types';
 export { Signer } from './Signer';
 export {
 	JWT,

package/src/singleton/API/types.ts

@@ -151,6 +151,9 @@ export type Field = {
 	attributes?: FieldAttribute[];
 	association?: AssociationType;
 };
+
+export type ModelFieldType = { model: string };
+
 export type FieldType =
 	| 'ID'
 	| 'String'
@@ -167,7 +170,7 @@ export type FieldType =
 	| 'AWSJSON'
 	| 'AWSPhone'
 	| { enum: string }
-	| { model: string }
+	| ModelFieldType
 	| { nonModel: string };
 export type FieldAttribute = ModelAttribute;
 

package/src/singleton/Auth/types.ts

@@ -1,8 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+
+import { AtLeastOne } from '../types';
+
 // From https://github.com/awslabs/aws-jwt-verify/blob/main/src/safe-json-parse.ts
 // From https://github.com/awslabs/aws-jwt-verify/blob/main/src/jwt-model.ts
-
 interface JwtPayloadStandardFields {
 	exp?: number; // expires: https://tools.ietf.org/html/rfc7519#section-4.1.4
 	iss?: string; // issuer: https://tools.ietf.org/html/rfc7519#section-4.1.1
@@ -97,7 +99,9 @@ export type AuthConfigUserAttributes = Partial<
 	Record<AuthStandardAttributeKey, { required: boolean }>
 >;
 
-export type AuthConfig = StrictUnion<
+export type AuthConfig = AtLeastOne<CognitoProviderConfig>;
+
+export type CognitoProviderConfig = StrictUnion<
 	| AuthIdentityPoolConfig
 	| AuthUserPoolConfig
 	| AuthUserPoolAndIdentityPoolConfig

package/src/singleton/Auth/utils/index.ts

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 import { AuthConfigurationErrorCode, assert } from './errorHelpers';
 import { base64Decoder } from '../../../utils/convert';
-
 import {
 	AuthConfig,
 	JWT,
@@ -12,6 +11,7 @@ import {
 	CognitoUserPoolAndIdentityPoolConfig,
 	CognitoIdentityPoolConfig,
 	StrictUnion,
+	OAuthConfig,
 } from '../types';
 
 export function assertTokenProviderConfig(
@@ -38,20 +38,22 @@ export function assertTokenProviderConfig(
 }
 
 export function assertOAuthConfig(
-	cognitoConfig?: CognitoUserPoolConfig | CognitoUserPoolAndIdentityPoolConfig
-): asserts cognitoConfig is CognitoUserPoolWithOAuthConfig {
+	cognitoConfig?: AuthConfig['Cognito']
+): asserts cognitoConfig is AuthConfig['Cognito'] & {
+	loginWith: {
+		oauth: OAuthConfig;
+	};
+} {
 	const validOAuthConfig =
 		!!cognitoConfig?.loginWith?.oauth?.domain &&
 		!!cognitoConfig?.loginWith?.oauth?.redirectSignOut &&
 		!!cognitoConfig?.loginWith?.oauth?.redirectSignIn &&
 		!!cognitoConfig?.loginWith?.oauth?.responseType;
-
 	return assert(
 		validOAuthConfig,
 		AuthConfigurationErrorCode.OAuthNotConfigureException
 	);
 }
-
 export function assertIdentityPoolIdConfig(
 	cognitoConfig?: StrictUnion<
 		| CognitoUserPoolConfig