@aws-amplify/datastore 5.0.32 → 5.0.33-s-auth.30d0cd2.0

package/dist/cjs/authModeStrategies/multiAuthStrategy.js

@@ -105,7 +105,7 @@ function getAuthRules({ rules, currentUser, }) {
  * @param param0 The `{schema, modelName}` to inspect.
  * @returns A sorted array of auth modes to attempt.
  */
-const multiAuthStrategy = (amplifyContext) => async ({ schema, modelName }) => {
+const multiAuthStrategy = () => async ({ schema, modelName }) => {
     let currentUser;
     try {
         const authSession = await (0, core_1.fetchAuthSession)();

package/dist/cjs/authModeStrategies/multiAuthStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"multiAuthStrategy.js","sources":["../../../src/authModeStrategies/multiAuthStrategy.ts"],"sourcesContent":["\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.multiAuthStrategy = void 0;\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nconst core_1 = require(\"@aws-amplify/core\");\nconst types_1 = require(\"../types\");\nfunction getProviderFromRule(rule) {\n    // private with no provider means userPools\n    if (rule.allow === 'private' && !rule.provider) {\n        return types_1.ModelAttributeAuthProvider.USER_POOLS;\n    }\n    // public with no provider means apiKey\n    if (rule.allow === 'public' && !rule.provider) {\n        return types_1.ModelAttributeAuthProvider.API_KEY;\n    }\n    return rule.provider;\n}\nfunction sortAuthRulesWithPriority(rules) {\n    const allowSortPriority = [\n        types_1.ModelAttributeAuthAllow.CUSTOM,\n        types_1.ModelAttributeAuthAllow.OWNER,\n        types_1.ModelAttributeAuthAllow.GROUPS,\n        types_1.ModelAttributeAuthAllow.PRIVATE,\n        types_1.ModelAttributeAuthAllow.PUBLIC,\n    ];\n    const providerSortPriority = [\n        types_1.ModelAttributeAuthProvider.FUNCTION,\n        types_1.ModelAttributeAuthProvider.USER_POOLS,\n        types_1.ModelAttributeAuthProvider.OIDC,\n        types_1.ModelAttributeAuthProvider.IAM,\n        types_1.ModelAttributeAuthProvider.API_KEY,\n    ];\n    return [...rules].sort((a, b) => {\n        if (a.allow === b.allow) {\n            return (providerSortPriority.indexOf(getProviderFromRule(a)) -\n                providerSortPriority.indexOf(getProviderFromRule(b)));\n        }\n        return (allowSortPriority.indexOf(a.allow) - allowSortPriority.indexOf(b.allow));\n    });\n}\nfunction getAuthRules({ rules, currentUser, }) {\n    // Using Set to ensure uniqueness\n    const authModes = new Set();\n    rules.forEach(rule => {\n        switch (rule.allow) {\n            case types_1.ModelAttributeAuthAllow.CUSTOM:\n                // custom with no provider -> function\n                if (!rule.provider ||\n                    rule.provider === types_1.ModelAttributeAuthProvider.FUNCTION) {\n                    authModes.add('lambda');\n                }\n                break;\n            case types_1.ModelAttributeAuthAllow.GROUPS:\n            case types_1.ModelAttributeAuthAllow.OWNER: {\n                // We shouldn't attempt User Pool or OIDC if there isn't an authenticated user\n                if (currentUser) {\n                    if (rule.provider === types_1.ModelAttributeAuthProvider.USER_POOLS) {\n                        authModes.add('userPool');\n                    }\n                    else if (rule.provider === types_1.ModelAttributeAuthProvider.OIDC) {\n                        authModes.add('oidc');\n                    }\n                }\n                break;\n            }\n            case types_1.ModelAttributeAuthAllow.PRIVATE: {\n                // We shouldn't attempt private if there isn't an authenticated user\n                if (currentUser) {\n                    // private with no provider means userPools\n                    if (!rule.provider ||\n                        rule.provider === types_1.ModelAttributeAuthProvider.USER_POOLS) {\n                        authModes.add('userPool');\n                    }\n                    else if (rule.provider === types_1.ModelAttributeAuthProvider.IAM) {\n                        authModes.add('iam');\n                    }\n                }\n                break;\n            }\n            case types_1.ModelAttributeAuthAllow.PUBLIC: {\n                if (rule.provider === types_1.ModelAttributeAuthProvider.IAM) {\n                    authModes.add('iam');\n                }\n                else if (!rule.provider ||\n                    rule.provider === types_1.ModelAttributeAuthProvider.API_KEY) {\n                    // public with no provider means apiKey\n                    authModes.add('apiKey');\n                }\n                break;\n            }\n            default:\n                break;\n        }\n    });\n    return Array.from(authModes);\n}\n/**\n * Returns an array of auth modes to try based on the schema, model, and\n * authenticated user (or lack thereof). Rules are sourced from `getAuthRules`\n * and returned in the order they ought to be attempted.\n *\n * @see sortAuthRulesWithPriority\n * @see getAuthRules\n *\n * @param param0 The `{schema, modelName}` to inspect.\n * @returns A sorted array of auth modes to attempt.\n */\nconst multiAuthStrategy = (amplifyContext) => async ({ schema, modelName }) => {\n    let currentUser;\n    try {\n        const authSession = await (0, core_1.fetchAuthSession)();\n        if (authSession.tokens.accessToken) {\n            // the user is authenticated\n            currentUser = authSession;\n        }\n    }\n    catch (e) {\n        // No current user\n    }\n    const { attributes } = schema.namespaces.user.models[modelName];\n    if (attributes) {\n        const authAttribute = attributes.find(attr => attr.type === 'auth');\n        if (authAttribute?.properties?.rules) {\n            const sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);\n            return getAuthRules({ currentUser, rules: sortedRules });\n        }\n    }\n    return [];\n};\nexports.multiAuthStrategy = multiAuthStrategy;\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"multiAuthStrategy.js","sources":["../../../src/authModeStrategies/multiAuthStrategy.ts"],"sourcesContent":["\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.multiAuthStrategy = void 0;\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nconst core_1 = require(\"@aws-amplify/core\");\nconst types_1 = require(\"../types\");\nfunction getProviderFromRule(rule) {\n    // private with no provider means userPools\n    if (rule.allow === 'private' && !rule.provider) {\n        return types_1.ModelAttributeAuthProvider.USER_POOLS;\n    }\n    // public with no provider means apiKey\n    if (rule.allow === 'public' && !rule.provider) {\n        return types_1.ModelAttributeAuthProvider.API_KEY;\n    }\n    return rule.provider;\n}\nfunction sortAuthRulesWithPriority(rules) {\n    const allowSortPriority = [\n        types_1.ModelAttributeAuthAllow.CUSTOM,\n        types_1.ModelAttributeAuthAllow.OWNER,\n        types_1.ModelAttributeAuthAllow.GROUPS,\n        types_1.ModelAttributeAuthAllow.PRIVATE,\n        types_1.ModelAttributeAuthAllow.PUBLIC,\n    ];\n    const providerSortPriority = [\n        types_1.ModelAttributeAuthProvider.FUNCTION,\n        types_1.ModelAttributeAuthProvider.USER_POOLS,\n        types_1.ModelAttributeAuthProvider.OIDC,\n        types_1.ModelAttributeAuthProvider.IAM,\n        types_1.ModelAttributeAuthProvider.API_KEY,\n    ];\n    return [...rules].sort((a, b) => {\n        if (a.allow === b.allow) {\n            return (providerSortPriority.indexOf(getProviderFromRule(a)) -\n                providerSortPriority.indexOf(getProviderFromRule(b)));\n        }\n        return (allowSortPriority.indexOf(a.allow) - allowSortPriority.indexOf(b.allow));\n    });\n}\nfunction getAuthRules({ rules, currentUser, }) {\n    // Using Set to ensure uniqueness\n    const authModes = new Set();\n    rules.forEach(rule => {\n        switch (rule.allow) {\n            case types_1.ModelAttributeAuthAllow.CUSTOM:\n                // custom with no provider -> function\n                if (!rule.provider ||\n                    rule.provider === types_1.ModelAttributeAuthProvider.FUNCTION) {\n                    authModes.add('lambda');\n                }\n                break;\n            case types_1.ModelAttributeAuthAllow.GROUPS:\n            case types_1.ModelAttributeAuthAllow.OWNER: {\n                // We shouldn't attempt User Pool or OIDC if there isn't an authenticated user\n                if (currentUser) {\n                    if (rule.provider === types_1.ModelAttributeAuthProvider.USER_POOLS) {\n                        authModes.add('userPool');\n                    }\n                    else if (rule.provider === types_1.ModelAttributeAuthProvider.OIDC) {\n                        authModes.add('oidc');\n                    }\n                }\n                break;\n            }\n            case types_1.ModelAttributeAuthAllow.PRIVATE: {\n                // We shouldn't attempt private if there isn't an authenticated user\n                if (currentUser) {\n                    // private with no provider means userPools\n                    if (!rule.provider ||\n                        rule.provider === types_1.ModelAttributeAuthProvider.USER_POOLS) {\n                        authModes.add('userPool');\n                    }\n                    else if (rule.provider === types_1.ModelAttributeAuthProvider.IAM) {\n                        authModes.add('iam');\n                    }\n                }\n                break;\n            }\n            case types_1.ModelAttributeAuthAllow.PUBLIC: {\n                if (rule.provider === types_1.ModelAttributeAuthProvider.IAM) {\n                    authModes.add('iam');\n                }\n                else if (!rule.provider ||\n                    rule.provider === types_1.ModelAttributeAuthProvider.API_KEY) {\n                    // public with no provider means apiKey\n                    authModes.add('apiKey');\n                }\n                break;\n            }\n            default:\n                break;\n        }\n    });\n    return Array.from(authModes);\n}\n/**\n * Returns an array of auth modes to try based on the schema, model, and\n * authenticated user (or lack thereof). Rules are sourced from `getAuthRules`\n * and returned in the order they ought to be attempted.\n *\n * @see sortAuthRulesWithPriority\n * @see getAuthRules\n *\n * @param param0 The `{schema, modelName}` to inspect.\n * @returns A sorted array of auth modes to attempt.\n */\nconst multiAuthStrategy = () => async ({ schema, modelName }) => {\n    let currentUser;\n    try {\n        const authSession = await (0, core_1.fetchAuthSession)();\n        if (authSession.tokens.accessToken) {\n            // the user is authenticated\n            currentUser = authSession;\n        }\n    }\n    catch (e) {\n        // No current user\n    }\n    const { attributes } = schema.namespaces.user.models[modelName];\n    if (attributes) {\n        const authAttribute = attributes.find(attr => attr.type === 'auth');\n        if (authAttribute?.properties?.rules) {\n            const sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);\n            return getAuthRules({ currentUser, rules: sortedRules });\n        }\n    }\n    return [];\n};\nexports.multiAuthStrategy = multiAuthStrategy;\n"],"names":[],"mappings":"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"}

package/dist/cjs/datastore/datastore.js

@@ -15,11 +15,10 @@ const storage_1 = require("../storage/storage");
 const relationship_1 = require("../storage/relationship");
 const sync_1 = require("../sync");
 const types_1 = require("../types");
-const utils_2 = require("./utils");
 const util_1 = require("../util");
 const next_1 = require("../predicates/next");
-const utils_3 = require("../sync/utils");
-const utils_4 = require("@aws-amplify/core/internals/utils");
+const utils_2 = require("../sync/utils");
+const utils_3 = require("./utils");
 (0, immer_1.setAutoFreeze)(true);
 (0, immer_1.enablePatches)();
 const logger = new core_1.ConsoleLogger('DataStore');
@@ -226,7 +225,7 @@ const initSchema = (userSchema) => {
             // compatibility with legacy/pre-PK codegen for lazy loading to inject
             // index fields into the model definition.
             // definition.cloudFields = { ...definition.fields };
-            const indexes = schema.namespaces[namespace].relationships[model.name].indexes;
+            const { indexes } = schema.namespaces[namespace].relationships[model.name];
             const indexFields = new Set();
             for (const index of indexes) {
                 for (const indexField of index[1]) {
@@ -308,7 +307,7 @@ const checkSchemaCodegenVersion = (codegenVersion) => {
     let isValid = false;
     try {
         const versionParts = codegenVersion.split('.');
-        const [major, minor, patch, patchrevision] = versionParts;
+        const [major, minor] = versionParts;
         isValid = Number(major) === majorVersion && Number(minor) >= minorVersion;
     }
     catch (err) {
@@ -340,9 +339,9 @@ const createTypeClasses = namespace => {
  * metadata fields (_version, _deleted, etc.) exposed on the model itself.
  */
 const instancesMetadata = new WeakSet();
-function modelInstanceCreator(modelConstructor, init) {
+function modelInstanceCreator(ModelConstructor, init) {
     instancesMetadata.add(init);
-    return new modelConstructor(init);
+    return new ModelConstructor(init);
 }
 const validateModelFields = (modelDefinition) => (k, v) => {
     const fieldDefinition = modelDefinition.fields[k];
@@ -414,9 +413,7 @@ const validateModelFields = (modelDefinition) => (k, v) => {
                     }
                 }
             }
-            else if (!isRequired && v === undefined) {
-                return;
-            }
+            else if (!isRequired && v === undefined) ;
             else if (typeof v !== jsType && v !== null) {
                 throw new Error(`Field ${name} should be of type ${jsType}, ${typeof v} received. ${v}`);
             }
@@ -576,7 +573,9 @@ const createModelClass = (modelDefinition) => {
             // are only create to provide a consistent view of the data for fields pre/post sync
             // where possible. (not all fields can be normalized pre-sync, because they're generally
             // "cloud managed" fields, like createdAt and updatedAt.)
-            const normalized = (0, immer_1.produce)(baseInstance, (draft) => normalize(modelDefinition, draft));
+            const normalized = (0, immer_1.produce)(baseInstance, (draft) => {
+                normalize(modelDefinition, draft);
+            });
             initPatches.set(normalized, patches);
             return normalized;
         }
@@ -654,7 +653,7 @@ const createModelClass = (modelDefinition) => {
         pkField: (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition),
     });
     for (const relationship of allModelRelationships) {
-        const field = relationship.field;
+        const { field } = relationship;
         Object.defineProperty(clazz.prototype, modelDefinition.fields[field].name, {
             set(model) {
                 if (!(typeof model === 'object' || typeof model === 'undefined'))
@@ -664,7 +663,7 @@ const createModelClass = (modelDefinition) => {
                     // Avoid validation error when processing AppSync response with nested
                     // selection set. Nested entitites lack version field and can not be validated
                     // TODO: explore a more reliable method to solve this
-                    if (model.hasOwnProperty('_version')) {
+                    if (Object.prototype.hasOwnProperty.call(model, '_version')) {
                         const modelConstructor = Object.getPrototypeOf(model || {})
                             .constructor;
                         if (!isValidModelConstructor(modelConstructor)) {
@@ -702,7 +701,7 @@ const createModelClass = (modelDefinition) => {
                 // if the memos already has a result for this field, we'll use it.
                 // there is no "cache" invalidation of any kind; memos are permanent to
                 // keep an immutable perception of the instance.
-                if (!instanceMemos.hasOwnProperty(field)) {
+                if (!Object.prototype.hasOwnProperty.call(instanceMemos, field)) {
                     // before we populate the memo, we need to know where to look for relatives.
                     // today, this only supports DataStore. Models aren't managed elsewhere in Amplify.
                     if ((0, exports.getAttachment)(this) === ModelAttachment.DataStore) {
@@ -711,9 +710,9 @@ const createModelClass = (modelDefinition) => {
                         // drop the promise into the memo's synchronously, eliminating the chance
                         // for a race.
                         const resultPromise = instance.query(relationship.remoteModelConstructor, base => base.and(q => {
-                            return relationship.remoteJoinFields.map((field, index) => {
+                            return relationship.remoteJoinFields.map((joinField, index) => {
                                 // TODO: anything we can use instead of `any` here?
-                                return q[field].eq(this[relationship.localJoinFields[index]]);
+                                return q[joinField].eq(this[relationship.localJoinFields[index]]);
                             });
                         }));
                         // results in hand, how we return them to the caller depends on the relationship type.
@@ -917,10 +916,10 @@ function getModelConstructorByModelName(namespaceName, modelName) {
  * @param version The expected schema version.
  */
 async function checkSchemaVersion(storage, version) {
-    const Setting = dataStoreClasses.Setting;
+    const SettingCtor = dataStoreClasses.Setting;
     const modelDefinition = schema.namespaces[util_1.DATASTORE].models.Setting;
     await storage.runExclusive(async (s) => {
-        const [schemaVersionSetting] = await s.query(Setting, predicates_1.ModelPredicateCreator.createFromAST(modelDefinition, {
+        const [schemaVersionSetting] = await s.query(SettingCtor, predicates_1.ModelPredicateCreator.createFromAST(modelDefinition, {
             and: { key: { eq: SETTING_SCHEMA_VERSION } },
         }), { page: 0, limit: 1 });
         if (schemaVersionSetting !== undefined &&
@@ -931,7 +930,7 @@ async function checkSchemaVersion(storage, version) {
             }
         }
         else {
-            await s.save(modelInstanceCreator(Setting, {
+            await s.save(modelInstanceCreator(SettingCtor, {
                 key: SETTING_SCHEMA_VERSION,
                 value: JSON.stringify(version),
             }));
@@ -1033,7 +1032,7 @@ class DataStore {
          *
          * (Reasonable = *seconds*, not minutes.)
          */
-        this.runningProcesses = new utils_4.BackgroundProcessManager();
+        this.runningProcesses = new utils_1.BackgroundProcessManager();
         /**
          * Indicates what state DataStore is in.
          *
@@ -1054,9 +1053,9 @@ class DataStore {
                 this.state = DataStoreState.Starting;
                 if (this.initialized === undefined) {
                     logger.debug('Starting DataStore');
-                    this.initialized = new Promise((res, rej) => {
-                        this.initResolve = res;
-                        this.initReject = rej;
+                    this.initialized = new Promise((resolve, reject) => {
+                        this.initResolve = resolve;
+                        this.initReject = reject;
                     });
                 }
                 else {
@@ -1082,7 +1081,7 @@ class DataStore {
                              * In non-Node environments (the browser or React Native), we can begin returning data
                              * once subscriptions are in place.
                              */
-                            const readyType = (0, utils_2.isNode)()
+                            const readyType = (0, utils_3.isNode)()
                                 ? sync_1.ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY
                                 : sync_1.ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED;
                             if (type === readyType) {
@@ -1118,7 +1117,7 @@ class DataStore {
                 if (!this.storage) {
                     throw new Error('No storage to query');
                 }
-                //#region Input validation
+                // #region Input validation
                 if (!isValidModelConstructor(modelConstructor)) {
                     const msg = 'Constructor is not for a valid model';
                     logger.error(msg, { modelConstructor });
@@ -1165,7 +1164,7 @@ class DataStore {
                         result = (0, util_1.inMemoryPagination)(result, pagination);
                     }
                 }
-                //#endregion
+                // #endregion
                 const returnOne = isQueryOne(identifierOrCriteria) ||
                     (0, types_1.isIdentifierObject)(identifierOrCriteria, modelDefinition);
                 return attached(returnOne ? result[0] : result, ModelAttachment.DataStore);
@@ -1192,7 +1191,9 @@ class DataStore {
                 // are ALWAYS present, whereas update patches are only present if copyOf
                 // was used to create the instance.
                 const patchesTuple = updatedPatchesTuple || initPatchesTuple;
-                const modelConstructor = model ? model.constructor : undefined;
+                const modelConstructor = model
+                    ? model.constructor
+                    : undefined;
                 if (!isValidModelConstructor(modelConstructor)) {
                     const msg = 'Object is not an instance of a valid model';
                     logger.error(msg, { model });
@@ -1355,15 +1356,15 @@ class DataStore {
                 : undefined;
             if (modelOrConstructor && modelConstructor === undefined) {
                 const model = modelOrConstructor;
-                const modelConstructor = model && Object.getPrototypeOf(model).constructor;
-                if (isValidModelConstructor(modelConstructor)) {
+                const resolvedModelConstructor = model && Object.getPrototypeOf(model).constructor;
+                if (isValidModelConstructor(resolvedModelConstructor)) {
                     if (identifierOrCriteria) {
                         logger.warn('idOrCriteria is ignored when using a model instance', {
                             model,
                             identifierOrCriteria,
                         });
                     }
-                    return this.observe(modelConstructor, model.id);
+                    return this.observe(resolvedModelConstructor, model.id);
                 }
                 else {
                     const msg = 'The model is not an instance of a PersistentModelConstructor';
@@ -1429,8 +1430,12 @@ class DataStore {
                                     observer.next(message);
                                 }
                             }, 'datastore observe message handler'),
-                        error: err => observer.error(err),
-                        complete: () => observer.complete(),
+                        error: err => {
+                            observer.error(err);
+                        },
+                        complete: () => {
+                            observer.complete();
+                        },
                     });
                 }, 'datastore observe observable initialization')
                     .catch(this.handleAddProcError('DataStore.observe()'))
@@ -1494,17 +1499,17 @@ class DataStore {
                         // first, query and return any locally-available records
                         (await this.query(model, criteria, sortOptions)).forEach(item => {
                             const itemModelDefinition = getModelDefinition(model);
-                            const idOrPk = (0, utils_3.getIdentifierValue)(itemModelDefinition, item);
+                            const idOrPk = (0, utils_2.getIdentifierValue)(itemModelDefinition, item);
                             items.set(idOrPk, item);
                         });
                         // Observe the model and send a stream of updates (debounced).
                         // We need to post-filter results instead of passing criteria through
                         // to have visibility into items that move from in-set to out-of-set.
                         // We need to explicitly remove those items from the existing snapshot.
-                        handle = this.observe(model).subscribe(({ element, model, opType }) => this.runningProcesses.isOpen &&
+                        handle = this.observe(model).subscribe(({ element, model: observedModel, opType }) => this.runningProcesses.isOpen &&
                             this.runningProcesses.add(async () => {
-                                const itemModelDefinition = getModelDefinition(model);
-                                const idOrPk = (0, utils_3.getIdentifierValue)(itemModelDefinition, element);
+                                const itemModelDefinition = getModelDefinition(observedModel);
+                                const idOrPk = (0, utils_2.getIdentifierValue)(itemModelDefinition, element);
                                 if (executivePredicate &&
                                     !(await executivePredicate.matches(element))) {
                                     if (opType === 'UPDATE' &&
@@ -1530,7 +1535,7 @@ class DataStore {
                                 else {
                                     itemsChanged.set(idOrPk, element);
                                 }
-                                const isSynced = this.sync?.getModelSyncedStatus(model) ?? false;
+                                const isSynced = this.sync?.getModelSyncedStatus(observedModel) ?? false;
                                 const limit = itemsChanged.size - deletedItemIds.length >=
                                     this.syncPageSize;
                                 if (limit || isSynced) {
@@ -1565,7 +1570,7 @@ class DataStore {
                     items.clear();
                     itemsArray.forEach(item => {
                         const itemModelDefinition = getModelDefinition(model);
-                        const idOrPk = (0, utils_3.getIdentifierValue)(itemModelDefinition, item);
+                        const idOrPk = (0, utils_2.getIdentifierValue)(itemModelDefinition, item);
                         items.set(idOrPk, item);
                     });
                     // remove deleted items from the final result set
@@ -1604,8 +1609,8 @@ class DataStore {
                  * @param itemsToSort A array of model type.
                  */
                 const sortItems = (itemsToSort) => {
-                    const modelDefinition = getModelDefinition(model);
-                    const pagination = this.processPagination(modelDefinition, options);
+                    const sortingModelDefinition = getModelDefinition(model);
+                    const pagination = this.processPagination(sortingModelDefinition, options);
                     const sortPredicates = predicates_1.ModelSortPredicateCreator.getPredicates(pagination.sort);
                     if (sortPredicates.length) {
                         const compareFn = (0, util_1.sortCompareFunction)(sortPredicates);
@@ -1638,7 +1643,7 @@ class DataStore {
         };
         this.configure = (config = {}) => {
             this.amplifyContext.InternalAPI = this.InternalAPI;
-            const { DataStore: configDataStore, authModeStrategyType: configAuthModeStrategyType, conflictHandler: configConflictHandler, errorHandler: configErrorHandler, maxRecordsToSync: configMaxRecordsToSync, syncPageSize: configSyncPageSize, fullSyncInterval: configFullSyncInterval, syncExpressions: configSyncExpressions, authProviders: configAuthProviders, storageAdapter: configStorageAdapter, ...configFromAmplify } = config;
+            const { DataStore: configDataStore, authModeStrategyType: configAuthModeStrategyType, maxRecordsToSync: configMaxRecordsToSync, syncPageSize: configSyncPageSize, fullSyncInterval: configFullSyncInterval, syncExpressions: configSyncExpressions, authProviders: configAuthProviders, storageAdapter: configStorageAdapter, ...configFromAmplify } = config;
             const currentAppSyncConfig = core_1.Amplify.getConfig().API?.GraphQL;
             const appSyncConfig = {
                 aws_appsync_graphqlEndpoint: currentAppSyncConfig?.endpoint,