tinybase 6.0.0 → 6.1.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinybase",
-  "version": "6.0.0",
+  "version": "6.1.0-beta.1",
   "author": "jamesgpearce",
   "repository": "github:tinyplex/tinybase",
   "license": "MIT",
@@ -80,9 +80,6 @@
     "postgres": {
       "optional": true
     },
-    "prettier": {
-      "optional": true
-    },
     "react": {
       "optional": true
     },

package/persisters/index.js

@@ -434,6 +434,13 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
+const jsonString = JSON.stringify;
+const jsonParse = JSON.parse;
+const jsonStringWithUndefined = (obj) =>
+  jsonString(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+
 const SINGLE_ROW_ID = '_';
 const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
 const SELECT = 'SELECT';
@@ -567,13 +574,6 @@ const getConfigStructures = (configOrStoreTableName) => {
   return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
 };
 
-const jsonString = JSON.stringify;
-const jsonParse = JSON.parse;
-const jsonStringWithUndefined = (obj) =>
-  jsonString(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
-const jsonParseWithUndefined = (str) =>
-  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
-
 const getCommandFunctions = (
   databaseExecuteCommand,
   managedTableNames,
@@ -1023,94 +1023,6 @@ const createTabularPersister = (
   return persister;
 };
 
-const createCustomSqlitePersister = (
-  store,
-  configOrStoreTableName,
-  rawExecuteCommand,
-  addChangeListener,
-  delChangeListener,
-  onSqlCommand,
-  onIgnoredError,
-  destroy,
-  persist,
-  thing,
-  getThing = 'getDb',
-  upsert,
-) => {
-  let dataVersion;
-  let schemaVersion;
-  let totalChanges;
-  const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
-  const [
-    isJson,
-    autoLoadIntervalSeconds,
-    defaultedConfig,
-    managedTableNamesSet,
-  ] = getConfigStructures(configOrStoreTableName);
-  const addPersisterListener = (listener) => {
-    let interval;
-    const startPolling = () =>
-      (interval = startInterval(async () => {
-        try {
-          const [{d, s, c}] = await executeCommand(
-            // eslint-disable-next-line max-len
-            `${SELECT} ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-          );
-          if (d != dataVersion || s != schemaVersion || c != totalChanges) {
-            if (dataVersion != null) {
-              listener();
-            }
-            dataVersion = d;
-            schemaVersion = s;
-            totalChanges = c;
-          }
-        } catch {}
-      }, autoLoadIntervalSeconds));
-    const stopPolling = () => {
-      dataVersion = schemaVersion = totalChanges = null;
-      stopInterval(interval);
-    };
-    const listeningHandle = addChangeListener((tableName) => {
-      if (managedTableNamesSet.has(tableName)) {
-        stopPolling();
-        listener();
-        startPolling();
-      }
-    });
-    startPolling();
-    return () => {
-      stopPolling();
-      delChangeListener(listeningHandle);
-    };
-  };
-  const delPersisterListener = (stopPollingAndDelUpdateListener) =>
-    stopPollingAndDelUpdateListener();
-  return (isJson ? createJsonPersister : createTabularPersister)(
-    store,
-    executeCommand,
-    addPersisterListener,
-    delPersisterListener,
-    onIgnoredError,
-    destroy,
-    persist,
-    defaultedConfig,
-    collValues(managedTableNamesSet),
-    async (executeCommand2, managedTableNames) =>
-      await executeCommand2(
-        // eslint-disable-next-line max-len
-        `${SELECT} t.name tn,c.name cn ${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`,
-        managedTableNames,
-      ),
-    thing,
-    getThing,
-    EMPTY_STRING,
-    upsert,
-    (cellOrValue) =>
-      cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
-    void 0,
-  );
-};
-
 const EVENT_CHANNEL = TINYBASE;
 const EVENT_REGEX = /^([cd]:)(.+)/;
 const CHANGE_DATA_TRIGGER = TINYBASE + '_data';
@@ -1204,6 +1116,94 @@ const createCustomPostgreSqlPersister = (
   );
 };
 
+const createCustomSqlitePersister = (
+  store,
+  configOrStoreTableName,
+  rawExecuteCommand,
+  addChangeListener,
+  delChangeListener,
+  onSqlCommand,
+  onIgnoredError,
+  destroy,
+  persist,
+  thing,
+  getThing = 'getDb',
+  upsert,
+) => {
+  let dataVersion;
+  let schemaVersion;
+  let totalChanges;
+  const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
+  const [
+    isJson,
+    autoLoadIntervalSeconds,
+    defaultedConfig,
+    managedTableNamesSet,
+  ] = getConfigStructures(configOrStoreTableName);
+  const addPersisterListener = (listener) => {
+    let interval;
+    const startPolling = () =>
+      (interval = startInterval(async () => {
+        try {
+          const [{d, s, c}] = await executeCommand(
+            // eslint-disable-next-line max-len
+            `${SELECT} ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
+          );
+          if (d != dataVersion || s != schemaVersion || c != totalChanges) {
+            if (dataVersion != null) {
+              listener();
+            }
+            dataVersion = d;
+            schemaVersion = s;
+            totalChanges = c;
+          }
+        } catch {}
+      }, autoLoadIntervalSeconds));
+    const stopPolling = () => {
+      dataVersion = schemaVersion = totalChanges = null;
+      stopInterval(interval);
+    };
+    const listeningHandle = addChangeListener((tableName) => {
+      if (managedTableNamesSet.has(tableName)) {
+        stopPolling();
+        listener();
+        startPolling();
+      }
+    });
+    startPolling();
+    return () => {
+      stopPolling();
+      delChangeListener(listeningHandle);
+    };
+  };
+  const delPersisterListener = (stopPollingAndDelUpdateListener) =>
+    stopPollingAndDelUpdateListener();
+  return (isJson ? createJsonPersister : createTabularPersister)(
+    store,
+    executeCommand,
+    addPersisterListener,
+    delPersisterListener,
+    onIgnoredError,
+    destroy,
+    persist,
+    defaultedConfig,
+    collValues(managedTableNamesSet),
+    async (executeCommand2, managedTableNames) =>
+      await executeCommand2(
+        // eslint-disable-next-line max-len
+        `${SELECT} t.name tn,c.name cn ${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`,
+        managedTableNames,
+      ),
+    thing,
+    getThing,
+    EMPTY_STRING,
+    upsert,
+    (cellOrValue) =>
+      cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
+    void 0,
+  );
+};
+
 export {
   Persists,
   Status,

package/persisters/with-schemas/index.js

@@ -434,6 +434,13 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
+const jsonString = JSON.stringify;
+const jsonParse = JSON.parse;
+const jsonStringWithUndefined = (obj) =>
+  jsonString(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+
 const SINGLE_ROW_ID = '_';
 const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
 const SELECT = 'SELECT';
@@ -567,13 +574,6 @@ const getConfigStructures = (configOrStoreTableName) => {
   return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
 };
 
-const jsonString = JSON.stringify;
-const jsonParse = JSON.parse;
-const jsonStringWithUndefined = (obj) =>
-  jsonString(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
-const jsonParseWithUndefined = (str) =>
-  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
-
 const getCommandFunctions = (
   databaseExecuteCommand,
   managedTableNames,
@@ -1023,94 +1023,6 @@ const createTabularPersister = (
   return persister;
 };
 
-const createCustomSqlitePersister = (
-  store,
-  configOrStoreTableName,
-  rawExecuteCommand,
-  addChangeListener,
-  delChangeListener,
-  onSqlCommand,
-  onIgnoredError,
-  destroy,
-  persist,
-  thing,
-  getThing = 'getDb',
-  upsert,
-) => {
-  let dataVersion;
-  let schemaVersion;
-  let totalChanges;
-  const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
-  const [
-    isJson,
-    autoLoadIntervalSeconds,
-    defaultedConfig,
-    managedTableNamesSet,
-  ] = getConfigStructures(configOrStoreTableName);
-  const addPersisterListener = (listener) => {
-    let interval;
-    const startPolling = () =>
-      (interval = startInterval(async () => {
-        try {
-          const [{d, s, c}] = await executeCommand(
-            // eslint-disable-next-line max-len
-            `${SELECT} ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-          );
-          if (d != dataVersion || s != schemaVersion || c != totalChanges) {
-            if (dataVersion != null) {
-              listener();
-            }
-            dataVersion = d;
-            schemaVersion = s;
-            totalChanges = c;
-          }
-        } catch {}
-      }, autoLoadIntervalSeconds));
-    const stopPolling = () => {
-      dataVersion = schemaVersion = totalChanges = null;
-      stopInterval(interval);
-    };
-    const listeningHandle = addChangeListener((tableName) => {
-      if (managedTableNamesSet.has(tableName)) {
-        stopPolling();
-        listener();
-        startPolling();
-      }
-    });
-    startPolling();
-    return () => {
-      stopPolling();
-      delChangeListener(listeningHandle);
-    };
-  };
-  const delPersisterListener = (stopPollingAndDelUpdateListener) =>
-    stopPollingAndDelUpdateListener();
-  return (isJson ? createJsonPersister : createTabularPersister)(
-    store,
-    executeCommand,
-    addPersisterListener,
-    delPersisterListener,
-    onIgnoredError,
-    destroy,
-    persist,
-    defaultedConfig,
-    collValues(managedTableNamesSet),
-    async (executeCommand2, managedTableNames) =>
-      await executeCommand2(
-        // eslint-disable-next-line max-len
-        `${SELECT} t.name tn,c.name cn ${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`,
-        managedTableNames,
-      ),
-    thing,
-    getThing,
-    EMPTY_STRING,
-    upsert,
-    (cellOrValue) =>
-      cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
-    void 0,
-  );
-};
-
 const EVENT_CHANNEL = TINYBASE;
 const EVENT_REGEX = /^([cd]:)(.+)/;
 const CHANGE_DATA_TRIGGER = TINYBASE + '_data';
@@ -1204,6 +1116,94 @@ const createCustomPostgreSqlPersister = (
   );
 };
 
+const createCustomSqlitePersister = (
+  store,
+  configOrStoreTableName,
+  rawExecuteCommand,
+  addChangeListener,
+  delChangeListener,
+  onSqlCommand,
+  onIgnoredError,
+  destroy,
+  persist,
+  thing,
+  getThing = 'getDb',
+  upsert,
+) => {
+  let dataVersion;
+  let schemaVersion;
+  let totalChanges;
+  const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
+  const [
+    isJson,
+    autoLoadIntervalSeconds,
+    defaultedConfig,
+    managedTableNamesSet,
+  ] = getConfigStructures(configOrStoreTableName);
+  const addPersisterListener = (listener) => {
+    let interval;
+    const startPolling = () =>
+      (interval = startInterval(async () => {
+        try {
+          const [{d, s, c}] = await executeCommand(
+            // eslint-disable-next-line max-len
+            `${SELECT} ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
+          );
+          if (d != dataVersion || s != schemaVersion || c != totalChanges) {
+            if (dataVersion != null) {
+              listener();
+            }
+            dataVersion = d;
+            schemaVersion = s;
+            totalChanges = c;
+          }
+        } catch {}
+      }, autoLoadIntervalSeconds));
+    const stopPolling = () => {
+      dataVersion = schemaVersion = totalChanges = null;
+      stopInterval(interval);
+    };
+    const listeningHandle = addChangeListener((tableName) => {
+      if (managedTableNamesSet.has(tableName)) {
+        stopPolling();
+        listener();
+        startPolling();
+      }
+    });
+    startPolling();
+    return () => {
+      stopPolling();
+      delChangeListener(listeningHandle);
+    };
+  };
+  const delPersisterListener = (stopPollingAndDelUpdateListener) =>
+    stopPollingAndDelUpdateListener();
+  return (isJson ? createJsonPersister : createTabularPersister)(
+    store,
+    executeCommand,
+    addPersisterListener,
+    delPersisterListener,
+    onIgnoredError,
+    destroy,
+    persist,
+    defaultedConfig,
+    collValues(managedTableNamesSet),
+    async (executeCommand2, managedTableNames) =>
+      await executeCommand2(
+        // eslint-disable-next-line max-len
+        `${SELECT} t.name tn,c.name cn ${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`,
+        managedTableNames,
+      ),
+    thing,
+    getThing,
+    EMPTY_STRING,
+    upsert,
+    (cellOrValue) =>
+      cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
+    void 0,
+  );
+};
+
 export {
   Persists,
   Status,