@aws-amplify/datastore 3.12.11 → 3.12.13-unstable.1

package/lib/datastore/datastore.d.ts

@@ -1,12 +1,10 @@
 import Observable from 'zen-observable-ts';
 import { PredicateAll } from '../predicates';
-import { ConflictHandler, DataStoreConfig, ModelInit, ModelInstanceMetadata, NonModelTypeConstructor, ProducerPaginationInput, PersistentModel, PersistentModelConstructor, ProducerModelPredicate, Schema, SubscriptionMessage, DataStoreSnapshot, TypeConstructorMap, ErrorHandler, ObserveQueryOptions } from '../types';
+import { ConflictHandler, DataStoreConfig, NonModelTypeConstructor, ProducerPaginationInput, PersistentModel, PersistentModelConstructor, ProducerModelPredicate, Schema, SubscriptionMessage, DataStoreSnapshot, TypeConstructorMap, ErrorHandler, ObserveQueryOptions, PersistentModelMetaData, IdentifierFieldOrIdentifierObject } from '../types';
 export declare let syncClasses: TypeConstructorMap;
-declare const initSchema: (userSchema: Schema) => Record<string, NonModelTypeConstructor<any> | PersistentModelConstructor<any, {
-    readOnlyFields: "createdAt" | "updatedAt";
-}>>;
+declare const initSchema: (userSchema: Schema) => Record<string, PersistentModelConstructor<any> | NonModelTypeConstructor<unknown>>;
 export declare type ModelInstanceCreator = typeof modelInstanceCreator;
-declare function modelInstanceCreator<T extends PersistentModel = PersistentModel>(modelConstructor: PersistentModelConstructor<T>, init: ModelInit<T> & Partial<ModelInstanceMetadata>): T;
+declare function modelInstanceCreator<T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, init: Partial<T>): T;
 declare class DataStore {
     private Auth;
     private API;
@@ -16,12 +14,12 @@ declare class DataStore {
     private conflictHandler;
     private errorHandler;
     private fullSyncInterval;
-    private initialized;
+    private initialized?;
     private initReject;
     private initResolve;
     private maxRecordsToSync;
-    private storage;
-    private sync;
+    private storage?;
+    private sync?;
     private syncPageSize;
     private syncExpressions;
     private syncPredicates;
@@ -31,30 +29,29 @@ declare class DataStore {
     getModuleName(): string;
     start: () => Promise<void>;
     query: {
-        <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, id: string): Promise<T | undefined>;
+        <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, identifier: IdentifierFieldOrIdentifierObject<T, PersistentModelMetaData<T>>): Promise<T | undefined>;
         <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, criteria?: ProducerModelPredicate<T> | typeof PredicateAll, paginationProducer?: ProducerPaginationInput<T>): Promise<T[]>;
     };
-    save: <T extends Readonly<{
-        id: string;
-    } & Record<string, any>>>(model: T, condition?: ProducerModelPredicate<T>) => Promise<T>;
+    save: <T extends Readonly<Record<string, any>>>(model: T, condition?: ProducerModelPredicate<T>) => Promise<T>;
     setConflictHandler: (config: DataStoreConfig) => ConflictHandler;
     setErrorHandler: (config: DataStoreConfig) => ErrorHandler;
     delete: {
-        <T extends PersistentModel>(model: T, condition?: ProducerModelPredicate<T>): Promise<T>;
-        <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, id: string): Promise<T[]>;
+        <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, identifier: IdentifierFieldOrIdentifierObject<T, PersistentModelMetaData<T>>): Promise<T[]>;
         <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, condition: ProducerModelPredicate<T> | typeof PredicateAll): Promise<T[]>;
+        <T extends PersistentModel>(model: T, condition?: ProducerModelPredicate<T>): Promise<T>;
     };
     observe: {
         (): Observable<SubscriptionMessage<PersistentModel>>;
+        <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, identifier: string): Observable<SubscriptionMessage<T>>;
+        <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, criteria?: ProducerModelPredicate<T> | typeof PredicateAll): Observable<SubscriptionMessage<T>>;
         <T extends PersistentModel>(model: T): Observable<SubscriptionMessage<T>>;
