@webda/core 4.0.0-beta.7 → 4.0.0-beta.9

package/lib/test/legacy-types.js

@@ -0,0 +1,481 @@
+import * as assert from "node:assert";
+import { useApplication } from "../application/hooks.js";
+import { formatMigrationReport } from "../stores/migration.js";
+import { V3Animal, V3Dog, V3Plant, V3Puppy } from "./legacy-types.fixture.model.js";
+// This module may be loaded from `src` while the store under test comes from `lib` (store packages alias
+// `@webda/core/lib/test`): it never touches the Registry or a class of `@webda/core` directly, only the store
+// methods and the fixture models.
+/**
+ * `models` of a store holding the fixture: two models sharing one table, V3Animal its root
+ */
+export const LEGACY_TYPE_MODELS = ["Webda/V3Animal", "Webda/V3Plant"];
+/**
+ * Rows as Webda 3 stored them: short, lower-case, upper-case, aliased, untyped and unknown types, and a type of an
+ * ancestor of the table root (`UuidModel`), which belongs to the root like an untyped row
+ */
+export const LEGACY_TYPE_ROWS = [
+    { key: "a1", data: { uuid: "a1", __type: "Webda/V3Animal", name: "current animal" } },
+    { key: "a2", data: { uuid: "a2", __type: "V3Animal", name: "short animal" } },
+    { key: "a3", data: { uuid: "a3", __type: "webda/v3animal", name: "lower animal" } },
+    { key: "a4", data: { uuid: "a4", name: "untyped animal" } },
+    { key: "a5", data: { uuid: "a5", __type: "UuidModel", name: "ancestor animal" } },
+    { key: "d1", data: { uuid: "d1", __type: "v3dog", name: "lower short dog" } },
+    { key: "p1", data: { uuid: "p1", __type: "WEBDA/V3PUPPY", name: "upper puppy" } },
+    { key: "p2", data: { uuid: "p2", __type: "Webda/V3Puppy", name: "current puppy" } },
+    { key: "g1", data: { uuid: "g1", __type: "Webda/Flora", name: "alias plant" } },
+    { key: "g2", data: { uuid: "g2", __type: "Flora", name: "short alias plant" } },
+    { key: "g3", data: { uuid: "g3", __type: "Webda/V3Plant", name: "current plant" } },
+    { key: "u1", data: { uuid: "u1", __type: "Gone/Model", name: "unknown" } }
+];
+/**
+ * Row whose type matches two models (both declare the alias `Webda/Creature`): ambiguous, so left untouched
+ *
+ * Not part of {@link LEGACY_TYPE_ROWS}: only the migration check seeds it.
+ */
+export const LEGACY_TYPE_AMBIGUOUS_ROW = {
+    key: "x1",
+    data: { uuid: "x1", __type: "Webda/Creature", name: "ambiguous" }
+};
+/**
+ * Exact `types` migration totals over {@link LEGACY_TYPE_ROWS}
+ */
+export const LEGACY_TYPE_REPORT = {
+    scanned: 12,
+    updated: 8,
+    byChange: {
+        "(untyped) → Webda/V3Animal": 1,
+        "Flora → Webda/V3Plant": 1,
+        "UuidModel → Webda/V3Animal": 1,
+        "V3Animal → Webda/V3Animal": 1,
+        "WEBDA/V3PUPPY → Webda/V3Puppy": 1,
+        "Webda/Flora → Webda/V3Plant": 1,
+        "v3dog → Webda/V3Dog": 1,
+        "webda/v3animal → Webda/V3Animal": 1
+    },
+    unknown: { "Gone/Model": 1 }
+};
+/**
+ * Register the fixture models in the current application (once), with the runtime Metadata the module loader sets
+ */
+export function registerLegacyTypeFixtures() {
+    const app = useApplication();
+    if (app.getModels()["Webda/V3Animal"] === V3Animal) {
+        return;
+    }
+    const metadata = (identifier, ancestors, subclasses, aliases = []) => ({
+        Identifier: identifier,
+        Import: "",
+        Plural: `${identifier.split("/").pop()}s`,
+        Schemas: {},
+        Relations: {},
+        Ancestors: ancestors,
+        Subclasses: subclasses,
+        PrimaryKey: ["uuid"],
+        Events: [],
+        Reflection: {},
+        Actions: {},
+        Aliases: aliases
+    });
+    const models = [
+        ["Webda/V3Puppy", V3Puppy, metadata("Webda/V3Puppy", ["Webda/V3Dog", "Webda/V3Animal"], [])],
+        ["Webda/V3Dog", V3Dog, metadata("Webda/V3Dog", ["Webda/V3Animal"], [V3Puppy])],
+        ["Webda/V3Animal", V3Animal, metadata("Webda/V3Animal", [], [V3Dog], ["Webda/Creature"])],
+        ["Webda/V3Plant", V3Plant, metadata("Webda/V3Plant", [], [], ["Webda/Flora", "Webda/Creature"])]
+    ];
+    for (const [identifier, clazz, meta] of models) {
+        app.addModel(identifier, clazz, meta);
+        clazz.registerSerializer(true, identifier);
+    }
+}
+/**
+ * Sum a migration report over its tables
+ * @param report - the report
+ * @returns the totals
+ */
+export function sumMigrationReport(report) {
+    const sum = { scanned: 0, updated: 0, byChange: {}, unknown: {} };
+    for (const table of Object.values(report.tables)) {
+        sum.scanned += table.scanned;
+        sum.updated += table.updated;
+        for (const [change, n] of Object.entries(table.byChange)) {
+            sum.byChange[change] = (sum.byChange[change] ?? 0) + n;
+        }
+        for (const [type, n] of Object.entries(table.unknown)) {
+            sum.unknown[type] = (sum.unknown[type] ?? 0) + n;
+        }
+    }
+    return sum;
+}
+/** Store names must be unique: their migration progress is keyed by name */
+let storeCounter = 0;
+/**
+ * @param ms - delay
+ * @returns a promise resolved after the delay
+ */
+const pause = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+/**
+ * @param harness - the harness
+ * @param store - the store
+ * @returns the table of the fixture rows
+ */
+function fixtureTable(harness, store) {
+    return harness.tableOf ? harness.tableOf(store, V3Animal) : store.getRawTables()[0].name;
+}
+/**
+ * Create a store of the fixture models and seed the Webda 3 rows
+ * @param harness - the harness
+ * @param label - name prefix
+ * @returns the store
+ */
+async function seedLegacyStore(harness, label) {
+    registerLegacyTypeFixtures();
+    const store = await harness.createStore(`LegacyTypes${label}${++storeCounter}`, LEGACY_TYPE_MODELS);
+    await harness.seedRaw(store, fixtureTable(harness, store), structuredClone(LEGACY_TYPE_ROWS));
+    return store;
+}
+/**
+ * Stored data of every row of a table, as the backend holds it
+ * @param store - the store
+ * @param table - the table
+ * @returns data by key
+ */
+async function readRawRows(store, table) {
+    const rows = {};
+    let token;
+    do {
+        const page = await store.rawPages(table, 100, token);
+        for (const row of page.rows)
+            rows[row.key] = row.data;
+        token = page.continuationToken;
+    } while (token);
+    return rows;
+}
+/**
+ * @param rows - rows by key, from {@link readRawRows}
+ * @returns the stored `__type` by key
+ */
+function typesOf(rows) {
+    return Object.fromEntries(Object.entries(rows).map(([key, data]) => [key, data.__type]));
+}
+/**
+ * @param model - the model
+ * @param query - the query
+ * @returns the sorted uuids of the query results
+ */
+async function uuids(model, query = "") {
+    return (await model.query(query)).results.map((item) => item.uuid).sort();
+}
+/**
+ * @param model - the model
+ * @returns the row count of the model, through the aggregation
+ */
+async function countOf(model) {
+    const repository = model.getRepository();
+    repository.configureAggregation({ fallback: "allow" });
+    return (await repository.aggregate({ metrics: { n: { count: "*" } } })).rows[0].n;
+}
+/**
+ * Reads see exactly the rows of each model, as the right class; bulk statements and deletes too
+ * @param harness - the harness
+ */
+export async function checkLegacyTypeVisibility(harness) {
+    await seedLegacyStore(harness, "Visibility");
+    assert.deepStrictEqual(await uuids(V3Animal), ["a1", "a2", "a3", "a4", "a5", "d1", "p1", "p2"]);
+    assert.deepStrictEqual(await uuids(V3Dog), ["d1", "p1", "p2"]);
+    assert.deepStrictEqual(await uuids(V3Puppy), ["p1", "p2"]);
+    assert.deepStrictEqual(await uuids(V3Plant), ["g1", "g2", "g3"]);
+    assert.deepStrictEqual(await uuids(V3Animal, "name = 'short animal'"), ["a2"]);
+    const animals = Object.fromEntries((await V3Animal.query("")).results.map(a => [a.uuid, a]));
+    assert.ok(animals.d1 instanceof V3Dog && !(animals.d1 instanceof V3Puppy), "d1 loads as V3Dog");
+    assert.ok(animals.p1 instanceof V3Puppy, "p1 loads as V3Puppy");
+    assert.strictEqual(animals.a2.constructor, V3Animal);
+    assert.strictEqual(animals.p1.__type, "Webda/V3Puppy");
+    assert.strictEqual(animals.a3.__type, "Webda/V3Animal");
+    // A row typed as an ancestor of the table root loads as the root
+    assert.strictEqual(animals.a5.constructor, V3Animal);
+    assert.strictEqual(animals.a5.__type, "Webda/V3Animal");
+    assert.strictEqual(await countOf(V3Animal), 8);
+    assert.strictEqual(await countOf(V3Dog), 3);
+    assert.strictEqual(await countOf(V3Plant), 3);
+    const iterated = [];
+    for await (const item of V3Dog.iterate(""))
+        iterated.push(item.uuid);
+    assert.deepStrictEqual(iterated.sort(), ["d1", "p1", "p2"]);
+    // get by key is unfiltered: the resolved class, or the repository model keeping an unknown type
+    assert.ok((await V3Animal.ref("d1").get()) instanceof V3Dog);
+    const unknown = await V3Animal.ref("u1").get();
+    assert.strictEqual(unknown.constructor, V3Animal);
+    assert.strictEqual(unknown.__type, "Gone/Model");
+    // Bulk statements only touch the rows of the model
+    assert.strictEqual(await V3Dog.getRepository().updateMany("UPDATE SET name = 'dog' WHERE name != ''"), 3);
+    assert.deepStrictEqual(await uuids(V3Animal, "name = 'dog'"), ["d1", "p1", "p2"]);
+    assert.strictEqual(await V3Animal.getRepository().updateMany("UPDATE SET name = 'ancestor' WHERE name = 'ancestor animal'"), 1);
+    assert.deepStrictEqual(await uuids(V3Animal, "name = 'ancestor'"), ["a5"]);
+    assert.strictEqual(await V3Plant.getRepository().deleteMany("DELETE WHERE name != ''"), 3);
+    assert.deepStrictEqual(await uuids(V3Plant), []);
+    assert.deepStrictEqual(await uuids(V3Animal), ["a1", "a2", "a3", "a4", "a5", "d1", "p1", "p2"]);
+    // A single delete removes the row of a legacy type, whatever its stored type, and only that row
+    await V3Animal.ref("a2").delete();
+    await V3Animal.ref("p1").delete();
+    assert.deepStrictEqual(await uuids(V3Animal), ["a1", "a3", "a4", "a5", "d1", "p2"]);
+    assert.deepStrictEqual(await uuids(V3Dog), ["d1", "p2"]);
+}
+/**
+ * Saving a legacy row writes its current identifier; a subclass row keeps its subclass identifier
+ * @param harness - the harness
+ */
+export async function checkLegacyTypeNormalization(harness) {
+    const store = await seedLegacyStore(harness, "Normalization");
+    const table = fixtureTable(harness, store);
+    await V3Animal.ref("a2").patch({ name: "patched" });
+    await V3Animal.ref("p1").patch({ name: "patched puppy" });
+    await V3Plant.ref("g2").patch({ name: "patched plant" });
+    await V3Animal.getRepository().update({ uuid: "a3", name: "updated" });
+    await V3Animal.ref("a5").patch({ name: "patched ancestor" });
+    const types = typesOf(await readRawRows(store, table));
+    assert.strictEqual(types.a2, "Webda/V3Animal");
+    assert.strictEqual(types.p1, "Webda/V3Puppy");
+    assert.strictEqual(types.g2, "Webda/V3Plant");
+    assert.strictEqual(types.a3, "Webda/V3Animal");
+    assert.strictEqual(types.a5, "Webda/V3Animal");
+    assert.strictEqual(types.u1, "Gone/Model");
+    assert.strictEqual(types.a4, undefined);
+    const puppy = await V3Animal.ref("p1").get();
+    assert.ok(puppy instanceof V3Puppy);
+    assert.strictEqual(puppy.name, "patched puppy");
+}
+/**
+ * The `types` report is exact; a dry run writes nothing; a second run updates nothing; a Webda 4 envelope keeps its
+ * value; an ambiguous type is counted and left alone
+ * @param harness - the harness
+ */
+export async function checkLegacyTypeMigration(harness) {
+    const store = await seedLegacyStore(harness, "Migration");
+    const table = fixtureTable(harness, store);
+    await harness.seedRaw(store, table, [structuredClone(LEGACY_TYPE_AMBIGUOUS_ROW)]);
+    const expected = {
+        ...LEGACY_TYPE_REPORT,
+        scanned: LEGACY_TYPE_REPORT.scanned + 1,
+        unknown: { ...LEGACY_TYPE_REPORT.unknown, [LEGACY_TYPE_AMBIGUOUS_ROW.data.__type]: 1 }
+    };
+    const before = await readRawRows(store, table);
+    const dry = await store.migrateTypes({ dryRun: true, batchSize: 4 });
+    assert.strictEqual(dry.dryRun, true);
+    assert.deepStrictEqual(sumMigrationReport(dry), expected);
+    assert.deepStrictEqual(await readRawRows(store, table), before, "a dry run writes no row");
+    assert.strictEqual(await store.getMigrationProgress("types"), undefined, "a dry run writes no progress");
+    const report = await store.migrateTypes({ batchSize: 4 });
+    assert.strictEqual(report.resumed, false);
+    assert.deepStrictEqual(sumMigrationReport(report), expected);
+    assert.ok(formatMigrationReport(report)
+        .split("\n")
+        .includes(`    ambiguous ${LEGACY_TYPE_AMBIGUOUS_ROW.data.__type}: 1`), "the report lists the ambiguous type");
+    const rows = await readRawRows(store, table);
+    assert.deepStrictEqual(typesOf(rows), {
+        a1: "Webda/V3Animal",
+        a2: "Webda/V3Animal",
+        a3: "Webda/V3Animal",
+        a4: "Webda/V3Animal",
+        a5: "Webda/V3Animal",
+        d1: "Webda/V3Dog",
+        p1: "Webda/V3Puppy",
+        p2: "Webda/V3Puppy",
+        g1: "Webda/V3Plant",
+        g2: "Webda/V3Plant",
+        g3: "Webda/V3Plant",
+        u1: "Gone/Model",
+        x1: "Webda/Creature"
+    });
+    assert.deepStrictEqual(rows.x1, before.x1, "an ambiguous row is left untouched");
+    const progress = (await store.getMigrationProgress("types"));
+    assert.strictEqual(progress.done, true);
+    assert.strictEqual(progress.leaseUntil, 0);
+    const again = await store.migrateTypes({ batchSize: 4 });
+    assert.deepStrictEqual(sumMigrationReport(again), {
+        scanned: expected.scanned,
+        updated: 0,
+        byChange: {},
+        unknown: expected.unknown
+    });
+    assert.deepStrictEqual(await uuids(V3Dog), ["d1", "p1", "p2"]);
+    // A row written by Webda 4 through the repository: only its __type is rewritten
+    await V3Animal.getRepository().create({ uuid: "e1", name: "envelope" });
+    const envelope = (await readRawRows(store, table)).e1;
+    assert.ok(envelope, "e1 was written");
+    await harness.seedRaw(store, table, [{ key: "e1", data: { ...structuredClone(envelope), __type: "V3Animal" } }]);
+    const enveloped = await store.migrateTypes({ batchSize: 4 });
+    assert.deepStrictEqual(sumMigrationReport(enveloped), {
+        scanned: expected.scanned + 1,
+        updated: 1,
+        byChange: { "V3Animal → Webda/V3Animal": 1 },
+        unknown: expected.unknown
+    });
+    assert.deepStrictEqual((await readRawRows(store, table)).e1, envelope, "only the __type changed, back to current");
+    const loaded = await V3Animal.ref("e1").get();
+    assert.strictEqual(loaded.name, "envelope");
+}
+/**
+ * A run interrupted after one page resumes and ends with the same totals
+ * @param harness - the harness
+ */
+export async function checkLegacyTypeResume(harness) {
+    const store = await seedLegacyStore(harness, "Resume");
+    const original = store.rawPages.bind(store);
+    let served = 0;
+    store.rawPages = async (table, batchSize, token) => {
+        if (served > 0)
+            throw new Error("Interrupted");
+        const page = await original(table, batchSize, token);
+        served += page.rows.length;
+        return page;
+    };
+    try {
+        await assert.rejects(() => store.migrateTypes({ batchSize: 4 }), /Interrupted/);
+    }
+    finally {
+        delete store.rawPages;
+    }
+    const interrupted = (await store.getMigrationProgress("types"));
+    assert.strictEqual(interrupted.done, false);
+    assert.strictEqual(interrupted.scanned, 4);
+    assert.strictEqual(interrupted.leaseUntil, 0);
+    const resumed = await store.migrateTypes({ batchSize: 4 });
+    assert.strictEqual(resumed.resumed, true);
+    assert.deepStrictEqual(sumMigrationReport(resumed), LEGACY_TYPE_REPORT);
+}
+/**
+ * A second runner fails fast; an expired lease is taken over; the stale runner stops without writing
+ *
+ * Both runners use a patcher that always patches, so a stale runner that kept writing would be caught.
+ * @param harness - the harness
+ */
+export async function checkLegacyTypeLease(harness) {
+    const store = await seedLegacyStore(harness, "Lease");
+    const table = fixtureTable(harness, store);
+    const original = store.rawPages.bind(store);
+    let release;
+    const hung = new Promise(resolve => (release = resolve));
+    let served = 0;
+    store.rawPages = async (name, batchSize, token) => {
+        if (served > 0)
+            await hung;
+        const page = await original(name, batchSize, token);
+        served += page.rows.length;
+        return page;
+    };
+    const mark = (runner) => () => ({ runner });
+    const leaseDuration = harness.leaseDuration ?? 1000;
+    let first;
+    let firstError;
+    try {
+        first = store.migration("lease", mark("stale"), { batchSize: 4, leaseDuration });
+        first.catch(err => (firstError = err));
+        let progress = await store.getMigrationProgress("lease");
+        const deadline = Date.now() + Math.max(10000, leaseDuration * 5);
+        while (!progress?.scanned) {
+            if (firstError)
+                throw firstError;
+            assert.ok(Date.now() < deadline, "the first runner never saved its first page");
+            await pause(5);
+            progress = await store.getMigrationProgress("lease");
+        }
+        await assert.rejects(() => store.migration("lease", mark("second"), { batchSize: 4 }), (err) => err?.code === "MIGRATION_ALREADY_RUNNING");
+        await pause(Math.max(0, progress.leaseUntil - Date.now()) + 20);
+    }
+    catch (err) {
+        release();
+        await first?.catch(() => undefined);
+        throw err;
+    }
+    finally {
+        delete store.rawPages;
+    }
+    const takeover = await store.migration("lease", mark("takeover"), { batchSize: 4 });
+    assert.strictEqual(takeover.resumed, true);
+    const totals = sumMigrationReport(takeover);
+    assert.strictEqual(totals.scanned, LEGACY_TYPE_ROWS.length);
+    assert.strictEqual(totals.updated, LEGACY_TYPE_ROWS.length);
+    const before = await readRawRows(store, table);
+    const runners = Object.values(before).map(data => data.runner);
+    assert.strictEqual(runners.filter(runner => runner === "stale").length, 4, "the stale runner wrote its first page");
+    assert.strictEqual(runners.filter(runner => runner === "takeover").length, LEGACY_TYPE_ROWS.length - 4);
+    release();
+    await assert.rejects(first, (err) => err?.code === "MIGRATION_ALREADY_RUNNING");
+    assert.deepStrictEqual(await readRawRows(store, table), before, "the stale runner writes nothing");
+}
+/**
+ * The startup check WARNs once with the counts; a clean store stays silent
+ * @param harness - the harness
+ */
+export async function checkLegacyTypeStartup(harness) {
+    const store = await seedLegacyStore(harness, "Startup");
+    const warnings = [];
+    store.log = (level, ...args) => {
+        const message = args.join(" ");
+        if (level === "WARN" && message.includes("legacy, untyped or unknown types"))
+            warnings.push(message);
+    };
+    try {
+        const summary = (await store.checkStoredTypes());
+        assert.deepStrictEqual({ legacy: summary.legacy, untyped: summary.untyped, unknown: summary.unknown, truncated: summary.truncated }, { legacy: 7, untyped: 1, unknown: 1, truncated: false });
+        assert.strictEqual(warnings.length, 1, warnings.join("\n"));
+        for (const part of [
+            "'V3Animal' → Webda/V3Animal: 1",
+            "untyped → Webda/V3Animal: 1",
+            "'Flora' → Webda/V3Plant: 1",
+            "'UuidModel' → Webda/V3Animal: 1",
+            "unknown 'Gone/Model': 1",
+            "webda migrate"
+        ]) {
+            assert.ok(warnings[0].includes(part), `${part} in ${warnings[0]}`);
+        }
+    }
+    finally {
+        delete store.log;
+    }
+    registerLegacyTypeFixtures();
+    const clean = await harness.createStore(`LegacyTypesClean${++storeCounter}`, LEGACY_TYPE_MODELS);
+    await harness.seedRaw(clean, fixtureTable(harness, clean), structuredClone(LEGACY_TYPE_ROWS.filter(row => ["a1", "p2", "g3"].includes(row.key))));
+    const cleanWarnings = [];
+    clean.log = (level, ...args) => {
+        const message = args.join(" ");
+        if (level === "WARN" && message.includes("legacy, untyped or unknown types"))
+            cleanWarnings.push(message);
+    };
+    try {
+        const summary = (await clean.checkStoredTypes());
+        assert.strictEqual(summary.message, undefined);
+        assert.deepStrictEqual(cleanWarnings, []);
+    }
+    finally {
+        delete clean.log;
+    }
+}
+/**
+ * Every check of the suite, by name
+ */
+export const LEGACY_TYPE_CHECKS = [
+    { name: "visibility", check: checkLegacyTypeVisibility },
+    { name: "normalization", check: checkLegacyTypeNormalization },
+    { name: "migration", check: checkLegacyTypeMigration },
+    { name: "resume", check: checkLegacyTypeResume },
+    { name: "lease", check: checkLegacyTypeLease },
+    { name: "startup", check: checkLegacyTypeStartup }
+];
+/**
+ * Run the whole suite
+ *
+ * A plain function rather than a test suite so store packages share it without duplicating test classes across
+ * module resolutions.
+ * @param harness - the harness
+ * @param options - names of the checks to skip, with a documented reason
+ * @param options.skip - check names
+ */
+export async function checkLegacyTypes(harness, options = {}) {
+    for (const { name, check } of LEGACY_TYPE_CHECKS) {
+        if (options.skip?.includes(name))
+            continue;
+        await check(harness);
+    }
+}
+//# sourceMappingURL=legacy-types.js.map

