From 9ccccae1cffa7d27f3cb13dcd464ac219c66fcd8 Mon Sep 17 00:00:00 2001 From: busma13 Date: Tue, 12 Nov 2024 07:26:35 -0700 Subject: [PATCH] update job-components, scripts, @types/node, and @sindersorhus/fnv1a --- asset/package.json | 2 +- package.json | 6 +- packages/standard-asset-apis/package.json | 4 +- .../src/routers/HashRouter.ts | 2 +- yarn.lock | 70 +++++++------------ 5 files changed, 33 insertions(+), 51 deletions(-) diff --git a/asset/package.json b/asset/package.json index 4275ae8e..72580c1b 100644 --- a/asset/package.json +++ b/asset/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@faker-js/faker": "^9.2.0", - "@terascope/job-components": "^1.5.1", + "@terascope/job-components": "^1.5.3", "@terascope/standard-asset-apis": "^1.0.2", "@terascope/utils": "^1.3.2", "@types/chance": "^1.1.4", diff --git a/package.json b/package.json index f858d59d..03a3d44a 100644 --- a/package.json +++ b/package.json @@ -30,13 +30,13 @@ }, "devDependencies": { "@terascope/eslint-config": "^1.1.0", - "@terascope/job-components": "^1.5.1", - "@terascope/scripts": "^1.4.2", + "@terascope/job-components": "^1.5.3", + "@terascope/scripts": "^1.5.0", "@terascope/standard-asset-apis": "^1.0.2", "@types/express": "^4.17.19", "@types/jest": "^29.5.14", "@types/json2csv": "^5.0.7", - "@types/node": "^22.7.4", + "@types/node": "^22.9.0", "@types/node-gzip": "^1.1.0", "@types/timsort": "^0.3.0", "eslint": "^9.14.0", diff --git a/packages/standard-asset-apis/package.json b/packages/standard-asset-apis/package.json index fc5f5716..916676b6 100644 --- a/packages/standard-asset-apis/package.json +++ b/packages/standard-asset-apis/package.json @@ -21,11 +21,11 @@ "test:watch": "ts-scripts test --watch . --" }, "dependencies": { - "@sindresorhus/fnv1a": "^2.0.1", + "@sindresorhus/fnv1a": "^3.1.0", "@terascope/utils": "^1.3.2" }, "devDependencies": { - "@terascope/scripts": "^1.4.2", + "@terascope/scripts": "^1.5.0", "@types/jest": "^29.5.14", "jest": "^29.7.0", "jest-extended": "^4.0.2", diff --git a/packages/standard-asset-apis/src/routers/HashRouter.ts b/packages/standard-asset-apis/src/routers/HashRouter.ts index d7023ae8..d4ff701c 100644 --- a/packages/standard-asset-apis/src/routers/HashRouter.ts +++ b/packages/standard-asset-apis/src/routers/HashRouter.ts @@ -33,7 +33,7 @@ export class HashRouter implements I.Router { } lookup(record: DataEntity): string { - const bucket = fnv1a(this.getHash(record)) % this.partitions; + const bucket = Number(fnv1a(this.getHash(record), { size: 32 })) % this.partitions; return bucket.toString(); } } diff --git a/yarn.lock b/yarn.lock index 5bba4343..056176be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -764,10 +764,10 @@ resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== -"@sindresorhus/fnv1a@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@sindresorhus/fnv1a/-/fnv1a-2.0.1.tgz#2aefdfa7eb5b7f29a7936978218e986c70c603fc" - integrity sha512-suq9tRQ6bkpMukTG5K5z0sPWB7t0zExMzZCdmYm6xTSSIm/yCKNm7VCL36wVeyTsFr597/UhU1OAYdHGMDiHrw== +"@sindresorhus/fnv1a@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/fnv1a/-/fnv1a-3.1.0.tgz#f8e46597298f6fd4c12dc901cdd4e73beb4d24fa" + integrity sha512-KV321z5m/0nuAg83W1dPLy85HpHDk7Sdi4fJbwvacWsEhAh+rZUW4ZfGcXmUIvjZg4ss2bcwNlRhJ7GBEUG08w== "@sindresorhus/is@^4.0.0": version "4.6.0" @@ -896,13 +896,13 @@ progress "^2.0.3" yargs "^17.2.1" -"@terascope/job-components@^1.5.1": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@terascope/job-components/-/job-components-1.5.1.tgz#a36e8b3a94ed389e16117d7500cdd3bdcfc40f97" - integrity sha512-rMHF/mJbv1K5SyJWQ1N+yuK6icntu+kHPyxcdcEvQ9F4Ci4NjJn8zUKdE305Rpdmz2aTx0bDiCXGQNNwVO2sVQ== +"@terascope/job-components@^1.5.3": + version "1.5.3" + resolved "https://registry.yarnpkg.com/@terascope/job-components/-/job-components-1.5.3.tgz#f8d180dd08b6fe955b4501ca96f2a629473a434f" + integrity sha512-H0OycdzTJTwLqoZBlT8q9xgiCk+NDs9ZtND6EpxRdiLBXDN3zmhnPPALHPLMO3Wz/DZU0Ip4AsKJ+jNOArOG9w== dependencies: "@terascope/types" "^1.2.0" - "@terascope/utils" "^1.3.1" + "@terascope/utils" "^1.3.2" convict "^6.2.4" convict-format-with-moment "^6.2.0" convict-format-with-validator "^6.2.0" @@ -911,10 +911,10 @@ prom-client "^15.1.3" uuid "^10.0.0" -"@terascope/scripts@^1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@terascope/scripts/-/scripts-1.4.2.tgz#1b9efe4c8418d32626760f3118377f54ec24b155" - integrity sha512-h++D7VOe9w+D+k7c4DCitjfybqiJruOAu9yAt1PYZV0B9jvUdd7+DQ6KMk2WjtsML3GkDZJbGe2BQAUWPcORXA== +"@terascope/scripts@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@terascope/scripts/-/scripts-1.5.0.tgz#474127ce9152c465cc40a8273177146bea880ec8" + integrity sha512-IHrVWsd8qx9yUdMomjVbbjb7d8BUZZjQQv3BeQ57MTza9Ic+Zn2GseNTNATgpaHxRHCz3YZbRsoZ24Q7zjf0Yw== dependencies: "@kubernetes/client-node" "^0.22.0" "@terascope/utils" "^1.3.2" @@ -947,7 +947,7 @@ dependencies: prom-client "^15.1.3" -"@terascope/utils@^1.3.1", "@terascope/utils@^1.3.2": +"@terascope/utils@^1.3.2": version "1.3.2" resolved "https://registry.yarnpkg.com/@terascope/utils/-/utils-1.3.2.tgz#c9f22523a1dc0d578c1c3428303f0f2076edbf69" integrity sha512-HNnZtkwQjOyH907lt4wX1avNtyyE1anXzvbBTc9YuX9SPVbeff92+mjYL+6qWtuv/TiHlKBT77+F1i5eB8WEuA== @@ -1419,13 +1419,20 @@ dependencies: undici-types "~6.19.2" -"@types/node@^22.0.0", "@types/node@^22.7.4": +"@types/node@^22.0.0": version "22.7.4" resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.4.tgz#e35d6f48dca3255ce44256ddc05dee1c23353fcc" integrity sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg== dependencies: undici-types "~6.19.2" +"@types/node@^22.9.0": + version "22.9.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.0.tgz#b7f16e5c3384788542c72dc3d561a7ceae2c0365" + integrity sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ== + dependencies: + undici-types "~6.19.8" + "@types/qs@*": version "6.9.15" resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.15.tgz#adde8a060ec9c305a82de1babc1056e73bd64dce" @@ -6541,16 +6548,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -6644,14 +6642,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -7095,7 +7086,7 @@ unbzip2-stream@^1.0.9: buffer "^5.2.1" through "^2.3.8" -undici-types@~6.19.2: +undici-types@~6.19.2, undici-types@~6.19.8: version "6.19.8" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== @@ -7297,16 +7288,7 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==