@vrplatform/kysely 1.3.12 → 1.3.17

package/src/local/generate.ts

@@ -3,14 +3,10 @@ import { exists } from 'node:fs/promises';
 import * as path from 'node:path';
 import { join } from 'node:path';
 import { PGlite } from '@electric-sql/pglite';
-import {
-  CamelCasePlugin,
-  FileMigrationProvider,
-  Kysely,
-  Migrator,
-} from 'kysely';
+import { FileMigrationProvider, type Kysely, Migrator } from 'kysely';
 import codegen from 'kysely-codegen';
 import { KyselyPGlite } from 'kysely-pglite';
+import { getKysely } from '../plugins';
 import type { DB } from '../v1.generated';
 
 async function migrate(root: string, client: PGlite) {
@@ -25,7 +21,7 @@ async function migrate(root: string, client: PGlite) {
   }
 }
 
-async function migrateKysely(root: string, kysely: Kysely<any>) {
+async function migrateKysely(root: string, kysely: Kysely<DB>) {
   console.log('init migrating kysely ....');
   const migrator = new Migrator({
     db: kysely,
@@ -75,9 +71,9 @@ async function generateDump(root: string, dumpPath: string) {
       process.exit(1);
     });
     const { dialect } = new KyselyPGlite(main);
-    const kysely = new Kysely<DB>({
-      dialect,
-      plugins: [new CamelCasePlugin()],
+    const kysely = getKysely(dialect, {
+      repositoryName: 'localTesting',
+      log: undefined,
     });
     await migrateKysely(root, kysely).catch(() => {
       console.error('failed to migrate kysely');
@@ -118,9 +114,9 @@ export async function createLocalKysely(root: string, dumpPath: string) {
   // warm up
   await pglite.sql`SELECT 1`;
   const { dialect } = new KyselyPGlite(pglite);
-  const kysely = new Kysely<DB>({
-    dialect,
-    plugins: [new CamelCasePlugin()],
+  const kysely = getKysely(dialect, {
+    repositoryName: 'localTesting',
+    log: undefined,
   });
 
   const originalDestroy = kysely.destroy.bind(kysely);

package/src/local/index.ts

@@ -1,10 +1,9 @@
 import { join } from 'node:path';
 import { PGlite } from '@electric-sql/pglite';
-import { CamelCasePlugin, Kysely, type LogConfig } from 'kysely';
+import type { LogConfig } from 'kysely';
 import { PGliteDialect } from 'kysely-pglite-dialect';
-import { KyselyPganalyzeCommentPlugin } from '../pganalyze-comment-plugin';
-import type { DB } from '../v1.generated';
-import { ensureDigestFunction } from './digest';
+import { getKysely } from '../plugins';
+import { ensureDigestFunction, ensureGenRandomBytesFunction } from './digest';
 
 export const root = join(__dirname, '../..');
 export const dumpPath = join(root, '.data.tar');
@@ -19,20 +18,17 @@ export async function useLocalKysely(args: UseLocalKyselyOptions = {}) {
 
   const dump = Bun.file(dumpPath);
 
-  const pglite = new PGlite({ loadDataDir: dump });
+  const pglite = new PGlite({
+    loadDataDir: dump,
+  });
   // warm up
   const dialect = new PGliteDialect(pglite);
-  const kysely = new Kysely<DB>({
-    dialect,
-    log: args.log === true ? ['query', 'error'] : args.log,
-    plugins: [
-      new CamelCasePlugin(),
-      new KyselyPganalyzeCommentPlugin({
-        repository: args.repositoryName ?? 'localTesting',
-      }),
-    ],
+  const kysely = getKysely(dialect, {
+    repositoryName: args?.repositoryName ?? 'localTesting',
+    log: args?.log,
   });
   await ensureDigestFunction(kysely);
+  await ensureGenRandomBytesFunction(kysely);
 
   const originalDestroy = kysely.destroy.bind(kysely);
   kysely.destroy = async () => {

package/src/plugins.ts

@@ -0,0 +1,30 @@
+import {
+  type Dialect,
+  Kysely as K,
+  type KyselyPlugin,
+  type LogConfig,
+} from 'kysely';
+import { CustomCasePlugin } from './camel-case';
+import { KyselyPganalyzeCommentPlugin } from './pganalyze-comment-plugin';
+import type { DB } from './v1.generated';
+
+export function getKysely(
+  dialect: Dialect,
+  options: { repositoryName?: string; log?: true | LogConfig }
+) {
+  const plugins: KyselyPlugin[] = [new CustomCasePlugin()];
+
+  if (options?.repositoryName) {
+    plugins.push(
+      new KyselyPganalyzeCommentPlugin({
+        repository: options.repositoryName,
+      })
+    );
+  }
+  const kysely = new K<DB>({
+    dialect,
+    plugins,
+    log: options?.log === true ? ['query', 'error'] : options?.log,
+  });
+  return kysely;
+}

package/src/test/index.ts

@@ -45,7 +45,8 @@ export async function useLocalKyselyResource(
     {},
     {
       get(_target, prop) {
-        if (prop === Symbol.dispose) {
+        // somehow not working if using Symbol.dispose
+        if (prop === Symbol.asyncDispose) {
           return async () => {
             await kysely.destroy();
           };

package/src/v1.generated.ts

@@ -180,6 +180,10 @@ export interface AccountingContact {
   name: string;
   phone: string | null;
   pmsStatus: string | null;
+  /**
+   * Human-readable system ID (CNT-XXX-XXXX-XXX).
+   */
+  shortRef: string | null;
   sourceId: string | null;
   status: Generated<string | null>;
   taxId: string | null;
@@ -298,6 +302,10 @@ export interface AccountingTransaction {
   recurringFeeId: string | null;
   recurringPattern: Json | null;
   recurringTemplateId: string | null;
+  /**
+   * Human-readable system ID (EXP/DEP/TRF-XXX-XXXX-XXX depending on transaction.type).
+   */
+  shortRef: string | null;
   sourceId: string | null;
   status: Generated<string>;
   tenantId: string;
@@ -406,6 +414,7 @@ export interface CoreFlow {
   leftType: string | null;
   mappingSchema: Json;
   rightType: string | null;
+  runSchema: Generated<Json>;
   settingSchema: Json;
   title: string;
   type: Generated<PublicFlowType | null>;
@@ -910,6 +919,10 @@ export interface PublicListing {
   ownerContactId: string | null;
   pmsAddressData: Json | null;
   pmsStatus: string | null;
+  /**
+   * Human-readable system ID (LST-XXX-XXXX-XXX).
+   */
+  shortRef: string | null;
   sourceId: string | null;
   status: string | null;
   tenantId: string;
@@ -1301,6 +1314,10 @@ export interface PublicReservation {
   paidStatus: string | null;
   paymentMethod: string | null;
   pmsReferenceCode: string | null;
+  /**
+   * Human-readable system ID (RES-XXX-XXXX-XXX).
+   */
+  shortRef: string | null;
   sourceId: string | null;
   status: Generated<string | null>;
   tenantId: string | null;