@substrat-run/contract-tests 0.129.0 → 0.130.1

package/dist/directory-restore-suite.d.ts

@@ -0,0 +1,29 @@
+import { type ScopeDumpTable } from '@substrat-run/contracts';
+/**
+ * A directory restore builds every directory table from the running code's schema, and the
+ * dump contributes rows only, by column name (#1912). #1898 held the directory's `_substrat_*`
+ * tables to that; this holds the platform's registries to it too (`tenants`, `scopes`,
+ * `hostnames`, `verticals`, `vertical_versions`, `orgs`, `tenant_stores`, `blob_stores`, …), and
+ * refuses a table the directory does not build at all.
+ *
+ * The harness hands each case a directory of its own, and reads it without writing to it (an
+ * export records an access-log row on the host path, which a byte-for-byte comparison would
+ * trip over).
+ */
+export interface RestorableDirectory {
+    /** Every table as the directory's storage holds it: DDL, columns and rows, in name order. */
+    snapshot(): Promise<ScopeDumpTable[]>;
+    /** The adapter's directory restore. */
+    restore(tables: ScopeDumpTable[]): Promise<void>;
+    /** A vertical registered by the adapter's own INSERT, which names no capability column. */
+    registerVertical(slug: string): Promise<void>;
+    /** Runs what a restore leaves to run after it: the #1764 split, where it is not run inline. */
+    settle(): Promise<void>;
+    close(): Promise<void>;
+}
+export interface DirectoryRestoreHarness {
+    /** A freshly built directory that no other case reads or writes. */
+    open(): Promise<RestorableDirectory>;
+}
+export declare function directoryRestoreSuite(name: string, harness: DirectoryRestoreHarness): void;
+//# sourceMappingURL=directory-restore-suite.d.ts.map

package/dist/directory-restore-suite.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"directory-restore-suite.d.ts","sourceRoot":"","sources":["../src/directory-restore-suite.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAG/E;;;;;;;;;;GAUG;AACH,MAAM,WAAW,mBAAmB;IAClC,6FAA6F;IAC7F,QAAQ,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IACtC,uCAAuC;IACvC,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,2FAA2F;IAC3F,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,+FAA+F;IAC/F,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,MAAM,WAAW,uBAAuB;IACtC,oEAAoE;IACpE,IAAI,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACtC;AAmFD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,GAAG,IAAI,CA8P1F"}

package/dist/directory-restore-suite.js

