Merge pull request #712 from streamich/json-pointer

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

.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;

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

@@ -1,5 +1,5 @@
 import {QuillConst} from './constants';
-import {PathStep} from '../../json-pointer';
+import {PathStep} from '@jsonjoy.com/json-pointer';
 import {QuillDeltaNode} from './QuillDeltaNode';
 import {NodeApi} from '../../json-crdt/model/api/nodes';
 import {konst} from '../../json-crdt-patch/builder/Konst';

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

@@ -3,7 +3,7 @@ import {PersistedSlice} from '../peritext/slice/PersistedSlice';
 import {SliceBehavior} from '../peritext/slice/constants';
 import type {OverlayPoint} from '../peritext/overlay/OverlayPoint';
 import type {QuillDeltaAttributes} from './types';
-import type {PathStep} from '../../json-pointer';
+import type {PathStep} from '@jsonjoy.com/json-pointer';
 
 export const getAttributes = (overlayPoint: OverlayPoint): QuillDeltaAttributes | undefined => {
   const layers = overlayPoint.layers;

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

@@ -1,9 +1,9 @@
 import {deepEqual} from '../../json-equal/deepEqual';
 import {ObjNode, ArrNode, JsonNode, ConNode} from '../nodes';
-import {toPath, isChild} from '../../json-pointer/util';
+import {toPath, isChild} from '@jsonjoy.com/json-pointer/lib/util';
 import {interval} from '../../json-crdt-patch/clock';
 import {PatchBuilder} from '../../json-crdt-patch/PatchBuilder';
-import type {Path} from '../../json-pointer/types';
+import type {Path} from '@jsonjoy.com/json-pointer/lib/types';
 import type {Model} from '../model';
 import type {Operation} from '../../json-patch';
 

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

@@ -1,8 +1,8 @@
 import {SyncStore} from '../../util/events/sync-store';
 import {JsonNodeApi} from '../model/api/types';
 import {JsonPatch} from './JsonPatch';
-import {toPath} from '../../json-pointer/util';
-import type {Path} from '../../json-pointer/types';
+import {toPath} from '@jsonjoy.com/json-pointer/lib/util';
+import type {Path} from '@jsonjoy.com/json-pointer/lib/types';
 import type {Model} from '../model';
 import type {Operation, OperationAdd, OperationRemove, OperationReplace} from '../../json-patch';
 import type {JsonNode, JsonNodeView} from '../nodes';

src/json-crdt/model/api/find.ts

@@ -1,4 +1,4 @@
-import {Path, toPath} from '../../../json-pointer';
+import {Path, toPath} from '@jsonjoy.com/json-pointer';
 import {VecNode, ObjNode, ArrNode} from '../../nodes';
 import type {JsonNode} from '../../nodes';
 

src/json-crdt/model/api/nodes.ts

@@ -1,7 +1,7 @@
 import {printTree} from 'tree-dump/lib/printTree';
 import {find} from './find';
 import {ITimestampStruct, Timestamp} from '../../../json-crdt-patch/clock';
-import {Path} from '../../../json-pointer';
+import {Path} from '@jsonjoy.com/json-pointer';
 import {ObjNode, ArrNode, BinNode, ConNode, VecNode, ValNode, StrNode, RootNode} from '../../nodes';
 import {NodeEvents} from './NodeEvents';
 import {ExtNode} from '../../extensions/ExtNode';

src/json-expression/Vars.ts

@@ -1,4 +1,4 @@
-import {get, toPath, validateJsonPointer} from '../json-pointer';
+import {get, toPath, validateJsonPointer} from '@jsonjoy.com/json-pointer';
 
 export class Vars {
   protected readonly vars: Map<string, unknown> = new Map();

src/json-expression/operators/input.ts

@@ -1,8 +1,8 @@
 import {Expression, ExpressionResult, Literal} from '../codegen-steps';
 import * as util from '../util';
-import * as jsonPointer from '../../json-pointer';
+import * as jsonPointer from '@jsonjoy.com/json-pointer';
 import {Vars} from '../Vars';
-import {$$find} from '../../json-pointer/codegen/find';
+import {$$find} from '@jsonjoy.com/json-pointer/lib/codegen/find';
 import type * as types from '../types';
 
 const get = (vars: Vars, varname: unknown) => {

src/json-expression/operators/patch.ts

@@ -1,9 +1,9 @@
 import {Expression, ExpressionResult} from '../codegen-steps';
 import type * as types from '../types';
-import {Path, toPath} from '../../json-pointer';
+import {Path, toPath} from '@jsonjoy.com/json-pointer';
 import {JavaScript, JavaScriptLinked, compileClosure} from '@jsonjoy.com/util/lib/codegen';
-import {$findRef} from '../../json-pointer/codegen/findRef';
-import {find} from '../../json-pointer/find';
+import {$findRef} from '@jsonjoy.com/json-pointer/lib/codegen/findRef';
+import {find} from '@jsonjoy.com/json-pointer/lib/find';
 
 const validateAddOperandCount = (count: number) => {
   if (count < 3) {

src/json-expression/util.ts

@@ -1,5 +1,5 @@
 import {deepEqual} from '../json-equal/deepEqual';
-import {toPath, get as get_} from '../json-pointer';
+import {toPath, get as get_} from '@jsonjoy.com/json-pointer';
 import type {Vars} from './Vars';
 import type {Expression, Literal, OperatorDefinition, OperatorMap} from './types';
 

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

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

src/json-ot/types/ot-json/apply.ts

@@ -1,4 +1,4 @@
-import {find, isArrayReference, isObjectReference} from '../../../json-pointer';
+import {find, isArrayReference, isObjectReference} from '@jsonjoy.com/json-pointer';
 import {JsonOp} from './types';
 import {evaluate as evalExpression} from '../../../json-expression/evaluate';
 import {comparePath} from './util';

src/json-ot/types/ot-json/json-patch.ts

@@ -1,6 +1,6 @@
 import {literal} from '../../../json-expression/util';
 import {OpTree} from './tree';
-import {toPath} from '../../../json-pointer/util';
+import {toPath} from '@jsonjoy.com/json-pointer/lib/util';
 import type {Operation} from '../../../json-patch';
 import type {Expr} from '../../../json-expression';
 import type {JsonOp} from './types';

src/json-ot/types/ot-json/tree.ts

@@ -1,5 +1,5 @@
 import type {Expr} from '../../../json-expression';
-import type {Path} from '../../../json-pointer';
+import type {Path} from '@jsonjoy.com/json-pointer';
 import type {JsonOp, JsonOpDataComponent, JsonOpDropComponent, JsonOpPickComponent} from './types';
 
 const toStringNode = (self: PickNode | DropNode, tab: string = ''): string => {

src/json-ot/types/ot-json/types.ts

@@ -1,7 +1,7 @@
 import type {BinaryOp} from '../ot-binary-irreversible/types';
 import type {EDIT_TYPE} from './constants';
 import type {Expr} from '../../../json-expression';
-import type {Path} from '../../../json-pointer';
+import type {Path} from '@jsonjoy.com/json-pointer';
 import type {StringOp} from '../ot-string-irreversible/types';
 
 export type JsonOpTestComponent = Expr;

src/json-ot/types/ot-json/util.ts

@@ -1,4 +1,4 @@
-import type {Path} from '../../../json-pointer';
+import type {Path} from '@jsonjoy.com/json-pointer';
 
 const comparePathComponent = (a: string | number, b: string | number): number => {
   if (a === b) return 0;

src/json-patch-ot/__tests__/util.spec.ts

@@ -1,5 +1,5 @@
 import {replaceIndices} from '../util';
-import {isValidIndex} from '../../json-pointer';
+import {isValidIndex} from '@jsonjoy.com/json-pointer';
 
 describe('Utils', () => {
   describe('isIndexValid', () => {

src/json-patch-ot/transforms/util.ts

@@ -1,4 +1,4 @@
-import {isValidIndex, isChild, parent, Path} from '../../json-pointer';
+import {isValidIndex, isChild, parent, Path} from '@jsonjoy.com/json-pointer';
 
 export const bumpArrayPath = (path1: Path, path2: Path): undefined | Path => {
   const folder = parent(path1);

src/json-patch-ot/transforms/xAdd.ts

@@ -1,5 +1,5 @@
 import {OpAdd, Op} from '../../json-patch/op';
-import {isRoot, isValidIndex, isChild, formatJsonPointer} from '../../json-pointer';
+import {isRoot, isValidIndex, isChild, formatJsonPointer} from '@jsonjoy.com/json-pointer';
 import {Operation} from '../../json-patch/types';
 import {bumpArrayPath} from './util';
 import {operationToOp} from '../../json-patch/codec/json';

src/json-patch-ot/transforms/xMove.ts

@@ -1,6 +1,6 @@
 import {operationToOp} from '../../json-patch/codec/json';
 import {OpMove, Op} from '../../json-patch/op';
-import {isRoot, isChild} from '../../json-pointer';
+import {isRoot, isChild} from '@jsonjoy.com/json-pointer';
 
 export const xMove = (move: OpMove, op: Op): null | Op | Op[] => {
   if (isRoot(move.path)) return op;

src/json-patch-ot/transforms/xRemove.ts

@@ -1,5 +1,5 @@
 import {OpRemove, Op} from '../../json-patch/op';
-import {isRoot, isValidIndex, formatJsonPointer, isPathEqual} from '../../json-pointer';
+import {isRoot, isValidIndex, formatJsonPointer, isPathEqual} from '@jsonjoy.com/json-pointer';
 import {lowerArrayPath} from './util';
 import {Operation} from '../../json-patch/types';
 import {operationToOp} from '../../json-patch/codec/json';

src/json-patch-ot/util.ts

@@ -1,4 +1,4 @@
-import {isValidIndex} from '../json-pointer';
+import {isValidIndex} from '@jsonjoy.com/json-pointer';
 
 export function replaceIndices(path: string, arrayPath: string, index: string, incUp: boolean): string {
   const remainder = path.substr(arrayPath.length);

src/json-patch/applyPatch/v2.ts

@@ -1,6 +1,6 @@
 import {clone as deepClone} from '../../json-clone/clone';
 import {Operation} from '../types';
-import {findByPointer} from '../../json-pointer/findByPointer/v6';
+import {findByPointer} from '@jsonjoy.com/json-pointer/lib/findByPointer/v6';
 import type {ApplyPatchOptions, OpResult, PatchResult} from './types';
 
 function applyOp(doc: unknown, operation: Operation): OpResult {

src/json-patch/applyPatch/v3.ts

@@ -1,6 +1,6 @@
 import {clone as deepClone} from '../../json-clone/clone';
 import {Operation} from '../types';
-import {findByPointer, unescapeComponent} from '../../json-pointer';
+import {findByPointer, unescapeComponent} from '@jsonjoy.com/json-pointer';
 import {deepEqual} from '../../json-equal/deepEqual';
 import type {ApplyPatchOptions, OpResult, PatchResult} from './types';
 import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty';

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

@@ -33,7 +33,7 @@ import {
 } from '../../op';
 import {MsgPackDecoderFast} from '@jsonjoy.com/json-pack/lib/msgpack/MsgPackDecoderFast';
 import {OPCODE} from '../../constants';
-import {Path} from '../../../json-pointer';
+import {Path} from '@jsonjoy.com/json-pointer';
 import {JsonPatchTypes} from '../json/types';
 import {createMatcherDefault} from '../../util';
 import type {JsonPatchOptions} from '../../types';

src/json-patch/codec/compact/decode.ts

@@ -29,7 +29,7 @@ import {OpOr} from '../../op/OpOr';
 import {OpNot} from '../../op/OpNot';
 import {OpMatches} from '../../op/OpMatches';
 import {OpType} from '../../op/OpType';
-import {toPath} from '../../../json-pointer';
+import {toPath} from '@jsonjoy.com/json-pointer';
 import {OPCODE} from '../../constants';
 import type {JsonPatchOptions} from '../../types';
 import {createMatcherDefault} from '../../util';

src/json-patch/codec/compact/types.ts

@@ -1,5 +1,5 @@
 import type {OPCODE} from '../../constants';
-import type {Path} from '../../../json-pointer/types';
+import type {Path} from '@jsonjoy.com/json-pointer/lib/types';
 import type {JsonPatchTypes} from '../json/types';
 
 export interface EncoderOptions {

src/json-patch/codec/json/decode.ts

@@ -29,7 +29,7 @@ import {OpOr} from '../../op/OpOr';
 import {OpNot} from '../../op/OpNot';
 import {OpMatches} from '../../op/OpMatches';
 import {OpType} from '../../op/OpType';
-import {toPath} from '../../../json-pointer';
+import {toPath} from '@jsonjoy.com/json-pointer';
 import type {JsonPatchOptions} from '../../types';
 import {createMatcherDefault} from '../../util';
 

src/json-patch/codec/json/types.ts

@@ -1,4 +1,4 @@
-import type {Path} from '../../../json-pointer';
+import type {Path} from '@jsonjoy.com/json-pointer';
 import {OpType} from '../../opcodes';
 
 export type Operation = JsonPatchOperation | PredicateOperation | JsonPatchExtendedOperation;

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

@@ -1,7 +1,7 @@
 import {OpAdd} from '../../op';
 import {JavaScriptLinked, compileClosure, JavaScript} from '@jsonjoy.com/util/lib/codegen';
 import type {ApplyFn} from '../types';
-import {$findRef} from '../../../json-pointer/codegen/findRef';
+import {$findRef} from '@jsonjoy.com/json-pointer/lib/codegen/findRef';
 
 export const $$add = (op: OpAdd): JavaScriptLinked<ApplyFn> => {
   const find = $findRef(op.path);

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

@@ -1,5 +1,5 @@
 import {OpStarts} from '../../op';
-import {$$find} from '../../../json-pointer/codegen/find';
+import {$$find} from '@jsonjoy.com/json-pointer/lib/codegen/find';
 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,5 +1,5 @@
 import {OpTest} from '../../op';
-import {$$find} from '../../../json-pointer/codegen/find';
+import {$$find} from '@jsonjoy.com/json-pointer/lib/codegen/find';
 import {$$deepEqual} from '../../../json-equal/$$deepEqual';
 import {JavaScriptLinked, compileClosure, JavaScript} from '@jsonjoy.com/util/lib/codegen';
 import {predicateOpWrapper} from '../util';

src/json-patch/exec/test.ts

@@ -1,5 +1,5 @@
 import {deepEqual} from '../../json-equal/deepEqual';
-import {find, Path} from '../../json-pointer';
+import {find, Path} from '@jsonjoy.com/json-pointer';
 
 export const execTest = (path: Path, value: unknown, not: boolean, doc: unknown) => {
   const {val} = find(doc, path);

src/json-patch/op/AbstractOp.ts

@@ -1,5 +1,5 @@
 import type {CompactOpBase} from '../codec/compact/types';
-import type {Path} from '../../json-pointer';
+import type {Path} from '@jsonjoy.com/json-pointer';
 import type {OpType} from '../opcodes';
 import type {Operation} from '../types';
 import {OPCODE} from '../constants';

src/json-patch/op/AbstractSecondOrderPredicateOp.ts

@@ -1,5 +1,5 @@
 import type {OpType} from '../opcodes';
-import type {Path} from '../../json-pointer';
+import type {Path} from '@jsonjoy.com/json-pointer';
 import {AbstractPredicateOp} from './AbstractPredicateOp';
 
 export abstract class AbstractSecondOrderPredicateOp<O extends OpType = OpType> extends AbstractPredicateOp<O> {

src/json-patch/op/OpAdd.ts

@@ -1,7 +1,7 @@
 import type {CompactAddOp, OPCODE_ADD} from '../codec/compact/types';
 import {AbstractOp} from './AbstractOp';
 import {OperationAdd} from '../types';
-import {find, Path, formatJsonPointer} from '../../json-pointer';
+import {find, Path, formatJsonPointer} from '@jsonjoy.com/json-pointer';
 import {OPCODE} from '../constants';
 import {clone as deepClone} from '../../json-clone/clone';
 import type {IMessagePackEncoder} from '@jsonjoy.com/json-pack/lib/msgpack';