tinybase 4.4.0-beta.0 → 4.4.0-beta.2

package/lib/debug/persisters/persister-sqlite3.js

@@ -15,13 +15,13 @@ const ifNotUndefined = (value, then, otherwise) =>
 const isString = (thing) => getTypeOf(thing) == STRING;
 const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
+const size = (arrayOrString) => arrayOrString.length;
 const promiseNew = (resolver) => new promise(resolver);
 const promiseAll = async (promises) => promise.all(promises);
 
 const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
-const arrayLength = (array) => array.length;
-const arrayIsEmpty = (array) => arrayLength(array) == 0;
+const arrayIsEmpty = (array) => size(array) == 0;
 const arrayFilter = (array, cb) => array.filter(cb);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
@@ -32,10 +32,18 @@ const collForEach = (coll, cb) => coll?.forEach(cb);
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
 const object = Object;
+const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objIds = object.keys;
 const objFreeze = object.freeze;
 const isObject = (obj) =>
-  isInstanceOf(obj, object) && obj.constructor == object;
+  !isUndefined(obj) &&
+  ifNotUndefined(
+    getPrototypeOf(obj),
+    (objPrototype) =>
+      objPrototype == object.prototype ||
+      isUndefined(getPrototypeOf(objPrototype)),
+    () => true,
+  );
 const objNew = (entries = []) => object.fromEntries(entries);
 const objMerge = (...objs) => object.assign({}, ...objs);
 const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
@@ -47,7 +55,7 @@ const objDel = (obj, id) => {
 const objMap = (obj, cb) =>
   arrayMap(object.entries(obj), ([id, value]) => cb(value, id));
 const objValues = (obj) => object.values(obj);
-const objSize = (obj) => arrayLength(objIds(obj));
+const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
 const mapNew = (entries) => new Map(entries);
@@ -318,8 +326,8 @@ const upsert = async (
       ')VALUES' +
       slice(
         strRepeat(
-          `,(?${strRepeat(',?', arrayLength(changingColumnNames))})`,
-          arrayLength(args) / (arrayLength(changingColumnNames) + 1),
+          `,(?${strRepeat(',?', size(changingColumnNames))})`,
+          size(args) / (size(changingColumnNames) + 1),
         ),
         1,
       ) +
@@ -357,6 +365,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
+  [getThing, thing] = [],
   scheduleId = [],
 ) => {
   let listenerId;
@@ -473,6 +482,7 @@ const createCustomPersister = (
     },
     stopAutoSave: () => {
       ifNotUndefined(listenerId, store.delListener);
+      listenerId = void 0;
       return persister;
     },
     schedule: async (...actions) => {
@@ -484,6 +494,9 @@ const createCustomPersister = (
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
   };
+  if (getThing) {
+    persister[getThing] = () => thing;
+  }
   return objFreeze(persister);
 };
 
@@ -496,7 +509,7 @@ const createJsonSqlitePersister = (
   onIgnoredError,
   [storeTableName],
   managedTableNames,
-  scheduleId,
+  db,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(cmd, managedTableNames, onIgnoredError);
@@ -529,7 +542,8 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    scheduleId,
+    ['getDb', db],
+    db,
   );
   return persister;
 };
@@ -546,7 +560,7 @@ const createTabularSqlitePersister = (
     [valuesLoad, valuesSave, valuesTableName],
   ],
   managedTableNames,
-  scheduleId,
+  db,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(cmd, managedTableNames, onIgnoredError);
@@ -633,7 +647,8 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    scheduleId,
+    ['getDb', db],
+    db,
   );
   return persister;
 };
@@ -742,7 +757,7 @@ const createSqlitePersister = (
   delUpdateListener,
   onSqlCommand,
   onIgnoredError,
-  scheduleId,
+  db,
 ) => {
   let dataVersion;
   let schemaVersion;
@@ -793,7 +808,7 @@ const createSqlitePersister = (
     onIgnoredError,
     defaultedConfig,
     collValues(managedTableNamesSet),
-    scheduleId,
+    db,
   );
 };
 
