tinybase 9.5.0 → 9.6.0-beta.1

package/omni/with-schemas/index.js

@@ -66,6 +66,7 @@ const CHANGE = 'change';
 const CONNECTION = 'connection';
 const STORAGE = 'storage';
 const REQUIRED = 'required';
+const M = 'm';
 const T = 't';
 const V = 'v';
 const UNDEFINED = '\uFFFC';
@@ -5152,9 +5153,11 @@ const escapeId = (str) =>
 const escapeIds = (...ids) => escapeId(arrayJoin(ids, '_'));
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const numberedPlaceholder = (offset) => '$' + offset[0]++;
+const anonymousPlaceholder = () => '?';
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -5167,7 +5170,7 @@ const STORE = 'store';
 const JSON$1 = 'json';
 const STORE_TABLE_NAME = STORE + 'TableName';
 const STORE_ID_COLUMN_NAME = STORE + 'Id' + COLUMN_NAME;
-const STORE_COLUMN_NAME = STORE + COLUMN_NAME;
+const STORE_COLUMN_NAME$1 = STORE + COLUMN_NAME;
 const AUTO_LOAD_INTERVAL_SECONDS = 'autoLoadIntervalSeconds';
 const ROW_ID_COLUMN_NAME = 'rowId' + COLUMN_NAME;
 const TABLE_ID = 'tableId';
@@ -5230,7 +5233,7 @@ const getConfigStructures = (configOrStoreTableName) => {
       [
         storeTableName,
         config[STORE_ID_COLUMN_NAME] ?? DEFAULT_ROW_ID_COLUMN_NAME,
-        config[STORE_COLUMN_NAME] ?? STORE,
+        config[STORE_COLUMN_NAME$1] ?? STORE,
       ],
       setNew(storeTableName),
     ];
