Merge pull request #712 from streamich/json-pointer

Switch to using @jsonjoy.com/json-pointer library

Author: streamich

.github/workflows/pr.yml

@@ -43,7 +43,6 @@ jobs:
       - run: yarn test:cli:patch
       - run: yarn test:cli:pack
       - run: yarn demo:json-patch
-      - run: yarn demo:json-pointer
   typedoc:
     runs-on: ubuntu-latest
     strategy:

.github/workflows/release.yml

@@ -27,7 +27,6 @@ jobs:
       - run: yarn test:cli:patch
       - run: yarn test:cli:pack
       - run: yarn demo:json-patch
-      - run: yarn demo:json-pointer
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v4
         env:

package.json

@@ -87,14 +87,13 @@
     "build": "yarn build:es2020",
     "jest": "jest",
     "test": "jest --maxWorkers 7",
-    "test:all": "yarn lint && yarn test && yarn build:all && yarn test:cli:pointer && yarn test:cli:patch && yarn test:cli:pack && yarn demo:json-patch && yarn demo:json-pointer",
+    "test:all": "yarn lint && yarn test && yarn build:all && yarn test:cli:pointer && yarn test:cli:patch && yarn test:cli:pack && yarn demo:json-patch",
     "test:ci": "yarn jest --maxWorkers 3 --no-cache",
     "test:cli": "yarn test:cli:pointer && yarn test:cli:patch && yarn test:cli:pack",
     "test:cli:pointer": "./bin/json-pointer-test.js ./bin/json-pointer.js",
     "test:cli:patch": "./bin/json-patch-test.js ./bin/json-patch.js",
     "test:cli:pack": "./bin/json-pack-test.js ./bin/json-pack.js",
     "demo:json-patch": "npx ts-node src/json-patch/__demos__/json-patch.ts",
-    "demo:json-pointer": "npx ts-node src/json-pointer/__demos__/json-pointer.ts",
     "bench:json-crdt:traces:crdt-libs": "cd src/json-crdt/__bench__ && yarn && yarn bench:traces:crdt-libs",
     "bench:json-crdt:traces:non-crdt-libs": "cd src/json-crdt/__bench__ && yarn && yarn bench:traces:non-crdt-libs",
     "bench:json-crdt:concurrent-traces": "cd src/json-crdt/__bench__ && yarn && yarn bench:concurrent-traces",
@@ -117,6 +116,7 @@
   "peerDependencies": {
     "@jsonjoy.com/base64": "^1.1.2",
     "@jsonjoy.com/json-pack": "^1.0.4",
+    "@jsonjoy.com/json-pointer": "^1.0.0",
     "@jsonjoy.com/util": "^1.3.0",
     "rxjs": "7",
     "tslib": "2"
@@ -136,6 +136,7 @@
   "devDependencies": {
     "@jsonjoy.com/base64": "^1.1.2",
     "@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",
@@ -197,7 +198,6 @@
           "json-ot",
           "json-patch-ot",
           "json-patch",
-          "json-pointer",
           "json-schema",
           "json-size",
           "json-stable",

src/index.ts

@@ -13,5 +13,4 @@ export type * from './json-crdt-patch';
 export type * from './json-crdt-extensions';
 export type * from './json-expression/types';
 export type * from './json-patch/types';
-export type * from './json-pointer/types';
 export type * from './json-schema/types';

src/json-cli/json-pointer.ts

@@ -1,7 +1,7 @@
 /* tslint:disable no-string-throw */
 
 import {readFileSync} from 'fs';
-import {findByPointer} from '../json-pointer';
+import {findByPointer} from '@jsonjoy.com/json-pointer';
 
 try {
   const buf = readFileSync(0);

src/json-crdt-extensions/peritext/block/Block.ts

@@ -4,7 +4,7 @@ import {MarkerOverlayPoint} from '../overlay/MarkerOverlayPoint';
 import {OverlayPoint} from '../overlay/OverlayPoint';
 import {UndefEndIter, type UndefIterator} from '../../../util/iterator';
 import {Inline} from './Inline';
-import type {Path} from '../../../json-pointer';
+import type {Path} from '@jsonjoy.com/json-pointer';
 import type {Printable} from 'tree-dump';
 import type {Peritext} from '../Peritext';
 import type {Stateful} from '../types';

src/json-crdt-extensions/peritext/block/Blocks.ts

@@ -3,7 +3,7 @@ import {MarkerOverlayPoint} from '../overlay/MarkerOverlayPoint';
 import {commonLength} from '../util/commonLength';
 import {printTree} from 'tree-dump/lib/printTree';
 import {LeafBlock} from './LeafBlock';
-import type {Path} from '../../../json-pointer';
+import type {Path} from '@jsonjoy.com/json-pointer';
 import type {Stateful} from '../types';
 import type {Printable} from 'tree-dump/lib/types';
 import type {Peritext} from '../Peritext';

src/json-crdt-extensions/peritext/block/Inline.ts

@@ -8,7 +8,7 @@ import {updateNum} from '../../../json-hash';
 import {MarkerOverlayPoint} from '../overlay/MarkerOverlayPoint';
 import type {AbstractRga} from '../../../json-crdt/nodes/rga';
 import type {Printable} from 'tree-dump/lib/types';
-import type {PathStep} from '../../../json-pointer';
+import type {PathStep} from '@jsonjoy.com/json-pointer';
 import type {Peritext} from '../Peritext';
 
 export const enum InlineAttrPos {

src/json-crdt-extensions/peritext/block/LeafBlock.ts

@@ -1,6 +1,6 @@
 import {printTree} from 'tree-dump/lib/printTree';
 import {Block} from './Block';
-import type {Path} from '../../../json-pointer';
+import type {Path} from '@jsonjoy.com/json-pointer';
 
 export interface IBlock<Attr = unknown> {
   readonly path: Path;

src/json-crdt-extensions/peritext/util/commonLength.ts

@@ -1,4 +1,4 @@
-import type {Path} from '../../../json-pointer';
+import type {Path} from '@jsonjoy.com/json-pointer';
 
 export const commonLength = (a: Path, b: Path): number => {
   let i = 0;