[hygiene] Nested ternaries

jamesgpearce · jamesgpearce · commit 561d73bd4ed7 · 2023-11-14T23:34:22.000-04:00
diff --git a/src/checkpoints.ts b/src/checkpoints.ts
@@ -267,8 +267,8 @@ export const createCheckpoints = getCreateFunction(
       const action = arrayHas(backwardIds, checkpointId)
         ? goBackwardImpl
         : arrayHas(forwardIds, checkpointId)
-        ? goForwardImpl
-        : null;
+          ? goForwardImpl
+          : null;
       while (!isUndefined(action) && checkpointId != currentId) {
         action();
       }
diff --git a/src/common/aggregators.ts b/src/common/aggregators.ts
@@ -95,17 +95,17 @@ export const getAggregateValue = <Value, AggregateValue>(
             oldLength++,
           )
         : isUndefined(newValue)
-        ? aggregateRemove?.(
-            aggregateValue as AggregateValue,
-            oldValue,
-            oldLength--,
-          )
-        : aggregateReplace?.(
-            aggregateValue as AggregateValue,
-            newValue,
-            oldValue,
-            oldLength,
-          );
+          ? aggregateRemove?.(
+              aggregateValue as AggregateValue,
+              oldValue,
+              oldLength--,
+            )
+          : aggregateReplace?.(
+              aggregateValue as AggregateValue,
+              newValue,
+              oldValue,
+              oldLength,
+            );
       force ||= isUndefined(aggregateValue);
     }
   });
diff --git a/src/common/listeners.ts b/src/common/listeners.ts
@@ -116,10 +116,12 @@ const getWildcardedLeaves = (
     p == size(path)
       ? arrayPush(leaves, node)
       : path[p] === null
-      ? collForEach(node as Node<IdOrNull, IdSet>, (node) => deep(node, p + 1))
-      : arrayForEach([path[p], null], (id) =>
-          deep(mapGet(node as Node<IdOrNull, IdSet>, id) as IdSetNode, p + 1),
-        );
+        ? collForEach(node as Node<IdOrNull, IdSet>, (node) =>
+            deep(node, p + 1),
+          )
+        : arrayForEach([path[p], null], (id) =>
+            deep(mapGet(node as Node<IdOrNull, IdSet>, id) as IdSetNode, p + 1),
+          );
   deep(deepIdSet, 0);
   return leaves;
 };
@@ -206,10 +208,10 @@ export const getListenerFunctions = (
           index == size(path)
             ? (listener as any)(thing, ...ids, ...extraArgsGetter(ids))
             : isUndefined(path[index])
-            ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id) =>
-                callWithIds(...ids, id),
-              )
-            : callWithIds(...ids, path[index] as Id);
+              ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id) =>
+                  callWithIds(...ids, id),
+                )
+              : callWithIds(...ids, path[index] as Id);
         };
         callWithIds();
       },