@@ -0,0 +1,330 @@
+import { describe, expect, it } from 'vitest';
+import { namesSpineTable } from '@substrat-run/contracts';
+import { ALTERED_SHAPES, CREATED_SHAPES } from './directory-shapes.js';
+/** The columns a restore could not have filled from the dump, and what today's DDL gives them. */
+const DEFAULTS = {
+    status: 'active',
+    storage_shape: 'A',
+    schema_version: '0',
+    migration_attempts: 0,
+    canonical: 0,
+    listed: 0,
+    installs_blocked: 0,
+    tenant_provisioner: 0,
+    email_sender: 0,
+};
+const INTEGER_COLUMNS = new Set([...Object.keys(DEFAULTS).filter((c) => typeof DEFAULTS[c] === 'number'), 'ordinal']);
+/** A live tenant row's NOT NULL columns. */
+const LIVE_TENANT = { tenant_id: 't-0', status: 'active', created_at: 'c' };
+/** A live pre-directory scope row: its NOT NULL columns, and a NULL slug for the backfill to fill. */
+const LIVE_SCOPE = { tenant_id: 't-0', storage_shape: 'A', status: 'active', schema_version: '0', created_at: 'c' };
+/**
+ * The value a crafted row carries in `column`: distinct per table and column, so a value that
+ * landed in the wrong column shows. `1` in an integer column, which for the three capability
+ * columns is the value a staff grant writes. The #1764 progress columns are dumped as a version
+ * the split has not reached, and the manifest as one it can parse.
+ */
+const valueFor = (table, column) => {
+    if (column === 'provisioned_by_tenant' || column === 'migration_count' || column === 'migrations_split')
+        return null;
+    if (column === 'manifest_json')
+        return '{"version":"1.0.0"}';
+    return INTEGER_COLUMNS.has(column) ? 1 : `${table}.${column}`;
+};
+const find = (tables, name) => {
+    const t = tables.find((x) => x.name === name);
+    if (!t)
+        throw new Error(`no table ${name} in the directory`);
+    return t;
+};
+const withTable = (tables, name, edit) => tables.map((t) => (t.name === name ? edit(t) : t));
+const rowOf = (columns, values) => columns.map((c) => values[c] ?? null);
+/** One table's rows as objects, keyed by column name. */
+const recordsOf = (t) => t.rows.map((r) => Object.fromEntries(t.columns.map((c, i) => [c, r[i]])));
+const crafted = (table, columns) => columns.map((c) => valueFor(table, c));
+/** A table in one of its older shapes, holding one crafted row. */
+const inShape = (shape) => ({
+    ddl: shape.ddl,
+    columns: shape.columns,
+    rows: [crafted(shape.table, shape.columns)],
+});
+/**
+ * The row a restore of `shape`'s crafted row must leave in today's table: the dumped values by
+ * name, today's default for a column the shape did not have, and a pre-directory scope row's
+ * naming columns filled the way the legacy backfill fills them. A version's #1764 progress is
+ * whatever the split then wrote, so it is asserted apart.
+ */
+const expectedRow = (shape, columns) => {
+    const dumped = new Set(shape.columns);
+    const out = {};
+    for (const c of columns) {
+        if (shape.table === 'vertical_versions' && (c === 'migration_count' || c === 'migrations_split'))
+            continue;
+        out[c] = dumped.has(c) ? valueFor(shape.table, c) : (DEFAULTS[c] ?? null);
+    }
+    if (shape.table === 'scopes') {
+        if (!dumped.has('slug'))
+            out.slug = String(out.scope_id).toLowerCase();
+        if (!dumped.has('kind'))
+            out.kind = 'scope';
+        if (!dumped.has('name'))
+            out.name = out.slug;
+    }
+    return out;
+};
+/** The scopes table as the directory's first day built it, before its naming columns. */
+const OLDEST_SCOPES = CREATED_SHAPES.find((s) => s.table === 'scopes');
+/** That table holding one live pre-directory row per id, each with a NULL slug. */
+const oldScopes = (ids) => ({
+    name: 'scopes',
+    ddl: OLDEST_SCOPES.ddl,
+    columns: OLDEST_SCOPES.columns,
+    rows: ids.map((id) => rowOf(OLDEST_SCOPES.columns, { ...LIVE_SCOPE, scope_id: id })),
+});
+export function directoryRestoreSuite(name, harness) {
+    const using = async (fn) => {
+        const dir = await harness.open();
+        try {
+            return await fn(dir, await dir.snapshot());
+        }
+        finally {
+            await dir.close();
+        }
+    };
+    /** The directory's tables and their DDL, which a restore must leave as this code builds them. */
+    const shapeOf = (tables) => tables.map((t) => [t.name, t.ddl, t.columns]);
+    describe(`directory restore builds every table from its own schema (#1912): ${name}`, () => {
+        it('a DEFAULT 1 on the three capability columns in the dump does not decide a later registration', async () => {
+            await using(async (dir, fresh) => {
+                const verticals = find(fresh, 'verticals');
+                const granted = ['tenant_provisioner', 'email_sender', 'installs_blocked'];
+                let ddl = verticals.ddl;
+                for (const c of granted)
+                    ddl = ddl.replace(new RegExp(`\\b(${c}\\s+INTEGER\\s+NOT NULL\\s+DEFAULT\\s+)0`), (_, head) => `${head}1`);
+                expect(ddl.match(/NOT NULL\s+DEFAULT\s+1\b/g)).toHaveLength(granted.length);
+                // A row that was granted all three in the copy keeps them: rows are the dump's to say.
+                await dir.restore(withTable(fresh, 'verticals', (t) => ({ ...t, ddl, rows: [crafted('verticals', t.columns)] })));
+                await dir.registerVertical('registered-after');
+                const after = await dir.snapshot();
+                expect(find(after, 'verticals').ddl).toBe(verticals.ddl);
+                const bySlug = Object.fromEntries(recordsOf(find(after, 'verticals')).map((r) => [r.slug, r]));
+                const capabilities = (slug) => Object.fromEntries(granted.map((c) => [c, bySlug[slug]?.[c]]));
+                expect(capabilities('registered-after')).toEqual({ tenant_provisioner: 0, email_sender: 0, installs_blocked: 0 });
+                expect(capabilities('verticals.slug')).toEqual({ tenant_provisioner: 1, email_sender: 1, installs_blocked: 1 });
+            });
+        });
+        it('a COLLATE NOCASE on tenants.slug and hostnames.hostname is not carried: case variants are two rows', async () => {
+            await using(async (dir, fresh) => {
+                const nocase = (ddl, column) => {
+                    const out = ddl.replace(new RegExp(`\\b(${column}\\s+TEXT)\\s+(NOT NULL|PRIMARY KEY)`), '$1 COLLATE NOCASE $2');
+                    expect(out).not.toBe(ddl);
+                    return out;
+                };
+                let tables = withTable(fresh, 'tenants', (t) => ({
+                    ...t,
+                    ddl: nocase(t.ddl, 'slug'),
+                    rows: ['Acme', 'acme'].map((slug, i) => rowOf(t.columns, { ...LIVE_TENANT, tenant_id: `t-${i}`, slug, name: slug })),
+                }));
+                tables = withTable(tables, 'hostnames', (t) => ({
+                    ...t,
+                    ddl: nocase(t.ddl, 'hostname'),
+                    rows: ['App.example.com', 'app.example.com'].map((hostname) => rowOf(t.columns, { hostname, tenant_id: 't-0', scope_id: 's', surface: 'app', status: 'active', canonical: 0, created_at: 'c' })),
+                }));
+                await dir.restore(tables);
+                const after = await dir.snapshot();
+                expect(shapeOf(after)).toEqual(shapeOf(fresh));
+                expect(recordsOf(find(after, 'tenants')).map((r) => r.slug)).toEqual(['Acme', 'acme']);
+                expect(recordsOf(find(after, 'hostnames')).map((r) => r.hostname).sort()).toEqual(['App.example.com', 'app.example.com']);
+            });
+        });
+        it('a REFERENCES in a registry’s own DDL is not carried', async () => {
+            await using(async (dir, fresh) => {
+                // Carried, this row would fail the commit: its tenant is not in the dump.
+                const tables = withTable(fresh, 'scopes', (t) => ({
+                    ...t,
+                    ddl: t.ddl.replace(/\b(tenant_id\s+TEXT\s+NOT NULL)/, '$1 REFERENCES tenants(tenant_id)'),
+                    rows: [crafted('scopes', t.columns)],
+                }));
+                expect(find(tables, 'scopes').ddl).toMatch(/REFERENCES tenants/);
+                await dir.restore(tables);
+                const after = await dir.snapshot();
+                expect(find(after, 'scopes').ddl).toBe(find(fresh, 'scopes').ddl);
+                expect(find(after, 'scopes').rows).toHaveLength(1);
+            });
+        });
+        it('a registry column this code does not know is kept bare and lowercased, with its values', async () => {
+            await using(async (dir, fresh) => {
+                const tables = withTable(fresh, 'tenants', (t) => {
+                    const columns = [...t.columns, 'Future_Note'];
+                    return {
+                        ...t,
+                        ddl: t.ddl.replace(/\)\s*$/, ", Future_Note TEXT NOT NULL COLLATE NOCASE DEFAULT 'x')"),
+                        columns,
+                        rows: [rowOf(columns, { ...LIVE_TENANT, slug: 'acme', name: 'Acme', Future_Note: 'kept' })],
+                    };
+                });
+                await dir.restore(tables);
+                const t = find(await dir.snapshot(), 'tenants');
+                expect(t.columns.at(-1)).toBe('future_note');
+                expect(t.ddl).toMatch(/ "future_note"[,\n)]/);
+                expect(t.ddl).not.toMatch(/NOCASE|Future_Note|DEFAULT 'x'/);
+                expect(t.rows.map((r) => r.at(-1))).toEqual(['kept']);
+            });
+        });
+        describe('an older dump of each registry still restores, into today’s table', () => {
+            for (const shape of [...CREATED_SHAPES, ...ALTERED_SHAPES]) {
+                it(`${shape.table}, ${shape.since}`, async () => {
+                    await using(async (dir, fresh) => {
+                        const today = find(fresh, shape.table);
+                        await dir.restore(withTable(fresh, shape.table, (t) => ({ ...t, ...inShape(shape) })));
+                        await dir.settle();
+                        const after = await dir.snapshot();
+                        expect(shapeOf(after)).toEqual(shapeOf(fresh));
+                        const [row, ...rest] = recordsOf(find(after, shape.table));
+                        expect(rest).toEqual([]);
+                        expect(row).toMatchObject(expectedRow(shape, today.columns));
+                        // #1764's split still runs over a version the dump stored before it.
+                        if (shape.table === 'vertical_versions')
+                            expect(row.migrations_split).toBe(1);
+                    });
+                });
+            }
+            it('a directory whose every registry is at its first shape', async () => {
+                await using(async (dir, fresh) => {
+                    const first = new Map();
+                    for (const s of CREATED_SHAPES)
+                        if (!first.has(s.table))
+                            first.set(s.table, s);
+                    await dir.restore(fresh.map((t) => (first.has(t.name) ? { ...t, ...inShape(first.get(t.name)) } : t)));
+                    await dir.settle();
+                    const after = await dir.snapshot();
+                    expect(shapeOf(after)).toEqual(shapeOf(fresh));
+                    for (const [table, shape] of first) {
+                        expect(recordsOf(find(after, table))).toEqual([expect.objectContaining(expectedRow(shape, find(fresh, table).columns))]);
+                    }
+                });
+            });
+            it('a directory from before the tenant registry, holding only its scopes', async () => {
+                await using(async (dir, fresh) => {
+                    await dir.restore([{ name: 'scopes', ...inShape(OLDEST_SCOPES) }]);
+                    const after = await dir.snapshot();
+                    expect(shapeOf(after)).toEqual(shapeOf(fresh));
+                    expect(recordsOf(find(after, 'scopes'))).toEqual([expect.objectContaining(expectedRow(OLDEST_SCOPES, find(fresh, 'scopes').columns))]);
+                    expect(find(after, 'tenants').rows).toEqual([]);
+                });
+            });
+        });
+        it('export → restore → export round-trips, every registry holding a row', async () => {
+            await using(async (dir, fresh) => {
+                await dir.restore(fresh.map((t) => (!namesSpineTable(t.name) ? { ...t, rows: [crafted(t.name, t.columns)] } : t)));
+                // The crafted version is one the #1764 split has not reached; it moves before the copy.
+                await dir.settle();
+                const before = await dir.snapshot();
+                expect(before.filter((t) => !namesSpineTable(t.name) && t.rows.length !== 1)).toEqual([]);
+                await dir.restore(before);
+                await dir.settle();
+                const after = await dir.snapshot();
+                expect(shapeOf(after)).toEqual(shapeOf(before));
+                for (const t of after) {
+                    const was = find(before, t.name);
+                    // The pure adapter records the restore in the admin log it just loaded; the Durable
+                    // Object leaves that to its host.
+                    if (t.name === '_substrat_admin_log') {
+                        const action = t.columns.indexOf('action');
+                        expect(t.rows.slice(0, was.rows.length)).toEqual(was.rows);
+                        for (const r of t.rows.slice(was.rows.length))
+                            expect(r[action]).toBe('restoreDirectory');
+                    }
+                    else {
+                        expect(t.rows).toEqual(was.rows);
+                    }
+                }
+            });
+        });
+        describe('refused, and the directory is left exactly as it was', () => {
+            const refusals = [
+                [
+                    // The issue's second case: with foreign keys enforced, a row here would fail the delete
+                    // of the tenant it names. Named with a second unbuilt table, to show both are named.
+                    'tables this directory does not build, one of them REFERENCES tenants',
+                    (tables) => [
+                        ...tables,
+                        { name: 'tenant_mirror', ddl: 'CREATE TABLE tenant_mirror (tenant_id TEXT REFERENCES tenants(tenant_id))', columns: ['tenant_id'], rows: [['t-0']] },
+                        { name: 'sqlitedata', ddl: 'CREATE TABLE sqlitedata (id INTEGER PRIMARY KEY, v TEXT)', columns: ['id', 'v'], rows: [] },
+                    ],
+                    /this directory does not build: tenant_mirror, sqlitedata\b/,
+                ],
+                // Both entries would load into the one table SQLite resolves them to, and the second could
+                // carry what the first's checks never saw. `assertDumpIdentifiers` folds case, as SQLite does.
+                ...['tenants', '_substrat_roles'].map((table) => [
+                    `a table listed twice, differing only in case: ${table}`,
+                    (tables) => {
+                        const t = find(tables, table);
+                        const twin = { ...t, name: table.toUpperCase(), ddl: t.ddl.replace(new RegExp(`^(CREATE TABLE\\s+)"?${table}"?`, 'i'), `$1${table.toUpperCase()}`) };
+                        return [...tables, twin];
+                    },
+                    new RegExp(`"${table.toUpperCase()}" is listed twice`),
+                ]),
+                ...['sqlite_master', 'SQLITE_SCHEMA', 'sqlite_sequence', '_cf_METADATA', '_cf_KV'].map((reserved) => [
+                    `a table named like one SQLite or workerd keeps for itself: ${reserved}`,
+                    (tables) => [...tables, { name: reserved, ddl: `CREATE TABLE ${reserved} (name TEXT)`, columns: ['name'], rows: [['x']] }],
+                    new RegExp(`this directory does not build: ${reserved}\\b`),
+                ]),
+                ...['rowid', 'OID', '_rowid_'].map((alias) => [
+                    `a registry column named ${alias}`,
+                    (tables) => withTable(tables, 'tenants', (t) => ({
+                        ...t,
+                        ddl: t.ddl.replace(/\)\s*$/, `, ${alias} INTEGER)`),
+                        columns: [...t.columns, alias],
+                        rows: t.rows.map((r) => [...r, 7]),
+                    })),
+                    new RegExp(`named for SQLite's rowid: ${alias}`),
+                ]),
+                [
+                    // A column added to one table, then a later table's row refused: the addition goes too.
+                    'a row that fails after a column was added',
+                    (tables) => {
+                        const t = withTable(tables, 'tenants', (x) => ({
+                            ...x,
+                            ddl: x.ddl.replace(/\)\s*$/, ', note TEXT)'),
+                            columns: [...x.columns, 'note'],
+                            rows: x.rows.map((r) => [...r, 'n']),
+                        }));
+                        // No `source`, which every shape of the table has required.
+                        return withTable(t, 'verticals', (x) => {
+                            const columns = x.columns.filter((c) => c !== 'source');
+                            return { ...x, columns, rows: [rowOf(columns, { ...DEFAULTS, slug: 'v', name: 'V', created_at: 'c' })] };
+                        });
+                    },
+                    /NOT NULL constraint failed: verticals\.source/,
+                ],
+                [
+                    // Two pre-directory scope rows whose ids differ only in case: the legacy backfill gives
+                    // them one slug, which the live-slug index refuses. It runs inside the transaction.
+                    'a legacy scope backfill that fails',
+                    (tables) => withTable(tables, 'scopes', () => oldScopes(['Dup', 'dup'])),
+                    /UNIQUE/,
+                ],
+            ];
+            for (const [what, craft, message] of refusals) {
+                it(what, async () => {
+                    await using(async (dir, fresh) => {
+                        // A directory holding something, so a restore that went through would show.
+                        await dir.restore(withTable(fresh, 'tenants', (t) => ({ ...t, rows: [rowOf(t.columns, { ...LIVE_TENANT, slug: 'kept', name: 'Kept' })] })));
+                        const before = await dir.snapshot();
+                        const attempt = craft(withTable(before, 'tenants', (t) => ({ ...t, rows: t.rows.map((r) => r.map((v) => (v === 'Kept' ? 'Changed' : v))) })));
+                        await expect(dir.restore(attempt)).rejects.toThrow(message);
+                        expect(await dir.snapshot()).toEqual(before);
+                    });
+                });
+            }
+            it('twin: the same dump without the refused parts restores', async () => {
+                await using(async (dir, fresh) => {
+                    await dir.restore(withTable(fresh, 'scopes', () => oldScopes(['Dup', 'other'])));
+                    expect(recordsOf(find(await dir.snapshot(), 'scopes')).map((r) => r.slug).sort()).toEqual(['dup', 'other']);
+                });
+            });
+        });
+    });
+}
+//# sourceMappingURL=directory-restore-suite.js.map

