dexie 4.1.0-alpha.2 → 4.1.0-alpha.4

package/dist/dexie.d.ts

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.1.0-alpha.2, Fri Oct 04 2024
+ * Version 4.1.0-alpha.4, Sun Oct 13 2024
  *
  * https://dexie.org
  *
@@ -746,7 +746,7 @@ export interface DBCoreMutateResponse {
 		[operationNumber: number]: Error;
 	};
 	lastResult: any;
-	results?: any[]; // Present on AddRequest and PutRequest.
+	results?: any[]; // Always present on responses to AddRequest and PutRequest.
 }
 export interface DBCoreAddRequest {
 	type: "add";

package/dist/dexie.js

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.1.0-alpha.2, Fri Oct 04 2024
+ * Version 4.1.0-alpha.4, Sun Oct 13 2024
  *
  * https://dexie.org
  *
@@ -1177,7 +1177,7 @@
         }
     }
 
-    var DEXIE_VERSION = '4.1.0-alpha.2';
+    var DEXIE_VERSION = '4.1.0-alpha.4';
     var maxString = String.fromCharCode(65535);
     var minKey = -Infinity;
     var INVALID_KEY_ARGUMENT = "Invalid key provided. Keys must be of type string, number, Date or Array<string | number | Date>.";
@@ -1339,6 +1339,9 @@
         var pkKeyPath = table.schema.primKey.keyPath;
         var docCache = getDocCache(db);
         return {
+            set: function () {
+                throw new TypeError("Y.Doc properties are read-only");
+            },
             get: function () {
                 var id = getByKeyPath(this, pkKeyPath);
                 var doc = docCache.find(table.name, id, prop);
@@ -1535,13 +1538,14 @@
             }
             if (this.schema.yProps) {
                 var Y_1 = getYLibrary(db);
-                constructor =  (function (_super) {
-                    __extends(class_2, _super);
-                    function class_2() {
+                var DBObjectWithYProps =  (function (_super) {
+                    __extends(DBObjectWithYProps, _super);
+                    function DBObjectWithYProps() {
                         return _super !== null && _super.apply(this, arguments) || this;
                     }
-                    return class_2;
+                    return DBObjectWithYProps;
                 }(constructor));
+                constructor = DBObjectWithYProps;
                 this.schema.yProps.forEach(function (_a) {
                     var prop = _a.prop, updatesTable = _a.updatesTable;
                     Object.defineProperty(constructor.prototype, prop, createYDocProperty(db, Y_1, _this, prop, updatesTable));
@@ -3847,6 +3851,87 @@
         });
     }
 
+    var EMPTY_ARRAY = [];
+    function createYjsMiddleware(dbSchema, Y) {
+        return {
+            stack: 'dbcore',
+            name: 'yjsMiddleware',
+            level: 50,
+            create: function (downCore) {
+                return (__assign(__assign({}, downCore), { table: function (tableName) {
+                        var downTable = downCore.table(tableName);
+                        var dbTableSchema = dbSchema[tableName];
+                        var yProps = dbTableSchema.yProps;
+                        if (!yProps || yProps.length === 0)
+                            return downTable;
+                        var tableMiddleware = __assign(__assign({}, downTable), { mutate: function (req) {
+                                if (req.type !== 'add' && req.type !== 'put')
+                                    return downTable.mutate(req);
+                                var reqClone = req;
+                                var updateSources = yProps
+                                    .map(function (p) { return ({
+                                    p: p,
+                                    entries: req.values.flatMap(function (value, iter) {
+                                        if (!value || typeof value !== 'object')
+                                            throw new TypeError("Table ".concat(tableName, " (with Y-properties) must only contain objects"));
+                                        if (!hasOwn(value, p.prop))
+                                            return [];
+                                        if (reqClone === req)
+                                            reqClone = __assign(__assign({}, req), { values: req.values.map(function (v) { return (__assign({}, v)); }) });
+                                        delete reqClone.values[iter][p.prop];
+                                        var doc = value[p.prop];
+                                        if (doc === null)
+                                            throw new TypeError("Cannot set Y property to null");
+                                        if (doc === undefined)
+                                            return EMPTY_ARRAY;
+                                        if (typeof doc !== 'object' || !('whenLoaded' in doc)) {
+                                            throw new TypeError("Y properties can only be inited with an Y.Doc instance or undefined to create an empty Y.Doc");
+                                        }
+                                        if (req.type === 'put')
+                                            throw new TypeError("Setting ".concat(tableName, ".").concat(p.prop, " (declared as ").concat(p.prop, ":Y) is only allowed when inserting new objects using db.").concat(tableName, ".add(), not put() or update()."));
+                                        if (Y.encodeStateVector(doc).length === 1) {
+                                            return EMPTY_ARRAY;
+                                        }
+                                        return {
+                                            iter: iter,
+                                            u: Y.encodeStateAsUpdateV2(doc),
+                                        };
+                                    }),
+                                }); })
+                                    .filter(function (_a) {
+                                    var entries = _a.entries;
+                                    return entries.length > 0;
+                                });
+                                if (req === reqClone)
+                                    return downTable.mutate(req);
+                                return downTable.mutate(reqClone).then(function (res) {
+                                    if (updateSources.length === 0)
+                                        return res;
+                                    return Promise.all(updateSources.map(function (_a) {
+                                        var p = _a.p, entries = _a.entries;
+                                        var updatesTable = downCore.table(p.updatesTable);
+                                        var updatesToInsert = entries.map(function (_a) {
+                                            var iter = _a.iter, u = _a.u;
+                                            return ({
+                                                k: res.results[iter],
+                                                u: u,
+                                                f: 1,
+                                            });
+                                        });
+                                        return updatesTable.mutate({
+                                            type: 'add',
+                                            values: updatesToInsert,
+                                            trans: req.trans,
+                                        });
+                                    })).then(function () { return res; });
+                                });
+                            } });
+                        return tableMiddleware;
+                    } }));
+            },
+        };
+    }
+
     var Version =  (function () {
         function Version() {
         }
@@ -3911,6 +3996,12 @@
                     db.table(tableName).mapToClass(dbschema[tableName].mappedClass || Object);
                 }
             });
+            if (Object.values(dbschema).some(function (table) { return table.yProps; })) {
+                db.use(createYjsMiddleware(dbschema, getYLibrary(db)));
+            }
+            else {
+                db.unuse({ stack: 'dbcore', name: 'yjsMiddleware' });
+            }
             return this;
         };
         Version.prototype.upgrade = function (upgradeFunction) {
@@ -5611,20 +5702,22 @@
             if (!stamp)
                 return;
             var lastCompressedUpdate = stamp.lastCompressed;
-            var unsyncedFrom = Math.min.apply(Math, __spreadArray([], __read(syncers.map(function (s) { return Math.min(s.unsentFrom || Infinity, s.receivedUntil != null ? s.receivedUntil + 1 : Infinity); })), false));
+            var unsyncedFrom = Math.min.apply(Math, __spreadArray([], __read(syncers.map(function (s) {
+                return Math.min(s.unsentFrom || Infinity, s.receivedUntil != null ? s.receivedUntil + 1 : Infinity);
+            })), false));
             return updTbl
                 .where('i')
                 .between(lastCompressedUpdate, Infinity, false)
                 .toArray(function (addedUpdates) {
                 var e_3, _a;
-                if (addedUpdates.length <= 1)
+                if (addedUpdates.length === 0)
                     return;
                 var docsToCompress = [];
-                var lastUpdateToCompress = lastCompressedUpdate + 1;
+                var lastUpdateToCompress = lastCompressedUpdate;
                 var _loop_2 = function (j) {
                     var updateRow = addedUpdates[j];
                     var i = updateRow.i, f = updateRow.f, k = updateRow.k;
-                    if (i >= unsyncedFrom && (f & 0x01))
+                    if (i >= unsyncedFrom && f & 0x01)
                         return "break";
                     var entry = docsToCompress.find(function (entry) { return cmp(entry.docId, k) === 0; });
                     if (entry)
@@ -5638,9 +5731,13 @@
                     if (state_1 === "break")
                         break;
                 }
+                if (lastUpdateToCompress === lastCompressedUpdate)
+                    return;
                 var p = Promise.resolve();
                 var _loop_3 = function (docId, updates) {
-                    p = p.then(function () { return compressUpdatesForDoc(db, updatesTable, docId, updates); });
+                    p = p.then(function () {
+                        return compressUpdatesForDoc(db, updatesTable, docId, updates);
+                    });
                 };
                 try {
                     for (var docsToCompress_1 = __values(docsToCompress), docsToCompress_1_1 = docsToCompress_1.next(); !docsToCompress_1_1.done; docsToCompress_1_1 = docsToCompress_1.next()) {
@@ -5671,7 +5768,7 @@
         return db.transaction('rw', updatesTable, function (tx) {
             var updTbl = tx.table(updatesTable);
             return updTbl.where({ k: parentId }).first(function (mainUpdate) {
-                var updates = [mainUpdate].concat(addedUpdatesToCompress);
+                var updates = [mainUpdate].concat(addedUpdatesToCompress.filter(function (u) { return u.i !== mainUpdate.i; }));
                 var Y = getYLibrary(db);
                 var doc = new Y.Doc({ gc: true });
                 updates.forEach(function (update) {