feat(dialect-wasqlite-worker): upgrade wasqlite and fix url

Author: subframe7536

eslint.config.js

@@ -5,4 +5,5 @@ export default defineEslintConfig({
   overrideRules: {
     'prefer-template': 'off',
   },
+  vue: true,
 })

packages/dialect-wasqlite-worker/package.json

@@ -57,6 +57,6 @@
     "zen-mitt": "^0.3.0"
   },
   "devDependencies": {
-    "@subframe7536/sqlite-wasm": "^0.2.2"
+    "@subframe7536/sqlite-wasm": "^0.3.0-beta.1"
   }
 }

packages/dialect-wasqlite-worker/src/driver.ts

@@ -125,7 +125,7 @@ class WaSqliteWorkerConnection implements DatabaseConnection {
   }
 
   streamQuery<R>(): AsyncIterableIterator<QueryResult<R>> {
-    throw new Error('SQLite driver doesn\'t support streaming')
+    throw new Error('wa-sqlite worker driver doesn\'t support streaming')
   }
 
   async executeQuery<R>(compiledQuery: CompiledQuery<unknown>): Promise<QueryResult<R>> {

packages/dialect-wasqlite-worker/src/index.ts

@@ -3,6 +3,8 @@ import { SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler } from 'kysely'
 import { WaSqliteWorkerDriver } from './driver'
 import type { Promisable } from './type'
 
+export { isIdbSupported, isOpfsSupported, isModuleWorkerSupport } from '@subframe7536/sqlite-wasm'
+
 export interface WaSqliteWorkerDialectConfig {
   /**
    * db file name
@@ -41,15 +43,13 @@ export interface WaSqliteWorkerDialectConfig {
    * import { useDefaultWasmURL } from 'kysely-wasqlite-worker'
    * @example
    * (useAsyncWasm) => useAsyncWasm
-   *   ? 'https://cdn.jsdelivr.net/gh/rhashimoto/wa-sqlite@v0.9.9/dist/wa-sqlite-async.wasm'
+   *   ? 'https://cdn.jsdelivr.net/gh/rhashimoto/wa-sqlite@v1.0.0/dist/wa-sqlite-async.wasm'
    *   : new URL('kysely-wasqlite-worker/wasm-sync', import.meta.url).href
    */
   url?: string | ((useAsyncWasm: boolean) => string)
   onCreateConnection?: (connection: DatabaseConnection) => Promisable<void>
 }
 
-export { isIdbSupported, isOpfsSupported, isModuleWorkerSupport } from '@subframe7536/sqlite-wasm'
-
 export class WaSqliteWorkerDialect implements Dialect {
   private config: WaSqliteWorkerDialectConfig
 

packages/dialect-wasqlite-worker/src/worker.ts

@@ -5,7 +5,7 @@ import type { MainMsg, WorkerMsg } from './type'
 
 let db: SQLiteDB
 
-async function init(url: string, fileName: string, useOPFS: boolean) {
+async function init(fileName: string, url: string, useOPFS: boolean) {
   db = await initSQLite(
     (
       useOPFS

packages/sqlite-builder/src/schema/parseExist.ts

@@ -25,6 +25,7 @@ export type ParsedColumnProperty = {
  * @todo support extra constraints
  */
 export function parseCreateTableSQL(definition: string): ParsedCreateTableSQL {
+  // eslint-disable-next-line regexp/no-super-linear-backtracking
   const baseRegex = /create table (?:if not exist)?\s*"([^"]+)".*?\((.*)\)/i
   const columnRegex = /"([^"]+)"\s+(\w+)\s?(not null)?/gi
   const [, tableName, cols] = definition.replace(/\r?\n/g, '').match(baseRegex)!

packages/sqlite-utils/src/soft-delete.ts

@@ -48,8 +48,8 @@ export function basicExecutorFn<DB extends Record<string, any>>(db: () => Kysely
 export function createSoftDeleteExecutorFn<DB extends Record<string, any>>(
   deleteColumnName = 'isDeleted',
 ): SqliteExecutorFn<DB, {
-  withoutDelete: <W extends WhereInterface<DB, keyof DB>>(qb: W) => WhereInterface<DB, keyof DB>
-}> {
+    withoutDelete: <W extends WhereInterface<DB, keyof DB>>(qb: W) => WhereInterface<DB, keyof DB>
+  }> {
   return (db: () => Kysely<DB>) => {
     return {
       selectFrom: <T extends keyof DB & string>(

playground/package.json

@@ -8,12 +8,12 @@
   },
   "dependencies": {
     "@subframe7536/sqlite-wasm": "^0.2.2",
-    "kysely-sqlite-builder": "workspace:*",
+    "kysely-sqlite-builder": "^0.8.7",
     "kysely-wasm": "workspace:*",
     "kysely-wasqlite-worker": "workspace:*",
-    "vue": "^3.4.27"
+    "vue": "^3.4.31"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^5.0.4"
+    "@vitejs/plugin-vue": "^5.0.5"
   }
 }

playground/src/App.vue

@@ -5,8 +5,6 @@ import OfficialWorker from './modules/officialWasmWorker?worker'
 import { useWaSqliteWorker } from './modules/wasqliteWorker'
 import { deleteFile } from './modules/indexeddb'
 
-// import { testCRSqlite } from './modules/crsqlite'
-
 const sqljsWorker = new SqljsWorker()
 const { result, run } = useDB()
 const officialWorker = new OfficialWorker()
@@ -56,7 +54,10 @@ async function clear() {
   <h3>see worker result in console</h3>
   <h3>
     you can explore
-    <a href="https://developer.mozilla.org/en-US/docs/Web/API/File_System_Access_API#origin_private_file_system" target="_blank">
+    <a
+      href="https://developer.mozilla.org/en-US/docs/Web/API/File_System_Access_API#origin_private_file_system"
+      target="_blank"
+    >
       OPFS
     </a>
     file using
@@ -95,31 +96,41 @@ async function clear() {
 </template>
 
 <style>
-button, a {
+button,
+a {
   font-family: sans-serif;
 }
+
 button {
   margin: 0 10px 10px;
   padding: 4px 8px;
   border-radius: 4px;
 }
+
 button:hover {
   background-color: lightblue;
   transition: 0.2s;
 }
-h1, h3 {
+
+h1,
+h3 {
   text-align: center;
 }
+
 h1 {
   margin-bottom: 0;
 }
-div, pre {
+
+div,
+pre {
   width: fit-content;
   margin: 0 auto 20px;
 }
+
 .buttons {
   display: flex;
 }
+
 pre {
   padding: 0 20px;
   border: 2px solid lightblue;
@@ -128,11 +139,13 @@ pre {
   width: 380px;
   overflow-y: scroll;
 }
-::-webkit-scrollbar{
+
+::-webkit-scrollbar {
   width: 6px;
   height: 6px;
 }
-::-webkit-scrollbar-thumb{
+
+::-webkit-scrollbar-thumb {
   width: 6px;
   border-radius: 6px;
   background-color: gray;

playground/src/modules/utils.ts

@@ -1,14 +1,15 @@
 import type { Dialect } from 'kysely'
 import { SqliteBuilder } from 'kysely-sqlite-builder'
 import type { InferDatabase } from 'kysely-sqlite-builder/schema'
-import { defineTable, useSchema } from 'kysely-sqlite-builder/schema'
+import { column, defineTable, useSchema } from 'kysely-sqlite-builder/schema'
 
 const tables = {
   test: defineTable({
-    id: { type: 'increments' },
-    name: { type: 'string' },
-    blobtest: { type: 'blob' },
-  }, {
+    columns: {
+      id: column.increments(),
+      name: column.string(),
+      blobtest: column.blob(),
+    },
     timeTrigger: { create: true, update: true },
   }),
 }
@@ -23,7 +24,7 @@ export async function testDB(dialect: Dialect) {
   if (!result.ready) {
     throw result.error
   }
-  console.log(await db.raw(`PRAGMA table_info('test')`))
+  console.log(await db.execute(`PRAGMA table_info('test')`))
 
   for (let i = 0; i < 10; i++) {
     await db.transaction(async () => {
@@ -32,18 +33,17 @@ export async function testDB(dialect: Dialect) {
           console.log('test rollback')
           throw new Error('test rollback')
         }
-        await db.execute(d => d
-          .insertInto('test')
+        await db.insertInto('test')
           .values({
             name: `test at ${Date.now()}`,
             blobtest: Uint8Array.from([2, 3, 4, 5, 6, 7, 8]),
-          }),
-        )
+          })
+          .execute()
       })
     })
   }
 
-  return db.execute(db => db.selectFrom('test').selectAll()).then(async (data) => {
+  return db.selectFrom('test').selectAll().execute().then(async (data) => {
     await db.destroy()
     console.log(data)
     return data