diff --git a/src/indexes.ts b/src/indexes.ts
@@ -59,8 +59,8 @@ export const createIndexes = getCreateFunction((store: Store): Indexes => {
       isUndefined(value)
         ? EMPTY_STRING
         : isArray(value)
-        ? arrayMap(value, id)
-        : id(value),
+          ? arrayMap(value, id)
+          : id(value),
     addListener,
     callListeners,
   );
diff --git a/src/persisters/persister-automerge.ts b/src/persisters/persister-automerge.ts
@@ -51,35 +51,35 @@ const setTransactionChangesToDoc = (
       transactionChangesFailed
         ? 0
         : isUndefined(table)
-        ? objDel(docTables, tableId)
-        : ifNotUndefined(
-            docTables[tableId],
-            (docTable) =>
-              objMap(table, (row, rowId) =>
-                transactionChangesFailed
-                  ? 0
-                  : isUndefined(row)
-                  ? objDel(docTable, rowId)
-                  : ifNotUndefined(
-                      objGet(docTable, rowId),
-                      (docRow: any) =>
-                        objMap(row, (cell, cellId) =>
-                          isUndefined(cell)
-                            ? objDel(docRow, cellId)
-                            : (docRow[cellId] = cell),
+          ? objDel(docTables, tableId)
+          : ifNotUndefined(
+              docTables[tableId],
+              (docTable) =>
+                objMap(table, (row, rowId) =>
+                  transactionChangesFailed
+                    ? 0
+                    : isUndefined(row)
+                      ? objDel(docTable, rowId)
+                      : ifNotUndefined(
+                          objGet(docTable, rowId),
+                          (docRow: any) =>
+                            objMap(row, (cell, cellId) =>
+                              isUndefined(cell)
+                                ? objDel(docRow, cellId)
+                                : (docRow[cellId] = cell),
+                            ),
+                          transactionChangesDidFail as any,
                         ),
-                      transactionChangesDidFail as any,
-                    ),
-              ),
-            transactionChangesDidFail,
-          ),
+                ),
+              transactionChangesDidFail,
+            ),
     );
     objMap(valueChanges, (value, valueId) =>
       transactionChangesFailed
         ? 0
         : isUndefined(value)
-        ? objDel(docValues, valueId)
-        : (docValues[valueId] = value),
+          ? objDel(docValues, valueId)
+          : (docValues[valueId] = value),
     );
   });
   if (transactionChangesFailed) {
diff --git a/src/persisters/persister-yjs.ts b/src/persisters/persister-yjs.ts
@@ -100,35 +100,35 @@ const setTransactionChangesToYDoc = (
       transactionChangesFailed
         ? 0
         : isUndefined(table)
-        ? yTables.delete(tableId)
-        : ifNotUndefined(
-            yTables.get(tableId),
-            (yTable) =>
-              objMap(table, (row, rowId) =>
-                transactionChangesFailed
-                  ? 0
-                  : isUndefined(row)
-                  ? yTable.delete(rowId)
-                  : ifNotUndefined(
-                      yTable.get(rowId),
-                      (yRow) =>
-                        objMap(row, (cell, cellId) =>
-                          isUndefined(cell)
-                            ? yRow.delete(cellId)
-                            : yRow.set(cellId, cell),
+          ? yTables.delete(tableId)
+          : ifNotUndefined(
+              yTables.get(tableId),
+              (yTable) =>
+                objMap(table, (row, rowId) =>
+                  transactionChangesFailed
+                    ? 0
+                    : isUndefined(row)
+                      ? yTable.delete(rowId)
+                      : ifNotUndefined(
+                          yTable.get(rowId),
+                          (yRow) =>
+                            objMap(row, (cell, cellId) =>
+                              isUndefined(cell)
+                                ? yRow.delete(cellId)
+                                : yRow.set(cellId, cell),
+                            ),
+                          transactionChangesDidFail,
                         ),
-                      transactionChangesDidFail,
-                    ),
-              ),
-            transactionChangesDidFail,
-          ),
+                ),
+              transactionChangesDidFail,
+            ),
     );
     objMap(valueChanges, (value, valueId) =>
       transactionChangesFailed
         ? 0
         : isUndefined(value)
-        ? yValues.delete(valueId)
-        : yValues.set(valueId, value),
+          ? yValues.delete(valueId)
+          : yValues.set(valueId, value),
     );
   });
   if (transactionChangesFailed) {
diff --git a/src/queries.ts b/src/queries.ts
@@ -252,8 +252,8 @@ export const createQueries = getCreateFunction((store: Store): Queries => {
         isFunction(arg1)
           ? arg1
           : isUndefined(arg3)
-          ? (getTableCell) => getTableCell(arg1) === arg2
-          : (getTableCell) => getTableCell(arg1, arg2 as Id) === arg3,
+            ? (getTableCell) => getTableCell(arg1) === arg2
+            : (getTableCell) => getTableCell(arg1, arg2 as Id) === arg3,
       );
 
     const group = (
@@ -477,12 +477,12 @@ export const createQueries = getCreateFunction((store: Store): Queries => {
           ...((isUndefined(arg2)
             ? [tableId, rootRowId, arg1]
             : arg1 === tableId
-            ? [tableId, rootRowId, arg2]
-            : [
-                mapGet(joins, arg1)?.[0] as Id,
-                mapGet(mapGet(joins, arg1)?.[4], rootRowId)?.[0],
-                arg2,
-              ]) as [Id, Id, Id]),
+              ? [tableId, rootRowId, arg2]
+              : [
+                  mapGet(joins, arg1)?.[0] as Id,
+                  mapGet(mapGet(joins, arg1)?.[4], rootRowId)?.[0],
+                  arg2,
+                ]) as [Id, Id, Id]),
         );
       selectJoinWhereStore.transaction(() =>
         arrayEvery(wheres, (where) => where(getTableCell))
diff --git a/src/store.ts b/src/store.ts
@@ -297,8 +297,8 @@ export const createStore: typeof createStoreDecl = (): Store => {
           () => cellInvalid(tableId, rowId, cellId, cell),
         )
       : isUndefined(getCellOrValueType(cell))
-      ? cellInvalid(tableId, rowId, cellId, cell)
-      : cell;
+        ? cellInvalid(tableId, rowId, cellId, cell)
+        : cell;
 
   const validateValues = (values: Values, skipDefaults?: 1): boolean =>
     validate(
@@ -326,8 +326,8 @@ export const createStore: typeof createStoreDecl = (): Store => {
           () => valueInvalid(valueId, value),
         )
       : isUndefined(getCellOrValueType(value))
-      ? valueInvalid(valueId, value)
-      : value;
+        ? valueInvalid(valueId, value)
+        : value;
 
   const addDefaultsToRow = (row: Row, tableId: Id, rowId?: Id): Row => {
     ifNotUndefined(
diff --git a/src/tools/common/code.ts b/src/tools/common/code.ts
@@ -177,8 +177,8 @@ export const getCodeFunctions = (): [
                 ? -1
                 : 1
               : import1 > import2
-              ? 1
-              : -1,
+                ? 1
+                : -1,
         ),
         EMPTY_STRING,
       ],
diff --git a/src/types/docs/metrics.js b/src/types/docs/metrics.js
@@ -351,8 +351,8 @@
    *     remove == metric
    *       ? undefined
    *       : add > 2
-   *       ? Math.min(metric, add)
-   *       : metric,
+   *         ? Math.min(metric, add)
+   *         : metric,
    * );
    *
    * console.log(metrics.getMetric('lowestPriceOver2'));
diff --git a/src/types/docs/queries.js b/src/types/docs/queries.js
@@ -1204,49 +1204,6 @@
  * ```js
  * const store = createStore()
  *   .setTable('pets', {
- *     fido: {species: 'dog', color: 'brown', owner: 'alice'},
- *     felix: {species: 'cat', color: 'black', owner: 'bob'},
- *     cujo: {species: 'dog', color: 'black', owner: 'bob'},
- *     lowly: {species: 'worm', color: 'brown', owner: 'alice'},
- *     carnaby: {species: 'parrot', color: 'black', owner: 'bob'},
- *     polly: {species: 'parrot', color: 'red', owner: 'alice'},
- *   })
- *   .setTable('species', {
- *     dog: {price: 5, legs: 4},
- *     cat: {price: 4, legs: 4},
- *     parrot: {price: 3, legs: 2},
- *     worm: {price: 1, legs: 0},
- *   });
- *
- * const queries = createQueries(store);
- * queries.setQueryDefinition('query', 'pets', ({select, join, group}) => {
- *   select('pets', 'color'); //    group by
- *   select('pets', 'owner'); //    group by
- *   select('species', 'price'); // grouped
- *   select('species', 'legs'); //  grouped
- *   // from pets
- *   join('species', 'species');
- *   group('price', 'avg').as('avgPrice');
- *   group('legs', 'sum').as('sumLegs');
- * });
- *
- * queries.forEachResultRow('query', (rowId) => {
- *   console.log({[rowId]: queries.getResultRow('query', rowId)});
- * });
- * // -> {0: {color: 'brown', owner: 'alice', avgPrice: 3, sumLegs: 4}}
- * // -> {1: {color: 'black', owner: 'bob', avgPrice: 4, sumLegs: 10}}
- * // -> {2: {color: 'red', owner: 'alice', avgPrice: 3, sumLegs: 2}}
- * ```
- * @example
- * This example shows a query that calculates the a custom aggregate of one
- * Cell's values, grouped by another. Note how `aggregateAdd`,
- * `aggregateRemove`, and `aggregateReplace` parameters are provided to make the
- * custom aggregation more efficient as individual values are added, removed, or
- * replaced during the lifecycle of the Table.
- *
- * ```js
- * const store = createStore()
- *   .setTable('pets', {
  *     fido: {species: 'dog', owner: 'alice'},
  *     felix: {species: 'cat', owner: 'bob'},
  *     cujo: {species: 'dog', owner: 'bob'},
@@ -1276,8 +1233,8 @@
  *       remove == current
  *         ? undefined
  *         : add > 2
- *         ? Math.min(current, add)
- *         : current,
+ *           ? Math.min(current, add)
+ *           : current,
  *   ).as('lowestPriceOver2');
  * });
  *
diff --git a/src/types/with-schemas/store.d.ts b/src/types/with-schemas/store.d.ts
@@ -104,10 +104,10 @@ export type Cell<
 > = CellType extends 'string'
   ? string
   : CellType extends 'number'
-  ? number
-  : CellType extends 'boolean'
-  ? boolean
-  : string | number | boolean;
+    ? number
+    : CellType extends 'boolean'
+      ? boolean
+      : string | number | boolean;
 
 /// CellOrUndefined
 export type CellOrUndefined<
@@ -147,10 +147,10 @@ export type Value<
 > = ValueType extends 'string'
   ? string
   : ValueType extends 'number'
-  ? number
-  : ValueType extends 'boolean'
-  ? boolean
-  : string | number | boolean;
+    ? number
+    : ValueType extends 'boolean'
+      ? boolean
+      : string | number | boolean;
 
 /// ValueOrUndefined
 export type ValueOrUndefined<
diff --git a/src/ui-react/context.ts b/src/ui-react/context.ts
@@ -61,8 +61,8 @@ const useThing = <
     isUndefined(id)
       ? contextValue[offset]
       : isString(id)
-      ? objGet((contextValue[offset + 1] ?? {}) as IdObj<Thing>, id)
-      : id
+        ? objGet((contextValue[offset + 1] ?? {}) as IdObj<Thing>, id)
+        : id
   ) as Thing;
 };
 
diff --git a/src/ui-react/dom.tsx b/src/ui-react/dom.tsx
@@ -383,8 +383,8 @@ const RelationshipInHtmlRow = ({
             tableId === localTableId
               ? localRowId
               : tableId === remoteTableId
-              ? remoteRowId
-              : null;
+                ? remoteRowId
+                : null;
           return isUndefined(rowId) ? null : (
             <td key={compoundCellId}>
               <CellView
diff --git a/test/unit/documentation.test.ts b/test/unit/documentation.test.ts
@@ -90,8 +90,8 @@ const forEachDirAndFile = (
     entry.isDirectory()
       ? dirCallback?.(path)
       : path.endsWith(extension)
-      ? fileCallback?.(path)
-      : null;
+        ? fileCallback?.(path)
+        : null;
   });
 
 const prepareTestResultsFromBlock = (block: string, prefix: string): void => {
diff --git a/test/unit/other/__snapshots__/tools.test.ts.snap b/test/unit/other/__snapshots__/tools.test.ts.snap
