[hygiene] Shrink jsonString

Author: jamesgpearce

src/cli.ts

@@ -2,13 +2,14 @@
 
 import {TablesSchema, ValuesSchema} from './types/store.d';
 import {dirname, resolve} from 'path';
-import {isArray, jsonParse} from './common/other';
 import {readFileSync, writeFileSync} from 'fs';
 import {UTF8} from './common/strings';
 import {arrayForEach} from './common/array';
 import {createStore} from './tinybase';
 import {createTools} from './tools';
 import {fileURLToPath} from 'url';
+import {isArray} from './common/other';
+import {jsonParse} from './common/json';
 import {objMap} from './common/obj';
 
 const FILE_ERROR = 'provide a valid schemaFile, storeName, and outputDir';

src/common/json.ts

@@ -0,0 +1,9 @@
+import {isInstanceOf} from './other';
+import {object} from './obj';
+
+export const jsonString = (obj: unknown): string =>
+  JSON.stringify(obj, (_key, value) =>
+    isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
+  );
+
+export const jsonParse = JSON.parse;

src/common/obj.ts

@@ -5,7 +5,7 @@ import {Id} from '../types/common.d';
 export type IdObj<Value> = {[id: string]: Value};
 export type IdObj2<Value> = IdObj<IdObj<Value>>;
 
-const object = Object;
+export const object = Object;
 
 export const objIds = object.keys;
 export const objFrozen = object.isFrozen;

src/common/other.ts

@@ -1,26 +1,9 @@
 import {BOOLEAN, FUNCTION, STRING, getTypeOf} from './strings';
-import {arrayReduce} from './array';
 
 const promise = Promise;
 
 export const DEBUG = (globalThis as any).DEBUG ?? true;
 
-export const jsonString = (obj: unknown): string =>
-  JSON.stringify(obj, (_key, value) =>
-    isInstanceOf(value, Map)
-      ? arrayReduce(
-          [...value],
-          (obj: {[key: string]: unknown}, [key, value]) => {
-            obj[key] = value;
-            return obj;
-          },
-          {},
-        )
-      : value,
-  );
-
-export const jsonParse = JSON.parse;
-
 export const mathMax = Math.max;
 
 export const mathMin = Math.min;

src/persisters/persister-browser.ts

@@ -4,7 +4,7 @@ import {
   createLocalPersister as createLocalPersisterDecl,
   createSessionPersister as createSessionPersisterDecl,
 } from '../types/persisters/persister-browser';
-import {jsonParse, jsonString} from '../common/other';
+import {jsonParse, jsonString} from '../common/json';
 import {createCustomPersister} from '../persisters';
 
 type StoreListener = (event: StorageEvent) => void;

src/persisters/persister-file.ts

@@ -1,7 +1,7 @@
 import {FSWatcher, watch} from 'fs';
 import {Persister, PersisterListener} from '../types/persisters';
 import {Store, Tables, Values} from '../types/store';
-import {jsonParse, jsonString} from '../common/other';
+import {jsonParse, jsonString} from '../common/json';
 import {readFile, writeFile} from 'fs/promises';
 import {UTF8} from '../common/strings';
 import {createCustomPersister} from '../persisters';

src/persisters/persister-remote.ts

@@ -1,8 +1,9 @@
 import {Persister, PersisterListener} from '../types/persisters';
 import {Store, Tables, Values} from '../types/store';
-import {isUndefined, jsonParse, jsonString} from '../common/other';
+import {jsonParse, jsonString} from '../common/json';
 import {createCustomPersister} from '../persisters';
 import {createRemotePersister as createRemotePersisterDecl} from '../types/persisters/persister-remote';
+import {isUndefined} from '../common/other';
 
 const getETag = (response: Response) => response.headers.get('ETag');
 

src/persisters/sqlite/json.ts

@@ -2,7 +2,7 @@ import {Cmd, getCommandFunctions} from './commands';
 import {DEFAULT_ROW_ID_COLUMN_NAME, SINGLE_ROW_ID} from './common';
 import {Persister, PersisterListener} from '../../types/persisters';
 import {Store, Tables, Values} from '../../types/store';
-import {jsonParse, jsonString} from '../../common/other';
+import {jsonParse, jsonString} from '../../common/json';
 import {DefaultedJsonConfig} from './config';
 import {createCustomPersister} from '../../persisters';
 

src/store.ts

@@ -57,8 +57,6 @@ import {
   isFunction,
   isTypeStringOrBoolean,
   isUndefined,
-  jsonParse,
-  jsonString,
 } from './common/other';
 import {
   ExtraArgsGetter,
@@ -126,6 +124,7 @@ import {
   collSize4,
 } from './common/coll';
 import {getCellOrValueType, setOrDelCell, setOrDelValue} from './common/cell';
+import {jsonParse, jsonString} from './common/json';
 import {defaultSorter} from './common';
 
 type TablesSchemaMap = IdMap2<CellSchema>;

src/tools.ts

@@ -13,7 +13,7 @@ import {objFreeze, objIsEmpty} from './common/obj';
 import {collForEach} from './common/coll';
 import {getCreateFunction} from './common/definable';
 import {getStoreApi as getStoreApiImpl} from './tools/api/api';
-import {jsonParse} from './common/other';
+import {jsonParse} from './common/json';
 
 type CellMeta = [string, IdMap<number>, [number, Cell?], number];