Updates

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!`))}`);

dist/commands/typedef.js

@@ -18,6 +18,7 @@ export default function () {
             dbSchemaToTypeDef({
                 dbSchema: finaldbSchema,
                 dst_file: out_file,
+                config,
             });
         }
         else {

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 {};

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) {
+export default function dbSchemaToType({ config, dbSchema, }) {
-    let datasquirelSchema = params?.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
+    const defDbName = config.db_name?.toUpperCase().replace(/ |\-/g, "_");
-        ?.toUpperCase()
-        .replace(/ |\-/g, "_");
     const defNames = [];
     const schemas = dbTablesSchemas
         .map((table) => {

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 {};

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 });

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",

src/commands/schema.ts

@@ -44,6 +44,7 @@ export default function () {
                 dbSchemaToTypeDef({
                     dbSchema: finaldbSchema,
                     dst_file: out_file,
+                    config,
                 });
             }
 

src/commands/typedef.ts

@@ -25,6 +25,7 @@ export default function () {
                 dbSchemaToTypeDef({
                     dbSchema: finaldbSchema,
                     dst_file: out_file,
+                    config,
                 });
             } else {
                 console.error(``);

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 {
+export default function dbSchemaToType({
-    let datasquirelSchema = params?.dbSchema;
+    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
+    const defDbName = config.db_name?.toUpperCase().replace(/ |\-/g, "_");
-        ?.toUpperCase()
-        .replace(/ |\-/g, "_");
 
     const defNames: string[] = [];
 

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);