[nulls] More progess

Author: jamesgpearce

coverage.json

@@ -1 +1 @@
-{"tests":7143,"assertions":32130,"lines":{"total":2326,"covered":2326,"skipped":0,"pct":100},"statements":{"total":2515,"covered":2515,"skipped":0,"pct":100},"functions":{"total":1005,"covered":1005,"skipped":0,"pct":100},"branches":{"total":876,"covered":876,"skipped":0,"pct":100},"branchesTrue":{"total":0,"covered":0,"skipped":0,"pct":100}}
+{"tests":7143,"assertions":32130,"lines":{"total":2333,"covered":2332,"skipped":0,"pct":99.95},"statements":{"total":2521,"covered":2520,"skipped":0,"pct":99.96},"functions":{"total":1006,"covered":1006,"skipped":0,"pct":100},"branches":{"total":881,"covered":880,"skipped":0,"pct":99.88},"branchesTrue":{"total":0,"covered":0,"skipped":0,"pct":100}}

src/common/listeners.ts

@@ -58,7 +58,7 @@ import type {
 import {arrayForEach, arrayPush} from './array.ts';
 import {collDel, collForEach, collIsEmpty} from './coll.ts';
 import {IdMap, Node, mapGet, mapNew, mapSet, visitTree} from './map.ts';
-import {ifNotUndefined, isUndefined, size} from './other.ts';
+import {ifNotUndefined, isNull, size} from './other.ts';
 import {getPoolFunctions} from './pool.ts';
 import {IdSet, setAdd, setNew} from './set.ts';
 import {EMPTY_STRING} from './strings.ts';
@@ -226,7 +226,7 @@ export const getListenerFunctions = (
           const index = size(ids);
           if (index == size(path)) {
             (listener as any)(thing, ...ids, ...extraArgsGetter(ids));
-          } else if (isUndefined(path[index])) {
+          } else if (isNull(path[index])) {
             arrayForEach(pathGetters[index]?.(...ids) ?? [], (id) =>
               callWithIds(...ids, id),
             );

src/common/map.ts

@@ -37,7 +37,7 @@ export const mapSet = <Key, Value>(
   key: Key,
   value?: Value,
 ): Map<Key, Value> | undefined =>
-  isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
+  value === undefined ? (collDel(map, key), map) : map?.set(key, value);
 
 export const mapEnsure = <Key, Value>(
   map: Map<Key, Value>,

src/common/obj.ts

@@ -1,6 +1,6 @@
 import type {Id} from '../@types/common/index.d.ts';
 import {arrayEvery, arrayForEach, arrayMap} from './array.ts';
-import {ifNotUndefined, isUndefined, size} from './other.ts';
+import {ifNotUndefined, isNull, isUndefined, size} from './other.ts';
 
 export type IdObj<Value> = {[id: string]: Value};
 export type IdObj2<Value> = IdObj<IdObj<Value>>;
@@ -104,6 +104,7 @@ export const objValidate = (
   emptyIsValid: 0 | 1 = 0,
 ): boolean => {
   if (
+    isNull(obj) ||
     isUndefined(obj) ||
     !isObject(obj) ||
     (!emptyIsValid && objIsEmpty(obj)) ||

src/common/other.ts

@@ -34,8 +34,12 @@ export const isInstanceOf = (
   cls: MapConstructor | SetConstructor | ObjectConstructor,
 ): boolean => thing instanceof cls;
 
-export const isUndefined = (thing: unknown): thing is undefined | null =>
-  thing == undefined;
+export const isUndefined = (thing: unknown): thing is undefined | null => {
+  if (thing === null) {
+    console.log('isUndefined called with null from:', new Error().stack);
+  }
+  return thing == undefined;
+};
 
 export const isNull = (thing: unknown): thing is null => thing == null;
 

src/queries/index.ts

@@ -199,8 +199,8 @@ export const createQueries = getCreateFunction((store: Store): Queries => {
     resetPreStores(queryId);
 
     const selectEntries: [Id, SelectClause][] = [];
-    const joinEntries: [IdOrNull, JoinClause][] = [
-      [null, [tableId, null, null, [], mapNew()]],
+    const joinEntries: [Id | undefined, JoinClause][] = [
+      [undefined, [tableId, null, null, [], mapNew()]],
     ];
     const wheres: WhereClause[] = [];
     const groupEntries: [Id, GroupClause][] = [];
@@ -226,7 +226,7 @@ export const createQueries = getCreateFunction((store: Store): Queries => {
       arg2?: Id | ((getCell: GetCell, rowId: Id) => Id | undefined),
     ) => {
       const fromIntermediateJoinedTableId =
-        isUndefined(arg2) || isFunction(arg1) ? null : arg1;
+        isUndefined(arg2) || isFunction(arg1) ? undefined : arg1;
       const onArg = isUndefined(fromIntermediateJoinedTableId) ? arg1 : arg2;
       const joinEntry: [Id, JoinClause] = [
         joinedTableId,
@@ -296,7 +296,7 @@ export const createQueries = getCreateFunction((store: Store): Queries => {
     if (collIsEmpty(selects)) {
       return queries;
     }
-    const joins: Map<IdOrNull, JoinClause> = mapNew(joinEntries);
+    const joins: Map<Id | undefined, JoinClause> = mapNew(joinEntries);
     mapForEach(joins, (asTableId, [, fromAsTableId]) =>
       ifNotUndefined(mapGet(joins, fromAsTableId), ({3: toAsTableIds}) =>
         isUndefined(asTableId) ? 0 : arrayPush(toAsTableIds, asTableId),
@@ -542,7 +542,7 @@ export const createQueries = getCreateFunction((store: Store): Queries => {
       writeSelectRow(rootRowId);
     };
 
-    const {3: joinedTableIds} = mapGet(joins, null) as JoinClause;
+    const {3: joinedTableIds} = mapGet(joins, undefined) as JoinClause;
     selectJoinWhereStore.transaction(() =>
       addStoreListeners(
         queryId,

src/store/index.ts

@@ -628,7 +628,7 @@ export const createStore: typeof createStoreDecl = (): Store => {
     mapSet(
       cellIds,
       cellId,
-      count != -addedOrRemoved ? count + addedOrRemoved : null,
+      count != -addedOrRemoved ? count + addedOrRemoved : undefined,
     );
 
     idsChanged(