Bump json pack

package.json

@@ -122,7 +122,8 @@
   },
   "dependencies": {
     "@jsonjoy.com/base64": "^1.1.1",
-    "@jsonjoy.com/json-pack": "^1.0.1",
+    "@jsonjoy.com/json-pack": "^1.0.2",
+    "@jsonjoy.com/util": "^1.0.0",
     "arg": "^5.0.2",
     "hyperdyperid": "^1.2.0",
     "multibase": "^4.0.6",
@@ -132,9 +133,6 @@
     "@automerge/automerge": "2.1.7",
     "@collabs/collabs": "0.13.4",
     "@exodus/schemasafe": "^1.0.0-rc.6",
-    "@msgpack/msgpack": "^3.0.0-beta2",
-    "@redis/client": "^1.5.12",
-    "@shelacek/ubjson": "^1.1.1",
     "@types/benchmark": "^2.1.2",
     "@types/jest": "^29.5.12",
     "@types/quill": "^2.0.14",
@@ -143,52 +141,28 @@
     "ajv": "^8.11.0",
     "app-root-path": "^3.1.0",
     "axios": "^1.3.5",
-    "base64-js": "^1.5.1",
     "benchmark": "^2.1.4",
-    "bson": "^5.4.0",
-    "cbor": "^8.1.0",
-    "cbor-js": "^0.1.0",
-    "cbor-sync": "^1.0.4",
-    "cbor-x": "^1.3.0",
-    "cborg": "^2.0.3",
     "concurrently": "^8.0.1",
     "diamond-types-node": "1.0.2",
     "editing-traces": "https://github.com/streamich/editing-traces#6494020428530a6e382378b98d1d7e31334e2d7b",
     "eventsource": "^2.0.2",
-    "fast-deep-equal": "^3.1.3",
-    "fast-equals": "^5.0.1",
     "fast-json-patch": "^3.0.0-1",
-    "fast-safe-stringify": "^2.1.1",
-    "fast-stable-stringify": "^1.0.0",
-    "fastest-stable-stringify": "^2.0.2",
     "find-my-way": "^7.6.0",
     "fork-ts-checker-webpack-plugin": "^8.0.0",
     "gh-pages": "^5.0.0",
     "html-webpack-plugin": "^5.5.1",
     "husky": "^8.0.3",
-    "ion-js": "^4.3.0",
     "isomorphic-ws": "^5.0.0",
     "jest": "^29.7.0",
-    "js-base64": "^3.7.2",
     "js-sdsl": "^4.4.0",
-    "jsbi": "^4.3.0",
     "json-crdt-traces": "https://github.com/streamich/json-crdt-traces#ec825401dc05cbb74b9e0b3c4d6527399f54d54d",
     "json-logic-js": "^2.0.1",
-    "json-pack-napi": "^0.0.2",
-    "load-script": "^2.0.0",
-    "lodash": "^4.17.21",
     "loro-crdt": "^0.4.1",
-    "markdown-it": "^13.0.1",
     "memfs": "^4.8.1",
-    "messagepack": "^1.1.12",
-    "msgpack-lite": "^0.1.26",
-    "msgpack5": "^6.0.2",
-    "msgpackr": "^1.6.0",
     "nodemon": "^3.0.0",
     "ot-text": "^1.0.2",
     "ot-text-unicode": "^4.0.0",
     "p4-css": "^1.5.1",
-    "pako": "^2.0.4",
     "prettier": "^3.2.5",
     "pretty-quick": "^3.1.3",
     "quill-delta": "^5.0.0",
@@ -198,8 +172,6 @@
     "rimraf": "^5.0.0",
     "rope.js": "0.1.0",
     "rxjs": "^7.5.5",
-    "safe-stable-stringify": "^2.3.1",
-    "secure-json-parse": "^2.4.0",
     "sorted-btree": "^1.8.1",
     "tinybench": "^2.4.0",
     "ts-jest": "^29.1.2",
@@ -254,24 +226,19 @@
         "scopes": [
           "",
           "demo",
-          "json-binary",
-          "json-brand",
           "json-cli",
           "json-clone",
           "json-crdt-patch",
           "json-crdt-extensions",
           "json-crdt-peritext-ui",
           "json-crdt",
-          "json-equal",
           "json-expression",
           "json-hash",
           "json-ot",
-          "json-pack",
           "json-patch-multicore",
           "json-patch-ot",
           "json-patch",
           "json-pointer",
-          "json-random",
           "json-schema",
           "json-size",
           "json-stable",

src/index.ts

@@ -7,7 +7,7 @@
  */
 
 export type * from '@jsonjoy.com/json-pack/lib/json-binary/types';
-export type * from '@jsonjoy.com/json-pack/lib/json-brand/types';
+export type * from '@jsonjoy.com/util/lib/json-brand/types';
 export type * from './json-crdt';
 export type * from './json-crdt-patch';
 export type * from './json-crdt-extensions';

src/json-clone/cloneBinary.ts

@@ -1,4 +1,4 @@
-import {isUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/isUint8Array';
+import {isUint8Array} from '@jsonjoy.com/util/lib/buffers/isUint8Array';
 
 const {isArray} = Array;
 const objectKeys = Object.keys;

src/json-crdt-patch/PatchBuilder.ts

@@ -16,7 +16,7 @@ import {
   NopOp,
 } from './operations';
 import {IClock, ITimestampStruct, ITimespanStruct, ts, Timestamp} from './clock';
-import {isUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/isUint8Array';
+import {isUint8Array} from '@jsonjoy.com/util/lib/buffers/isUint8Array';
 import {Patch} from './Patch';
 import {ORIGIN} from './constants';
 import {VectorDelayedValue} from './builder/Tuple';

src/json-crdt-patch/codec/__tests__/PatchFuzzer.ts

@@ -1,5 +1,5 @@
 import {RandomJson} from '../../../json-random';
-import {Fuzzer} from '../../../util/Fuzzer';
+import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {interval, ITimestampStruct, Timespan, ClockVector, ServerClockVector, ts} from '../../clock';
 import {SESSION} from '../../constants';
 import {Patch} from '../../Patch';

src/json-crdt-patch/util/binary/CrdtReader.ts

@@ -1,4 +1,4 @@
-import {Reader} from '@jsonjoy.com/json-pack/lib/util/buffers/Reader';
+import {Reader} from '@jsonjoy.com/util/lib/buffers/Reader';
 
 /** @todo Rename file name. */
 export class CrdtReader extends Reader {

src/json-crdt-patch/util/binary/CrdtWriter.ts

@@ -1,4 +1,4 @@
-import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 
 export class CrdtWriter extends Writer {
   /**

src/json-crdt/__bench__/util/fuzzer-traces.ts

@@ -3,7 +3,7 @@ import * as fs from 'fs';
 import {Patch} from '../../../json-crdt-patch';
 import {CborDecoder} from '@jsonjoy.com/json-pack/lib/cbor/CborDecoder';
 import {Model} from '../../model';
-import {bufferToUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/bufferToUint8Array';
+import {bufferToUint8Array} from '@jsonjoy.com/util/lib/buffers/bufferToUint8Array';
 
 export const loadFuzzerTrace = (traceName: string): [batch: Patch[], model: Model] => {
   const root = path.resolve(__dirname, '..', '..', '..', '..');

src/json-crdt/__tests__/fuzzer/Picker.ts

@@ -2,7 +2,7 @@ import {DelOp, InsObjOp, InsStrOp, InsBinOp, InsArrOp} from '../../../json-crdt-
 import {RandomJson} from '../../../json-random';
 import {JsonNode, ObjNode, ArrNode, BinNode, StrNode} from '../../nodes';
 import {Model} from '../../model/Model';
-import {Fuzzer} from '../../../util/Fuzzer';
+import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {FuzzerOptions} from './types';
 
 type StringOp = typeof InsStrOp | typeof DelOp;

src/json-crdt/__tests__/fuzzer/SessionLogical.ts

@@ -21,7 +21,7 @@ import {randomU32} from 'hyperdyperid/lib/randomU32';
 import {StrNode, ValNode, ObjNode, ArrNode, BinNode} from '../../nodes';
 import {interval} from '../../../json-crdt-patch/clock';
 import type {JsonCrdtFuzzer} from './JsonCrdtFuzzer';
-import {Fuzzer} from '../../../util/Fuzzer';
+import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 
 const jsonEncoder = new JsonEncoder();
 const jsonDecoder = new JsonDecoder();

src/json-crdt/__tests__/fuzzer/generate-trace.ts

@@ -5,7 +5,7 @@ import {Patch} from '../../../json-crdt-patch';
 import {Model} from '../../model';
 import {JsonCrdtFuzzer} from './JsonCrdtFuzzer';
 import {CborEncoder} from '@jsonjoy.com/json-pack/lib/cbor/CborEncoder';
-import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import * as fs from 'fs';
 
 const sessionNum = 100;

src/json-crdt/codec/sidecar/binary/Decoder.ts

@@ -5,7 +5,7 @@ import {Model, UNDEFINED} from '../../../model/Model';
 import {CborDecoderBase} from '@jsonjoy.com/json-pack/lib/cbor/CborDecoderBase';
 import * as nodes from '../../../nodes';
 import {CRDT_MAJOR} from '../../structural/binary/constants';
-import {sort} from '../../../../util/sort/insertion';
+import {sort} from '@jsonjoy.com/util/lib/sort/insertion';
 import {SESSION} from '../../../../json-crdt-patch/constants';
 
 export class Decoder {

src/json-crdt/codec/sidecar/binary/Encoder.ts

@@ -5,7 +5,7 @@ import {ITimestampStruct, Timestamp} from '../../../../json-crdt-patch/clock';
 import {CborEncoder} from '@jsonjoy.com/json-pack/lib/cbor/CborEncoder';
 import {SESSION} from '../../../../json-crdt-patch/constants';
 import {CRDT_MAJOR_OVERLAY} from '../../structural/binary/constants';
-import {sort} from '@jsonjoy.com/json-pack/lib/util/sort/insertion';
+import {sort} from '@jsonjoy.com/util/lib/sort/insertion';
 import {UNDEFINED} from '../../../model/Model';
 import type {Model} from '../../../model';
 

src/json-crdt/log/codec/logEncoderOpts.ts

@@ -1,4 +1,4 @@
-import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {Encoder as SidecarEncoder} from '../../codec/sidecar/binary/Encoder';
 import {Encoder as StructuralEncoderCompact} from '../../codec/structural/compact/Encoder';
 import {Encoder as StructuralEncoderVerbose} from '../../codec/structural/verbose/Encoder';

src/json-crdt/nodes/bin/__tests__/BinNode.fuzzing.spec.ts

@@ -1,7 +1,7 @@
 /* tslint:disable no-console */
 
 import {ITimespanStruct, ITimestampStruct, ts} from '../../../../json-crdt-patch/clock';
-import {Fuzzer} from '../../../../util/Fuzzer';
+import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {BinNode} from '../BinNode';
 import {randomU32} from 'hyperdyperid/lib/randomU32';
 import {RandomJson} from '../../../../json-random';

src/json-crdt/nodes/rga/AbstractRga.ts

@@ -8,14 +8,14 @@ import {
   containsId,
   Timestamp,
 } from '../../../json-crdt-patch/clock';
-import {isUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/isUint8Array';
+import {isUint8Array} from '@jsonjoy.com/util/lib/buffers/isUint8Array';
 import {rSplay, lSplay, llSplay, rrSplay, lrSplay, rlSplay} from '../../../util/trees/splay/util';
 import {splay2} from '../../../util/trees/splay/util2';
 import {insert2, remove2} from '../../../util/trees/util2';
 import {ORIGIN} from '../../../json-crdt-patch/constants';
 import {printTree} from '../../../util/print/printTree';
 import {printBinary} from '../../../util/print/printBinary';
-import {printOctets} from '@jsonjoy.com/json-pack/lib/util/buffers/printOctets';
+import {printOctets} from '@jsonjoy.com/util/lib/buffers/printOctets';
 
 /**
  * @category CRDT Node

src/json-crdt/nodes/str/__tests__/StrNode.fuzzing-2.spec.ts

@@ -1,7 +1,7 @@
 /* tslint:disable no-console */
 
 import {ITimespanStruct, ITimestampStruct, ts} from '../../../../json-crdt-patch/clock';
-import {Fuzzer} from '../../../../util/Fuzzer';
+import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {StrNode} from '../StrNode';
 import {randomU32} from 'hyperdyperid/lib/randomU32';
 import * as path from 'path';

src/json-crdt/nodes/str/__tests__/StrNode.fuzzing.spec.ts

@@ -1,7 +1,7 @@
 /* tslint:disable no-console */
 
 import {ITimespanStruct, ITimestampStruct, ts} from '../../../../json-crdt-patch/clock';
-import {Fuzzer} from '../../../../util/Fuzzer';
+import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {StrNode} from '../StrNode';
 import {randomU32} from 'hyperdyperid/lib/randomU32';
 import {RandomJson} from '../../../../json-random';

src/json-crdt/nodes/str/__tests__/StrNodeFuzzer.ts

@@ -1,6 +1,6 @@
 import {equal} from 'assert';
 import {ITimespanStruct, ITimestampStruct, ClockVector, toDisplayString, ts} from '../../../../json-crdt-patch/clock';
-import {Fuzzer} from '../../../../util/Fuzzer';
+import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {randomSessionId} from '../../../model/util';
 import {StrNode} from '../StrNode';
 import {printTree} from '../../../../util/print/printTree';

src/json-crdt/schema/__tests__/toSchema.spec.ts

@@ -1,6 +1,6 @@
 import {NodeBuilder, s, nodes} from '../../../json-crdt-patch';
 import {deepEqual} from '../../../json-equal/deepEqual';
-import {cmpUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/cmpUint8Array';
+import {cmpUint8Array} from '@jsonjoy.com/util/lib/buffers/cmpUint8Array';
 import {Model} from '../../model';
 import {toSchema} from '../toSchema';
 

src/json-equal/$$deepEqual/v1.ts

@@ -1,4 +1,4 @@
-import {JavaScript} from '@jsonjoy.com/json-pack/lib/util/codegen';
+import {JavaScript} from '@jsonjoy.com/util/lib/codegen';
 
 const codegenValue = (doc: unknown, code: string[], r: number): number => {
   let rr = r;

src/json-expression/codegen.ts

@@ -1,8 +1,8 @@
 import * as util from './util';
-import {Codegen} from '@jsonjoy.com/json-pack/lib/util/codegen/Codegen';
+import {Codegen} from '@jsonjoy.com/util/lib/codegen/Codegen';
 import {ExpressionResult, Literal} from './codegen-steps';
 import {createEvaluate} from './createEvaluate';
-import {JavaScript} from '@jsonjoy.com/json-pack/lib/util/codegen';
+import {JavaScript} from '@jsonjoy.com/util/lib/codegen';
 import {Vars} from './Vars';
 import type * as types from './types';
 

src/json-expression/types.ts

@@ -1,4 +1,4 @@
-import type {JavaScript} from '../util/codegen';
+import type {JavaScript} from '@jsonjoy.com/util/lib/codegen';
 import type {Vars} from './Vars';
 import type {ExpressionResult} from './codegen-steps';
 

src/json-hash/index.ts

@@ -1,5 +1,5 @@
 import type {JsonValue} from '@jsonjoy.com/json-pack/lib/types';
-import {sort} from '../util/sort/insertion';
+import {sort} from '@jsonjoy.com/util/lib/sort/insertion';
 
 export const enum CONST {
   START_STATE = 5381,

src/json-ot/types/ot-binary-irreversible/__tests__/BinaryOtFuzzer.ts

@@ -1,5 +1,5 @@
 import {RandomJson} from '../../../../json-random';
-import {Fuzzer} from '../../../../util/Fuzzer';
+import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {append, normalize} from '../util';
 import {BinaryOp} from '../types';
 

src/json-ot/types/ot-json/__tests__/fuzzer/JsonOtFuzzer.ts

@@ -1,7 +1,7 @@
 import {clone} from '../../../../../json-clone';
 import {find, isArrayReference, isObjectReference, Path} from '../../../../../json-pointer';
 import {RandomJson} from '../../../../../json-random';
-import {Fuzzer} from '../../../../../util/Fuzzer';
+import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import type {JsonOp, JsonOpDataComponent, JsonOpDropComponent, JsonOpPickComponent} from '../../types';
 import {applyPatch} from '../../../../../json-patch/applyPatch';
 

src/json-ot/types/ot-string-irreversible/__tests__/StringOtFuzzer.ts

@@ -1,5 +1,5 @@
 import {RandomJson} from '../../../../json-random';
-import {Fuzzer} from '../../../../util/Fuzzer';
+import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {append, normalize} from '../util';
 import {StringOp} from '../types';
 

src/json-ot/types/ot-string/__tests__/StringOtFuzzer.ts

@@ -1,5 +1,5 @@
 import {RandomJson} from '../../../../json-random';
-import {Fuzzer} from '../../../../util/Fuzzer';
+import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {append, normalize} from '../util';
 import {StringOp} from '../types';
 

src/json-patch/applyPatch/v3.ts

@@ -3,7 +3,7 @@ import {Operation} from '../types';
 import {findByPointer, unescapeComponent} from '../../json-pointer';
 import {deepEqual} from '../../json-equal/deepEqual';
 import type {ApplyPatchOptions, OpResult, PatchResult} from './types';
-import {hasOwnProperty} from '../../util/hasOwnProperty';
+import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty';
 
 const {isArray} = Array;
 

src/json-patch/codec/binary/Decoder.ts

@@ -37,7 +37,7 @@ import {Path} from '../../../json-pointer';
 import {JsonPatchTypes} from '../json/types';
 import {createMatcherDefault} from '../../util';
 import type {JsonPatchOptions} from '../../types';
-import type {Reader} from '@jsonjoy.com/json-pack/lib/util/buffers/Reader';
+import type {Reader} from '@jsonjoy.com/util/lib/buffers/Reader';
 
 export class Decoder extends MsgPackDecoderFast<Reader> {
   constructor(private readonly options: JsonPatchOptions) {

src/json-patch/codegen/apply.ts

@@ -5,7 +5,7 @@ import {AbstractPredicateOp} from '../op';
 import {ApplyPatchOptions} from '../applyPatch/types';
 import type {JsonPatchOptions} from '..';
 import type {ApplyFn} from './types';
-import {compile, JavaScriptLinked, JavaScript} from '../../util/codegen';
+import {compile, JavaScriptLinked, JavaScript} from '@jsonjoy.com/util/lib/codegen';
 import {codegenOp} from './codegenOp';
 
 export const apply = (patch: readonly Operation[], applyOptions: ApplyPatchOptions, doc: unknown): unknown => {

src/json-patch/codegen/ops/add.ts

@@ -1,5 +1,5 @@
 import {OpAdd} from '../../op';
-import {JavaScriptLinked, compileClosure, JavaScript} from '../../../util/codegen';
+import {JavaScriptLinked, compileClosure, JavaScript} from '@jsonjoy.com/util/lib/codegen';
 import type {ApplyFn} from '../types';
 import {$findRef} from '../../../json-pointer/codegen/findRef';
 

src/json-patch/codegen/ops/starts.ts

@@ -1,6 +1,6 @@
 import {OpStarts} from '../../op';
 import {$$find} from '../../../json-pointer/codegen/find';
-import {JavaScriptLinked, compileClosure, JavaScript} from '../../../util/codegen';
+import {JavaScriptLinked, compileClosure, JavaScript} from '@jsonjoy.com/util/lib/codegen';
 import {predicateOpWrapper} from '../util';
 import type {ApplyFn} from '../types';
 

src/json-patch/codegen/ops/test.ts

@@ -1,7 +1,7 @@
 import {OpTest} from '../../op';
 import {$$find} from '../../../json-pointer/codegen/find';
 import {$$deepEqual} from '../../../json-equal/$$deepEqual';
-import {JavaScriptLinked, compileClosure, JavaScript} from '../../../util/codegen';
+import {JavaScriptLinked, compileClosure, JavaScript} from '@jsonjoy.com/util/lib/codegen';
 import {predicateOpWrapper} from '../util';
 import type {ApplyFn} from '../types';
 

src/json-patch/validate.ts

@@ -23,7 +23,7 @@ import {
   JsonPatchTypes,
 } from './types';
 import {validateJsonPointer} from '../json-pointer/validate';
-import {hasOwnProperty} from '../util/hasOwnProperty';
+import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty';
 
 export const validateOperations = (ops: Operation[], allowMatchesOp: boolean = false) => {
   if (!Array.isArray(ops)) throw new Error('Not a array.');

src/json-pointer/codegen/find.ts

@@ -1,4 +1,4 @@
-import {JavaScript} from '../../util/codegen';
+import {JavaScript} from '@jsonjoy.com/util/lib/codegen';
 import {Path} from '../types';
 
 export const $$find = (path: Path): JavaScript<(doc: unknown) => unknown> => {