chore: update @subframe7536/sqlite-wasm to v1.3.0 in dependencies and peerDependencies

Author: subframe7536

packages/dialect-wasqlite-worker/package.json

@@ -60,12 +60,12 @@
     "zen-mitt": "^3.1.0"
   },
   "devDependencies": {
-    "@subframe7536/sqlite-wasm": "^1.2.0",
+    "@subframe7536/sqlite-wasm": "^1.3.0",
     "kysely": "catalog:",
     "wa-sqlite": "^1.0.0"
   },
   "peerDependencies": {
-    "@subframe7536/sqlite-wasm": ">=0.5.0",
+    "@subframe7536/sqlite-wasm": ">=1.3.0",
     "kysely": ">=0.29"
   }
 }

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

@@ -1,13 +1,10 @@
 import type { SQLiteDBCore } from '@subframe7536/sqlite-wasm'
 import {
-  changes as changesCore,
-  close as closeCore,
-  lastInsertRowId as lastInsertRowIdCore,
+  close as coreClose,
+  query as coreQuery,
+  iterator as coreIterator,
 } from '@subframe7536/sqlite-wasm'
-import { SQLITE_OK, SQLITE_ROW } from '@subframe7536/sqlite-wasm/constant'
-import type { QueryResult } from 'kysely'
 import type { IGenericSqlite, Promisable } from 'kysely-generic-sqlite'
-import { parseBigInt } from 'kysely-generic-sqlite'
 import type { MessageHandleFn } from 'kysely-generic-sqlite/worker'
 import { createWebOnMessageCallback } from 'kysely-generic-sqlite/worker-helper-web'
 
@@ -23,83 +20,6 @@ export const defaultCreateDatabaseFn: CreateDatabaseFn = async ({ fileName, url,
   )
 }
 
-function createRowMapper(sqlite: SQLiteDBCore['sqlite'], stmt: number) {
-  const cols = sqlite.column_names(stmt)
-  return (row: any[]) => Object.fromEntries(cols.map((key, i) => [key, row[i]]))
-}
-
-async function queryData(
-  core: SQLiteDBCore,
-  sql: string,
-  parameters?: readonly any[],
-): Promise<QueryResult<any>> {
-  const iterator = core.sqlite.statements(core.pointer, sql)[Symbol.asyncIterator]()
-  const { value: stmt } = await iterator.next()
-
-  try {
-    if (parameters?.length) {
-      core.sqlite.bind_collection(stmt, parameters)
-    }
-
-    const size = core.sqlite.column_count(stmt)
-    if (size === 0) {
-      await core.sqlite.step(stmt)
-      return {
-        rows: [],
-        insertId: parseBigInt(lastInsertRowIdCore(core)),
-        numAffectedRows: parseBigInt(changesCore(core)),
-      }
-    }
-
-    const mapRow = createRowMapper(core.sqlite, stmt)
-    const result = []
-    let idx = 0
-    while ((await core.sqlite.step(stmt)) === SQLITE_ROW) {
-      result[idx++] = mapRow(core.sqlite.row(stmt))
-    }
-    return { rows: result }
-  } finally {
-    await iterator.return?.()
-  }
-}
-
-async function* iterateDate(
-  core: SQLiteDBCore,
-  sql: string,
-  parameters?: readonly any[],
-  chunkSize = 1,
-): AsyncIterableIterator<any[]> {
-  const { sqlite, pointer } = core
-  let cache = new Array(chunkSize)
-  for await (const stmt of sqlite.statements(pointer, sql)) {
-    if (parameters?.length) {
-      sqlite.bind_collection(stmt, parameters)
-    }
-    let idx = 0
-    const mapRow = createRowMapper(core.sqlite, stmt)
-    while (1) {
-      const result = await sqlite.step(stmt)
-      if (result === SQLITE_ROW) {
-        cache[idx] = mapRow(core.sqlite.row(stmt))
-        if (++idx === chunkSize) {
-          yield cache.slice(0, idx)
-          idx = 0
-        }
-      } else if (result === SQLITE_OK) {
-        if (++idx === chunkSize) {
-          yield []
-        }
-      } else {
-        if (idx > 0) {
-          yield cache.slice(0, idx)
-        }
-        break
-      }
-    }
-  }
-  cache = undefined!
-}
-
 /**
  * Handle worker message, support custom message handler,
  * built-in: {@link defaultCreateDatabaseFn}
@@ -136,9 +56,11 @@ export function createOnMessageCallback(
 export function createSqliteExecutor(db: SQLiteDBCore): IGenericSqlite<SQLiteDBCore> {
   return {
     db,
-    query: async (_isSelect, sql, parameters) => await queryData(db, sql, parameters),
-    close: async () => await closeCore(db),
+    query: async (_isSelect, sql, parameters) => ({
+      rows: await coreQuery(db, sql, parameters as any[]),
+    }),
+    close: async () => await coreClose(db),
     iterator: (_isSelect, sql, parameters, chunkSize) =>
-      iterateDate(db, sql, parameters as any[], chunkSize),
+      coreIterator(db, sql, parameters as any[], chunkSize),
   }
 }