@@ -5291,6 +5294,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -5501,7 +5505,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -5520,6 +5524,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -5553,13 +5558,14 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           rows,
+          getPlaceholder,
           currentColumnNames,
         );
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
             getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds)})`,
+            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
           deleteRowIds,
         );
       } else if (
@@ -5602,6 +5608,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -5615,7 +5622,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -5651,6 +5662,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -5662,6 +5674,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -5729,6 +5742,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -5740,6 +5754,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -6109,12 +6124,13 @@ const createCustomPostgreSqlPersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` c.table_name tn,c.column_name cn,CASE WHEN tc.constraint_type IN('PRIMARY KEY','UNIQUE')AND(${SELECT} count(*) FROM information_schema.key_column_usage kcu2 ${WHERE} kcu2.constraint_schema=kcu.constraint_schema AND kcu2.constraint_name=kcu.constraint_name)=1 THEN 1 ELSE 0 END uq FROM information_schema.columns c LEFT JOIN information_schema.key_column_usage kcu ON kcu.table_schema=c.table_schema AND kcu.table_name=c.table_name AND kcu.column_name=c.column_name LEFT JOIN information_schema.table_constraints tc ON tc.constraint_schema=kcu.constraint_schema AND tc.constraint_name=kcu.constraint_name ${WHERE} c.table_schema='public'AND c.table_name IN(${getPlaceholders(managedTableNames)})`,
+          ` c.table_name tn,c.column_name cn,CASE WHEN tc.constraint_type IN('PRIMARY KEY','UNIQUE')AND(${SELECT} count(*) FROM information_schema.key_column_usage kcu2 ${WHERE} kcu2.constraint_schema=kcu.constraint_schema AND kcu2.constraint_name=kcu.constraint_name)=1 THEN 1 ELSE 0 END uq FROM information_schema.columns c LEFT JOIN information_schema.key_column_usage kcu ON kcu.table_schema=c.table_schema AND kcu.table_name=c.table_name AND kcu.column_name=c.column_name LEFT JOIN information_schema.table_constraints tc ON tc.constraint_schema=kcu.constraint_schema AND tc.constraint_name=kcu.constraint_name ${WHERE} c.table_schema='public'AND c.table_name IN(${getPlaceholders(managedTableNames, numberedPlaceholder)})`,
         managedTableNames,
       ),
     thing,
     getThing,
     'text',
+    numberedPlaceholder,
     void 0,
     (cellOrValue) => jsonString(cellOrValue),
     (field) => jsonParse(field),
@@ -6257,12 +6273,13 @@ const createCustomSqlitePersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq FROM ${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames)})ORDER BY t.name,c.name`,
+          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq FROM ${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames, anonymousPlaceholder)})ORDER BY t.name,c.name`,
         managedTableNames,
       ),
     thing,
     getThing,
     EMPTY_STRING,
+    anonymousPlaceholder,
     upsert,
     (cellOrValue) =>
       isTrue(cellOrValue) ? 1 : isFalse(cellOrValue) ? 0 : cellOrValue,
@@ -6446,6 +6463,32 @@ const createAutomergePersister = (
   );
 };
 
+const createBetterSqlite3Persister = (
+  store,
+  db,
+  configOrStoreTableName,
+  onSqlCommand,
+  onIgnoredError,
+) =>
+  createCustomSqlitePersister(
+    store,
+    configOrStoreTableName,
+    async (sql, params = []) => {
+      const statement = db.prepare(sql);
+      return statement.reader
+        ? statement.all(...params)
+        : (statement.run(...params), []);
+    },
+    () => noop,
+    (unsubscribeFunction) => unsubscribeFunction(),
+    onSqlCommand,
+    onIgnoredError,
+    noop,
+    3,
+    // StoreOrMergeableStore,
+    db,
+  );
+
 const createStoragePersister = (
   store,
   storageName,
@@ -6521,6 +6564,34 @@ const createOpfsPersister = (store, handle, onIgnoredError) => {
   );
 };
 
+const RETURNS_ROWS = /^\s*(SELECT|PRAGMA)/i;
+const createCapacitorSqlitePersister = (
+  store,
+  db,
+  configOrStoreTableName,
+  onSqlCommand,
+  onIgnoredError,
+) =>
+  createCustomSqlitePersister(
+    store,
+    configOrStoreTableName,
+    async (sql, params = []) => {
+      if (test(RETURNS_ROWS, sql)) {
+        return (await db.query(sql, params)).values ?? [];
+      }
+      await db.run(sql, params, false);
+      return [];
+    },
+    () => noop,
+    (unsubscribeFunction) => unsubscribeFunction(),
+    onSqlCommand,
+    onIgnoredError,
+    noop,
+    3,
+    // StoreOrMergeableStore,
+    db,
+  );
+
 const createCrSqliteWasmPersister = (
   store,
   db,
@@ -6564,7 +6635,6 @@ const createDurableObjectSqlStoragePersister = (
     configOrStoreTableName,
     async (sql, params = []) => {
       if (!arrayHas(['BEGIN', 'END'], sql)) {
-        sql = strReplace(sql, /\$\d+/g, '?');
         return getSqlRows(sqlStorage, sql, ...params);
       }
       return [];
@@ -7080,7 +7150,10 @@ const createFilePersister = (store, filePath, onIgnoredError) => {
   );
 };
 
-const OBJECT_STORE_NAMES = [T, V];
+const CONTENT_OBJECT_STORE_NAMES = [T, V];
+const MERGEABLE_OBJECT_STORE_NAMES = [M];
+const OBJECT_STORE_NAMES = [...CONTENT_OBJECT_STORE_NAMES, M];
+const VERSION = 3;
 const KEY_PATH = {keyPath: 'k'};
 const objectStoreMatch = async (objectStore, obj) => {
   const actions = objToArray(obj, (v, k) =>
@@ -7106,6 +7179,7 @@ const createIndexedDbPersister = (
   onIgnoredError,
 ) => {
   const forObjectStores = async (
+    objectStoreNames,
     forObjectStore,
     params = [],
     create = 0,
@@ -7114,7 +7188,7 @@ const createIndexedDbPersister = (
     promiseNew((resolve, reject) => {
       const request = (WINDOW ? WINDOW.indexedDB : indexedDB).open(
         dbName,
-        create ? 2 : void 0,
+        create ? VERSION : void 0,
       );
       let blocked = 0;
       request.onupgradeneeded = () =>
@@ -7135,7 +7209,7 @@ const createIndexedDbPersister = (
               async () => {
                 request.result.onversionchange = () => request.result.close();
                 const transaction = request.result.transaction(
-                  OBJECT_STORE_NAMES,
+                  objectStoreNames,
                   mode,
                 );
                 const transactionComplete = promiseNew((resolve2, reject2) => {
@@ -7145,7 +7219,7 @@ const createIndexedDbPersister = (
                 });
                 const [result] = await promiseAll([
                   promiseAll(
-                    arrayMap(OBJECT_STORE_NAMES, (objectStoreName, index) =>
+                    arrayMap(objectStoreNames, (objectStoreName, index) =>
                       forObjectStore(
                         transaction.objectStore(objectStoreName),
                         params[index],
@@ -7164,22 +7238,45 @@ const createIndexedDbPersister = (
             );
       request.onerror = () => reject(errorNew(ERROR_INDEXED_DB_OPEN));
     });
-  const getPersisted = async () =>
-    await forObjectStores(async (objectStore) =>
-      objNew(
-        arrayMap(await execObjectStore(objectStore, 'getAll'), ({k, v}) => [
-          k,
-          v,
-        ]),
-      ),
+  const getObjectStoreEntries = async (objectStore) =>
+    objNew(
+      arrayMap(await execObjectStore(objectStore, 'getAll'), ({k, v}) => [
+        k,
+        v,
+      ]),
     );
-  const setPersisted = (getContent) =>
-    forObjectStores(
-      (objectStore, content) => objectStoreMatch(objectStore, content),
-      getContent(),
-      1,
-      'readwrite',
+  const getPersisted = async () => {
+    if (!store.isMergeable()) {
+      return await forObjectStores(
+        CONTENT_OBJECT_STORE_NAMES,
+        getObjectStoreEntries,
+      );
+    }
+    const [mergeable] = await forObjectStores(
+      MERGEABLE_OBJECT_STORE_NAMES,
+      getObjectStoreEntries,
     );
+    return objHas(mergeable, T) ? [mergeable[T], mergeable[V]] : void 0;
+  };
+  const setPersisted = async (getContent) => {
+    const content = getContent();
+    await (store.isMergeable()
+      ? forObjectStores(
+          MERGEABLE_OBJECT_STORE_NAMES,
+          (objectStore, mergeable) => objectStoreMatch(objectStore, mergeable),
+          [{[T]: content[0], [V]: content[1]}],
+          1,
+          'readwrite',
+        )
+      : forObjectStores(
+          CONTENT_OBJECT_STORE_NAMES,
+          (objectStore, tablesOrValues) =>
+            objectStoreMatch(objectStore, tablesOrValues),
+          content,
+          1,
+          'readwrite',
+        ));
+  };
   const addPersisterListener = (listener) =>
     getPersisted().then((content) => {
       let active = 1;
@@ -7222,8 +7319,8 @@ const createIndexedDbPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
-    // StoreOnly,
+    3,
+    // StoreOrMergeableStore,
     {getDbName: () => dbName},
   );
 };
@@ -7709,6 +7806,68 @@ class TinyBasePartyKitServer {
   }
 }
 
+const isPool = (pg) => !isUndefined(pg?.idleCount);
+const reserveClient = async (pg, onIgnoredError) => {
+  if (isPool(pg)) {
+    const client = await pg.connect();
+    client.on('error', onIgnoredError ?? noop);
+    return [client, (discard) => client.release(discard)];
+  }
+  return [pg, noop];
+};
+const getSerializer = () => {
+  let chain = promiseResolve();
+  return (action) => (chain = chain.then(action, action));
+};
+const createPgPersister = async (
+  store,
+  pg,
+  configOrStoreTableName,
+  onSqlCommand,
+  onIgnoredError,
+) => {
+  const [commandClient, releaseCommandClient] = await reserveClient(
+    pg,
+    onIgnoredError,
+  );
+  const serialize = getSerializer();
+  try {
+    return createCustomPostgreSqlPersister(
+      store,
+      configOrStoreTableName,
+      (sql, params = []) =>
+        serialize(async () => (await commandClient.query(sql, params)).rows),
+      async (channel, listener) => {
+        const handler = (notification) =>
+          notification.channel == channel ? listener(notification.payload) : 0;
+        const listenSql = escapeId(channel);
+        const [client, release] = await reserveClient(pg, onIgnoredError);
+        client.on('notification', handler);
+        await client.query('LISTEN ' + listenSql);
+        return async () => {
+          client.off('notification', handler);
+          if (isPool(pg)) {
+            release(true);
+          } else {
+            await client.query('UNLISTEN ' + listenSql);
+          }
+        };
+      },
+      (unlisten) => tryCatch(unlisten, onIgnoredError),
+      onSqlCommand,
+      onIgnoredError,
+      releaseCommandClient,
+      3,
+      // StoreOrMergeableStore,
+      pg,
+      'getPg',
+    );
+  } catch (error) {
+    releaseCommandClient();
+    throw error;
+  }
+};
+
 const createPglitePersister = async (
   store,
   pglite,
@@ -7810,14 +7969,17 @@ const powerSyncUpdateThenInsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
+  const updateOffset = [1];
   const assignments = arrayJoin(
     arrayMap(
       changingColumnNames,
-      (columnName, index) => escapeId(columnName) + '=$' + (index + 1),
+      (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 (
@@ -7830,8 +7992,8 @@ const powerSyncUpdateThenInsert = async (
             ' ' +
             WHERE +
             escapeId(rowIdColumnName) +
-            '=$' +
-            (size(row) + 1) +
+            '=' +
+            rowIdPlaceholder +
             ' RETURNING' +
             escapeId(rowIdColumnName),
           [...rowParams, id],
@@ -7846,7 +8008,7 @@ const powerSyncUpdateThenInsert = async (
           '(' +
           escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
           ')VALUES(' +
-          getPlaceholders([id, ...row], offset) +
+          getPlaceholders([id, ...row], getPlaceholder, offset) +
           ')',
         [id, ...rowParams],
       );
@@ -8110,6 +8272,75 @@ const createSqlite3Persister = (
     db,
   );
 
+const STORE_COLUMN_NAME = 'store';
+const PUBLIC_SCHEMA = 'public';
+const createSupabasePersister = (
+  store,
+  supabase,
+  configOrStoreTableName,
+  onIgnoredError,
+) => {
+  const config = isString(configOrStoreTableName)
+    ? {storeTableName: configOrStoreTableName}
+    : (configOrStoreTableName ?? {});
+  const storeTableName = config.storeTableName ?? TINYBASE;
+  const storeIdColumnName =
+    config.storeIdColumnName ?? DEFAULT_ROW_ID_COLUMN_NAME;
+  const storeColumnName = config.storeColumnName ?? STORE_COLUMN_NAME;
+  const {autoLoadIntervalSeconds} = config;
+  const getPersisted = async () => {
+    const {data, error} = await supabase
+      .from(storeTableName)
+      .select(storeColumnName)
+      .eq(storeIdColumnName, SINGLE_ROW_ID)
+      .maybeSingle();
+    if (error) {
+      throw error;
+    }
+    return jsonParseWithUndefined(data?.[storeColumnName] ?? 'null');
+  };
+  const setPersisted = async (getContent) => {
+    const {error} = await supabase.from(storeTableName).upsert(
+      {
+        [storeIdColumnName]: SINGLE_ROW_ID,
+        [storeColumnName]: jsonStringWithUndefined(getContent() ?? null),
+      },
+      {onConflict: storeIdColumnName},
+    );
+    if (error) {
+      throw error;
+    }
+  };
+  const addPersisterListener = (listener) => [
+    supabase
+      .channel(TINYBASE + '_' + storeTableName + '_' + getUniqueId())
+      .on(
+        'postgres_changes',
+        {event: '*', schema: PUBLIC_SCHEMA, table: storeTableName},
+        () => void listener(),
+      )
+      .subscribe((_status, error) => (error ? onIgnoredError?.(error) : 0)),
+    isUndefined(autoLoadIntervalSeconds)
+      ? void 0
+      : startInterval(() => void listener(), autoLoadIntervalSeconds),
+  ];
+  const delPersisterListener = async ([channel, interval]) => {
+    stopInterval(interval);
+    await supabase.removeChannel(channel);
+  };
+  return createCustomPersister(
+    store,
+    getPersisted,
+    setPersisted,
+    addPersisterListener,
+    delPersisterListener,
+    onIgnoredError,
+    3,
+    // StoreOrMergeableStore,
+    {getSupabase: () => supabase},
+  );
+};
+
 const DELETE = 'delete';
 const getYMap = (yMap) =>
   yMap instanceof Map$1 ? yMap : errorThrow(ERROR_CONTENT);
@@ -12424,7 +12655,9 @@ export {
   addOrRemoveHash,
   broadcastChanges,
   createAutomergePersister,
+  createBetterSqlite3Persister,
   createBroadcastChannelSynchronizer,
+  createCapacitorSqlitePersister,
   createCheckpoints,
   createCrSqliteWasmPersister,
   createCustomPersister,
@@ -12447,6 +12680,7 @@ export {
   createOpfsPersister,
   createPartyKitPersister,
   createPglitePersister,
+  createPgPersister,
   createPostgresPersister,
   createPowerSyncPersister,
   createQueries,
@@ -12459,6 +12693,7 @@ export {
   createSqliteBunPersister,
   createSqliteWasmPersister,
   createStore,
+  createSupabasePersister,
   createWsServer,
   createWsServerSimple,
   createWsSynchronizer,