@@ -811,7 +826,7 @@ const createSqlite3Persister = (
     async (sql, args = []) =>
       await promiseNew((resolve, reject) =>
         db.all(sql, args, (error, rows) =>
-          error ? reject(error) : resolve(rows.map((row) => ({...row}))),
+          error ? reject(error) : resolve(rows),
         ),
       ),
     (listener) => {

package/lib/debug/persisters/persister-yjs.js

@@ -4,29 +4,36 @@ const TINYBASE = 'tinybase';
 const T = 't';
 const V = 'v';
 
+const isUndefined = (thing) => thing == void 0;
+const ifNotUndefined = (value, then, otherwise) =>
+  isUndefined(value) ? otherwise?.() : then(value);
+const size = (arrayOrString) => arrayOrString.length;
+
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
-const arrayLength = (array) => array.length;
-const arrayIsEmpty = (array) => arrayLength(array) == 0;
+const arrayIsEmpty = (array) => size(array) == 0;
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
-const isInstanceOf = (thing, cls) => thing instanceof cls;
-const isUndefined = (thing) => thing == void 0;
-const ifNotUndefined = (value, then, otherwise) =>
-  isUndefined(value) ? otherwise?.() : then(value);
-
 const object = Object;
+const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objIds = object.keys;
 const objFreeze = object.freeze;
 const isObject = (obj) =>
-  isInstanceOf(obj, object) && obj.constructor == object;
+  !isUndefined(obj) &&
+  ifNotUndefined(
+    getPrototypeOf(obj),
+    (objPrototype) =>
+      objPrototype == object.prototype ||
+      isUndefined(getPrototypeOf(objPrototype)),
+    () => true,
+  );
 const objNew = (entries = []) => object.fromEntries(entries);
 const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
 const objHas = (obj, id) => !isUndefined(objGet(obj, id));
 const objMap = (obj, cb) =>
   arrayMap(object.entries(obj), ([id, value]) => cb(value, id));
-const objSize = (obj) => arrayLength(objIds(obj));
+const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 const objEnsure = (obj, id, getDefaultValue) => {
   if (!objHas(obj, id)) {
@@ -61,6 +68,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
+  [getThing, thing] = [],
   scheduleId = [],
 ) => {
   let listenerId;
@@ -177,6 +185,7 @@ const createCustomPersister = (
     },
     stopAutoSave: () => {
       ifNotUndefined(listenerId, store.delListener);
+      listenerId = void 0;
       return persister;
     },
     schedule: async (...actions) => {
@@ -188,13 +197,16 @@ const createCustomPersister = (
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
   };
+  if (getThing) {
+    persister[getThing] = () => thing;
+  }
   return objFreeze(persister);
 };
 
 const DELETE = 'delete';
 const getYContent = (yContent) => [yContent.get(T), yContent.get(V)];
 const getTransactionChangesFromYDoc = (yContent, events) => {
-  if (arrayLength(events) == 1 && arrayIsEmpty(events[0].path)) {
+  if (size(events) == 1 && arrayIsEmpty(events[0].path)) {
     return [yContent.get(T).toJSON(), yContent.get(V).toJSON()];
   }
   const [yTables, yValues] = getYContent(yContent);
@@ -365,6 +377,7 @@ const createYjsPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    ['getYDoc', yDoc],
   );
 };
 

package/lib/debug/persisters.js

@@ -1,18 +1,25 @@
-const isInstanceOf = (thing, cls) => thing instanceof cls;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
+const size = (arrayOrString) => arrayOrString.length;
 
-const arrayLength = (array) => array.length;
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
 const object = Object;
+const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objIds = object.keys;
 const objFreeze = object.freeze;
 const isObject = (obj) =>
-  isInstanceOf(obj, object) && obj.constructor == object;
-const objSize = (obj) => arrayLength(objIds(obj));
+  !isUndefined(obj) &&
+  ifNotUndefined(
+    getPrototypeOf(obj),
+    (objPrototype) =>
+      objPrototype == object.prototype ||
+      isUndefined(getPrototypeOf(objPrototype)),
+    () => true,
+  );
+const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
@@ -38,6 +45,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
+  [getThing, thing] = [],
   scheduleId = [],
 ) => {
   let listenerId;
@@ -154,6 +162,7 @@ const createCustomPersister = (
     },
     stopAutoSave: () => {
       ifNotUndefined(listenerId, store.delListener);
+      listenerId = void 0;
       return persister;
     },
     schedule: async (...actions) => {
@@ -165,6 +174,9 @@ const createCustomPersister = (
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
   };
+  if (getThing) {
+    persister[getThing] = () => thing;
+  }
   return objFreeze(persister);
 };
 

package/lib/debug/queries.js

@@ -21,18 +21,6 @@ const SORTED_ROW_IDS = 'Sorted' + ROW + IDS;
 const CELL = 'Cell';
 const CELL_IDS = CELL + IDS;
 
-const arrayEvery = (array, cb) => array.every(cb);
-const arrayIsEqual = (array1, array2) =>
-  arrayLength(array1) === arrayLength(array2) &&
-  arrayEvery(array1, (value1, index) => array2[index] === value1);
-const arrayForEach = (array, cb) => array.forEach(cb);
-const arrayMap = (array, cb) => array.map(cb);
-const arraySum = (array) => arrayReduce(array, (i, j) => i + j, 0);
-const arrayLength = (array) => array.length;
-const arrayIsEmpty = (array) => arrayLength(array) == 0;
-const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
-const arrayPush = (array, ...values) => array.push(...values);
-
 const mathMax = Math.max;
 const mathMin = Math.min;
 const isFiniteNumber = isFinite;
@@ -43,8 +31,20 @@ const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
 const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
+const size = (arrayOrString) => arrayOrString.length;
 const getUndefined = () => void 0;
 
+const arrayEvery = (array, cb) => array.every(cb);
+const arrayIsEqual = (array1, array2) =>
+  size(array1) === size(array2) &&
+  arrayEvery(array1, (value1, index) => array2[index] === value1);
+const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayMap = (array, cb) => array.map(cb);
+const arraySum = (array) => arrayReduce(array, (i, j) => i + j, 0);
+const arrayIsEmpty = (array) => size(array) == 0;
+const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
+const arrayPush = (array, ...values) => array.push(...values);
+
 const object = Object;
 const objFreeze = object.freeze;
 const objMap = (obj, cb) =>
@@ -76,10 +76,10 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     (ensureLeaf ? mapEnsure : mapGet)(
       node,
       path[p],
-      p > arrayLength(path) - 2 ? ensureLeaf : mapNew,
+      p > size(path) - 2 ? ensureLeaf : mapNew,
     ),
     (nodeOrLeaf) => {
-      if (p > arrayLength(path) - 2) {
+      if (p > size(path) - 2) {
         if (pruneLeaf?.(nodeOrLeaf)) {
           mapSet(node, path[p]);
         }
@@ -423,7 +423,7 @@ const createQueries = getCreateFunction((store) => {
     const havings = [];
     const select = (arg1, arg2) => {
       const selectEntry = isFunction(arg1)
-        ? [arrayLength(selectEntries) + EMPTY_STRING, arg1]
+        ? [size(selectEntries) + EMPTY_STRING, arg1]
         : [
             isUndefined(arg2) ? arg1 : arg2,
             (getTableCell) => getTableCell(arg1, arg2),
@@ -797,6 +797,7 @@ const createQueries = getCreateFunction((store) => {
           ...slice(args, 0, argumentCount),
           (_store, ...listenerArgs) =>
             args[argumentCount](queries, ...listenerArgs),
+          true,
         );
     },
   );

package/lib/debug/relationships.js

@@ -7,15 +7,15 @@ const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
 const isString = (thing) => getTypeOf(thing) == STRING;
 const isArray = (thing) => Array.isArray(thing);
+const size = (arrayOrString) => arrayOrString.length;
 const test = (regex, subject) => regex.test(subject);
 
 const arrayEvery = (array, cb) => array.every(cb);
 const arrayIsEqual = (array1, array2) =>
-  arrayLength(array1) === arrayLength(array2) &&
+  size(array1) === size(array2) &&
   arrayEvery(array1, (value1, index) => array2[index] === value1);
 const arrayForEach = (array, cb) => array.forEach(cb);
-const arrayLength = (array) => array.length;
-const arrayIsEmpty = (array) => arrayLength(array) == 0;
+const arrayIsEmpty = (array) => size(array) == 0;
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
@@ -53,10 +53,10 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     (ensureLeaf ? mapEnsure : mapGet)(
       node,
       path[p],
-      p > arrayLength(path) - 2 ? ensureLeaf : mapNew,
+      p > size(path) - 2 ? ensureLeaf : mapNew,
     ),
     (nodeOrLeaf) => {
-      if (p > arrayLength(path) - 2) {
+      if (p > size(path) - 2) {
         if (pruneLeaf?.(nodeOrLeaf)) {
           mapSet(node, path[p]);
         }
@@ -255,7 +255,7 @@ const getPoolFunctions = () => {
   return [
     (reuse) => (reuse ? arrayShift(pool) : null) ?? EMPTY_STRING + nextId++,
     (id) => {
-      if (test(INTEGER, id) && arrayLength(pool) < 1e3) {
+      if (test(INTEGER, id) && size(pool) < 1e3) {
         arrayPush(pool, id);
       }
     },
@@ -265,7 +265,7 @@ const getPoolFunctions = () => {
 const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
   const leaves = [];
   const deep = (node, p) =>
-    p == arrayLength(path)
+    p == size(path)
       ? arrayPush(leaves, node)
       : path[p] === null
       ? collForEach(node, (node2) => deep(node2, p + 1))
@@ -317,8 +317,8 @@ const getListenerFunctions = (getThing) => {
       mapGet(allListeners, id),
       ([listener, , path = [], pathGetters, extraArgsGetter]) => {
         const callWithIds = (...ids) => {
-          const index = arrayLength(ids);
-          index == arrayLength(path)
+          const index = size(ids);
+          index == size(path)
             ? listener(thing, ...ids, ...extraArgsGetter(ids))
             : isUndefined(path[index])
             ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>