@aws-amplify/datastore 3.12.5 → 3.12.6-clean-npm-artifacts.25

package/CHANGELOG.md

@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.12.12](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.12.10...@aws-amplify/datastore@3.12.12) (2022-09-30)
+
+**Note:** Version bump only for package @aws-amplify/datastore
+
+
+
+
+
+## [3.12.11](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.12.10...@aws-amplify/datastore@3.12.11) (2022-09-20)
+
+**Note:** Version bump only for package @aws-amplify/datastore
+
+
+
+
+
+## [3.12.10](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.12.9...@aws-amplify/datastore@3.12.10) (2022-09-08)
+
+**Note:** Version bump only for package @aws-amplify/datastore
+
+
+
+
+
+## [3.12.9](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.12.8...@aws-amplify/datastore@3.12.9) (2022-09-01)
+
+
+### Bug Fixes
+
+* **datastore:** clear before start with nextjs ([#10234](https://github.com/aws-amplify/amplify-js/issues/10234)) ([98dd9f2](https://github.com/aws-amplify/amplify-js/commit/98dd9f27fe798d4337201d082e9f65d785366f8b))
+
+
+
+
+
+## [3.12.8](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.12.7...@aws-amplify/datastore@3.12.8) (2022-08-23)
+
+**Note:** Version bump only for package @aws-amplify/datastore
+
+
+
+
+
+## [3.12.7](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.12.6...@aws-amplify/datastore@3.12.7) (2022-08-18)
+
+**Note:** Version bump only for package @aws-amplify/datastore
+
+
+
+
+
+## [3.12.6](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.12.5...@aws-amplify/datastore@3.12.6) (2022-08-16)
+
+
+### Bug Fixes
+
+* **datastore:** make di context fields private ([#10162](https://github.com/aws-amplify/amplify-js/issues/10162)) ([88a9ec9](https://github.com/aws-amplify/amplify-js/commit/88a9ec97fca2eb19c9cc9496b8b7d25b75f02073))
+
+
+
+
+
 ## [3.12.5](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.12.4...@aws-amplify/datastore@3.12.5) (2022-08-01)
 
 **Note:** Version bump only for package @aws-amplify/datastore

package/docs/conflict-resolution.md

@@ -0,0 +1,8 @@
+# Conflict Resolution
+- **AppSync is the source of truth for conflict resolution**
+   1. In the event AppSync fails to resolve a conflict, the network response will contain an error message (`conflict unhandled`). This is how we give customers the chance to make an update, or try again.
+   2. We use jittered retry (10x).
+   - TODO: add more detail / links to how this retry logic occurs.
+- We err on the side of not deleting customer data when performing conflict resolution.
+- Auto-merge is the default resolution strategy. This relies on the version, and will attempt to merge fields that changed when possible.
+- For more, see [the AppSync docs](https://docs.aws.amazon.com/appsync/latest/devguide/conflict-detection-and-sync.html)

package/docs/contributing.md

@@ -0,0 +1,17 @@
+# Contributing
+
+## Formatting
+- We use Prettier to format our code. We recommend installing it within your IDE to prevent formatting code within other Amplify packages (as opposed to formatting from the Prettier CLI directly). Example [VS Code Extension](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)).
+
+## Testing DataStore changes locally
+- On first build:
+	- Within **amplify-js**: `yarn && yarn build && yarn link-all && yarn build:esm:watch`
+	- Within sample app: `yarn && yarn link aws-amplify && yarn link @aws-amplify/datastore && yarn start`
+- On subsequent builds (useful if something isn't working):
+	- Within **amplify-js**: `yarn clean && yarn build && yarn link-all && yarn build:esm:watch`
+	- Within sample app: `rm -rf node_modules && yarn && yarn link aws-amplify && yarn link @aws-amplify/datastore && yarn start`
+
+## Contributing to these docs
+- Do not link to specific lines of code, as these frequently change. Instead, do the opposite: link to the documentation within the code itself, as the docs are less likely to change.
+- Prefer small, self-contained sections over large, monolothic documents.
+- Do not use permalinks - instead, link to the most current files.

package/docs/datastore-lifecycle-events.md

@@ -0,0 +1,88 @@
+# DataStore Lifecycle Events ("Start", "Stop", "Clear")
+
+# DataStore Initialization ("Start")
+
+**Understanding how DataStore starts is critical to understanding how DataStore fundamentally works.** At a high level, starting DataStore does the following things in order for each model:
+
+> 1.  Init Schema
+> 2.  Init the Storage Engine
+> 3.  Migrate schema changes
+> 4.  Sync Engine Operations
+> 5.  Empty the Outbox / processes the mutation queue
+> 6.  Begin processing the subscription buffer
+> 7.  DataStore is now in "ready" state
+
+- _We can eagerly start DataStore by calling `DataStore.start`. Otherwise, invoking a method (query, save, delete, observe) will start it up_
+- _When importing a model, DS consumes `schema.js`, and creates the IndexedDB store._
+
+## **How it works:**
+
+1.  ### **Init schema**
+    - **1.1** First we call `initSchema` [here](packages/datastore/src/datastore/datastore.ts)
+    - **1.2** Codegen then generates `schema.js` from the schema
+    - **1.3** DataStore consumes `schema.js`
+
+2.  ### **Init the storage engine**
+    - **2.1** The adapter is initialized
+    - **2.2** The local database gets created if it doesn’t exist already
+    - **2.3** The adapter [has a `setUp`](packages/datastore/src/storage/adapter/IndexedDBAdapter.ts#L82) method that then calls the database's `init` method
+    - **2.4** Relations are established
+    - _Nothing happens until the first interaction with DataStore_
+
+3.  ### **Migrate schema changes (if needed)**
+    - See [schema-changes.md](./schema-changes.md)
+    - If the user has updated the schema, we perform the migration here
+
+4.  ### **Sync Engine Operations**
+-  #### 4.1 Instantiate Sync Engine (`this.sync = new SyncEngine(`)
+    - The Sync Engine is only instantiated if there is a graphql endpoint (meaning we’ve already provisioned the backend). Otherwise, DataStore is in local-only mode. See [datastore.ts](packages/datastore/src/datastore/datastore.ts#L735)
+    - **Note: at this step, we do not yet process the buffer**
+    - There are three subscriptions per model: `create`, `update`, and `delete`
+
+- #### 4.2 Sync Engine is started (`syncSubscription = this.sync.start(`)
+    - **4.2.1 Subscribe to the Sync Engine**
+      - Messages from this subscription are emmited as Hub events for DataStore
+      - When ready, we call `initResolve`
+      - If unauthorized, DS keeps working, as we may have publicly readable models
+      - If a validation error occurs, DataStore Sync breaks entirely
+      - Without subscriptions, DataStore doesn’t work (when there is an endpoint present)
+      - Subscriptions are the only component that update the local store from remote
+      - If updates come in, they’re buffered to be processed after sync is complete
+      - Prepares the sync predicates (similar to adapter setup)
+
+    - **4.2.2 Subscribe to DataStore connectivity observable (notifications about network status)**
+        - `this.datastoreConnectivity.status().subscribe`
+        - Subscribe Amplify Core component that monitors network reachability
+        - We do this here because we need the ability to stop or start the sync process. When offline, we disconnect the websocket and stop syncing. Once online, we reconnect the websocket and start base / delta syncing
+        - Sync engine subscribes to the Storage Engine
+            - Every write may need to get translated to a mutation in the outbox
+            - Storage engine is local source of truth for DataStore, all other pieces are observing
+
+    - **4.2.3 Run the Sync Queries (when online)**
+        - _Note: We perform a topological sort of the data - we sync the children first, so when we query the parent, the children are already present We also use an optimisation to parallelize this process if possible (i.e. non-dependent models)_
+        - Sync queries are Graphql queries that are necessary to hydrate the local store initially
+        - The first time we run the app, we will perform a query to perform a scan or query of DynamoDB with up to 10k records per table. This populates the local store. With selective sync, we perform a query instead of a scan against DynamoDB.
+        - Subsequent changes after the initial sync query come in through subscriptions
+        - There are two mechanisms:
+            - Base sync - retrieve all records up to total sync value
+            - Delta sync - one table per model, one delta sync table per DS store
+        - AppSync makse the final decision regarding which sync (base vs delta) to perform
+            - The client sends the last sync param with the sync query, service then compares the diff
+            - There is a TTL on all delta sync table records
+            - To find the TTL within the AppSync Console, see "Update Data Source"
+
+5. ### **Empty the Outbox / processes the mutation queue**
+    - Example: when performing mutations offline, records are added to the queue. Once there is connectivity, we start sending these **ONE BY ONE**.
+    - **Note: No batch API is exposed to consumers**
+    - Mutation events have ids
+    - Syncs get applied before mutations are sent
+6. ### **Begin processing the subscription buffer**
+    - If we receive subscription messages any time in the process of initializing subscriptions, performing sync queries, or processing the mutation queue, we buffer the subscription messages until everything else is completed. Once we have completed processing the mutation queue, we then process the subscription buffer
+7. ### **DataStore is now in "ready" state**
+    - For additional reference, and how the above are published as Hub events, see [the docs](https://docs.amplify.aws/lib/datastore/datastore-events/q/platform/js/)
+
+## Stop
+- Stops the DataStore sync process. This will close the real-time subscription connection when your app is no longer interested in updates. You will typically call DataStore.stop() just before your application is closed. You can also force your DataStore sync expressions to be re-evaluated at runtime by calling stop(), followed by start()
+
+## Clear
+- Clears local data from DataStore. DataStore will now require a full sync (not a delta sync) to populate the local store with data

package/docs/getting-started.md

@@ -0,0 +1,26 @@
+# Onboarding with DataStore
+
+## Understand the primary DataStore events
+- Read the [DataStore lifecycle events doc](docs/datastore-lifecycle-events.md)
+
+## Building a sample app with DataStore to understand how it works
+1. Build a basic DataStore sample app (no @auth, just 1-2 models).
+2. Build a similar sample app with the API category.
+3. Add @auth rules to the DataStore app:
+    1. `amplify update api`
+    2. Modify schema according to auth rules docs (https://docs.amplify.aws/lib/datastore/setup-auth-rules/q/platform/js).
+    3. `amplify push`
+    4. `amplify codegen models`
+4. Add [selective sync](https://docs.amplify.aws/lib/datastore/sync/q/platform/js#selectively-syncing-a-subset-of-your-data).
+5. Enable [real-time changes](https://docs.amplify.aws/lib/datastore/real-time/q/platform/js).
+6. While interacting with your app, examine the IndexedDB tables (Application > IndexedDB within Chrome dev tools):
+    1. Check out the different stores in IDB that get created for your schema. Note the internal stores prefixed with sync_, and the stores corresponding to your models prefixed with user_.
+    2. Familiarize yourself with how actions taken in the UI affect the data stored in IDB. This may be easier to do while throttling the network connection. You'll be able to see how outgoing mutations first get persisted into the corresponding store, then added to the mutation queue / outbox (sync_MutationEvent), and then updated in the store with data from AppSync.
+7. Turn on DEBUG logging (`Amplify.Logger.LOG_LEVEL = "DEBUG";`) at the root of your project, and inspect the logs in the console while using your app. Additionally, [enable hub events](https://docs.amplify.aws/lib/datastore/datastore-events/q/platform/js#usage) for DataStore.
+8. The best way to understand DataStore events is to place several debuggers or breakpoints throughout DataStore.
+    - With logging / Hub events enabled, you can see what operations DataStore is performing (i.e. start, sync, etc.) as you step through with the debugger.
+9. Testing offline scenerios / concurrent user sessions is a useful way to test the full functionality of DataStore, and to fully understand how the sync process actually works.
+10. Next steps:
+    - Create a React Native example (uses a different storage type)
+    - Try more complex schema types
+    - Observe changes in records within DynamoDB (for instance, soft deletion).

package/docs/namespaces.md

@@ -0,0 +1,52 @@
+# Namespaces
+- `datastore`
+	- Settings
+- `user` 
+	- Models that came from user schema
+- `sync` 
+	- Metadata (last time ran query, etc.)
+- `storage` 
+	- Deprecated
+# Local database examples:
+
+- *Note: Anything prepended with `sync_` is an internal table.*
+
+- ## datastore_Setting
+    - Used for schema versioning
+    - See the [schema changes doc](docs/schema-changes.md)
+    ```
+	{
+		id: "01FYABF3DMBZZJ46W1CC214NH2"
+		key: "schemaVersion"
+		value: "\"4401034582a70c60713e1f7f9da3b752\""
+	}
+	```
+- ## sync_ModelMetadata
+    - Sync Engine metadata
+	- Includes information about the last time we synced a model
+	```
+	{
+		fullSyncInterval: 86400000
+		id: "01FYABF3DMBZZJ46W1CC214NH3"
+		lastFullSync: 1647467532307
+		lastSync: 1647467532307
+		lastSyncPredicate: null
+		model: "Todo"
+		namespace: "user"
+	}
+	```
+- ## sync_MutationEvent
+- ## user_[Model Name]
+    - The actual records themselves.
+	```
+	{
+		createdAt: "2022-03-16T21:52:07.718Z"
+		description: null
+		id: "6f69055b-b081-4225-8fc4-1d6d52732660"
+		name: "name 1647467527489"
+		updatedAt: "2022-03-16T21:52:07.718Z"
+		_deleted: null
+		_lastChangedAt: 1647467527754
+		_version: 1
+	}
+	```

package/docs/observables.md

@@ -0,0 +1,11 @@
+# How DataStore uses Observables
+- All of DataStore internally uses event driven methods (observables) to handle everything from the sync process, to observing online connectivity. **This makes the Storage Engine the single source of truth for DataStore.**
+- Examples:
+	- The Sync Engine observes DataStore Connectivity 
+	- The Sync Engine observes the Storage Engine 
+    - The client observes DataStore with `observe` and `observeQuery`:
+		- https://docs.amplify.aws/lib/datastore/real-time/q/platform/js/
+
+## Understanding Observables
+- DataStore uses [`zen-observable`](https://github.com/zenparsing/zen-observable)
+- [The RXJS docs](https://rxjs.dev/guide/observable) do a good job of describing observables in more detail.

package/docs/schema-changes.md

@@ -0,0 +1,12 @@
+# What happens when a user changes their schema?
+   - The `schema.js` file that exists within an Amplify project (located at `src/models/schema.js`) contains a version hash. 
+   - This hash is compared against the hash stored in the `Settings` table of the local database. Example:
+       ```
+           {
+               id: "01FYABF3DMBZZJ46W1CC214NH2"
+               key: "schemaVersion"
+               value: "\"4401034582a70c60713e1f7f9da3b752\""
+           }
+       ```
+   - The process of checking the schema version (`checkSchemaVersion`) occurs when DataStore starts, after the Storage Engine has been initialized, and before the Sync Engine is initialized.
+   - If the schema version has changed, we clear local storage, and perform a full sync

package/docs/storage.md

@@ -0,0 +1,36 @@
+# Storage
+## Adapters:
+- Web
+   - [IndexedDB](../src/storage/adapter/IndexedDBAdapter.ts)
+- Mobile
+   - React Native
+      - [Async Storage](../src/storage/adapter/AsyncStorageAdapter.ts) (can opt in to use SQLite)
+- SSR
+   - [InMemoryStore](../src/storage/adapter/InMemoryStore.ts)
+
+## How we determine which adapter to use
+
+We determine the storage adapter [here](../src/storage/adapter/getDefaultAdapter/index.ts). 
+
+
+## [The Storage class](../src/storage/storage.ts)
+- The Storage class is what interacts with the adapters.
+
+## [Storage Adapters](../src/storage/adapter)
+   1. There is one adapter per database type we support (i.e. three adapters).
+   2. Each adapter provides a unified API for the storage engine to interact with.
+   3. The SQLite adapter lives [in it’s own package](https://github.com/aws-amplify/amplify-js/tree/main/packages/datastore-storage-adapter).
+   4. **ExclusiveStorage wraps public storage methods (e.g. `Storage.runExclusive`)**
+      1. Guarantees consistency
+      2. Makes the storage class transactional
+      3. **Provides concurrency control**
+
+## How DataStore finds records locally:
+- Varies by storage adapter
+- [SQLiteAdapter](https://github.com/aws-amplify/amplify-js/tree/main/packages/datastore-storage-adapter): DataStore constructs a query. 
+- [Async Storage](../src/storage/adapter/AsyncStorageAdapter.ts): DataStore scans and filters. 
+- [IndexedDB](../src/storage/adapter/IndexedDBAdapter.ts): if the query is by primary key, DataStore queries against the index, otherwise it scans and filters.
+   - *Note: The lazy loading branch includes an improvement to the IndexedDB adapter that will check if any search criteria can leverage an index (there is no preference for low cardinality; the first identified index is used.) If so, the base result is sourced from the index and the remaining criteria will be applied as a filter.*
+
+## Understanding the difference between Save and Batch Save
+- As the names imply, `save` accepts a single record and persists it, while `batchSave` accepts a page of records and persists them all. `batchSave`, however, is *only used within the sync processor*, and will filter out deleted records from the sync page results, and then delete them from the local db.

package/docs/sync-engine.md

@@ -0,0 +1,64 @@
+# Sync Engine
+
+See [the sync class](packages/datastore/src/sync/index.ts)
+
+## High-level overview:
+- The first time DataStore is started on a new client, a full sync is performed. Subsequent reloads of the app (including browser refresh, or a new browser session) are delta syncs.
+- If it has been greater than the `fullSyncInterval` (configurable) since the client has performed a full sync, this operation occurs as a full sync.
+- The Sync Engine is well documented in the [DataStore Lifecycle Events doc](./datastore-lifecycle-events.md). The purpose of this doc is to explain anything about the sync process that is not already documented there.
+
+
+## Types of Syncs
+### Full Sync
+- All records are fetched from AppSync.
+
+### Delta Sync
+- All the records that changed after a given time stamp are fetched.
+
+## How it works
+
+### [Merger](../src/sync/merger.ts)
+- A helper class for merging subscription records with the outbox (checks IDs).
+- The Sync Engine uses merge in two places:
+	- 1. https://github.com/aws-amplify/amplify-js/blob/main/packages/datastore/src/sync/index.ts#L289
+		- Triggered by the mutation response. It gets called after the client that authored the change receives the network response of the mutation request they generated.
+	- 2. https://github.com/aws-amplify/amplify-js/blob/main/packages/datastore/src/sync/index.ts#L326
+		- Triggered by an AppSync real-time subscription event, which is how all clients get notified of the change. In the case of the mutation author, this notification is redundant, but it’s necessary for all other active users of the application. This is why there will always be multiple snapshot returned by `observe` and `observeQuery` in the case of the mutation author.
+
+- The function of [the Merger class](../src/sync/merger.ts) is to filter out any incoming records that have corresponding pending changes in that client’s mutation queue / outbox, and is done to maintain data consistency. We wouldn’t want to write over data that the client has deliberately changed, and essentially undo whatever changes were performed on that client - even temporarily. Thus, each time a change comes in via a mutation response, AppSync subscription, or sync query, **Merger will only persist that change to the local database when there is not a pending mutation for that same record**.
+- If there is a pending change in the outbox - we discard the incoming model we were working with inside the merge call (by not saving it). Later, when the record from the Outbox gets processed by AppSync (and conflict resolution rules are applied as appropriate), we will persist the response of the mutation (assuming we don’t change the record again in the interim)
+- If there is not a pending change in the outbox - we persist the model to the local store via `Storage.save` within `merge`.
+- _Note: We maintain a single instance of a mutation when we are offline (i.e. if we perform multiple updates on the same record, we merge them into a single event). Once we are online, but other mutations are processing, we'll still attempt to merge outgoing events into an existing one if they are not already in flight_
+- Merger Example:
+	- User A updates record 1
+	- The update to record 1 is persisted locally, and enters the mutation queue for persistence to Appsync
+	- User B has not yet received the update to record 1, and updates record 1
+	- User A receives User B's update to record 1, but has not yet sent the mutation to AppSync
+	- If Merger did not first check the mutation queue prior to applying the change from User B, User A would see their update, then user B's update, then, depending on how the conflict is handled by AppSync, could then see their update again. Instead, User A sees their update, and rejects User B's update. Once the conflict is handled by AppSync, any changes that are received are then applied.
+- *How to locally test / step through Merger:* 
+	- Create a few records and make sure the records go out successfully and are persisted. Then, delete local data in IndexedDB (either by clicking the `clear` button in a sample, or through dev tools), then reload the page, or perform a query.
+- **Note: AppSync expects us to send only updated fields in order for merge to work correctly.**
+
+### [Outbox]((../src/sync/outbox.ts))
+- A mutation event outbox
+- Holds all local changes (even if you close the app). 
+- Peek returns the next mutation event to be sent to AppSync, but does not remove it from the outbox.
+
+## [Processors](../src/sync/processors)
+- Sync Engine uses processors depending on the type of operation
+- All processors utilize observables
+- Where retry happens
+
+### Mutation Processor (Local changes)
+- Online or offline changes that were optimistically made to the Storage Engine (processed in mutation queue **one by one**).
+- Observes Storage Engine for new changes.
+
+### Subscription Processor (Remote changes)
+- Real-time subscription messages (such as another client performing a change).
+- Uses the Amplify API Graphql package (which then uses PubSub).
+### Sync Processor
+- When the client goes online, fetch all changes that were performed in AppSync (could be full or delta sync).
+
+## Misc:
+- AppSync records are soft-deleted and have a TTL. 
+- TODO: special configurations around sync intervals

package/docs/workarounds.md

@@ -0,0 +1 @@
+# TODO: "Unsupported hacks" / Workarounds

package/lib/authModeStrategies/multiAuthStrategy.js

@@ -1,65 +1,7 @@
 "use strict";
-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 (_) 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 __spread = (this && this.__spread) || function () {
-    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
-    return ar;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var auth_1 = __importDefault(require("@aws-amplify/auth"));
+var tslib_1 = require("tslib");
+var auth_1 = tslib_1.__importDefault(require("@aws-amplify/auth"));
 var api_graphql_1 = require("@aws-amplify/api-graphql");
 var types_1 = require("../types");
 function getProviderFromRule(rule) {
@@ -88,7 +30,7 @@ function sortAuthRulesWithPriority(rules) {
         types_1.ModelAttributeAuthProvider.IAM,
         types_1.ModelAttributeAuthProvider.API_KEY,
     ];
-    return __spread(rules).sort(function (a, b) {
+    return tslib_1.__spread(rules).sort(function (a, b) {
         if (a.allow === b.allow) {
             return (providerSortPriority.indexOf(getProviderFromRule(a)) -
                 providerSortPriority.indexOf(getProviderFromRule(b)));
@@ -156,10 +98,10 @@ function getAuthRules(_a) {
 exports.multiAuthStrategy = function (amplifyContext) {
     return function (_a) {
         var schema = _a.schema, modelName = _a.modelName;
-        return __awaiter(void 0, void 0, void 0, function () {
+        return tslib_1.__awaiter(void 0, void 0, void 0, function () {
             var currentUser, e_1, attributes, authAttribute, sortedRules;
             var _b;
-            return __generator(this, function (_c) {
+            return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         amplifyContext.Auth = amplifyContext.Auth || auth_1.default;

package/lib/authModeStrategies/multiAuthStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"multiAuthStrategy.js","sourceRoot":"","sources":["../../src/authModeStrategies/multiAuthStrategy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multiAuthStrategy.js","sourceRoot":"","sources":["../../src/authModeStrategies/multiAuthStrategy.ts"],"names":[],"mappings":"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"}

package/lib/datastore/datastore.d.ts

@@ -8,9 +8,9 @@ declare const initSchema: (userSchema: Schema) => Record<string, NonModelTypeCon
 export declare type ModelInstanceCreator = typeof modelInstanceCreator;
 declare function modelInstanceCreator<T extends PersistentModel = PersistentModel>(modelConstructor: PersistentModelConstructor<T>, init: ModelInit<T> & Partial<ModelInstanceMetadata>): T;
 declare class DataStore {
-    Auth: import("@aws-amplify/auth/lib-esm/Auth").AuthClass;
-    API: import("@aws-amplify/api").APIClass;
-    Cache: import("@aws-amplify/cache/lib-esm/types").ICache;
+    private Auth;
+    private API;
+    private Cache;
     private amplifyConfig;
     private authModeStrategy;
     private conflictHandler;