@aws-amplify/datastore 4.7.5 → 5.0.1-console-preview.4432977.0

package/lib-esm/types.js

@@ -1,4 +1,39 @@
-import { __awaiter, __generator } from "tslib";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import { isAWSDate, isAWSTime, isAWSDateTime, isAWSTimestamp, isAWSEmail, isAWSJSON, isAWSURL, isAWSPhone, isAWSIPAddress, extractPrimaryKeyFieldNames, } from './util';
 export function isSchemaModel(obj) {
     return obj && obj.pluralName !== undefined;
@@ -216,4 +251,3 @@ var PredicateInternalsKey = /** @class */ (function () {
 }());
 export { PredicateInternalsKey };
 // #endregion
-//# sourceMappingURL=types.js.map

package/lib-esm/util.d.ts

@@ -1,6 +1,7 @@
 import { ULID } from 'ulid';
 import { Patch } from 'immer';
-import { PersistentModel, PersistentModelConstructor, PredicateObject, PredicatesGroup, RelationshipType, RelationType, ModelKeys, ModelAttributes, SchemaNamespace, SortPredicatesGroup, NonModelTypeConstructor, PaginationInput, DeferredCallbackResolverOptions, SchemaModel, ModelAttribute, IndexesType } from './types';
+import { ModelInstanceCreator } from './datastore/datastore';
+import { AllOperators, PersistentModel, PersistentModelConstructor, PredicateGroups, PredicateObject, PredicatesGroup, RelationshipType, RelationType, ModelKeys, ModelAttributes, SchemaNamespace, SortPredicatesGroup, NonModelTypeConstructor, PaginationInput, DeferredCallbackResolverOptions, SchemaModel, ModelAttribute, IndexesType, ModelAssociation } from './types';
 export declare const ID = "id";
 /**
  * Used by the Async Storage Adapter to concatenate key values
@@ -35,12 +36,12 @@ declare const STORAGE = NAMESPACES.STORAGE;
 export { USER, SYNC, STORAGE, DATASTORE };
 export declare const exhaustiveCheck: (obj: never, throwOnError?: boolean) => void;
 export declare const isNullOrUndefined: (val: any) => boolean;
-export declare const validatePredicate: <T extends Readonly<Record<string, any>>>(model: T, groupType: "and" | "or" | "not", predicatesOrGroups: (PredicateObject<T> | PredicatesGroup<T>)[]) => any;
-export declare const validatePredicateField: <T>(value: T, operator: "eq" | "ne" | "gt" | "lt" | "ge" | "le" | "contains" | "notContains" | "beginsWith" | "between", operand: T | [T, T]) => boolean;
+export declare const validatePredicate: <T extends Readonly<Record<string, any>>>(model: T, groupType: keyof PredicateGroups<T>, predicatesOrGroups: (PredicateObject<T> | PredicatesGroup<T>)[]) => any;
+export declare const validatePredicateField: <T>(value: T, operator: keyof AllOperators, operand: T | [T, T]) => boolean;
 export declare const isModelConstructor: <T extends Readonly<Record<string, any>>>(obj: any) => obj is PersistentModelConstructor<T>;
 export declare function registerNonModelClass(clazz: NonModelTypeConstructor<any>): void;
 export declare const isNonModelConstructor: (obj: any) => obj is NonModelTypeConstructor<any>;
-export declare const traverseModel: <T extends Readonly<Record<string, any>>>(srcModelName: string, instance: T, namespace: SchemaNamespace, modelInstanceCreator: <T_1 extends Readonly<Record<string, any>>>(modelConstructor: PersistentModelConstructor<T_1>, init: Partial<T_1>) => T_1, getModelConstructorByModelName: (namsespaceName: NAMESPACES, modelName: string) => PersistentModelConstructor<any>) => {
+export declare const traverseModel: <T extends Readonly<Record<string, any>>>(srcModelName: string, instance: T, namespace: SchemaNamespace, modelInstanceCreator: ModelInstanceCreator, getModelConstructorByModelName: (namsespaceName: NAMESPACES, modelName: string) => PersistentModelConstructor<any>) => {
     modelName: string;
     item: T;
     instance: T;
@@ -157,15 +158,15 @@ export declare class DeferredCallbackResolver {
 export declare function mergePatches<T>(originalSource: T, oldPatches: Patch[], newPatches: Patch[]): Patch[];
 export declare const getStorename: (namespace: string, modelName: string) => string;
 export declare const processCompositeKeys: (attributes: ModelAttributes) => Set<string>[];
-export declare const extractKeyIfExists: (modelDefinition: SchemaModel) => ModelAttribute;
+export declare const extractKeyIfExists: (modelDefinition: SchemaModel) => ModelAttribute | undefined;
 export declare const extractPrimaryKeyFieldNames: (modelDefinition: SchemaModel) => string[];
 export declare const extractPrimaryKeyValues: <T extends Readonly<Record<string, any>>>(model: T, keyFields: string[]) => string[];
 export declare const extractPrimaryKeysAndValues: <T extends Readonly<Record<string, any>>>(model: T, keyFields: string[]) => any;
 export declare const isIdManaged: (modelDefinition: SchemaModel) => boolean;
 export declare const isIdOptionallyManaged: (modelDefinition: SchemaModel) => boolean;
 export declare const establishRelationAndKeys: (namespace: SchemaNamespace) => [RelationshipType, ModelKeys];
-export declare const getIndex: (rel: RelationType[], src: string) => string;
-export declare const getIndexFromAssociation: (indexes: IndexesType, src: string | string[]) => string;
+export declare const getIndex: (rel: RelationType[], src: string) => string | undefined;
+export declare const getIndexFromAssociation: (indexes: IndexesType, src: string | string[]) => string | undefined;
 /**
  * Backwards-compatability for schema generated prior to custom primary key support:
 the single field `targetName` has been replaced with an array of `targetNames`.
@@ -173,16 +174,7 @@ the single field `targetName` has been replaced with an array of `targetNames`.
  * @param src {RelationType | ModelAssociation | undefined}
  * @returns array of targetNames, or `undefined`
  */
-export declare const extractTargetNamesFromSrc: (src: {
-    connectionType: "HAS_MANY" | "HAS_ONE";
-    associatedWith: string | string[];
-    targetName?: string;
-    targetNames?: string[];
-} | {
-    connectionType: "BELONGS_TO";
-    targetName?: string;
-    targetNames?: string[];
-} | RelationType) => string[];
+export declare const extractTargetNamesFromSrc: (src: RelationType | ModelAssociation | undefined) => string[] | undefined;
 export declare const indexNameFromKeys: (keys: string[]) => string;
 export declare const keysEqual: (keysA: any, keysB: any) => boolean;
 export declare const getIndexKeys: (namespace: SchemaNamespace, modelName: string) => string[];

package/lib-esm/util.js

@@ -1,12 +1,92 @@
-import { __assign, __awaiter, __generator, __read, __spread, __values } from "tslib";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Buffer } from 'buffer';
 import { monotonicFactory } from 'ulid';
 import { v4 as uuid } from 'uuid';
 import { produce, applyPatches } from 'immer';
 import { isPredicateGroup, isPredicateObj, SortDirection, isModelAttributeKey, isModelAttributePrimaryKey, isModelAttributeCompositeKey, LimitTimerRaceResolvedValues, } from './types';
