fix: type correct and bundle #1

Author: subframe7536

package.json

@@ -61,11 +61,9 @@
  "access": "public",
  "registry": "https://registry.npmjs.org/"
  },
- "dependencies": {
- "@subframe7536/type-utils": "^0.1.6"
- },
  "devDependencies": {
  "@subframe7536/eslint-config": "^0.9.4",
+ "@subframe7536/type-utils": "^0.1.6",
  "@types/node": "^20.16.13",
  "bumpp": "^9.7.1",
  "eslint": "^9.13.0",

pnpm-lock.yaml

@@ -1,5 +1,4 @@
-import type { Promisable } from '@subframe7536/type-utils'
-import type { Options, SQLiteDB, SQLiteDBCore } from './types'
+import type { Options, Promisable, SQLiteDB, SQLiteDBCore } from './types'
 import { Factory, SQLITE_OPEN_CREATE, SQLITE_OPEN_READONLY, SQLITE_OPEN_READWRITE, SQLITE_ROW } from 'wa-sqlite'
 
 /**
@@ -31,7 +30,7 @@ export async function initSQLiteCore(
  const { path, sqliteModule, vfsFn, vfsOptions, readonly } = await options
  const sqlite = Factory(sqliteModule)
  const vfs = await vfsFn(path, sqliteModule, vfsOptions)
- sqlite.vfs_register(vfs, true)
+ sqlite.vfs_register(vfs as unknown as SQLiteVFS, true)
  const db = await sqlite.open_v2(
  path,
  readonly ? SQLITE_OPEN_READONLY : SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,

src/core.ts

@@ -1,9 +1,49 @@
-import type { Promisable } from '@subframe7536/type-utils'
-import { Base } from 'wa-sqlite/src/VFS.js'
+import type { Base } from 'wa-sqlite/src/VFS.js'
 
-// eslint-disable-next-line unused-imports/no-unused-vars
-declare class ISQLiteVFS extends Base {
- public static create(name: string, module: any, options?: any): Promisable<SQLiteVFS>
+export type Promisable<T> = T | Promise<T>
+
+export interface FacadeVFS extends Base {
+ close: () => void | Promise<void>
+
+ isReady: () => boolean | Promise<boolean>
+
+ hasAsyncMethod: (methodName: string) => boolean
+
+ getFilename: (pFile: number) => string
+
+ jOpen: (filename: string, pFile: number, flags: number, pOutFlags: DataView) => number | Promise<number>
+
+ jDelete: (filename: string, syncDir: number) => number | Promise<number>
+
+ jAccess: (filename: string, flags: number, pResOut: DataView) => number | Promise<number>
+
+ jFullPathname: (filename: string, zOut: Uint8Array) => number | Promise<number>
+
+ jGetLastError: (zBuf: Uint8Array) => number | Promise<number>
+
+ jClose: (pFile: number) => number | Promise<number>
+
+ jRead: (pFile: number, pData: Uint8Array, iOffset: number) => number | Promise<number>
+
+ jWrite: (pFile: number, pData: Uint8Array, iOffset: number) => number | Promise<number>
+
+ jTruncate: (pFile: number, size: number) => number | Promise<number>
+
+ jSync: (pFile: number, flags: number) => number | Promise<number>
+
+ jFileSize: (pFile: number, pSize: DataView) => number | Promise<number>
+
+ jLock: (pFile: number, lockType: number) => number | Promise<number>
+
+ jUnlock: (pFile: number, lockType: number) => number | Promise<number>
+
+ jCheckReservedLock: (pFile: number, pResOut: DataView) => number | Promise<number>
+
+ jFileControl: (pFile: number, op: number, pArg: DataView) => number | Promise<number>
+
+ jSectorSize: (pFile: number) => number | Promise<number>
+
+ jDeviceCharacteristics: (pFile: number) => number | Promise<number>
 }
 
 export type IDBBatchAtomicVFSOptions = {
@@ -22,7 +62,7 @@ export type IDBBatchAtomicVFSOptions = {
 export type Options = {
  path: string
  sqliteModule: any
- vfsFn: typeof ISQLiteVFS['create']
+ vfsFn: (name: string, module: any, options?: any) => Promisable<FacadeVFS>
  vfsOptions?: any
  readonly?: boolean
 }
@@ -47,7 +87,7 @@ export type SQLiteDBCore = {
  /**
  * SQLite vfs
  */
- vfs: SQLiteVFS
+ vfs: FacadeVFS
 }
 
 export type SQLiteDB = SQLiteDBCore & {

src/types/index.ts

@@ -1,17 +1,17 @@
 declare module 'wa-sqlite/src/examples/IDBBatchAtomicVFS.js' {
  export class IDBBatchAtomicVFS {
- static create(name: string, module: any, options: any): Promise<SQLiteVFS>
+ static create(name: string, module: any, options: any): Promise<any>
  }
 }
 
 declare module 'wa-sqlite/src/examples/IDBMirrorVFS.js' {
  export class IDBMirrorVFS {
- static create(name: string, module: any): Promise<SQLiteVFS>
+ static create(name: string, module: any): Promise<any>
  }
 }
 
 declare module 'wa-sqlite/src/examples/OPFSCoopSyncVFS.js' {
  export class OPFSCoopSyncVFS {
- static create(name: string, module: any): Promise<SQLiteVFS>
+ static create(name: string, module: any): Promise<any>
  }
 }

src/types/wa-sqlite.d.ts

@@ -10,7 +10,7 @@ export default defineConfig({
  constant: 'src/constant.ts',
  },
  format: ['esm', 'cjs'],
- dts: true,
+ dts: { resolve: true },
  treeshake: true,
  tsconfig: './tsconfig.json',
  noExternal: ['wa-sqlite'],