Merge pull request #714 from streamich/restructure-libs

Restructure libs

Author: streamich

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-binary/index.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-patch-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-pointer-test.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/json-unpack.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][] = [