tinybase 10.0.0-beta.0 → 10.0.0-beta.2

package/omni/with-schemas/index.js

@@ -1012,7 +1012,8 @@ const createCheckpoints = getCreateFunction(
                 cellOrValueIsEqual(oldNew[0], newCell) &&
                 collIsEmpty(mapSet(row, cellId)) &&
                 collIsEmpty(mapSet(table, rowId)) &&
-                collIsEmpty(mapSet(cellsDelta, tableId))
+                collIsEmpty(mapSet(cellsDelta, tableId)) &&
+                collIsEmpty(valuesDelta)
               ) {
                 storeUnchanged();
               }
@@ -1032,7 +1033,8 @@ const createCheckpoints = getCreateFunction(
               oldNew[1] = newValue;
               if (
                 cellOrValueIsEqual(oldNew[0], newValue) &&
-                collIsEmpty(mapSet(valuesDelta, valueId))
+                collIsEmpty(mapSet(valuesDelta, valueId)) &&
+                collIsEmpty(cellsDelta)
               ) {
                 storeUnchanged();
               }
@@ -4274,7 +4276,8 @@ const numericAggregators = mapNew([
     [
       (numbers, length) => arraySum(numbers) / length,
       (metric, add, length) => metric + (add - metric) / (length + 1),
-      (metric, remove, length) => metric + (metric - remove) / (length - 1),
+      (metric, remove, length) =>
+        length > 1 ? metric + (metric - remove) / (length - 1) : void 0,
       (metric, add, remove, length) => metric + (add - remove) / length,
     ],
   ],
@@ -5160,10 +5163,74 @@ const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
     arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
-const getWhereCondition = (tableName, condition = TRUE) =>
-  WHERE + `(${replaceTableName(condition, escapeId(tableName))})`;
+const getWhere = (tableName, condition = TRUE, extraCondition) => {
+  const conditions = arrayFilter(
+    [
+      condition == TRUE
+        ? void 0
+        : `(${replaceTableName(condition, escapeId(tableName))})`,
+      extraCondition,
+    ],
+    (condition2) => !isUndefined(condition2),
+  );
+  return isEmpty(conditions)
+    ? EMPTY_STRING
+    : WHERE + arrayJoin(conditions, 'AND');
+};
 const replaceTableName = (condition, tableName) =>
   strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
+const updateThenInsertUpsert = async (
+  executeCommand,
+  tableName,
+  rowIdColumnName,
+  changingColumnNames,
+  rows,
+  getPlaceholder,
+) => {
+  const updateOffset = [1];
+  const assignments = arrayJoin(
+    arrayMap(
+      changingColumnNames,
+      (columnName) => escapeId(columnName) + '=' + getPlaceholder(updateOffset),
+    ),
+    COMMA,
+  );
+  const rowIdPlaceholder = getPlaceholder(updateOffset);
+  for (const [id, row] of objToArray(rows, (row2, id2) => [id2, row2])) {
+    const rowParams = arrayMap(row, (value) => value ?? null);
+    if (
+      isEmpty(
+        await executeCommand(
+          UPDATE +
+            escapeId(tableName) +
+            ' SET' +
+            assignments +
+            ' ' +
+            WHERE +
+            escapeId(rowIdColumnName) +
+            '=' +
+            rowIdPlaceholder +
+            ' RETURNING' +
+            escapeId(rowIdColumnName),
+          [...rowParams, id],
+        ),
+      )
+    ) {
+      const offset = [1];
+      await executeCommand(
+        INSERT +
+          ' INTO' +
+          escapeId(tableName) +
+          '(' +
+          escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
+          ')VALUES(' +
+          getPlaceholders([id, ...row], getPlaceholder, offset) +
+          ')',
+        [id, ...rowParams],
+      );
+    }
+  }
+};
 
 const COLUMN_NAME = 'ColumnName';
 const STORE = 'store';
@@ -5336,7 +5403,7 @@ const getCommandFunctions = (
               await executeCommand(
                 SELECT_STAR_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition),
+                  getWhere(tableName, condition),
               ),
               (row) => {
                 const rowId = row[rowIdColumnName];
@@ -5492,9 +5559,7 @@ const getCommandFunctions = (
       if (isUndefined(content)) {
         if (isUndefined(contentSubIdSet)) {
           await executeCommand(
-            DELETE_FROM +
-              escapeId(tableName) +
-              getWhereCondition(tableName, condition),
+            DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
           );
         }
       } else {
@@ -5504,8 +5569,11 @@ const getCommandFunctions = (
               await executeCommand(
                 DELETE_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  getWhere(
+                    tableName,
+                    condition,
+                    `(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  ),
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -5564,8 +5632,12 @@ const getCommandFunctions = (
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
-            getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            getWhere(
+              tableName,
+              condition,
+              // eslint-disable-next-line max-len
+              `${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            ),
           deleteRowIds,
         );
       } else if (
@@ -5573,9 +5645,7 @@ const getCommandFunctions = (
         collHas(schemaMap, tableName)
       ) {
         await executeCommand(
-          DELETE_FROM +
-            escapeId(tableName) +
-            getWhereCondition(tableName, condition),
+          DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
         );
       }
     }
@@ -7346,30 +7416,28 @@ const createLibSqlPersister = (
     client,
     'getClient',
     void 0,
-    client.protocol == 'file'
-      ? void 0
-      : async (actions) => {
-          onSqlCommand?.('BEGIN');
-          const transaction = await client.transaction('write');
-          return await tryFinallyAsync(
-            async () => {
-              try {
-                const result = await actions(async (sql, args = []) => {
-                  onSqlCommand?.(sql, args);
-                  return (await transaction.execute({sql, args})).rows;
-                });
-                await transaction.commit();
-                onSqlCommand?.('END');
-                return result;
-              } catch (error) {
-                await tryCatch(() => transaction.rollback());
-                onSqlCommand?.('ROLLBACK');
-                throw error;
-              }
-            },
-            () => transaction.close(),
-          );
+    async (actions) => {
+      onSqlCommand?.('BEGIN');
+      const transaction = await client.transaction('write');
+      return await tryFinallyAsync(
+        async () => {
+          try {
+            const result = await actions(async (sql, args) => {
+              onSqlCommand?.(sql, args);
+              return (await transaction.execute({sql, args: args ?? []})).rows;
+            });
+            await transaction.commit();
+            onSqlCommand?.('END');
+            return result;
+          } catch (error) {
+            await tryCatch(() => transaction.rollback());
+            onSqlCommand?.('ROLLBACK');
+            throw error;
+          }
         },
+        () => transaction.close(),
+      );
+    },
   );
 
 const SET_CHANGES = 's';
@@ -7960,60 +8028,8 @@ const createPowerSyncPersister = (
     // StoreOnly,
     powerSync,
     'getPowerSync',
-    powerSyncUpdateThenInsert,
-  );
-};
-const powerSyncUpdateThenInsert = async (
-  executeCommand,
-  tableName,
-  rowIdColumnName,
-  changingColumnNames,
-  rows,
-  getPlaceholder,
-) => {
-  const updateOffset = [1];
-  const assignments = arrayJoin(
-    arrayMap(
-      changingColumnNames,
-      (columnName) => escapeId(columnName) + '=' + getPlaceholder(updateOffset),
-    ),
-    COMMA,
+    updateThenInsertUpsert,
   );
-  const rowIdPlaceholder = getPlaceholder(updateOffset);
-  for (const [id, row] of objToArray(rows, (row2, id2) => [id2, row2])) {
-    const rowParams = arrayMap(row, (value) => value ?? null);
-    if (
-      isEmpty(
-        await executeCommand(
-          UPDATE +
-            escapeId(tableName) +
-            ' SET' +
-            assignments +
-            ' ' +
-            WHERE +
-            escapeId(rowIdColumnName) +
-            '=' +
-            rowIdPlaceholder +
-            ' RETURNING' +
-            escapeId(rowIdColumnName),
-          [...rowParams, id],
-        ),
-      )
-    ) {
-      const offset = [1];
-      await executeCommand(
-        INSERT +
-          ' INTO' +
-          escapeId(tableName) +
-          '(' +
-          escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
-          ')VALUES(' +
-          getPlaceholders([id, ...row], getPlaceholder, offset) +
-          ')',
-        [id, ...rowParams],
-      );
-    }
-  }
 };
 
 const createReactNativeMmkvPersister = (
@@ -8362,6 +8378,70 @@ const createSupabasePersister = (
   );
 };
 
+const LIMIT_0 = 'LIMIT 0';
+const createTinyJoinPersister = (
+  store,
+  tinyJoin,
+  configOrStoreTableName,
+  onSqlCommand,
+  onIgnoredError,
+) => {
+  const executeCommand = getWrappedCommand(
+    async (sql, params = []) => (await tinyJoin.query(sql, params)).rows,
+    onSqlCommand,
+  );
+  const [isJson, , defaultedConfig, managedTableNamesSet] = getConfigStructures(
+    configOrStoreTableName,
+  );
+  if (!isJson && store.isMergeable()) {
+    errorThrow(ERROR_STORE_TYPE);
+  }
+  const managedTableNames = collValues(managedTableNamesSet);
+  const querySchema = async () => {
+    const schema = [];
+    await promiseAll(
+      arrayMap(managedTableNames, async (tn) => {
+        const sql = SELECT_STAR_FROM + escapeId(tn) + LIMIT_0;
+        onSqlCommand?.(sql);
+        await tryCatchIgnore(async () =>
+          arrayForEach((await tinyJoin.query(sql)).fields, ({name}) =>
+            arrayPush(schema, {tn, cn: name}),
+          ),
+        );
+      }),
+    );
+    return schema;
+  };
+  const addPersisterListener = (listener) =>
+    tinyJoin.subscribe(
+      {tables: managedTableNames},
+      () => void tryCatchIgnore(listener, onIgnoredError),
+    );
+  const delPersisterListener = (unsubscribe) => unsubscribe();
+  const executeTransaction = (actions) => actions(executeCommand);
+  return (isJson ? createJsonPersister : createTabularPersister)(
+    store,
+    executeCommand,
+    addPersisterListener,
+    delPersisterListener,
+    onIgnoredError,
+    noop,
+    3,
+    // StoreOrMergeableStore,
+    defaultedConfig,
+    managedTableNames,
+    querySchema,
+    tinyJoin,
+    'getTinyJoin',
+    'text',
+    numberedPlaceholder,
+    updateThenInsertUpsert,
+    (cellOrValue) => jsonString(cellOrValue),
+    (field) => jsonParse(field),
+    executeTransaction,
+  );
+};
+
 const DELETE = 'delete';
 const getYMap = (yMap) =>
   yMap instanceof Map$1 ? yMap : errorThrow(ERROR_CONTENT);
@@ -9737,11 +9817,21 @@ const createRelationships = getCreateFunction((store) => {
     remoteTableId,
     getRemoteRowId2,
   ) => {
+    mapForEach(mapGet(linkedRowIdsListeners, relationshipId), (firstRowId) =>
+      getLinkedRowIdsCache(relationshipId, firstRowId),
+    );
     mapSet(remoteTableIds, relationshipId, remoteTableId);
     setDefinitionAndListen(
       relationshipId,
       localTableId,
-      (change, changedRemoteRowIds) => {
+      (
+        change,
+        changedRemoteRowIds,
+        _changedSortKeys,
+        _rowValues,
+        _sortKeys,
+        force,
+      ) => {
         const changedLocalRows = setNew();
         const changedRemoteRows = setNew();
         const changedLinkedRows = setNew();
@@ -9786,6 +9876,26 @@ const createRelationships = getCreateFunction((store) => {
           },
         );
         change();
+        if (force) {
+          mapForEach(
+            mapGet(linkedRowIdsListeners, relationshipId),
+            (firstRowId) => {
+              const oldLinkedRowIds = getLinkedRowIds(
+                relationshipId,
+                firstRowId,
+              );
+              delLinkedRowIdsCache(relationshipId, firstRowId);
+              if (
+                !arrayIsEqual(
+                  oldLinkedRowIds,
+                  getLinkedRowIds(relationshipId, firstRowId),
+                )
+              ) {
+                setAdd(changedLinkedRows, firstRowId);
+              }
+            },
+          );
+        }
         collForEach(changedLocalRows, (localRowId) =>
           callListeners(remoteRowIdListeners, [relationshipId, localRowId]),
         );
@@ -10810,7 +10920,7 @@ const createLocalSynchronizer = (store, onSend, onReceive, onIgnoredError) => {
     send,
     registerReceive,
     destroy,
-    0.01,
+    0.05,
     onSend,
     onReceive,
     onIgnoredError,
@@ -12716,6 +12826,7 @@ export {
   createSqliteWasmPersister,
   createStore,
   createSupabasePersister,
+  createTinyJoinPersister,
   createWsServer,
   createWsServerSimple,
   createWsSynchronizer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinybase",
-  "version": "10.0.0-beta.0",
+  "version": "10.0.0-beta.2",
   "author": "jamesgpearce",
   "repository": {
     "type": "git",
@@ -35,36 +35,37 @@
   "peerDependencies": {
     "@automerge/automerge-repo": "^2.5.6",
     "@capacitor-community/sqlite": "^8.1.1",
-    "@cloudflare/workers-types": "^5.20260902.1",
+    "@cloudflare/workers-types": "^5.20260911.1",
     "@electric-sql/pglite": "^0.5.8",
-    "@libsql/client": "^0.17.4",
-    "@powersync/common": "^2.2.0",
+    "@libsql/client": "^0.18.0",
+    "@powersync/common": "^2.2.1",
     "@sinclair/typebox": "^0.34.52",
-    "@sqlite.org/sqlite-wasm": "^3.53.0-build1",
-    "@supabase/supabase-js": "^2.114.0",
+    "@sqlite.org/sqlite-wasm": "^3.53.4-build1",
+    "@supabase/supabase-js": "^2.116.0",
     "@vlcn.io/crsqlite-wasm": "^0.16.0",
     "arktype": "^2.2.3",
     "better-sqlite3": "^13.0.3",
-    "bun": "^1.4.0",
-    "effect": "^3.22.1",
+    "bun": "^1.4.2",
+    "effect": "^3.22.2",
     "electric-sql": "^0.12.1",
-    "expo": "^57.0.19",
-    "expo-sqlite": "^57.0.2",
+    "expo": "^57.0.22",
+    "expo-sqlite": "^57.0.3",
     "partykit": "^0.0.115",
     "partysocket": "^1.3.0",
     "pg": "^8.23.0",
     "postgres": "^3.4.9",
-    "react": "^19.2.8",
-    "react-dom": "^19.2.8",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
     "react-native-mmkv": "^4.3.2",
     "react-native-sqlite-storage": "^6.0.1",
     "solid-js": "^1.9.15",
     "sqlite3": "^6.0.1",
     "svelte": "^5.57.0",
-    "valibot": "^1.4.2",
+    "tinyjoin": "^0.1.0",
+    "valibot": "^1.5.0",
     "ws": "^8.21.3",
     "yjs": "^13.6.32",
-    "zod": "^4.5.4"
+    "zod": "^4.6.2"
   },
   "peerDependenciesMeta": {
     "@automerge/automerge-repo": {
@@ -151,6 +152,9 @@
     "svelte": {
       "optional": true
     },
+    "tinyjoin": {
+      "optional": true
+    },
     "valibot": {
       "optional": true
     },
@@ -384,6 +388,12 @@
       "persisters/persister-supabase/with-schemas": [
         "./@types/persisters/persister-supabase/with-schemas/index.d.ts"
       ],
+      "persisters/persister-tinyjoin": [
+        "./@types/persisters/persister-tinyjoin/index.d.ts"
+      ],
+      "persisters/persister-tinyjoin/with-schemas": [
+        "./@types/persisters/persister-tinyjoin/with-schemas/index.d.ts"
+      ],
       "persisters/persister-yjs": [
         "./@types/persisters/persister-yjs/index.d.ts"
       ],
@@ -762,6 +772,12 @@
       "min/persisters/persister-supabase/with-schemas": [
         "./@types/persisters/persister-supabase/with-schemas/index.d.ts"
       ],
+      "min/persisters/persister-tinyjoin": [
+        "./@types/persisters/persister-tinyjoin/index.d.ts"
+      ],
+      "min/persisters/persister-tinyjoin/with-schemas": [
+        "./@types/persisters/persister-tinyjoin/with-schemas/index.d.ts"
+      ],
       "min/persisters/persister-yjs": [
         "./@types/persisters/persister-yjs/index.d.ts"
       ],
@@ -1353,6 +1369,18 @@
         "default": "./persisters/persister-supabase/index.js"
       }
     },
+    "./persisters/persister-tinyjoin": {
+      "default": {
+        "types": "./@types/persisters/persister-tinyjoin/index.d.ts",
+        "default": "./persisters/persister-tinyjoin/index.js"
+      }
+    },
+    "./persisters/persister-tinyjoin/with-schemas": {
+      "default": {
+        "types": "./@types/persisters/persister-tinyjoin/with-schemas/index.d.ts",
+        "default": "./persisters/persister-tinyjoin/index.js"
+      }
+    },
     "./persisters/persister-yjs": {
       "default": {
         "types": "./@types/persisters/persister-yjs/index.d.ts",
@@ -2093,6 +2121,18 @@
         "default": "./min/persisters/persister-supabase/index.js"
       }
     },
+    "./min/persisters/persister-tinyjoin": {
+      "default": {
+        "types": "./@types/persisters/persister-tinyjoin/index.d.ts",
+        "default": "./min/persisters/persister-tinyjoin/index.js"
+      }
+    },
+    "./min/persisters/persister-tinyjoin/with-schemas": {
+      "default": {
+        "types": "./@types/persisters/persister-tinyjoin/with-schemas/index.d.ts",
+        "default": "./min/persisters/persister-tinyjoin/index.js"
+      }
+    },
     "./min/persisters/persister-yjs": {
       "default": {
         "types": "./@types/persisters/persister-yjs/index.d.ts",

package/persisters/index.js

@@ -883,8 +883,20 @@ const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
     arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
-const getWhereCondition = (tableName, condition = TRUE) =>
-  WHERE + `(${replaceTableName(condition, escapeId(tableName))})`;
+const getWhere = (tableName, condition = TRUE, extraCondition) => {
+  const conditions = arrayFilter(
+    [
+      condition == TRUE
+        ? void 0
+        : `(${replaceTableName(condition, escapeId(tableName))})`,
+      extraCondition,
+    ],
+    (condition2) => !isUndefined(condition2),
+  );
+  return isEmpty(conditions)
+    ? EMPTY_STRING
+    : WHERE + arrayJoin(conditions, 'AND');
+};
 const replaceTableName = (condition, tableName) =>
   strReplace(condition, TABLE_NAME_PLACEHOLDER_REGEX, tableName);
 
@@ -1059,7 +1071,7 @@ const getCommandFunctions = (
               await executeCommand(
                 SELECT_STAR_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition),
+                  getWhere(tableName, condition),
               ),
               (row) => {
                 const rowId = row[rowIdColumnName];
@@ -1215,9 +1227,7 @@ const getCommandFunctions = (
       if (isUndefined(content)) {
         if (isUndefined(contentSubIdSet)) {
           await executeCommand(
-            DELETE_FROM +
-              escapeId(tableName) +
-              getWhereCondition(tableName, condition),
+            DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
           );
         }
       } else {
@@ -1227,8 +1237,11 @@ const getCommandFunctions = (
               await executeCommand(
                 DELETE_FROM +
                   escapeId(tableName) +
-                  getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  getWhere(
+                    tableName,
+                    condition,
+                    `(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
+                  ),
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1287,8 +1300,12 @@ const getCommandFunctions = (
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
-            getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            getWhere(
+              tableName,
+              condition,
+              // eslint-disable-next-line max-len
+              `${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
+            ),
           deleteRowIds,
         );
       } else if (
@@ -1296,9 +1313,7 @@ const getCommandFunctions = (
         collHas(schemaMap, tableName)
       ) {
         await executeCommand(
-          DELETE_FROM +
-            escapeId(tableName) +
-            getWhereCondition(tableName, condition),
+          DELETE_FROM + escapeId(tableName) + getWhere(tableName, condition),
         );
       }
     }