feat(workspace): separate kysely-sqlite-utils from kysely-sqlite-builder

Author: subframe7536

commitlint.config.cjs

@@ -19,6 +19,7 @@ module.exports = {
       'dialect-wasqlite-worker',
       'builder',
       'workspace',
+      'utils',
     ],
     markBreakingChangeMode: true,
     allowBreakingChanges: [

packages/sqlite-builder/package.json

@@ -39,6 +39,7 @@
   },
   "dependencies": {
     "@subframe7536/type-utils": "^0.1.3",
-    "kysely-plugin-serialize": "workspace:*"
+    "kysely-plugin-serialize": "workspace:*",
+    "kysely-sqlite-utils": "workspace:*"
   }
 }

packages/sqlite-builder/src/builder.ts

@@ -8,16 +8,16 @@ import type {
 } from 'kysely'
 import { CompiledQuery, Kysely } from 'kysely'
 import { SerializePlugin, defaultSerializer } from 'kysely-plugin-serialize'
+import type { QueryBuilderOutput } from 'kysely-sqlite-utils'
 import {
   createKyselyLogger,
   precompileQuery,
   checkIntegrity as runCheckIntegrity,
   savePoint,
-} from './utils'
+} from 'kysely-sqlite-utils'
 import type {
   AvailableBuilder,
   DBLogger,
-  QueryBuilderOutput,
   SqliteBuilderOptions,
   StatusResult,
   SyncTableFn,
@@ -130,7 +130,7 @@ export class SqliteBuilder<DB extends Record<string, any>> {
   }
 
   private getDB() {
-    return this.trx || this.kysely
+    return this.trxCount ? this.trx! : this.kysely
   }
 
   private logError(e: unknown, errorMsg?: string) {

packages/sqlite-builder/src/index.ts

@@ -1,4 +1,4 @@
 export * from './builder'
 export type { DBLogger, SqliteBuilderOptions } from './types'
 export * from './sync'
-export * from './utils'
+export * from 'kysely-sqlite-utils'

packages/sqlite-builder/src/sync/core.ts

@@ -1,6 +1,6 @@
 import { type Kysely, sql } from 'kysely'
+import { getOrSetDBVersion } from 'kysely-sqlite-utils'
 import type { DBLogger } from '../types'
-import { getOrSetDBVersion } from '../utils'
 import type { Columns, Schema, Table } from './types'
 import {
   parseColumnType,

packages/sqlite-builder/src/sync/index.ts

@@ -1,10 +1,12 @@
-import type { Kysely } from 'kysely'
+import type { Kysely, MigrationProvider, MigratorProps } from 'kysely'
+import { Migrator } from 'kysely'
 import type { DBLogger, SyncTableFn } from '../types'
 import type { Schema } from './types'
 import type { SyncOptions } from './core'
 import { syncTables } from './core'
 
 export * from './types'
+
 export { defineTable, defineLiteral, defineObject } from './define'
 
 /**
@@ -21,3 +23,17 @@ export function createAutoSyncSchemaFn<T extends Schema>(
     await syncTables(db, schema, options, log ? logger : undefined)
   }
 }
+
+/**
+ * migrate to latest
+ */
+
+export function createMigrateFn(
+  provider: MigrationProvider,
+  options?: Omit<MigratorProps, 'db' | 'provider'>,
+): SyncTableFn {
+  return async (db: Kysely<any>) => {
+    const migrator = new Migrator({ db, provider, ...options })
+    await migrator.migrateToLatest()
+  }
+}

packages/sqlite-builder/src/types.ts

@@ -1,5 +1,4 @@
 import type {
-  Compilable,
   DeleteQueryBuilder,
   Dialect,
   InsertQueryBuilder,
@@ -9,7 +8,7 @@ import type {
   UpdateQueryBuilder,
 } from 'kysely'
 import type { SerializePluginOptions } from 'kysely-plugin-serialize'
-import type { LoggerOptions } from './utils'
+import type { LoggerOptions } from 'kysely-sqlite-utils'
 
 export interface SqliteBuilderOptions {
   dialect: Dialect
@@ -42,8 +41,6 @@ export type AvailableBuilder<DB, O> =
   | InsertQueryBuilder<DB, any, O>
   | DeleteQueryBuilder<DB, any, O>
 
-export type QueryBuilderOutput<QB> = QB extends Compilable<infer O> ? O : never
-
 export type StatusResult =
   | { ready: true }
   | { ready: false; error: unknown }