Merge pull request #570 from streamich/bump-json-pack

Bump json pack

Author: streamich

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-brand/index.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-clone/cloneBinary.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/PatchBuilder.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/codec/__tests__/PatchFuzzer.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/CrdtReader.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-patch/util/binary/CrdtWriter.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/__bench__/util/fuzzer-traces.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;