package/dist/directory-restore-suite.js.map

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

package/dist/directory-shapes.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Every shape a directory table has had (#1912), as `directoryRestoreSuite` feeds them to a
+ * restore. Read off the history of `DIRECTORY_DDL` (`adapter-cloudflare/src/control-plane-do.ts`)
+ * and of the pure adapter's `applyDirectorySchema`, which built the same column sets within days
+ * of each other, plus one of its own (#1173's scopes): one entry per distinct column set a
+ * `CREATE TABLE` ever produced, with the date, commit and PR that introduced it, the DDL as SQLite stored it (comments dropped) and the columns in
+ * the order a dump lists them. A directory created on that day and never migrated dumps exactly
+ * that; one migrated forward by `ensureDirectoryColumns` dumps the ALTERed-up shapes below.
+ *
+ * Every `NOT NULL` column without a default is present in each table's first shape, and every
+ * later column is nullable or defaulted, so each of these loads by column name into today's table.
+ * The spine's own shapes are #1911's, and not listed here.
+ */
+export interface DirectoryShape {
+    table: string;
+    since: string;
+    ddl: string;
+    columns: string[];
+}
+/** Each table as a `CREATE TABLE` built it, oldest first. */
+export declare const CREATED_SHAPES: readonly DirectoryShape[];
+/**
+ * Each table a directory created on its first day holds after `ensureDirectoryColumns` has
+ * ALTERed it forward: the first shape, with every later column appended in the order the Durable
+ * Object's pass adds them. SQLite appends each `ADD COLUMN` to the stored DDL, so the column order
+ * differs from a table created today, which a load by position would get wrong.
+ */
+export declare const ALTERED_SHAPES: readonly DirectoryShape[];
+//# sourceMappingURL=directory-shapes.d.ts.map

package/dist/directory-shapes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"directory-shapes.d.ts","sourceRoot":"","sources":["../src/directory-shapes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,6DAA6D;AAC7D,eAAO,MAAM,cAAc,EAAE,SAAS,cAAc,EAuLnD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,EAAE,SAAS,cAAc,EA+BnD,CAAC"}