-import { WordArray } from 'amazon-cognito-identity-js';
 import { ModelSortPredicateCreator } from './predicates';
 export var ID = 'id';
 /**
@@ -44,7 +124,7 @@ export { USER, SYNC, STORAGE, DATASTORE };
 export var exhaustiveCheck = function (obj, throwOnError) {
     if (throwOnError === void 0) { throwOnError = true; }
     if (throwOnError) {
-        throw new Error("Invalid " + obj);
+        throw new Error("Invalid ".concat(obj));
     }
 };
 export var isNullOrUndefined = function (val) {
@@ -68,7 +148,7 @@ export var validatePredicate = function (model, groupType, predicatesOrGroups) {
             filterType = 'some';
             break;
         default:
-            throw new Error("Invalid " + groupType);
+            throw new Error("Invalid ".concat(groupType));
     }
     var result = predicatesOrGroups[filterType](function (predicateOrGroup) {
         if (isPredicateObj(predicateOrGroup)) {
@@ -271,10 +351,11 @@ export var isSafariCompatabilityMode = function () { return __awaiter(void 0, vo
         }
     });
 }); };
-var randomBytes = function (nBytes) {
-    return Buffer.from(new WordArray().random(nBytes).toString(), 'hex');
-};
-var prng = function () { return randomBytes(1).readUInt8(0) / 0xff; };
+// TODO(v6): refactor this random number logic  auth -> core
+// const randomBytes = (nBytes: number): Buffer => {
+// 	return Buffer.from(new WordArray().random(nBytes).toString(), 'hex');
+// };
+var prng = function () { return 10 / 0xff; };
 export function monotonicUlidFactory(seed) {
     var ulid = monotonicFactory(prng);
     return function () {
@@ -363,8 +444,8 @@ export function valuesEqual(valA, valB, nullish) {
         return false;
     }
     if (a instanceof Set && b instanceof Set) {
-        a = __spread(a);
-        b = __spread(b);
+        a = __spreadArray([], __read(a), false);
+        b = __spreadArray([], __read(b), false);
     }
     if (a instanceof Map && b instanceof Map) {
         a = Object.fromEntries(a);
@@ -704,7 +785,7 @@ export function mergePatches(originalSource, oldPatches, newPatches) {
     return patches;
 }
 export var getStorename = function (namespace, modelName) {
-    var storeName = namespace + "_" + modelName;
+    var storeName = "".concat(namespace, "_").concat(modelName);
     return storeName;
 };
 //#region Key Utils
@@ -763,10 +844,10 @@ export var processCompositeKeys = function (attributes) {
             }
             // does the current set share values with another set we've already added to `combined`?
             var intersectingSetIdx = combined.findIndex(function (existingSet) {
-                return __spread(existingSet).some(function (f) { return sortKeyFieldsSet.has(f); });
+                return __spreadArray([], __read(existingSet), false).some(function (f) { return sortKeyFieldsSet.has(f); });
             });
             if (intersectingSetIdx > -1) {
-                var union = new Set(__spread(combined[intersectingSetIdx], sortKeyFieldsSet));
+                var union = new Set(__spreadArray(__spreadArray([], __read(combined[intersectingSetIdx]), false), __read(sortKeyFieldsSet), false));
                 // combine the current set with the intersecting set we found above
                 combined[intersectingSetIdx] = union;
             }
@@ -957,7 +1038,7 @@ export var indexNameFromKeys = function (keys) {
         if (idx === 0) {
             return cur;
         }
-        return "" + prev + IDENTIFIER_KEY_SEPARATOR + cur;
+        return "".concat(prev).concat(IDENTIFIER_KEY_SEPARATOR).concat(cur);
     }, '');
 };
 export var keysEqual = function (keysA, keysB) {
@@ -999,4 +1080,3 @@ export var getTimestampFields = function (definition) {
     var customFields = timestampFieldsMap || {};
     return __assign(__assign({}, defaultFields), customFields);
 };
-//# sourceMappingURL=util.js.map

package/package.json

@@ -1,134 +1,141 @@
 {
-	"name": "@aws-amplify/datastore",
-	"version": "4.7.5",
-	"description": "AppSyncLocal support for aws-amplify",
-	"main": "./lib/index.js",
-	"module": "./lib-esm/index.js",
-	"typings": "./lib-esm/index.d.ts",
-	"react-native": {
-		"./lib/index": "./lib-esm/index.js"
-	},
-	"publishConfig": {
-		"access": "public"
-	},
-	"sideEffects": [
-		"./lib/datastore/datastore.js",
-		"./lib-esm/datastore/datastore.js"
-	],
-	"scripts": {
-		"test": "npm run lint && jest -w 1 --coverage",
-		"test:size": "size-limit",
-		"build-with-test": "npm test && npm run build",
-		"build:cjs": "node ./build es5 && webpack && webpack --config ./webpack.config.dev.js",
-		"build:esm": "node ./build es6",
-		"build:cjs:watch": "node ./build es5 --watch",
-		"build:esm:watch": "rimraf lib-esm && node ./build es6 --watch",
-		"build": "yarn clean && yarn build:esm && npm run build:cjs",
-		"clean": "npm run clean:size && rimraf lib-esm lib dist",
-		"clean:size": "rimraf dual-publish-tmp tmp*",
-		"format": "echo \"Not implemented\"  && npm run ts-coverage",
-		"lint": "tslint '{__tests__,src}/**/*.ts' && npm run ts-coverage",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 92.05"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/aws-amplify/amplify-js.git"
-	},
-	"author": "Amazon Web Services",
-	"license": "Apache-2.0",
-	"bugs": {
-		"url": "https://github.com/aws/aws-amplify/issues"
-	},
-	"homepage": "https://aws-amplify.github.io/",
-	"devDependencies": {
-		"@react-native-community/netinfo": "4.7.0",
-		"@types/uuid": "3.4.6",
-		"@types/uuid-validate": "^0.0.1",
-		"dexie": "3.2.2",
-		"dexie-export-import": "1.0.3",
-		"fake-indexeddb": "3.0.0"
-	},
-	"files": [
-		"lib",
-		"lib-esm",
-		"src",
-		"ssr"
-	],
-	"dependencies": {
-		"@aws-amplify/api": "5.4.5",
-		"@aws-amplify/auth": "5.6.5",
-		"@aws-amplify/core": "5.8.5",
-		"@aws-amplify/pubsub": "5.5.5",
-		"amazon-cognito-identity-js": "6.3.6",
-		"buffer": "4.9.2",
-		"idb": "5.0.6",
-		"immer": "9.0.6",
-		"ulid": "2.3.0",
-		"uuid": "3.4.0",
-		"zen-observable-ts": "0.8.19",
-		"zen-push": "0.2.1"
-	},
-	"size-limit": [
-		{
-			"name": "DataStore (top-level class)",
-			"path": "./lib-esm/index.js",
-			"import": "{ Amplify, DataStore }",
-			"limit": "137 kB"
-		}
-	],
-	"jest": {
-		"globals": {
-			"ts-jest": {
-				"diagnostics": true,
-				"tsConfig": {
-					"lib": [
-						"es5",
-						"es2015",
-						"dom",
-						"esnext.asynciterable",
-						"es2019"
-					],
-					"target": "es5",
-					"allowJs": true,
-					"esModuleInterop": true,
-					"downlevelIteration": true,
-					"strictNullChecks": true
-				}
-			}
-		},
-		"transform": {
-			"^.+\\.(js|jsx|ts|tsx)$": "ts-jest"
-		},
-		"testRegex": "(/__tests__/.*|\\.(test|spec))\\.(tsx?|jsx?)$",
-		"testPathIgnorePatterns": [
-			"__tests__/model.ts",
-			"__tests__/schema.ts",
-			"__tests__/helpers/",
-			"__tests__/commonAdapterTests.ts"
-		],
-		"moduleFileExtensions": [
-			"ts",
-			"tsx",
-			"js",
-			"json",
-			"jsx"
-		],
-		"testEnvironment": "jsdom",
-		"testURL": "http://localhost/",
-		"coverageThreshold": {
-			"global": {
-				"branches": 0,
-				"functions": 0,
-				"lines": 0,
-				"statements": 0
-			}
-		},
-		"coveragePathIgnorePatterns": [
-			"/node_modules/",
-			"dist",
-			"lib",
-			"lib-esm"
-		]
-	},
-	"gitHead": "c3a06153e3ffe05dd65485a22b1f99aabe9b3d83"
+  "name": "@aws-amplify/datastore",
+  "version": "5.0.1-console-preview.4432977.0+4432977",
+  "description": "AppSyncLocal support for aws-amplify",
+  "main": "./lib/index.js",
+  "module": "./lib-esm/index.js",
+  "typings": "./lib-esm/index.d.ts",
+  "react-native": {
+    "./lib/index": "./lib-esm/index.js"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "sideEffects": [
+    "./lib/datastore/datastore.js",
+    "./lib-esm/datastore/datastore.js"
+  ],
+  "scripts": {
+    "test": "npm run lint && jest -w 1 --coverage",
+    "test:size": "size-limit",
+    "build-with-test": "npm test && npm run build",
+    "build:cjs": "rimraf lib && tsc -m commonjs --outDir lib && webpack && webpack --config ./webpack.config.dev.js",
+    "build:esm": "rimraf lib-esm && tsc -m esnext --outDir lib-esm",
+    "build:cjs:watch": "rimraf lib && tsc -m commonjs --outDir lib --watch",
+    "build:esm:watch": "rimraf lib-esm && tsc -m esnext --outDir lib-esm --watch",
+    "build": "yarn clean && yarn build:esm && npm run build:cjs",
+    "clean": "npm run clean:size && rimraf lib-esm lib dist",
+    "clean:size": "rimraf dual-publish-tmp tmp*",
+    "format": "echo \"Not implemented\"  && npm run ts-coverage",
+    "lint": "tslint '{__tests__,src}/**/*.ts' && npm run ts-coverage",
+    "ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 92.05"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aws-amplify/amplify-js.git"
+  },
+  "author": "Amazon Web Services",
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/aws/aws-amplify/issues"
+  },
+  "homepage": "https://aws-amplify.github.io/",
+  "files": [
+    "lib",
+    "lib-esm",
+    "src",
+    "ssr"
+  ],
+  "dependencies": {
+    "@aws-amplify/api": "6.0.1-console-preview.4432977.0+4432977",
+    "@aws-amplify/auth": "6.0.1-console-preview.4432977.0+4432977",
+    "buffer": "4.9.2",
+    "idb": "5.0.6",
+    "immer": "9.0.6",
+    "ulid": "^2.3.0",
+    "uuid": "^9.0.0",
+    "zen-observable-ts": "0.8.19",
+    "zen-push": "0.2.1"
+  },
+  "peerDependencies": {
+    "@aws-amplify/core": "6.0.1-console-preview.4432977.0+4432977"
+  },
+  "devDependencies": {
+    "@aws-amplify/core": "6.0.1-console-preview.4432977.0+4432977",
+    "@react-native-community/netinfo": "4.7.0",
+    "@types/uuid": "^9.0.0",
+    "@types/uuid-validate": "^0.0.1",
+    "dexie": "3.2.2",
+    "dexie-export-import": "1.0.3",
+    "fake-indexeddb": "3.0.0",
+    "typescript": "5.0.2"
+  },
+  "size-limit": [
+    {
+      "name": "DataStore (top-level class)",
+      "path": "./lib-esm/index.js",
+      "import": "{ Amplify, DataStore }",
+      "limit": "137 kB"
+    }
+  ],
+  "jest": {
+    "globals": {
+      "ts-jest": {
+        "diagnostics": true,
+        "tsConfig": {
+          "lib": [
+            "es5",
+            "es2015",
+            "dom",
+            "esnext.asynciterable",
+            "es2019"
+          ],
+          "target": "es5",
+          "allowJs": true,
+          "esModuleInterop": true,
+          "strictNullChecks": false,
+          "types": [
+            "@types/jest"
+          ]
+        }
+      }
+    },
+    "transform": {
+      "^.+\\.(js|jsx|ts|tsx)$": "ts-jest"
+    },
+    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(tsx?|jsx?)$",
+    "testPathIgnorePatterns": [
+      "__tests__/model.ts",
+      "__tests__/schema.ts",
+      "__tests__/helpers/",
+      "__tests__/commonAdapterTests.ts",
+      "__tests__/DataStore.ts",
+      "__tests__/connectivityHandling.test.ts",
+      "__tests__/mutation.test.ts"
+    ],
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js",
+      "json",
+      "jsx"
+    ],
+    "testEnvironment": "jsdom",
+    "testURL": "http://localhost/",
+    "coverageThreshold": {
+      "global": {
+        "branches": 0,
+        "functions": 0,
+        "lines": 0,
+        "statements": 0
+      }
+    },
+    "coveragePathIgnorePatterns": [
+      "/node_modules/",
+      "dist",
+      "lib",
+      "lib-esm"
+    ]
+  },
+  "gitHead": "4432977940335c2e9fe48cc9415350c4c44ef0eb"
 }

