@aws-amplify/datastore 4.7.24 → 4.7.26

package/lib/.tsbuildinfo

@@ -1,3 +1 @@
-{
-  "version": "3.8.3"
-}
+{"version":"5.8.3"}

package/lib/authModeStrategies/defaultAuthStrategy.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultAuthStrategy = void 0;
 // Default behavior is to use the primary auth mode for an API,
 // so we are returning an empty array so that DataStore will default
 // to using the primary auth mode.
-exports.defaultAuthStrategy = function () { return []; };
+var defaultAuthStrategy = function () { return []; };
+exports.defaultAuthStrategy = defaultAuthStrategy;
 //# sourceMappingURL=defaultAuthStrategy.js.map

package/lib/authModeStrategies/defaultAuthStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultAuthStrategy.js","sourceRoot":"","sources":["../../src/authModeStrategies/defaultAuthStrategy.ts"],"names":[],"mappings":";;AAIA,+DAA+D;AAC/D,oEAAoE;AACpE,kCAAkC;AACrB,QAAA,mBAAmB,GAAqB,cAAM,OAAA,EAAE,EAAF,CAAE,CAAC"}
+{"version":3,"file":"defaultAuthStrategy.js","sourceRoot":"","sources":["../../src/authModeStrategies/defaultAuthStrategy.ts"],"names":[],"mappings":";;;AAIA,+DAA+D;AAC/D,oEAAoE;AACpE,kCAAkC;AAC3B,IAAM,mBAAmB,GAAqB,cAAM,OAAA,EAAE,EAAF,CAAE,CAAC;AAAjD,QAAA,mBAAmB,uBAA8B"}

package/lib/authModeStrategies/index.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.multiAuthStrategy = exports.defaultAuthStrategy = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 var defaultAuthStrategy_1 = require("./defaultAuthStrategy");
-exports.defaultAuthStrategy = defaultAuthStrategy_1.defaultAuthStrategy;
+Object.defineProperty(exports, "defaultAuthStrategy", { enumerable: true, get: function () { return defaultAuthStrategy_1.defaultAuthStrategy; } });
 var multiAuthStrategy_1 = require("./multiAuthStrategy");
-exports.multiAuthStrategy = multiAuthStrategy_1.multiAuthStrategy;
+Object.defineProperty(exports, "multiAuthStrategy", { enumerable: true, get: function () { return multiAuthStrategy_1.multiAuthStrategy; } });
 //# sourceMappingURL=index.js.map

package/lib/authModeStrategies/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/authModeStrategies/index.ts"],"names":[],"mappings":";;AAAA,qEAAqE;AACrE,sCAAsC;AACtC,6DAA4D;AAAnD,oDAAA,mBAAmB,CAAA;AAC5B,yDAAwD;AAA/C,gDAAA,iBAAiB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/authModeStrategies/index.ts"],"names":[],"mappings":";;;AAAA,qEAAqE;AACrE,sCAAsC;AACtC,6DAA4D;AAAnD,0HAAA,mBAAmB,OAAA;AAC5B,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA"}

package/lib/authModeStrategies/multiAuthStrategy.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.multiAuthStrategy = void 0;
 var tslib_1 = require("tslib");
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
@@ -32,7 +33,7 @@ function sortAuthRulesWithPriority(rules) {
         types_1.ModelAttributeAuthProvider.IAM,
         types_1.ModelAttributeAuthProvider.API_KEY,
     ];
