Merge pull request #2 from jsonjoy-com/util

Use "util" package

package.json

@@ -63,6 +63,7 @@
   },
   "dependencies": {
     "@jsonjoy.com/base64": "^1.1.1",
+    "@jsonjoy.com/util": "^1.0.0",
     "hyperdyperid": "^1.2.0",
     "thingies": "^1.20.0"
   },

src/__bench__/bench.bson.encoding.ts

@@ -2,9 +2,9 @@
 
 import {runBenchmark, IBenchmark} from '../__bench__/runBenchmark';
 import {BsonEncoder} from '../bson/BsonEncoder';
-import {Writer} from '../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {payloads as payloads_} from '../__bench__/payloads';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 import {BSON, EJSON} from 'bson';
 
 const payloads = payloads_.map((p) => ({...p, data: {data: p.data}}));

src/__bench__/bench.cbor-dag.encoding.ts

@@ -5,7 +5,7 @@ import {CborEncoderDag} from '../cbor/CborEncoderDag';
 import {CborEncoder} from '../cbor/CborEncoder';
 import {CborDecoder} from '../cbor/CborDecoder';
 import {payloads} from '../__bench__/payloads';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 
 const benchmark: IBenchmark = {
   name: 'Encoding',

src/__bench__/bench.cbor.decoding.ts

@@ -4,7 +4,7 @@ import {runBenchmark, IBenchmark} from '../__bench__/runBenchmark';
 import {CborEncoder} from '../cbor/CborEncoder';
 import {CborDecoderBase} from '../cbor/CborDecoderBase';
 import {payloads} from '../__bench__/payloads';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 
 const encoder = new CborEncoder();
 

src/__bench__/bench.cbor.encoding.ts

@@ -4,7 +4,7 @@ import {runBenchmark, IBenchmark} from '../__bench__/runBenchmark';
 import {CborEncoder} from '../cbor/CborEncoder';
 import {CborEncoderFast} from '../cbor/CborEncoderFast';
 import {CborDecoder} from '../cbor/CborDecoder';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 import {payloads} from '../__bench__/payloads';
 
 const benchmark: IBenchmark = {

src/__bench__/bench.encoders.ts

@@ -10,8 +10,8 @@ import {UbjsonEncoder} from '../ubjson/UbjsonEncoder';
 import {IonEncoderFast} from '../ion/IonEncoderFast';
 import {CborDecoder} from '../cbor/CborDecoder';
 import {payloads} from '../__bench__/payloads';
-import {deepEqual} from '../json-equal/deepEqual';
-import {Writer} from '../util/buffers/Writer';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 
 const benchmark: IBenchmark = {
   name: 'Encoding',

src/__bench__/bench.encoding.ts

@@ -5,7 +5,7 @@ import {JsonEncoder} from '../json/JsonEncoder';
 import {UbjsonEncoder} from '../ubjson/UbjsonEncoder';
 import {CborEncoderFast} from '../cbor/CborEncoderFast';
 import {CborEncoder} from '../cbor/CborEncoder';
-import {Writer} from '../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {payloads} from '../__bench__/payloads';
 import {MsgPackEncoderFast} from '../msgpack';
 

src/__bench__/bench.ion.encoding.ts

@@ -2,10 +2,10 @@
 
 import {runBenchmark, IBenchmark} from '../__bench__/runBenchmark';
 import {IonEncoderFast} from '../ion/IonEncoderFast';
-import {Writer} from '../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {payloads} from '../__bench__/payloads';
 import {load, makeBinaryWriter, dom} from 'ion-js';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 
 const benchmark: IBenchmark = {
   name: 'Encoding',

src/__bench__/bench.json.decoding.ts

@@ -3,7 +3,7 @@
 import {runBenchmark, IBenchmark} from '../__bench__/runBenchmark';
 import {JsonDecoder} from '../json/JsonDecoder';
 import {payloads} from '../__bench__/payloads';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 
 const encodedPayloads = payloads.map((payload) => {
   return {

src/__bench__/bench.json.encoding.ts

@@ -2,9 +2,9 @@
 
 import {runBenchmark, IBenchmark} from '../__bench__/runBenchmark';
 import {JsonEncoder} from '../json/JsonEncoder';
-import {Writer} from '../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {payloads} from '../__bench__/payloads';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 const safeStringify = require('fast-safe-stringify');
 
 const benchmark: IBenchmark = {

src/__bench__/bench.msgpack.decoding.ts

@@ -5,7 +5,7 @@ import {MsgPackEncoderFast} from '../msgpack/MsgPackEncoderFast';
 import {MsgPackDecoderFast} from '../msgpack/MsgPackDecoderFast';
 import {MsgPackDecoder} from '../msgpack/MsgPackDecoder';
 import {payloads} from '../__bench__/payloads';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 
 const encoder = new MsgPackEncoderFast();
 

src/__bench__/bench.msgpack.encoding.ts

@@ -5,7 +5,7 @@ import {MsgPackEncoder} from '../msgpack/MsgPackEncoder';
 import {MsgPackEncoderFast} from '../msgpack/MsgPackEncoderFast';
 import {CborDecoder} from '../cbor/CborDecoder';
 import {payloads} from '../__bench__/payloads';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 
 const benchmark: IBenchmark = {
   name: 'MessagePack Encoding',

src/__bench__/bench.slice.ts

@@ -4,7 +4,7 @@ import {runBenchmark, IBenchmark} from '../__bench__/runBenchmark';
 import {CborEncoder} from '../cbor/CborEncoder';
 import {CborDecoder} from '../cbor/CborDecoder';
 import {payloads} from '../__bench__/payloads';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 
 const encoder = new CborEncoder();
 

src/__bench__/bench.ubjson.decoding.ts

@@ -3,9 +3,9 @@
 import {runBenchmark, IBenchmark} from '../__bench__/runBenchmark';
 import {UbjsonEncoder} from '../ubjson/UbjsonEncoder';
 import {UbjsonDecoder} from '../ubjson/UbjsonDecoder';
-import {Writer} from '../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {payloads} from '../__bench__/payloads';
-import {deepEqual} from '../json-equal/deepEqual';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 
 const encoder = new UbjsonEncoder(new Writer());
 const encodedPayloads = payloads.map((payload) => {

src/__bench__/bench.ubjson.encoding.ts

@@ -2,7 +2,7 @@
 
 import {runBenchmark, IBenchmark} from '../__bench__/runBenchmark';
 import {UbjsonEncoder} from '../ubjson/UbjsonEncoder';
-import {Writer} from '../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {payloads} from '../__bench__/payloads';
 
 const benchmark: IBenchmark = {

src/__bench__/bench.writer-size.ts

@@ -4,8 +4,8 @@ import {runBenchmark, IBenchmark} from '../__bench__/runBenchmark';
 import {CborEncoder} from '../cbor/CborEncoder';
 import {CborDecoder} from '../cbor/CborDecoder';
 import {payloads} from '../__bench__/payloads';
-import {deepEqual} from '../json-equal/deepEqual';
-import {Writer} from '../util/buffers/Writer';
+import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 
 const benchmark: IBenchmark = {
   name: 'Encoding',

src/__bench__/profiler/time.ts

@@ -1,7 +1,7 @@
 /* tslint:disable no-console */
 
 import {MsgPackEncoderFast} from '../../msgpack/MsgPackEncoderFast';
-import {Writer} from '../../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 
 const json = [1234];
 

src/__demos__/json.ts

@@ -8,7 +8,7 @@
 
 import {JsonEncoder} from '../json/JsonEncoder';
 import {JsonDecoder} from '../json/JsonDecoder';
-import {Writer} from '../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 
 const encoder = new JsonEncoder(new Writer());
 const decoder = new JsonDecoder();

src/__demos__/ubjson.ts

@@ -8,7 +8,7 @@
 
 import {UbjsonEncoder} from '../ubjson/UbjsonEncoder';
 import {UbjsonDecoder} from '../ubjson/UbjsonDecoder';
-import {Writer} from '../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 
 const encoder = new UbjsonEncoder(new Writer());
 const decoder = new UbjsonDecoder();

src/bencode/BencodeDecoder.ts

@@ -1,4 +1,4 @@
-import {Reader} from '../util/buffers/Reader';
+import {Reader} from '@jsonjoy.com/util/lib/buffers/Reader';
 import type {BinaryJsonDecoder, PackValue} from '../types';
 
 export class BencodeDecoder implements BinaryJsonDecoder {

src/bencode/BencodeEncoder.ts

@@ -1,6 +1,6 @@
-import {utf8Size} from '../util/strings/utf8';
-import {sort} from '../util/sort/insertion';
-import type {IWriter, IWriterGrowable} from '../util/buffers';
+import {utf8Size} from '@jsonjoy.com/util/lib/strings/utf8';
+import {sort} from '@jsonjoy.com/util/lib/sort/insertion';
+import type {IWriter, IWriterGrowable} from '@jsonjoy.com/util/lib/buffers';
 import type {BinaryJsonEncoder} from '../types';
 
 export class BencodeEncoder implements BinaryJsonEncoder {

src/bencode/__tests__/BencodeDecoder.spec.ts

@@ -1,7 +1,7 @@
-import {Writer} from '../../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
+import {utf8} from '@jsonjoy.com/util/lib/buffers/strings';
 import {BencodeEncoder} from '../BencodeEncoder';
 import {BencodeDecoder} from '../BencodeDecoder';
-import {utf8} from '../../util/buffers/strings';
 
 const decoder = new BencodeDecoder();
 

src/bencode/__tests__/BencodeEncoder.spec.ts

@@ -1,6 +1,5 @@
-import {utf8} from '../../util/buffers/strings';
-import {Writer} from '../../util/buffers/Writer';
-import {PackValue} from '../../types';
+import {utf8} from '@jsonjoy.com/util/lib/buffers/strings';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {BencodeEncoder} from '../BencodeEncoder';
 
 const writer = new Writer(32);

src/bencode/__tests__/automated.spec.ts

@@ -1,7 +1,7 @@
-import {Writer} from '../../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {BencodeEncoder} from '../BencodeEncoder';
 import {BencodeDecoder} from '../BencodeDecoder';
-import {utf8} from '../../util/buffers/strings';
+import {utf8} from '@jsonjoy.com/util/lib/buffers/strings';
 
 const writer = new Writer(8);
 const encoder = new BencodeEncoder(writer);

src/bson/BsonEncoder.ts

@@ -11,7 +11,7 @@ import {
   BsonObjectId,
   BsonTimestamp,
 } from './values';
-import type {IWriter, IWriterGrowable} from '../util/buffers';
+import type {IWriter, IWriterGrowable} from '@jsonjoy.com/util/lib/buffers';
 import type {BinaryJsonEncoder} from '../types';
 
 export class BsonEncoder implements BinaryJsonEncoder {

src/bson/__tests__/BsonEncoder-values.spec.ts

@@ -1,5 +1,5 @@
 import {BSON, Decimal128, MinKey, MaxKey} from 'bson';
-import {Writer} from '../../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {BsonEncoder} from '../BsonEncoder';
 import {
   BsonBinary,

src/bson/__tests__/BsonEncoder.spec.ts

@@ -1,5 +1,5 @@
 import {BSON} from 'bson';
-import {Writer} from '../../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {BsonEncoder} from '../BsonEncoder';
 
 const writer = new Writer(8);

src/bson/__tests__/codec.spec.ts

@@ -1,7 +1,7 @@
 import {BSON} from 'bson';
 import {documents} from '../../__tests__/json-documents';
 import {BsonEncoder} from '../BsonEncoder';
-import {Writer} from '../../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 
 const run = (encoder: BsonEncoder) => {
   describe('JSON documents', () => {

src/cbor/CborDecoder.ts

@@ -2,7 +2,7 @@ import {CONST, ERROR, MAJOR} from './constants';
 import {CborDecoderBase} from './CborDecoderBase';
 import {JsonPackValue} from '../JsonPackValue';
 import type {Path} from '../json-pointer';
-import type {IReader, IReaderResettable} from '../util/buffers';
+import type {IReader, IReaderResettable} from '@jsonjoy.com/util/lib/buffers';
 
 export class CborDecoder<
   R extends IReader & IReaderResettable = IReader & IReaderResettable,

src/cbor/CborDecoderBase.ts

@@ -1,11 +1,11 @@
 import {CONST, ERROR, MAJOR} from './constants';
-import {decodeF16} from '../util/buffers/f16';
+import {decodeF16} from '@jsonjoy.com/util/lib/buffers/f16';
 import {JsonPackExtension} from '../JsonPackExtension';
 import {JsonPackValue} from '../JsonPackValue';
-import {Reader} from '../util/buffers/Reader';
-import sharedCachedUtf8Decoder from '../util/buffers/utf8/sharedCachedUtf8Decoder';
-import type {CachedUtf8Decoder} from '../util/buffers/utf8/CachedUtf8Decoder';
-import type {IReader, IReaderResettable} from '../util/buffers';
+import {Reader} from '@jsonjoy.com/util/lib/buffers/Reader';
+import sharedCachedUtf8Decoder from '@jsonjoy.com/util/lib/buffers/utf8/sharedCachedUtf8Decoder';
+import type {CachedUtf8Decoder} from '@jsonjoy.com/util/lib/buffers/utf8/CachedUtf8Decoder';
+import type {IReader, IReaderResettable} from '@jsonjoy.com/util/lib/buffers';
 import type {BinaryJsonDecoder, PackValue} from '../types';
 
 export class CborDecoderBase<R extends IReader & IReaderResettable = IReader & IReaderResettable>

src/cbor/CborEncoder.ts

@@ -1,8 +1,8 @@
-import {isFloat32} from '../util/buffers/isFloat32';
+import {isFloat32} from '@jsonjoy.com/util/lib/buffers/isFloat32';
 import {JsonPackExtension} from '../JsonPackExtension';
 import {CborEncoderFast} from './CborEncoderFast';
-import type {IWriter, IWriterGrowable} from '../util/buffers';
 import {JsonPackValue} from '../JsonPackValue';
+import type {IWriter, IWriterGrowable} from '@jsonjoy.com/util/lib/buffers';
 
 export class CborEncoder<W extends IWriter & IWriterGrowable = IWriter & IWriterGrowable> extends CborEncoderFast<W> {
   /**

src/cbor/CborEncoderFast.ts

@@ -1,8 +1,8 @@
-import {Writer} from '../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {CONST, MAJOR_OVERLAY} from './constants';
-import type {IWriter, IWriterGrowable} from '../util/buffers';
+import type {IWriter, IWriterGrowable} from '@jsonjoy.com/util/lib/buffers';
 import type {BinaryJsonEncoder, StreamingBinaryJsonEncoder, TlvBinaryJsonEncoder} from '../types';
-import type {Slice} from '../util/buffers/Slice';
+import type {Slice} from '@jsonjoy.com/util/lib/buffers/Slice';
 
 const isSafeInteger = Number.isSafeInteger;
 

src/cbor/CborEncoderStable.ts

@@ -1,7 +1,7 @@
 import {CborEncoder} from './CborEncoder';
-import {sort} from '../util/sort/insertion2';
+import {sort} from '@jsonjoy.com/util/lib/sort/insertion2';
 import {MAJOR_OVERLAY} from './constants';
-import {objKeyCmp} from '../util/objKeyCmp';
+import {objKeyCmp} from '@jsonjoy.com/util/lib/objKeyCmp';
 
 const strHeaderLength = (strSize: number): 1 | 2 | 3 | 5 => {
   if (strSize <= 23) return 1;

src/cbor/__tests__/CborDecoderDag.spec.ts

@@ -1,4 +1,4 @@
-import {Writer} from '../../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {CborEncoderStable} from '../CborEncoderStable';
 import {CborDecoderDag} from '../CborDecoderDag';
 import {JsonPackExtension} from '../../JsonPackExtension';

src/cbor/__tests__/CborEncoder.spec.ts

@@ -1,4 +1,4 @@
-import {Writer} from '../../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {JsonPackValue} from '../../JsonPackValue';
 import {CborEncoder} from '../CborEncoder';
 import {decode} from 'cbor';

src/cbor/__tests__/CborEncoderDag.spec.ts

@@ -1,4 +1,4 @@
-import {Writer} from '../../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {CborEncoderDag} from '../CborEncoderDag';
 import {CborDecoder} from '../CborDecoder';
 import {JsonPackExtension} from '../../JsonPackExtension';

src/cbor/__tests__/CborEncoderStable.spec.ts

@@ -1,4 +1,4 @@
-import {Writer} from '../../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {CborEncoderStable} from '../CborEncoderStable';
 import {encode} from 'cborg';
 

src/cbor/__tests__/fuzzing.spec.ts

@@ -1,4 +1,4 @@
-import {RandomJson} from '../../json-random';
+import {RandomJson} from '@jsonjoy.com/util/lib/json-random';
 import {CborEncoderFast} from '../CborEncoderFast';
 import {CborEncoder} from '../CborEncoder';
 import {CborEncoderStable} from '../CborEncoderStable';

src/cbor/__tests__/shallow-read.genShallowRead.spec.ts

@@ -2,7 +2,7 @@ import {genShallowReader} from '../../msgpack/shallow-read';
 import {CborEncoder} from '../CborEncoder';
 import {CborDecoder} from '../CborDecoder';
 import {Path} from '../../json-pointer';
-import {Writer} from '../../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 
 const assetShallowRead = (doc: unknown, path: Path): void => {
   const writer = new Writer(1);

src/codecs/Codecs.ts

@@ -1,4 +1,4 @@
-import {Writer} from '../util/buffers/Writer';
+import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import {CborJsonValueCodec} from './cbor';
 import {JsonJsonValueCodec} from './json';
 import {MsgPackJsonValueCodec} from './msgpack';

src/codecs/cbor.ts

@@ -1,7 +1,7 @@
 import {CborDecoder} from '../cbor/CborDecoder';
 import {CborEncoder} from '../cbor/CborEncoder';
 import {EncodingFormat} from '../constants';
-import type {Writer} from '../util/buffers/Writer';
+import type {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import type {JsonValueCodec} from './types';
 
 export class CborJsonValueCodec implements JsonValueCodec {

src/codecs/json.ts

@@ -1,7 +1,7 @@
 import {EncodingFormat} from '../constants';
 import {JsonEncoder} from '../json/JsonEncoder';
 import {JsonDecoder} from '../json/JsonDecoder';
-import type {Writer} from '../util/buffers/Writer';
+import type {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import type {JsonValueCodec} from './types';
 
 export class JsonJsonValueCodec implements JsonValueCodec {

src/codecs/msgpack.ts

@@ -1,7 +1,7 @@
 import {EncodingFormat} from '../constants';
 import {MsgPackEncoder} from '../msgpack';
 import {MsgPackDecoder} from '../msgpack/MsgPackDecoder';
-import type {Writer} from '../util/buffers/Writer';
+import type {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
 import type {JsonValueCodec} from './types';
 
 export class MsgPackJsonValueCodec implements JsonValueCodec {