[null] Tidy up

Author: jamesgpearce

src/@types/common/index.d.ts

@@ -21,7 +21,7 @@ export type ParameterizedCallback<Parameter> = (parameter?: Parameter) => void;
 export type Callback = () => void;
 
 /// SortKey
-export type SortKey = string | number | boolean;
+export type SortKey = string | number | boolean | null;
 
 /// GetNow
 export type GetNow = () => number;

src/common/cell.ts

@@ -6,19 +6,19 @@ import type {
 } from '../@types/store/index.d.ts';
 import {
   isFiniteNumber,
-  isNullish,
+  isNull,
   isTypeStringOrBoolean,
   isUndefined,
 } from './other.ts';
 import {BOOLEAN, NUMBER, STRING, getTypeOf} from './strings.ts';
 
-export type CellOrValueType = 'string' | 'number' | 'boolean';
+export type CellOrValueType = 'string' | 'number' | 'boolean' | 'null';
 
 export const getCellOrValueType = (
   cellOrValue: any,
 ): CellOrValueType | undefined => {
-  if (isNullish(cellOrValue)) {
-    return undefined;
+  if (isNull(cellOrValue)) {
+    return 'null';
   }
   const type = getTypeOf(cellOrValue);
   return isTypeStringOrBoolean(type) ||
@@ -27,8 +27,8 @@ export const getCellOrValueType = (
     : undefined;
 };
 
-export const isCellOrValueOrNullOrUndefined = (cellOrValue: any): boolean =>
-  isNullish(cellOrValue) || !isUndefined(getCellOrValueType(cellOrValue));
+export const isCellOrValueOrUndefined = (cellOrValue: any): boolean =>
+  isUndefined(cellOrValue) || !isUndefined(getCellOrValueType(cellOrValue));
 
 export const setOrDelCell = (
   store: Store,

src/mergeable-store/index.ts

@@ -22,7 +22,7 @@ import type {
   Store,
   ValueOrUndefined,
 } from '../@types/store/index.d.ts';
-import {isCellOrValueOrNullOrUndefined} from '../common/cell.ts';
+import {isCellOrValueOrUndefined} from '../common/cell.ts';
 import {collClear, collForEach} from '../common/coll.ts';
 import {
   addOrRemoveHash,
@@ -126,7 +126,7 @@ const validateMergeableContent = (
                 objValidate(
                   cellStamps,
                   (cellStamp) =>
-                    stampValidate(cellStamp, isCellOrValueOrNullOrUndefined),
+                    stampValidate(cellStamp, isCellOrValueOrUndefined),
                   undefined,
                   1,
                 ),
@@ -142,7 +142,7 @@ const validateMergeableContent = (
   stampValidate(mergeableContent[1], (values) =>
     objValidate(
       values,
-      (value) => stampValidate(value, isCellOrValueOrNullOrUndefined),
+      (value) => stampValidate(value, isCellOrValueOrUndefined),
       undefined,
       1,
     ),

src/store/index.ts

@@ -303,9 +303,19 @@ export const createStore: typeof createStoreDecl = (): Store => {
       ? ifNotUndefined(
           mapGet(mapGet(tablesSchemaMap, tableId), cellId),
           (cellSchema) =>
-            getCellOrValueType(cell) != cellSchema[TYPE]
-              ? cellInvalid(tableId, rowId, cellId, cell, cellSchema[DEFAULT])
-              : cell,
+            isNull(cell)
+              ? cellSchema[ALLOW_NULL]
+                ? cell
+                : cellInvalid(tableId, rowId, cellId, cell, cellSchema[DEFAULT])
+              : getCellOrValueType(cell) == cellSchema[TYPE]
+                ? cell
+                : cellInvalid(
+                    tableId,
+                    rowId,
+                    cellId,
+                    cell,
+                    cellSchema[DEFAULT],
+                  ),
           () => cellInvalid(tableId, rowId, cellId, cell),
         )
       : isUndefined(getCellOrValueType(cell))
@@ -332,9 +342,13 @@ export const createStore: typeof createStoreDecl = (): Store => {
       ? ifNotUndefined(
           mapGet(valuesSchemaMap, valueId),
           (valueSchema) =>
-            getCellOrValueType(value) != valueSchema[TYPE]
-              ? valueInvalid(valueId, value, valueSchema[DEFAULT])
-              : value,
+            isNull(value)
+              ? valueSchema[ALLOW_NULL]
+                ? value
+                : valueInvalid(valueId, value, valueSchema[DEFAULT])
+              : getCellOrValueType(value) == valueSchema[TYPE]
+                ? value
+                : valueInvalid(valueId, value, valueSchema[DEFAULT]),
           () => valueInvalid(valueId, value),
         )
       : isUndefined(getCellOrValueType(value))