Merge pull request #714 from streamich/restructure-libs

Restructure libs

package.json

@@ -114,11 +114,6 @@
     "upgrade:interactive": "npx [email protected] --interactive"
   },
   "peerDependencies": {
-    "@jsonjoy.com/base64": "^1.1.2",
-    "@jsonjoy.com/json-expression": "^1.0.0",
-    "@jsonjoy.com/json-pack": "^1.0.4",
-    "@jsonjoy.com/json-pointer": "^1.0.0",
-    "@jsonjoy.com/util": "^1.3.0",
     "rxjs": "7",
     "tslib": "2"
   },
@@ -128,18 +123,19 @@
     }
   },
   "dependencies": {
+    "@jsonjoy.com/base64": "^1.1.2",
+    "@jsonjoy.com/json-expression": "^1.0.0",
+    "@jsonjoy.com/json-pack": "^1.1.0",
+    "@jsonjoy.com/json-pointer": "^1.0.0",
+    "@jsonjoy.com/json-type": "^1.0.0",
+    "@jsonjoy.com/util": "^1.4.0",
     "arg": "^5.0.2",
     "hyperdyperid": "^1.2.0",
     "sonic-forest": "^1.0.3",
     "thingies": "^2.1.1",
     "tree-dump": "^1.0.2"
   },
   "devDependencies": {
-    "@jsonjoy.com/base64": "^1.1.2",
-    "@jsonjoy.com/json-expression": "^1.0.0",
-    "@jsonjoy.com/json-pack": "^1.0.4",
-    "@jsonjoy.com/json-pointer": "^1.0.0",
-    "@jsonjoy.com/util": "^1.3.0",
     "@types/benchmark": "^2.1.5",
     "@types/jest": "^29.5.12",
     "benchmark": "^2.1.4",
@@ -190,7 +186,6 @@
           "",
           "demo",
           "json-cli",
-          "json-clone",
           "json-crdt-patch",
           "json-crdt-extensions",
           "json-crdt-peritext-ui",
@@ -199,12 +194,8 @@
           "json-ot",
           "json-patch-ot",
           "json-patch",
-          "json-schema",
-          "json-size",
           "json-stable",
           "json-text",
-          "json-type",
-          "json-type-value",
           "json-walk",
           "util"
         ]

src/index.ts

@@ -12,4 +12,3 @@ export type * from './json-crdt';
 export type * from './json-crdt-patch';
 export type * from './json-crdt-extensions';
 export type * from './json-patch/types';
-export type * from './json-schema/types';

src/json-cli/json-patch-test.ts

@@ -2,7 +2,7 @@
 
 import {spawnSync} from 'child_process';
 import {validateOperation} from '../json-patch';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 import {testSuites} from './test/suites';
 
 const bin = String(process.argv[2]);

src/json-cli/json-pointer-test.ts

@@ -2,7 +2,7 @@
 
 import {spawnSync} from 'child_process';
 import {testCases} from './json-pointer-testCases';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 
 const bin = String(process.argv[2]);
 

src/json-cli/json-unpack.ts

@@ -1,7 +1,7 @@
 import {readFileSync} from 'fs';
 import {MsgPackDecoderFast} from '@jsonjoy.com/json-pack/lib/msgpack';
 import {CborDecoder} from '@jsonjoy.com/json-pack/lib/cbor/CborDecoder';
