From be47d4e719c70eb57e67da09f9833a2b49106b03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 May 2026 23:14:46 +0000 Subject: [PATCH 1/4] build(deps): bump ueberdb2 from 5.0.48 to 6.0.2 Bumps [ueberdb2](https://github.com/ether/ueberDB) from 5.0.48 to 6.0.2. - [Changelog](https://github.com/ether/ueberDB/blob/main/CHANGELOG.md) - [Commits](https://github.com/ether/ueberDB/compare/v5.0.48...v6.0.2) --- updated-dependencies: - dependency-name: ueberdb2 dependency-version: 6.0.2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- bin/package.json | 2 +- src/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/package.json b/bin/package.json index 045f13cb7ba..30597781804 100644 --- a/bin/package.json +++ b/bin/package.json @@ -11,7 +11,7 @@ "log4js": "^6.9.1", "semver": "^7.8.0", "tsx": "^4.22.0", - "ueberdb2": "^5.0.48" + "ueberdb2": "^6.0.2" }, "devDependencies": { "@types/node": "^25.8.0", diff --git a/src/package.json b/src/package.json index 8a5bd8431ba..384d88f3b8f 100644 --- a/src/package.json +++ b/src/package.json @@ -86,7 +86,7 @@ "swagger-ui-express": "^5.0.1", "tinycon": "0.6.8", "tsx": "4.22.0", - "ueberdb2": "^5.0.48", + "ueberdb2": "^6.0.2", "underscore": "1.13.8", "undici": "^8.3.0", "unorm": "1.6.0", From 3b18df2e5a7607f9c538ade070ef1b757476780b Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 12 May 2026 09:47:11 +0100 Subject: [PATCH 2/4] fix(db): adapt to ueberdb2 v6 ESM + stricter types ueberdb2 v6 ships ESM-only with an "import"-only exports map, which broke `require('ueberdb2')` from src/'s CJS modules (gen:api crashed with ERR_PACKAGE_PATH_NOT_EXPORTED). v6 also tightened the public types: get/getSub now return `Promise` instead of `any`, and remove() no longer accepts the deprecated callback argument. - DB.ts, ImportEtherpad.ts: load Database via dynamic `import()` so CJS consumers can pull in the ESM-only package; keep type imports. - Pad.ts: switch Database to `import type`, cast `unknown` results from db.get()/getSub() at the four use sites that compose against typed values, and drop the deprecated `null` second argument from the two db.remove() calls. Co-Authored-By: Claude Opus 4.7 (1M context) --- src/node/db/DB.ts | 4 +++- src/node/db/Pad.ts | 14 +++++++------- src/node/utils/ImportEtherpad.ts | 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/node/db/DB.ts b/src/node/db/DB.ts index 4b4899fac72..b9d0e3ec675 100644 --- a/src/node/db/DB.ts +++ b/src/node/db/DB.ts @@ -21,7 +21,7 @@ * limitations under the License. */ -import {Database, DatabaseType} from 'ueberdb2'; +import type {DatabaseType} from 'ueberdb2'; import settings from '../utils/Settings'; import log4js from 'log4js'; const stats = require('../stats') @@ -37,6 +37,8 @@ exports.db = null; * Initializes the database with the settings provided by the settings module */ exports.init = async () => { + // ueberdb2 v6 is ESM-only; load via dynamic import so CJS consumers work. + const {Database} = await import('ueberdb2'); exports.db = new Database(settings.dbType as DatabaseType, settings.dbSettings, null, logger); await exports.db.init(); if (exports.db.metrics != null) { diff --git a/src/node/db/Pad.ts b/src/node/db/Pad.ts index 9e5fd7de33d..80d91bce052 100644 --- a/src/node/db/Pad.ts +++ b/src/node/db/Pad.ts @@ -1,5 +1,5 @@ 'use strict'; -import {Database} from "ueberdb2"; +import type {Database} from "ueberdb2"; import {AChangeSet, APool, AText} from "../types/PadType"; import {MapArrayType} from "../types/MapType"; @@ -347,8 +347,8 @@ class Pad { Stream.range(keyRev + 1, targetRev + 1).map(this.getRevisionChangeset.bind(this))), ]); const apool = this.apool(); - let atext = keyAText; - for (const cs of changesets) atext = applyToAText(cs, atext, apool); + let atext = keyAText as AText; + for (const cs of changesets) atext = applyToAText(cs as string, atext, apool); return atext; } @@ -494,7 +494,7 @@ class Pad { async getChatMessage(entryNum: number) { const entry = await this.db.get(`pad:${this.id}:chat:${entryNum}`); if (entry == null) return null; - const message = ChatMessage.fromObject(entry); + const message = ChatMessage.fromObject(entry as ChatMessage); message.displayName = await authorManager.getAuthorName(message.authorId); return message; } @@ -524,7 +524,7 @@ class Pad { async init(text:string, authorId = '') { // try to load the pad - const value = await this.db.get(`pad:${this.id}`); + const value = await this.db.get(`pad:${this.id}`) as Record | null; // if this pad exists, load it if (value != null) { @@ -733,13 +733,13 @@ class Pad { // delete all chat messages // @ts-ignore p.push(timesLimit(this.chatHead + 1, 500, async (i: string) => { - await this.db.remove(`pad:${this.id}:chat:${i}`, null); + await this.db.remove(`pad:${this.id}:chat:${i}`); })); // delete all revisions // @ts-ignore p.push(timesLimit(this.head + 1, 500, async (i: string) => { - await this.db.remove(`pad:${this.id}:revs:${i}`, null); + await this.db.remove(`pad:${this.id}:revs:${i}`); })); // remove pad from all authors who contributed diff --git a/src/node/utils/ImportEtherpad.ts b/src/node/utils/ImportEtherpad.ts index cf34107c73e..804baa8da4b 100644 --- a/src/node/utils/ImportEtherpad.ts +++ b/src/node/utils/ImportEtherpad.ts @@ -26,11 +26,12 @@ const db = require('../db/DB'); const hooks = require('../../static/js/pluginfw/hooks'); import log4js from 'log4js'; const supportedElems = require('../../static/js/contentcollector').supportedElems; -import {Database} from 'ueberdb2'; const logger = log4js.getLogger('ImportEtherpad'); exports.setPadRaw = async (padId: string, r: string, authorId = '') => { + // ueberdb2 v6 is ESM-only; load via dynamic import so CJS consumers work. + const {Database} = await import('ueberdb2'); const records = JSON.parse(r); // get supported block Elements from plugins, we will use this later. From 190444b5e1e8a6b3657535a2c6ba1ea2853f468f Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 12 May 2026 10:13:52 +0100 Subject: [PATCH 3/4] deps: add dirty-ts (now a peer dep of ueberdb2 v6) ueberdb2 v6 moved its DB drivers from `dependencies` to optional `peerDependencies`, so `dirty-ts` is no longer installed transitively. The CI backend tests on Windows (and any new install using the settings.json.template default `dbType: "dirty"`) need it. The other 12 drivers from v5's transitive set are already direct deps in src/package.json. This commit just covers the one that was missed. Co-Authored-By: Claude Opus 4.7 (1M context) --- src/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/package.json b/src/package.json index 384d88f3b8f..106dde66330 100644 --- a/src/package.json +++ b/src/package.json @@ -36,6 +36,7 @@ "cookie-parser": "^1.4.7", "cross-env": "^10.1.0", "cross-spawn": "^7.0.6", + "dirty-ts": "^1.1.8", "ejs": "^5.0.2", "esbuild": "^0.28.0", "express": "^5.2.1", From e26c5c8b9c217c3b5a7e1a302ed0f6b7451b9f76 Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 12 May 2026 10:41:10 +0100 Subject: [PATCH 4/4] deps: bump ueberdb2 to ^6.0.3 (dirty-ts default-import fix) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v6.0.3 ships ether/ueberDB#958 — unwrap the CJS `__esModule`/default wrapping on `import Dirty from 'dirty-ts'`. Without it, every consumer using `dbType: "dirty"` (the settings.json.template default) crashes at init with `TypeError: Dirty is not a constructor`. Bumped in src/package.json and bin/package.json; lockfile refreshed. Backend test suite (1115 tests) passes locally against v6.0.3 with `dbType: "dirty"`. Co-Authored-By: Claude Opus 4.7 (1M context) --- bin/package.json | 2 +- pnpm-lock.yaml | 310 ++++++++++------------------------------------- src/package.json | 2 +- 3 files changed, 63 insertions(+), 251 deletions(-) diff --git a/bin/package.json b/bin/package.json index 30597781804..3301ce768f2 100644 --- a/bin/package.json +++ b/bin/package.json @@ -11,7 +11,7 @@ "log4js": "^6.9.1", "semver": "^7.8.0", "tsx": "^4.22.0", - "ueberdb2": "^6.0.2" + "ueberdb2": "^6.0.3" }, "devDependencies": { "@types/node": "^25.8.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7a1847389f5..4dc1ca21965 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -156,8 +156,8 @@ importers: specifier: ^4.22.0 version: 4.22.0 ueberdb2: - specifier: ^5.0.48 - version: 5.0.48(@azure/core-client@1.10.1)(@opentelemetry/api@1.9.1)(@types/node@25.8.0)(tslib@2.8.1)(typescript@6.0.3) + specifier: ^6.0.3 + version: 6.0.3(@elastic/elasticsearch@9.4.0)(async@3.2.6)(cassandra-driver@4.8.0)(dirty-ts@1.1.8)(mongodb@7.2.0)(mssql@12.5.3(@azure/core-client@1.10.1))(mysql2@3.22.3(@types/node@25.8.0))(nano@11.0.5)(pg@8.20.0)(redis@5.12.1(@opentelemetry/api@1.9.1))(rethinkdb@2.4.2)(rusty-store-kv@1.3.1)(surrealdb@2.0.3(tslib@2.8.1)(typescript@6.0.3)) devDependencies: '@types/node': specifier: ^25.8.0 @@ -186,7 +186,7 @@ importers: dependencies: '@elastic/elasticsearch': specifier: ^9.4.0 - version: 9.4.0(apache-arrow@21.1.0) + version: 9.4.0 async: specifier: ^3.2.6 version: 3.2.6 @@ -202,6 +202,9 @@ importers: cross-spawn: specifier: ^7.0.6 version: 7.0.6 + dirty-ts: + specifier: ^1.1.8 + version: 1.1.8 ejs: specifier: ^5.0.2 version: 5.0.2 @@ -353,8 +356,8 @@ importers: specifier: 4.22.0 version: 4.22.0 ueberdb2: - specifier: ^5.0.48 - version: 5.0.48(@azure/core-client@1.10.1)(@opentelemetry/api@1.9.1)(@types/node@25.8.0)(tslib@2.8.1)(typescript@6.0.3) + specifier: ^6.0.3 + version: 6.0.3(@elastic/elasticsearch@9.4.0)(async@3.2.6)(cassandra-driver@4.8.0)(dirty-ts@1.1.8)(mongodb@7.2.0)(mssql@12.5.3(@azure/core-client@1.10.1))(mysql2@3.22.3(@types/node@25.8.0))(nano@11.0.5)(pg@8.20.0)(redis@5.12.1(@opentelemetry/api@1.9.1))(rethinkdb@2.4.2)(rusty-store-kv@1.3.1)(surrealdb@2.0.3(tslib@2.8.1)(typescript@6.0.3)) underscore: specifier: 1.13.8 version: 1.13.8 @@ -730,10 +733,6 @@ packages: '@docsearch/sidepanel-js@4.6.0': resolution: {integrity: sha512-lFT5KLwlzUmpoGArCScNoK41l9a22JYsEPwBzMrz+/ILVR5Ax87UphCuiyDFQWEvEmbwzn/kJx5W/O5BUlN1Rw==} - '@elastic/elasticsearch@9.3.4': - resolution: {integrity: sha512-Mp14fPEYx+WTfZdcvAaZ9WkLYGHQCbwMx6EP5VCucYdhv4cn/g2sbnMT5HzK+gX3XEpBnnkEK/+WysCKzxuo3A==} - engines: {node: '>=18'} - '@elastic/elasticsearch@9.4.0': resolution: {integrity: sha512-UbvHAtGAqiQdAsAmb3vfCMwOTIf6BoSf6MDpz7mw5UzpU3pRSl4KeFzaXRfrk4+PrgiudYx14socGCI6frgguQ==} engines: {node: '>=20'} @@ -1020,12 +1019,6 @@ packages: peerDependencies: koa: ^2.0.0 || ^3.0.0 - '@kwsites/file-exists@1.1.1': - resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==} - - '@kwsites/promise-deferred@1.1.1': - resolution: {integrity: sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==} - '@mongodb-js/saslprep@1.4.8': resolution: {integrity: sha512-kpjr2jy2w71w0oqAMI8oibBmiF9lXxWkEQs5gMkW4hVE48bsqINGLxnCSYW62ck/NHXJQpQEfA9WlJ1sY0eqBg==} @@ -1784,12 +1777,6 @@ packages: '@shikijs/vscode-textmate@10.0.2': resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} - '@simple-git/args-pathspec@1.0.3': - resolution: {integrity: sha512-ngJMaHlsWDTfjyq9F3VIQ8b7NXbBLq5j9i5bJ6XLYtD6qlDXT7fdKY2KscWWUF8t18xx052Y/PUO1K1TRc9yKA==} - - '@simple-git/argv-parser@1.1.1': - resolution: {integrity: sha512-Q9lBcfQ+VQCpQqGJFHe5yooOS5hGdLFFbJ5R+R5aDsnkPCahtn1hSkMcORX65J2Z5lxSkD0lQorMsncuBQxYUw==} - '@sinonjs/commons@3.0.1': resolution: {integrity: sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==} @@ -1850,12 +1837,6 @@ packages: '@types/chai@5.2.3': resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==} - '@types/command-line-args@5.2.3': - resolution: {integrity: sha512-uv0aG6R0Y8WHZLTamZwtfsDLVRnOa+n+n5rEvFWL5Na5gZ8V2Teab/duDPFzIIIhs9qizDpcavCusCLJZu62Kw==} - - '@types/command-line-usage@5.0.4': - resolution: {integrity: sha512-BwR5KP3Es/CSht0xqBcUXS3qCAUVXwpRKsV2+arxeb65atasuXG9LykC9Ab10Cw3s2raH92ZqOeILaQbsB2ACg==} - '@types/connect@3.4.38': resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==} @@ -1984,9 +1965,6 @@ packages: '@types/node@18.19.130': resolution: {integrity: sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==} - '@types/node@24.12.4': - resolution: {integrity: sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA==} - '@types/node@25.7.0': resolution: {integrity: sha512-z+pdZyxE+RTQE9AcboAZCb4otwcrvgHD+GlBpPgn0emDVt0ohrTMhAwlr2Wd9nZ+nihhYFxO2pThz3C5qSu2Eg==} @@ -2493,10 +2471,6 @@ packages: resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==} engines: {node: '>=12'} - apache-arrow@21.1.0: - resolution: {integrity: sha512-kQrYLxhC+NTVVZ4CCzGF6L/uPVOzJmD1T3XgbiUnP7oTeVFOFgEUu6IKNwCDkpFoBVqDKQivlX4RUFqqnWFlEA==} - hasBin: true - argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} @@ -2507,10 +2481,6 @@ packages: resolution: {integrity: sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==} engines: {node: '>=10'} - array-back@6.2.3: - resolution: {integrity: sha512-SGDvmg6QTYiTxCBkYVmThcoa67uLl35pyzRHdpCGBOcqFy6BtwnphoFPk7LhJshD+Yk1Kt35WGWeZPTgwR4Fhw==} - engines: {node: '>=12.17'} - array-buffer-byte-length@1.0.2: resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==} engines: {node: '>= 0.4'} @@ -2711,10 +2681,6 @@ packages: resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==} engines: {node: '>=18'} - chalk-template@0.4.0: - resolution: {integrity: sha512-/ghrgmhfY8RaSdeo43hNXxpoHAtxdbskUHjPpfqUWGttFgycUhYPGx3YZBCnUCvOa7Doivn1IZec3DEGFoMgLg==} - engines: {node: '>=12'} - chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} engines: {node: '>=10'} @@ -2772,19 +2738,6 @@ packages: comma-separated-tokens@2.0.3: resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==} - command-line-args@6.0.2: - resolution: {integrity: sha512-AIjYVxrV9X752LmPDLbVYv8aMCuHPSLZJXEo2qo/xJfv+NYhaZ4sMSF01rM+gHPaMgvPM0l5D/F+Qx+i2WfSmQ==} - engines: {node: '>=12.20'} - peerDependencies: - '@75lb/nature': latest - peerDependenciesMeta: - '@75lb/nature': - optional: true - - command-line-usage@7.0.4: - resolution: {integrity: sha512-85UdvzTNx/+s5CkSgBm/0hzP80RFHAa7PsfeADE5ezZF3uHz3/Tqj9gIKGT9PTtpycc3Ua64T0oVulGfKxzfqg==} - engines: {node: '>=12.20.0'} - commander@11.1.0: resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==} engines: {node: '>=16'} @@ -3465,15 +3418,6 @@ packages: resolution: {integrity: sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==} engines: {node: '>= 18.0.0'} - find-replace@5.0.2: - resolution: {integrity: sha512-Y45BAiE3mz2QsrN2fb5QEtO4qb44NcS7en/0y9PEVsg351HsLeVclP8QPMH79Le9sH3rs5RSwJu99W0WPZO43Q==} - engines: {node: '>=14'} - peerDependencies: - '@75lb/nature': latest - peerDependenciesMeta: - '@75lb/nature': - optional: true - find-root@1.1.0: resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==} @@ -3489,9 +3433,6 @@ packages: resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} hasBin: true - flatbuffers@25.9.23: - resolution: {integrity: sha512-MI1qs7Lo4Syw0EOzUl0xjs2lsoeqFku44KpngfIduHBYvzm8h2+7K8YMQh1JtVVVrUvhLpNwqVi4DERegUJhPQ==} - flatted@3.4.2: resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==} @@ -4038,10 +3979,6 @@ packages: engines: {node: '>=6'} hasBin: true - json-bignum@0.0.3: - resolution: {integrity: sha512-2WHyXj3OfHSgNyuzDbSxI1w2jgw5gkWSWhS7Qg4bWXx1nLk3jnbwfUeS0PSba3IzpTUWdHxBieELUzXRjQB2zg==} - engines: {node: '>=0.8'} - json-buffer@3.0.1: resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} @@ -4213,9 +4150,6 @@ packages: lockfile@1.0.4: resolution: {integrity: sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==} - lodash.camelcase@4.3.0: - resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==} - lodash.clonedeep@4.5.0: resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==} @@ -4454,22 +4388,11 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - mssql@12.3.1: - resolution: {integrity: sha512-vejZVkcJE6QoXOwt0nwQ79zpnnyworRmIs81qSDWTFUPui6oVv2bs06Tx2iHxrslxUXuXAJevFzWwYjO7mVeOg==} - engines: {node: '>=18'} - hasBin: true - mssql@12.5.3: resolution: {integrity: sha512-+xKl4f/gVLUcX1VvN6MBIPbhwpR3CD7MERwybNQBglLbtky3V/avndByIcN9HSIoDI8wJbGiFpS4A437geoXjg==} engines: {node: '>=18.19.0'} hasBin: true - mysql2@3.22.1: - resolution: {integrity: sha512-48+9UXehKyxxiP2pqCxUq+MSFvX+v41jwsSpFDQO/jAoFuAELutBGJUhWJnDbe82/OBlIhSBMC82WeonmznT/Q==} - engines: {node: '>= 8.0'} - peerDependencies: - '@types/node': '>= 8' - mysql2@3.22.3: resolution: {integrity: sha512-uWWxvZSRvRhtBdh2CdcuK83YcOfPdmEeEYB069bAmPnV93QApDGVPuvCQOLjlh7tYHEWdgQPrn6kosDxHBVLkA==} engines: {node: '>= 8.0'} @@ -5264,9 +5187,6 @@ packages: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} - simple-git@3.36.0: - resolution: {integrity: sha512-cGQjLjK8bxJw4QuYT7gxHw3/IouVESbhahSsHrX97MzCL1gu2u7oy38W6L2ZIGECEfIBG4BabsWDPjBxJENv9Q==} - sinon@22.0.0: resolution: {integrity: sha512-sq/6DpdXOrLyfbKlXLg/Usc7xu8YXPeLkOFZRvA3bNUSA2lhbrZ06yuXbH1fkzBPCbz9O10+7hznzUsjaYNm0Q==} @@ -5453,10 +5373,6 @@ packages: tabbable@6.4.0: resolution: {integrity: sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==} - table-layout@4.1.1: - resolution: {integrity: sha512-iK5/YhZxq5GO5z8wb0bY1317uDF3Zjpha0QFFLA8/trAoiLbQD0HUbMesEaxyzUgDxi2QlcbM8IvqOlEjgoXBA==} - engines: {node: '>=12.17'} - tapable@2.3.2: resolution: {integrity: sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==} engines: {node: '>=6'} @@ -5610,13 +5526,53 @@ packages: engines: {node: '>=14.17'} hasBin: true - typical@7.3.0: - resolution: {integrity: sha512-ya4mg/30vm+DOWfBg4YK3j2WD6TWtRkCbasOJr40CseYENzCUby/7rIvXA99JGsQHeNxLbnXdyLLxKSv3tauFw==} - engines: {node: '>=12.17'} - - ueberdb2@5.0.48: - resolution: {integrity: sha512-g7oxzIv4iMs2+nADMbzPwsQ3Jik49XdU33CSFRh92EWahqH8yokzUxNAC/iso++XbzAj/NOQhdl9JORExtjeAw==} - engines: {node: '>=18.0.0'} + ueberdb2@6.0.3: + resolution: {integrity: sha512-ae+c26khcpP+zLve8Muv4VyR3gwxH3RaEPfHvWVAq9sdpXnUAB+bEQr0S2JE42SXuyRq9mfsQ6H0OaTuH3divg==} + engines: {node: '>=22.0.0'} + peerDependencies: + '@elastic/elasticsearch': ^9.0.0 + async: ^3.0.0 + cassandra-driver: ^4.0.0 + dirty-ts: ^1.0.0 + mongodb: ^7.0.0 + mssql: ^12.0.0 + mysql2: ^3.0.0 + nano: ^11.0.0 + pg: ^8.0.0 + redis: ^5.0.0 + rethinkdb: ^2.0.0 + rusty-store-kv: ^1.0.0 + simple-git: ^3.0.0 + surrealdb: ^2.0.0 + peerDependenciesMeta: + '@elastic/elasticsearch': + optional: true + async: + optional: true + cassandra-driver: + optional: true + dirty-ts: + optional: true + mongodb: + optional: true + mssql: + optional: true + mysql2: + optional: true + nano: + optional: true + pg: + optional: true + redis: + optional: true + rethinkdb: + optional: true + rusty-store-kv: + optional: true + simple-git: + optional: true + surrealdb: + optional: true uid-safe@2.1.5: resolution: {integrity: sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==} @@ -5632,9 +5588,6 @@ packages: undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - undici-types@7.16.0: - resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} - undici-types@7.21.0: resolution: {integrity: sha512-w9IMgQrz4O0YN1LtB7K5P63vhlIOvC7opSmouCJ+ZywlPAlO9gIkJ+otk6LvGpAs2wg4econaCz3TvQ9xPoyuQ==} @@ -5985,10 +5938,6 @@ packages: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} - wordwrapjs@5.1.1: - resolution: {integrity: sha512-0yweIbkINJodk27gX9LBGMzyQdBDan3s/dEAiwBOj+Mf0PPyWL6/rikalkv8EeD0E8jm4o5RXEOrFTP3NXbhJg==} - engines: {node: '>=12.17'} - workerpool@9.3.4: resolution: {integrity: sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==} @@ -6437,21 +6386,10 @@ snapshots: '@docsearch/sidepanel-js@4.6.0': {} - '@elastic/elasticsearch@9.3.4': - dependencies: - '@elastic/transport': 9.3.5 - apache-arrow: 21.1.0 - tslib: 2.8.1 - transitivePeerDependencies: - - '@75lb/nature' - - supports-color - - '@elastic/elasticsearch@9.4.0(apache-arrow@21.1.0)': + '@elastic/elasticsearch@9.4.0': dependencies: '@elastic/transport': 9.3.5 tslib: 2.8.1 - optionalDependencies: - apache-arrow: 21.1.0 transitivePeerDependencies: - supports-color @@ -6670,14 +6608,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@kwsites/file-exists@1.1.1': - dependencies: - debug: 4.4.3(supports-color@8.1.1) - transitivePeerDependencies: - - supports-color - - '@kwsites/promise-deferred@1.1.1': {} - '@mongodb-js/saslprep@1.4.8': dependencies: sparse-bitfield: 3.0.3 @@ -7244,12 +7174,6 @@ snapshots: '@shikijs/vscode-textmate@10.0.2': {} - '@simple-git/args-pathspec@1.0.3': {} - - '@simple-git/argv-parser@1.1.1': - dependencies: - '@simple-git/args-pathspec': 1.0.3 - '@sinonjs/commons@3.0.1': dependencies: type-detect: 4.0.8 @@ -7313,10 +7237,6 @@ snapshots: '@types/deep-eql': 4.0.2 assertion-error: 2.0.1 - '@types/command-line-args@5.2.3': {} - - '@types/command-line-usage@5.0.4': {} - '@types/connect@3.4.38': dependencies: '@types/node': 25.7.0 @@ -7462,10 +7382,6 @@ snapshots: dependencies: undici-types: 5.26.5 - '@types/node@24.12.4': - dependencies: - undici-types: 7.16.0 - '@types/node@25.7.0': dependencies: undici-types: 7.21.0 @@ -7999,20 +7915,6 @@ snapshots: ansi-styles@6.2.3: {} - apache-arrow@21.1.0: - dependencies: - '@swc/helpers': 0.5.21 - '@types/command-line-args': 5.2.3 - '@types/command-line-usage': 5.0.4 - '@types/node': 24.12.4 - command-line-args: 6.0.2 - command-line-usage: 7.0.4 - flatbuffers: 25.9.23 - json-bignum: 0.0.3 - tslib: 2.8.1 - transitivePeerDependencies: - - '@75lb/nature' - argparse@1.0.10: dependencies: sprintf-js: 1.0.3 @@ -8023,8 +7925,6 @@ snapshots: dependencies: tslib: 2.8.1 - array-back@6.2.3: {} - array-buffer-byte-length@1.0.2: dependencies: call-bound: 1.0.4 @@ -8239,10 +8139,6 @@ snapshots: chai@6.2.2: {} - chalk-template@0.4.0: - dependencies: - chalk: 4.1.2 - chalk@4.1.2: dependencies: ansi-styles: 4.3.0 @@ -8290,20 +8186,6 @@ snapshots: comma-separated-tokens@2.0.3: {} - command-line-args@6.0.2: - dependencies: - array-back: 6.2.3 - find-replace: 5.0.2 - lodash.camelcase: 4.3.0 - typical: 7.3.0 - - command-line-usage@7.0.4: - dependencies: - array-back: 6.2.3 - chalk-template: 0.4.0 - table-layout: 4.1.1 - typical: 7.3.0 - commander@11.1.0: {} component-emitter@1.3.1: {} @@ -9124,8 +9006,6 @@ snapshots: transitivePeerDependencies: - supports-color - find-replace@5.0.2: {} - find-root@1.1.0: {} find-up@5.0.0: @@ -9140,8 +9020,6 @@ snapshots: flat@5.0.2: {} - flatbuffers@25.9.23: {} - flatted@3.4.2: {} focus-trap@8.0.0: @@ -9775,8 +9653,6 @@ snapshots: jsesc@3.1.0: {} - json-bignum@0.0.3: {} - json-buffer@3.0.1: {} json-schema-traverse@0.4.1: {} @@ -9970,8 +9846,6 @@ snapshots: dependencies: signal-exit: 3.0.7 - lodash.camelcase@4.3.0: {} - lodash.clonedeep@4.5.0: {} lodash.includes@4.3.0: {} @@ -10196,17 +10070,6 @@ snapshots: ms@2.1.3: {} - mssql@12.3.1(@azure/core-client@1.10.1): - dependencies: - '@tediousjs/connection-string': 1.1.0 - commander: 11.1.0 - debug: 4.4.3(supports-color@8.1.1) - tarn: 3.0.2 - tedious: 19.2.1(@azure/core-client@1.10.1) - transitivePeerDependencies: - - '@azure/core-client' - - supports-color - mssql@12.5.3(@azure/core-client@1.10.1): dependencies: '@tediousjs/connection-string': 1.1.0 @@ -10218,18 +10081,6 @@ snapshots: - '@azure/core-client' - supports-color - mysql2@3.22.1(@types/node@25.8.0): - dependencies: - '@types/node': 25.8.0 - aws-ssl-profiles: 1.1.2 - denque: 2.1.0 - generate-function: 2.3.1 - iconv-lite: 0.7.2 - long: 5.3.2 - lru.min: 1.1.4 - named-placeholders: 1.1.6 - sql-escaper: 1.3.3 - mysql2@3.22.3(@types/node@25.8.0): dependencies: '@types/node': 25.8.0 @@ -11142,16 +10993,6 @@ snapshots: signal-exit@4.1.0: {} - simple-git@3.36.0: - dependencies: - '@kwsites/file-exists': 1.1.1 - '@kwsites/promise-deferred': 1.1.1 - '@simple-git/args-pathspec': 1.0.3 - '@simple-git/argv-parser': 1.1.1 - debug: 4.4.3(supports-color@8.1.1) - transitivePeerDependencies: - - supports-color - sinon@22.0.0: dependencies: '@sinonjs/commons': 3.0.1 @@ -11379,11 +11220,6 @@ snapshots: tabbable@6.4.0: {} - table-layout@4.1.1: - dependencies: - array-back: 6.2.3 - wordwrapjs: 5.1.1 - tapable@2.3.2: {} tar@7.5.13: @@ -11544,41 +11380,21 @@ snapshots: typescript@6.0.3: {} - typical@7.3.0: {} - - ueberdb2@5.0.48(@azure/core-client@1.10.1)(@opentelemetry/api@1.9.1)(@types/node@25.8.0)(tslib@2.8.1)(typescript@6.0.3): - dependencies: - '@elastic/elasticsearch': 9.3.4 + ueberdb2@6.0.3(@elastic/elasticsearch@9.4.0)(async@3.2.6)(cassandra-driver@4.8.0)(dirty-ts@1.1.8)(mongodb@7.2.0)(mssql@12.5.3(@azure/core-client@1.10.1))(mysql2@3.22.3(@types/node@25.8.0))(nano@11.0.5)(pg@8.20.0)(redis@5.12.1(@opentelemetry/api@1.9.1))(rethinkdb@2.4.2)(rusty-store-kv@1.3.1)(surrealdb@2.0.3(tslib@2.8.1)(typescript@6.0.3)): + optionalDependencies: + '@elastic/elasticsearch': 9.4.0 async: 3.2.6 cassandra-driver: 4.8.0 dirty-ts: 1.1.8 mongodb: 7.2.0 - mssql: 12.3.1(@azure/core-client@1.10.1) - mysql2: 3.22.1(@types/node@25.8.0) + mssql: 12.5.3(@azure/core-client@1.10.1) + mysql2: 3.22.3(@types/node@25.8.0) nano: 11.0.5 pg: 8.20.0 redis: 5.12.1(@opentelemetry/api@1.9.1) rethinkdb: 2.4.2 rusty-store-kv: 1.3.1 - simple-git: 3.36.0 surrealdb: 2.0.3(tslib@2.8.1)(typescript@6.0.3) - transitivePeerDependencies: - - '@75lb/nature' - - '@aws-sdk/credential-providers' - - '@azure/core-client' - - '@mongodb-js/zstd' - - '@node-rs/xxhash' - - '@opentelemetry/api' - - '@types/node' - - gcp-metadata - - kerberos - - mongodb-client-encryption - - pg-native - - snappy - - socks - - supports-color - - tslib - - typescript uid-safe@2.1.5: dependencies: @@ -11595,8 +11411,6 @@ snapshots: undici-types@5.26.5: {} - undici-types@7.16.0: {} - undici-types@7.21.0: {} undici-types@7.24.5: {} @@ -11935,8 +11749,6 @@ snapshots: word-wrap@1.2.5: {} - wordwrapjs@5.1.1: {} - workerpool@9.3.4: {} wrap-ansi@7.0.0: diff --git a/src/package.json b/src/package.json index 106dde66330..74625c4c5c4 100644 --- a/src/package.json +++ b/src/package.json @@ -87,7 +87,7 @@ "swagger-ui-express": "^5.0.1", "tinycon": "0.6.8", "tsx": "4.22.0", - "ueberdb2": "^6.0.2", + "ueberdb2": "^6.0.3", "underscore": "1.13.8", "undici": "^8.3.0", "unorm": "1.6.0",