diff --git a/package.json b/package.json index c209d950..161353e0 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ }, "dependencies": { "@jsonjoy.com/base64": "^1.1.1", + "@jsonjoy.com/json-pointer": "^1.0.1", "@jsonjoy.com/util": "^1.1.2", "hyperdyperid": "^1.2.0", "thingies": "^1.20.0" diff --git a/src/cbor/CborDecoder.ts b/src/cbor/CborDecoder.ts index 951cf243..b6b119ed 100644 --- a/src/cbor/CborDecoder.ts +++ b/src/cbor/CborDecoder.ts @@ -1,7 +1,7 @@ import {CONST, ERROR, MAJOR} from './constants'; import {CborDecoderBase} from './CborDecoderBase'; import {JsonPackValue} from '../JsonPackValue'; -import type {Path} from '../json-pointer'; +import type {Path} from '@jsonjoy.com/json-pointer'; import type {IReader, IReaderResettable} from '@jsonjoy.com/util/lib/buffers'; export class CborDecoder< diff --git a/src/cbor/__tests__/shallow-read.genShallowRead.spec.ts b/src/cbor/__tests__/shallow-read.genShallowRead.spec.ts index 544a35e9..fc92733f 100644 --- a/src/cbor/__tests__/shallow-read.genShallowRead.spec.ts +++ b/src/cbor/__tests__/shallow-read.genShallowRead.spec.ts @@ -1,7 +1,7 @@ import {genShallowReader} from '../../msgpack/shallow-read'; import {CborEncoder} from '../CborEncoder'; import {CborDecoder} from '../CborDecoder'; -import {Path} from '../../json-pointer'; +import type {Path} from '@jsonjoy.com/json-pointer'; import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; const assetShallowRead = (doc: unknown, path: Path): void => { diff --git a/src/json-pointer/index.ts b/src/json-pointer/index.ts deleted file mode 100644 index fcb073fe..00000000 --- a/src/json-pointer/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './types'; diff --git a/src/json-pointer/types.ts b/src/json-pointer/types.ts deleted file mode 100644 index 8c0860c5..00000000 --- a/src/json-pointer/types.ts +++ /dev/null @@ -1,2 +0,0 @@ -export type PathStep = string | number; -export type Path = readonly PathStep[]; diff --git a/src/msgpack/MsgPackDecoder.ts b/src/msgpack/MsgPackDecoder.ts index d9475db9..3d29bada 100644 --- a/src/msgpack/MsgPackDecoder.ts +++ b/src/msgpack/MsgPackDecoder.ts @@ -1,6 +1,6 @@ import {JsonPackValue} from '.'; import {MsgPackDecoderFast} from './MsgPackDecoderFast'; -import type {Path} from '../json-pointer'; +import type {Path} from '@jsonjoy.com/json-pointer'; import type {Reader} from '@jsonjoy.com/util/lib/buffers/Reader'; /** diff --git a/src/msgpack/__tests__/shallow-read.genShallowRead.spec.ts b/src/msgpack/__tests__/shallow-read.genShallowRead.spec.ts index f967984a..b4061270 100644 --- a/src/msgpack/__tests__/shallow-read.genShallowRead.spec.ts +++ b/src/msgpack/__tests__/shallow-read.genShallowRead.spec.ts @@ -1,7 +1,7 @@ import {genShallowReader} from '../shallow-read'; import {MsgPackEncoder} from '../MsgPackEncoder'; import {MsgPackDecoder} from '../MsgPackDecoder'; -import {Path} from '../../json-pointer'; +import type {Path} from '@jsonjoy.com/json-pointer'; const assetShallowRead = (doc: unknown, path: Path): void => { const encoder = new MsgPackEncoder(); diff --git a/src/msgpack/shallow-read.ts b/src/msgpack/shallow-read.ts index 0a76fabc..f64f9c82 100644 --- a/src/msgpack/shallow-read.ts +++ b/src/msgpack/shallow-read.ts @@ -1,4 +1,4 @@ -import {Path} from '../json-pointer'; +import type {Path} from '@jsonjoy.com/json-pointer'; import {Codegen} from '@jsonjoy.com/util/lib/codegen/Codegen'; import type {MsgPackDecoder} from './MsgPackDecoder'; diff --git a/yarn.lock b/yarn.lock index 26e47966..af5f15f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -600,11 +600,30 @@ resolved "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.1.tgz" integrity sha512-LnFjVChaGY8cZVMwAIMjvA1XwQjZ/zIXHyh28IyJkyNkzof4Dkm1+KN9UIm3lHhREH4vs7XwZ0NpkZKnwOtEfg== +"@jsonjoy.com/buffers@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@jsonjoy.com/buffers/-/buffers-1.0.0.tgz#ade6895b7d3883d70f87b5743efaa12c71dfef7a" + integrity sha512-NDigYR3PHqCnQLXYyoLbnEdzMMvzeiCWo1KOut7Q0CoIqg9tUAPKJ1iq/2nFhc5kZtexzutNY0LFjdwWL3Dw3Q== + +"@jsonjoy.com/json-pointer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@jsonjoy.com/json-pointer/-/json-pointer-1.0.1.tgz#3b710158e8a212708a2886ea5e38d92e2ea4f4a0" + integrity sha512-tJpwQfuBuxqZlyoJOSZcqf7OUmiYQ6MiPNmOv4KbZdXE/DdvBSSAwhos0zIlJU/AXxC8XpuO8p08bh2fIl+RKA== + dependencies: + "@jsonjoy.com/util" "^1.3.0" + "@jsonjoy.com/util@^1.1.2": version "1.1.2" resolved "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.1.2.tgz" integrity sha512-HOGa9wtE6LEz2I5mMQ2pMSjth85PmD71kPbsecs02nEUq3/Kw0wRK3gmZn5BCEB8mFLXByqPxjHgApoMwIPMKQ== +"@jsonjoy.com/util@^1.3.0": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@jsonjoy.com/util/-/util-1.8.1.tgz#62387224001e59ded1ca3744b88b44cdb808e7f9" + integrity sha512-26hOMkQx15sYBpt/bCK3/S7Bep8vMy+VKGBhWQax7GXYd+mwP5mc0HNX5oqLws/JQZ9GRjn9rvXoDbcq1OC2xA== + dependencies: + "@jsonjoy.com/buffers" "^1.0.0" + "@msgpack/msgpack@^3.0.0-beta2": version "3.0.0-beta2" resolved "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-3.0.0-beta2.tgz"