package/src/authModeStrategies/multiAuthStrategy.ts

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Auth } from '@aws-amplify/auth';
-import { GRAPHQL_AUTH_MODE } from '@aws-amplify/api-graphql';
+import { fetchAuthSession } from '@aws-amplify/core';
 import {
 	AuthModeStrategy,
 	ModelAttributeAuthProperty,
@@ -9,6 +8,7 @@ import {
 	ModelAttributeAuthAllow,
 	AmplifyContext,
 } from '../types';
+import { GraphQLAuthModeKeys } from '@aws-amplify/core/internals/utils';
 
 function getProviderFromRule(
 	rule: ModelAttributeAuthProperty
@@ -63,7 +63,7 @@ function getAuthRules({
 	currentUser: unknown;
 }) {
 	// Using Set to ensure uniqueness
-	const authModes = new Set<GRAPHQL_AUTH_MODE>();
+	const authModes = new Set<GraphQLAuthModeKeys>();
 
 	rules.forEach(rule => {
 		switch (rule.allow) {
@@ -73,7 +73,7 @@ function getAuthRules({
 					!rule.provider ||
 					rule.provider === ModelAttributeAuthProvider.FUNCTION
 				) {
-					authModes.add(GRAPHQL_AUTH_MODE.AWS_LAMBDA);
+					authModes.add('lambda');
 				}
 				break;
 			case ModelAttributeAuthAllow.GROUPS:
@@ -81,9 +81,9 @@ function getAuthRules({
 				// We shouldn't attempt User Pool or OIDC if there isn't an authenticated user
 				if (currentUser) {
 					if (rule.provider === ModelAttributeAuthProvider.USER_POOLS) {
-						authModes.add(GRAPHQL_AUTH_MODE.AMAZON_COGNITO_USER_POOLS);
+						authModes.add('jwt');
 					} else if (rule.provider === ModelAttributeAuthProvider.OIDC) {
-						authModes.add(GRAPHQL_AUTH_MODE.OPENID_CONNECT);
+						authModes.add('jwt');
 					}
 				}
 				break;
@@ -96,9 +96,9 @@ function getAuthRules({
 						!rule.provider ||
 						rule.provider === ModelAttributeAuthProvider.USER_POOLS
 					) {
-						authModes.add(GRAPHQL_AUTH_MODE.AMAZON_COGNITO_USER_POOLS);
+						authModes.add('jwt');
 					} else if (rule.provider === ModelAttributeAuthProvider.IAM) {
-						authModes.add(GRAPHQL_AUTH_MODE.AWS_IAM);
+						authModes.add('iam');
 					}
 				}
 
@@ -106,13 +106,13 @@ function getAuthRules({
 			}
 			case ModelAttributeAuthAllow.PUBLIC: {
 				if (rule.provider === ModelAttributeAuthProvider.IAM) {
-					authModes.add(GRAPHQL_AUTH_MODE.AWS_IAM);
+					authModes.add('iam');
 				} else if (
 					!rule.provider ||
 					rule.provider === ModelAttributeAuthProvider.API_KEY
 				) {
 					// public with no provider means apiKey
-					authModes.add(GRAPHQL_AUTH_MODE.API_KEY);
+					authModes.add('apiKey');
 				}
 				break;
 			}
@@ -140,10 +140,9 @@ export const multiAuthStrategy: (
 ) => AuthModeStrategy =
 	(amplifyContext: AmplifyContext) =>
 	async ({ schema, modelName }) => {
-		amplifyContext.Auth = amplifyContext.Auth || Auth;
 		let currentUser;
 		try {
-			currentUser = await amplifyContext.Auth.currentAuthenticatedUser();
+			currentUser = await fetchAuthSession();
 		} catch (e) {
 			// No current user
 		}