tinybase 8.5.0 → 9.0.0-beta.0

package/persisters/with-schemas/index.js

@@ -49,6 +49,7 @@ const tryCatch = async (action, then1, then2) => {
   }
 };
 
+const arrayHas = (array, value) => array.includes(value);
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
@@ -579,6 +580,8 @@ const DEFAULT_TABULAR_VALUES_CONFIG = {
   save: 0,
   [TABLE_NAME]: TINYBASE + '_values',
 };
+const getValuesIn = (config) => (isArray(config) ? config : void 0);
+const hasValues = (config) => isTrue(config) || isArray(config);
 const getDefaultedConfig = (configOrStoreTableName) =>
   objMerge(
     DEFAULT_CONFIG,
@@ -629,11 +632,15 @@ const getConfigStructures = (configOrStoreTableName) => {
     ];
   }
   const {tables: {load = {}, save = {}} = {}, values = {}} = config;
-  const valuesConfig = slice(
-    objValues(objMerge(DEFAULT_TABULAR_VALUES_CONFIG, values)),
-    0,
-    objSize(DEFAULT_TABULAR_VALUES_CONFIG),
-  );
+  const valuesConfigObj = objMerge(DEFAULT_TABULAR_VALUES_CONFIG, values);
+  const {load: valuesLoad, save: valuesSave} = valuesConfigObj;
+  const valuesConfig = [
+    hasValues(valuesLoad),
+    hasValues(valuesSave),
+    valuesConfigObj[TABLE_NAME],
+    getValuesIn(valuesLoad),
+    getValuesIn(valuesSave),
+  ];
   const valuesTable = valuesConfig[2];
   const managedTableNames = setNew(valuesTable);
   const excludedTableNames = setNew(valuesTable);
@@ -695,8 +702,18 @@ const getCommandFunctions = (
       ({tn, cn}) => setAdd(mapEnsure(schemaMap, tn, setNew), cn),
     );
   };
-  const loadTable = async (tableName, rowIdColumnName, condition) =>
-    canSelect(tableName, rowIdColumnName)
+  const loadTable = async (
+    tableName,
+    rowIdColumnName,
+    condition,
+    contentSubIds,
+  ) => {
+    const contentSubIdSet = isUndefined(contentSubIds)
+      ? void 0
+      : setNew(contentSubIds);
+    const includeContentSubId = (contentSubId) =>
+      isUndefined(contentSubIdSet) || collHas(contentSubIdSet, contentSubId);
+    return canSelect(tableName, rowIdColumnName)
       ? objNew(
           arrayFilter(
             arrayMap(
@@ -705,17 +722,35 @@ const getCommandFunctions = (
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition),
               ),
-              (row) => [
-                row[rowIdColumnName],
-                decode
+              (row) => {
+                const rowId = row[rowIdColumnName];
+                const rowContent = decode
                   ? objMap(objDel(row, rowIdColumnName), decode)
-                  : objDel(row, rowIdColumnName),
-              ],
+                  : objDel(row, rowIdColumnName);
+                return [
+                  rowId,
+                  isUndefined(contentSubIdSet)
+                    ? rowContent
+                    : objNew(
+                        arrayFilter(
+                          objToArray(
+                            rowContent,
+                            (cellOrValue, contentSubId) => [
+                              contentSubId,
+                              cellOrValue,
+                            ],
+                          ),
+                          ([contentSubId]) => includeContentSubId(contentSubId),
+                        ),
+                      ),
+                ];
+              },
             ),
             (entry) => !isUndefined(entry[0]) && !objIsEmpty(entry[1]),
           ),
         )
       : {};