-    return tslib_1.__spread(rules).sort(function (a, b) {
+    return tslib_1.__spreadArray([], tslib_1.__read(rules), false).sort(function (a, b) {
         if (a.allow === b.allow) {
             return (providerSortPriority.indexOf(getProviderFromRule(a)) -
                 providerSortPriority.indexOf(getProviderFromRule(b)));
@@ -108,39 +109,38 @@ function getAuthRules(_a) {
  * @param param0 The `{schema, modelName}` to inspect.
  * @returns A sorted array of auth modes to attempt.
  */
-exports.multiAuthStrategy = function (amplifyContext) {
-    return function (_a) {
-        var schema = _a.schema, modelName = _a.modelName;
-        return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-            var currentUser, e_1, attributes, authAttribute, sortedRules;
-            var _b;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        amplifyContext.Auth = amplifyContext.Auth || auth_1.Auth;
-                        _c.label = 1;
-                    case 1:
-                        _c.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, amplifyContext.Auth.currentAuthenticatedUser()];
-                    case 2:
-                        currentUser = _c.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        e_1 = _c.sent();
-                        return [3 /*break*/, 4];
-                    case 4:
-                        attributes = schema.namespaces.user.models[modelName].attributes;
-                        if (attributes) {
-                            authAttribute = attributes.find(function (attr) { return attr.type === 'auth'; });
-                            if ((_b = authAttribute === null || authAttribute === void 0 ? void 0 : authAttribute.properties) === null || _b === void 0 ? void 0 : _b.rules) {
-                                sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);
-                                return [2 /*return*/, getAuthRules({ currentUser: currentUser, rules: sortedRules })];
-                            }
+var multiAuthStrategy = function (amplifyContext) {
+    return function (_a) { return tslib_1.__awaiter(void 0, [_a], void 0, function (_b) {
+        var currentUser, e_1, attributes, authAttribute, sortedRules;
+        var _c;
+        var schema = _b.schema, modelName = _b.modelName;
+        return tslib_1.__generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    amplifyContext.Auth = amplifyContext.Auth || auth_1.Auth;
+                    _d.label = 1;
+                case 1:
+                    _d.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, amplifyContext.Auth.currentAuthenticatedUser()];
+                case 2:
+                    currentUser = _d.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    e_1 = _d.sent();
+                    return [3 /*break*/, 4];
+                case 4:
+                    attributes = schema.namespaces.user.models[modelName].attributes;
+                    if (attributes) {
+                        authAttribute = attributes.find(function (attr) { return attr.type === 'auth'; });
+                        if ((_c = authAttribute === null || authAttribute === void 0 ? void 0 : authAttribute.properties) === null || _c === void 0 ? void 0 : _c.rules) {
+                            sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);
+                            return [2 /*return*/, getAuthRules({ currentUser: currentUser, rules: sortedRules })];
                         }
-                        return [2 /*return*/, []];
-                }
-            });
+                    }
+                    return [2 /*return*/, []];
+            }
         });
-    };
+    }); };
 };
+exports.multiAuthStrategy = multiAuthStrategy;
 //# sourceMappingURL=multiAuthStrategy.js.map

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

@@ -1,6 +1,6 @@
 import Observable from 'zen-observable-ts';
 import { PredicateAll } from '../predicates';
-import { ConflictHandler, DataStoreConfig, NonModelTypeConstructor, ProducerPaginationInput, PersistentModel, PersistentModelConstructor, Schema, SubscriptionMessage, DataStoreSnapshot, TypeConstructorMap, ErrorHandler, ObserveQueryOptions, PersistentModelMetaData, IdentifierFieldOrIdentifierObject, RecursiveModelPredicateExtender, ModelPredicateExtender } from '../types';
+import { ConflictHandler, DataStoreConfig, ProducerPaginationInput, PersistentModel, PersistentModelConstructor, Schema, SubscriptionMessage, DataStoreSnapshot, TypeConstructorMap, ErrorHandler, ObserveQueryOptions, PersistentModelMetaData, IdentifierFieldOrIdentifierObject, RecursiveModelPredicateExtender, ModelPredicateExtender } from '../types';
 export declare let syncClasses: TypeConstructorMap;
 /**
  * Describes whether and to what a model is attached for lazy loading purposes.
@@ -41,8 +41,8 @@ export declare function attached<T extends PersistentModel | PersistentModel[]>(
  *
  * @param instance A model instance
  */
-export declare const getAttachment: (instance: Readonly<Record<string, any>>) => ModelAttachment.Detached | ModelAttachment;
-declare const initSchema: (userSchema: Schema) => Record<string, PersistentModelConstructor<any> | NonModelTypeConstructor<unknown>>;
+export declare const getAttachment: (instance: PersistentModel) => ModelAttachment;
+declare const initSchema: (userSchema: Schema) => TypeConstructorMap;
 /**
  * Constructs a model and records it with its metadata in a weakset. Allows for
  * the separate storage of core model fields and Amplify/DataStore metadata
@@ -173,7 +173,7 @@ declare class DataStore {
         <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, identifier: IdentifierFieldOrIdentifierObject<T, PersistentModelMetaData<T>>): Promise<T | undefined>;
         <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, criteria?: RecursiveModelPredicateExtender<T> | typeof PredicateAll | null, paginationProducer?: ProducerPaginationInput<T>): Promise<T[]>;
     };
-    save: <T extends Readonly<Record<string, any>>>(model: T, condition?: ModelPredicateExtender<T>) => Promise<T>;
+    save: <T extends PersistentModel>(model: T, condition?: ModelPredicateExtender<T>) => Promise<T>;
     setConflictHandler: (config: DataStoreConfig) => ConflictHandler;
     setErrorHandler: (config: DataStoreConfig) => ErrorHandler;
     delete: {