package/lib/test/legacy-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy-types.js","sourceRoot":"","sources":["../../src/test/legacy-types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webda/core",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.9",
   "description": "Expose API with Lambda",
   "keywords": [
     "aws",
@@ -55,18 +55,18 @@
     "ws": "^8.20.0",
     "yaml": "^2.8.3",
     "yargs": "^18.0.0",
+    "@webda/cache": "^4.0.0-beta.9",
     "@webda/decorators": "^4.0.0-beta.5",
-    "@webda/models": "^4.0.0-beta.7",
-    "@webda/ql": "4.0.0-beta.6",
-    "@webda/cache": "^4.0.0-beta.7",
-    "@webda/tsc-esm": "4.0.0-beta.7",
-    "@webda/utils": "^4.0.0-beta.7",
-    "@webda/workout": "4.0.0-beta.5"
+    "@webda/models": "^4.0.0-beta.9",
+    "@webda/ql": "4.0.0-beta.8",
+    "@webda/tsc-esm": "4.0.0-beta.8",
+    "@webda/workout": "4.0.0-beta.5",
+    "@webda/utils": "^4.0.0-beta.9"
   },
   "peerDependencies": {
     "sinon": "^21.0.3",
     "vitest": "^4.1.2",
-    "@webda/test": "^4.0.0-beta.6"
+    "@webda/test": "^4.0.0-beta.7"
   },
   "peerDependenciesMeta": {
     "sinon": {
@@ -100,9 +100,9 @@
     "typescript": "7.1.0-dev.20260929.1",
     "vite": "^6.0.0",
     "vitest": "^4.1.2",
-    "@webda/compiler": "^4.0.0-beta.7",
-    "@webda/test": "^4.0.0-beta.6",
-    "@webda/content-mapper": "^4.0.0-beta.7"
+    "@webda/compiler": "^4.0.0-beta.9",
+    "@webda/content-mapper": "^4.0.0-beta.8",
+    "@webda/test": "^4.0.0-beta.7"
   },
   "files": [
     "lib",