tinybase 5.1.0-beta.0 → 5.1.0

package/cjs/persisters/persister-sqlite-wasm/with-schemas/index.cjs

@@ -30,6 +30,7 @@ const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
 const arrayFilter = (array, cb) => array.filter(cb);
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -389,15 +390,10 @@ const jsonStringWithUndefined = (obj) =>
 const jsonParseWithUndefined = (str) =>
   JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -406,7 +402,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -475,7 +471,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -489,19 +488,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -551,7 +555,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,
@@ -757,7 +764,7 @@ const getDefaultedConfig = (configOrStoreTableName) =>
     DEFAULT_CONFIG,
     isString(configOrStoreTableName)
       ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-      : configOrStoreTableName ?? {},
+      : (configOrStoreTableName ?? {}),
   );
 const getDefaultedTabularConfigMap = (
   configsObj,
@@ -930,7 +937,8 @@ const createSqliteWasmPersister = (
     () => sqlite3.capi.sqlite3_update_hook(db, () => 0, 0),
     onSqlCommand,
     onIgnoredError,
-    Persists.StoreOrMergeableStore,
+    3,
+    // StoreOrMergeableStore,
     db,
   );
 

package/cjs/persisters/persister-sqlite3/index.cjs

@@ -31,6 +31,7 @@ const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
 const arrayFilter = (array, cb) => array.filter(cb);
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -390,15 +391,10 @@ const jsonStringWithUndefined = (obj) =>
 const jsonParseWithUndefined = (str) =>
   JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -407,7 +403,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -476,7 +472,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -490,19 +489,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -552,7 +556,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,
@@ -758,7 +765,7 @@ const getDefaultedConfig = (configOrStoreTableName) =>
     DEFAULT_CONFIG,
     isString(configOrStoreTableName)
       ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-      : configOrStoreTableName ?? {},
+      : (configOrStoreTableName ?? {}),
   );
 const getDefaultedTabularConfigMap = (
   configsObj,
@@ -932,7 +939,8 @@ const createSqlite3Persister = (
     (observer) => db.off(CHANGE, observer),
     onSqlCommand,
     onIgnoredError,
-    Persists.StoreOrMergeableStore,
+    3,
+    // StoreOrMergeableStore,
     db,
   );
 

package/cjs/persisters/persister-sqlite3/with-schemas/index.cjs

@@ -31,6 +31,7 @@ const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
 const arrayFilter = (array, cb) => array.filter(cb);
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -390,15 +391,10 @@ const jsonStringWithUndefined = (obj) =>
 const jsonParseWithUndefined = (str) =>
   JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -407,7 +403,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -476,7 +472,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -490,19 +489,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -552,7 +556,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,
@@ -758,7 +765,7 @@ const getDefaultedConfig = (configOrStoreTableName) =>
     DEFAULT_CONFIG,
     isString(configOrStoreTableName)
       ? {[STORE_TABLE_NAME]: configOrStoreTableName}
-      : configOrStoreTableName ?? {},
+      : (configOrStoreTableName ?? {}),
   );
 const getDefaultedTabularConfigMap = (
   configsObj,
@@ -932,7 +939,8 @@ const createSqlite3Persister = (
     (observer) => db.off(CHANGE, observer),
     onSqlCommand,
     onIgnoredError,
-    Persists.StoreOrMergeableStore,
+    3,
+    // StoreOrMergeableStore,
     db,
   );
 

package/cjs/persisters/persister-yjs/index.cjs

@@ -18,6 +18,7 @@ const errorNew = (message) => {
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -67,15 +68,10 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -84,7 +80,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -153,7 +149,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -167,19 +166,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -229,7 +233,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,
@@ -370,8 +377,8 @@ const applyChangesToYDoc = (yContent, getContent, changes) => {
 const yMapMatch = (yMapOrParent, idInParent, obj, set) => {
   const yMap = isUndefined(idInParent)
     ? yMapOrParent
-    : yMapOrParent.get(idInParent) ??
-      yMapOrParent.set(idInParent, new yjs.Map());
+    : (yMapOrParent.get(idInParent) ??
+      yMapOrParent.set(idInParent, new yjs.Map()));
   let changed;
   objToArray(obj, (value, id) => {
     if (set(yMap, id, value)) {
@@ -418,7 +425,8 @@ const createYjsPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOnly,
+    1,
+    // StoreOnly,
     {getYDoc: () => yDoc},
   );
 };

package/cjs/persisters/persister-yjs/with-schemas/index.cjs

@@ -18,6 +18,7 @@ const errorNew = (message) => {
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -67,15 +68,10 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -84,7 +80,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -153,7 +149,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -167,19 +166,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -229,7 +233,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,
@@ -370,8 +377,8 @@ const applyChangesToYDoc = (yContent, getContent, changes) => {
 const yMapMatch = (yMapOrParent, idInParent, obj, set) => {
   const yMap = isUndefined(idInParent)
     ? yMapOrParent
-    : yMapOrParent.get(idInParent) ??
-      yMapOrParent.set(idInParent, new yjs.Map());
+    : (yMapOrParent.get(idInParent) ??
+      yMapOrParent.set(idInParent, new yjs.Map()));
   let changed;
   objToArray(obj, (value, id) => {
     if (set(yMap, id, value)) {
@@ -418,7 +425,8 @@ const createYjsPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOnly,
+    1,
+    // StoreOnly,
     {getYDoc: () => yDoc},
   );
 };

package/cjs/persisters/with-schemas/index.cjs

@@ -9,6 +9,7 @@ const errorNew = (message) => {
   throw new Error(message);
 };
 
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -45,14 +46,14 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
 };
 
 const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
+  StoreOnly: 1 /* StoreOnly */,
+  MergeableStoreOnly: 2 /* MergeableStoreOnly */,
+  StoreOrMergeableStore: 3 /* StoreOrMergeableStore */,
 };
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -61,7 +62,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -130,7 +131,10 @@ const createCustomPersister = (
       loads++;
       await schedule(async () => {
         try {
-          setContentOrChanges(await getPersisted());
+          const content = await getPersisted();
+          isArray(content)
+            ? setContentOrChanges(content)
+            : errorNew(`Content is not an array ${content}`);
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -144,19 +148,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -206,7 +215,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,

package/cjs/queries/index.cjs

@@ -478,9 +478,9 @@ const createQueries = getCreateFunction((store) => {
           selectedCellId,
           isFunction(aggregate)
             ? [aggregate, aggregateAdd, aggregateRemove, aggregateReplace]
-            : mapGet(numericAggregators, aggregate) ?? [
+            : (mapGet(numericAggregators, aggregate) ?? [
                 (_cells, length) => length,
-              ],
+              ]),
         ],
       ];
       arrayPush(groupEntries, groupEntry);