@vrplatform/kysely 1.2.25 → 1.2.26

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.2.25",
+  "version": "1.2.26",
   "description": "",
   "main": "build/main/index.js",
   "module": "build/module/index.js",
@@ -43,9 +43,10 @@
   ],
   "scripts": {
     "pub": "bun run build && cp .data.tar build/ && pnpm publish --no-git-checks",
+    "generate": "bun pgdump && bun run generate:v1 && bun run generate:v2",
     "generate:v1": "kysely-codegen --env-file ../../.env --out-file ./src/v1.generated.ts --default-schema=xxx --camel-case",
-    "generate:v2": "rm -f .data.tar && bun src/test.ts",
-    "pg-dump": "dotenvx run -f ../../.env -- bun pg-dump:run",
+    "generate:v2": "rm -f .data.tar && bun setup.ts",
+    "pgdump": "dotenvx run -f ../../.env -- bun pg-dump:run && bun pg-dump:rm && bun pg-dump:fix-uuid",
     "pg-dump:run": "pg_dump --clean --schema-only --if-exists --no-owner --no-acl $DATABASE_URL > initial/0000000000000-init.sql",
     "pg-dump:rm": "sed -i '' '/EXTENSION/d' initial/0000000000000-init.sql",
     "pg-dump:fix-uuid": "sed -i '' 's/public\\.gen_random_uuid()/gen_random_uuid()/g' initial/0000000000000-init.sql",

package/src/index.ts

@@ -1,5 +1,5 @@
 import { serializeError } from '@finalytic/utils';
-import { CamelCasePlugin, Kysely as K } from 'kysely';
+import { CamelCasePlugin, Kysely as K, type Transaction as T } from 'kysely';
 import { PostgresJSDialect } from 'kysely-postgres-js';
 import postgres, { type Sql } from 'postgres';
 
@@ -21,16 +21,18 @@ export * from './v1.generated';
 import { join, relative } from 'node:path';
 import type { DB } from './v1.generated';
 
+export type Transaction = T<DB>;
 export { sql } from 'kysely';
 
 export type Kysely = K<DB>;
 export type Postgres = Sql;
-export function useKysely(postgres: Sql) {
+export function useKysely(postgres: Sql, options: { log?: boolean } = {}) {
   return new K<DB>({
     dialect: new PostgresJSDialect({
       postgres,
     }),
     plugins: [new CamelCasePlugin()],
+    log: options?.log ? ['query', 'error'] : undefined,
   });
 }
 
@@ -68,7 +70,8 @@ export async function useAsyncKysely(connectionString: string, ssl?: boolean) {
 }
 
 const connections: postgres.Sql<any>[] = [];
-export function usePostgres(connectionString: string, ssl?: boolean) {
+export function usePostgres(connectionString?: string, ssl?: boolean) {
+  if (!connectionString) throw new Error('No connection string');
   const pg = postgres(connectionString, {
     ssl: ssl ? 'require' : false,
   });
@@ -76,8 +79,17 @@ export function usePostgres(connectionString: string, ssl?: boolean) {
   return pg;
 }
 
-export async function forceCloseAllPostgres() {
-  await Promise.all(connections.map((pg) => pg.end().catch(() => undefined)));
+export async function forceCloseAllPostgres(timeoutMs = 5000) {
+  await Promise.allSettled(
+    connections.map((pg) =>
+      Promise.race([
+        pg.end(),
+        new Promise((_, reject) =>
+          setTimeout(() => reject(new Error('end timeout')), timeoutMs)
+        ),
+      ]).catch(() => undefined)
+    )
+  );
 }
 
 export class DatabaseError extends Error {

package/src/local.ts

@@ -38,7 +38,10 @@ async function migrateKysely(kysely: Kysely<any>) {
   });
 
   console.log('migrating kysely ....');
-  const { error, results } = await migrator.migrateToLatest();
+  const { error, results } = await migrator.migrateToLatest().catch(() => {
+    console.error('failed to migrate');
+    process.exit(1);
+  });
 
   for (const it of results ?? []) {
     if (it.status === 'Success') {
@@ -57,26 +60,47 @@ async function migrateKysely(kysely: Kysely<any>) {
 
 const dumpPath = join(root, '.data.tar');
 const dumpFile = (async () => {
-  const dataExists = await exists(dumpPath);
+  const dataExists = await exists(dumpPath).catch(() => false);
   if (!dataExists) {
     console.log('Creating initial dump');
     const main = new PGlite();
-    await migrate(main);
+    await migrate(main).catch(async (err) => {
+      console.error('failed to migrate initial dump');
+      await Bun.write(
+        '../logs/migrate-initial-dump.json',
+        JSON.stringify(err as any, null, 2)
+      );
+      process.exit(1);
+    });
     const { dialect } = new KyselyPGlite(main);
     const kysely = new Kysely<DB>({
       dialect,
       plugins: [new CamelCasePlugin()],
     });
-    await migrateKysely(kysely);
-    await codegen.generate({
-      db: kysely,
-      outFile: path.join(root, 'src/v1.generated.ts'),
-      defaultSchemas: ['xxx'],
-      camelCase: true,
-      dialect: codegen.getDialect('postgres'),
+    await migrateKysely(kysely).catch(() => {
+      console.error('failed to migrate kysely');
+      process.exit(1);
+    });
+    await codegen
+      .generate({
+        db: kysely,
+        outFile: path.join(root, 'src/v1.generated.ts'),
+        defaultSchemas: ['xxx'],
+        camelCase: true,
+        dialect: codegen.getDialect('postgres'),
+      })
+      .catch(() => {
+        console.error('failed to generate kysely');
+        process.exit(1);
+      });
+    const content = await main.dumpDataDir('none').catch(() => {
+      console.error('failed to dump data');
+      process.exit(1);
+    });
+    await Bun.write(dumpPath, content).catch(() => {
+      console.error('failed to write dump');
+      process.exit(1);
     });
-    const content = await main.dumpDataDir('none');
-    await Bun.write(dumpPath, content);
     return content;
   }
   return Bun.file(dumpPath);

package/src/test.ts

@@ -1,11 +1,19 @@
 import { afterAll } from 'bun:test';
 import { useLocalKysely } from './local';
 
-export async function useTestKysely() {
+export async function useTestKysely(
+  cleanupStrategy: 'afterAll' | 'using' | 'manual'
+) {
   const kysely = await useLocalKysely();
 
-  afterAll(async () => {
-    await kysely.destroy();
-  });
-  return kysely;
+  if (cleanupStrategy === 'afterAll')
+    afterAll(async () => {
+      await kysely.destroy();
+    });
+  return {
+    kysely,
+    [Symbol.dispose]: async () => {
+      await kysely.destroy();
+    },
+  };
 }

package/src/v1.generated.ts

@@ -332,32 +332,6 @@ export interface AccountingTransactionType {
   name: string;
 }
 
-export interface CoreAction {
-  appId: string | null;
-  automationId: string | null;
-  connectionId: string | null;
-  createdAt: Generated<Timestamp | null>;
-  id: Generated<string>;
-  inputJson: Json | null;
-  isCurrent: boolean | null;
-  jobId: string | null;
-  jobIndex: number | null;
-  jobPageId: string | null;
-  jobPlanId: string | null;
-  objectId: string | null;
-  opId: string | null;
-  outputJson: Json | null;
-  refs: Json | null;
-  schemaId: string | null;
-  sourceId: string | null;
-  status: string | null;
-  tenantId: string | null;
-  title: string | null;
-  type: string | null;
-  uniqueRef: string | null;
-  updatedAt: Generated<Timestamp | null>;
-}
-
 export interface CoreActiveStatus {
   name: string;
 }
@@ -420,36 +394,6 @@ export interface CoreChangeType {
   name: string;
 }
 
-export interface CoreIssue {
-  actionId: string | null;
-  automationId: string | null;
-  code: string | null;
-  connectionId: string | null;
-  createdAt: Generated<Timestamp | null>;
-  extractId: string | null;
-  extractPageId: string | null;
-  id: Generated<string>;
-  jobId: string | null;
-  jobPageId: string | null;
-  jobPlanId: string | null;
-  kind: string | null;
-  message: string | null;
-  metadata: Generated<Json | null>;
-  refId: Generated<string | null>;
-  refType: string | null;
-  refValue: string | null;
-  status: string | null;
-  subType: string | null;
-  tenantId: string | null;
-  type: string | null;
-  uniqueRef: string | null;
-  updatedAt: Generated<Timestamp | null>;
-}
-
-export interface CoreIssueKind {
-  name: string;
-}
-
 export interface CoreIssueMessageOverwrite {
   createdAt: Generated<Timestamp | null>;
   id: Generated<string>;
@@ -458,107 +402,6 @@ export interface CoreIssueMessageOverwrite {
   updatedAt: Generated<Timestamp | null>;
 }
 
-export interface CoreIssueStatus {
-  name: string;
-}
-
-export interface CoreIssueType {
-  name: string;
-}
-
-export interface CoreJob {
-  automationId: string | null;
-  connectionId: string | null;
-  createdAt: Generated<Timestamp | null>;
-  id: Generated<string>;
-  kind: string | null;
-  metadata: Generated<Json | null>;
-  params: Json | null;
-  planId: string | null;
-  rangeEnd: Timestamp | null;
-  rangeStart: Timestamp | null;
-  schemaId: string | null;
-  status: Generated<string>;
-  tenantId: string | null;
-  title: string | null;
-  type: string | null;
-  updatedAt: Generated<Timestamp | null>;
-  workflowId: string | null;
-}
-
-export interface CoreJobPage {
-  createdAt: Generated<Timestamp | null>;
-  cursor: string | null;
-  id: Generated<string>;
-  jobId: string | null;
-  params: Json | null;
-  status: Generated<string>;
-  tenantId: string | null;
-  title: string | null;
-  updatedAt: Generated<Timestamp | null>;
-}
-
-export interface CoreJobPlan {
-  automationId: string | null;
-  connectionId: string | null;
-  createdAt: Generated<Timestamp>;
-  hypervisorRef: string | null;
-  id: Generated<string>;
-  isCurrentOnConnection: Generated<boolean | null>;
-  params: Json | null;
-  rangeEnd: Timestamp | null;
-  rangeStart: Timestamp | null;
-  status: Generated<string>;
-  tenantId: string;
-  title: string | null;
-  triggeredByUserId: string | null;
-  type: string | null;
-  updatedAt: Generated<Timestamp>;
-  workflowId: string | null;
-}
-
-export interface CoreSchema {
-  appId: string | null;
-  createdAt: Generated<Timestamp | null>;
-  hasExternalLinks: boolean | null;
-  id: Generated<string>;
-  indexSchema: Json | null;
-  jsonSchema: Json | null;
-  kind: string | null;
-  uniqueRef: string | null;
-  updatedAt: Generated<Timestamp | null>;
-}
-
-export interface CoreSchemaKind {
-  name: string;
-}
-
-export interface CoreSourceAction {
-  actionId: string;
-  createdAt: Generated<Timestamp>;
-  id: Generated<string>;
-  opId: string | null;
-  sourceId: string;
-  tenantId: string | null;
-  updatedAt: Generated<Timestamp>;
-}
-
-export interface CoreSourceOp {
-  actionId: string | null;
-  createdAt: Generated<Timestamp | null>;
-  fields: Generated<Json>;
-  id: Generated<string>;
-  jobId: string | null;
-  jobPageId: string | null;
-  jobPlanId: string | null;
-  json: Json | null;
-  kind: string;
-  sourceId: string;
-  tenantId: string;
-  updatedAt: Generated<Timestamp | null>;
-  version: Generated<number | null>;
-}
-
 export interface CoreSync {
   automationId: string | null;
   connectionId: string | null;
@@ -731,28 +574,6 @@ export interface PublicAccountCollectionType {
   name: string;
 }
 
-export interface PublicAction {
-  automationId: string | null;
-  automationTaskId: string | null;
-  connectionId: string | null;
-  createdAt: Generated<Timestamp>;
-  id: Generated<string>;
-  inputFileId: string | null;
-  jobTaskId: string | null;
-  outputFileId: string | null;
-  processTaskId: string | null;
-  status: string | null;
-  taskId: string | null;
-  tenantId: string | null;
-  type: string | null;
-  uniqueRef: string | null;
-  updatedAt: Generated<Timestamp>;
-}
-
-export interface PublicActionStatus {
-  name: string;
-}
-
 export interface PublicAddress {
   city: string | null;
   country: string | null;
@@ -904,23 +725,6 @@ export interface PublicConnectionStatusTemporary {
   name: string;
 }
 
-export interface PublicCsvLine {
-  connectionId: string;
-  createdAt: Generated<Timestamp | null>;
-  csv: string;
-  date: Timestamp;
-  fileId: string | null;
-  fileUniqueRef: string | null;
-  headers: string | null;
-  id: Generated<string>;
-  index: number | null;
-  json: Json | null;
-  tenantId: string;
-  type: string;
-  uniqueRef: string;
-  updatedAt: Generated<Timestamp | null>;
-}
-
 export interface PublicCurrency {
   name: string;
 }
@@ -1146,20 +950,6 @@ export interface PublicListingStatus {
   name: string;
 }
 
-export interface PublicMetric {
-  connectionId: string;
-  createdAt: Generated<Timestamp>;
-  date: Timestamp;
-  id: Generated<string>;
-  listingConnectionId: string | null;
-  metadata: Generated<Json>;
-  tenantId: string;
-  type: string;
-  uniqueRef: string | null;
-  updatedAt: Generated<Timestamp>;
-  value: number | null;
-}
-
 export interface PublicOwner {
   addressId: string | null;
   companyType: string | null;
@@ -1194,9 +984,12 @@ export interface PublicOwnerStatement {
   centAccountingBalanceStart: number | null;
   centBalanceEnd: Int8 | null;
   centBalanceStart: Int8 | null;
+  centExpenses: Int8 | null;
+  centNetRevenue: Int8 | null;
   centPayedOut: number | null;
   centRentalRevenue: number | null;
   centTotal: Int8 | null;
+  centTransfer: Int8 | null;
   createdAt: Generated<Timestamp>;
   currency: string | null;
   endAt: Timestamp;
@@ -1217,17 +1010,6 @@ export interface PublicOwnerStatement {
   updatedAt: Generated<Timestamp>;
 }
 
-export interface PublicOwnerStatementIssue {
-  id: Generated<string>;
-  level: Generated<string>;
-  lineId: string | null;
-  message: string;
-  statementId: string | null;
-  tenantId: string;
-  type: string;
-  uniqueRef: string;
-}
-
 export interface PublicOwnerStatementLayout {
   automationId: string | null;
   connectionId: string | null;
@@ -1608,23 +1390,6 @@ export interface PublicReservationWithOccupancyStatus {
   userdata: Json | null;
 }
 
-export interface PublicScheduledEvent {
-  createdAt: Generated<Timestamp>;
-  id: Generated<string>;
-  message: string | null;
-  objectId: string;
-  op: string;
-  scheduledAt: Timestamp | null;
-  status: Generated<string | null>;
-  tableName: string;
-  tenantId: string;
-  updatedAt: Generated<Timestamp>;
-}
-
-export interface PublicScheduledEventStatus {
-  name: string;
-}
-
 export interface PublicSetting {
   automationId: string | null;
   connectionId: string | null;
@@ -1679,7 +1444,6 @@ export interface PublicSource {
   parentId: string | null;
   remoteId: string | null;
   reservationId: string | null;
-  schemaId: string | null;
   status: Generated<string | null>;
   tenantId: string;
   transformJson: Json | null;
@@ -2036,7 +1800,6 @@ export interface DB {
   "accounting.transaction": AccountingTransaction;
   "accounting.transactionLine": AccountingTransactionLine;
   "accounting.transactionType": AccountingTransactionType;
-  "core.action": CoreAction;
   "core.activeStatus": CoreActiveStatus;
   "core.change": CoreChange;
   "core.changeEntityType": CoreChangeEntityType;
@@ -2045,18 +1808,7 @@ export interface DB {
   "core.changeStatus": CoreChangeStatus;
   "core.changeSyncType": CoreChangeSyncType;
   "core.changeType": CoreChangeType;
-  "core.issue": CoreIssue;
-  "core.issueKind": CoreIssueKind;
   "core.issueMessageOverwrite": CoreIssueMessageOverwrite;
-  "core.issueStatus": CoreIssueStatus;
-  "core.issueType": CoreIssueType;
-  "core.job": CoreJob;
-  "core.jobPage": CoreJobPage;
-  "core.jobPlan": CoreJobPlan;
-  "core.schema": CoreSchema;
-  "core.schemaKind": CoreSchemaKind;
-  "core.sourceAction": CoreSourceAction;
-  "core.sourceOp": CoreSourceOp;
   "core.sync": CoreSync;
   "core.syncStatus": CoreSyncStatus;
   "core.syncSubtask": CoreSyncSubtask;
@@ -2075,8 +1827,6 @@ export interface DB {
   "hdbCatalog.hdbVersion": HdbCatalogHdbVersion;
   "public.accountCollection": PublicAccountCollection;
   "public.accountCollectionType": PublicAccountCollectionType;
-  "public.action": PublicAction;
-  "public.actionStatus": PublicActionStatus;
   "public.address": PublicAddress;
   "public.app": PublicApp;
   "public.auditLog": PublicAuditLog;
@@ -2087,7 +1837,6 @@ export interface DB {
   "public.bookingChannel": PublicBookingChannel;
   "public.connection": PublicConnection;
   "public.connectionStatusTemporary": PublicConnectionStatusTemporary;
-  "public.csvLine": PublicCsvLine;
   "public.currency": PublicCurrency;
   "public.duplicateEmails": PublicDuplicateEmails;
   "public.emailTemplate": PublicEmailTemplate;
@@ -2111,11 +1860,9 @@ export interface DB {
   "public.listingOwnershipPeriodMember": PublicListingOwnershipPeriodMember;
   "public.listingPmsStatus": PublicListingPmsStatus;
   "public.listingStatus": PublicListingStatus;
-  "public.metric": PublicMetric;
   "public.owner": PublicOwner;
   "public.ownerPmsStatus": PublicOwnerPmsStatus;
   "public.ownerStatement": PublicOwnerStatement;
-  "public.ownerStatementIssue": PublicOwnerStatementIssue;
   "public.ownerStatementLayout": PublicOwnerStatementLayout;
   "public.ownerStatementLayoutAccount": PublicOwnerStatementLayoutAccount;
   "public.ownerStatementLayoutListing": PublicOwnerStatementLayoutListing;
@@ -2143,8 +1890,6 @@ export interface DB {
   "public.reservation": PublicReservation;
   "public.reservationStatus": PublicReservationStatus;
   "public.reservationWithOccupancyStatus": PublicReservationWithOccupancyStatus;
-  "public.scheduledEvent": PublicScheduledEvent;
-  "public.scheduledEventStatus": PublicScheduledEventStatus;
   "public.setting": PublicSetting;
   "public.source": PublicSource;
   "public.task": PublicTask;