[ids] Re-use Ids if required

Author: jamesgpearce

src/common/listeners.ts

@@ -113,7 +113,7 @@ export const getListenerFunctions = (
     extraArgsGetter: ExtraArgsGetter = () => [],
   ): Id => {
     thing ??= getThing();
-    const id = getId();
+    const id = getId(1);
     mapSet(allListeners, id, [
       listener,
       idSetNode,

src/common/pool.ts

@@ -5,11 +5,15 @@ import {test} from './other';
 
 const INTEGER = /^\d+$/;
 
-export const getPoolFunctions = (): [() => Id, (id: Id) => void] => {
+export const getPoolFunctions = (): [
+  (reuse: 0 | 1) => Id,
+  (id: Id) => void,
+] => {
   const pool: Ids = [];
   let nextId = 0;
   return [
-    (): Id => arrayShift(pool) ?? EMPTY_STRING + nextId++,
+    (reuse: 0 | 1): Id =>
+      (reuse ? arrayShift(pool) : null) ?? EMPTY_STRING + nextId++,
     (id: Id): void => {
       if (test(INTEGER, id) && arrayLength(pool) < 1e3) {
         arrayPush(pool, id);

src/store.ts

@@ -495,13 +495,13 @@ export const createStore: typeof createStoreDecl = (): Store => {
     }
   };
 
-  const getNewRowId = (tableId: Id): Id => {
+  const getNewRowId = (tableId: Id, reuse: 0 | 1): Id => {
     const [getId] = mapEnsure(tablePoolFunctions, tableId, getPoolFunctions);
-    const rowId = getId();
+    const rowId = getId(reuse);
     if (!collHas(mapGet(tablesMap, tableId), rowId)) {
       return rowId;
     }
-    return getNewRowId(tableId);
+    return getNewRowId(tableId, reuse);
   };
 
   const getOrCreateTable = (tableId: Id) =>
@@ -983,15 +983,15 @@ export const createStore: typeof createStoreDecl = (): Store => {
       rowId,
     );
 
-  const addRow = (tableId: Id, row: Row): Id | undefined =>
+  const addRow = (tableId: Id, row: Row, reuseRowIds = true): Id | undefined =>
     transaction(() => {
       let rowId: Id | undefined = undefined;
       if (validateRow(tableId, rowId, row)) {
         tableId = id(tableId);
         setValidRow(
           tableId,
           getOrCreateTable(tableId),
-          (rowId = getNewRowId(tableId)),
+          (rowId = getNewRowId(tableId, reuseRowIds ? 1 : 0)),
           row,
         );
       }