-import * as JSONB from '../json-binary';
+import * as JSONB from '@jsonjoy.com/json-pack/lib/json-binary';
 import arg from 'arg';
 
 const args = arg(

src/json-cli/test/op.replace.tests.json.ts

@@ -1,4 +1,4 @@
-import {clone as deepClone} from '../../json-clone/clone';
+import {clone as deepClone} from '@jsonjoy.com/util/lib/json-clone/clone';
 import {TestCase} from './types';
 
 const values: [string, unknown][] = [

src/json-crdt-extensions/quill-delta/QuillDeltaNode.ts

@@ -1,5 +1,5 @@
 import {isEmpty} from '@jsonjoy.com/util/lib/isEmpty';
-import {deepEqual} from '../../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 import {StrNode} from '../../json-crdt/nodes/str/StrNode';
 import {ArrNode} from '../../json-crdt/nodes/arr/ArrNode';
 import {Peritext} from '../peritext';

src/json-crdt-extensions/quill-delta/__tests__/QuillDeltaFuzzer.ts

@@ -3,7 +3,7 @@ import {randomU32} from 'hyperdyperid/lib/randomU32';
 import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {isEmpty} from '@jsonjoy.com/util/lib/isEmpty';
 import {QuillDeltaAttributes, QuillDeltaOp, QuillDeltaOpInsert, QuillDeltaOpRetain, QuillTrace} from '../types';
-import {RandomJson} from '../../../json-random';
+import {RandomJson} from '@jsonjoy.com/util/lib/json-random';
 import {removeErasures} from '../util';
 
 export interface QuillDeltaFuzzerOptions {

src/json-crdt-extensions/quill-delta/__tests__/fuzzing.yjs.spec.ts

@@ -1,8 +1,8 @@
 import {QuillDeltaFuzzer} from './QuillDeltaFuzzer';
 import {Doc as YDoc} from 'yjs';
 import {QuillDeltaOp, QuillDeltaOpDelete} from '../types';
-import {deepEqual} from '../../../json-equal/deepEqual';
-import {clone} from '../../../json-clone';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
+import {clone} from '@jsonjoy.com/util/lib/json-clone';
 
 const normalizeDelta = (delta: QuillDeltaOp[]): QuillDeltaOp[] => {
   const length = delta.length;

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

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

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

@@ -2,7 +2,7 @@ import {Model} from '../../model/Model';
 import {SessionLogical} from './SessionLogical';
 import {Picker} from './Picker';
 import {FuzzerOptions} from './types';
-import {RandomJson} from '../../../json-random/RandomJson';
+import {RandomJson} from '@jsonjoy.com/util/lib/json-random/RandomJson';
 import {generateInteger} from './util';
 import {PatchBuilder} from '../../../json-crdt-patch/PatchBuilder';
 import {Patch} from '../../../json-crdt-patch';

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

@@ -1,5 +1,5 @@
 import {DelOp, InsObjOp, InsStrOp, InsBinOp, InsArrOp} from '../../../json-crdt-patch/operations';
-import {RandomJson} from '../../../json-random';
+import {RandomJson} from '@jsonjoy.com/util/lib/json-random';
 import {JsonNode, ObjNode, ArrNode, BinNode, StrNode} from '../../nodes';
 import {Model} from '../../model/Model';
 import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';

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

@@ -16,7 +16,7 @@ import {generateInteger} from './util';
 import {Model} from '../..';
 import {Patch} from '../../../json-crdt-patch/Patch';
 import {PatchBuilder} from '../../../json-crdt-patch/PatchBuilder';
-import {RandomJson} from '../../../json-random/RandomJson';
+import {RandomJson} from '@jsonjoy.com/util/lib/json-random/RandomJson';
 import {randomU32} from 'hyperdyperid/lib/randomU32';
 import {StrNode, ValNode, ObjNode, ArrNode, BinNode} from '../../nodes';
 import {interval} from '../../../json-crdt-patch/clock';

src/json-crdt/__tests__/hash.spec.ts

@@ -1,4 +1,4 @@
-import {RandomJson} from '../../json-random';
+import {RandomJson} from '@jsonjoy.com/util/lib/json-random';
 import {hashNode} from '../hash';
 import {Model} from '../model';
 

src/json-crdt/json-patch/JsonPatch.ts

@@ -1,4 +1,4 @@
-import {deepEqual} from '../../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 import {ObjNode, ArrNode, JsonNode, ConNode} from '../nodes';
 import {toPath, isChild} from '@jsonjoy.com/json-pointer/lib/util';
 import {interval} from '../../json-crdt-patch/clock';

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

@@ -4,7 +4,7 @@ import {ITimespanStruct, ITimestampStruct, ts} from '../../../../json-crdt-patch
 import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {BinNode} from '../BinNode';
 import {randomU32} from 'hyperdyperid/lib/randomU32';
-import {RandomJson} from '../../../../json-random';
+import {RandomJson} from '@jsonjoy.com/util/lib/json-random';
 import * as path from 'path';
 import * as fs from 'fs';
 

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

@@ -4,7 +4,7 @@ import {ITimespanStruct, ITimestampStruct, ts} from '../../../../json-crdt-patch
 import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer';
 import {StrNode} from '../StrNode';
 import {randomU32} from 'hyperdyperid/lib/randomU32';
-import {RandomJson} from '../../../../json-random';
+import {RandomJson} from '@jsonjoy.com/util/lib/json-random';
 import * as path from 'path';
 import * as fs from 'fs';
 

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

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