+  };
   const saveTable = async (
     tableName,
     rowIdColumnName,
@@ -724,15 +759,23 @@ const getCommandFunctions = (
     deleteEmptyTable,
     partial = false,
     condition = TRUE,
+    contentSubIds,
   ) => {
+    const contentSubIdSet = isUndefined(contentSubIds)
+      ? void 0
+      : setNew(contentSubIds);
+    const includeContentSubId = (contentSubId) =>
+      isUndefined(contentSubIdSet) || collHas(contentSubIdSet, contentSubId);
     const settingColumnNameSet = setNew();
     objMap(content ?? {}, (contentRow) =>
-      arrayMap(objIds(contentRow ?? {}), (cellOrValueId) =>
-        setAdd(settingColumnNameSet, cellOrValueId),
+      arrayMap(
+        arrayFilter(objIds(contentRow ?? {}), includeContentSubId),
+        (cellOrValueId) => setAdd(settingColumnNameSet, cellOrValueId),
       ),
     );
     const settingColumnNames = collValues(settingColumnNameSet);
     if (
+      isUndefined(contentSubIdSet) &&
       !partial &&
       deleteEmptyTable &&
       condition == TRUE &&
@@ -744,7 +787,13 @@ const getCommandFunctions = (
       return;
     }
     const currentColumnNames = mapGet(schemaMap, tableName);
-    const unaccountedColumnNames = setNew(collValues(currentColumnNames));
+    const unaccountedColumnNames = setNew(
+      arrayFilter(
+        collValues(currentColumnNames),
+        (columnName) =>
+          columnName == rowIdColumnName || includeContentSubId(columnName),
+      ),
+    );
     if (!arrayIsEmpty(settingColumnNames)) {
       if (!collHas(schemaMap, tableName)) {
         await databaseExecuteCommand(
@@ -810,11 +859,13 @@ const getCommandFunctions = (
     ]);
     if (partial) {
       if (isUndefined(content)) {
-        await databaseExecuteCommand(
-          DELETE_FROM +
-            escapeId(tableName) +
-            getWhereCondition(tableName, condition),
-        );
+        if (isUndefined(contentSubIdSet)) {
+          await databaseExecuteCommand(
+            DELETE_FROM +
+              escapeId(tableName) +
+              getWhereCondition(tableName, condition),
+          );
+        }
       } else {
         await promiseAll(
           objToArray(content, async (row, rowId) => {
@@ -827,18 +878,24 @@ const getCommandFunctions = (
                 [rowId],
               );
             } else if (!arrayIsEmpty(settingColumnNames)) {
-              await upsert(
-                databaseExecuteCommand,
-                tableName,
-                rowIdColumnName,
+              const changingColumnNames = arrayFilter(
                 objIds(row),
-                {
-                  [rowId]: encode
-                    ? arrayMap(objValues(row), encode)
-                    : objValues(row),
-                },
-                currentColumnNames,
+                includeContentSubId,
               );
+              if (!arrayIsEmpty(changingColumnNames)) {
+                await upsert(
+                  databaseExecuteCommand,
+                  tableName,
+                  rowIdColumnName,
+                  changingColumnNames,
+                  {
+                    [rowId]: arrayMap(changingColumnNames, (cellId) =>
+                      encode ? encode(row[cellId]) : row[cellId],
+                    ),
+                  },
+                  currentColumnNames,
+                );
+              }
             }
           }),
         );
@@ -847,7 +904,9 @@ const getCommandFunctions = (
       if (!arrayIsEmpty(settingColumnNames)) {
         const changingColumnNames = arrayFilter(
           collValues(mapGet(schemaMap, tableName)),
-          (changingColumnName) => changingColumnName != rowIdColumnName,
+          (changingColumnName) =>
+            changingColumnName != rowIdColumnName &&
+            includeContentSubId(changingColumnName),
         );
         const rows = {};
         const deleteRowIds = [];
@@ -863,6 +922,7 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           rows,
+          currentColumnNames,
         );
         await databaseExecuteCommand(
           DELETE_FROM +
@@ -871,7 +931,10 @@ const getCommandFunctions = (
             `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds)})`,
           deleteRowIds,
         );
-      } else if (collHas(schemaMap, tableName)) {
+      } else if (
+        isUndefined(contentSubIdSet) &&
+        collHas(schemaMap, tableName)
+      ) {
         await databaseExecuteCommand(
           DELETE_FROM +
             escapeId(tableName) +
@@ -1010,7 +1073,13 @@ const createTabularPersister = (
   [
     tablesLoadConfig,
     tablesSaveConfig,
-    [valuesLoad, valuesSave, valuesTableName],
+    [
+      valuesLoad,
+      valuesSave,
+      valuesTableName,
+      valuesLoadValueIds,
+      valuesSaveValueIds,
+    ],
   ],
   managedTableNames,
   querySchema,
@@ -1060,15 +1129,33 @@ const createTabularPersister = (
         },
       ),
     );
+  const getValuesSubset = (values, valueIds, partial) =>
+    objNew(
+      partial == true
+        ? arrayFilter(
+            objToArray(values, (value, valueId) => [valueId, value]),
+            ([valueId]) => arrayHas(valueIds, valueId),
+          )
+        : arrayFilter(
+            arrayMap(valueIds, (valueId) => [valueId, values[valueId]]),
+            ([, value]) => !isUndefined(value),
+          ),
+    );
   const saveValues = async (values, partial) =>
     valuesSave
       ? await saveTable(
           valuesTableName,
           DEFAULT_ROW_ID_COLUMN_NAME,
-          {[SINGLE_ROW_ID]: values},
+          {
+            [SINGLE_ROW_ID]: isUndefined(valuesSaveValueIds)
+              ? values
+              : getValuesSubset(values, valuesSaveValueIds, partial),
+          },
           true,
           true,
           partial,
+          void 0,
+          valuesSaveValueIds,
         )
       : null;
   const loadTables = async () =>
@@ -1088,9 +1175,14 @@ const createTabularPersister = (
     );
   const loadValues = async () =>
     valuesLoad
-      ? (await loadTable(valuesTableName, DEFAULT_ROW_ID_COLUMN_NAME))[
-          SINGLE_ROW_ID
-        ]
+      ? (
+          await loadTable(
+            valuesTableName,
+            DEFAULT_ROW_ID_COLUMN_NAME,
+            void 0,
+            valuesLoadValueIds,
+          )
+        )[SINGLE_ROW_ID]
       : {};
   const getPersisted = () =>
     transaction(async () => {

package/queries/index.js

@@ -282,14 +282,12 @@ const getDefinableFunctions = (
       const newRowValue = hasRow(tableId, rowId)
         ? validateRowValue(getRowValue(getCell, rowId))
         : void 0;
-      if (
-        !(
-          oldRowValue === newRowValue ||
-          (isArray(oldRowValue) &&
-            isArray(newRowValue) &&
-            arrayIsEqual(oldRowValue, newRowValue))
-        )
-      ) {
+      if (!(
+        oldRowValue === newRowValue ||
+        (isArray(oldRowValue) &&
+          isArray(newRowValue) &&
+          arrayIsEqual(oldRowValue, newRowValue))
+      )) {
         mapSet(changedRowValues, rowId, [oldRowValue, newRowValue]);
       }
       if (!isUndefined(getSortKey)) {
@@ -380,9 +378,9 @@ const PARAMS_TABLE = '_';
 const PARAM_LISTENER_PREFIX = 'p';
 const createQueries = getCreateFunction((store) => {
   const createStore = store._[0];
-  const preStore = createStore();
   const paramStore = createStore();
   const resultStore = createStore();
+  const preStores = mapNew();
   const resultStores = mapNew();
   const redefiningQueryIds = setNew();
   const routedResultListeners = mapNew();
@@ -425,12 +423,13 @@ const createQueries = getCreateFunction((store) => {
   );
   const getResultStore = (queryId) =>
     mapEnsure(resultStores, queryId, createStore);
-  const addPreStoreListener = (preStore2, queryId, ...listenerIds) =>
+  const getPreStore = (queryId) => mapEnsure(preStores, queryId, createStore);
+  const addPreStoreListener = (preStore, queryId, ...listenerIds) =>
     arrayForEach(listenerIds, (listenerId) =>
       setAdd(
         mapEnsure(
           mapEnsure(preStoreListenerIds, queryId, mapNew),
-          preStore2,
+          preStore,
           setNew,
         ),
         listenerId,
@@ -440,16 +439,17 @@ const createQueries = getCreateFunction((store) => {
     ifNotUndefined(
       mapGet(preStoreListenerIds, queryId),
       (queryPreStoreListenerIds) => {
-        mapForEach(queryPreStoreListenerIds, (preStore2, listenerIds) =>
+        mapForEach(queryPreStoreListenerIds, (preStore, listenerIds) =>
           collForEach(listenerIds, (listenerId) =>
-            preStore2.delListener(listenerId),
+            preStore.delListener(listenerId),
           ),
         );
         collClear(queryPreStoreListenerIds);
       },
     );
-    arrayForEach([getResultStore(queryId), preStore], (store2) =>
-      store2.delTable(queryId),
+    arrayForEach(
+      [getResultStore(queryId), mapGet(preStores, queryId)],
+      (store2) => store2?.delTable(queryId),
     );
   };
   const addSourceStoreListeners = (
@@ -677,10 +677,12 @@ const createQueries = getCreateFunction((store) => {
           ),
         );
         const groups = mapNew(groupEntries);
-        let selectJoinWhereStore = preStore;
-        if (collIsEmpty(groups) && arrayIsEmpty(havings)) {
-          selectJoinWhereStore = resultStore2;
-        } else {
+        const hasGroupsOrHavings =
+          !collIsEmpty(groups) || !arrayIsEmpty(havings);
+        const selectJoinWhereStore = hasGroupsOrHavings
+          ? getPreStore(queryId)
+          : resultStore2;
+        if (hasGroupsOrHavings) {
           synchronizeTransactions(queryId, selectJoinWhereStore, resultStore2);
           const groupedSelectedCellIds = mapNew();
           mapForEach(groups, (groupedCellId, [selectedCellId, aggregators]) =>

package/queries/with-schemas/index.js

@@ -282,14 +282,12 @@ const getDefinableFunctions = (
       const newRowValue = hasRow(tableId, rowId)
         ? validateRowValue(getRowValue(getCell, rowId))
         : void 0;
-      if (
-        !(
-          oldRowValue === newRowValue ||
-          (isArray(oldRowValue) &&
-            isArray(newRowValue) &&
-            arrayIsEqual(oldRowValue, newRowValue))
-        )
-      ) {
+      if (!(
+        oldRowValue === newRowValue ||
+        (isArray(oldRowValue) &&
+          isArray(newRowValue) &&
+          arrayIsEqual(oldRowValue, newRowValue))
+      )) {
         mapSet(changedRowValues, rowId, [oldRowValue, newRowValue]);
       }
       if (!isUndefined(getSortKey)) {
@@ -380,9 +378,9 @@ const PARAMS_TABLE = '_';
 const PARAM_LISTENER_PREFIX = 'p';
 const createQueries = getCreateFunction((store) => {
   const createStore = store._[0];
-  const preStore = createStore();
   const paramStore = createStore();
   const resultStore = createStore();
+  const preStores = mapNew();
   const resultStores = mapNew();
   const redefiningQueryIds = setNew();
   const routedResultListeners = mapNew();
@@ -425,12 +423,13 @@ const createQueries = getCreateFunction((store) => {
   );
   const getResultStore = (queryId) =>
     mapEnsure(resultStores, queryId, createStore);
-  const addPreStoreListener = (preStore2, queryId, ...listenerIds) =>
+  const getPreStore = (queryId) => mapEnsure(preStores, queryId, createStore);
+  const addPreStoreListener = (preStore, queryId, ...listenerIds) =>
     arrayForEach(listenerIds, (listenerId) =>
       setAdd(
         mapEnsure(
           mapEnsure(preStoreListenerIds, queryId, mapNew),
-          preStore2,
+          preStore,
           setNew,
         ),
         listenerId,
@@ -440,16 +439,17 @@ const createQueries = getCreateFunction((store) => {
     ifNotUndefined(
       mapGet(preStoreListenerIds, queryId),
       (queryPreStoreListenerIds) => {
-        mapForEach(queryPreStoreListenerIds, (preStore2, listenerIds) =>
+        mapForEach(queryPreStoreListenerIds, (preStore, listenerIds) =>
           collForEach(listenerIds, (listenerId) =>
-            preStore2.delListener(listenerId),
+            preStore.delListener(listenerId),
           ),
         );
         collClear(queryPreStoreListenerIds);
       },
     );
-    arrayForEach([getResultStore(queryId), preStore], (store2) =>
-      store2.delTable(queryId),
+    arrayForEach(
+      [getResultStore(queryId), mapGet(preStores, queryId)],
+      (store2) => store2?.delTable(queryId),
     );
   };
   const addSourceStoreListeners = (
@@ -677,10 +677,12 @@ const createQueries = getCreateFunction((store) => {
           ),
         );
         const groups = mapNew(groupEntries);
-        let selectJoinWhereStore = preStore;
-        if (collIsEmpty(groups) && arrayIsEmpty(havings)) {
-          selectJoinWhereStore = resultStore2;
-        } else {
+        const hasGroupsOrHavings =
+          !collIsEmpty(groups) || !arrayIsEmpty(havings);
+        const selectJoinWhereStore = hasGroupsOrHavings
+          ? getPreStore(queryId)
+          : resultStore2;
+        if (hasGroupsOrHavings) {
           synchronizeTransactions(queryId, selectJoinWhereStore, resultStore2);
           const groupedSelectedCellIds = mapNew();
           mapForEach(groups, (groupedCellId, [selectedCellId, aggregators]) =>