-        <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, criteria?: string | ProducerModelPredicate<T>): Observable<SubscriptionMessage<T>>;
     };
     observeQuery: {
         <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, criteria?: ProducerModelPredicate<T> | typeof PredicateAll, paginationProducer?: ObserveQueryOptions<T>): Observable<DataStoreSnapshot<T>>;
     };
     configure: (config?: DataStoreConfig) => void;
     clear: () => Promise<void>;
-    stop: () => Promise<void>;
+    stop: (this: DataStore) => Promise<void>;
     private processPagination;
     private processSyncExpressions;
     private createFromCondition;

package/lib/datastore/datastore.js

@@ -105,6 +105,7 @@ var storage_1 = require("../storage/storage");
 var sync_1 = require("../sync");
 var types_1 = require("../types");
 var util_1 = require("../util");
+var utils_1 = require("../sync/utils");
 immer_1.setAutoFreeze(true);
 immer_1.enablePatches();
 var logger = new core_1.ConsoleLogger('DataStore');
@@ -248,6 +249,13 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
             (v === null || v === undefined)) {
             throw new Error("Field " + name_1 + " is required");
         }
+        if (types_1.isSchemaModelWithAttributes(modelDefinition) && !util_1.isIdManaged(modelDefinition)) {
+            var keys = util_1.extractPrimaryKeyFieldNames(modelDefinition);
+            if (keys.includes(k) && v === '') {
+                logger.error(util_1.errorMessages.idEmptyString, { k: k, value: v });
+                throw new Error(util_1.errorMessages.idEmptyString);
+            }
+        }
         if (types_1.isGraphQLScalarType(type)) {
             var jsType_1 = types_1.GraphQLScalarType.getJSType(type);
             var validateScalar_1 = types_1.GraphQLScalarType.getValidationFunction(type);
@@ -348,21 +356,29 @@ var createModelClass = function (modelDefinition) {
         function Model(init) {
             var instance = immer_1.produce(this, function (draft) {
                 initializeInstance(init, modelDefinition, draft);
-                var modelInstanceMetadata = instancesMetadata.has(init)
+                // model is initialized inside a DataStore component (e.g. by Sync Engine, Storage Engine, etc.)
+                var isInternallyInitialized = instancesMetadata.has(init);
+                var modelInstanceMetadata = isInternallyInitialized
                     ? init
                     : {};
-                var _id = modelInstanceMetadata.id, _version = modelInstanceMetadata._version, _lastChangedAt = modelInstanceMetadata._lastChangedAt, _deleted = modelInstanceMetadata._deleted;
-                // instancesIds are set by modelInstanceCreator, it is accessible only internally
-                var isInternal = _id !== null && _id !== undefined;
-                var id = isInternal
-                    ? _id
-                    : modelDefinition.syncable
-                        ? uuid_1.v4()
-                        : ulid();
-                if (!isInternal) {
+                var _id = modelInstanceMetadata.id;
+                if (util_1.isIdManaged(modelDefinition)) {
+                    var isInternalModel = _id !== null && _id !== undefined;
+                    var id = isInternalModel
+                        ? _id
+                        : modelDefinition.syncable
+                            ? uuid_1.v4()
+                            : ulid();
+                    draft.id = id;
+                }
+                else if (util_1.isIdOptionallyManaged(modelDefinition)) {
+                    // only auto-populate if the id was not provided
+                    draft.id = draft.id || uuid_1.v4();
+                }
+                if (!isInternallyInitialized) {
                     checkReadOnlyPropertyOnCreate(draft, modelDefinition);
                 }
-                draft.id = id;
+                var _version = modelInstanceMetadata._version, _lastChangedAt = modelInstanceMetadata._lastChangedAt, _deleted = modelInstanceMetadata._deleted;
                 if (modelDefinition.syncable) {
                     draft._version = _version;
                     draft._lastChangedAt = _lastChangedAt;
@@ -381,7 +397,9 @@ var createModelClass = function (modelDefinition) {
             var patches;
             var model = immer_1.produce(source, function (draft) {
                 fn(draft);
-                draft.id = source.id;
+                var keyNames = util_1.extractPrimaryKeyFieldNames(modelDefinition);
+                // Keys are immutable
+                keyNames.forEach(function (key) { return (draft[key] = source[key]); });
                 var modelValidator = validateModelFields(modelDefinition);
                 Object.entries(draft).forEach(function (_a) {
                     var _b = __read(_a, 2), k = _b[0], v = _b[1];
@@ -514,7 +532,6 @@ function checkSchemaVersion(storage, version) {
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0: return [4 /*yield*/, s.query(Setting, predicates_1.ModelPredicateCreator.createFromExisting(modelDefinition, function (c) {
-                                            // @ts-ignore Argument of type '"eq"' is not assignable to parameter of type 'never'.
                                             return c.key('eq', SETTING_SCHEMA_VERSION);
                                         }), { page: 0, limit: 1 })];
                                     case 1:
@@ -670,8 +687,8 @@ var DataStore = /** @class */ (function () {
                 }
             });
         }); };
-        this.query = function (modelConstructor, idOrCriteria, paginationProducer) { return __awaiter(_this, void 0, void 0, function () {
-            var msg, modelDefinition, predicate, pagination, result;
+        this.query = function (modelConstructor, identifierOrCriteria, paginationProducer) { return __awaiter(_this, void 0, void 0, function () {
+            var msg, modelDefinition, keyFields, predicate, msg, pagination, result, returnOne;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.start()];
@@ -683,22 +700,32 @@ var DataStore = /** @class */ (function () {
                             logger.error(msg, { modelConstructor: modelConstructor });
                             throw new Error(msg);
                         }
-                        if (typeof idOrCriteria === 'string') {
+                        if (typeof identifierOrCriteria === 'string') {
                             if (paginationProducer !== undefined) {
                                 logger.warn('Pagination is ignored when querying by id');
                             }
                         }
                         modelDefinition = getModelDefinition(modelConstructor);
-                        if (isQueryOne(idOrCriteria)) {
-                            predicate = predicates_1.ModelPredicateCreator.createForId(modelDefinition, idOrCriteria);
+                        keyFields = util_1.extractPrimaryKeyFieldNames(modelDefinition);
+                        if (isQueryOne(identifierOrCriteria)) {
+                            if (keyFields.length > 1) {
+                                msg = util_1.errorMessages.queryByPkWithCompositeKeyPresent;
+                                logger.error(msg, { keyFields: keyFields });
+                                throw new Error(msg);
+                            }
+                            predicate = predicates_1.ModelPredicateCreator.createForSingleField(modelDefinition, keyFields[0], identifierOrCriteria);
                         }
                         else {
-                            if (predicates_1.isPredicatesAll(idOrCriteria)) {
+                            // Object is being queried using object literal syntax
+                            if (types_1.isIdentifierObject(identifierOrCriteria, modelDefinition)) {
+                                predicate = predicates_1.ModelPredicateCreator.createForPk(modelDefinition, identifierOrCriteria);
+                            }
+                            else if (predicates_1.isPredicatesAll(identifierOrCriteria)) {
                                 // Predicates.ALL means "all records", so no predicate (undefined)
                                 predicate = undefined;
                             }
                             else {
-                                predicate = predicates_1.ModelPredicateCreator.createFromExisting(modelDefinition, idOrCriteria);
+                                predicate = predicates_1.ModelPredicateCreator.createFromExisting(modelDefinition, identifierOrCriteria);
                             }
                         }
                         pagination = this.processPagination(modelDefinition, paginationProducer);
@@ -711,7 +738,9 @@ var DataStore = /** @class */ (function () {
                         return [4 /*yield*/, this.storage.query(modelConstructor, predicate, pagination)];
                     case 2:
                         result = _a.sent();
-                        return [2 /*return*/, isQueryOne(idOrCriteria) ? result[0] : result];
+                        returnOne = isQueryOne(identifierOrCriteria) ||
+                            types_1.isIdentifierObject(identifierOrCriteria, modelDefinition);
+                        return [2 /*return*/, returnOne ? result[0] : result];
                 }
             });
         }); };
@@ -740,7 +769,7 @@ var DataStore = /** @class */ (function () {
                                         case 0: return [4 /*yield*/, s.save(model, producedCondition, undefined, patchesTuple)];
                                         case 1:
                                             _a.sent();
-                                            return [2 /*return*/, s.query(modelConstructor, predicates_1.ModelPredicateCreator.createForId(modelDefinition, model.id))];
+                                            return [2 /*return*/, s.query(modelConstructor, predicates_1.ModelPredicateCreator.createForPk(modelDefinition, model))];
                                     }
                                 });
                             }); })];
@@ -776,8 +805,8 @@ var DataStore = /** @class */ (function () {
             }
             return _this.errorHandler || defaultErrorHandler;
         };
-        this.delete = function (modelOrConstructor, idOrCriteria) { return __awaiter(_this, void 0, void 0, function () {
-            var condition, msg, modelConstructor, msg, msg, _a, deleted, model, modelConstructor, msg, modelDefinition, idPredicate, msg, _b, _c, deleted;
+        this.delete = function (modelOrConstructor, identifierOrCriteria) { return __awaiter(_this, void 0, void 0, function () {
+            var condition, msg, modelConstructor, msg, modelDefinition, keyFields, msg, msg, _a, deleted, model, modelConstructor, msg, modelDefinition, pkPredicate, msg, _b, _c, deleted;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, this.start()];
@@ -790,21 +819,33 @@ var DataStore = /** @class */ (function () {
                         }
                         if (!isValidModelConstructor(modelOrConstructor)) return [3 /*break*/, 3];
                         modelConstructor = modelOrConstructor;
-                        if (!idOrCriteria) {
+                        if (!identifierOrCriteria) {
                             msg = 'Id to delete or criteria required. Do you want to delete all? Pass Predicates.ALL';
-                            logger.error(msg, { idOrCriteria: idOrCriteria });
+                            logger.error(msg, { identifierOrCriteria: identifierOrCriteria });
                             throw new Error(msg);
                         }
-                        if (typeof idOrCriteria === 'string') {
-                            condition = predicates_1.ModelPredicateCreator.createForId(getModelDefinition(modelConstructor), idOrCriteria);
+                        modelDefinition = getModelDefinition(modelConstructor);
+                        if (typeof identifierOrCriteria === 'string') {
+                            keyFields = util_1.extractPrimaryKeyFieldNames(modelDefinition);
+                            if (keyFields.length > 1) {
+                                msg = util_1.errorMessages.deleteByPkWithCompositeKeyPresent;
+                                logger.error(msg, { keyFields: keyFields });
+                                throw new Error(msg);
+                            }
+                            condition = predicates_1.ModelPredicateCreator.createForSingleField(getModelDefinition(modelConstructor), keyFields[0], identifierOrCriteria);
                         }
                         else {
-                            condition = predicates_1.ModelPredicateCreator.createFromExisting(getModelDefinition(modelConstructor), 
-                            /**
-                             * idOrCriteria is always a ProducerModelPredicate<T>, never a symbol.
-                             * The symbol is used only for typing purposes. e.g. see Predicates.ALL
-                             */
-                            idOrCriteria);
+                            if (types_1.isIdentifierObject(identifierOrCriteria, modelDefinition)) {
+                                condition = predicates_1.ModelPredicateCreator.createForPk(modelDefinition, identifierOrCriteria);
+                            }
+                            else {
+                                condition = predicates_1.ModelPredicateCreator.createFromExisting(modelDefinition, 
+                                /**
+                                 * idOrCriteria is always a ProducerModelPredicate<T>, never a symbol.
+                                 * The symbol is used only for typing purposes. e.g. see Predicates.ALL
+                                 */
+                                identifierOrCriteria);
+                            }
                             if (!condition || !predicates_1.ModelPredicateCreator.isValidPredicate(condition)) {
                                 msg = 'Criteria required. Do you want to delete all? Pass Predicates.ALL';
                                 logger.error(msg, { condition: condition });
@@ -825,17 +866,17 @@ var DataStore = /** @class */ (function () {
                             throw new Error(msg);
                         }
                         modelDefinition = getModelDefinition(modelConstructor);
-                        idPredicate = predicates_1.ModelPredicateCreator.createForId(modelDefinition, model.id);
-                        if (idOrCriteria) {
-                            if (typeof idOrCriteria !== 'function') {
+                        pkPredicate = predicates_1.ModelPredicateCreator.createForPk(modelDefinition, model);
+                        if (identifierOrCriteria) {
+                            if (typeof identifierOrCriteria !== 'function') {
                                 msg = 'Invalid criteria';
-                                logger.error(msg, { idOrCriteria: idOrCriteria });
+                                logger.error(msg, { identifierOrCriteria: identifierOrCriteria });
                                 throw new Error(msg);
                             }
-                            condition = idOrCriteria(idPredicate);
+                            condition = identifierOrCriteria(pkPredicate);
                         }
                         else {
-                            condition = idPredicate;
+                            condition = pkPredicate;
                         }
                         return [4 /*yield*/, this.storage.delete(model, condition)];
                     case 4:
@@ -844,7 +885,7 @@ var DataStore = /** @class */ (function () {
                 }
             });
         }); };
-        this.observe = function (modelOrConstructor, idOrCriteria) {
+        this.observe = function (modelOrConstructor, identifierOrCriteria) {
             var predicate;
             var modelConstructor = modelOrConstructor && isValidModelConstructor(modelOrConstructor)
                 ? modelOrConstructor
@@ -853,10 +894,10 @@ var DataStore = /** @class */ (function () {
                 var model = modelOrConstructor;
                 var modelConstructor_1 = model && Object.getPrototypeOf(model).constructor;
                 if (isValidModelConstructor(modelConstructor_1)) {
-                    if (idOrCriteria) {
+                    if (identifierOrCriteria) {
                         logger.warn('idOrCriteria is ignored when using a model instance', {
                             model: model,
-                            idOrCriteria: idOrCriteria,
+                            identifierOrCriteria: identifierOrCriteria,
                         });
                     }
                     return _this.observe(modelConstructor_1, model.id);
@@ -867,9 +908,17 @@ var DataStore = /** @class */ (function () {
                     throw new Error(msg);
                 }
             }
-            if (idOrCriteria !== undefined && modelConstructor === undefined) {
+            // observe should not accept object literal syntax
+            if (identifierOrCriteria &&
+                modelConstructor &&
+                types_1.isIdentifierObject(identifierOrCriteria, getModelDefinition(modelConstructor))) {
+                var msg = util_1.errorMessages.observeWithObjectLiteral;
+                logger.error(msg, { objectLiteral: identifierOrCriteria });
+                throw new Error(msg);
+            }
+            if (identifierOrCriteria !== undefined && modelConstructor === undefined) {
                 var msg = 'Cannot provide criteria without a modelConstructor';
-                logger.error(msg, idOrCriteria);
+                logger.error(msg, identifierOrCriteria);
                 throw new Error(msg);
             }
             if (modelConstructor && !isValidModelConstructor(modelConstructor)) {
@@ -877,13 +926,20 @@ var DataStore = /** @class */ (function () {
                 logger.error(msg, { modelConstructor: modelConstructor });
                 throw new Error(msg);
             }
-            if (typeof idOrCriteria === 'string') {
-                predicate = predicates_1.ModelPredicateCreator.createForId(getModelDefinition(modelConstructor), idOrCriteria);
+            if (typeof identifierOrCriteria === 'string') {
+                var modelDefinition = getModelDefinition(modelConstructor);
+                var _a = __read(util_1.extractPrimaryKeyFieldNames(modelDefinition), 1), keyField = _a[0];
+                predicate = predicates_1.ModelPredicateCreator.createForSingleField(getModelDefinition(modelConstructor), keyField, identifierOrCriteria);
             }
             else {
-                predicate =
-                    modelConstructor &&
-                        predicates_1.ModelPredicateCreator.createFromExisting(getModelDefinition(modelConstructor), idOrCriteria);
+                if (predicates_1.isPredicatesAll(identifierOrCriteria)) {
+                    predicate = undefined;
+                }
+                else {
+                    predicate =
+                        modelConstructor &&
+                            predicates_1.ModelPredicateCreator.createFromExisting(getModelDefinition(modelConstructor), identifierOrCriteria);
+                }
             }
             return new zen_observable_ts_1.default(function (observer) {
                 var handle;
@@ -904,13 +960,16 @@ var DataStore = /** @class */ (function () {
                                 })
                                     .subscribe({
                                     next: function (item) { return __awaiter(_this, void 0, void 0, function () {
-                                        var message, freshElement;
+                                        var message, modelDefinition, keyFields, primaryKeysAndValues, freshElement;
                                         return __generator(this, function (_a) {
                                             switch (_a.label) {
                                                 case 0:
                                                     message = item;
                                                     if (!(item.opType !== 'DELETE')) return [3 /*break*/, 2];
-                                                    return [4 /*yield*/, this.query(item.model, item.element.id)];
+                                                    modelDefinition = getModelDefinition(item.model);
+                                                    keyFields = util_1.extractPrimaryKeyFieldNames(modelDefinition);
+                                                    primaryKeysAndValues = util_1.extractPrimaryKeysAndValues(item.element, keyFields);
+                                                    return [4 /*yield*/, this.query(item.model, primaryKeysAndValues)];
                                                 case 1:
                                                     freshElement = _a.sent();
                                                     message = __assign(__assign({}, message), { element: freshElement });
@@ -966,8 +1025,9 @@ var DataStore = /** @class */ (function () {
                 var sort = (options || {}).sort;
                 var sortOptions = sort ? { sort: sort } : undefined;
                 var modelDefinition = getModelDefinition(model);
+                var keyFields = util_1.extractPrimaryKeyFieldNames(modelDefinition);
                 if (isQueryOne(criteria)) {
-                    predicate = predicates_1.ModelPredicateCreator.createForId(modelDefinition, criteria);
+                    predicate = predicates_1.ModelPredicateCreator.createForSingleField(modelDefinition, keyFields[0], criteria);
                 }
                 else {
                     if (predicates_1.isPredicatesAll(criteria)) {
@@ -991,7 +1051,9 @@ var DataStore = /** @class */ (function () {
                             case 1:
                                 // first, query and return any locally-available records
                                 (_a.sent()).forEach(function (item) {
-                                    return items.set(item.id, item);
+                                    var itemModelDefinition = getModelDefinition(model);
+                                    var idOrPk = utils_1.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
@@ -1000,15 +1062,17 @@ var DataStore = /** @class */ (function () {
                                 handle = this.observe(model).subscribe(function (_a) {
                                     var element = _a.element, model = _a.model, opType = _a.opType;
                                     var _b, _c;
+                                    var itemModelDefinition = getModelDefinition(model);
+                                    var idOrPk = utils_1.getIdentifierValue(itemModelDefinition, element);
                                     if (hasPredicate &&
                                         !util_1.validatePredicate(element, predicateGroupType, predicates)) {
                                         if (opType === 'UPDATE' &&
-                                            (items.has(element.id) || itemsChanged.has(element.id))) {
+                                            (items.has(idOrPk) || itemsChanged.has(idOrPk))) {
                                             // tracking as a "deleted item" will include the item in
                                             // page limit calculations and ensure it is removed from the
                                             // final items collection, regardless of which collection(s)
                                             // it is currently in. (I mean, it could be in both, right!?)
-                                            deletedItemIds.push(element.id);
+                                            deletedItemIds.push(idOrPk);
                                         }
                                         else {
                                             // ignore updates for irrelevant/filtered items.
@@ -1020,10 +1084,10 @@ var DataStore = /** @class */ (function () {
                                     // in the `mergePage` method within src/sync/merger.ts. The final state of a model instance
                                     // depends on the LATEST record (for a given id).
                                     if (opType === 'DELETE') {
-                                        deletedItemIds.push(element.id);
+                                        deletedItemIds.push(idOrPk);
                                     }
                                     else {
-                                        itemsChanged.set(element.id, element);
+                                        itemsChanged.set(idOrPk, element);
                                     }
                                     var isSynced = (_c = (_b = _this.sync) === null || _b === void 0 ? void 0 : _b.getModelSyncedStatus(model)) !== null && _c !== void 0 ? _c : false;
                                     var limit = itemsChanged.size - deletedItemIds.length >= _this.syncPageSize;
@@ -1058,9 +1122,13 @@ var DataStore = /** @class */ (function () {
                         sortItems(itemsArray);
                     }
                     items.clear();
-                    itemsArray.forEach(function (item) { return items.set(item.id, item); });
+                    itemsArray.forEach(function (item) {
+                        var itemModelDefinition = getModelDefinition(model);
+                        var idOrPk = utils_1.getIdentifierValue(itemModelDefinition, item);
+                        items.set(idOrPk, item);
+                    });
                     // remove deleted items from the final result set
-                    deletedItemIds.forEach(function (id) { return items.delete(id); });
+                    deletedItemIds.forEach(function (idOrPk) { return items.delete(idOrPk); });
                     return {
                         items: Array.from(items.values()),
                         isSynced: isSynced,
@@ -1364,9 +1432,8 @@ var DataStore = /** @class */ (function () {
                 return sessionId + "-" + appSyncId;
             }
         }
-        catch (_b) {
-            return undefined;
-        }
+        catch (_b) { }
+        return undefined;
     };
     return DataStore;
 }());