@vrplatform/kysely 1.3.45-4998 → 1.3.45-5

package/build/main/local/index.js

@@ -40,6 +40,8 @@ const path = __importStar(require("node:path"));
 const pglite_1 = require("@electric-sql/pglite");
 const kysely_1 = require("kysely");
 const kysely_pglite_dialect_1 = require("kysely-pglite-dialect");
+const control_plane_1 = require("../control-plane");
+const migration_1 = require("../migration");
 const plugins_1 = require("../plugins");
 const digest_1 = require("./digest");
 exports.root = path.join(__dirname, '../..');
@@ -47,13 +49,13 @@ exports.dumpPath = path.join(exports.root, '.data.tar');
 async function migrateToLatest(kysely) {
     const migrator = new kysely_1.Migrator({
         db: kysely,
-        migrationTableSchema: 'core',
-        migrationTableName: 'kysely_migration',
-        migrationLockTableName: 'kysely_migration_lock',
+        migrationTableSchema: migration_1.appMigrationEpoch.tableSchema,
+        migrationTableName: migration_1.appMigrationEpoch.tableName,
+        migrationLockTableName: migration_1.appMigrationEpoch.lockTableName,
         provider: new kysely_1.FileMigrationProvider({
             fs: node_fs_1.promises,
             path,
-            migrationFolder: path.join(exports.root, 'migrations'),
+            migrationFolder: path.join(exports.root, migration_1.appMigrationEpoch.folder),
         }),
     });
     const { error } = await migrator.migrateToLatest();
@@ -76,6 +78,214 @@ async function useLocalKysely(args = {}) {
     await (0, digest_1.ensureDigestFunction)(kysely);
     await (0, digest_1.ensureGenRandomBytesFunction)(kysely);
     await migrateToLatest(kysely);
+    await (0, kysely_1.sql) `alter schema public rename to regional_public`.execute(kysely);
+    await (0, kysely_1.sql) `alter schema core rename to regional_core`.execute(kysely);
+    await (0, kysely_1.sql) `create schema public`.execute(kysely);
+    await (0, kysely_1.sql) `create schema core`.execute(kysely);
+    const controlPlaneBootstrapKysely = (0, plugins_1.getKysely)(dialect, {
+        repositoryName: `${args.repositoryName ?? 'localTesting'}/control-plane-bootstrap`,
+    });
+    const controlPlaneMigrator = new kysely_1.Migrator({
+        db: controlPlaneBootstrapKysely,
+        migrationTableSchema: 'public',
+        migrationTableName: 'control_plane_kysely_migration',
+        migrationLockTableName: 'control_plane_kysely_migration_lock',
+        provider: new kysely_1.FileMigrationProvider({
+            fs: node_fs_1.promises,
+            path,
+            migrationFolder: path.join(exports.root, 'control-plane-migrations'),
+        }),
+    });
+    const { error: controlPlaneMigrationError } = await controlPlaneMigrator.migrateToLatest();
+    if (controlPlaneMigrationError) {
+        throw controlPlaneMigrationError;
+    }
+    await (0, kysely_1.sql) `alter table core.flow set schema public`.execute(controlPlaneBootstrapKysely);
+    await (0, kysely_1.sql) `alter table core.issue_message_overwrite set schema public`.execute(controlPlaneBootstrapKysely);
+    await (0, kysely_1.sql) `drop schema core`.execute(controlPlaneBootstrapKysely);
+    await (0, kysely_1.sql) `alter schema public rename to control_plane`.execute(controlPlaneBootstrapKysely);
+    await (0, kysely_1.sql) `alter schema regional_public rename to public`.execute(controlPlaneBootstrapKysely);
+    await (0, kysely_1.sql) `alter schema regional_core rename to core`.execute(controlPlaneBootstrapKysely);
+    await (0, kysely_1.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.');
+    end;
+    $$;
+  `.execute(controlPlaneBootstrapKysely);
+    await (0, kysely_1.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 (0, kysely_1.sql) `
+    insert into control_plane.currency (name)
+    select name
+    from public.currency
+    on conflict (name) do nothing;
+  `.execute(controlPlaneBootstrapKysely);
+    await (0, kysely_1.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 (0, kysely_1.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 (0, kysely_1.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 (0, kysely_1.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 controlPlaneKysely = (0, control_plane_1.withControlPlaneSchema)((0, plugins_1.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/main/local/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"src/","sources":["local/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoCA,wCAgCC;AApED,qCAAyC;AACzC,gDAAkC;AAClC,iDAA8C;AAC9C,mCAAyE;AACzE,iEAAsD;AACtD,wCAAuC;AAEvC,qCAA8E;AAEjE,QAAA,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACrC,QAAA,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,YAAI,EAAE,WAAW,CAAC,CAAC;AAOrD,KAAK,UAAU,eAAe,CAAC,MAAmC;IAChE,MAAM,QAAQ,GAAG,IAAI,iBAAQ,CAAC;QAC5B,EAAE,EAAE,MAAM;QACV,oBAAoB,EAAE,MAAM;QAC5B,kBAAkB,EAAE,kBAAkB;QACtC,sBAAsB,EAAE,uBAAuB;QAC/C,QAAQ,EAAE,IAAI,8BAAqB,CAAC;YAClC,EAAE,EAAF,kBAAE;YACF,IAAI;YACJ,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,YAAI,EAAE,YAAY,CAAC;SAC/C,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;AAEM,KAAK,UAAU,cAAc,CAAC,OAA8B,EAAE;IACnE,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,iCAAiC;IAEjC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,gBAAQ,CAAC,CAAC;IAEhC,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC;QACxB,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAI,qCAAa,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAA,mBAAS,EAAC,OAAO,EAAE;QAChC,cAAc,EAAE,IAAI,EAAE,cAAc,IAAI,cAAc;QACtD,GAAG,EAAE,IAAI,EAAE,GAAG;KACf,CAAC,CAAC;IACH,MAAM,IAAA,6BAAoB,EAAC,MAAM,CAAC,CAAC;IACnC,MAAM,IAAA,qCAA4B,EAAC,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 { 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: 'core',\n    migrationTableName: 'kysely_migration',\n    migrationLockTableName: 'kysely_migration_lock',\n    provider: new FileMigrationProvider({\n      fs,\n      path,\n      migrationFolder: path.join(root, 'migrations'),\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    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(\n  args: UseLocalKyselyOptions = {}\n): Promise<LocalKysely> {\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<DB>(dialect, {\n    repositoryName: args?.repositoryName ?? 'localTesting',\n    log: args?.log,\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: `${args.repositoryName ?? 'localTesting'}/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    end;\n    $$;\n  `.execute(controlPlaneBootstrapKysely);\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 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/main/local/prune-pulled-schema.js

@@ -9,6 +9,7 @@ exports.prunePulledSchemaFile = prunePulledSchemaFile;
 exports.prunePulledSchema = prunePulledSchema;
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
+const error_1 = require("../error");
 const START_MARKER = '-- VRP legacy-column-prune:start';
 const END_MARKER = '-- VRP legacy-column-prune:end';
 const hasuraAuditTriggerPattern = /^CREATE TRIGGER "(notify_hasura_audit_[^"]+)" [\s\S]*? ON ([^\s;]+) FOR EACH ROW EXECUTE FUNCTION hdb_catalog\."notify_hasura_audit_[^"]+"\(\);$/gm;
@@ -118,7 +119,9 @@ function applyPruneBlock(sql, columns) {
     if (startAt !== -1) {
         const endAt = sql.indexOf(END_MARKER, startAt);
         if (endAt === -1) {
-            throw new Error(`Malformed legacy prune block in initial SQL: missing "${END_MARKER}".`);
+            throw new error_1.KyselyError('Malformed legacy prune block in initial SQL', {
+                missingMarker: END_MARKER,
+            });
         }
         const tailStart = endAt + END_MARKER.length;
         const afterTail = sql.slice(tailStart).replace(/^\s*\n/, '');

package/build/main/local/prune-pulled-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"prune-pulled-schema.js","sourceRoot":"src/","sources":["local/prune-pulled-schema.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile, writeFile } from 'node:fs/promises';\nimport { join } from 'node:path';\n\nconst START_MARKER = '-- VRP legacy-column-prune:start';\nconst END_MARKER = '-- VRP legacy-column-prune:end';\n\nexport type LegacyColumnPrune = {\n  table: `${string}.${string}`;\n  column: string;\n  issue: string;\n};\n\nconst hasuraAuditTriggerPattern =\n  /^CREATE TRIGGER \"(notify_hasura_audit_[^\"]+)\" [\\s\\S]*? ON ([^\\s;]+) FOR EACH ROW EXECUTE FUNCTION hdb_catalog\\.\"notify_hasura_audit_[^\"]+\"\\(\\);$/gm;\n\nexport type HasuraAuditTrigger = {\n  name: string;\n  table: `${string}.${string}`;\n};\n\n/**\n * Active removals currently validated by runtime + type usage.\n * Add new entries here incrementally to surface compile/runtime callers.\n */\nexport const activeLegacyColumnPrunes: LegacyColumnPrune[] = [\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'fly_app',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'default_machine_size',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'endpoint',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'uid',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'plugin_data',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'config',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'flows',\n  },\n  {\n    issue: 'PRO-12855',\n    table: 'public.owner_statement',\n    column: 'cent_accounting_balance_start',\n  },\n  {\n    issue: 'PRO-12855',\n    table: 'public.owner_statement',\n    column: 'cent_accounting_balance_end',\n  },\n  {\n    issue: 'PRO-12855',\n    table: 'accounting.contact',\n    column: 'pms_status',\n  },\n  {\n    issue: 'PRO-12855',\n    table: 'public.owner',\n    column: 'pms_status',\n  },\n];\n\nexport function extractHasuraAuditTriggers(sql: string): HasuraAuditTrigger[] {\n  const unique = new Map<string, HasuraAuditTrigger>();\n\n  for (const match of sql.matchAll(hasuraAuditTriggerPattern)) {\n    const name = match[1];\n    const table = match[2] as `${string}.${string}`;\n    const key = `${name}::${table}`;\n\n    if (!unique.has(key)) {\n      unique.set(key, { name, table });\n    }\n  }\n\n  return [...unique.values()];\n}\n\nexport function buildPruneBlock(\n  columns: readonly LegacyColumnPrune[],\n  hasuraAuditTriggers: readonly HasuraAuditTrigger[] = []\n): string {\n  const columnStatements = columns.map(\n    (item) =>\n      `ALTER TABLE ${item.table} DROP COLUMN IF EXISTS ${item.column}; -- ${item.issue}`\n  );\n  const triggerStatements = hasuraAuditTriggers.map(\n    (trigger) =>\n      `DROP TRIGGER IF EXISTS \"${trigger.name}\" ON ${trigger.table}; -- hasura-audit`\n  );\n\n  return [\n    START_MARKER,\n    '-- Managed by src/local/prune-pulled-schema.ts',\n    ...columnStatements,\n    ...(triggerStatements.length > 0\n      ? [\n          '',\n          '-- Disable Hasura audit triggers in local bootstrap',\n          ...triggerStatements,\n        ]\n      : []),\n    END_MARKER,\n  ].join('\\n');\n}\n\nexport function buildPruneReminderLog(columns: readonly LegacyColumnPrune[]) {\n  const lines = [\n    `[kysely] Legacy column prune reminder (${columns.length} columns). Remove these from production schema when ready:`,\n  ];\n\n  for (const item of columns) {\n    lines.push(`  - ${item.table}.${item.column} [${item.issue}]`);\n  }\n\n  return lines;\n}\n\nexport function applyPruneBlock(\n  sql: string,\n  columns: readonly LegacyColumnPrune[]\n): string {\n  const hasuraAuditTriggers = extractHasuraAuditTriggers(sql);\n  const startAt = sql.indexOf(START_MARKER);\n\n  let base = sql;\n  if (startAt !== -1) {\n    const endAt = sql.indexOf(END_MARKER, startAt);\n    if (endAt === -1) {\n      throw new Error(\n        `Malformed legacy prune block in initial SQL: missing \"${END_MARKER}\".`\n      );\n    }\n    const tailStart = endAt + END_MARKER.length;\n    const afterTail = sql.slice(tailStart).replace(/^\\s*\\n/, '');\n    base = `${sql.slice(0, startAt).trimEnd()}\\n${afterTail}`;\n  }\n\n  const next = base.trimEnd();\n  if (columns.length === 0) {\n    return `${next}\\n`;\n  }\n\n  return `${next}\\n\\n${buildPruneBlock(columns, hasuraAuditTriggers)}\\n`;\n}\n\nexport async function prunePulledSchemaFile(filePath: string) {\n  const original = await readFile(filePath, 'utf8');\n  const updated = applyPruneBlock(original, activeLegacyColumnPrunes);\n  const changed = updated !== original;\n  if (changed) {\n    await writeFile(filePath, updated, 'utf8');\n  }\n\n  const status = changed ? 'applied' : 'already up to date';\n  console.log(`[kysely] Legacy column prune block ${status}.`);\n  for (const line of buildPruneReminderLog(activeLegacyColumnPrunes)) {\n    console.log(line);\n  }\n}\n\nexport async function prunePulledSchema(root: string) {\n  const filePath = join(root, 'initial/0000000000000-init.sql');\n  await prunePulledSchemaFile(filePath);\n}\n\nasync function run() {\n  await prunePulledSchema(process.cwd());\n}\n\nfunction isDirectExecution() {\n  const entryPath = process.argv[1];\n  if (!entryPath) {\n    return false;\n  }\n\n  return (\n    entryPath.endsWith('prune-pulled-schema.ts') ||\n    entryPath.endsWith('prune-pulled-schema.js')\n  );\n}\n\n(async () => {\n  if (isDirectExecution()) {\n    await run();\n  }\n})();\n"]}
+{"version":3,"file":"prune-pulled-schema.js","sourceRoot":"src/","sources":["local/prune-pulled-schema.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile, writeFile } from 'node:fs/promises';\nimport { join } from 'node:path';\nimport { KyselyError } from '../error';\n\nconst START_MARKER = '-- VRP legacy-column-prune:start';\nconst END_MARKER = '-- VRP legacy-column-prune:end';\n\nexport type LegacyColumnPrune = {\n  table: `${string}.${string}`;\n  column: string;\n  issue: string;\n};\n\nconst hasuraAuditTriggerPattern =\n  /^CREATE TRIGGER \"(notify_hasura_audit_[^\"]+)\" [\\s\\S]*? ON ([^\\s;]+) FOR EACH ROW EXECUTE FUNCTION hdb_catalog\\.\"notify_hasura_audit_[^\"]+\"\\(\\);$/gm;\n\nexport type HasuraAuditTrigger = {\n  name: string;\n  table: `${string}.${string}`;\n};\n\n/**\n * Active removals currently validated by runtime + type usage.\n * Add new entries here incrementally to surface compile/runtime callers.\n */\nexport const activeLegacyColumnPrunes: LegacyColumnPrune[] = [\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'fly_app',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'default_machine_size',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'endpoint',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'uid',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'plugin_data',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'config',\n  },\n  {\n    issue: 'VRI-45',\n    table: 'public.app',\n    column: 'flows',\n  },\n  {\n    issue: 'PRO-12855',\n    table: 'public.owner_statement',\n    column: 'cent_accounting_balance_start',\n  },\n  {\n    issue: 'PRO-12855',\n    table: 'public.owner_statement',\n    column: 'cent_accounting_balance_end',\n  },\n  {\n    issue: 'PRO-12855',\n    table: 'accounting.contact',\n    column: 'pms_status',\n  },\n  {\n    issue: 'PRO-12855',\n    table: 'public.owner',\n    column: 'pms_status',\n  },\n];\n\nexport function extractHasuraAuditTriggers(sql: string): HasuraAuditTrigger[] {\n  const unique = new Map<string, HasuraAuditTrigger>();\n\n  for (const match of sql.matchAll(hasuraAuditTriggerPattern)) {\n    const name = match[1];\n    const table = match[2] as `${string}.${string}`;\n    const key = `${name}::${table}`;\n\n    if (!unique.has(key)) {\n      unique.set(key, { name, table });\n    }\n  }\n\n  return [...unique.values()];\n}\n\nexport function buildPruneBlock(\n  columns: readonly LegacyColumnPrune[],\n  hasuraAuditTriggers: readonly HasuraAuditTrigger[] = []\n): string {\n  const columnStatements = columns.map(\n    (item) =>\n      `ALTER TABLE ${item.table} DROP COLUMN IF EXISTS ${item.column}; -- ${item.issue}`\n  );\n  const triggerStatements = hasuraAuditTriggers.map(\n    (trigger) =>\n      `DROP TRIGGER IF EXISTS \"${trigger.name}\" ON ${trigger.table}; -- hasura-audit`\n  );\n\n  return [\n    START_MARKER,\n    '-- Managed by src/local/prune-pulled-schema.ts',\n    ...columnStatements,\n    ...(triggerStatements.length > 0\n      ? [\n          '',\n          '-- Disable Hasura audit triggers in local bootstrap',\n          ...triggerStatements,\n        ]\n      : []),\n    END_MARKER,\n  ].join('\\n');\n}\n\nexport function buildPruneReminderLog(columns: readonly LegacyColumnPrune[]) {\n  const lines = [\n    `[kysely] Legacy column prune reminder (${columns.length} columns). Remove these from production schema when ready:`,\n  ];\n\n  for (const item of columns) {\n    lines.push(`  - ${item.table}.${item.column} [${item.issue}]`);\n  }\n\n  return lines;\n}\n\nexport function applyPruneBlock(\n  sql: string,\n  columns: readonly LegacyColumnPrune[]\n): string {\n  const hasuraAuditTriggers = extractHasuraAuditTriggers(sql);\n  const startAt = sql.indexOf(START_MARKER);\n\n  let base = sql;\n  if (startAt !== -1) {\n    const endAt = sql.indexOf(END_MARKER, startAt);\n    if (endAt === -1) {\n      throw new KyselyError('Malformed legacy prune block in initial SQL', {\n        missingMarker: END_MARKER,\n      });\n    }\n    const tailStart = endAt + END_MARKER.length;\n    const afterTail = sql.slice(tailStart).replace(/^\\s*\\n/, '');\n    base = `${sql.slice(0, startAt).trimEnd()}\\n${afterTail}`;\n  }\n\n  const next = base.trimEnd();\n  if (columns.length === 0) {\n    return `${next}\\n`;\n  }\n\n  return `${next}\\n\\n${buildPruneBlock(columns, hasuraAuditTriggers)}\\n`;\n}\n\nexport async function prunePulledSchemaFile(filePath: string) {\n  const original = await readFile(filePath, 'utf8');\n  const updated = applyPruneBlock(original, activeLegacyColumnPrunes);\n  const changed = updated !== original;\n  if (changed) {\n    await writeFile(filePath, updated, 'utf8');\n  }\n\n  const status = changed ? 'applied' : 'already up to date';\n  console.log(`[kysely] Legacy column prune block ${status}.`);\n  for (const line of buildPruneReminderLog(activeLegacyColumnPrunes)) {\n    console.log(line);\n  }\n}\n\nexport async function prunePulledSchema(root: string) {\n  const filePath = join(root, 'initial/0000000000000-init.sql');\n  await prunePulledSchemaFile(filePath);\n}\n\nasync function run() {\n  await prunePulledSchema(process.cwd());\n}\n\nfunction isDirectExecution() {\n  const entryPath = process.argv[1];\n  if (!entryPath) {\n    return false;\n  }\n\n  return (\n    entryPath.endsWith('prune-pulled-schema.ts') ||\n    entryPath.endsWith('prune-pulled-schema.js')\n  );\n}\n\n(async () => {\n  if (isDirectExecution()) {\n    await run();\n  }\n})();\n"]}

package/build/main/migration.d.ts

@@ -0,0 +1,7 @@
+export declare const appMigrationEpoch: {
+    readonly baseline: "0000000000000-baseline";
+    readonly folder: "migrations-v2";
+    readonly lockTableName: "kysely_migration_lock";
+    readonly tableName: "kysely_migration";
+    readonly tableSchema: "kysely_v2";
+};

package/build/main/migration.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.appMigrationEpoch = void 0;
+exports.appMigrationEpoch = {
+    baseline: '0000000000000-baseline',
+    folder: 'migrations-v2',
+    lockTableName: 'kysely_migration_lock',
+    tableName: 'kysely_migration',
+    tableSchema: 'kysely_v2',
+};
+//# sourceMappingURL=migration.js.map

package/build/main/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migration.js","sourceRoot":"src/","sources":["migration.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG;IAC/B,QAAQ,EAAE,wBAAwB;IAClC,MAAM,EAAE,eAAe;IACvB,aAAa,EAAE,uBAAuB;IACtC,SAAS,EAAE,kBAAkB;IAC7B,WAAW,EAAE,WAAW;CAChB,CAAC","sourcesContent":["export const appMigrationEpoch = {\n  baseline: '0000000000000-baseline',\n  folder: 'migrations-v2',\n  lockTableName: 'kysely_migration_lock',\n  tableName: 'kysely_migration',\n  tableSchema: 'kysely_v2',\n} as const;\n"]}

package/build/main/query/listing/status.d.ts

@@ -9,16 +9,6 @@ export declare function whereListingIsActive(eb: ExpressionBuilder<DB & {
 }, 'l'>, today?: string): import("kysely").ExpressionWrapper<DB & {
     l: PublicListing;
 }, "l", import("kysely/dist/cjs/util/type-utils").SqlBool>;
-export declare function selectListingIsInactive(eb: ExpressionBuilder<DB & {
-    l: PublicListing;
-}, 'l'>, today?: string): import("kysely").ExpressionWrapper<DB & {
-    l: PublicListing;
-}, "l", import("kysely/dist/cjs/util/type-utils").SqlBool>;
-export declare function selectListingIsActive(eb: ExpressionBuilder<DB & {
-    l: PublicListing;
-}, 'l'>, today?: string): import("kysely").ExpressionWrapper<DB & {
-    l: PublicListing;
-}, "l", import("kysely/dist/cjs/util/type-utils").SqlBool>;
 export declare function selectListingStatus(eb: ExpressionBuilder<DB & {
     l: PublicListing;
 }, 'l'>, today?: string): import("kysely").ExpressionWrapper<DB & {

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

@@ -2,22 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.whereListingIsInactive = whereListingIsInactive;
 exports.whereListingIsActive = whereListingIsActive;
-exports.selectListingIsInactive = selectListingIsInactive;
-exports.selectListingIsActive = selectListingIsActive;
 exports.selectListingStatus = selectListingStatus;
 const utils_1 = require("@vrplatform/utils");
 const isomorphic_1 = require("../../isomorphic");
+const status_1 = require("../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(status_1.whereTenantActive)
         .where((eb2) => eb2.or([
         eb2.and([
             eb2('tenant.isGeneralLedger', '=', false),
@@ -72,12 +66,6 @@ function whereListingIsInactive(eb, today = (0, utils_1.day)().yyyymmdd()) {
 function whereListingIsActive(eb, today = (0, utils_1.day)().yyyymmdd()) {
     return hasActiveListing(eb, today);
 }
-function selectListingIsInactive(eb, today = (0, utils_1.day)().yyyymmdd()) {
-    return whereListingIsInactive(eb, today);
-}
-function selectListingIsActive(eb, today = (0, utils_1.day)().yyyymmdd()) {
-    return whereListingIsActive(eb, today);
-}
 function selectListingStatus(eb, today = (0, utils_1.day)().yyyymmdd()) {
     return eb
         .case()

package/build/main/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 selectListingIsInactive(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string = day().yyyymmdd()\n) {\n  return whereListingIsInactive(eb, today);\n}\n\nexport function selectListingIsActive(\n  eb: ExpressionBuilder<DB & { l: PublicListing }, 'l'>,\n  today: string = day().yyyymmdd()\n) {\n  return whereListingIsActive(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/main/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/main/query/tenant/status.js

@@ -3,38 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.whereTenantActive = whereTenantActive;
 exports.whereTenantNotTestTeam = whereTenantNotTestTeam;
 exports.whereTenantShouldBePaid = whereTenantShouldBePaid;
-const utils_1 = require("@vrplatform/utils");
+const isomorphic_1 = require("../../isomorphic");
+const billing_partner_1 = require("./billing-partner");
 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')
-            .whereRef('billingPartner.id', '=', 'tenant.calculatedBillingPartnerId')
-            .where('billingPartner.calculatedStatus', '=', 'active')),
+            .where('billingPartner.id', '=', eb.fn.coalesce('tenant.calculatedBillingPartnerId', eb.val((0, billing_partner_1.getCalculatedBillingPartnerId)({}))))
+            .where('billingPartner.calculatedStatus', 'is distinct from', 'active'))),
     ]);
 }
-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),
-        ]),
-    ]);
+function whereTenantNotTestTeam(testTeamId) {
+    return (0, isomorphic_1.sql) `(
+    ${isomorphic_1.sql.ref('tenant.id')} != ${testTeamId}
+    and (
+      ${isomorphic_1.sql.ref('tenant.partnerId')} is null
+      or ${isomorphic_1.sql.ref('tenant.partnerId')} != ${testTeamId}
+    )
+    and (
+      ${isomorphic_1.sql.ref('tenant.billingPartnerId')} is null
+      or ${isomorphic_1.sql.ref('tenant.billingPartnerId')} != ${testTeamId}
+    )
+  )`;
 }
-function whereTenantShouldBePaid(eb, { includePartnerTeams = false, today = (0, utils_1.day)().yyyymmdd(), } = {}) {
+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/main/query/tenant/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"src/","sources":["query/tenant/status.ts"],"names":[],"mappings":";;AAQA,8CAWC;AAED,wDAeC;AAED,0DAqBC;AA3DD,6CAAwC;AAQxC,SAAgB,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,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE,mCAAmC,CAAC;aACvE,KAAK,CAAC,iCAAiC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAC3D;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,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,SAAgB,uBAAuB,CACrC,EAA2B,EAC3B,EACE,mBAAmB,GAAG,KAAK,EAC3B,KAAK,GAAG,IAAA,WAAG,GAAE,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';\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        .whereRef('billingPartner.id', '=', 'tenant.calculatedBillingPartnerId')\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":";;AAcA,8CAwBC;AAED,wDAYC;AAED,0DAeC;AArED,iDAM0B;AAC1B,uDAAkE;AAOlE,SAAgB,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,IAAA,+CAA6B,EAAC,EAAE,CAAC,CAAC,CAC1C,CACF;aACA,KAAK,CACJ,iCAAiC,EACjC,kBAAkB,EAClB,QAAQ,CACT,CACJ,CACF;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,sBAAsB,CAAC,UAAkB;IACvD,OAAO,IAAA,gBAAG,EAAS;MACf,gBAAG,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,UAAU;;QAEnC,gBAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC;WACxB,gBAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,OAAO,UAAU;;;QAG/C,gBAAG,CAAC,GAAG,CAAC,yBAAyB,CAAC;WAC/B,gBAAG,CAAC,GAAG,CAAC,yBAAyB,CAAC,OAAO,UAAU;;IAE1D,CAAC;AACL,CAAC;AAED,SAAgB,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/main/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>;
@@ -10,6 +10,10 @@ type UseAsyncRegionalKysely = (connectionString: string, options?: {
     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 +36,7 @@ export declare function resolveTenantKysely({ connectionId, slug, tenantId, repo
     tenantId?: string;
     repositoryName: string;
     env: RegionEnvironment;
+    useAsyncControlPlaneKysely?: UseAsyncControlPlaneKysely;
     useAsyncKysely?: UseAsyncRegionalKysely;
     probe?: true;
 }): Promise<TenantKysely>;