From e7ee76f572b7c8504a18efe7dc734e4893b1ef2b Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Wed, 11 Mar 2026 05:40:37 +0100 Subject: [PATCH] Updates --- dist/commands/schema.js | 1 + dist/commands/typedef.js | 1 + dist/lib/sqlite/db-schema-to-typedef.d.ts | 7 ++++--- dist/lib/sqlite/db-schema-to-typedef.js | 8 +++----- dist/lib/sqlite/schema-to-typedef.d.ts | 5 +++-- dist/lib/sqlite/schema-to-typedef.js | 4 ++-- package.json | 2 +- src/commands/schema.ts | 1 + src/commands/typedef.ts | 1 + src/lib/sqlite/db-schema-to-typedef.ts | 19 ++++++++++++------- src/lib/sqlite/schema-to-typedef.ts | 14 +++++++++++--- 11 files changed, 40 insertions(+), 23 deletions(-) diff --git a/dist/commands/schema.js b/dist/commands/schema.js index c05c9bf..6f3edef 100644 --- a/dist/commands/schema.js +++ b/dist/commands/schema.js @@ -30,6 +30,7 @@ export default function () { dbSchemaToTypeDef({ dbSchema: finaldbSchema, dst_file: out_file, + config, }); } console.log(`${chalk.bold(chalk.green(`DB Schema setup success!`))}`); diff --git a/dist/commands/typedef.js b/dist/commands/typedef.js index df2863c..d167d4e 100644 --- a/dist/commands/typedef.js +++ b/dist/commands/typedef.js @@ -18,6 +18,7 @@ export default function () { dbSchemaToTypeDef({ dbSchema: finaldbSchema, dst_file: out_file, + config, }); } else { diff --git a/dist/lib/sqlite/db-schema-to-typedef.d.ts b/dist/lib/sqlite/db-schema-to-typedef.d.ts index 43062ab..1643a8f 100644 --- a/dist/lib/sqlite/db-schema-to-typedef.d.ts +++ b/dist/lib/sqlite/db-schema-to-typedef.d.ts @@ -1,6 +1,7 @@ -import type { BUN_SQLITE_DatabaseSchemaType } from "../../types"; +import type { BUN_SQLITE_DatabaseSchemaType, BunSQLiteConfig } from "../../types"; type Params = { - dbSchema?: BUN_SQLITE_DatabaseSchemaType; + dbSchema: BUN_SQLITE_DatabaseSchemaType; + config: BunSQLiteConfig; }; -export default function dbSchemaToType(params?: Params): string[] | undefined; +export default function dbSchemaToType({ config, dbSchema, }: Params): string[] | undefined; export {}; diff --git a/dist/lib/sqlite/db-schema-to-typedef.js b/dist/lib/sqlite/db-schema-to-typedef.js index 1739dbb..fb71f6f 100644 --- a/dist/lib/sqlite/db-schema-to-typedef.js +++ b/dist/lib/sqlite/db-schema-to-typedef.js @@ -1,16 +1,14 @@ import _ from "lodash"; import generateTypeDefinition from "./db-generate-type-defs"; -export default function dbSchemaToType(params) { - let datasquirelSchema = params?.dbSchema; +export default function dbSchemaToType({ config, dbSchema, }) { + let datasquirelSchema = dbSchema; if (!datasquirelSchema) return; let tableNames = `export const BunSQLiteTables = [\n${datasquirelSchema.tables .map((tbl) => ` "${tbl.tableName}",`) .join("\n")}\n] as const`; const dbTablesSchemas = datasquirelSchema.tables; - const defDbName = datasquirelSchema.dbName - ?.toUpperCase() - .replace(/ |\-/g, "_"); + const defDbName = config.db_name?.toUpperCase().replace(/ |\-/g, "_"); const defNames = []; const schemas = dbTablesSchemas .map((table) => { diff --git a/dist/lib/sqlite/schema-to-typedef.d.ts b/dist/lib/sqlite/schema-to-typedef.d.ts index bc433e8..ec02d14 100644 --- a/dist/lib/sqlite/schema-to-typedef.d.ts +++ b/dist/lib/sqlite/schema-to-typedef.d.ts @@ -1,7 +1,8 @@ -import type { BUN_SQLITE_DatabaseSchemaType } from "../../types"; +import type { BUN_SQLITE_DatabaseSchemaType, BunSQLiteConfig } from "../../types"; type Params = { dbSchema: BUN_SQLITE_DatabaseSchemaType; dst_file: string; + config: BunSQLiteConfig; }; -export default function dbSchemaToTypeDef({ dbSchema, dst_file }: Params): void; +export default function dbSchemaToTypeDef({ dbSchema, dst_file, config, }: Params): void; export {}; diff --git a/dist/lib/sqlite/schema-to-typedef.js b/dist/lib/sqlite/schema-to-typedef.js index ff0231d..f0c5ac3 100644 --- a/dist/lib/sqlite/schema-to-typedef.js +++ b/dist/lib/sqlite/schema-to-typedef.js @@ -1,11 +1,11 @@ import path from "node:path"; import { existsSync, mkdirSync, writeFileSync } from "node:fs"; import dbSchemaToType from "./db-schema-to-typedef"; -export default function dbSchemaToTypeDef({ dbSchema, dst_file }) { +export default function dbSchemaToTypeDef({ dbSchema, dst_file, config, }) { try { if (!dbSchema) throw new Error("No schema found"); - const definitions = dbSchemaToType({ dbSchema }); + const definitions = dbSchemaToType({ dbSchema, config }); const ourfileDir = path.dirname(dst_file); if (!existsSync(ourfileDir)) { mkdirSync(ourfileDir, { recursive: true }); diff --git a/package.json b/package.json index d3378d9..aefe3ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/bun-sqlite", - "version": "1.0.9", + "version": "1.0.10", "description": "SQLite manager for Bun", "author": "Benjamin Toby", "main": "dist/index.js", diff --git a/src/commands/schema.ts b/src/commands/schema.ts index 2e543ae..a797e95 100644 --- a/src/commands/schema.ts +++ b/src/commands/schema.ts @@ -44,6 +44,7 @@ export default function () { dbSchemaToTypeDef({ dbSchema: finaldbSchema, dst_file: out_file, + config, }); } diff --git a/src/commands/typedef.ts b/src/commands/typedef.ts index 65dd52f..0422e48 100644 --- a/src/commands/typedef.ts +++ b/src/commands/typedef.ts @@ -25,6 +25,7 @@ export default function () { dbSchemaToTypeDef({ dbSchema: finaldbSchema, dst_file: out_file, + config, }); } else { console.error(``); diff --git a/src/lib/sqlite/db-schema-to-typedef.ts b/src/lib/sqlite/db-schema-to-typedef.ts index 978d216..1afccc6 100644 --- a/src/lib/sqlite/db-schema-to-typedef.ts +++ b/src/lib/sqlite/db-schema-to-typedef.ts @@ -1,13 +1,20 @@ import _ from "lodash"; -import type { BUN_SQLITE_DatabaseSchemaType } from "../../types"; +import type { + BUN_SQLITE_DatabaseSchemaType, + BunSQLiteConfig, +} from "../../types"; import generateTypeDefinition from "./db-generate-type-defs"; type Params = { - dbSchema?: BUN_SQLITE_DatabaseSchemaType; + dbSchema: BUN_SQLITE_DatabaseSchemaType; + config: BunSQLiteConfig; }; -export default function dbSchemaToType(params?: Params): string[] | undefined { - let datasquirelSchema = params?.dbSchema; +export default function dbSchemaToType({ + config, + dbSchema, +}: Params): string[] | undefined { + let datasquirelSchema = dbSchema; if (!datasquirelSchema) return; @@ -17,9 +24,7 @@ export default function dbSchemaToType(params?: Params): string[] | undefined { const dbTablesSchemas = datasquirelSchema.tables; - const defDbName = datasquirelSchema.dbName - ?.toUpperCase() - .replace(/ |\-/g, "_"); + const defDbName = config.db_name?.toUpperCase().replace(/ |\-/g, "_"); const defNames: string[] = []; diff --git a/src/lib/sqlite/schema-to-typedef.ts b/src/lib/sqlite/schema-to-typedef.ts index 9a1e79f..74aaf37 100644 --- a/src/lib/sqlite/schema-to-typedef.ts +++ b/src/lib/sqlite/schema-to-typedef.ts @@ -1,18 +1,26 @@ import path from "node:path"; import { existsSync, mkdirSync, writeFileSync } from "node:fs"; -import type { BUN_SQLITE_DatabaseSchemaType } from "../../types"; +import type { + BUN_SQLITE_DatabaseSchemaType, + BunSQLiteConfig, +} from "../../types"; import dbSchemaToType from "./db-schema-to-typedef"; type Params = { dbSchema: BUN_SQLITE_DatabaseSchemaType; dst_file: string; + config: BunSQLiteConfig; }; -export default function dbSchemaToTypeDef({ dbSchema, dst_file }: Params) { +export default function dbSchemaToTypeDef({ + dbSchema, + dst_file, + config, +}: Params) { try { if (!dbSchema) throw new Error("No schema found"); - const definitions = dbSchemaToType({ dbSchema }); + const definitions = dbSchemaToType({ dbSchema, config }); const ourfileDir = path.dirname(dst_file);