@vrplatform/kysely 1.3.45-stage.5592 → 1.3.45-stage.560

package/build/module/local/index.js

@@ -1,8 +1,9 @@
 import { promises as fs } from 'node:fs';
 import * as path from 'node:path';
 import { PGlite } from '@electric-sql/pglite';
-import { FileMigrationProvider, Migrator } from 'kysely';
+import { FileMigrationProvider, Migrator, sql } from 'kysely';
 import { PGliteDialect } from 'kysely-pglite-dialect';
+import { withControlPlaneSchema } from '../control-plane';
 import { appMigrationEpoch } from '../migration';
 import { getKysely } from '../plugins';
 import { ensureDigestFunction, ensureGenRandomBytesFunction } from './digest';
@@ -10,6 +11,7 @@ export const root = path.join(__dirname, '../..');
 export const dumpPath = path.join(root, '.data.tar');
 async function migrateToLatest(kysely) {
     const migrator = new Migrator({
+        allowUnorderedMigrations: true,
         db: kysely,
         migrationTableSchema: appMigrationEpoch.tableSchema,
         migrationTableName: appMigrationEpoch.tableName,
@@ -25,21 +27,329 @@ async function migrateToLatest(kysely) {
         throw error;
     }
 }
+// Every spec file used to replay this identical bootstrap - migrations, the
+// schema surgery, and the control-plane seed copies - against a freshly loaded
+// snapshot, which measured ~345ms per file against ~185ms for the snapshot load
+// alone. None of it depends on the caller, so it runs once and is cached as a
+// prepared snapshot keyed by everything that determines its content.
+const preparedDumpPrefix = '.data.prepared.';
+let preparedDumpPromise;
+async function preparedDumpKey() {
+    const [snapshot, appMigrations, controlPlaneMigrations] = await Promise.all([
+        fs.stat(dumpPath),
+        fs.readdir(path.join(root, appMigrationEpoch.folder)),
+        fs.readdir(path.join(root, 'control-plane-migrations')),
+    ]);
+    const hasher = new Bun.CryptoHasher('sha256');
+    hasher.update(`${snapshot.size}:${snapshot.mtimeMs}`);
+    hasher.update(appMigrations.sort().join(','));
+    hasher.update(controlPlaneMigrations.sort().join(','));
+    // Source of the bootstrap itself, so editing the surgery rebuilds the
+    // snapshot. Read through toString() rather than the file: this module is also
+    // published as CommonJS, where import.meta is a compile error.
+    for (const step of [
+        buildPreparedDump,
+        migrateToLatest,
+        ensureDigestFunction,
+        ensureGenRandomBytesFunction,
+    ]) {
+        hasher.update(step.toString());
+    }
+    return hasher.digest('hex').slice(0, 16);
+}
+async function resolvePreparedDump() {
+    const key = await preparedDumpKey();
+    const target = path.join(root, `${preparedDumpPrefix}${key}.tar`);
+    const cached = Bun.file(target);
+    if (await cached.exists()) {
+        return cached;
+    }
+    const content = await buildPreparedDump();
+    // Sibling workers build this concurrently on a cold cache; rename is atomic,
+    // so a reader never observes a half-written snapshot.
+    const staging = `${target}.${process.pid}.tmp`;
+    await Bun.write(staging, content);
+    await fs.rename(staging, target);
+    // Only finished snapshots: a sibling worker's staging file also carries the
+    // prefix, and removing it would break its rename.
+    const current = path.basename(target);
+    for (const entry of await fs.readdir(root)) {
+        if (entry.startsWith(preparedDumpPrefix) &&
+            entry.endsWith('.tar') &&
+            entry !== current) {
+            await fs.rm(path.join(root, entry), { force: true });
+        }
+    }
+    return content;
+}
+async function buildPreparedDump() {
+    const pglite = new PGlite({
+        loadDataDir: Bun.file(dumpPath),
+    });
+    const dialect = new PGliteDialect(pglite);
+    const kysely = getKysely(dialect, {
+        repositoryName: 'localTestingPrepare',
+    });
+    await ensureDigestFunction(kysely);
+    await ensureGenRandomBytesFunction(kysely);
+    await migrateToLatest(kysely);
+    await sql `alter schema public rename to regional_public`.execute(kysely);
+    await sql `alter schema core rename to regional_core`.execute(kysely);
+    await sql `create schema public`.execute(kysely);
+    await sql `create schema core`.execute(kysely);
+    const controlPlaneBootstrapKysely = getKysely(dialect, {
+        repositoryName: 'localTestingPrepare/control-plane-bootstrap',
+    });
+    const controlPlaneMigrator = new Migrator({
+        db: controlPlaneBootstrapKysely,
+        migrationTableSchema: 'public',
+        migrationTableName: 'control_plane_kysely_migration',
+        migrationLockTableName: 'control_plane_kysely_migration_lock',
+        provider: new FileMigrationProvider({
+            fs,
+            path,
+            migrationFolder: path.join(root, 'control-plane-migrations'),
+        }),
+    });
+    const { error: controlPlaneMigrationError } = await controlPlaneMigrator.migrateToLatest();
+    if (controlPlaneMigrationError) {
+        throw controlPlaneMigrationError;
+    }
+    await sql `alter table core.flow set schema public`.execute(controlPlaneBootstrapKysely);
+    await sql `alter table core.issue_message_overwrite set schema public`.execute(controlPlaneBootstrapKysely);
+    await sql `drop schema core`.execute(controlPlaneBootstrapKysely);
+    await sql `alter schema public rename to control_plane`.execute(controlPlaneBootstrapKysely);
+    await sql `alter schema regional_public rename to public`.execute(controlPlaneBootstrapKysely);
+    await sql `alter schema regional_core rename to core`.execute(controlPlaneBootstrapKysely);
+    await sql `
+    do $$
+    declare
+      definition text;
+    begin
+      select pg_get_functiondef(
+        'control_plane.normalize_tenant_slug(text)'::regprocedure
+      ) into definition;
+      execute replace(definition, 'public.', 'control_plane.');
+
+      select pg_get_functiondef(
+        'control_plane.build_unique_tenant_slug(text,uuid)'::regprocedure
+      ) into definition;
+      execute replace(definition, 'public.', 'control_plane.');
+
+      select pg_get_functiondef(
+        'control_plane.refresh_operation_state(uuid)'::regprocedure
+      ) into definition;
+      execute replace(definition, 'public.', 'control_plane.');
+
+      select pg_get_functiondef(
+        'control_plane.refresh_destructive_job_operation()'::regprocedure
+      ) into definition;
+      execute replace(definition, 'public.', 'control_plane.');
+    end;
+    $$;
+  `.execute(controlPlaneBootstrapKysely);
+    // The canonical VRPlatform tenant. Production code falls back to this exact id
+    // in getCalculatedBillingPartnerId, so specs need it to exist without each of
+    // them creating - and mutating - their own copy of a shared singleton.
+    await kysely
+        .insertInto('public.tenant')
+        .values({
+        id: '7bfec41f-aa3f-4602-95d2-f7996e4f0e59',
+        name: 'VRPlatform',
+        type: 'partner',
+        status: 'active',
+        isActive: true,
+        isGeneralLedger: false,
+        isOnboarding: false,
+        partnerId: null,
+        billingPartnerId: null,
+        defaultCurrency: 'usd',
+        statementStartAt: new Date('2020-01-01T00:00:00Z'),
+    })
+        .onConflict((oc) => oc.column('id').doNothing())
+        .execute();
+    await sql `
+    insert into control_plane.app (
+      authentication,
+      category,
+      color,
+      created_at,
+      icon,
+      icon_round,
+      id,
+      info,
+      name,
+      type,
+      version
+    )
+    select
+      authentication,
+      category,
+      color,
+      created_at,
+      icon,
+      icon_round,
+      id,
+      info,
+      name,
+      type,
+      version
+    from public.app
+    on conflict (id) do nothing;
+  `.execute(controlPlaneBootstrapKysely);
+    await sql `
+    insert into control_plane.currency (name)
+    select name
+    from public.currency
+    on conflict (name) do nothing;
+  `.execute(controlPlaneBootstrapKysely);
+    await sql `
+    insert into control_plane.booking_channel (
+      channel_ref,
+      color,
+      created_at,
+      icon,
+      icon_provider,
+      id,
+      last_generate_run,
+      logo,
+      logo_provider,
+      selected_booking_channel_icon_candidate_id,
+      selected_booking_channel_logo_candidate_id,
+      unique_ref,
+      updated_at
+    )
+    select
+      channel_ref,
+      color,
+      created_at,
+      icon,
+      icon_provider,
+      id,
+      last_generate_run,
+      logo,
+      logo_provider,
+      selected_booking_channel_icon_candidate_id,
+      selected_booking_channel_logo_candidate_id,
+      unique_ref,
+      updated_at
+    from public.booking_channel
+    on conflict (id) do nothing;
+  `.execute(controlPlaneBootstrapKysely);
+    await sql `
+    insert into control_plane.booking_channel_icon_candidate (
+      booking_channel_id,
+      cloudflare_image_id,
+      color,
+      comment,
+      created_at,
+      external_icon,
+      height,
+      id,
+      provider,
+      source,
+      updated_at,
+      width
+    )
+    select
+      booking_channel_id,
+      cloudflare_image_id,
+      color,
+      comment,
+      created_at,
+      external_icon,
+      height,
+      id,
+      provider,
+      source,
+      updated_at,
+      width
+    from public.booking_channel_icon_candidate
+    on conflict (id) do nothing;
+  `.execute(controlPlaneBootstrapKysely);
+    await sql `
+    insert into control_plane.tenant (
+      billing_partner_id,
+      billing_plan,
+      created_at,
+      data_region,
+      id,
+      name,
+      partner_id,
+      slug,
+      status,
+      storage_realm,
+      type,
+      unique_ref,
+      updated_at
+    )
+    select
+      billing_partner_id,
+      billing_plan,
+      created_at,
+      data_region,
+      id,
+      name,
+      partner_id,
+      slug,
+      status,
+      storage_realm,
+      type,
+      unique_ref,
+      updated_at
+    from public.tenant
+    on conflict (id) do nothing;
+  `.execute(controlPlaneBootstrapKysely);
+    await sql `
+    insert into control_plane.token (
+      created_at,
+      expires_at,
+      id,
+      nano_id,
+      payload,
+      tenant_id,
+      type,
+      user_id
+    )
+    select
+      created_at,
+      expires_at,
+      id,
+      nano_id,
+      payload,
+      tenant_id,
+      type,
+      user_id
+    from public.token
+    on conflict (id) do nothing;
+  `.execute(controlPlaneBootstrapKysely);
+    const content = await pglite.dumpDataDir('none');
+    await kysely.destroy();
+    return content;
+}
 export async function useLocalKysely(args = {}) {
     let isDestroyed = false;
-    // const now = performance.now();
-    const dump = Bun.file(dumpPath);
+    preparedDumpPromise ??= resolvePreparedDump();
     const pglite = new PGlite({
-        loadDataDir: dump,
+        loadDataDir: await preparedDumpPromise,
     });
+    // The constructor is lazy. The bootstrap this replaced forced the snapshot to
+    // load before returning, so keep that contract: a returned handle is usable,
+    // and a bad snapshot fails here instead of inside an unrelated test.
+    await pglite.waitReady;
     const dialect = new PGliteDialect(pglite);
     const kysely = getKysely(dialect, {
         repositoryName: args?.repositoryName ?? 'localTesting',
         log: args?.log,
     });
-    await ensureDigestFunction(kysely);
-    await ensureGenRandomBytesFunction(kysely);
-    await migrateToLatest(kysely);
+    const controlPlaneKysely = withControlPlaneSchema(getKysely(dialect, {
+        repositoryName: `${args.repositoryName ?? 'localTesting'}/control-plane`,
+        log: args.log,
+    }), 'control_plane', 'control_plane');
+    controlPlaneKysely.destroy = async () => { };
+    Object.defineProperty(kysely, 'controlPlaneKysely', {
+        value: controlPlaneKysely,
+    });
     const originalDestroy = kysely.destroy.bind(kysely);
     kysely.destroy = async () => {
         if (isDestroyed)

package/build/module/local/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"src/","sources":["local/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAkB,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAE9E,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;AAOrD,KAAK,UAAU,eAAe,CAAC,MAAmC;IAChE,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC;QAC5B,EAAE,EAAE,MAAM;QACV,oBAAoB,EAAE,iBAAiB,CAAC,WAAW;QACnD,kBAAkB,EAAE,iBAAiB,CAAC,SAAS;QAC/C,sBAAsB,EAAE,iBAAiB,CAAC,aAAa;QACvD,QAAQ,EAAE,IAAI,qBAAqB,CAAC;YAClC,EAAE;YACF,IAAI;YACJ,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;SAC3D,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,QAAQ,CAAC,eAAe,EAAE,CAAC;IACnD,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAA8B,EAAE;IACnE,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,iCAAiC;IAEjC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEhC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE;QAChC,cAAc,EAAE,IAAI,EAAE,cAAc,IAAI,cAAc;QACtD,GAAG,EAAE,IAAI,EAAE,GAAG;KACf,CAAC,CAAC;IACH,MAAM,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,4BAA4B,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,eAAe,CAAC,MAAqC,CAAC,CAAC;IAE7D,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,CAAC,OAAO,GAAG,KAAK,IAAI,EAAE;QAC1B,IAAI,WAAW;YAAE,OAAO;QACxB,WAAW,GAAG,IAAI,CAAC;QACnB,wCAAwC;QACxC,MAAM,eAAe,EAAE,CAAC;QACxB,cAAc;QACd,0EAA0E;QAC1E,IAAI;IACN,CAAC,CAAC;IAEF,iFAAiF;IAEjF,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { promises as fs } from 'node:fs';\nimport * as path from 'node:path';\nimport { PGlite } from '@electric-sql/pglite';\nimport { FileMigrationProvider, type LogConfig, Migrator } from 'kysely';\nimport { PGliteDialect } from 'kysely-pglite-dialect';\nimport { appMigrationEpoch } from '../migration';\nimport { getKysely } from '../plugins';\nimport type { DB } from '../v1.generated';\nimport { ensureDigestFunction, ensureGenRandomBytesFunction } from './digest';\n\nexport const root = path.join(__dirname, '../..');\nexport const dumpPath = path.join(root, '.data.tar');\n\nexport type UseLocalKyselyOptions = {\n  repositoryName?: string;\n  log?: true | LogConfig;\n};\n\nasync function migrateToLatest(kysely: import('kysely').Kysely<DB>) {\n  const migrator = new Migrator({\n    db: kysely,\n    migrationTableSchema: appMigrationEpoch.tableSchema,\n    migrationTableName: appMigrationEpoch.tableName,\n    migrationLockTableName: appMigrationEpoch.lockTableName,\n    provider: new FileMigrationProvider({\n      fs,\n      path,\n      migrationFolder: path.join(root, appMigrationEpoch.folder),\n    }),\n  });\n\n  const { error } = await migrator.migrateToLatest();\n  if (error) {\n    throw error;\n  }\n}\n\nexport async function useLocalKysely(args: UseLocalKyselyOptions = {}) {\n  let isDestroyed = false;\n  // const now = performance.now();\n\n  const dump = Bun.file(dumpPath);\n\n  const pglite = new PGlite({\n    loadDataDir: dump,\n  });\n  const dialect = new PGliteDialect(pglite);\n  const kysely = getKysely(dialect, {\n    repositoryName: args?.repositoryName ?? 'localTesting',\n    log: args?.log,\n  });\n  await ensureDigestFunction(kysely);\n  await ensureGenRandomBytesFunction(kysely);\n  await migrateToLatest(kysely as import('kysely').Kysely<DB>);\n\n  const originalDestroy = kysely.destroy.bind(kysely);\n  kysely.destroy = async () => {\n    if (isDestroyed) return;\n    isDestroyed = true;\n    //const destroyTime = performance.now();\n    await originalDestroy();\n    //console.log(\n    //  `Database destroyed: ${Math.round(performance.now() - destroyTime)}ms`\n    //);\n  };\n\n  // console.log(`Database initialized: ${Math.round(performance.now() - now)}ms`);\n\n  return kysely;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"src/","sources":["local/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { promises as fs } from 'node:fs';\nimport * as path from 'node:path';\nimport { PGlite } from '@electric-sql/pglite';\nimport { FileMigrationProvider, type LogConfig, Migrator, sql } from 'kysely';\nimport { PGliteDialect } from 'kysely-pglite-dialect';\nimport { type ControlPlaneDB, withControlPlaneSchema } from '../control-plane';\nimport type { ControlPlaneKysely } from '../index';\nimport { appMigrationEpoch } from '../migration';\nimport { getKysely } from '../plugins';\nimport type { DB } from '../v1.generated';\nimport { ensureDigestFunction, ensureGenRandomBytesFunction } from './digest';\n\nexport const root = path.join(__dirname, '../..');\nexport const dumpPath = path.join(root, '.data.tar');\n\nexport type UseLocalKyselyOptions = {\n  repositoryName?: string;\n  log?: true | LogConfig;\n};\n\nexport type LocalKysely = import('kysely').Kysely<DB> & {\n  controlPlaneKysely: ControlPlaneKysely;\n};\n\nasync function migrateToLatest<Database>(\n  kysely: import('kysely').Kysely<Database>\n) {\n  const migrator = new Migrator({\n    allowUnorderedMigrations: true,\n    db: kysely,\n    migrationTableSchema: appMigrationEpoch.tableSchema,\n    migrationTableName: appMigrationEpoch.tableName,\n    migrationLockTableName: appMigrationEpoch.lockTableName,\n    provider: new FileMigrationProvider({\n      fs,\n      path,\n      migrationFolder: path.join(root, appMigrationEpoch.folder),\n    }),\n  });\n\n  const { error } = await migrator.migrateToLatest();\n  if (error) {\n    throw error;\n  }\n}\n\n// Every spec file used to replay this identical bootstrap - migrations, the\n// schema surgery, and the control-plane seed copies - against a freshly loaded\n// snapshot, which measured ~345ms per file against ~185ms for the snapshot load\n// alone. None of it depends on the caller, so it runs once and is cached as a\n// prepared snapshot keyed by everything that determines its content.\nconst preparedDumpPrefix = '.data.prepared.';\n\nlet preparedDumpPromise: Promise<Blob> | undefined;\n\nasync function preparedDumpKey(): Promise<string> {\n  const [snapshot, appMigrations, controlPlaneMigrations] = await Promise.all([\n    fs.stat(dumpPath),\n    fs.readdir(path.join(root, appMigrationEpoch.folder)),\n    fs.readdir(path.join(root, 'control-plane-migrations')),\n  ]);\n\n  const hasher = new Bun.CryptoHasher('sha256');\n  hasher.update(`${snapshot.size}:${snapshot.mtimeMs}`);\n  hasher.update(appMigrations.sort().join(','));\n  hasher.update(controlPlaneMigrations.sort().join(','));\n  // Source of the bootstrap itself, so editing the surgery rebuilds the\n  // snapshot. Read through toString() rather than the file: this module is also\n  // published as CommonJS, where import.meta is a compile error.\n  for (const step of [\n    buildPreparedDump,\n    migrateToLatest,\n    ensureDigestFunction,\n    ensureGenRandomBytesFunction,\n  ]) {\n    hasher.update(step.toString());\n  }\n  return hasher.digest('hex').slice(0, 16);\n}\n\nasync function resolvePreparedDump(): Promise<Blob> {\n  const key = await preparedDumpKey();\n  const target = path.join(root, `${preparedDumpPrefix}${key}.tar`);\n  const cached = Bun.file(target);\n  if (await cached.exists()) {\n    return cached;\n  }\n\n  const content = await buildPreparedDump();\n  // Sibling workers build this concurrently on a cold cache; rename is atomic,\n  // so a reader never observes a half-written snapshot.\n  const staging = `${target}.${process.pid}.tmp`;\n  await Bun.write(staging, content);\n  await fs.rename(staging, target);\n\n  // Only finished snapshots: a sibling worker's staging file also carries the\n  // prefix, and removing it would break its rename.\n  const current = path.basename(target);\n  for (const entry of await fs.readdir(root)) {\n    if (\n      entry.startsWith(preparedDumpPrefix) &&\n      entry.endsWith('.tar') &&\n      entry !== current\n    ) {\n      await fs.rm(path.join(root, entry), { force: true });\n    }\n  }\n\n  return content;\n}\n\nasync function buildPreparedDump(): Promise<Blob> {\n  const pglite = new PGlite({\n    loadDataDir: Bun.file(dumpPath),\n  });\n  const dialect = new PGliteDialect(pglite);\n  const kysely = getKysely<DB>(dialect, {\n    repositoryName: 'localTestingPrepare',\n  });\n  await ensureDigestFunction(kysely);\n  await ensureGenRandomBytesFunction(kysely);\n  await migrateToLatest(kysely);\n\n  await sql`alter schema public rename to regional_public`.execute(kysely);\n  await sql`alter schema core rename to regional_core`.execute(kysely);\n  await sql`create schema public`.execute(kysely);\n  await sql`create schema core`.execute(kysely);\n\n  const controlPlaneBootstrapKysely = getKysely<ControlPlaneDB>(dialect, {\n    repositoryName: 'localTestingPrepare/control-plane-bootstrap',\n  });\n  const controlPlaneMigrator = new Migrator({\n    db: controlPlaneBootstrapKysely,\n    migrationTableSchema: 'public',\n    migrationTableName: 'control_plane_kysely_migration',\n    migrationLockTableName: 'control_plane_kysely_migration_lock',\n    provider: new FileMigrationProvider({\n      fs,\n      path,\n      migrationFolder: path.join(root, 'control-plane-migrations'),\n    }),\n  });\n  const { error: controlPlaneMigrationError } =\n    await controlPlaneMigrator.migrateToLatest();\n  if (controlPlaneMigrationError) {\n    throw controlPlaneMigrationError;\n  }\n\n  await sql`alter table core.flow set schema public`.execute(\n    controlPlaneBootstrapKysely\n  );\n  await sql`alter table core.issue_message_overwrite set schema public`.execute(\n    controlPlaneBootstrapKysely\n  );\n  await sql`drop schema core`.execute(controlPlaneBootstrapKysely);\n  await sql`alter schema public rename to control_plane`.execute(\n    controlPlaneBootstrapKysely\n  );\n  await sql`alter schema regional_public rename to public`.execute(\n    controlPlaneBootstrapKysely\n  );\n  await sql`alter schema regional_core rename to core`.execute(\n    controlPlaneBootstrapKysely\n  );\n  await sql`\n    do $$\n    declare\n      definition text;\n    begin\n      select pg_get_functiondef(\n        'control_plane.normalize_tenant_slug(text)'::regprocedure\n      ) into definition;\n      execute replace(definition, 'public.', 'control_plane.');\n\n      select pg_get_functiondef(\n        'control_plane.build_unique_tenant_slug(text,uuid)'::regprocedure\n      ) into definition;\n      execute replace(definition, 'public.', 'control_plane.');\n\n      select pg_get_functiondef(\n        'control_plane.refresh_operation_state(uuid)'::regprocedure\n      ) into definition;\n      execute replace(definition, 'public.', 'control_plane.');\n\n      select pg_get_functiondef(\n        'control_plane.refresh_destructive_job_operation()'::regprocedure\n      ) into definition;\n      execute replace(definition, 'public.', 'control_plane.');\n    end;\n    $$;\n  `.execute(controlPlaneBootstrapKysely);\n  // The canonical VRPlatform tenant. Production code falls back to this exact id\n  // in getCalculatedBillingPartnerId, so specs need it to exist without each of\n  // them creating - and mutating - their own copy of a shared singleton.\n  await kysely\n    .insertInto('public.tenant')\n    .values({\n      id: '7bfec41f-aa3f-4602-95d2-f7996e4f0e59',\n      name: 'VRPlatform',\n      type: 'partner',\n      status: 'active',\n      isActive: true,\n      isGeneralLedger: false,\n      isOnboarding: false,\n      partnerId: null,\n      billingPartnerId: null,\n      defaultCurrency: 'usd',\n      statementStartAt: new Date('2020-01-01T00:00:00Z'),\n    })\n    .onConflict((oc) => oc.column('id').doNothing())\n    .execute();\n\n  await sql`\n    insert into control_plane.app (\n      authentication,\n      category,\n      color,\n      created_at,\n      icon,\n      icon_round,\n      id,\n      info,\n      name,\n      type,\n      version\n    )\n    select\n      authentication,\n      category,\n      color,\n      created_at,\n      icon,\n      icon_round,\n      id,\n      info,\n      name,\n      type,\n      version\n    from public.app\n    on conflict (id) do nothing;\n  `.execute(controlPlaneBootstrapKysely);\n  await sql`\n    insert into control_plane.currency (name)\n    select name\n    from public.currency\n    on conflict (name) do nothing;\n  `.execute(controlPlaneBootstrapKysely);\n  await sql`\n    insert into control_plane.booking_channel (\n      channel_ref,\n      color,\n      created_at,\n      icon,\n      icon_provider,\n      id,\n      last_generate_run,\n      logo,\n      logo_provider,\n      selected_booking_channel_icon_candidate_id,\n      selected_booking_channel_logo_candidate_id,\n      unique_ref,\n      updated_at\n    )\n    select\n      channel_ref,\n      color,\n      created_at,\n      icon,\n      icon_provider,\n      id,\n      last_generate_run,\n      logo,\n      logo_provider,\n      selected_booking_channel_icon_candidate_id,\n      selected_booking_channel_logo_candidate_id,\n      unique_ref,\n      updated_at\n    from public.booking_channel\n    on conflict (id) do nothing;\n  `.execute(controlPlaneBootstrapKysely);\n  await sql`\n    insert into control_plane.booking_channel_icon_candidate (\n      booking_channel_id,\n      cloudflare_image_id,\n      color,\n      comment,\n      created_at,\n      external_icon,\n      height,\n      id,\n      provider,\n      source,\n      updated_at,\n      width\n    )\n    select\n      booking_channel_id,\n      cloudflare_image_id,\n      color,\n      comment,\n      created_at,\n      external_icon,\n      height,\n      id,\n      provider,\n      source,\n      updated_at,\n      width\n    from public.booking_channel_icon_candidate\n    on conflict (id) do nothing;\n  `.execute(controlPlaneBootstrapKysely);\n  await sql`\n    insert into control_plane.tenant (\n      billing_partner_id,\n      billing_plan,\n      created_at,\n      data_region,\n      id,\n      name,\n      partner_id,\n      slug,\n      status,\n      storage_realm,\n      type,\n      unique_ref,\n      updated_at\n    )\n    select\n      billing_partner_id,\n      billing_plan,\n      created_at,\n      data_region,\n      id,\n      name,\n      partner_id,\n      slug,\n      status,\n      storage_realm,\n      type,\n      unique_ref,\n      updated_at\n    from public.tenant\n    on conflict (id) do nothing;\n  `.execute(controlPlaneBootstrapKysely);\n  await sql`\n    insert into control_plane.token (\n      created_at,\n      expires_at,\n      id,\n      nano_id,\n      payload,\n      tenant_id,\n      type,\n      user_id\n    )\n    select\n      created_at,\n      expires_at,\n      id,\n      nano_id,\n      payload,\n      tenant_id,\n      type,\n      user_id\n    from public.token\n    on conflict (id) do nothing;\n  `.execute(controlPlaneBootstrapKysely);\n\n  const content = await pglite.dumpDataDir('none');\n  await kysely.destroy();\n  return content;\n}\n\nexport async function useLocalKysely(\n  args: UseLocalKyselyOptions = {}\n): Promise<LocalKysely> {\n  let isDestroyed = false;\n\n  preparedDumpPromise ??= resolvePreparedDump();\n  const pglite = new PGlite({\n    loadDataDir: await preparedDumpPromise,\n  });\n  // The constructor is lazy. The bootstrap this replaced forced the snapshot to\n  // load before returning, so keep that contract: a returned handle is usable,\n  // and a bad snapshot fails here instead of inside an unrelated test.\n  await pglite.waitReady;\n  const dialect = new PGliteDialect(pglite);\n  const kysely = getKysely<DB>(dialect, {\n    repositoryName: args?.repositoryName ?? 'localTesting',\n    log: args?.log,\n  });\n\n  const controlPlaneKysely = withControlPlaneSchema(\n    getKysely<ControlPlaneDB>(dialect, {\n      repositoryName: `${args.repositoryName ?? 'localTesting'}/control-plane`,\n      log: args.log,\n    }),\n    'control_plane',\n    'control_plane'\n  );\n  controlPlaneKysely.destroy = async () => {};\n  Object.defineProperty(kysely, 'controlPlaneKysely', {\n    value: controlPlaneKysely,\n  });\n\n  const originalDestroy = kysely.destroy.bind(kysely);\n  kysely.destroy = async () => {\n    if (isDestroyed) return;\n    isDestroyed = true;\n    //const destroyTime = performance.now();\n    await originalDestroy();\n    //console.log(\n    //  `Database destroyed: ${Math.round(performance.now() - destroyTime)}ms`\n    //);\n  };\n\n  // console.log(`Database initialized: ${Math.round(performance.now() - now)}ms`);\n\n  return kysely as LocalKysely;\n}\n"]}

package/build/module/postgres-error.d.ts

@@ -1,8 +1,8 @@
 /**
- * Matches PostgreSQL errors from both production's postgres.js driver and
- * PGlite, which expose constraint names under different property names.
+ * Matches PostgreSQL errors by code and, when requested, constraint. Production
+ * postgres.js and PGlite expose constraint names under different properties.
  */
 export declare function isPostgresError(error: unknown, expected: {
     code: string;
-    constraint: string;
+    constraint?: string;
 }): boolean;

package/build/module/postgres-error.js

@@ -1,6 +1,6 @@
 /**
- * Matches PostgreSQL errors from both production's postgres.js driver and
- * PGlite, which expose constraint names under different property names.
+ * Matches PostgreSQL errors by code and, when requested, constraint. Production
+ * postgres.js and PGlite expose constraint names under different properties.
  */
 export function isPostgresError(error, expected) {
     if (!(error instanceof Error) ||
@@ -13,6 +13,7 @@ export function isPostgresError(error, expected) {
         : 'constraint_name' in error && typeof error.constraint_name === 'string'
             ? error.constraint_name
             : undefined;
-    return error.code === expected.code && constraint === expected.constraint;
+    return (error.code === expected.code &&
+        (expected.constraint === undefined || constraint === expected.constraint));
 }
 //# sourceMappingURL=postgres-error.js.map

package/build/module/postgres-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-error.js","sourceRoot":"src/","sources":["postgres-error.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,eAAe,CAC7B,KAAc,EACd,QAA8C;IAE9C,IACE,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC;QACzB,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC;QAClB,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAC9B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,UAAU,GACd,YAAY,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ;QAC3D,CAAC,CAAC,KAAK,CAAC,UAAU;QAClB,CAAC,CAAC,iBAAiB,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,eAAe,KAAK,QAAQ;YACvE,CAAC,CAAC,KAAK,CAAC,eAAe;YACvB,CAAC,CAAC,SAAS,CAAC;IAElB,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,IAAI,UAAU,KAAK,QAAQ,CAAC,UAAU,CAAC;AAC5E,CAAC","sourcesContent":["/**\n * Matches PostgreSQL errors from both production's postgres.js driver and\n * PGlite, which expose constraint names under different property names.\n */\nexport function isPostgresError(\n  error: unknown,\n  expected: { code: string; constraint: string }\n): boolean {\n  if (\n    !(error instanceof Error) ||\n    !('code' in error) ||\n    typeof error.code !== 'string'\n  ) {\n    return false;\n  }\n\n  const constraint =\n    'constraint' in error && typeof error.constraint === 'string'\n      ? error.constraint\n      : 'constraint_name' in error && typeof error.constraint_name === 'string'\n        ? error.constraint_name\n        : undefined;\n\n  return error.code === expected.code && constraint === expected.constraint;\n}\n"]}
+{"version":3,"file":"postgres-error.js","sourceRoot":"src/","sources":["postgres-error.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,eAAe,CAC7B,KAAc,EACd,QAA+C;IAE/C,IACE,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC;QACzB,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC;QAClB,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAC9B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,UAAU,GACd,YAAY,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ;QAC3D,CAAC,CAAC,KAAK,CAAC,UAAU;QAClB,CAAC,CAAC,iBAAiB,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,eAAe,KAAK,QAAQ;YACvE,CAAC,CAAC,KAAK,CAAC,eAAe;YACvB,CAAC,CAAC,SAAS,CAAC;IAElB,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI;QAC5B,CAAC,QAAQ,CAAC,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,QAAQ,CAAC,UAAU,CAAC,CAC1E,CAAC;AACJ,CAAC","sourcesContent":["/**\n * Matches PostgreSQL errors by code and, when requested, constraint. Production\n * postgres.js and PGlite expose constraint names under different properties.\n */\nexport function isPostgresError(\n  error: unknown,\n  expected: { code: string; constraint?: string }\n): boolean {\n  if (\n    !(error instanceof Error) ||\n    !('code' in error) ||\n    typeof error.code !== 'string'\n  ) {\n    return false;\n  }\n\n  const constraint =\n    'constraint' in error && typeof error.constraint === 'string'\n      ? error.constraint\n      : 'constraint_name' in error && typeof error.constraint_name === 'string'\n        ? error.constraint_name\n        : undefined;\n\n  return (\n    error.code === expected.code &&\n    (expected.constraint === undefined || constraint === expected.constraint)\n  );\n}\n"]}

package/build/module/query/listing/status.js

@@ -1,16 +1,12 @@
 import { day } from '@vrplatform/utils';
 import { sql } from '../../isomorphic';
+import { whereTenantActive } from '../tenant/status';
 function hasActiveListing(eb, today) {
     return eb.exists(eb
         .selectFrom('public.tenant as tenant')
-        .leftJoin('public.tenant as billingPartner', 'billingPartner.id', 'tenant.calculatedBillingPartnerId')
         .select('tenant.id')
         .whereRef('tenant.id', '=', 'l.tenantId')
-        .where('tenant.calculatedStatus', '=', 'active')
-        .where((eb2) => eb2.or([
-        eb2('tenant.calculatedBillingPartnerId', 'is', null),
-        eb2('billingPartner.calculatedStatus', '=', 'active'),
-    ]))
+        .where(whereTenantActive)
         .where((eb2) => eb2.or([
         eb2.and([
             eb2('tenant.isGeneralLedger', '=', false),

package/build/module/query/listing/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"src/","sources":["query/listing/status.ts"],"names":[],"mappings":"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","sourcesContent":["import { day } from '@vrplatform/utils';\nimport type { DB, ExpressionBuilder, PublicListing } from '../../isomorphic';\nimport { sql } from '../../isomorphic';\n\nfunction hasActiveListing(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string\n) {\n  return eb.exists(\n    eb\n      .selectFrom('public.tenant as tenant')\n      .leftJoin(\n        'public.tenant as billingPartner',\n        'billingPartner.id',\n        'tenant.calculatedBillingPartnerId'\n      )\n      .select('tenant.id')\n      .whereRef('tenant.id', '=', 'l.tenantId')\n      .where('tenant.calculatedStatus', '=', 'active')\n      .where((eb2) =>\n        eb2.or([\n          eb2('tenant.calculatedBillingPartnerId', 'is', null),\n          eb2('billingPartner.calculatedStatus', '=', 'active'),\n        ])\n      )\n      .where((eb2) =>\n        eb2.or([\n          eb2.and([\n            eb2('tenant.isGeneralLedger', '=', false),\n            eb('l.calculatedStatus', '=', 'active'),\n          ]),\n          eb2.and([\n            eb2('tenant.isGeneralLedger', '=', true),\n            eb.not(hasInactiveOwnership(eb, today)),\n          ]),\n        ])\n      )\n      .limit(1)\n  );\n}\n\nfunction hasInactiveOwnership(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string\n) {\n  const onDate = day(today).toDate();\n  return eb.exists(\n    eb\n      .selectFrom('public.listingOwnershipPeriod as lop')\n      .select('lop.id')\n      .where(\n        'lop.listingId',\n        '=',\n        sql<string>`coalesce(${sql.ref('l.parentId')}, ${sql.ref('l.id')})`\n      )\n      .whereRef('lop.tenantId', '=', 'l.tenantId')\n      .where('lop.setListingInactive', '=', true)\n      .where((eb2) =>\n        eb2.or([\n          eb2.and([\n            eb2('lop.startAt', '<=', onDate),\n            eb2('lop.endAt', '>=', onDate),\n          ]),\n          eb2.and([\n            eb2('lop.startAt', '<=', onDate),\n            eb2('lop.endAt', 'is', null),\n          ]),\n        ])\n      )\n      .limit(1)\n  );\n}\n\nfunction hasInactiveListing(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string\n) {\n  return eb.exists(\n    eb\n      .selectFrom('public.tenant as tenant')\n      .select('tenant.id')\n      .whereRef('tenant.id', '=', 'l.tenantId')\n      .where((eb2) =>\n        eb2.or([\n          eb2.and([\n            eb2('tenant.isGeneralLedger', '=', false),\n            eb('l.calculatedStatus', '=', 'inactive'),\n          ]),\n          eb2.and([\n            eb2('tenant.isGeneralLedger', '=', true),\n            hasInactiveOwnership(eb, today),\n          ]),\n        ])\n      )\n  );\n}\n\nexport function whereListingIsInactive(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string = day().yyyymmdd()\n) {\n  return hasInactiveListing(eb, today);\n}\n\nexport function whereListingIsActive(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string = day().yyyymmdd()\n) {\n  return hasActiveListing(eb, today);\n}\n\nexport function selectListingStatus(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string = day().yyyymmdd()\n) {\n  return eb\n    .case()\n    .when(whereListingIsInactive(eb, today))\n    .then('inactive')\n    .else('active')\n    .end();\n}\n"]}
+{"version":3,"file":"status.js","sourceRoot":"src/","sources":["query/listing/status.ts"],"names":[],"mappings":"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","sourcesContent":["import { day } from '@vrplatform/utils';\nimport type { DB, ExpressionBuilder, PublicListing } from '../../isomorphic';\nimport { sql } from '../../isomorphic';\nimport { whereTenantActive } from '../tenant/status';\n\nfunction hasActiveListing(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string\n) {\n  return eb.exists(\n    eb\n      .selectFrom('public.tenant as tenant')\n      .select('tenant.id')\n      .whereRef('tenant.id', '=', 'l.tenantId')\n      .where(whereTenantActive)\n      .where((eb2) =>\n        eb2.or([\n          eb2.and([\n            eb2('tenant.isGeneralLedger', '=', false),\n            eb('l.calculatedStatus', '=', 'active'),\n          ]),\n          eb2.and([\n            eb2('tenant.isGeneralLedger', '=', true),\n            eb.not(hasInactiveOwnership(eb, today)),\n          ]),\n        ])\n      )\n      .limit(1)\n  );\n}\n\nfunction hasInactiveOwnership(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string\n) {\n  const onDate = day(today).toDate();\n  return eb.exists(\n    eb\n      .selectFrom('public.listingOwnershipPeriod as lop')\n      .select('lop.id')\n      .where(\n        'lop.listingId',\n        '=',\n        sql<string>`coalesce(${sql.ref('l.parentId')}, ${sql.ref('l.id')})`\n      )\n      .whereRef('lop.tenantId', '=', 'l.tenantId')\n      .where('lop.setListingInactive', '=', true)\n      .where((eb2) =>\n        eb2.or([\n          eb2.and([\n            eb2('lop.startAt', '<=', onDate),\n            eb2('lop.endAt', '>=', onDate),\n          ]),\n          eb2.and([\n            eb2('lop.startAt', '<=', onDate),\n            eb2('lop.endAt', 'is', null),\n          ]),\n        ])\n      )\n      .limit(1)\n  );\n}\n\nfunction hasInactiveListing(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string\n) {\n  return eb.exists(\n    eb\n      .selectFrom('public.tenant as tenant')\n      .select('tenant.id')\n      .whereRef('tenant.id', '=', 'l.tenantId')\n      .where((eb2) =>\n        eb2.or([\n          eb2.and([\n            eb2('tenant.isGeneralLedger', '=', false),\n            eb('l.calculatedStatus', '=', 'inactive'),\n          ]),\n          eb2.and([\n            eb2('tenant.isGeneralLedger', '=', true),\n            hasInactiveOwnership(eb, today),\n          ]),\n        ])\n      )\n  );\n}\n\nexport function whereListingIsInactive(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string = day().yyyymmdd()\n) {\n  return hasInactiveListing(eb, today);\n}\n\nexport function whereListingIsActive(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string = day().yyyymmdd()\n) {\n  return hasActiveListing(eb, today);\n}\n\nexport function selectListingStatus(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string = day().yyyymmdd()\n) {\n  return eb\n    .case()\n    .when(whereListingIsInactive(eb, today))\n    .then('inactive')\n    .else('active')\n    .end();\n}\n"]}

package/build/module/query/tenant/status.d.ts

@@ -1,17 +1,14 @@
-import type { DB, ExpressionBuilder, PublicTenant } from '../../isomorphic';
+import { type DB, type ExpressionBuilder, type PublicTenant, type SqlBool } from '../../isomorphic';
 type TenantExpressionBuilder = ExpressionBuilder<DB & {
     tenant: PublicTenant;
 }, 'tenant'>;
 export declare function whereTenantActive(eb: TenantExpressionBuilder): import("kysely").ExpressionWrapper<DB & {
     tenant: PublicTenant;
-}, "tenant", import("kysely/dist/cjs/util/type-utils").SqlBool>;
-export declare function whereTenantNotTestTeam(eb: TenantExpressionBuilder, testTeamId: string): import("kysely").ExpressionWrapper<DB & {
-    tenant: PublicTenant;
-}, "tenant", import("kysely/dist/cjs/util/type-utils").SqlBool>;
-export declare function whereTenantShouldBePaid(eb: TenantExpressionBuilder, { includePartnerTeams, today, }?: {
+}, "tenant", SqlBool>;
+export declare function whereTenantNotTestTeam(testTeamId: string): import("kysely").RawBuilder<SqlBool>;
+export declare function whereTenantShouldBePaid(eb: TenantExpressionBuilder, { includePartnerTeams, }?: {
     includePartnerTeams?: boolean;
-    today?: Date | string;
 }): import("kysely").ExpressionWrapper<DB & {
     tenant: PublicTenant;
-}, "tenant", import("kysely/dist/cjs/util/type-utils").SqlBool>;
+}, "tenant", SqlBool>;
 export {};

package/build/module/query/tenant/status.js

@@ -1,36 +1,32 @@
-import { day } from '@vrplatform/utils';
+import { sql, } from '../../isomorphic';
 import { getCalculatedBillingPartnerId } from './billing-partner';
 export function whereTenantActive(eb) {
     return eb.and([
         eb('tenant.calculatedStatus', '=', 'active'),
-        eb.exists(eb
+        eb.not(eb.exists(eb
             .selectFrom('public.tenant as billingPartner')
             .select('billingPartner.id')
             .where('billingPartner.id', '=', eb.fn.coalesce('tenant.calculatedBillingPartnerId', eb.val(getCalculatedBillingPartnerId({}))))
-            .where('billingPartner.calculatedStatus', '=', 'active')),
+            .where('billingPartner.calculatedStatus', 'is distinct from', 'active'))),
     ]);
 }
-export function whereTenantNotTestTeam(eb, testTeamId) {
-    return eb.and([
-        eb('tenant.id', '!=', testTeamId),
-        eb.or([
-            eb('tenant.partnerId', 'is', null),
-            eb('tenant.partnerId', '!=', testTeamId),
-        ]),
-        eb.or([
-            eb('tenant.billingPartnerId', 'is', null),
-            eb('tenant.billingPartnerId', '!=', testTeamId),
-        ]),
-    ]);
+export function whereTenantNotTestTeam(testTeamId) {
+    return sql `(
+    ${sql.ref('tenant.id')} != ${testTeamId}
+    and (
+      ${sql.ref('tenant.partnerId')} is null
+      or ${sql.ref('tenant.partnerId')} != ${testTeamId}
+    )
+    and (
+      ${sql.ref('tenant.billingPartnerId')} is null
+      or ${sql.ref('tenant.billingPartnerId')} != ${testTeamId}
+    )
+  )`;
 }
-export function whereTenantShouldBePaid(eb, { includePartnerTeams = false, today = day().yyyymmdd(), } = {}) {
+export function whereTenantShouldBePaid(eb, { includePartnerTeams = false, } = {}) {
     return eb.and([
         whereTenantActive(eb),
         eb('tenant.isOnboarding', '=', false),
-        eb.or([
-            eb('tenant.trialUntil', '<', today),
-            eb('tenant.trialUntil', 'is', null),
-        ]),
         ...(includePartnerTeams
             ? []
             : [eb('tenant.calculatedIsBillable', '=', true)]),

package/build/module/query/tenant/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"src/","sources":["query/tenant/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAOlE,MAAM,UAAU,iBAAiB,CAAC,EAA2B;IAC3D,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE,QAAQ,CAAC;QAC5C,EAAE,CAAC,MAAM,CACP,EAAE;aACC,UAAU,CAAC,iCAAiC,CAAC;aAC7C,MAAM,CAAC,mBAAmB,CAAC;aAC3B,KAAK,CACJ,mBAAmB,EACnB,GAAG,EACH,EAAE,CAAC,EAAE,CAAC,QAAQ,CACZ,mCAAmC,EACnC,EAAE,CAAC,GAAG,CAAC,6BAA6B,CAAC,EAAE,CAAC,CAAC,CAC1C,CACF;aACA,KAAK,CAAC,iCAAiC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAC3D;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,EAA2B,EAC3B,UAAkB;IAElB,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,UAAU,CAAC;QACjC,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,kBAAkB,EAAE,IAAI,EAAE,IAAI,CAAC;YAClC,EAAE,CAAC,kBAAkB,EAAE,IAAI,EAAE,UAAU,CAAC;SACzC,CAAC;QACF,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,yBAAyB,EAAE,IAAI,EAAE,IAAI,CAAC;YACzC,EAAE,CAAC,yBAAyB,EAAE,IAAI,EAAE,UAAU,CAAC;SAChD,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,EAA2B,EAC3B,EACE,mBAAmB,GAAG,KAAK,EAC3B,KAAK,GAAG,GAAG,EAAE,CAAC,QAAQ,EAAE,MAItB,EAAE;IAEN,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,iBAAiB,CAAC,EAAE,CAAC;QACrB,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE,KAAK,CAAC;QACrC,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE,KAAK,CAAC;YACnC,EAAE,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,CAAC;SACpC,CAAC;QACF,GAAG,CAAC,mBAAmB;YACrB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;KACpD,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { day } from '@vrplatform/utils';\nimport type { DB, ExpressionBuilder, PublicTenant } from '../../isomorphic';\nimport { getCalculatedBillingPartnerId } from './billing-partner';\n\ntype TenantExpressionBuilder = ExpressionBuilder<\n  DB & { tenant: PublicTenant },\n  'tenant'\n>;\n\nexport function whereTenantActive(eb: TenantExpressionBuilder) {\n  return eb.and([\n    eb('tenant.calculatedStatus', '=', 'active'),\n    eb.exists(\n      eb\n        .selectFrom('public.tenant as billingPartner')\n        .select('billingPartner.id')\n        .where(\n          'billingPartner.id',\n          '=',\n          eb.fn.coalesce(\n            'tenant.calculatedBillingPartnerId',\n            eb.val(getCalculatedBillingPartnerId({}))\n          )\n        )\n        .where('billingPartner.calculatedStatus', '=', 'active')\n    ),\n  ]);\n}\n\nexport function whereTenantNotTestTeam(\n  eb: TenantExpressionBuilder,\n  testTeamId: string\n) {\n  return eb.and([\n    eb('tenant.id', '!=', testTeamId),\n    eb.or([\n      eb('tenant.partnerId', 'is', null),\n      eb('tenant.partnerId', '!=', testTeamId),\n    ]),\n    eb.or([\n      eb('tenant.billingPartnerId', 'is', null),\n      eb('tenant.billingPartnerId', '!=', testTeamId),\n    ]),\n  ]);\n}\n\nexport function whereTenantShouldBePaid(\n  eb: TenantExpressionBuilder,\n  {\n    includePartnerTeams = false,\n    today = day().yyyymmdd(),\n  }: {\n    includePartnerTeams?: boolean;\n    today?: Date | string;\n  } = {}\n) {\n  return eb.and([\n    whereTenantActive(eb),\n    eb('tenant.isOnboarding', '=', false),\n    eb.or([\n      eb('tenant.trialUntil', '<', today),\n      eb('tenant.trialUntil', 'is', null),\n    ]),\n    ...(includePartnerTeams\n      ? []\n      : [eb('tenant.calculatedIsBillable', '=', true)]),\n  ]);\n}\n"]}
+{"version":3,"file":"status.js","sourceRoot":"src/","sources":["query/tenant/status.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,GAKJ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAOlE,MAAM,UAAU,iBAAiB,CAAC,EAA2B;IAC3D,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE,QAAQ,CAAC;QAC5C,EAAE,CAAC,GAAG,CACJ,EAAE,CAAC,MAAM,CACP,EAAE;aACC,UAAU,CAAC,iCAAiC,CAAC;aAC7C,MAAM,CAAC,mBAAmB,CAAC;aAC3B,KAAK,CACJ,mBAAmB,EACnB,GAAG,EACH,EAAE,CAAC,EAAE,CAAC,QAAQ,CACZ,mCAAmC,EACnC,EAAE,CAAC,GAAG,CAAC,6BAA6B,CAAC,EAAE,CAAC,CAAC,CAC1C,CACF;aACA,KAAK,CACJ,iCAAiC,EACjC,kBAAkB,EAClB,QAAQ,CACT,CACJ,CACF;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,UAAkB;IACvD,OAAO,GAAG,CAAS;MACf,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,UAAU;;QAEnC,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC;WACxB,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,OAAO,UAAU;;;QAG/C,GAAG,CAAC,GAAG,CAAC,yBAAyB,CAAC;WAC/B,GAAG,CAAC,GAAG,CAAC,yBAAyB,CAAC,OAAO,UAAU;;IAE1D,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,EAA2B,EAC3B,EACE,mBAAmB,GAAG,KAAK,MAGzB,EAAE;IAEN,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,iBAAiB,CAAC,EAAE,CAAC;QACrB,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE,KAAK,CAAC;QACrC,GAAG,CAAC,mBAAmB;YACrB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;KACpD,CAAC,CAAC;AACL,CAAC","sourcesContent":["import {\n  sql,\n  type DB,\n  type ExpressionBuilder,\n  type PublicTenant,\n  type SqlBool,\n} from '../../isomorphic';\nimport { getCalculatedBillingPartnerId } from './billing-partner';\n\ntype TenantExpressionBuilder = ExpressionBuilder<\n  DB & { tenant: PublicTenant },\n  'tenant'\n>;\n\nexport function whereTenantActive(eb: TenantExpressionBuilder) {\n  return eb.and([\n    eb('tenant.calculatedStatus', '=', 'active'),\n    eb.not(\n      eb.exists(\n        eb\n          .selectFrom('public.tenant as billingPartner')\n          .select('billingPartner.id')\n          .where(\n            'billingPartner.id',\n            '=',\n            eb.fn.coalesce(\n              'tenant.calculatedBillingPartnerId',\n              eb.val(getCalculatedBillingPartnerId({}))\n            )\n          )\n          .where(\n            'billingPartner.calculatedStatus',\n            'is distinct from',\n            'active'\n          )\n      )\n    ),\n  ]);\n}\n\nexport function whereTenantNotTestTeam(testTeamId: string) {\n  return sql<SqlBool>`(\n    ${sql.ref('tenant.id')} != ${testTeamId}\n    and (\n      ${sql.ref('tenant.partnerId')} is null\n      or ${sql.ref('tenant.partnerId')} != ${testTeamId}\n    )\n    and (\n      ${sql.ref('tenant.billingPartnerId')} is null\n      or ${sql.ref('tenant.billingPartnerId')} != ${testTeamId}\n    )\n  )`;\n}\n\nexport function whereTenantShouldBePaid(\n  eb: TenantExpressionBuilder,\n  {\n    includePartnerTeams = false,\n  }: {\n    includePartnerTeams?: boolean;\n  } = {}\n) {\n  return eb.and([\n    whereTenantActive(eb),\n    eb('tenant.isOnboarding', '=', false),\n    ...(includePartnerTeams\n      ? []\n      : [eb('tenant.calculatedIsBillable', '=', true)]),\n  ]);\n}\n"]}

package/build/module/regional.d.ts

@@ -1,4 +1,4 @@
-import type { Kysely } from './index';
+import type { ControlPlaneKysely, Kysely } from './index';
 export declare const tenantDataRegions: readonly ["ap", "crunchy", "eu", "hostaway", "us"];
 export type TenantDataRegion = (typeof tenantDataRegions)[number];
 export type RegionEnvironment = Record<string, string | undefined>;
@@ -7,9 +7,14 @@ export declare function resolveTenantDatabaseUrl(dataRegion: TenantDataRegion, e
 export declare function resolveTenantApiBaseUrl(dataRegion: TenantDataRegion, env: RegionEnvironment): string;
 export declare function resolveConfiguredTenantDataRegions(env: RegionEnvironment): ("ap" | "crunchy" | "eu" | "hostaway" | "us")[];
 type UseAsyncRegionalKysely = (connectionString: string, options?: {
+    dataRegion?: TenantDataRegion;
     repositoryName?: string;
     probe?: true;
 }) => Promise<Kysely>;
+type UseAsyncControlPlaneKysely = (connectionString: string, options?: {
+    repositoryName?: string;
+    probe?: true;
+}) => Promise<ControlPlaneKysely>;
 export declare function useTenantDatabaseKysely(dataRegion: TenantDataRegion, repositoryName: string, env: RegionEnvironment, options?: {
     useAsyncKysely?: UseAsyncRegionalKysely;
     probe?: true;
@@ -32,6 +37,7 @@ export declare function resolveTenantKysely({ connectionId, slug, tenantId, repo
     tenantId?: string;
     repositoryName: string;
     env: RegionEnvironment;
+    useAsyncControlPlaneKysely?: UseAsyncControlPlaneKysely;
     useAsyncKysely?: UseAsyncRegionalKysely;
     probe?: true;
 }): Promise<TenantKysely>;