From a96e1a5a833b003ea6c68072a1f74cdd828af630 Mon Sep 17 00:00:00 2001 From: streamich Date: Wed, 10 Apr 2024 00:30:46 +0200 Subject: [PATCH 1/4] =?UTF-8?q?chore:=20=F0=9F=A4=96=20bump=20json-pack=20?= =?UTF-8?q?and=20cleanup=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 36 +---- yarn.lock | 379 +++------------------------------------------------ 2 files changed, 23 insertions(+), 392 deletions(-) diff --git a/package.json b/package.json index ef4d58c1df..e982712f82 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ }, "dependencies": { "@jsonjoy.com/base64": "^1.1.1", - "@jsonjoy.com/json-pack": "^1.0.1", + "@jsonjoy.com/json-pack": "^1.0.2", "arg": "^5.0.2", "hyperdyperid": "^1.2.0", "multibase": "^4.0.6", @@ -132,9 +132,6 @@ "@automerge/automerge": "2.1.7", "@collabs/collabs": "0.13.4", "@exodus/schemasafe": "^1.0.0-rc.6", - "@msgpack/msgpack": "^3.0.0-beta2", - "@redis/client": "^1.5.12", - "@shelacek/ubjson": "^1.1.1", "@types/benchmark": "^2.1.2", "@types/jest": "^29.5.12", "@types/quill": "^2.0.14", @@ -143,52 +140,28 @@ "ajv": "^8.11.0", "app-root-path": "^3.1.0", "axios": "^1.3.5", - "base64-js": "^1.5.1", "benchmark": "^2.1.4", - "bson": "^5.4.0", - "cbor": "^8.1.0", - "cbor-js": "^0.1.0", - "cbor-sync": "^1.0.4", - "cbor-x": "^1.3.0", - "cborg": "^2.0.3", "concurrently": "^8.0.1", "diamond-types-node": "1.0.2", "editing-traces": "https://github.com/streamich/editing-traces#6494020428530a6e382378b98d1d7e31334e2d7b", "eventsource": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "fast-equals": "^5.0.1", "fast-json-patch": "^3.0.0-1", - "fast-safe-stringify": "^2.1.1", - "fast-stable-stringify": "^1.0.0", - "fastest-stable-stringify": "^2.0.2", "find-my-way": "^7.6.0", "fork-ts-checker-webpack-plugin": "^8.0.0", "gh-pages": "^5.0.0", "html-webpack-plugin": "^5.5.1", "husky": "^8.0.3", - "ion-js": "^4.3.0", "isomorphic-ws": "^5.0.0", "jest": "^29.7.0", - "js-base64": "^3.7.2", "js-sdsl": "^4.4.0", - "jsbi": "^4.3.0", "json-crdt-traces": "https://github.com/streamich/json-crdt-traces#ec825401dc05cbb74b9e0b3c4d6527399f54d54d", "json-logic-js": "^2.0.1", - "json-pack-napi": "^0.0.2", - "load-script": "^2.0.0", - "lodash": "^4.17.21", "loro-crdt": "^0.4.1", - "markdown-it": "^13.0.1", "memfs": "^4.8.1", - "messagepack": "^1.1.12", - "msgpack-lite": "^0.1.26", - "msgpack5": "^6.0.2", - "msgpackr": "^1.6.0", "nodemon": "^3.0.0", "ot-text": "^1.0.2", "ot-text-unicode": "^4.0.0", "p4-css": "^1.5.1", - "pako": "^2.0.4", "prettier": "^3.2.5", "pretty-quick": "^3.1.3", "quill-delta": "^5.0.0", @@ -198,8 +171,6 @@ "rimraf": "^5.0.0", "rope.js": "0.1.0", "rxjs": "^7.5.5", - "safe-stable-stringify": "^2.3.1", - "secure-json-parse": "^2.4.0", "sorted-btree": "^1.8.1", "tinybench": "^2.4.0", "ts-jest": "^29.1.2", @@ -254,24 +225,19 @@ "scopes": [ "", "demo", - "json-binary", - "json-brand", "json-cli", "json-clone", "json-crdt-patch", "json-crdt-extensions", "json-crdt-peritext-ui", "json-crdt", - "json-equal", "json-expression", "json-hash", "json-ot", - "json-pack", "json-patch-multicore", "json-patch-ot", "json-patch", "json-pointer", - "json-random", "json-schema", "json-size", "json-stable", diff --git a/yarn.lock b/yarn.lock index d3e099929b..1901ae0f7a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -317,36 +317,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cbor-extract/cbor-extract-darwin-arm64@2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@cbor-extract/cbor-extract-darwin-arm64/-/cbor-extract-darwin-arm64-2.1.1.tgz#5721f6dd3feae0b96d23122853ce977e0671b7a6" - integrity sha512-blVBy5MXz6m36Vx0DfLd7PChOQKEs8lK2bD1WJn/vVgG4FXZiZmZb2GECHFvVPA5T7OnODd9xZiL3nMCv6QUhA== - -"@cbor-extract/cbor-extract-darwin-x64@2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@cbor-extract/cbor-extract-darwin-x64/-/cbor-extract-darwin-x64-2.1.1.tgz#c25e7d0133950d87d101d7b3afafea8d50d83f5f" - integrity sha512-h6KFOzqk8jXTvkOftyRIWGrd7sKQzQv2jVdTL9nKSf3D2drCvQB/LHUxAOpPXo3pv2clDtKs3xnHalpEh3rDsw== - -"@cbor-extract/cbor-extract-linux-arm64@2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@cbor-extract/cbor-extract-linux-arm64/-/cbor-extract-linux-arm64-2.1.1.tgz#48f78e7d8f0fcc84ed074b6bfa6d15dd83187c63" - integrity sha512-SxAaRcYf8S0QHaMc7gvRSiTSr7nUYMqbUdErBEu+HYA4Q6UNydx1VwFE68hGcp1qvxcy9yT5U7gA+a5XikfwSQ== - -"@cbor-extract/cbor-extract-linux-arm@2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@cbor-extract/cbor-extract-linux-arm/-/cbor-extract-linux-arm-2.1.1.tgz#7507d346389cb682e44fab8fae9534edd52e2e41" - integrity sha512-ds0uikdcIGUjPyraV4oJqyVE5gl/qYBpa/Wnh6l6xLE2lj/hwnjT2XcZCChdXwW/YFZ1LUHs6waoYN8PmK0nKQ== - -"@cbor-extract/cbor-extract-linux-x64@2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@cbor-extract/cbor-extract-linux-x64/-/cbor-extract-linux-x64-2.1.1.tgz#b7c1d2be61c58ec18d58afbad52411ded63cd4cd" - integrity sha512-GVK+8fNIE9lJQHAlhOROYiI0Yd4bAZ4u++C2ZjlkS3YmO6hi+FUxe6Dqm+OKWTcMpL/l71N6CQAmaRcb4zyJuA== - -"@cbor-extract/cbor-extract-win32-x64@2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@cbor-extract/cbor-extract-win32-x64/-/cbor-extract-win32-x64-2.1.1.tgz#21b11a1a3f18c3e7d62fd5f87438b7ed2c64c1f7" - integrity sha512-2Niq1C41dCRIDeD8LddiH+mxGlO7HJ612Ll3D/E73ZWBmycued+8ghTr/Ho3CMOWPUEr08XtyBMVXAjqF+TcKw== - "@collabs/collabs@0.13.4": version "0.13.4" resolved "https://registry.yarnpkg.com/@collabs/collabs/-/collabs-0.13.4.tgz#74bfa91c7e9e4c3e720437d75b0bee4270c997df" @@ -675,55 +645,28 @@ resolved "https://registry.yarnpkg.com/@jsonjoy.com/base64/-/base64-1.1.1.tgz#a717fd8840f7bad49c7fe66cc65db8bcfc4c4dc5" integrity sha512-LnFjVChaGY8cZVMwAIMjvA1XwQjZ/zIXHyh28IyJkyNkzof4Dkm1+KN9UIm3lHhREH4vs7XwZ0NpkZKnwOtEfg== -"@jsonjoy.com/json-pack@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@jsonjoy.com/json-pack/-/json-pack-1.0.1.tgz#ab324209c99d1b0ccf7a247ce81a45658ec31283" - integrity sha512-a8nau3pCEmoyCR3O3ih5XVxhFhs1+PPphNAbTN1P66TOvPItWQ9NyGE78Rc8YgoyWBPwwyGW1C60sS8/Ji3L8g== +"@jsonjoy.com/json-pack@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@jsonjoy.com/json-pack/-/json-pack-1.0.2.tgz#d7c8c284db828b29eebb9082134251a8216ec5cc" + integrity sha512-4KMApTgb1Hvjz9Ue7unziJ1xNy3k6d2erp0hz1iXryXsf6LEM3KwN6YrfbqT0vqkUO8Tu+CSnvMia9cWX6YGVw== dependencies: "@jsonjoy.com/base64" "^1.1.1" + "@jsonjoy.com/util" "^1.0.0" hyperdyperid "^1.2.0" thingies "^1.20.0" +"@jsonjoy.com/util@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@jsonjoy.com/util/-/util-1.0.0.tgz#417a4e6c112501ac98e3a4e695f5ffa23ba01b2d" + integrity sha512-uTa/IyBC3/xTC5/qwMnY79ZqCA6ENQgsM6nzuAISa7pYiiUn+U4JIXoyaHEApX6k8KvTCBDNJs+k8U03bw5ffQ== + dependencies: + hyperdyperid "^1.2.0" + "@leichtgewicht/ip-codec@^2.0.1": version "2.0.4" resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== -"@msgpack/msgpack@^3.0.0-beta2": - version "3.0.0-beta2" - resolved "https://registry.yarnpkg.com/@msgpack/msgpack/-/msgpack-3.0.0-beta2.tgz#5bccee30f84df220b33905e3d8249ba96deca0b7" - integrity sha512-y+l1PNV0XDyY8sM3YtuMLK5vE3/hkfId+Do8pLo/OPxfxuFAUwcGz3oiiUuV46/aBpwTzZ+mRWVMtlSKbradhw== - -"@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz#44d752c1a2dc113f15f781b7cc4f53a307e3fa38" - integrity sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ== - -"@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz#f954f34355712212a8e06c465bc06c40852c6bb3" - integrity sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw== - -"@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz#45c63037f045c2b15c44f80f0393fa24f9655367" - integrity sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg== - -"@msgpackr-extract/msgpackr-extract-linux-arm@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz#35707efeafe6d22b3f373caf9e8775e8920d1399" - integrity sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA== - -"@msgpackr-extract/msgpackr-extract-linux-x64@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz#091b1218b66c341f532611477ef89e83f25fae4f" - integrity sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA== - -"@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz#0f164b726869f71da3c594171df5ebc1c4b0a407" - integrity sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ== - "@multiformats/base-x@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@multiformats/base-x/-/base-x-4.0.1.tgz#95ff0fa58711789d53aefb2590a8b7a4e715d121" @@ -787,20 +730,6 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== -"@redis/client@^1.5.12": - version "1.5.12" - resolved "https://registry.yarnpkg.com/@redis/client/-/client-1.5.12.tgz#4c387727992152aea443b869de0ebb697f899187" - integrity sha512-/ZjE18HRzMd80eXIIUIPcH81UoZpwulbo8FmbElrjPqH0QC0SeIKu1BOU49bO5trM5g895kAjhvalt5h77q+4A== - dependencies: - cluster-key-slot "1.1.2" - generic-pool "3.9.0" - yallist "4.0.0" - -"@shelacek/ubjson@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@shelacek/ubjson/-/ubjson-1.1.1.tgz#949d9e6fb5cf2ada4197de6f8430fa7894d61ed4" - integrity sha512-2Vi46ct3IWzh8eAz9IZ0NulIRtJbGgJDppatJvufB0fHwasRSfklBoQrVrCutF24fSuRvTvZVebjtcIHOxvzWw== - "@sinclair/typebox@^0.27.8": version "0.27.8" resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" @@ -1469,11 +1398,6 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - array-differ@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b" @@ -1590,7 +1514,7 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64-js@^1.3.1, base64-js@^1.5.1: +base64-js@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== @@ -1613,22 +1537,6 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -bindings@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" - integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== - dependencies: - file-uri-to-path "1.0.0" - -bl@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-5.1.0.tgz#183715f678c7188ecef9fe475d90209400624273" - integrity sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ== - dependencies: - buffer "^6.0.3" - inherits "^2.0.4" - readable-stream "^3.4.0" - body-parser@1.20.1: version "1.20.1" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" @@ -1716,24 +1624,11 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" -bson@^5.4.0: - version "5.5.1" - resolved "https://registry.yarnpkg.com/bson/-/bson-5.5.1.tgz#f5849d405711a7f23acdda9a442375df858e6833" - integrity sha512-ix0EwukN2EpC0SRWIj/7B5+A6uQMQy6KMREI9qQqvgpkV2frH63T0UDVd1SYedL6dNCmDBYB3QtXi4ISk9YT+g== - buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -buffer@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" - integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.2.1" - bufferutil@^4.0.1: version "4.0.8" resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.8.tgz#1de6a71092d65d7766c4d8a522b261a6e787e8ea" @@ -1805,49 +1700,6 @@ caniuse-lite@^1.0.30001587: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001607.tgz#b91e8e033f6bca4e13d3d45388d87fa88931d9a5" integrity sha512-WcvhVRjXLKFB/kmOFVwELtMxyhq3iM/MvmXcyCe2PNf166c39mptscOc/45TTS96n2gpNV2z7+NakArTWZCQ3w== -cbor-extract@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/cbor-extract/-/cbor-extract-2.1.1.tgz#f154b31529fdb6b7c70fb3ca448f44eda96a1b42" - integrity sha512-1UX977+L+zOJHsp0mWFG13GLwO6ucKgSmSW6JTl8B9GUvACvHeIVpFqhU92299Z6PfD09aTXDell5p+lp1rUFA== - dependencies: - node-gyp-build-optional-packages "5.0.3" - optionalDependencies: - "@cbor-extract/cbor-extract-darwin-arm64" "2.1.1" - "@cbor-extract/cbor-extract-darwin-x64" "2.1.1" - "@cbor-extract/cbor-extract-linux-arm" "2.1.1" - "@cbor-extract/cbor-extract-linux-arm64" "2.1.1" - "@cbor-extract/cbor-extract-linux-x64" "2.1.1" - "@cbor-extract/cbor-extract-win32-x64" "2.1.1" - -cbor-js@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/cbor-js/-/cbor-js-0.1.0.tgz#c80ce6120f387e8faa74370dfda21d965b8fc7f9" - integrity sha512-7sQ/TvDZPl7csT1Sif9G0+MA0I0JOVah8+wWlJVQdVEgIbCzlN/ab3x+uvMNsc34TUvO6osQTAmB2ls80JX6tw== - -cbor-sync@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/cbor-sync/-/cbor-sync-1.0.4.tgz#5a11a1ab75c2a14d1af1b237fd84aa8c1593662f" - integrity sha512-GWlXN4wiz0vdWWXBU71Dvc1q3aBo0HytqwAZnXF1wOwjqNnDWA1vZ1gDMFLlqohak31VQzmhiYfiCX5QSSfagA== - -cbor-x@^1.3.0: - version "1.5.6" - resolved "https://registry.yarnpkg.com/cbor-x/-/cbor-x-1.5.6.tgz#cbc5a8267bcd89a559d32339fe7ec442bc3b3862" - integrity sha512-+TXdnDNdr8JH5GQRoAhjdT/5s5N+b71s2Nz8DpDRyuWx0uzMj8JTR3AqqMTBO/1HtUBHZpmK1enD2ViXFx0Nug== - optionalDependencies: - cbor-extract "^2.1.1" - -cbor@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/cbor/-/cbor-8.1.0.tgz#cfc56437e770b73417a2ecbfc9caf6b771af60d5" - integrity sha512-DwGjNW9omn6EwP70aXsn7FQJx5kO12tX0bZkaTjzdVFM6/7nhA4t0EENocKGx6D2Bch9PE2KzCUf5SceBdeijg== - dependencies: - nofilter "^3.1.0" - -cborg@^2.0.3: - version "2.0.5" - resolved "https://registry.yarnpkg.com/cborg/-/cborg-2.0.5.tgz#b5393c8b1843d5c1a61f2b79b4c9f752052a4d44" - integrity sha512-xVW1rSIw1ZXbkwl2XhJ7o/jAv0vnVoQv/QlfQxV8a7V5PlA4UU/AcIiXqmpyybwNWy/GPQU1m/aBVNIWr7/T0w== - chalk@^2.3.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -1948,11 +1800,6 @@ clone-deep@^4.0.1: kind-of "^6.0.2" shallow-clone "^3.0.0" -cluster-key-slot@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac" - integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA== - co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -2424,11 +2271,6 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== -entities@~3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" - integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== - envinfo@^7.7.3: version "7.11.0" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.0.tgz#c3793f44284a55ff8c82faf1ffd91bc6478ea01f" @@ -2534,11 +2376,6 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -event-lite@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/event-lite/-/event-lite-0.1.3.tgz#3dfe01144e808ac46448f0c19b4ab68e403a901d" - integrity sha512-8qz9nOz5VeD2z96elrEKD2U433+L3DWdUdDkOINLGOJvx1GsMBbMn0aCeu28y8/e85A6mCigBiFlYMnTBEGlSw== - eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -2659,11 +2496,6 @@ fast-diff@^1.3.0: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== -fast-equals@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-5.0.1.tgz#a4eefe3c5d1c0d021aeed0bc10ba5e0c12ee405d" - integrity sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ== - fast-json-patch@^3.0.0-1: version "3.1.1" resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947" @@ -2686,16 +2518,6 @@ fast-querystring@^1.0.0: dependencies: fast-decode-uri-component "^1.0.1" -fast-safe-stringify@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" - integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== - -fast-stable-stringify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-stable-stringify/-/fast-stable-stringify-1.0.0.tgz#5c5543462b22aeeefd36d05b34e51c78cb86d313" - integrity sha512-wpYMUmFu5f00Sm0cj2pfivpmawLZ0NKdviQ4w9zJeR8JVtOpOxHmLaJuj0vxvGqMJQWyP/COUkF75/57OKyRag== - fastest-levenshtein@^1.0.12: version "1.0.16" resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" @@ -2720,11 +2542,6 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" -file-uri-to-path@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" - integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== - filename-reserved-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" @@ -2878,11 +2695,6 @@ function-bind@^1.1.2: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== -generic-pool@3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.9.0.tgz#36f4a678e963f4fdb8707eab050823abc4e8f5e4" - integrity sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g== - gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" @@ -3177,11 +2989,6 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" -ieee754@^1.1.8, ieee754@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - ignore-by-default@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" @@ -3221,7 +3028,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -3239,21 +3046,11 @@ inline-style-prefixer@^6.0.0: css-in-js-utils "^3.1.0" fast-loops "^1.1.3" -int64-buffer@^0.1.9: - version "0.1.10" - resolved "https://registry.yarnpkg.com/int64-buffer/-/int64-buffer-0.1.10.tgz#277b228a87d95ad777d07c13832022406a473423" - integrity sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA== - interpret@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== -ion-js@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ion-js/-/ion-js-4.3.0.tgz#ea511b94a3a555ac6e2e58832c7b66c41c302a0f" - integrity sha512-8yhU1yx6Uia109cMbiDQDQS0InGJj8BaXckjyaN+5vCzL0e8qEXzLVRy579TmNThBDq8IfUJfqe0565Syh+0JA== - ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -3356,7 +3153,7 @@ is-wsl@^3.1.0: dependencies: is-inside-container "^1.0.0" -isarray@^1.0.0, isarray@~1.0.0: +isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== @@ -3810,11 +3607,6 @@ jest@^29.7.0: import-local "^3.0.2" jest-cli "^29.7.0" -js-base64@^3.7.2: - version "3.7.5" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.5.tgz#21e24cf6b886f76d6f5f165bfcd69cc55b9e3fca" - integrity sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA== - js-sdsl@^4.4.0: version "4.4.2" resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.2.tgz#2e3c031b1f47d3aca8b775532e3ebb0818e7f847" @@ -3833,11 +3625,6 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -jsbi@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741" - integrity sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g== - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -3852,14 +3639,6 @@ json-logic-js@^2.0.1: resolved "https://registry.yarnpkg.com/json-logic-js/-/json-logic-js-2.0.2.tgz#b613e095f5e598cb78f7b9a2bbf638e74cf98158" integrity sha512-ZBtBdMJieqQcH7IX/LaBsr5pX+Y5JIW+EhejtM3Ffg2jdN9Iwf+Ht6TbHnvAZ/YtwyuhPaCBlnvzrwVeWdvGDQ== -json-pack-napi@^0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/json-pack-napi/-/json-pack-napi-0.0.2.tgz#57a3535aab2c851725612fe1b81c4173cf10d6da" - integrity sha512-NOkouHWWiZhCcmnE/w6MkV8JNhhW8kln6VvWcq0egX++XLayHpZtcGkfm5d+RxVuSQuTjIkwHyez49yLJgzs+Q== - dependencies: - bindings "^1.5.0" - node-addon-api "^6.1.0" - json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" @@ -3936,18 +3715,6 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -linkify-it@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec" - integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw== - dependencies: - uc.micro "^1.0.1" - -load-script@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-script/-/load-script-2.0.0.tgz#40821aaa59e9bbe7be2e28b6ab053e6f44330fa1" - integrity sha512-km6cyoPW4rM22JMGb+SHUKPMZVDpUaMpMAKrv8UHWllIxc/qjgMGHD91nY+5hM+/NFs310OZ2pqQeJKs7HqWPA== - loader-runner@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" @@ -4061,17 +3828,6 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" -markdown-it@^13.0.1: - version "13.0.2" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536" - integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w== - dependencies: - argparse "^2.0.1" - entities "~3.0.1" - linkify-it "^4.0.1" - mdurl "^1.0.1" - uc.micro "^1.0.5" - marked@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" @@ -4082,11 +3838,6 @@ mdn-data@2.0.14: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== -mdurl@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" - integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g== - media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" @@ -4116,11 +3867,6 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -messagepack@^1.1.12: - version "1.1.12" - resolved "https://registry.yarnpkg.com/messagepack/-/messagepack-1.1.12.tgz#64284d4c8f325582a8b0dafbdb2e550f01d9dcf6" - integrity sha512-pNB6K4q4VMLRXdvlGZkTtQhmKFntvLisnOQnL0VhKpZooL8B8Wsv5TXuidIJil0bCH6V172p3+Onfyow0usPYQ== - methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -4212,47 +3958,6 @@ ms@2.1.3, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -msgpack-lite@^0.1.26: - version "0.1.26" - resolved "https://registry.yarnpkg.com/msgpack-lite/-/msgpack-lite-0.1.26.tgz#dd3c50b26f059f25e7edee3644418358e2a9ad89" - integrity sha512-SZ2IxeqZ1oRFGo0xFGbvBJWMp3yLIY9rlIJyxy8CGrwZn1f0ZK4r6jV/AM1r0FZMDUkWkglOk/eeKIL9g77Nxw== - dependencies: - event-lite "^0.1.1" - ieee754 "^1.1.8" - int64-buffer "^0.1.9" - isarray "^1.0.0" - -msgpack5@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/msgpack5/-/msgpack5-6.0.2.tgz#46d2a9fdbe9c1b71ae7ae43f656fe266115d5e7e" - integrity sha512-kBSpECAWslrciRF3jy6HkMckNa14j3VZwNUUe1ONO/yihs19MskiFnsWXm0Q0aPkDYDBRFvTKkEuEDY+HVxBvQ== - dependencies: - bl "^5.0.0" - inherits "^2.0.3" - readable-stream "^3.0.0" - safe-buffer "^5.1.2" - -msgpackr-extract@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz#e05ec1bb4453ddf020551bcd5daaf0092a2c279d" - integrity sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A== - dependencies: - node-gyp-build-optional-packages "5.0.7" - optionalDependencies: - "@msgpackr-extract/msgpackr-extract-darwin-arm64" "3.0.2" - "@msgpackr-extract/msgpackr-extract-darwin-x64" "3.0.2" - "@msgpackr-extract/msgpackr-extract-linux-arm" "3.0.2" - "@msgpackr-extract/msgpackr-extract-linux-arm64" "3.0.2" - "@msgpackr-extract/msgpackr-extract-linux-x64" "3.0.2" - "@msgpackr-extract/msgpackr-extract-win32-x64" "3.0.2" - -msgpackr@^1.6.0: - version "1.9.9" - resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.9.9.tgz#ec71e37beb8729280847f683cb0a340eb35ce70f" - integrity sha512-sbn6mioS2w0lq1O6PpGtsv6Gy8roWM+o3o4Sqjd6DudrL/nOugY+KyJUimoWzHnf9OkO0T6broHFnYE/R05t9A== - optionalDependencies: - msgpackr-extract "^3.0.2" - multibase@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/multibase/-/multibase-4.0.6.tgz#6e624341483d6123ca1ede956208cb821b440559" @@ -4326,26 +4031,11 @@ node-abort-controller@^3.0.1: resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548" integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ== -node-addon-api@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76" - integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA== - node-forge@^1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== -node-gyp-build-optional-packages@5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz#92a89d400352c44ad3975010368072b41ad66c17" - integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA== - -node-gyp-build-optional-packages@5.0.7: - version "5.0.7" - resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz#5d2632bbde0ab2f6e22f1bbac2199b07244ae0b3" - integrity sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w== - node-gyp-build@^4.3.0: version "4.7.1" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.7.1.tgz#cd7d2eb48e594874053150a9418ac85af83ca8f7" @@ -4382,11 +4072,6 @@ nodemon@^3.0.0: touch "^3.1.0" undefsafe "^2.0.5" -nofilter@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-3.1.0.tgz#c757ba68801d41ff930ba2ec55bab52ca184aa66" - integrity sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g== - nopt@~1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" @@ -4518,11 +4203,6 @@ p4-css@^1.5.1: dependencies: nano-css "^5.3.0" -pako@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86" - integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug== - param-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" @@ -4821,7 +4501,7 @@ readable-stream@^2.0.1: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.4.0: +readable-stream@^3.0.6: version "3.6.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -4969,7 +4649,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -4981,11 +4661,6 @@ safe-regex2@^2.0.0: dependencies: ret "~0.2.0" -safe-stable-stringify@^2.3.1: - version "2.4.3" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" - integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== - "safer-buffer@>= 2.1.2 < 3": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -5017,11 +4692,6 @@ schema-utils@^4.0.0, schema-utils@^4.2.0: ajv-formats "^2.1.1" ajv-keywords "^5.1.0" -secure-json-parse@^2.4.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.7.0.tgz#5a5f9cd6ae47df23dba3151edd06855d47e09862" - integrity sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw== - select-hose@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" @@ -5689,11 +5359,6 @@ uWebSockets.js@uNetworking/uWebSockets.js#v20.23.0: version "20.23.0" resolved "https://codeload.github.com/uNetworking/uWebSockets.js/tar.gz/49f8f1eb54435e4c3e3e436571e93d1f06aaabbb" -uc.micro@^1.0.1, uc.micro@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" - integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== - undefsafe@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c" @@ -6017,16 +5682,16 @@ yaeti@^0.0.6: resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" integrity sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug== -yallist@4.0.0, yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + yaml@^1.10.0: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" From 963046770f2a6ff5c655606522eff87e37225a50 Mon Sep 17 00:00:00 2001 From: streamich Date: Wed, 10 Apr 2024 00:50:19 +0200 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=F0=9F=90=9B=20update=20new=20packag?= =?UTF-8?q?e=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/index.ts | 2 +- src/json-brand/index.ts | 1 - src/json-clone/cloneBinary.ts | 2 +- src/json-crdt-patch/PatchBuilder.ts | 2 +- src/json-crdt-patch/util/binary/CrdtReader.ts | 2 +- src/json-crdt-patch/util/binary/CrdtWriter.ts | 2 +- src/json-crdt/codec/sidecar/binary/Decoder.ts | 2 +- src/json-crdt/codec/sidecar/binary/Encoder.ts | 2 +- src/json-crdt/log/codec/logEncoderOpts.ts | 2 +- src/json-crdt/nodes/rga/AbstractRga.ts | 4 +- src/json-equal/$$deepEqual/v1.ts | 2 +- src/json-expression/codegen.ts | 4 +- src/json-expression/types.ts | 2 +- src/json-hash/index.ts | 2 +- src/json-patch/applyPatch/v3.ts | 2 +- src/json-patch/codec/binary/Decoder.ts | 2 +- src/json-patch/codegen/apply.ts | 2 +- src/json-patch/codegen/ops/add.ts | 2 +- src/json-patch/codegen/ops/starts.ts | 2 +- src/json-patch/codegen/ops/test.ts | 2 +- src/json-patch/validate.ts | 2 +- src/json-pointer/codegen/find.ts | 2 +- src/json-pointer/codegen/findRef.ts | 4 +- src/json-pointer/find.ts | 2 +- src/json-pointer/findByPointer/v1.ts | 2 +- src/json-pointer/findByPointer/v2.ts | 2 +- src/json-pointer/findByPointer/v3.ts | 2 +- src/json-pointer/findByPointer/v4.ts | 2 +- src/json-pointer/findByPointer/v5.ts | 2 +- src/json-pointer/findByPointer/v6.ts | 2 +- src/json-pointer/get.ts | 2 +- src/json-size/json.ts | 2 +- src/json-size/msgpackSizeFast.ts | 2 +- src/json-stable/index.ts | 6 +- src/json-type-cli/Cli.ts | 2 +- src/json-type-cli/codecs/cbor.ts | 2 +- src/json-type-cli/codecs/json.ts | 2 +- src/json-type-cli/codecs/json2.ts | 4 +- src/json-type-cli/codecs/json4.ts | 4 +- src/json-type-cli/codecs/msgpack.ts | 2 +- src/json-type-cli/codecs/ubjson.ts | 2 +- src/json-type-cli/defaultCodecs.ts | 2 +- src/json-type-cli/params/CliParamCmd.ts | 4 +- .../binary/BinaryEncoderCodegenContext.ts | 4 +- .../CapacityEstimatorCodegenContext.ts | 2 +- .../json/JsonTextEncoderCodegenContext.ts | 6 +- .../validator/ValidatorCodegenContext.ts | 2 +- src/json-type/schema/schema.ts | 2 +- src/json-type/type/classes/AbstractType.ts | 8 +-- src/json-type/type/classes/AnyType.ts | 2 +- src/json-type/type/classes/ArrayType.ts | 4 +- src/json-type/type/classes/BinaryType.ts | 4 +- src/json-type/type/classes/BooleanType.ts | 4 +- src/json-type/type/classes/ConstType.ts | 4 +- src/json-type/type/classes/MapType.ts | 6 +- src/json-type/type/classes/NumberType.ts | 4 +- src/json-type/type/classes/ObjectType.ts | 8 +-- src/json-type/type/classes/OrType.ts | 4 +- src/json-type/type/classes/RefType.ts | 4 +- src/json-type/type/classes/StringType.ts | 6 +- src/json-type/type/classes/TupleType.ts | 4 +- src/json-type/typescript/toText.ts | 2 +- .../browser/createBinaryWsRpcClient.ts | 2 +- .../browser/createJsonWsRpcClient.ts | 2 +- src/reactive-rpc/common/channel/channel.ts | 2 +- src/reactive-rpc/common/channel/mock.ts | 2 +- .../codec/binary/BinaryRpcMessageCodec.ts | 2 +- .../common/codec/binary/decode.ts | 4 +- .../common/testing/buildE2eClient.ts | 4 +- src/reactive-rpc/server/context.ts | 6 +- src/reactive-rpc/server/http1/Http1Server.ts | 4 +- src/reactive-rpc/server/http1/context.ts | 2 +- src/reactive-rpc/server/uws/RpcApp.ts | 4 +- .../server/ws/codec/WsFrameDecoder.ts | 2 +- .../server/ws/codec/WsFrameEncoder.ts | 4 +- .../server/ws/server/WsServerConnection.ts | 4 +- src/util/Fuzzer.ts | 66 ------------------- src/util/NullObject.ts | 2 - src/util/buffers/index.ts | 1 - src/util/codegen/index.ts | 1 - src/util/hasOwnProperty.ts | 5 -- src/util/isEmpty.ts | 4 -- src/util/lazyFunction.ts | 8 --- src/util/router/codegen.ts | 4 +- src/util/router/router.ts | 2 +- src/util/router/tree.ts | 2 +- src/util/sort/insertion.ts | 1 - src/util/sort/insertion2.ts | 1 - src/util/types.ts | 9 --- src/web3/adl/hamt-crdt/Hamt.ts | 2 +- src/web3/adl/hamt-crdt/HamtFrame.ts | 2 +- src/web3/codec/codecs/writer.ts | 2 +- src/web3/multiformats/Multihash.ts | 2 +- 94 files changed, 121 insertions(+), 219 deletions(-) delete mode 100644 src/json-brand/index.ts delete mode 100644 src/util/Fuzzer.ts delete mode 100644 src/util/NullObject.ts delete mode 100644 src/util/buffers/index.ts delete mode 100644 src/util/codegen/index.ts delete mode 100644 src/util/hasOwnProperty.ts delete mode 100644 src/util/isEmpty.ts delete mode 100644 src/util/lazyFunction.ts delete mode 100644 src/util/sort/insertion.ts delete mode 100644 src/util/sort/insertion2.ts delete mode 100644 src/util/types.ts diff --git a/package.json b/package.json index e982712f82..3c5421ec5e 100644 --- a/package.json +++ b/package.json @@ -123,6 +123,7 @@ "dependencies": { "@jsonjoy.com/base64": "^1.1.1", "@jsonjoy.com/json-pack": "^1.0.2", + "@jsonjoy.com/util": "^1.0.0", "arg": "^5.0.2", "hyperdyperid": "^1.2.0", "multibase": "^4.0.6", diff --git a/src/index.ts b/src/index.ts index ccefde3bc6..6d549e2889 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,7 +7,7 @@ */ export type * from '@jsonjoy.com/json-pack/lib/json-binary/types'; -export type * from '@jsonjoy.com/json-pack/lib/json-brand/types'; +export type * from '@jsonjoy.com/util/lib/json-brand/types'; export type * from './json-crdt'; export type * from './json-crdt-patch'; export type * from './json-crdt-extensions'; diff --git a/src/json-brand/index.ts b/src/json-brand/index.ts deleted file mode 100644 index 58890235f8..0000000000 --- a/src/json-brand/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@jsonjoy.com/json-pack/lib/json-brand'; diff --git a/src/json-clone/cloneBinary.ts b/src/json-clone/cloneBinary.ts index fc5b110ebd..4d5725902c 100644 --- a/src/json-clone/cloneBinary.ts +++ b/src/json-clone/cloneBinary.ts @@ -1,4 +1,4 @@ -import {isUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/isUint8Array'; +import {isUint8Array} from '@jsonjoy.com/util/lib/buffers/isUint8Array'; const {isArray} = Array; const objectKeys = Object.keys; diff --git a/src/json-crdt-patch/PatchBuilder.ts b/src/json-crdt-patch/PatchBuilder.ts index 2116af5d00..d05ed079e8 100644 --- a/src/json-crdt-patch/PatchBuilder.ts +++ b/src/json-crdt-patch/PatchBuilder.ts @@ -16,7 +16,7 @@ import { NopOp, } from './operations'; import {IClock, ITimestampStruct, ITimespanStruct, ts, Timestamp} from './clock'; -import {isUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/isUint8Array'; +import {isUint8Array} from '@jsonjoy.com/util/lib/buffers/isUint8Array'; import {Patch} from './Patch'; import {ORIGIN} from './constants'; import {VectorDelayedValue} from './builder/Tuple'; diff --git a/src/json-crdt-patch/util/binary/CrdtReader.ts b/src/json-crdt-patch/util/binary/CrdtReader.ts index 242a75e36c..8a7622e00d 100644 --- a/src/json-crdt-patch/util/binary/CrdtReader.ts +++ b/src/json-crdt-patch/util/binary/CrdtReader.ts @@ -1,4 +1,4 @@ -import {Reader} from '@jsonjoy.com/json-pack/lib/util/buffers/Reader'; +import {Reader} from '@jsonjoy.com/util/lib/buffers/Reader'; /** @todo Rename file name. */ export class CrdtReader extends Reader { diff --git a/src/json-crdt-patch/util/binary/CrdtWriter.ts b/src/json-crdt-patch/util/binary/CrdtWriter.ts index 5c71546451..e835be947e 100644 --- a/src/json-crdt-patch/util/binary/CrdtWriter.ts +++ b/src/json-crdt-patch/util/binary/CrdtWriter.ts @@ -1,4 +1,4 @@ -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; export class CrdtWriter extends Writer { /** diff --git a/src/json-crdt/codec/sidecar/binary/Decoder.ts b/src/json-crdt/codec/sidecar/binary/Decoder.ts index a7700e31cf..157b91021d 100644 --- a/src/json-crdt/codec/sidecar/binary/Decoder.ts +++ b/src/json-crdt/codec/sidecar/binary/Decoder.ts @@ -5,7 +5,7 @@ import {Model, UNDEFINED} from '../../../model/Model'; import {CborDecoderBase} from '@jsonjoy.com/json-pack/lib/cbor/CborDecoderBase'; import * as nodes from '../../../nodes'; import {CRDT_MAJOR} from '../../structural/binary/constants'; -import {sort} from '../../../../util/sort/insertion'; +import {sort} from '@jsonjoy.com/util/lib/sort/insertion'; import {SESSION} from '../../../../json-crdt-patch/constants'; export class Decoder { diff --git a/src/json-crdt/codec/sidecar/binary/Encoder.ts b/src/json-crdt/codec/sidecar/binary/Encoder.ts index 3dd3afdb84..fed981e30d 100644 --- a/src/json-crdt/codec/sidecar/binary/Encoder.ts +++ b/src/json-crdt/codec/sidecar/binary/Encoder.ts @@ -5,7 +5,7 @@ import {ITimestampStruct, Timestamp} from '../../../../json-crdt-patch/clock'; import {CborEncoder} from '@jsonjoy.com/json-pack/lib/cbor/CborEncoder'; import {SESSION} from '../../../../json-crdt-patch/constants'; import {CRDT_MAJOR_OVERLAY} from '../../structural/binary/constants'; -import {sort} from '@jsonjoy.com/json-pack/lib/util/sort/insertion'; +import {sort} from '@jsonjoy.com/util/lib/sort/insertion'; import {UNDEFINED} from '../../../model/Model'; import type {Model} from '../../../model'; diff --git a/src/json-crdt/log/codec/logEncoderOpts.ts b/src/json-crdt/log/codec/logEncoderOpts.ts index b826ed468f..f485163abd 100644 --- a/src/json-crdt/log/codec/logEncoderOpts.ts +++ b/src/json-crdt/log/codec/logEncoderOpts.ts @@ -1,4 +1,4 @@ -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {Encoder as SidecarEncoder} from '../../codec/sidecar/binary/Encoder'; import {Encoder as StructuralEncoderCompact} from '../../codec/structural/compact/Encoder'; import {Encoder as StructuralEncoderVerbose} from '../../codec/structural/verbose/Encoder'; diff --git a/src/json-crdt/nodes/rga/AbstractRga.ts b/src/json-crdt/nodes/rga/AbstractRga.ts index 443cb33610..b8eb36e8df 100644 --- a/src/json-crdt/nodes/rga/AbstractRga.ts +++ b/src/json-crdt/nodes/rga/AbstractRga.ts @@ -8,14 +8,14 @@ import { containsId, Timestamp, } from '../../../json-crdt-patch/clock'; -import {isUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/isUint8Array'; +import {isUint8Array} from '@jsonjoy.com/util/lib/buffers/isUint8Array'; import {rSplay, lSplay, llSplay, rrSplay, lrSplay, rlSplay} from '../../../util/trees/splay/util'; import {splay2} from '../../../util/trees/splay/util2'; import {insert2, remove2} from '../../../util/trees/util2'; import {ORIGIN} from '../../../json-crdt-patch/constants'; import {printTree} from '../../../util/print/printTree'; import {printBinary} from '../../../util/print/printBinary'; -import {printOctets} from '@jsonjoy.com/json-pack/lib/util/buffers/printOctets'; +import {printOctets} from '@jsonjoy.com/util/lib/buffers/printOctets'; /** * @category CRDT Node diff --git a/src/json-equal/$$deepEqual/v1.ts b/src/json-equal/$$deepEqual/v1.ts index a240f9171c..c775924f41 100644 --- a/src/json-equal/$$deepEqual/v1.ts +++ b/src/json-equal/$$deepEqual/v1.ts @@ -1,4 +1,4 @@ -import {JavaScript} from '@jsonjoy.com/json-pack/lib/util/codegen'; +import {JavaScript} from '@jsonjoy.com/util/lib/codegen'; const codegenValue = (doc: unknown, code: string[], r: number): number => { let rr = r; diff --git a/src/json-expression/codegen.ts b/src/json-expression/codegen.ts index b4427251ea..8629421049 100644 --- a/src/json-expression/codegen.ts +++ b/src/json-expression/codegen.ts @@ -1,8 +1,8 @@ import * as util from './util'; -import {Codegen} from '@jsonjoy.com/json-pack/lib/util/codegen/Codegen'; +import {Codegen} from '@jsonjoy.com/util/lib/codegen/Codegen'; import {ExpressionResult, Literal} from './codegen-steps'; import {createEvaluate} from './createEvaluate'; -import {JavaScript} from '@jsonjoy.com/json-pack/lib/util/codegen'; +import {JavaScript} from '@jsonjoy.com/util/lib/codegen'; import {Vars} from './Vars'; import type * as types from './types'; diff --git a/src/json-expression/types.ts b/src/json-expression/types.ts index 984dd0278f..1bc1b2bfca 100644 --- a/src/json-expression/types.ts +++ b/src/json-expression/types.ts @@ -1,4 +1,4 @@ -import type {JavaScript} from '../util/codegen'; +import type {JavaScript} from '@jsonjoy.com/util/lib/codegen'; import type {Vars} from './Vars'; import type {ExpressionResult} from './codegen-steps'; diff --git a/src/json-hash/index.ts b/src/json-hash/index.ts index 80dcc9c879..d9657f0f19 100644 --- a/src/json-hash/index.ts +++ b/src/json-hash/index.ts @@ -1,5 +1,5 @@ import type {JsonValue} from '@jsonjoy.com/json-pack/lib/types'; -import {sort} from '../util/sort/insertion'; +import {sort} from '@jsonjoy.com/util/lib/sort/insertion'; export const enum CONST { START_STATE = 5381, diff --git a/src/json-patch/applyPatch/v3.ts b/src/json-patch/applyPatch/v3.ts index 4401f8c9fd..10b312394a 100644 --- a/src/json-patch/applyPatch/v3.ts +++ b/src/json-patch/applyPatch/v3.ts @@ -3,7 +3,7 @@ import {Operation} from '../types'; import {findByPointer, unescapeComponent} from '../../json-pointer'; import {deepEqual} from '../../json-equal/deepEqual'; import type {ApplyPatchOptions, OpResult, PatchResult} from './types'; -import {hasOwnProperty} from '../../util/hasOwnProperty'; +import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty'; const {isArray} = Array; diff --git a/src/json-patch/codec/binary/Decoder.ts b/src/json-patch/codec/binary/Decoder.ts index 8f747dc0bc..d10a9e8c41 100644 --- a/src/json-patch/codec/binary/Decoder.ts +++ b/src/json-patch/codec/binary/Decoder.ts @@ -37,7 +37,7 @@ import {Path} from '../../../json-pointer'; import {JsonPatchTypes} from '../json/types'; import {createMatcherDefault} from '../../util'; import type {JsonPatchOptions} from '../../types'; -import type {Reader} from '@jsonjoy.com/json-pack/lib/util/buffers/Reader'; +import type {Reader} from '@jsonjoy.com/util/lib/buffers/Reader'; export class Decoder extends MsgPackDecoderFast { constructor(private readonly options: JsonPatchOptions) { diff --git a/src/json-patch/codegen/apply.ts b/src/json-patch/codegen/apply.ts index 0ed7c0b26b..5c32aa7c9c 100644 --- a/src/json-patch/codegen/apply.ts +++ b/src/json-patch/codegen/apply.ts @@ -5,7 +5,7 @@ import {AbstractPredicateOp} from '../op'; import {ApplyPatchOptions} from '../applyPatch/types'; import type {JsonPatchOptions} from '..'; import type {ApplyFn} from './types'; -import {compile, JavaScriptLinked, JavaScript} from '../../util/codegen'; +import {compile, JavaScriptLinked, JavaScript} from '@jsonjoy.com/util/lib/codegen'; import {codegenOp} from './codegenOp'; export const apply = (patch: readonly Operation[], applyOptions: ApplyPatchOptions, doc: unknown): unknown => { diff --git a/src/json-patch/codegen/ops/add.ts b/src/json-patch/codegen/ops/add.ts index f4b1c5d866..c417e7ea7a 100644 --- a/src/json-patch/codegen/ops/add.ts +++ b/src/json-patch/codegen/ops/add.ts @@ -1,5 +1,5 @@ import {OpAdd} from '../../op'; -import {JavaScriptLinked, compileClosure, JavaScript} from '../../../util/codegen'; +import {JavaScriptLinked, compileClosure, JavaScript} from '@jsonjoy.com/util/lib/codegen'; import type {ApplyFn} from '../types'; import {$findRef} from '../../../json-pointer/codegen/findRef'; diff --git a/src/json-patch/codegen/ops/starts.ts b/src/json-patch/codegen/ops/starts.ts index a5d7b7d4e1..992b2665c5 100644 --- a/src/json-patch/codegen/ops/starts.ts +++ b/src/json-patch/codegen/ops/starts.ts @@ -1,6 +1,6 @@ import {OpStarts} from '../../op'; import {$$find} from '../../../json-pointer/codegen/find'; -import {JavaScriptLinked, compileClosure, JavaScript} from '../../../util/codegen'; +import {JavaScriptLinked, compileClosure, JavaScript} from '@jsonjoy.com/util/lib/codegen'; import {predicateOpWrapper} from '../util'; import type {ApplyFn} from '../types'; diff --git a/src/json-patch/codegen/ops/test.ts b/src/json-patch/codegen/ops/test.ts index 5ab5d49f0e..e7db89eafc 100644 --- a/src/json-patch/codegen/ops/test.ts +++ b/src/json-patch/codegen/ops/test.ts @@ -1,7 +1,7 @@ import {OpTest} from '../../op'; import {$$find} from '../../../json-pointer/codegen/find'; import {$$deepEqual} from '../../../json-equal/$$deepEqual'; -import {JavaScriptLinked, compileClosure, JavaScript} from '../../../util/codegen'; +import {JavaScriptLinked, compileClosure, JavaScript} from '@jsonjoy.com/util/lib/codegen'; import {predicateOpWrapper} from '../util'; import type {ApplyFn} from '../types'; diff --git a/src/json-patch/validate.ts b/src/json-patch/validate.ts index a091fc8064..f209344ff4 100644 --- a/src/json-patch/validate.ts +++ b/src/json-patch/validate.ts @@ -23,7 +23,7 @@ import { JsonPatchTypes, } from './types'; import {validateJsonPointer} from '../json-pointer/validate'; -import {hasOwnProperty} from '../util/hasOwnProperty'; +import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty'; export const validateOperations = (ops: Operation[], allowMatchesOp: boolean = false) => { if (!Array.isArray(ops)) throw new Error('Not a array.'); diff --git a/src/json-pointer/codegen/find.ts b/src/json-pointer/codegen/find.ts index 6ab93e30fd..9898ba2866 100644 --- a/src/json-pointer/codegen/find.ts +++ b/src/json-pointer/codegen/find.ts @@ -1,4 +1,4 @@ -import {JavaScript} from '../../util/codegen'; +import {JavaScript} from '@jsonjoy.com/util/lib/codegen'; import {Path} from '../types'; export const $$find = (path: Path): JavaScript<(doc: unknown) => unknown> => { diff --git a/src/json-pointer/codegen/findRef.ts b/src/json-pointer/codegen/findRef.ts index e09285009d..a5c9162cba 100644 --- a/src/json-pointer/codegen/findRef.ts +++ b/src/json-pointer/codegen/findRef.ts @@ -1,7 +1,7 @@ import type {Reference} from '../find'; import type {Path} from '../types'; -import {JavaScriptLinked, compileClosure} from '../../util/codegen'; -import {hasOwnProperty} from '../../util/hasOwnProperty'; +import {JavaScriptLinked, compileClosure} from '@jsonjoy.com/util/lib/codegen'; +import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty'; type Fn = (val: unknown) => Reference; diff --git a/src/json-pointer/find.ts b/src/json-pointer/find.ts index a030b41920..b76b1758b6 100644 --- a/src/json-pointer/find.ts +++ b/src/json-pointer/find.ts @@ -1,6 +1,6 @@ /* tslint:disable no-string-throw */ -import {hasOwnProperty} from '../util/hasOwnProperty'; +import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty'; import type {Path} from './types'; export interface Reference { diff --git a/src/json-pointer/findByPointer/v1.ts b/src/json-pointer/findByPointer/v1.ts index 7c55f410b7..4a5b58ad90 100644 --- a/src/json-pointer/findByPointer/v1.ts +++ b/src/json-pointer/findByPointer/v1.ts @@ -1,4 +1,4 @@ -import {hasOwnProperty} from '../../util/hasOwnProperty'; +import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty'; import {Reference} from '../find'; import {isValidIndex, unescapeComponent} from '../util'; diff --git a/src/json-pointer/findByPointer/v2.ts b/src/json-pointer/findByPointer/v2.ts index 1ecb87eb7a..da56108071 100644 --- a/src/json-pointer/findByPointer/v2.ts +++ b/src/json-pointer/findByPointer/v2.ts @@ -1,4 +1,4 @@ -import {hasOwnProperty} from '../../util/hasOwnProperty'; +import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty'; import {Reference} from '../find'; import {isValidIndex, unescapeComponent} from '../util'; diff --git a/src/json-pointer/findByPointer/v3.ts b/src/json-pointer/findByPointer/v3.ts index 9058801fbd..3f9cff0174 100644 --- a/src/json-pointer/findByPointer/v3.ts +++ b/src/json-pointer/findByPointer/v3.ts @@ -1,4 +1,4 @@ -import {hasOwnProperty} from '../../util/hasOwnProperty'; +import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty'; import {Reference} from '../find'; import {isInteger, unescapeComponent} from '../util'; diff --git a/src/json-pointer/findByPointer/v4.ts b/src/json-pointer/findByPointer/v4.ts index 2c582a0453..e18e6f2005 100644 --- a/src/json-pointer/findByPointer/v4.ts +++ b/src/json-pointer/findByPointer/v4.ts @@ -1,4 +1,4 @@ -import {hasOwnProperty} from '../../util/hasOwnProperty'; +import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty'; import {Reference} from '../find'; import {unescapeComponent} from '../util'; diff --git a/src/json-pointer/findByPointer/v5.ts b/src/json-pointer/findByPointer/v5.ts index 9f5bea2a11..bf8f1c59ee 100644 --- a/src/json-pointer/findByPointer/v5.ts +++ b/src/json-pointer/findByPointer/v5.ts @@ -1,6 +1,6 @@ /* tslint:disable no-string-throw */ -import {hasOwnProperty} from '../../util/hasOwnProperty'; +import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty'; import {Reference} from '../find'; import {unescapeComponent} from '../util'; diff --git a/src/json-pointer/findByPointer/v6.ts b/src/json-pointer/findByPointer/v6.ts index 3b51c33bde..2f745194a8 100644 --- a/src/json-pointer/findByPointer/v6.ts +++ b/src/json-pointer/findByPointer/v6.ts @@ -1,6 +1,6 @@ /* tslint:disable no-string-throw */ -import {hasOwnProperty} from '../../util/hasOwnProperty'; +import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty'; import {Reference} from '../find'; import {unescapeComponent} from '../util'; diff --git a/src/json-pointer/get.ts b/src/json-pointer/get.ts index 07e3d72bb6..e683a41be2 100644 --- a/src/json-pointer/get.ts +++ b/src/json-pointer/get.ts @@ -1,4 +1,4 @@ -import {hasOwnProperty} from '../util/hasOwnProperty'; +import {hasOwnProperty} from '@jsonjoy.com/util/lib/hasOwnProperty'; import type {Path} from './types'; export const get = (val: unknown, path: Path): unknown | undefined => { diff --git a/src/json-size/json.ts b/src/json-size/json.ts index c75f7b41d5..7b2c3bfefd 100644 --- a/src/json-size/json.ts +++ b/src/json-size/json.ts @@ -1,4 +1,4 @@ -import {utf8Size} from '@jsonjoy.com/json-pack/lib/util/strings/utf8'; +import {utf8Size} from '@jsonjoy.com/util/lib/strings/utf8'; const numberSize = (num: number) => { const isInteger = num === Math.round(num); diff --git a/src/json-size/msgpackSizeFast.ts b/src/json-size/msgpackSizeFast.ts index 8ddd87a2a5..933aea8936 100644 --- a/src/json-size/msgpackSizeFast.ts +++ b/src/json-size/msgpackSizeFast.ts @@ -1,5 +1,5 @@ import {JsonPackExtension, JsonPackValue} from '@jsonjoy.com/json-pack/lib/msgpack'; -import {isUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/isUint8Array'; +import {isUint8Array} from '@jsonjoy.com/util/lib/buffers/isUint8Array'; const arraySize = (arr: unknown[]): number => { let size = 2; diff --git a/src/json-stable/index.ts b/src/json-stable/index.ts index 74a0e51be4..28c767561d 100644 --- a/src/json-stable/index.ts +++ b/src/json-stable/index.ts @@ -1,6 +1,6 @@ -import {escape} from '@jsonjoy.com/json-pack/lib/util/strings/escape'; -import {sort} from '../util/sort/insertion'; -import type {json_string} from '../json-brand'; +import {escape} from '@jsonjoy.com/util/lib/strings/escape'; +import {sort} from '@jsonjoy.com/util/lib/sort/insertion'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; const getKeys = Object.keys; diff --git a/src/json-type-cli/Cli.ts b/src/json-type-cli/Cli.ts index 83dedaecca..ce042eb9d0 100644 --- a/src/json-type-cli/Cli.ts +++ b/src/json-type-cli/Cli.ts @@ -1,7 +1,7 @@ import {parseArgs} from 'node:util'; import {TypeSystem} from '../json-type/system/TypeSystem'; import {ObjectValueCaller} from '../reactive-rpc/common/rpc/caller/ObjectValueCaller'; -import {bufferToUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/bufferToUint8Array'; +import {bufferToUint8Array} from '@jsonjoy.com/util/lib/buffers/bufferToUint8Array'; import {formatError} from './util'; import {defineBuiltinRoutes} from './methods'; import {defaultParams} from './defaultParams'; diff --git a/src/json-type-cli/codecs/cbor.ts b/src/json-type-cli/codecs/cbor.ts index 6174b2fbbf..20078fe649 100644 --- a/src/json-type-cli/codecs/cbor.ts +++ b/src/json-type-cli/codecs/cbor.ts @@ -1,6 +1,6 @@ import {CborDecoder} from '@jsonjoy.com/json-pack/lib/cbor/CborDecoder'; import {CborEncoder} from '@jsonjoy.com/json-pack/lib/cbor/CborEncoder'; -import type {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import type {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import type {CliCodec} from '../types'; export class CliCodecCbor implements CliCodec<'cbor'> { diff --git a/src/json-type-cli/codecs/json.ts b/src/json-type-cli/codecs/json.ts index fad83b3069..e6823a8df6 100644 --- a/src/json-type-cli/codecs/json.ts +++ b/src/json-type-cli/codecs/json.ts @@ -1,6 +1,6 @@ import {JsonDecoder} from '@jsonjoy.com/json-pack/lib/json/JsonDecoder'; import {JsonEncoder} from '@jsonjoy.com/json-pack/lib/json/JsonEncoder'; -import type {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import type {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import type {CliCodec} from '../types'; export class CliCodecJson implements CliCodec<'json'> { diff --git a/src/json-type-cli/codecs/json2.ts b/src/json-type-cli/codecs/json2.ts index d9df7f99d7..3a369a0967 100644 --- a/src/json-type-cli/codecs/json2.ts +++ b/src/json-type-cli/codecs/json2.ts @@ -1,7 +1,7 @@ import {JsonDecoder} from '@jsonjoy.com/json-pack/lib/json/JsonDecoder'; import {JsonEncoder} from '@jsonjoy.com/json-pack/lib/json/JsonEncoder'; -import {bufferToUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/bufferToUint8Array'; -import type {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {bufferToUint8Array} from '@jsonjoy.com/util/lib/buffers/bufferToUint8Array'; +import type {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import type {CliCodec} from '../types'; /** diff --git a/src/json-type-cli/codecs/json4.ts b/src/json-type-cli/codecs/json4.ts index 1d290ec3b4..d2607f4bd5 100644 --- a/src/json-type-cli/codecs/json4.ts +++ b/src/json-type-cli/codecs/json4.ts @@ -1,7 +1,7 @@ import {JsonDecoder} from '@jsonjoy.com/json-pack/lib/json/JsonDecoder'; import {JsonEncoder} from '@jsonjoy.com/json-pack/lib/json/JsonEncoder'; -import type {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; -import {bufferToUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/bufferToUint8Array'; +import type {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; +import {bufferToUint8Array} from '@jsonjoy.com/util/lib/buffers/bufferToUint8Array'; import type {CliCodec} from '../types'; /** diff --git a/src/json-type-cli/codecs/msgpack.ts b/src/json-type-cli/codecs/msgpack.ts index 95cb5ab8ef..bd49f2f003 100644 --- a/src/json-type-cli/codecs/msgpack.ts +++ b/src/json-type-cli/codecs/msgpack.ts @@ -1,6 +1,6 @@ import {MsgPackEncoder} from '@jsonjoy.com/json-pack/lib/msgpack'; import {MsgPackDecoder} from '@jsonjoy.com/json-pack/lib/msgpack/MsgPackDecoder'; -import type {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import type {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import type {CliCodec} from '../types'; export class CliCodecMsgpack implements CliCodec<'msgpack'> { diff --git a/src/json-type-cli/codecs/ubjson.ts b/src/json-type-cli/codecs/ubjson.ts index bad4036c81..ae0d57f84f 100644 --- a/src/json-type-cli/codecs/ubjson.ts +++ b/src/json-type-cli/codecs/ubjson.ts @@ -1,6 +1,6 @@ import {UbjsonDecoder} from '@jsonjoy.com/json-pack/lib/ubjson/UbjsonDecoder'; import {UbjsonEncoder} from '@jsonjoy.com/json-pack/lib/ubjson/UbjsonEncoder'; -import type {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import type {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import type {CliCodec} from '../types'; export class CliCodecUbjson implements CliCodec<'ubjson'> { diff --git a/src/json-type-cli/defaultCodecs.ts b/src/json-type-cli/defaultCodecs.ts index c6511a13d8..944c58be3b 100644 --- a/src/json-type-cli/defaultCodecs.ts +++ b/src/json-type-cli/defaultCodecs.ts @@ -1,4 +1,4 @@ -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {CliCodecs} from './CliCodecs'; import {CliCodecCbor} from './codecs/cbor'; import {CliCodecJson} from './codecs/json'; diff --git a/src/json-type-cli/params/CliParamCmd.ts b/src/json-type-cli/params/CliParamCmd.ts index f685c40746..791e9ab369 100644 --- a/src/json-type-cli/params/CliParamCmd.ts +++ b/src/json-type-cli/params/CliParamCmd.ts @@ -1,8 +1,8 @@ import {applyPatch} from '../../json-patch'; import {spawn} from 'child_process'; import {find, toPath, validateJsonPointer} from '../../json-pointer'; -import {bufferToUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/bufferToUint8Array'; -import {listToUint8} from '@jsonjoy.com/json-pack/lib/util/buffers/concat'; +import {bufferToUint8Array} from '@jsonjoy.com/util/lib/buffers/bufferToUint8Array'; +import {listToUint8} from '@jsonjoy.com/util/lib/buffers/concat'; import type {Cli} from '../Cli'; import type {CliParam, CliParamInstance} from '../types'; diff --git a/src/json-type/codegen/binary/BinaryEncoderCodegenContext.ts b/src/json-type/codegen/binary/BinaryEncoderCodegenContext.ts index b21d988fe8..e8a395d29b 100644 --- a/src/json-type/codegen/binary/BinaryEncoderCodegenContext.ts +++ b/src/json-type/codegen/binary/BinaryEncoderCodegenContext.ts @@ -1,6 +1,6 @@ -import {Codegen, CodegenStepExecJs} from '../../../util/codegen'; +import {Codegen, CodegenStepExecJs} from '@jsonjoy.com/util/lib/codegen'; import {WriteBlobStep} from '../WriteBlobStep'; -import {concat} from '@jsonjoy.com/json-pack/lib/util/buffers/concat'; +import {concat} from '@jsonjoy.com/util/lib/buffers/concat'; import {Value} from '../../../json-type-value/Value'; import type {TypeSystem} from '../../system'; import type {Type} from '../../type'; diff --git a/src/json-type/codegen/capacity/CapacityEstimatorCodegenContext.ts b/src/json-type/codegen/capacity/CapacityEstimatorCodegenContext.ts index 636b64af7a..0e5fee9ef4 100644 --- a/src/json-type/codegen/capacity/CapacityEstimatorCodegenContext.ts +++ b/src/json-type/codegen/capacity/CapacityEstimatorCodegenContext.ts @@ -1,4 +1,4 @@ -import {Codegen, CodegenStepExecJs} from '../../../util/codegen'; +import {Codegen, CodegenStepExecJs} from '@jsonjoy.com/util/lib/codegen'; import {maxEncodingCapacity} from '../../../json-size'; import {Value} from '../../../json-type-value/Value'; import type {TypeSystem} from '../../system'; diff --git a/src/json-type/codegen/json/JsonTextEncoderCodegenContext.ts b/src/json-type/codegen/json/JsonTextEncoderCodegenContext.ts index 21b3a9d705..2e500aad09 100644 --- a/src/json-type/codegen/json/JsonTextEncoderCodegenContext.ts +++ b/src/json-type/codegen/json/JsonTextEncoderCodegenContext.ts @@ -1,9 +1,9 @@ -import {Codegen, CodegenStepExecJs} from '../../../util/codegen'; -import {asString} from '@jsonjoy.com/json-pack/lib/util/strings/asString'; +import {Codegen, CodegenStepExecJs} from '@jsonjoy.com/util/lib/codegen'; +import {asString} from '@jsonjoy.com/util/lib/strings/asString'; import {toBase64} from '@jsonjoy.com/base64/lib/toBase64'; import type {TypeSystem} from '../../system'; import type {Type} from '../../type'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; export type JsonEncoderFn = (value: T) => json_string; diff --git a/src/json-type/codegen/validator/ValidatorCodegenContext.ts b/src/json-type/codegen/validator/ValidatorCodegenContext.ts index 00eb93c190..065eeaa091 100644 --- a/src/json-type/codegen/validator/ValidatorCodegenContext.ts +++ b/src/json-type/codegen/validator/ValidatorCodegenContext.ts @@ -1,4 +1,4 @@ -import {Codegen} from '../../../util/codegen'; +import {Codegen} from '@jsonjoy.com/util/lib/codegen'; import {ValidationError, ValidationErrorMessage} from '../../constants'; import type {TypeSystem} from '../../system'; import type {Type} from '../../type'; diff --git a/src/json-type/schema/schema.ts b/src/json-type/schema/schema.ts index ba1545995e..c2cb50f900 100644 --- a/src/json-type/schema/schema.ts +++ b/src/json-type/schema/schema.ts @@ -1,5 +1,5 @@ import type {Observable} from 'rxjs'; -import type {Mutable} from '../../util/types'; +import type {Mutable} from '@jsonjoy.com/util/lib/types'; import type {Display, Identifiable} from './common'; import type {Expr} from '../../json-expression'; diff --git a/src/json-type/type/classes/AbstractType.ts b/src/json-type/type/classes/AbstractType.ts index 14232589c0..5d5c7288ba 100644 --- a/src/json-type/type/classes/AbstractType.ts +++ b/src/json-type/type/classes/AbstractType.ts @@ -19,16 +19,16 @@ import { JsonEncoderCodegenContextOptions, } from '../../codegen/binary/JsonEncoderCodegenContext'; import {CborEncoder} from '@jsonjoy.com/json-pack/lib/cbor/CborEncoder'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import { MessagePackEncoderCodegenContext, MessagePackEncoderCodegenContextOptions, } from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {MsgPackEncoder} from '@jsonjoy.com/json-pack/lib/msgpack'; -import {lazy} from '../../../util/lazyFunction'; +import {lazy} from '@jsonjoy.com/util/lib/lazyFunction'; import {EncodingFormat} from '@jsonjoy.com/json-pack/lib/constants'; import {JsonEncoder} from '@jsonjoy.com/json-pack/lib/json/JsonEncoder'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import { CapacityEstimatorCodegenContext, CapacityEstimatorCodegenContextOptions, @@ -38,7 +38,7 @@ import {JsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/types'; import type * as jsonSchema from '../../../json-schema'; import type {BaseType} from '../types'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; import type {Validators} from './types'; diff --git a/src/json-type/type/classes/AnyType.ts b/src/json-type/type/classes/AnyType.ts index 0efd7d4ec6..77a4e69133 100644 --- a/src/json-type/type/classes/AnyType.ts +++ b/src/json-type/type/classes/AnyType.ts @@ -7,7 +7,7 @@ import {JsonTextEncoderCodegenContext} from '../../codegen/json/JsonTextEncoderC import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; import {BinaryEncoderCodegenContext} from '../../codegen/binary/BinaryEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {EncodingFormat} from '@jsonjoy.com/json-pack/lib/constants'; import {BinaryJsonEncoder} from '@jsonjoy.com/json-pack/lib/types'; diff --git a/src/json-type/type/classes/ArrayType.ts b/src/json-type/type/classes/ArrayType.ts index f1b1dd969e..4cb4da2c82 100644 --- a/src/json-type/type/classes/ArrayType.ts +++ b/src/json-type/type/classes/ArrayType.ts @@ -8,7 +8,7 @@ import {JsonTextEncoderCodegenContext} from '../../codegen/json/JsonTextEncoderC import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; import {BinaryEncoderCodegenContext} from '../../codegen/binary/BinaryEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {BinaryJsonEncoder} from '@jsonjoy.com/json-pack/lib/types'; import {CapacityEstimatorCodegenContext} from '../../codegen/capacity/CapacityEstimatorCodegenContext'; @@ -20,7 +20,7 @@ import {NumberType} from './NumberType'; import type * as jsonSchema from '../../../json-schema'; import type {SchemaOf, Type} from '../types'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; diff --git a/src/json-type/type/classes/BinaryType.ts b/src/json-type/type/classes/BinaryType.ts index dc98969d19..b3784f9658 100644 --- a/src/json-type/type/classes/BinaryType.ts +++ b/src/json-type/type/classes/BinaryType.ts @@ -10,7 +10,7 @@ import {JsonTextEncoderCodegenContext} from '../../codegen/json/JsonTextEncoderC import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; import {BinaryEncoderCodegenContext} from '../../codegen/binary/BinaryEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {BinaryJsonEncoder} from '@jsonjoy.com/json-pack/lib/types'; import {CapacityEstimatorCodegenContext} from '../../codegen/capacity/CapacityEstimatorCodegenContext'; @@ -19,7 +19,7 @@ import {AbstractType} from './AbstractType'; import type * as jsonSchema from '../../../json-schema'; import type {SchemaOf, Type} from '../types'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; diff --git a/src/json-type/type/classes/BooleanType.ts b/src/json-type/type/classes/BooleanType.ts index 9697fa2aef..281fdc8d75 100644 --- a/src/json-type/type/classes/BooleanType.ts +++ b/src/json-type/type/classes/BooleanType.ts @@ -8,7 +8,7 @@ import {JsonTextEncoderCodegenContext} from '../../codegen/json/JsonTextEncoderC import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; import {BinaryEncoderCodegenContext} from '../../codegen/binary/BinaryEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {BinaryJsonEncoder} from '@jsonjoy.com/json-pack/lib/types'; import {CapacityEstimatorCodegenContext} from '../../codegen/capacity/CapacityEstimatorCodegenContext'; @@ -16,7 +16,7 @@ import {MaxEncodingOverhead} from '../../../json-size'; import {AbstractType} from './AbstractType'; import type * as jsonSchema from '../../../json-schema'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; import type * as jtd from '../../jtd/types'; diff --git a/src/json-type/type/classes/ConstType.ts b/src/json-type/type/classes/ConstType.ts index 533ff44380..a78898fd20 100644 --- a/src/json-type/type/classes/ConstType.ts +++ b/src/json-type/type/classes/ConstType.ts @@ -9,7 +9,7 @@ import {JsonTextEncoderCodegenContext} from '../../codegen/json/JsonTextEncoderC import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; import {BinaryEncoderCodegenContext} from '../../codegen/binary/BinaryEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {BinaryJsonEncoder} from '@jsonjoy.com/json-pack/lib/types'; import {CapacityEstimatorCodegenContext} from '../../codegen/capacity/CapacityEstimatorCodegenContext'; @@ -17,7 +17,7 @@ import {maxEncodingCapacity} from '../../../json-size'; import {AbstractType} from './AbstractType'; import type * as jsonSchema from '../../../json-schema'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; import type * as jtd from '../../jtd/types'; diff --git a/src/json-type/type/classes/MapType.ts b/src/json-type/type/classes/MapType.ts index 61355bcb8a..f891a56668 100644 --- a/src/json-type/type/classes/MapType.ts +++ b/src/json-type/type/classes/MapType.ts @@ -1,7 +1,7 @@ import * as schema from '../../schema'; import {RandomJson} from '../../../json-random'; import {printTree} from '../../../util/print/printTree'; -import {asString} from '@jsonjoy.com/json-pack/lib/util/strings/asString'; +import {asString} from '@jsonjoy.com/util/lib/strings/asString'; import {validateTType} from '../../schema/validate'; import {ValidatorCodegenContext} from '../../codegen/validator/ValidatorCodegenContext'; import {ValidationPath} from '../../codegen/validator/types'; @@ -10,7 +10,7 @@ import {JsonTextEncoderCodegenContext} from '../../codegen/json/JsonTextEncoderC import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; import {BinaryEncoderCodegenContext} from '../../codegen/binary/BinaryEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {BinaryJsonEncoder} from '@jsonjoy.com/json-pack/lib/types'; import {CapacityEstimatorCodegenContext} from '../../codegen/capacity/CapacityEstimatorCodegenContext'; @@ -19,7 +19,7 @@ import {AbstractType} from './AbstractType'; import type * as jsonSchema from '../../../json-schema'; import type {SchemaOf, Type} from '../types'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; diff --git a/src/json-type/type/classes/NumberType.ts b/src/json-type/type/classes/NumberType.ts index fed3fd990f..5d6d441713 100644 --- a/src/json-type/type/classes/NumberType.ts +++ b/src/json-type/type/classes/NumberType.ts @@ -8,7 +8,7 @@ import {JsonTextEncoderCodegenContext} from '../../codegen/json/JsonTextEncoderC import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; import {BinaryEncoderCodegenContext} from '../../codegen/binary/BinaryEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {BinaryJsonEncoder} from '@jsonjoy.com/json-pack/lib/types'; import {CapacityEstimatorCodegenContext} from '../../codegen/capacity/CapacityEstimatorCodegenContext'; @@ -16,7 +16,7 @@ import {MaxEncodingOverhead} from '../../../json-size'; import {AbstractType} from './AbstractType'; import type * as jsonSchema from '../../../json-schema'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; import type * as jtd from '../../jtd/types'; diff --git a/src/json-type/type/classes/ObjectType.ts b/src/json-type/type/classes/ObjectType.ts index f1b5822449..38e22ece42 100644 --- a/src/json-type/type/classes/ObjectType.ts +++ b/src/json-type/type/classes/ObjectType.ts @@ -1,17 +1,17 @@ import * as schema from '../../schema'; import {RandomJson} from '../../../json-random'; import {printTree} from '../../../util/print/printTree'; -import {asString} from '@jsonjoy.com/json-pack/lib/util/strings/asString'; +import {asString} from '@jsonjoy.com/util/lib/strings/asString'; import {validateTType, validateWithValidator} from '../../schema/validate'; import {ValidatorCodegenContext} from '../../codegen/validator/ValidatorCodegenContext'; import {ValidationPath} from '../../codegen/validator/types'; import {ValidationError} from '../../constants'; -import {normalizeAccessor} from '@jsonjoy.com/json-pack/lib/util/codegen/util/normalizeAccessor'; +import {normalizeAccessor} from '@jsonjoy.com/util/lib/codegen/util/normalizeAccessor'; import {canSkipObjectKeyUndefinedCheck} from '../../codegen/validator/util'; import {JsonTextEncoderCodegenContext} from '../../codegen/json/JsonTextEncoderCodegenContext'; import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {CapacityEstimatorCodegenContext} from '../../codegen/capacity/CapacityEstimatorCodegenContext'; import {MaxEncodingOverhead, maxEncodingCapacity} from '../../../json-size'; @@ -19,7 +19,7 @@ import {AbstractType} from './AbstractType'; import type * as jsonSchema from '../../../json-schema'; import type {SchemaOf, SchemaOfObjectFields, Type} from '../types'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; diff --git a/src/json-type/type/classes/OrType.ts b/src/json-type/type/classes/OrType.ts index 28c01bda53..5ba41f3f9f 100644 --- a/src/json-type/type/classes/OrType.ts +++ b/src/json-type/type/classes/OrType.ts @@ -8,7 +8,7 @@ import {JsonTextEncoderCodegenContext} from '../../codegen/json/JsonTextEncoderC import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; import {BinaryEncoderCodegenContext} from '../../codegen/binary/BinaryEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {BinaryJsonEncoder} from '@jsonjoy.com/json-pack/lib/types'; import {CapacityEstimatorCodegenContext} from '../../codegen/capacity/CapacityEstimatorCodegenContext'; @@ -20,7 +20,7 @@ import {AbstractType} from './AbstractType'; import type * as jsonSchema from '../../../json-schema'; import type {SchemaOf, Type} from '../types'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; diff --git a/src/json-type/type/classes/RefType.ts b/src/json-type/type/classes/RefType.ts index 8eaa3dea86..d2222174d6 100644 --- a/src/json-type/type/classes/RefType.ts +++ b/src/json-type/type/classes/RefType.ts @@ -8,7 +8,7 @@ import {CompiledBinaryEncoder} from '../../codegen/types'; import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; import {BinaryEncoderCodegenContext} from '../../codegen/binary/BinaryEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {EncodingFormat} from '@jsonjoy.com/json-pack/lib/constants'; import {BinaryJsonEncoder} from '@jsonjoy.com/json-pack/lib/types'; @@ -17,7 +17,7 @@ import {AbstractType} from './AbstractType'; import type * as jsonSchema from '../../../json-schema'; import type {SchemaOf, Type} from '../types'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; diff --git a/src/json-type/type/classes/StringType.ts b/src/json-type/type/classes/StringType.ts index fda53ff6b3..41e6396ed7 100644 --- a/src/json-type/type/classes/StringType.ts +++ b/src/json-type/type/classes/StringType.ts @@ -1,6 +1,6 @@ import * as schema from '../../schema'; import {RandomJson} from '../../../json-random'; -import {asString} from '@jsonjoy.com/json-pack/lib/util/strings/asString'; +import {asString} from '@jsonjoy.com/util/lib/strings/asString'; import {validateMinMax, validateTType, validateWithValidator} from '../../schema/validate'; import {ValidatorCodegenContext} from '../../codegen/validator/ValidatorCodegenContext'; import {ValidationPath} from '../../codegen/validator/types'; @@ -9,7 +9,7 @@ import {JsonTextEncoderCodegenContext} from '../../codegen/json/JsonTextEncoderC import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; import {BinaryEncoderCodegenContext} from '../../codegen/binary/BinaryEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {BinaryJsonEncoder} from '@jsonjoy.com/json-pack/lib/types'; import {CapacityEstimatorCodegenContext} from '../../codegen/capacity/CapacityEstimatorCodegenContext'; @@ -17,7 +17,7 @@ import {MaxEncodingOverhead} from '../../../json-size'; import {AbstractType} from './AbstractType'; import type * as jsonSchema from '../../../json-schema'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; import type * as jtd from '../../jtd/types'; diff --git a/src/json-type/type/classes/TupleType.ts b/src/json-type/type/classes/TupleType.ts index 5adea83dd8..b01496a247 100644 --- a/src/json-type/type/classes/TupleType.ts +++ b/src/json-type/type/classes/TupleType.ts @@ -7,7 +7,7 @@ import {ValidationError} from '../../constants'; import {JsonTextEncoderCodegenContext} from '../../codegen/json/JsonTextEncoderCodegenContext'; import {CborEncoderCodegenContext} from '../../codegen/binary/CborEncoderCodegenContext'; import {JsonEncoderCodegenContext} from '../../codegen/binary/JsonEncoderCodegenContext'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {MessagePackEncoderCodegenContext} from '../../codegen/binary/MessagePackEncoderCodegenContext'; import {CapacityEstimatorCodegenContext} from '../../codegen/capacity/CapacityEstimatorCodegenContext'; import {MaxEncodingOverhead} from '../../../json-size'; @@ -15,7 +15,7 @@ import {AbstractType} from './AbstractType'; import type * as jsonSchema from '../../../json-schema'; import type {SchemaOf, Type} from '../types'; import type {TypeSystem} from '../../system/TypeSystem'; -import type {json_string} from '../../../json-brand'; +import type {json_string} from '@jsonjoy.com/util/lib/json-brand'; import type * as ts from '../../typescript/types'; import type {TypeExportContext} from '../../system/TypeExportContext'; diff --git a/src/json-type/typescript/toText.ts b/src/json-type/typescript/toText.ts index 9c40ba6dd9..6604f083ad 100644 --- a/src/json-type/typescript/toText.ts +++ b/src/json-type/typescript/toText.ts @@ -1,4 +1,4 @@ -import {wordWrap} from '@jsonjoy.com/json-pack/lib/util/strings/wordWrap'; +import {wordWrap} from '@jsonjoy.com/util/lib/strings/wordWrap'; import {TsIdentifier, TsNode, TsParameter} from './types'; import {TAB, isSimpleType, normalizeKey} from './util'; diff --git a/src/reactive-rpc/browser/createBinaryWsRpcClient.ts b/src/reactive-rpc/browser/createBinaryWsRpcClient.ts index 457c21fc88..78cfc585c7 100644 --- a/src/reactive-rpc/browser/createBinaryWsRpcClient.ts +++ b/src/reactive-rpc/browser/createBinaryWsRpcClient.ts @@ -1,5 +1,5 @@ import {CborJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/cbor'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {RpcPersistentClient, WebSocketChannel} from '../common'; import {RpcCodec} from '../common/codec/RpcCodec'; import {BinaryRpcMessageCodec} from '../common/codec/binary'; diff --git a/src/reactive-rpc/browser/createJsonWsRpcClient.ts b/src/reactive-rpc/browser/createJsonWsRpcClient.ts index d1515cbe9e..0478532008 100644 --- a/src/reactive-rpc/browser/createJsonWsRpcClient.ts +++ b/src/reactive-rpc/browser/createJsonWsRpcClient.ts @@ -1,5 +1,5 @@ import {JsonJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/json'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {RpcPersistentClient, WebSocketChannel} from '../common'; import {RpcCodec} from '../common/codec/RpcCodec'; import {CompactRpcMessageCodec} from '../common/codec/compact'; diff --git a/src/reactive-rpc/common/channel/channel.ts b/src/reactive-rpc/common/channel/channel.ts index b153f6bfd8..f31ecb37be 100644 --- a/src/reactive-rpc/common/channel/channel.ts +++ b/src/reactive-rpc/common/channel/channel.ts @@ -1,6 +1,6 @@ import type {WebSocketBase, CloseEventBase} from './types'; import {Subject, ReplaySubject, BehaviorSubject, Observable, from} from 'rxjs'; -import {toUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/toUint8Array'; +import {toUint8Array} from '@jsonjoy.com/util/lib/buffers/toUint8Array'; import {delay, filter, map, skip, switchMap, take, takeUntil, tap} from 'rxjs/operators'; export const enum ChannelState { diff --git a/src/reactive-rpc/common/channel/mock.ts b/src/reactive-rpc/common/channel/mock.ts index ad6f978679..e6ef9c15bc 100644 --- a/src/reactive-rpc/common/channel/mock.ts +++ b/src/reactive-rpc/common/channel/mock.ts @@ -1,5 +1,5 @@ import {WebSocketState} from './constants'; -import {utf8Size} from '@jsonjoy.com/json-pack/lib/util/strings/utf8'; +import {utf8Size} from '@jsonjoy.com/util/lib/strings/utf8'; export interface CreateWebSocketMockParams { onClose: (code?: number, reason?: string) => void; diff --git a/src/reactive-rpc/common/codec/binary/BinaryRpcMessageCodec.ts b/src/reactive-rpc/common/codec/binary/BinaryRpcMessageCodec.ts index 10485a5e04..d8b3d2a236 100644 --- a/src/reactive-rpc/common/codec/binary/BinaryRpcMessageCodec.ts +++ b/src/reactive-rpc/common/codec/binary/BinaryRpcMessageCodec.ts @@ -1,7 +1,7 @@ import {RpcMessageFormat} from '../constants'; import {decode} from './decode'; import * as msg from '../../messages'; -import type {Uint8ArrayCut} from '@jsonjoy.com/json-pack/lib/util/buffers/Uint8ArrayCut'; +import type {Uint8ArrayCut} from '@jsonjoy.com/util/lib/buffers/Uint8ArrayCut'; import type {RpcMessageCodec} from '../types'; import type {JsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/types'; diff --git a/src/reactive-rpc/common/codec/binary/decode.ts b/src/reactive-rpc/common/codec/binary/decode.ts index 7c5e3b5236..db38628a90 100644 --- a/src/reactive-rpc/common/codec/binary/decode.ts +++ b/src/reactive-rpc/common/codec/binary/decode.ts @@ -1,4 +1,4 @@ -import {Uint8ArrayCut} from '@jsonjoy.com/json-pack/lib/util/buffers/Uint8ArrayCut'; +import {Uint8ArrayCut} from '@jsonjoy.com/util/lib/buffers/Uint8ArrayCut'; import { NotificationMessage, ReactiveRpcMessage, @@ -13,7 +13,7 @@ import { } from '../../messages'; import {RpcValue} from '../../messages/Value'; import {BinaryMessageType} from './constants'; -import type {Reader} from '@jsonjoy.com/json-pack/lib/util/buffers/Reader'; +import type {Reader} from '@jsonjoy.com/util/lib/buffers/Reader'; export const decode = (reader: Reader): ReactiveRpcMessage => { const word = reader.u32(); diff --git a/src/reactive-rpc/common/testing/buildE2eClient.ts b/src/reactive-rpc/common/testing/buildE2eClient.ts index 9a003f8783..937a200fb4 100644 --- a/src/reactive-rpc/common/testing/buildE2eClient.ts +++ b/src/reactive-rpc/common/testing/buildE2eClient.ts @@ -1,6 +1,6 @@ import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs'; -import {Fuzzer} from '../../../util/Fuzzer'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {ConnectionContext} from '../../server/context'; import {RpcCodecs} from '../codec/RpcCodecs'; import {RpcMessageCodecs} from '../codec/RpcMessageCodecs'; diff --git a/src/reactive-rpc/server/context.ts b/src/reactive-rpc/server/context.ts index 33c656c8ab..7b48210ae6 100644 --- a/src/reactive-rpc/server/context.ts +++ b/src/reactive-rpc/server/context.ts @@ -1,6 +1,6 @@ -import {NullObject} from '../../util/NullObject'; -import {copy} from '@jsonjoy.com/json-pack/lib/util/buffers/copy'; -import {listToUint8} from '@jsonjoy.com/json-pack/lib/util/buffers/concat'; +import {NullObject} from '@jsonjoy.com/util/lib/NullObject'; +import {copy} from '@jsonjoy.com/util/lib/buffers/copy'; +import {listToUint8} from '@jsonjoy.com/util/lib/buffers/concat'; import type {JsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/types'; import type {RpcMessageCodec} from '../common/codec/types'; import type {RpcApp} from './uws/RpcApp'; diff --git a/src/reactive-rpc/server/http1/Http1Server.ts b/src/reactive-rpc/server/http1/Http1Server.ts index 1d9a4342e1..b00ef387d8 100644 --- a/src/reactive-rpc/server/http1/Http1Server.ts +++ b/src/reactive-rpc/server/http1/Http1Server.ts @@ -1,6 +1,6 @@ import * as http from 'http'; import * as net from 'net'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs'; import {WsServerConnection} from '../ws/server/WsServerConnection'; import {WsFrameEncoder} from '../ws/codec/WsFrameEncoder'; @@ -13,7 +13,7 @@ import {findTokenInText, setCodecs} from './util'; import {Http1ConnectionContext, WsConnectionContext} from './context'; import {RpcCodecs} from '../../common/codec/RpcCodecs'; import {RpcMessageCodecs} from '../../common/codec/RpcMessageCodecs'; -import {NullObject} from '../../../util/NullObject'; +import {NullObject} from '@jsonjoy.com/util/lib/NullObject'; export type Http1Handler = (ctx: Http1ConnectionContext) => void | Promise; export type Http1NotFoundHandler = (res: http.ServerResponse, req: http.IncomingMessage) => void; diff --git a/src/reactive-rpc/server/http1/context.ts b/src/reactive-rpc/server/http1/context.ts index 85e4063e3c..d1f3513db9 100644 --- a/src/reactive-rpc/server/http1/context.ts +++ b/src/reactive-rpc/server/http1/context.ts @@ -1,5 +1,5 @@ import {getBody} from './util'; -import {listToUint8} from '@jsonjoy.com/json-pack/lib/util/buffers/concat'; +import {listToUint8} from '@jsonjoy.com/util/lib/buffers/concat'; import type * as http from 'http'; import type {JsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/types'; import type {RpcMessageCodec} from '../../common/codec/types'; diff --git a/src/reactive-rpc/server/uws/RpcApp.ts b/src/reactive-rpc/server/uws/RpcApp.ts index 0aaac8af39..f633bb0708 100644 --- a/src/reactive-rpc/server/uws/RpcApp.ts +++ b/src/reactive-rpc/server/uws/RpcApp.ts @@ -7,8 +7,8 @@ import {RpcMessageCodecs} from '../../common/codec/RpcMessageCodecs'; import {RpcValue} from '../../common/messages/Value'; import {RpcCodecs} from '../../common/codec/RpcCodecs'; import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; -import {copy} from '@jsonjoy.com/json-pack/lib/util/buffers/copy'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; +import {copy} from '@jsonjoy.com/util/lib/buffers/copy'; import {type ReactiveRpcMessage, RpcMessageStreamProcessor, ReactiveRpcClientMessage} from '../../common'; import type * as types from './types'; import type {RouteHandler} from './types'; diff --git a/src/reactive-rpc/server/ws/codec/WsFrameDecoder.ts b/src/reactive-rpc/server/ws/codec/WsFrameDecoder.ts index 7025a4485d..8c97f3448d 100644 --- a/src/reactive-rpc/server/ws/codec/WsFrameDecoder.ts +++ b/src/reactive-rpc/server/ws/codec/WsFrameDecoder.ts @@ -1,4 +1,4 @@ -import {StreamingOctetReader} from '@jsonjoy.com/json-pack/lib/util/buffers/StreamingOctetReader'; +import {StreamingOctetReader} from '@jsonjoy.com/util/lib/buffers/StreamingOctetReader'; import {WsFrameOpcode} from './constants'; import {WsFrameDecodingError} from './errors'; import {WsCloseFrame, WsFrameHeader, WsPingFrame, WsPongFrame} from './frames'; diff --git a/src/reactive-rpc/server/ws/codec/WsFrameEncoder.ts b/src/reactive-rpc/server/ws/codec/WsFrameEncoder.ts index f92ddbbc4a..1c3628b5eb 100644 --- a/src/reactive-rpc/server/ws/codec/WsFrameEncoder.ts +++ b/src/reactive-rpc/server/ws/codec/WsFrameEncoder.ts @@ -1,7 +1,7 @@ -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {WsFrameOpcode} from './constants'; import {WsFrameEncodingError} from './errors'; -import type {IWriter, IWriterGrowable} from '@jsonjoy.com/json-pack/lib/util/buffers'; +import type {IWriter, IWriterGrowable} from '@jsonjoy.com/util/lib/buffers'; const maskBuf = new Uint8Array(4); const maskBufView = new DataView(maskBuf.buffer, maskBuf.byteOffset, maskBuf.byteLength); diff --git a/src/reactive-rpc/server/ws/server/WsServerConnection.ts b/src/reactive-rpc/server/ws/server/WsServerConnection.ts index 0919f0487c..1112093472 100644 --- a/src/reactive-rpc/server/ws/server/WsServerConnection.ts +++ b/src/reactive-rpc/server/ws/server/WsServerConnection.ts @@ -1,7 +1,7 @@ import * as crypto from 'crypto'; import * as stream from 'stream'; -import {utf8Size} from '@jsonjoy.com/json-pack/lib/util/strings/utf8'; -import {listToUint8} from '@jsonjoy.com/json-pack/lib/util/buffers/concat'; +import {utf8Size} from '@jsonjoy.com/util/lib/strings/utf8'; +import {listToUint8} from '@jsonjoy.com/util/lib/buffers/concat'; import {WsCloseFrame, WsFrameDecoder, WsFrameHeader, WsFrameOpcode, WsPingFrame, WsPongFrame} from '../codec'; import type {WsFrameEncoder} from '../codec/WsFrameEncoder'; diff --git a/src/util/Fuzzer.ts b/src/util/Fuzzer.ts deleted file mode 100644 index 694149ba73..0000000000 --- a/src/util/Fuzzer.ts +++ /dev/null @@ -1,66 +0,0 @@ -import {randomBytes} from 'crypto'; - -function xoshiro128ss(a: number, b: number, c: number, d: number) { - return () => { - const t = b << 9; - let r = b * 5; - r = ((r << 7) | (r >>> 25)) * 9; - c ^= a; - d ^= b; - b ^= c; - a ^= d; - c ^= t; - d = (d << 11) | (d >>> 21); - return (r >>> 0) / 4294967296; - }; -} - -export class Fuzzer { - public static randomInt(min: number, max: number): number { - return Math.floor(Math.random() * (max - min + 1)) + min; - } - - public static randomInt2([min, max]: [min: number, max: number]): number { - return Math.floor(Math.random() * (max - min + 1)) + min; - } - - /** @deprecated */ - public static pick(elements: T[]): T { - return elements[Math.floor(Math.random() * elements.length)]; - } - - /** @deprecated */ - public static repeat(times: number, callback: () => T): T[] { - const result: T[] = []; - for (let i = 0; i < times; i++) result.push(callback()); - return result; - } - - public readonly seed: Buffer; - public readonly random: () => number; - - constructor(seed?: Buffer) { - this.seed = seed = seed || randomBytes(4 * 4); - let i = 0; - const a = (seed[i++] << 24) | (seed[i++] << 16) | (seed[i++] << 8) | seed[i++]; - const b = (seed[i++] << 24) | (seed[i++] << 16) | (seed[i++] << 8) | seed[i++]; - const c = (seed[i++] << 24) | (seed[i++] << 16) | (seed[i++] << 8) | seed[i++]; - const d = (seed[i++] << 24) | (seed[i++] << 16) | (seed[i++] << 8) | seed[i++]; - this.random = xoshiro128ss(a, b, c, d); - Math.random = this.random; - } - - public readonly randomInt = (min: number, max: number): number => { - return Math.floor(Math.random() * (max - min + 1)) + min; - }; - - public readonly pick = (elements: T[]): T => { - return elements[Math.floor(Math.random() * elements.length)]; - }; - - public readonly repeat = (times: number, callback: () => T): T[] => { - const result: T[] = []; - for (let i = 0; i < times; i++) result.push(callback()); - return result; - }; -} diff --git a/src/util/NullObject.ts b/src/util/NullObject.ts deleted file mode 100644 index 707a2f0cc0..0000000000 --- a/src/util/NullObject.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const NullObject = function NullObject() {} as any as new () => Record; -NullObject.prototype = Object.create(null); diff --git a/src/util/buffers/index.ts b/src/util/buffers/index.ts deleted file mode 100644 index 7d1d7e6433..0000000000 --- a/src/util/buffers/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@jsonjoy.com/json-pack/lib/util/buffers'; diff --git a/src/util/codegen/index.ts b/src/util/codegen/index.ts deleted file mode 100644 index 41fa667fe6..0000000000 --- a/src/util/codegen/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@jsonjoy.com/json-pack/lib/util/codegen'; diff --git a/src/util/hasOwnProperty.ts b/src/util/hasOwnProperty.ts deleted file mode 100644 index 668c13cb9d..0000000000 --- a/src/util/hasOwnProperty.ts +++ /dev/null @@ -1,5 +0,0 @@ -const has = Object.prototype.hasOwnProperty; - -export function hasOwnProperty(obj: object, key: string): boolean { - return has.call(obj, key); -} diff --git a/src/util/isEmpty.ts b/src/util/isEmpty.ts deleted file mode 100644 index cb3f76edb1..0000000000 --- a/src/util/isEmpty.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const isEmpty = (obj: object): boolean => { - for (const key in obj) if (Object.prototype.hasOwnProperty.call(obj, key)) return false; - return true; -}; diff --git a/src/util/lazyFunction.ts b/src/util/lazyFunction.ts deleted file mode 100644 index ec5afd7ba9..0000000000 --- a/src/util/lazyFunction.ts +++ /dev/null @@ -1,8 +0,0 @@ -export const lazy = any>(factory: () => T): T => { - let generated: T | undefined; - const fn = (...args: any[]) => { - if (!generated) generated = factory(); - return generated.apply(null, args); - }; - return fn as T; -}; diff --git a/src/util/router/codegen.ts b/src/util/router/codegen.ts index 96e516fca3..da38825e7e 100644 --- a/src/util/router/codegen.ts +++ b/src/util/router/codegen.ts @@ -1,5 +1,5 @@ -import {Codegen} from '@jsonjoy.com/json-pack/lib/util/codegen'; -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {Codegen} from '@jsonjoy.com/util/lib/codegen'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import type {Match} from './router'; export type RouteMatcher = (route: string) => undefined | Match; diff --git a/src/util/router/router.ts b/src/util/router/router.ts index 6b0daee5d0..143104fe3d 100644 --- a/src/util/router/router.ts +++ b/src/util/router/router.ts @@ -1,4 +1,4 @@ -import {JsExpression} from '@jsonjoy.com/json-pack/lib/util/codegen/util/JsExpression'; +import {JsExpression} from '@jsonjoy.com/util/lib/codegen/util/JsExpression'; import {printTree} from '../print/printTree'; import {Printable} from '../print/types'; import {RouteMatcher, RouterCodegenCtx, RouterCodegenOpts} from './codegen'; diff --git a/src/util/router/tree.ts b/src/util/router/tree.ts index d32484a128..9e209cde0c 100644 --- a/src/util/router/tree.ts +++ b/src/util/router/tree.ts @@ -1,4 +1,4 @@ -import {emitStringMatch} from '@jsonjoy.com/json-pack/lib/util/codegen/util/helpers'; +import {emitStringMatch} from '@jsonjoy.com/util/lib/codegen/util/helpers'; import {printTree} from '../print/printTree'; import {Printable} from '../print/types'; import {RadixTree} from '../trees/radix/RadixTree'; diff --git a/src/util/sort/insertion.ts b/src/util/sort/insertion.ts deleted file mode 100644 index 69d45d86c7..0000000000 --- a/src/util/sort/insertion.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@jsonjoy.com/json-pack/lib/util/sort/insertion'; diff --git a/src/util/sort/insertion2.ts b/src/util/sort/insertion2.ts deleted file mode 100644 index dbf23491f1..0000000000 --- a/src/util/sort/insertion2.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@jsonjoy.com/json-pack/lib/util/sort/insertion2'; diff --git a/src/util/types.ts b/src/util/types.ts deleted file mode 100644 index 726479dc00..0000000000 --- a/src/util/types.ts +++ /dev/null @@ -1,9 +0,0 @@ -export type Mutable = { - -readonly [P in keyof T]: T[P]; -}; - -export type Brand = S & {__TYPE__: T; __BRAND__: B}; - -export type MaybeArray = T | T[]; - -export type Ensure = T extends Ext ? T : never; diff --git a/src/web3/adl/hamt-crdt/Hamt.ts b/src/web3/adl/hamt-crdt/Hamt.ts index 98992c9022..8d5edc957d 100644 --- a/src/web3/adl/hamt-crdt/Hamt.ts +++ b/src/web3/adl/hamt-crdt/Hamt.ts @@ -4,7 +4,7 @@ import {HamtFrame} from './HamtFrame'; import * as hlc from '../../hlc'; import {Cid} from '../../multiformats'; import {sha256} from '../../crypto'; -import {toBuf} from '@jsonjoy.com/json-pack/lib/util/buffers/toBuf'; +import {toBuf} from '@jsonjoy.com/util/lib/buffers/toBuf'; import type {CidCasStruct} from '../../store/cas/CidCasStruct'; import type * as types from './types'; diff --git a/src/web3/adl/hamt-crdt/HamtFrame.ts b/src/web3/adl/hamt-crdt/HamtFrame.ts index 87cab2b8b4..14b62e32c0 100644 --- a/src/web3/adl/hamt-crdt/HamtFrame.ts +++ b/src/web3/adl/hamt-crdt/HamtFrame.ts @@ -1,5 +1,5 @@ import {Defer} from 'thingies/es2020/Defer'; -import {cmpUint8Array2} from '@jsonjoy.com/json-pack/lib/util/buffers/cmpUint8Array2'; +import {cmpUint8Array2} from '@jsonjoy.com/util/lib/buffers/cmpUint8Array2'; import {cmpDto} from '../../hlc'; import {CidCasStruct} from '../../store/cas/CidCasStruct'; import {Cid} from '../../multiformats'; diff --git a/src/web3/codec/codecs/writer.ts b/src/web3/codec/codecs/writer.ts index 195e12d84c..8636e0f104 100644 --- a/src/web3/codec/codecs/writer.ts +++ b/src/web3/codec/codecs/writer.ts @@ -1,3 +1,3 @@ -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; export const writer = new Writer(); diff --git a/src/web3/multiformats/Multihash.ts b/src/web3/multiformats/Multihash.ts index d6ef9af470..367af4a8e7 100644 --- a/src/web3/multiformats/Multihash.ts +++ b/src/web3/multiformats/Multihash.ts @@ -1,4 +1,4 @@ -import {cmpUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/cmpUint8Array'; +import {cmpUint8Array} from '@jsonjoy.com/util/lib/buffers/cmpUint8Array'; import {crypto} from '../crypto'; import * as uvint from '../util/uvint'; import {Multicodec} from './constants'; From 0ca861a4a2df4db4c799d0fc641bef0667613365 Mon Sep 17 00:00:00 2001 From: streamich Date: Wed, 10 Apr 2024 00:57:51 +0200 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=F0=9F=A4=96=20update=20imports=20?= =?UTF-8?q?in=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/json-crdt-patch/codec/__tests__/PatchFuzzer.ts | 2 +- src/json-crdt/__bench__/util/fuzzer-traces.ts | 2 +- src/json-crdt/__tests__/fuzzer/Picker.ts | 2 +- src/json-crdt/__tests__/fuzzer/SessionLogical.ts | 2 +- src/json-crdt/nodes/bin/__tests__/BinNode.fuzzing.spec.ts | 2 +- src/json-crdt/nodes/str/__tests__/StrNode.fuzzing-2.spec.ts | 2 +- src/json-crdt/nodes/str/__tests__/StrNode.fuzzing.spec.ts | 2 +- src/json-crdt/nodes/str/__tests__/StrNodeFuzzer.ts | 2 +- src/json-crdt/schema/__tests__/toSchema.spec.ts | 2 +- .../ot-binary-irreversible/__tests__/BinaryOtFuzzer.ts | 2 +- src/json-ot/types/ot-json/__tests__/fuzzer/JsonOtFuzzer.ts | 2 +- .../ot-string-irreversible/__tests__/StringOtFuzzer.ts | 2 +- src/json-ot/types/ot-string/__tests__/StringOtFuzzer.ts | 2 +- src/json-size/__tests__/fuzz.spec.ts | 2 +- src/json-size/__tests__/testJsonSize.ts | 2 +- .../binary/__tests__/CborEncoderCodegenContext.spec.ts | 2 +- .../binary/__tests__/JsonEncoderCodegenContext.spec.ts | 2 +- .../__tests__/MessagePackEncoderCodegenContext.spec.ts | 2 +- .../__tests__/e2e/uws/http/FetchRpcClient.spec.ts | 2 +- .../__tests__/e2e/uws/http/StreamingRpcClient.spec.ts | 2 +- .../__tests__/e2e/uws/ws/RpcPersistentClient.spec.ts | 2 +- .../codec/binary/__tests__/BinaryRpcMessageCodec.spec.ts | 2 +- .../common/codec/binary/__tests__/automated.spec.ts | 2 +- .../common/codec/binary/__tests__/decode.spec.ts | 6 +++--- .../common/codec/binary/__tests__/encode.spec.ts | 2 +- .../common/codec/binary/__tests__/smoke-tests.spec.ts | 2 +- .../codec/compact/__tests__/CompactRpcMessageCodec.spec.ts | 2 +- .../common/codec/compact/__tests__/automated.spec.ts | 2 +- .../common/codec/compact/__tests__/smoke-tests.spec.ts | 2 +- .../common/codec/json-rpc-2/__tests__/automated.spec.ts | 2 +- .../common/rpc/__tests__/RpcPersistentClient.spec.ts | 2 +- .../common/rpc/caller/error/__tests__/RpcErrorType.spec.ts | 2 +- .../server/ws/server/__tests__/WsServerConnection.spec.ts | 4 ++-- src/web3/adl/hamt-crdt/__tests__/Hamt.spec.ts | 2 +- 34 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/json-crdt-patch/codec/__tests__/PatchFuzzer.ts b/src/json-crdt-patch/codec/__tests__/PatchFuzzer.ts index 6cec6b055d..9bfe94c1bc 100644 --- a/src/json-crdt-patch/codec/__tests__/PatchFuzzer.ts +++ b/src/json-crdt-patch/codec/__tests__/PatchFuzzer.ts @@ -1,5 +1,5 @@ import {RandomJson} from '../../../json-random'; -import {Fuzzer} from '../../../util/Fuzzer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; import {interval, ITimestampStruct, Timespan, ClockVector, ServerClockVector, ts} from '../../clock'; import {SESSION} from '../../constants'; import {Patch} from '../../Patch'; diff --git a/src/json-crdt/__bench__/util/fuzzer-traces.ts b/src/json-crdt/__bench__/util/fuzzer-traces.ts index a359a1fd47..8a7251e9c1 100644 --- a/src/json-crdt/__bench__/util/fuzzer-traces.ts +++ b/src/json-crdt/__bench__/util/fuzzer-traces.ts @@ -3,7 +3,7 @@ import * as fs from 'fs'; import {Patch} from '../../../json-crdt-patch'; import {CborDecoder} from '@jsonjoy.com/json-pack/lib/cbor/CborDecoder'; import {Model} from '../../model'; -import {bufferToUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/bufferToUint8Array'; +import {bufferToUint8Array} from '@jsonjoy.com/util/lib/buffers/bufferToUint8Array'; export const loadFuzzerTrace = (traceName: string): [batch: Patch[], model: Model] => { const root = path.resolve(__dirname, '..', '..', '..', '..'); diff --git a/src/json-crdt/__tests__/fuzzer/Picker.ts b/src/json-crdt/__tests__/fuzzer/Picker.ts index 37a9370b5d..e8415d7fb7 100644 --- a/src/json-crdt/__tests__/fuzzer/Picker.ts +++ b/src/json-crdt/__tests__/fuzzer/Picker.ts @@ -2,7 +2,7 @@ import {DelOp, InsObjOp, InsStrOp, InsBinOp, InsArrOp} from '../../../json-crdt- import {RandomJson} from '../../../json-random'; import {JsonNode, ObjNode, ArrNode, BinNode, StrNode} from '../../nodes'; import {Model} from '../../model/Model'; -import {Fuzzer} from '../../../util/Fuzzer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; import {FuzzerOptions} from './types'; type StringOp = typeof InsStrOp | typeof DelOp; diff --git a/src/json-crdt/__tests__/fuzzer/SessionLogical.ts b/src/json-crdt/__tests__/fuzzer/SessionLogical.ts index eb2d749807..b1c219305c 100644 --- a/src/json-crdt/__tests__/fuzzer/SessionLogical.ts +++ b/src/json-crdt/__tests__/fuzzer/SessionLogical.ts @@ -21,7 +21,7 @@ import {randomU32} from 'hyperdyperid/lib/randomU32'; import {StrNode, ValNode, ObjNode, ArrNode, BinNode} from '../../nodes'; import {interval} from '../../../json-crdt-patch/clock'; import type {JsonCrdtFuzzer} from './JsonCrdtFuzzer'; -import {Fuzzer} from '../../../util/Fuzzer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; const jsonEncoder = new JsonEncoder(); const jsonDecoder = new JsonDecoder(); diff --git a/src/json-crdt/nodes/bin/__tests__/BinNode.fuzzing.spec.ts b/src/json-crdt/nodes/bin/__tests__/BinNode.fuzzing.spec.ts index f030804436..69344286a0 100644 --- a/src/json-crdt/nodes/bin/__tests__/BinNode.fuzzing.spec.ts +++ b/src/json-crdt/nodes/bin/__tests__/BinNode.fuzzing.spec.ts @@ -1,7 +1,7 @@ /* tslint:disable no-console */ import {ITimespanStruct, ITimestampStruct, ts} from '../../../../json-crdt-patch/clock'; -import {Fuzzer} from '../../../../util/Fuzzer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; import {BinNode} from '../BinNode'; import {randomU32} from 'hyperdyperid/lib/randomU32'; import {RandomJson} from '../../../../json-random'; diff --git a/src/json-crdt/nodes/str/__tests__/StrNode.fuzzing-2.spec.ts b/src/json-crdt/nodes/str/__tests__/StrNode.fuzzing-2.spec.ts index ff7b7222d8..ff90e4ae19 100644 --- a/src/json-crdt/nodes/str/__tests__/StrNode.fuzzing-2.spec.ts +++ b/src/json-crdt/nodes/str/__tests__/StrNode.fuzzing-2.spec.ts @@ -1,7 +1,7 @@ /* tslint:disable no-console */ import {ITimespanStruct, ITimestampStruct, ts} from '../../../../json-crdt-patch/clock'; -import {Fuzzer} from '../../../../util/Fuzzer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; import {StrNode} from '../StrNode'; import {randomU32} from 'hyperdyperid/lib/randomU32'; import * as path from 'path'; diff --git a/src/json-crdt/nodes/str/__tests__/StrNode.fuzzing.spec.ts b/src/json-crdt/nodes/str/__tests__/StrNode.fuzzing.spec.ts index 9ab6cbe899..7432aa6ce4 100644 --- a/src/json-crdt/nodes/str/__tests__/StrNode.fuzzing.spec.ts +++ b/src/json-crdt/nodes/str/__tests__/StrNode.fuzzing.spec.ts @@ -1,7 +1,7 @@ /* tslint:disable no-console */ import {ITimespanStruct, ITimestampStruct, ts} from '../../../../json-crdt-patch/clock'; -import {Fuzzer} from '../../../../util/Fuzzer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; import {StrNode} from '../StrNode'; import {randomU32} from 'hyperdyperid/lib/randomU32'; import {RandomJson} from '../../../../json-random'; diff --git a/src/json-crdt/nodes/str/__tests__/StrNodeFuzzer.ts b/src/json-crdt/nodes/str/__tests__/StrNodeFuzzer.ts index 954995fe01..a3929bb29f 100644 --- a/src/json-crdt/nodes/str/__tests__/StrNodeFuzzer.ts +++ b/src/json-crdt/nodes/str/__tests__/StrNodeFuzzer.ts @@ -1,6 +1,6 @@ import {equal} from 'assert'; import {ITimespanStruct, ITimestampStruct, ClockVector, toDisplayString, ts} from '../../../../json-crdt-patch/clock'; -import {Fuzzer} from '../../../../util/Fuzzer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; import {randomSessionId} from '../../../model/util'; import {StrNode} from '../StrNode'; import {printTree} from '../../../../util/print/printTree'; diff --git a/src/json-crdt/schema/__tests__/toSchema.spec.ts b/src/json-crdt/schema/__tests__/toSchema.spec.ts index a0ae310343..9a08bc874b 100644 --- a/src/json-crdt/schema/__tests__/toSchema.spec.ts +++ b/src/json-crdt/schema/__tests__/toSchema.spec.ts @@ -1,6 +1,6 @@ import {NodeBuilder, s, nodes} from '../../../json-crdt-patch'; import {deepEqual} from '../../../json-equal/deepEqual'; -import {cmpUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/cmpUint8Array'; +import {cmpUint8Array} from '@jsonjoy.com/util/lib/buffers/cmpUint8Array'; import {Model} from '../../model'; import {toSchema} from '../toSchema'; diff --git a/src/json-ot/types/ot-binary-irreversible/__tests__/BinaryOtFuzzer.ts b/src/json-ot/types/ot-binary-irreversible/__tests__/BinaryOtFuzzer.ts index 4cbe3195d2..aec4767320 100644 --- a/src/json-ot/types/ot-binary-irreversible/__tests__/BinaryOtFuzzer.ts +++ b/src/json-ot/types/ot-binary-irreversible/__tests__/BinaryOtFuzzer.ts @@ -1,5 +1,5 @@ import {RandomJson} from '../../../../json-random'; -import {Fuzzer} from '../../../../util/Fuzzer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; import {append, normalize} from '../util'; import {BinaryOp} from '../types'; diff --git a/src/json-ot/types/ot-json/__tests__/fuzzer/JsonOtFuzzer.ts b/src/json-ot/types/ot-json/__tests__/fuzzer/JsonOtFuzzer.ts index 4710bfab23..75f1c1ecc9 100644 --- a/src/json-ot/types/ot-json/__tests__/fuzzer/JsonOtFuzzer.ts +++ b/src/json-ot/types/ot-json/__tests__/fuzzer/JsonOtFuzzer.ts @@ -1,7 +1,7 @@ import {clone} from '../../../../../json-clone'; import {find, isArrayReference, isObjectReference, Path} from '../../../../../json-pointer'; import {RandomJson} from '../../../../../json-random'; -import {Fuzzer} from '../../../../../util/Fuzzer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; import type {JsonOp, JsonOpDataComponent, JsonOpDropComponent, JsonOpPickComponent} from '../../types'; import {applyPatch} from '../../../../../json-patch/applyPatch'; diff --git a/src/json-ot/types/ot-string-irreversible/__tests__/StringOtFuzzer.ts b/src/json-ot/types/ot-string-irreversible/__tests__/StringOtFuzzer.ts index 46321c2ef7..c7da7b47e6 100644 --- a/src/json-ot/types/ot-string-irreversible/__tests__/StringOtFuzzer.ts +++ b/src/json-ot/types/ot-string-irreversible/__tests__/StringOtFuzzer.ts @@ -1,5 +1,5 @@ import {RandomJson} from '../../../../json-random'; -import {Fuzzer} from '../../../../util/Fuzzer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; import {append, normalize} from '../util'; import {StringOp} from '../types'; diff --git a/src/json-ot/types/ot-string/__tests__/StringOtFuzzer.ts b/src/json-ot/types/ot-string/__tests__/StringOtFuzzer.ts index a76eba3dd4..1d87f12af1 100644 --- a/src/json-ot/types/ot-string/__tests__/StringOtFuzzer.ts +++ b/src/json-ot/types/ot-string/__tests__/StringOtFuzzer.ts @@ -1,5 +1,5 @@ import {RandomJson} from '../../../../json-random'; -import {Fuzzer} from '../../../../util/Fuzzer'; +import {Fuzzer} from '@jsonjoy.com/util/lib/Fuzzer'; import {append, normalize} from '../util'; import {StringOp} from '../types'; diff --git a/src/json-size/__tests__/fuzz.spec.ts b/src/json-size/__tests__/fuzz.spec.ts index 5a067411e2..41d4dd8560 100644 --- a/src/json-size/__tests__/fuzz.spec.ts +++ b/src/json-size/__tests__/fuzz.spec.ts @@ -1,6 +1,6 @@ import {jsonSize} from '..'; import {RandomJson} from '../../json-random/RandomJson'; -import {utf8Size} from '@jsonjoy.com/json-pack/lib/util/strings/utf8'; +import {utf8Size} from '@jsonjoy.com/util/lib/strings/utf8'; const random = new RandomJson(); const iterations = 100; diff --git a/src/json-size/__tests__/testJsonSize.ts b/src/json-size/__tests__/testJsonSize.ts index eeae004be2..ae04fdfeb8 100644 --- a/src/json-size/__tests__/testJsonSize.ts +++ b/src/json-size/__tests__/testJsonSize.ts @@ -1,4 +1,4 @@ -import {utf8Size} from '@jsonjoy.com/json-pack/lib/util/strings/utf8'; +import {utf8Size} from '@jsonjoy.com/util/lib/strings/utf8'; export const testJsonSize = ( jsonSize: (val: unknown) => number, diff --git a/src/json-type/codegen/binary/__tests__/CborEncoderCodegenContext.spec.ts b/src/json-type/codegen/binary/__tests__/CborEncoderCodegenContext.spec.ts index 2c56ad4c02..cfb2fc23d6 100644 --- a/src/json-type/codegen/binary/__tests__/CborEncoderCodegenContext.spec.ts +++ b/src/json-type/codegen/binary/__tests__/CborEncoderCodegenContext.spec.ts @@ -4,7 +4,7 @@ import {CborDecoder} from '@jsonjoy.com/json-pack/lib/cbor/CborDecoder'; import {Type} from '../../../type'; import {testBinaryCodegen} from './testBinaryCodegen'; import {EncodingFormat} from '@jsonjoy.com/json-pack/lib/constants'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; const writer = new Writer(1); const encoder = new CborEncoder(writer); diff --git a/src/json-type/codegen/binary/__tests__/JsonEncoderCodegenContext.spec.ts b/src/json-type/codegen/binary/__tests__/JsonEncoderCodegenContext.spec.ts index 5ef8d2067d..a5747828a2 100644 --- a/src/json-type/codegen/binary/__tests__/JsonEncoderCodegenContext.spec.ts +++ b/src/json-type/codegen/binary/__tests__/JsonEncoderCodegenContext.spec.ts @@ -3,7 +3,7 @@ import {Type} from '../../../type'; import {testBinaryCodegen} from './testBinaryCodegen'; import {EncodingFormat} from '@jsonjoy.com/json-pack/lib/constants'; import {JsonEncoder} from '@jsonjoy.com/json-pack/lib/json/JsonEncoder'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {parse} from '../../../../json-binary'; const encoder = new JsonEncoder(new Writer(16)); diff --git a/src/json-type/codegen/binary/__tests__/MessagePackEncoderCodegenContext.spec.ts b/src/json-type/codegen/binary/__tests__/MessagePackEncoderCodegenContext.spec.ts index e7f4cba553..64cf21bf65 100644 --- a/src/json-type/codegen/binary/__tests__/MessagePackEncoderCodegenContext.spec.ts +++ b/src/json-type/codegen/binary/__tests__/MessagePackEncoderCodegenContext.spec.ts @@ -4,7 +4,7 @@ import {MsgPackDecoder} from '@jsonjoy.com/json-pack/lib/msgpack/MsgPackDecoder' import {Type} from '../../../type'; import {testBinaryCodegen} from './testBinaryCodegen'; import {EncodingFormat} from '@jsonjoy.com/json-pack/lib/constants'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; const writer = new Writer(64); const encoder = new MsgPackEncoder(writer); diff --git a/src/reactive-rpc/__tests__/e2e/uws/http/FetchRpcClient.spec.ts b/src/reactive-rpc/__tests__/e2e/uws/http/FetchRpcClient.spec.ts index 037105b016..9de300faf7 100644 --- a/src/reactive-rpc/__tests__/e2e/uws/http/FetchRpcClient.spec.ts +++ b/src/reactive-rpc/__tests__/e2e/uws/http/FetchRpcClient.spec.ts @@ -5,7 +5,7 @@ import {ApiTestSetup, runApiTests} from '../../../../common/rpc/__tests__/runApiTests'; import {RpcCodecs} from '../../../../common/codec/RpcCodecs'; import {RpcMessageCodecs} from '../../../../common/codec/RpcMessageCodecs'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs'; import {RpcMessageCodec} from '../../../../common/codec/types'; import {JsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/types'; diff --git a/src/reactive-rpc/__tests__/e2e/uws/http/StreamingRpcClient.spec.ts b/src/reactive-rpc/__tests__/e2e/uws/http/StreamingRpcClient.spec.ts index ec55936d1d..547953c523 100644 --- a/src/reactive-rpc/__tests__/e2e/uws/http/StreamingRpcClient.spec.ts +++ b/src/reactive-rpc/__tests__/e2e/uws/http/StreamingRpcClient.spec.ts @@ -6,7 +6,7 @@ import {ApiTestSetup, runApiTests} from '../../../../common/rpc/__tests__/runApi import {StreamingRpcClient} from '../../../../common'; import {RpcCodecs} from '../../../../common/codec/RpcCodecs'; import {RpcMessageCodecs} from '../../../../common/codec/RpcMessageCodecs'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs'; import {RpcMessageCodec} from '../../../../common/codec/types'; import {JsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/types'; diff --git a/src/reactive-rpc/__tests__/e2e/uws/ws/RpcPersistentClient.spec.ts b/src/reactive-rpc/__tests__/e2e/uws/ws/RpcPersistentClient.spec.ts index 381b56665f..3972bf42f9 100644 --- a/src/reactive-rpc/__tests__/e2e/uws/ws/RpcPersistentClient.spec.ts +++ b/src/reactive-rpc/__tests__/e2e/uws/ws/RpcPersistentClient.spec.ts @@ -6,7 +6,7 @@ import {ApiTestSetup, runApiTests} from '../../../../common/rpc/__tests__/runApi import WebSocket from 'ws'; import {RpcCodecs} from '../../../../common/codec/RpcCodecs'; import {RpcMessageCodecs} from '../../../../common/codec/RpcMessageCodecs'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs'; import {RpcMessageCodec} from '../../../../common/codec/types'; import {JsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/types'; diff --git a/src/reactive-rpc/common/codec/binary/__tests__/BinaryRpcMessageCodec.spec.ts b/src/reactive-rpc/common/codec/binary/__tests__/BinaryRpcMessageCodec.spec.ts index e67bc5121e..7cc051bb00 100644 --- a/src/reactive-rpc/common/codec/binary/__tests__/BinaryRpcMessageCodec.spec.ts +++ b/src/reactive-rpc/common/codec/binary/__tests__/BinaryRpcMessageCodec.spec.ts @@ -1,5 +1,5 @@ import {CborJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/cbor'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {RequestCompleteMessage} from '../../../messages'; import {BinaryRpcMessageCodec} from '../BinaryRpcMessageCodec'; diff --git a/src/reactive-rpc/common/codec/binary/__tests__/automated.spec.ts b/src/reactive-rpc/common/codec/binary/__tests__/automated.spec.ts index 49424177ad..ff6a27bc26 100644 --- a/src/reactive-rpc/common/codec/binary/__tests__/automated.spec.ts +++ b/src/reactive-rpc/common/codec/binary/__tests__/automated.spec.ts @@ -1,6 +1,6 @@ import {BinaryRpcMessageCodec} from '..'; import {CborJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/cbor'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {messages} from '../../../messages/__tests__/fixtures'; const codec = new BinaryRpcMessageCodec(); diff --git a/src/reactive-rpc/common/codec/binary/__tests__/decode.spec.ts b/src/reactive-rpc/common/codec/binary/__tests__/decode.spec.ts index e406657c7f..72f56e48e8 100644 --- a/src/reactive-rpc/common/codec/binary/__tests__/decode.spec.ts +++ b/src/reactive-rpc/common/codec/binary/__tests__/decode.spec.ts @@ -11,10 +11,10 @@ import { } from '../../../messages'; import {RpcValue} from '../../../messages/Value'; import {decode} from '../decode'; -import {Reader} from '@jsonjoy.com/json-pack/lib/util/buffers/Reader'; -import {Uint8ArrayCut} from '@jsonjoy.com/json-pack/lib/util/buffers/Uint8ArrayCut'; +import {Reader} from '@jsonjoy.com/util/lib/buffers/Reader'; +import {Uint8ArrayCut} from '@jsonjoy.com/util/lib/buffers/Uint8ArrayCut'; import {CborJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/cbor'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; const codec = new CborJsonValueCodec(new Writer(64)); const encoder = codec.encoder; diff --git a/src/reactive-rpc/common/codec/binary/__tests__/encode.spec.ts b/src/reactive-rpc/common/codec/binary/__tests__/encode.spec.ts index 789373112e..c43984911a 100644 --- a/src/reactive-rpc/common/codec/binary/__tests__/encode.spec.ts +++ b/src/reactive-rpc/common/codec/binary/__tests__/encode.spec.ts @@ -7,7 +7,7 @@ import { } from '../../../messages'; import {RpcValue} from '../../../messages/Value'; import {CborJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/cbor'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; const cborCodec = new CborJsonValueCodec(new Writer(64)); const encoder = cborCodec.encoder; diff --git a/src/reactive-rpc/common/codec/binary/__tests__/smoke-tests.spec.ts b/src/reactive-rpc/common/codec/binary/__tests__/smoke-tests.spec.ts index 8a2f839f23..a30ac8eb7c 100644 --- a/src/reactive-rpc/common/codec/binary/__tests__/smoke-tests.spec.ts +++ b/src/reactive-rpc/common/codec/binary/__tests__/smoke-tests.spec.ts @@ -1,5 +1,5 @@ import {BinaryRpcMessageCodec} from '..'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs'; import { NotificationMessage, diff --git a/src/reactive-rpc/common/codec/compact/__tests__/CompactRpcMessageCodec.spec.ts b/src/reactive-rpc/common/codec/compact/__tests__/CompactRpcMessageCodec.spec.ts index c1a2450534..9a35f725a5 100644 --- a/src/reactive-rpc/common/codec/compact/__tests__/CompactRpcMessageCodec.spec.ts +++ b/src/reactive-rpc/common/codec/compact/__tests__/CompactRpcMessageCodec.spec.ts @@ -1,5 +1,5 @@ import {MsgPackJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/msgpack'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {RequestCompleteMessage} from '../../../messages'; import {CompactRpcMessageCodec} from '../CompactRpcMessageCodec'; diff --git a/src/reactive-rpc/common/codec/compact/__tests__/automated.spec.ts b/src/reactive-rpc/common/codec/compact/__tests__/automated.spec.ts index 4be20127eb..0c3119e21e 100644 --- a/src/reactive-rpc/common/codec/compact/__tests__/automated.spec.ts +++ b/src/reactive-rpc/common/codec/compact/__tests__/automated.spec.ts @@ -1,7 +1,7 @@ import {compactMessages} from './compact-messages'; import {CompactRpcMessageCodec} from '..'; import {CborJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/cbor'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {messages} from '../../../messages/__tests__/fixtures'; const codec = new CompactRpcMessageCodec(); diff --git a/src/reactive-rpc/common/codec/compact/__tests__/smoke-tests.spec.ts b/src/reactive-rpc/common/codec/compact/__tests__/smoke-tests.spec.ts index bcb531186e..90950cb400 100644 --- a/src/reactive-rpc/common/codec/compact/__tests__/smoke-tests.spec.ts +++ b/src/reactive-rpc/common/codec/compact/__tests__/smoke-tests.spec.ts @@ -1,5 +1,5 @@ import {CompactRpcMessageCodec} from '..'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs'; import { NotificationMessage, diff --git a/src/reactive-rpc/common/codec/json-rpc-2/__tests__/automated.spec.ts b/src/reactive-rpc/common/codec/json-rpc-2/__tests__/automated.spec.ts index fd548252c5..f0a9cdc95a 100644 --- a/src/reactive-rpc/common/codec/json-rpc-2/__tests__/automated.spec.ts +++ b/src/reactive-rpc/common/codec/json-rpc-2/__tests__/automated.spec.ts @@ -1,6 +1,6 @@ import {JsonRpc2RpcMessageCodec} from '..'; import {JsonJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/json'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {ReactiveRpcMessage} from '../../../messages'; import {messages} from '../../../messages/__tests__/fixtures'; diff --git a/src/reactive-rpc/common/rpc/__tests__/RpcPersistentClient.spec.ts b/src/reactive-rpc/common/rpc/__tests__/RpcPersistentClient.spec.ts index 9eefc5dd2c..61b97ffd95 100644 --- a/src/reactive-rpc/common/rpc/__tests__/RpcPersistentClient.spec.ts +++ b/src/reactive-rpc/common/rpc/__tests__/RpcPersistentClient.spec.ts @@ -6,7 +6,7 @@ import {until} from '../../../../__tests__/util'; import {RpcValue} from '../../messages/Value'; import {RpcCodec} from '../../codec/RpcCodec'; import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {RpcMessageCodecs} from '../../codec/RpcMessageCodecs'; test('on remote method execution, sends message over WebSocket only once', async () => { diff --git a/src/reactive-rpc/common/rpc/caller/error/__tests__/RpcErrorType.spec.ts b/src/reactive-rpc/common/rpc/caller/error/__tests__/RpcErrorType.spec.ts index db3f7cc264..c9edeebbb2 100644 --- a/src/reactive-rpc/common/rpc/caller/error/__tests__/RpcErrorType.spec.ts +++ b/src/reactive-rpc/common/rpc/caller/error/__tests__/RpcErrorType.spec.ts @@ -1,5 +1,5 @@ import {Codecs} from '@jsonjoy.com/json-pack/lib/codecs/Codecs'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {RpcError} from '../RpcError'; import {RpcErrorType} from '../RpcErrorType'; diff --git a/src/reactive-rpc/server/ws/server/__tests__/WsServerConnection.spec.ts b/src/reactive-rpc/server/ws/server/__tests__/WsServerConnection.spec.ts index e6aeee348e..c434c44be0 100644 --- a/src/reactive-rpc/server/ws/server/__tests__/WsServerConnection.spec.ts +++ b/src/reactive-rpc/server/ws/server/__tests__/WsServerConnection.spec.ts @@ -3,8 +3,8 @@ import {WsServerConnection} from '../WsServerConnection'; import {WsFrameEncoder} from '../../codec/WsFrameEncoder'; import {until} from 'thingies'; import {WsFrameOpcode} from '../../codec'; -import {bufferToUint8Array} from '@jsonjoy.com/json-pack/lib/util/buffers/bufferToUint8Array'; -import {listToUint8} from '@jsonjoy.com/json-pack/lib/util/buffers/concat'; +import {bufferToUint8Array} from '@jsonjoy.com/util/lib/buffers/bufferToUint8Array'; +import {listToUint8} from '@jsonjoy.com/util/lib/buffers/concat'; const setup = () => { const socket = new stream.PassThrough(); diff --git a/src/web3/adl/hamt-crdt/__tests__/Hamt.spec.ts b/src/web3/adl/hamt-crdt/__tests__/Hamt.spec.ts index b52311c47b..ceece93f88 100644 --- a/src/web3/adl/hamt-crdt/__tests__/Hamt.spec.ts +++ b/src/web3/adl/hamt-crdt/__tests__/Hamt.spec.ts @@ -1,4 +1,4 @@ -import {b} from '@jsonjoy.com/json-pack/lib/util/buffers/b'; +import {b} from '@jsonjoy.com/util/lib/buffers/b'; import {HlcFactory} from '../../../hlc'; import {CidCasMemory} from '../../../store/cas/CidCasMemory'; import {CidCasStructCbor} from '../../../store/cas/CidCasStructCbor'; From 919e91ddf7dc8ec7a71877c5867bafcc517b83b9 Mon Sep 17 00:00:00 2001 From: streamich Date: Wed, 10 Apr 2024 00:59:14 +0200 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20=F0=9F=A4=96=20update=20benchmark?= =?UTF-8?q?=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/json-crdt/__tests__/fuzzer/generate-trace.ts | 2 +- src/json-size/__bench__/json-size.ts | 2 +- src/json-type/__bench__/encode.ts | 2 +- src/server/__bench__/ping.bench.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/json-crdt/__tests__/fuzzer/generate-trace.ts b/src/json-crdt/__tests__/fuzzer/generate-trace.ts index 2d07cedee8..369e0c7fca 100644 --- a/src/json-crdt/__tests__/fuzzer/generate-trace.ts +++ b/src/json-crdt/__tests__/fuzzer/generate-trace.ts @@ -5,7 +5,7 @@ import {Patch} from '../../../json-crdt-patch'; import {Model} from '../../model'; import {JsonCrdtFuzzer} from './JsonCrdtFuzzer'; import {CborEncoder} from '@jsonjoy.com/json-pack/lib/cbor/CborEncoder'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import * as fs from 'fs'; const sessionNum = 100; diff --git a/src/json-size/__bench__/json-size.ts b/src/json-size/__bench__/json-size.ts index c806dd5b77..845a2d0fdf 100644 --- a/src/json-size/__bench__/json-size.ts +++ b/src/json-size/__bench__/json-size.ts @@ -3,7 +3,7 @@ // npx ts-node src/json-size/__bench__/json-size.ts import * as Benchmark from 'benchmark'; -import {utf8Size} from '@jsonjoy.com/json-pack/lib/util/strings/utf8'; +import {utf8Size} from '@jsonjoy.com/util/lib/strings/utf8'; import {jsonSize, jsonSizeApprox} from '../json'; import {jsonSizeFast} from '../jsonSizeFast'; import {msgpackSizeFast} from '../msgpackSizeFast'; diff --git a/src/json-type/__bench__/encode.ts b/src/json-type/__bench__/encode.ts index 1b6c2b4945..f165be6d44 100644 --- a/src/json-type/__bench__/encode.ts +++ b/src/json-type/__bench__/encode.ts @@ -5,7 +5,7 @@ import {CborEncoder} from '@jsonjoy.com/json-pack/lib/cbor/CborEncoder'; import {JsonEncoder} from '@jsonjoy.com/json-pack/lib/json/JsonEncoder'; import {CompiledBinaryEncoder} from '../codegen/types'; import {EncodingFormat} from '@jsonjoy.com/json-pack/lib/constants'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; const system = new TypeSystem(); const {t} = system; diff --git a/src/server/__bench__/ping.bench.ts b/src/server/__bench__/ping.bench.ts index 50ea60a779..cf44cd261e 100644 --- a/src/server/__bench__/ping.bench.ts +++ b/src/server/__bench__/ping.bench.ts @@ -4,7 +4,7 @@ import {Suite} from 'benchmark'; import {RpcPersistentClient, WebSocketChannel} from '../../reactive-rpc/common'; -import {Writer} from '@jsonjoy.com/json-pack/lib/util/buffers/Writer'; +import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer'; import {BinaryRpcMessageCodec} from '../../reactive-rpc/common/codec/binary'; import {CompactRpcMessageCodec} from '../../reactive-rpc/common/codec/compact'; import {CborJsonValueCodec} from '@jsonjoy.com/json-pack/lib/codecs/cbor';