typesql-cli 0.9.6 → 0.10.1

package/sqlite-query-analyzer/code-generator.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTsCode = exports.generateCrud = exports.validateAndGenerateCode = void 0;
+exports.validateAndGenerateCode = validateAndGenerateCode;
+exports.generateCrud = generateCrud;
+exports.generateTsCode = generateTsCode;
 const Either_1 = require("fp-ts/lib/Either");
 const parser_1 = require("./parser");
 const code_generator_1 = require("../code-generator");
@@ -12,7 +14,7 @@ const ts_nested_descriptor_1 = require("../ts-nested-descriptor");
 const describe_query_1 = require("../describe-query");
 const query_executor_1 = require("./query-executor");
 const ts_dynamic_query_descriptor_1 = require("../ts-dynamic-query-descriptor");
-const os_1 = require("os");
+const node_os_1 = require("node:os");
 function validateAndGenerateCode(client, sql, queryName, sqliteDbSchema, isCrud = false) {
     const { sql: processedSql } = (0, describe_query_1.preprocessSql)(sql);
     const explainSqlResult = (0, query_executor_1.explainSql)(client.client, processedSql);
@@ -22,12 +24,11 @@ function validateAndGenerateCode(client, sql, queryName, sqliteDbSchema, isCrud
             description: explainSqlResult.left.description
         });
     }
-    const code = generateTsCode(sql, queryName, sqliteDbSchema, isCrud, client.type);
+    const code = generateTsCode(sql, queryName, sqliteDbSchema, client.type, isCrud);
     return code;
 }
-exports.validateAndGenerateCode = validateAndGenerateCode;
 function mapToColumnInfo(col, checkOptional) {
-    const defaultValue = col.columnKey == 'PRI' && col.column_type == 'INTEGER' ? 'AUTOINCREMENT' : col.defaultValue;
+    const defaultValue = col.columnKey === 'PRI' && col.column_type === 'INTEGER' ? 'AUTOINCREMENT' : col.defaultValue;
     const columnInfo = {
         columnName: col.column,
         notNull: col.notNull,
@@ -37,45 +38,44 @@ function mapToColumnInfo(col, checkOptional) {
     };
     return columnInfo;
 }
-function generateCrud(client = 'sqlite', queryType, tableName, dbSchema) {
-    const columns = dbSchema.filter(col => col.table == tableName);
-    const columnInfo = columns.map(col => mapToColumnInfo(col, queryType == 'Insert' || queryType == 'Update'));
-    const keys = columns.filter(col => col.columnKey == 'PRI');
-    if (keys.length == 0) {
-        keys.push(...columns.filter(col => col.columnKey == 'UNI'));
-    }
-    const keyColumnInfo = keys.map(key => mapToColumnInfo(key, false)).map(col => mapColumnToTsFieldDescriptor(col, client));
+function generateCrud(client, queryType, tableName, dbSchema) {
+    const columns = dbSchema.filter((col) => col.table === tableName);
+    const columnInfo = columns.map((col) => mapToColumnInfo(col, queryType === 'Insert' || queryType === 'Update'));
+    const keys = columns.filter((col) => col.columnKey === 'PRI');
+    if (keys.length === 0) {
+        keys.push(...columns.filter((col) => col.columnKey === 'UNI'));
+    }
+    const keyColumnInfo = keys.map((key) => mapToColumnInfo(key, false)).map((col) => mapColumnToTsFieldDescriptor(col, client));
     const resultColumns = mapColumns(client, queryType, columnInfo, false);
-    const params = columnInfo.map(col => mapColumnToTsFieldDescriptor(col, client));
+    const params = columnInfo.map((col) => mapColumnToTsFieldDescriptor(col, client));
     const tsDescriptor = {
         sql: '',
         queryType,
         multipleRowsResult: false,
         columns: resultColumns,
         parameterNames: [],
-        parameters: queryType == 'Insert' ? params : keyColumnInfo,
-        data: queryType == 'Update' ? params.filter(param => { var _a; return param.name != ((_a = keyColumnInfo[0]) === null || _a === void 0 ? void 0 : _a.name); }) : []
+        parameters: queryType === 'Insert' ? params : keyColumnInfo,
+        data: queryType === 'Update' ? params.filter((param) => { var _a; return param.name !== ((_a = keyColumnInfo[0]) === null || _a === void 0 ? void 0 : _a.name); }) : []
     };
     const queryName = getQueryName(queryType, tableName);
     const code = generateCodeFromTsDescriptor(client, queryName, tsDescriptor, true, tableName);
     return code;
 }
-exports.generateCrud = generateCrud;
 function getQueryName(queryType, tableName) {
     const camelCaseName = (0, code_generator_1.convertToCamelCaseName)(tableName);
     const captitalizedName = (0, code_generator_1.capitalize)(camelCaseName);
     switch (queryType) {
-        case "Select":
-            return 'selectFrom' + captitalizedName;
-        case "Insert":
-            return 'insertInto' + captitalizedName;
-        case "Update":
-            return 'update' + captitalizedName;
-        case "Delete":
-            return 'deleteFrom' + captitalizedName;
+        case 'Select':
+            return `selectFrom${captitalizedName}`;
+        case 'Insert':
+            return `insertInto${captitalizedName}`;
+        case 'Update':
+            return `update${captitalizedName}`;
+        case 'Delete':
+            return `deleteFrom${captitalizedName}`;
     }
 }
-function generateTsCode(sql, queryName, sqliteDbSchema, isCrud = false, client = 'sqlite') {
+function generateTsCode(sql, queryName, sqliteDbSchema, client, isCrud = false) {
     const schemaDefResult = (0, parser_1.parseSql)(sql, sqliteDbSchema);
     if ((0, Either_1.isLeft)(schemaDefResult)) {
         return schemaDefResult;
@@ -84,7 +84,6 @@ function generateTsCode(sql, queryName, sqliteDbSchema, isCrud = false, client =
     const code = generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud);
     return (0, Either_1.right)(code);
 }
-exports.generateTsCode = generateTsCode;
 function createTsDescriptor(queryInfo, client) {
     var _a;
     const tsDescriptor = {
@@ -94,17 +93,17 @@ function createTsDescriptor(queryInfo, client) {
         returning: queryInfo.returning,
         columns: mapColumns(client, queryInfo.queryType, queryInfo.columns, queryInfo.returning),
         parameterNames: [],
-        parameters: queryInfo.parameters.map(param => mapParameterToTsFieldDescriptor(param, client)),
-        data: (_a = queryInfo.data) === null || _a === void 0 ? void 0 : _a.map(param => mapParameterToTsFieldDescriptor(param, client)),
+        parameters: queryInfo.parameters.map((param) => mapParameterToTsFieldDescriptor(param, client)),
+        data: (_a = queryInfo.data) === null || _a === void 0 ? void 0 : _a.map((param) => mapParameterToTsFieldDescriptor(param, client)),
         orderByColumns: queryInfo.orderByColumns
     };
     if (queryInfo.nestedInfo) {
-        const nestedDescriptor2 = queryInfo.nestedInfo.map(relation => {
+        const nestedDescriptor2 = queryInfo.nestedInfo.map((relation) => {
             const tsRelation = {
                 groupIndex: relation.groupIndex,
                 name: relation.name,
-                fields: relation.fields.map(field => mapFieldToTsField(queryInfo.columns, field, client)),
-                relations: relation.relations.map(relation => (0, ts_nested_descriptor_1.mapToTsRelation2)(relation))
+                fields: relation.fields.map((field) => mapFieldToTsField(queryInfo.columns, field, client)),
+                relations: relation.relations.map((relation) => (0, ts_nested_descriptor_1.mapToTsRelation2)(relation))
             };
             return tsRelation;
         });
@@ -138,13 +137,13 @@ function mapColumns(client, queryType, columns, returning = false) {
             notNull: true
         }
     ];
-    if (queryType == 'Insert' && !returning) {
-        return client == 'sqlite' ? sqliteInsertColumns : libSqlInsertColumns;
+    if (queryType === 'Insert' && !returning) {
+        return client === 'better-sqlite3' || client == 'bun:sqlite' ? sqliteInsertColumns : libSqlInsertColumns;
     }
-    if (queryType == 'Update' || queryType == 'Delete') {
-        return client == 'sqlite' ? [sqliteInsertColumns[0]] : [libSqlInsertColumns[0]];
+    if (queryType === 'Update' || queryType === 'Delete') {
+        return client === 'better-sqlite3' || client == 'bun:sqlite' ? [sqliteInsertColumns[0]] : [libSqlInsertColumns[0]];
     }
-    const escapedColumnsNames = (0, code_generator_1.renameInvalidNames)(columns.map(col => col.columnName));
+    const escapedColumnsNames = (0, code_generator_1.renameInvalidNames)(columns.map((col) => col.columnName));
     return columns.map((col, index) => mapColumnToTsFieldDescriptor(Object.assign(Object.assign({}, col), { columnName: escapedColumnsNames[index] }), client));
 }
 function mapFieldToTsField(columns, field, client) {
@@ -194,7 +193,7 @@ function mapColumnType(sqliteType, client) {
         case 'DATE':
             return 'Date';
         case 'BLOB':
-            return client == 'sqlite' ? 'Uint8Array' : 'ArrayBuffer';
+            return client === 'better-sqlite3' ? 'Uint8Array' : 'ArrayBuffer';
     }
 }
 function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud = false, tableName = '') {
@@ -206,35 +205,38 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
     const capitalizedName = (0, code_generator_1.capitalize)(camelCaseName);
     const queryType = tsDescriptor.queryType;
     const sql = tsDescriptor.sql;
-    const dataTypeName = capitalizedName + 'Data';
-    const paramsTypeName = capitalizedName + 'Params';
-    const resultTypeName = capitalizedName + 'Result';
-    const dynamicParamsTypeName = capitalizedName + 'DynamicParams';
-    const selectColumnsTypeName = capitalizedName + 'Select';
-    const whereTypeName = capitalizedName + 'Where';
-    const orderByTypeName = capitalizedName + 'OrderBy';
+    const dataTypeName = `${capitalizedName}Data`;
+    const paramsTypeName = `${capitalizedName}Params`;
+    const resultTypeName = `${capitalizedName}Result`;
+    const dynamicParamsTypeName = `${capitalizedName}DynamicParams`;
+    const selectColumnsTypeName = `${capitalizedName}Select`;
+    const whereTypeName = `${capitalizedName}Where`;
+    const orderByTypeName = `${capitalizedName}OrderBy`;
     const generateOrderBy = tsDescriptor.orderByColumns != null && tsDescriptor.orderByColumns.length > 0;
     const uniqueParams = (0, code_generator_1.removeDuplicatedParameters2)(tsDescriptor.parameters);
     const uniqueUpdateParams = (0, code_generator_1.removeDuplicatedParameters2)(tsDescriptor.data || []);
     const orderByField = generateOrderBy ? `orderBy: [${orderByTypeName}, 'asc' | 'desc'][]` : undefined;
     const paramsTypes = (0, code_generator_1.removeDuplicatedParameters2)(tsDescriptor.dynamicQuery2 == null ? tsDescriptor.parameters : (0, ts_dynamic_query_descriptor_1.mapToDynamicParams)(tsDescriptor.parameters));
-    let functionArguments = client == 'sqlite' ? `db: Database` : 'client: Client | Transaction';
-    functionArguments += queryType == 'Update' ? `, data: ${dataTypeName}` : '';
+    let functionArguments = client === 'better-sqlite3' || client == 'bun:sqlite' ? 'db: Database' : 'client: Client | Transaction';
+    functionArguments += queryType === 'Update' ? `, data: ${dataTypeName}` : '';
     if (tsDescriptor.dynamicQuery2 == null) {
-        functionArguments += tsDescriptor.parameters.length > 0 || generateOrderBy ? ', params: ' + paramsTypeName : '';
+        functionArguments += tsDescriptor.parameters.length > 0 || generateOrderBy ? `, params: ${paramsTypeName}` : '';
     }
     else {
         functionArguments += `, ${orderByField ? 'params' : 'params?'}: ${dynamicParamsTypeName}`;
     }
-    const orNull = queryType == 'Select' ? ' | null' : '';
+    const orNull = queryType === 'Select' ? ' | null' : '';
     const returnType = tsDescriptor.multipleRowsResult ? `${resultTypeName}[]` : `${resultTypeName}${orNull}`;
-    const allParameters = (((_a = tsDescriptor.data) === null || _a === void 0 ? void 0 : _a.map((param) => fromDriver('data', param))) || [])
-        .concat(tsDescriptor.parameters.map(param => fromDriver('params', param)));
-    const queryParams = allParameters.length > 0 ? '[' + allParameters.join(', ') + ']' : '';
-    if (client == 'sqlite') {
+    const allParameters = (((_a = tsDescriptor.data) === null || _a === void 0 ? void 0 : _a.map((param) => fromDriver('data', param))) || []).concat(tsDescriptor.parameters.map((param) => fromDriver('params', param)));
+    const queryParamsWithoutBrackets = allParameters.length > 0 ? `${allParameters.join(', ')}` : '';
+    const queryParams = queryParamsWithoutBrackets !== '' ? `[${queryParamsWithoutBrackets}]` : '';
+    if (client === 'better-sqlite3') {
         writer.writeLine(`import type { Database } from 'better-sqlite3';`);
     }
-    if (client == 'libsql') {
+    if (client === 'bun:sqlite') {
+        writer.writeLine(`import type { Database } from 'bun:sqlite';`);
+    }
+    if (client === 'libsql') {
         writer.writeLine(`import type { Client, Transaction } from '@libsql/client';`);
     }
     if (tsDescriptor.dynamicQuery2 != null) {
@@ -256,7 +258,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         (0, code_generator_1.writeTypeBlock)(writer, resultTypes, resultTypeName, false);
         const selectFields = (0, ts_dynamic_query_descriptor_1.mapToDynamicSelectColumns)(tsDescriptor.columns);
         (0, code_generator_1.writeTypeBlock)(writer, selectFields, selectColumnsTypeName, false);
-        writer.write(`const selectFragments = `).inlineBlock(() => {
+        writer.write('const selectFragments = ').inlineBlock(() => {
             var _a;
             (_a = tsDescriptor.dynamicQuery2) === null || _a === void 0 ? void 0 : _a.select.forEach((fragment, index) => {
                 const field = tsDescriptor.columns[index].name;
@@ -266,7 +268,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         writer.write(' as const;');
         writer.blankLine();
         writer.writeLine(`const NumericOperatorList = ['=', '<>', '>', '<', '>=', '<='] as const;`);
-        writer.writeLine(`type NumericOperator = typeof NumericOperatorList[number];`);
+        writer.writeLine('type NumericOperator = typeof NumericOperatorList[number];');
         if ((0, code_generator_1.hasStringColumn)(tsDescriptor.columns)) {
             writer.writeLine(`type StringOperator = '=' | '<>' | '>' | '<' | '>=' | '<=' | 'LIKE';`);
         }
@@ -274,20 +276,20 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         writer.writeLine(`type BetweenOperator = 'BETWEEN';`);
         writer.blankLine();
         writer.write(`export type ${whereTypeName} =`).indent(() => {
-            tsDescriptor.columns.forEach(col => {
+            tsDescriptor.columns.forEach((col) => {
                 writer.writeLine(`| ['${col.name}', ${(0, code_generator_1.getOperator)(col.tsType)}, ${col.tsType} | null]`);
                 writer.writeLine(`| ['${col.name}', SetOperator, ${col.tsType}[]]`);
                 writer.writeLine(`| ['${col.name}', BetweenOperator, ${col.tsType} | null, ${col.tsType} | null]`);
             });
         });
         writer.blankLine();
-        const asyncModified = client == 'libsql' ? 'async ' : '';
-        const returnTypeModifier = client == 'libsql' ? `Promise<${returnType}>` : returnType;
+        const asyncModified = client === 'libsql' ? 'async ' : '';
+        const returnTypeModifier = client === 'libsql' ? `Promise<${returnType}>` : returnType;
         writer.write(`export ${asyncModified}function ${camelCaseName}(${functionArguments}): ${returnTypeModifier}`).block(() => {
             var _a, _b, _c, _d, _e, _f;
             writer.write('const where = whereConditionsToObject(params?.where);').newLine();
             if (orderByField != null) {
-                writer.writeLine(`const orderBy = orderByToObject(params.orderBy);`);
+                writer.writeLine('const orderBy = orderByToObject(params.orderBy);');
             }
             writer.write('const paramsValues: any = [];').newLine();
             const hasCte = (((_a = tsDescriptor.dynamicQuery2) === null || _a === void 0 ? void 0 : _a.with.length) || 0) > 0;
@@ -295,17 +297,17 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                 writer.writeLine(`let withClause = '';`);
                 (_b = tsDescriptor.dynamicQuery2) === null || _b === void 0 ? void 0 : _b.with.forEach((withFragment, index) => {
                     var _a;
-                    const selectConditions = withFragment.dependOnFields.map(fieldIndex => 'params.select.' + tsDescriptor.columns[fieldIndex].name);
+                    const selectConditions = withFragment.dependOnFields.map((fieldIndex) => `params.select.${tsDescriptor.columns[fieldIndex].name}`);
                     if (selectConditions.length > 0) {
                         selectConditions.unshift('params?.select == null');
                     }
-                    const whereConditions = withFragment.dependOnFields.map(fieldIndex => 'where.' + tsDescriptor.columns[fieldIndex].name + ' != null');
-                    const orderByConditions = ((_a = withFragment.dependOnOrderBy) === null || _a === void 0 ? void 0 : _a.map(orderBy => 'orderBy[\'' + orderBy + '\'] != null')) || [];
+                    const whereConditions = withFragment.dependOnFields.map((fieldIndex) => `where.${tsDescriptor.columns[fieldIndex].name} != null`);
+                    const orderByConditions = ((_a = withFragment.dependOnOrderBy) === null || _a === void 0 ? void 0 : _a.map((orderBy) => `orderBy['${orderBy}'] != null`)) || [];
                     const allConditions = [...selectConditions, ...whereConditions, ...orderByConditions];
-                    const paramValues = withFragment.parameters.map(param => 'params?.params?.' + param);
-                    writer.write(`if (${allConditions.join(os_1.EOL + '\t|| ')})`).block(() => {
+                    const paramValues = withFragment.parameters.map((param) => `params?.params?.${param}`);
+                    writer.write(`if (${allConditions.join(`${node_os_1.EOL}\t|| `)})`).block(() => {
                         writer.write(`withClause += EOL + \`${withFragment.fragment}\`;`);
-                        paramValues.forEach(paramValues => {
+                        paramValues.forEach((paramValues) => {
                             writer.writeLine(`paramsValues.push(${paramValues});`);
                         });
                     });
@@ -318,56 +320,56 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             (_c = tsDescriptor.dynamicQuery2) === null || _c === void 0 ? void 0 : _c.select.forEach((select, index) => {
                 writer.write(`if (params?.select == null || params.select.${tsDescriptor.columns[index].name})`).block(() => {
                     writer.writeLine(`sql = appendSelect(sql, \`${select.fragment}\`);`);
-                    select.parameters.forEach(param => {
+                    select.parameters.forEach((param) => {
                         writer.writeLine(`paramsValues.push(params?.params?.${param} ?? null);`);
                     });
                 });
             });
             (_d = tsDescriptor.dynamicQuery2) === null || _d === void 0 ? void 0 : _d.from.forEach((from, index) => {
                 var _a;
-                if (index == 0) {
+                if (index === 0) {
                     writer.writeLine(`sql += EOL + \`${from.fragment}\`;`);
                 }
                 else {
-                    const selectConditions = from.dependOnFields.map(fieldIndex => 'params.select.' + tsDescriptor.columns[fieldIndex].name);
+                    const selectConditions = from.dependOnFields.map((fieldIndex) => `params.select.${tsDescriptor.columns[fieldIndex].name}`);
                     if (selectConditions.length > 0) {
                         selectConditions.unshift('params?.select == null');
                     }
-                    const whereConditions = from.dependOnFields.map(fieldIndex => 'where.' + tsDescriptor.columns[fieldIndex].name + ' != null');
-                    const orderByConditions = ((_a = from.dependOnOrderBy) === null || _a === void 0 ? void 0 : _a.map(orderBy => 'orderBy[\'' + orderBy + '\'] != null')) || [];
+                    const whereConditions = from.dependOnFields.map((fieldIndex) => `where.${tsDescriptor.columns[fieldIndex].name} != null`);
+                    const orderByConditions = ((_a = from.dependOnOrderBy) === null || _a === void 0 ? void 0 : _a.map((orderBy) => `orderBy['${orderBy}'] != null`)) || [];
                     const allConditions = [...selectConditions, ...whereConditions, ...orderByConditions];
-                    const paramValues = from.parameters.map(param => 'params?.params?.' + param);
-                    writer.write(`if (${allConditions.join(os_1.EOL + '\t|| ')})`).block(() => {
+                    const paramValues = from.parameters.map((param) => `params?.params?.${param}`);
+                    writer.write(`if (${allConditions.join(`${node_os_1.EOL}\t|| `)})`).block(() => {
                         writer.write(`sql += EOL + \`${from.fragment}\`;`);
-                        paramValues.forEach(paramValues => {
+                        paramValues.forEach((paramValues) => {
                             writer.writeLine(`paramsValues.push(${paramValues});`);
                         });
                     });
                 }
             });
-            writer.writeLine(`sql += EOL + \`WHERE 1 = 1\`;`);
-            (_e = tsDescriptor.dynamicQuery2) === null || _e === void 0 ? void 0 : _e.where.forEach(fragment => {
-                const paramValues = fragment.parameters.map(param => 'params?.params?.' + param + ' ?? null');
+            writer.writeLine('sql += EOL + `WHERE 1 = 1`;');
+            (_e = tsDescriptor.dynamicQuery2) === null || _e === void 0 ? void 0 : _e.where.forEach((fragment) => {
+                const paramValues = fragment.parameters.map((param) => `params?.params?.${param} ?? null`);
                 writer.writeLine(`sql += EOL + \`${fragment.fragment}\`;`);
-                paramValues.forEach(paramValues => {
+                paramValues.forEach((paramValues) => {
                     writer.writeLine(`paramsValues.push(${paramValues});`);
                 });
             });
-            writer.write(`params?.where?.forEach(condition => `).inlineBlock(() => {
+            writer.write('params?.where?.forEach(condition => ').inlineBlock(() => {
                 var _a;
-                writer.writeLine(`const where = whereCondition(condition);`);
+                writer.writeLine('const where = whereCondition(condition);');
                 (_a = tsDescriptor.dynamicQuery2) === null || _a === void 0 ? void 0 : _a.select.forEach((select, index) => {
                     if (select.parameters.length > 0) {
                         writer.write(`if (condition[0] == '${tsDescriptor.columns[index].name}')`).block(() => {
-                            select.parameters.forEach(param => {
+                            select.parameters.forEach((param) => {
                                 writer.writeLine(`paramsValues.push(params?.params?.${param} ?? null);`);
                             });
                         });
                     }
                 });
-                writer.write(`if (where?.hasValue)`).block(() => {
+                writer.write('if (where?.hasValue)').block(() => {
                     writer.writeLine(`sql += EOL + 'AND ' + where.sql;`);
-                    writer.write(`paramsValues.push(...where.values);`);
+                    writer.write('paramsValues.push(...where.values);');
                 });
             });
             writer.write(');').newLine();
@@ -377,68 +379,79 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             const limitOffset = (_f = tsDescriptor.dynamicQuery2) === null || _f === void 0 ? void 0 : _f.limitOffset;
             if (limitOffset) {
                 writer.writeLine(`sql += EOL + \`${limitOffset.fragment}\`;`);
-                limitOffset.parameters.forEach(param => {
+                limitOffset.parameters.forEach((param) => {
                     writer.writeLine(`paramsValues.push(params?.params?.${param} ?? null);`);
                 });
             }
-            if (client == 'sqlite') {
+            if (client === 'better-sqlite3') {
                 writer.write('return db.prepare(sql)').newLine();
                 writer.indent().write('.raw(true)').newLine();
-                writer.indent().write(`.all(paramsValues)`).newLine();
-                writer.indent().write(`.map(data => mapArrayTo${resultTypeName}(data, params?.select))${tsDescriptor.multipleRowsResult ? '' : '[0]'};`);
+                writer.indent().write('.all(paramsValues)').newLine();
+                writer
+                    .indent()
+                    .write(`.map(data => mapArrayTo${resultTypeName}(data, params?.select))${tsDescriptor.multipleRowsResult ? '' : '[0]'};`);
+            }
+            if (client === 'bun:sqlite') {
+                writer.write('return db.prepare(sql)').newLine();
+                writer.indent().write('.values(paramsValues)').newLine();
+                writer
+                    .indent()
+                    .write(`.map(data => mapArrayTo${resultTypeName}(data, params?.select))${tsDescriptor.multipleRowsResult ? '' : '[0]'};`);
             }
-            if (client == 'libsql') {
+            if (client === 'libsql') {
                 writer.write('return client.execute({ sql, args: paramsValues })').newLine();
                 writer.indent().write('.then(res => res.rows)').newLine();
-                writer.indent().write(`.then(rows => rows.map(row => mapArrayTo${resultTypeName}(row, params?.select)))${tsDescriptor.multipleRowsResult ? '' : '[0]'};`);
+                writer
+                    .indent()
+                    .write(`.then(rows => rows.map(row => mapArrayTo${resultTypeName}(row, params?.select)))${tsDescriptor.multipleRowsResult ? '' : '[0]'};`);
             }
         });
         writer.blankLine();
         writer.write(`function mapArrayTo${resultTypeName}(data: any, select?: ${selectColumnsTypeName})`).block(() => {
             writer.writeLine(`const result = {} as ${resultTypeName};`);
-            writer.writeLine(`let rowIndex = -1;`);
+            writer.writeLine('let rowIndex = -1;');
             tsDescriptor.columns.forEach((tsField) => {
                 writer.write(`if (select == null || select.${tsField.name})`).block(() => {
-                    writer.writeLine(`rowIndex++;`);
+                    writer.writeLine('rowIndex++;');
                     writer.writeLine(`result.${tsField.name} = ${toDriver('data[rowIndex]', tsField)};`);
                 });
             });
             writer.write('return result;');
         });
         writer.blankLine();
-        writer.write(`function appendSelect(sql: string, selectField: string)`).block(() => {
+        writer.write('function appendSelect(sql: string, selectField: string)').block(() => {
             writer.write(`if (sql == 'SELECT')`).block(() => {
-                writer.writeLine(`return sql + EOL + selectField;`);
+                writer.writeLine('return sql + EOL + selectField;');
             });
-            writer.write(`else`).block(() => {
+            writer.write('else').block(() => {
                 writer.writeLine(`return sql + ', ' + EOL + selectField;`);
             });
         });
         writer.blankLine();
         writer.write(`function whereConditionsToObject(whereConditions?: ${whereTypeName}[])`).block(() => {
-            writer.writeLine(`const obj = {} as any;`);
-            writer.write(`whereConditions?.forEach(condition => `).inlineBlock(() => {
-                writer.writeLine(`const where = whereCondition(condition);`);
-                writer.write(`if (where?.hasValue) `).block(() => {
-                    writer.writeLine(`obj[condition[0]] = true;`);
+            writer.writeLine('const obj = {} as any;');
+            writer.write('whereConditions?.forEach(condition => ').inlineBlock(() => {
+                writer.writeLine('const where = whereCondition(condition);');
+                writer.write('if (where?.hasValue) ').block(() => {
+                    writer.writeLine('obj[condition[0]] = true;');
                 });
             });
             writer.write(');');
-            writer.writeLine(`return obj;`);
+            writer.writeLine('return obj;');
         });
         if (orderByField != null) {
             writer.blankLine();
             writer.write(`function orderByToObject(orderBy: ${dynamicParamsTypeName}['orderBy'])`).block(() => {
-                writer.writeLine(`const obj = {} as any;`);
-                writer.write(`orderBy?.forEach(order => `).inlineBlock(() => {
-                    writer.writeLine(`obj[order[0]] = true;`);
+                writer.writeLine('const obj = {} as any;');
+                writer.write('orderBy?.forEach(order => ').inlineBlock(() => {
+                    writer.writeLine('obj[order[0]] = true;');
                 });
                 writer.write(');');
-                writer.writeLine(`return obj;`);
+                writer.writeLine('return obj;');
             });
         }
         writer.blankLine();
-        writer.write(`type WhereConditionResult = `).block(() => {
+        writer.write('type WhereConditionResult = ').block(() => {
             writer.writeLine('sql: string;');
             writer.writeLine('hasValue: boolean;');
             writer.writeLine('values: any[];');
@@ -451,8 +464,8 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             writer.blankLine();
             if ((0, code_generator_1.hasStringColumn)(tsDescriptor.columns)) {
                 writer.write(`if (operator == 'LIKE') `).block(() => {
-                    writer.write(`return `).block(() => {
-                        writer.writeLine('sql: `${selectFragment} LIKE concat(\'%\', ?, \'%\')`,');
+                    writer.write('return ').block(() => {
+                        writer.writeLine("sql: `${selectFragment} LIKE concat('%', ?, '%')`,");
                         writer.writeLine('hasValue: condition[2] != null,');
                         writer.writeLine('values: [condition[2]]');
                     });
@@ -460,17 +473,17 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             }
             writer.write(`if (operator == 'BETWEEN') `).block(() => {
                 if ((0, code_generator_1.hasDateColumn)(tsDescriptor.columns)) {
-                    writer.writeLine(`const value1 = isDate(condition[2]) ? condition[2]?.toISOString() : condition[2];`);
-                    writer.writeLine(`const value2 = isDate(condition[3]) ? condition[3]?.toISOString() : condition[3];`);
+                    writer.writeLine('const value1 = isDate(condition[2]) ? condition[2]?.toISOString() : condition[2];');
+                    writer.writeLine('const value2 = isDate(condition[3]) ? condition[3]?.toISOString() : condition[3];');
                     writer.writeLine(`const param = isDate(condition[2]) && isDate(condition[3]) ? 'date(?)' : '?';`);
-                    writer.write(`return `).block(() => {
+                    writer.write('return ').block(() => {
                         writer.writeLine('sql: `${selectFragment} BETWEEN ${param} AND ${param}`,');
                         writer.writeLine('hasValue: value1 != null && value2 != null,');
                         writer.writeLine('values: [value1, value2]');
                     });
                 }
                 else {
-                    writer.write(`return `).block(() => {
+                    writer.write('return ').block(() => {
                         writer.writeLine('sql: `${selectFragment} BETWEEN ? AND ?`,');
                         writer.writeLine('hasValue: condition[2] != null && condition[3] != null,');
                         writer.writeLine('values: [condition[2], condition[3]]');
@@ -479,32 +492,32 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             });
             writer.write(`if (operator == 'IN' || operator == 'NOT IN') `).block(() => {
                 if ((0, code_generator_1.hasDateColumn)(tsDescriptor.columns)) {
-                    writer.write(`return `).block(() => {
-                        writer.writeLine('sql: `${selectFragment} ${operator} (${condition[2]?.map(value => isDate(value) ? \'date(?)\' : \'?\').join(\', \')})`,');
+                    writer.write('return ').block(() => {
+                        writer.writeLine("sql: `${selectFragment} ${operator} (${condition[2]?.map(value => isDate(value) ? 'date(?)' : '?').join(', ')})`,");
                         writer.writeLine('hasValue: condition[2] != null && condition[2].length > 0,');
                         writer.writeLine('values: condition[2].map(value => isDate(value) ? value.toISOString() : value)');
                     });
                 }
                 else {
-                    writer.write(`return `).block(() => {
-                        writer.writeLine('sql: `${selectFragment} ${operator} (${condition[2]?.map(_ => \'?\').join(\', \')})`,');
+                    writer.write('return ').block(() => {
+                        writer.writeLine("sql: `${selectFragment} ${operator} (${condition[2]?.map(_ => '?').join(', ')})`,");
                         writer.writeLine('hasValue: condition[2] != null && condition[2].length > 0,');
                         writer.writeLine('values: condition[2]');
                     });
                 }
             });
-            writer.write(`if (NumericOperatorList.includes(operator)) `).block(() => {
+            writer.write('if (NumericOperatorList.includes(operator)) ').block(() => {
                 if ((0, code_generator_1.hasDateColumn)(tsDescriptor.columns)) {
-                    writer.writeLine(`const value = isDate(condition[2]) ? condition[2]?.toISOString() : condition[2];`);
+                    writer.writeLine('const value = isDate(condition[2]) ? condition[2]?.toISOString() : condition[2];');
                     writer.writeLine(`const param = isDate(condition[2]) ? 'date(?)' : '?';`);
-                    writer.write(`return `).block(() => {
+                    writer.write('return ').block(() => {
                         writer.writeLine('sql: `${selectFragment} ${operator} ${param}`,');
                         writer.writeLine('hasValue: value != null,');
                         writer.writeLine('values: [value]');
                     });
                 }
                 else {
-                    writer.write(`return `).block(() => {
+                    writer.write('return ').block(() => {
                         writer.writeLine('sql: `${selectFragment} ${operator} ?`,');
                         writer.writeLine('hasValue: condition[2] != null,');
                         writer.writeLine('values: [condition[2]]');
@@ -514,8 +527,8 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         });
         if ((0, code_generator_1.hasDateColumn)(tsDescriptor.columns)) {
             writer.blankLine();
-            writer.write(`function isDate(value: any): value is Date`).block(() => {
-                writer.writeLine(`return value instanceof Date;`);
+            writer.write('function isDate(value: any): value is Date').block(() => {
+                writer.writeLine('return value instanceof Date;');
             });
         }
     }
@@ -523,7 +536,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         if (uniqueUpdateParams.length > 0) {
             writer.blankLine();
             writer.write(`export type ${dataTypeName} =`).block(() => {
-                uniqueUpdateParams.forEach(field => {
+                uniqueUpdateParams.forEach((field) => {
                     const optionalOp = field.optional ? '?' : '';
                     const orNull = field.notNull ? '' : ' | null';
                     writer.writeLine(`${field.name}${optionalOp}: ${field.tsType}${orNull};`);
@@ -545,7 +558,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         }
         writer.blankLine();
         writer.write(`export type ${resultTypeName} =`).block(() => {
-            tsDescriptor.columns.forEach(field => {
+            tsDescriptor.columns.forEach((field) => {
                 const optionalOp = field.notNull ? '' : '?';
                 writer.writeLine(`${field.name}${optionalOp}: ${field.tsType};`);
             });
@@ -553,21 +566,21 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         writer.blankLine();
     }
     if (isCrud) {
-        const crudFunction = client == 'libsql'
+        const crudFunction = client === 'libsql'
             ? `async function ${camelCaseName}(${functionArguments}): Promise<${returnType}>`
             : `function ${camelCaseName}(${functionArguments}): ${returnType}`;
         writer.write(`export ${crudFunction}`).block(() => {
             const idColumn = tsDescriptor.parameters[0].name;
-            writeExecuteCrudBlock(client, queryType, tableName, tsDescriptor.columns, idColumn, queryParams, paramsTypeName, dataTypeName, resultTypeName, writer);
+            writeExecuteCrudBlock(client, queryType, tableName, tsDescriptor.columns, idColumn, client == 'bun:sqlite' ? queryParamsWithoutBrackets : queryParams, paramsTypeName, dataTypeName, resultTypeName, writer);
         });
     }
-    if (tsDescriptor.dynamicQuery2 == null && !isCrud && (queryType == 'Select' || (queryType == 'Insert' && tsDescriptor.returning))) {
-        if (client == 'sqlite') {
+    if (tsDescriptor.dynamicQuery2 == null && !isCrud && (queryType === 'Select' || (queryType === 'Insert' && tsDescriptor.returning))) {
+        if (client === 'better-sqlite3') {
             writer.write(`export function ${camelCaseName}(${functionArguments}): ${returnType}`).block(() => {
                 const processedSql = tsDescriptor.orderByColumns ? (0, code_generator_1.replaceOrderByParam)(sql) : sql;
                 const sqlSplit = processedSql.split('\n');
                 writer.write('const sql = `').newLine();
-                sqlSplit.forEach(sqlLine => {
+                sqlSplit.forEach((sqlLine) => {
                     writer.indent().write(sqlLine).newLine();
                 });
                 writer.indent().write('`').newLine();
@@ -577,19 +590,33 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                 writer.indent().write(`.map(data => mapArrayTo${resultTypeName}(data))${tsDescriptor.multipleRowsResult ? '' : '[0]'};`);
             });
         }
-        if (!isCrud && client == 'libsql') {
+        if (client === 'bun:sqlite') {
+            writer.write(`export function ${camelCaseName}(${functionArguments}): ${returnType}`).block(() => {
+                const processedSql = tsDescriptor.orderByColumns ? (0, code_generator_1.replaceOrderByParam)(sql) : sql;
+                const sqlSplit = processedSql.split('\n');
+                writer.write('const sql = `').newLine();
+                sqlSplit.forEach((sqlLine) => {
+                    writer.indent().write(sqlLine).newLine();
+                });
+                writer.indent().write('`').newLine();
+                writer.write('return db.prepare(sql)').newLine();
+                writer.indent().write(`.values(${queryParamsWithoutBrackets})`).newLine();
+                writer.indent().write(`.map(data => mapArrayTo${resultTypeName}(data))${tsDescriptor.multipleRowsResult ? '' : '[0]'};`);
+            });
+        }
+        if (!isCrud && client === 'libsql') {
             writer.write(`export async function ${camelCaseName}(${functionArguments}): Promise<${returnType}>`).block(() => {
                 const processedSql = tsDescriptor.orderByColumns ? (0, code_generator_1.replaceOrderByParam)(sql) : sql;
                 const sqlSplit = processedSql.split('\n');
                 writer.write('const sql = `').newLine();
-                sqlSplit.forEach(sqlLine => {
+                sqlSplit.forEach((sqlLine) => {
                     writer.indent().write(sqlLine).newLine();
                 });
                 writer.indent().write('`').newLine();
-                const executeParams = queryParams != '' ? `{ sql, args: ${queryParams} }` : 'sql';
+                const executeParams = queryParams !== '' ? `{ sql, args: ${queryParams} }` : 'sql';
                 writer.write(`return client.execute(${executeParams})`).newLine();
-                if (queryType == 'Select') {
-                    writer.indent().write(`.then(res => res.rows)`).newLine();
+                if (queryType === 'Select') {
+                    writer.indent().write('.then(res => res.rows)').newLine();
                     if (tsDescriptor.multipleRowsResult) {
                         writer.indent().write(`.then(rows => rows.map(row => mapArrayTo${resultTypeName}(row)));`);
                     }
@@ -597,9 +624,9 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                         writer.indent().write(`.then(rows => mapArrayTo${resultTypeName}(rows[0]));`);
                     }
                 }
-                if (queryType == 'Insert') {
+                if (queryType === 'Insert') {
                     if (tsDescriptor.returning) {
-                        writer.indent().write(`.then(res => res.rows)`).newLine();
+                        writer.indent().write('.then(res => res.rows)').newLine();
                         writer.indent().write(`.then(rows => mapArrayTo${resultTypeName}(rows[0]));`);
                     }
                     else {
@@ -609,27 +636,28 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             });
         }
     }
-    if (!isCrud && (queryType == 'Update' || queryType == 'Delete' || (queryType == 'Insert' && !tsDescriptor.returning))) {
-        if (client == 'sqlite') {
+    if (!isCrud && (queryType === 'Update' || queryType === 'Delete' || (queryType === 'Insert' && !tsDescriptor.returning))) {
+        if (client === 'better-sqlite3' || client === 'bun:sqlite') {
             writer.write(`export function ${camelCaseName}(${functionArguments}): ${resultTypeName}`).block(() => {
-                writeExecuteBlock(sql, queryParams, resultTypeName, writer);
+                const params = client === 'better-sqlite3' ? queryParams : queryParamsWithoutBrackets;
+                writeExecuteBlock(sql, params, resultTypeName, writer);
             });
         }
-        if (client == 'libsql') {
+        if (client === 'libsql') {
             writer.write(`export async function ${camelCaseName}(${functionArguments}): Promise<${resultTypeName}>`).block(() => {
                 const sqlSplit = sql.split('\n');
                 writer.write('const sql = `').newLine();
-                sqlSplit.forEach(sqlLine => {
+                sqlSplit.forEach((sqlLine) => {
                     writer.indent().write(sqlLine).newLine();
                 });
                 writer.indent().write('`').newLine();
-                const executeParams = queryParams != '' ? `{ sql, args: ${queryParams} }` : 'sql';
+                const executeParams = queryParams !== '' ? `{ sql, args: ${queryParams} }` : 'sql';
                 writer.write(`return client.execute(${executeParams})`).newLine();
                 writer.indent().write(`.then(res => mapArrayTo${resultTypeName}(res));`);
             });
         }
     }
-    if ((queryType == 'Select' || tsDescriptor.returning) && tsDescriptor.dynamicQuery2 == null) {
+    if ((queryType === 'Select' || tsDescriptor.returning) && tsDescriptor.dynamicQuery2 == null) {
         writer.blankLine();
         writer.write(`function mapArrayTo${resultTypeName}(data: any) `).block(() => {
             writer.write(`const result: ${resultTypeName} = `).block(() => {
@@ -641,7 +669,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             writer.writeLine('return result;');
         });
     }
-    else if (client == 'libsql' && !tsDescriptor.returning && tsDescriptor.dynamicQuery2 == null) {
+    else if (client === 'libsql' && !tsDescriptor.returning && tsDescriptor.dynamicQuery2 == null) {
         writer.blankLine();
         writer.write(`function mapArrayTo${resultTypeName}(data: any) `).block(() => {
             writer.write(`const result: ${resultTypeName} = `).block(() => {
@@ -657,7 +685,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         const orderByType = tsDescriptor.dynamicQuery2 == null ? paramsTypeName : dynamicParamsTypeName;
         if (orderByField != null) {
             writer.blankLine();
-            writer.write(`const orderByFragments = `).inlineBlock(() => {
+            writer.write('const orderByFragments = ').inlineBlock(() => {
                 var _a;
                 (_a = tsDescriptor.orderByColumns) === null || _a === void 0 ? void 0 : _a.forEach((col) => {
                     writer.writeLine(`'${col}': \`${col}\`,`);
@@ -678,11 +706,11 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             const relationType = (0, code_generator_1.generateRelationType)(capitalizedName, relation.name);
             writer.blankLine();
             writer.write(`export type ${relationType} = `).block(() => {
-                const uniqueNameFields = (0, code_generator_1.renameInvalidNames)(relation.fields.map(f => f.name));
+                const uniqueNameFields = (0, code_generator_1.renameInvalidNames)(relation.fields.map((f) => f.name));
                 relation.fields.forEach((field, index) => {
                     writer.writeLine(`${uniqueNameFields[index]}: ${field.tsType};`);
                 });
-                relation.relations.forEach(field => {
+                relation.relations.forEach((field) => {
                     const nestedRelationType = (0, code_generator_1.generateRelationType)(capitalizedName, field.tsType);
                     const nullableOperator = field.notNull ? '' : '?';
                     writer.writeLine(`${field.name}${nullableOperator}: ${nestedRelationType};`);
@@ -692,8 +720,8 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         writer.blankLine();
         relations.forEach((relation, index) => {
             const relationType = (0, code_generator_1.generateRelationType)(capitalizedName, relation.name);
-            if (index == 0) {
-                if (client == 'sqlite') {
+            if (index === 0) {
+                if (client === 'better-sqlite3' || client == 'bun:sqlite') {
                     writer.write(`export function ${camelCaseName}Nested(${functionArguments}): ${relationType}[]`).block(() => {
                         const params = tsDescriptor.parameters.length > 0 ? ', params' : '';
                         writer.writeLine(`const selectResult = ${camelCaseName}(db${params});`);
@@ -703,7 +731,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                         writer.writeLine(`return collect${relationType}(selectResult);`);
                     });
                 }
-                else if (client == 'libsql') {
+                else if (client === 'libsql') {
                     writer.write(`export async function ${camelCaseName}Nested(${functionArguments}): Promise<${relationType}[]>`).block(() => {
                         const params = tsDescriptor.parameters.length > 0 ? ', params' : '';
                         writer.writeLine(`const selectResult = await ${camelCaseName}(client${params});`);
@@ -718,11 +746,14 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         });
         writer.blankLine();
         writer.write('const groupBy = <T, Q>(array: T[], predicate: (value: T, index: number, array: T[]) => Q) =>').block(() => {
-            writer.write('return array.reduce((map, value, index, array) => ').inlineBlock(() => {
+            writer
+                .write('return array.reduce((map, value, index, array) => ')
+                .inlineBlock(() => {
                 writer.writeLine('const key = predicate(value, index, array);');
                 writer.writeLine('map.get(key)?.push(value) ?? map.set(key, [value]);');
                 writer.writeLine('return map;');
-            }).write(', new Map<Q, T[]>());');
+            })
+                .write(', new Map<Q, T[]>());');
         });
     }
     return writer.toString();
@@ -730,7 +761,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
 function writeExecuteBlock(sql, queryParams, resultTypeName, writer) {
     const sqlSplit = sql.split('\n');
     writer.write('const sql = `').newLine();
-    sqlSplit.forEach(sqlLine => {
+    sqlSplit.forEach((sqlLine) => {
         writer.indent().write(sqlLine).newLine();
     });
     writer.indent().write('`').newLine();
@@ -739,13 +770,13 @@ function writeExecuteBlock(sql, queryParams, resultTypeName, writer) {
 }
 function writeExecuteCrudBlock(client, queryType, tableName, columns, idColumn, queryParams, paramTypeName, dataTypeName, resultTypeName, writer) {
     switch (queryType) {
-        case "Select":
+        case 'Select':
             return writeExecutSelectCrudBlock(client, tableName, idColumn, columns, queryParams, resultTypeName, writer);
-        case "Insert":
+        case 'Insert':
             return writeExecuteInsertCrudBlock(client, tableName, paramTypeName, resultTypeName, writer);
-        case "Update":
+        case 'Update':
             return writeExecuteUpdateCrudBlock(client, tableName, idColumn, dataTypeName, resultTypeName, writer);
-        case "Delete":
+        case 'Delete':
             return writeExecutDeleteCrudBlock(client, tableName, idColumn, queryParams, resultTypeName, writer);
     }
 }
@@ -759,41 +790,50 @@ function writeExecutSelectCrudBlock(client, tableName, idColumn, columns, queryP
     writer.indent().write(`FROM ${tableName}`).newLine();
     writer.indent().write(`WHERE ${idColumn} = ?\``).newLine();
     writer.blankLine();
-    if (client == 'sqlite') {
+    if (client === 'better-sqlite3') {
         writer.write('return db.prepare(sql)').newLine();
         writer.indent().write('.raw(true)').newLine();
         writer.indent().write(`.all(${queryParams})`).newLine();
         writer.indent().write(`.map(data => mapArrayTo${resultTypeName}(data))[0];`);
     }
+    else if (client === 'bun:sqlite') {
+        writer.write('return db.prepare(sql)').newLine();
+        writer.indent().write(`.values(${queryParams})`).newLine();
+        writer.indent().write(`.map(data => mapArrayTo${resultTypeName}(data))[0];`);
+    }
     else {
         writer.write(`return client.execute({ sql, args: ${queryParams} })`).newLine();
-        writer.indent().write(`.then(res => res.rows)`).newLine();
+        writer.indent().write('.then(res => res.rows)').newLine();
         writer.indent().write(`.then(rows => mapArrayTo${resultTypeName}(rows[0]));`);
     }
 }
 function writeExecuteInsertCrudBlock(client, tableName, paramTypeName, resultTypeName, writer) {
     writer.blankLine();
     writer.writeLine(`const keys = Object.keys(params) as Array<keyof ${paramTypeName}>;`);
-    writer.writeLine(`const columns = keys.filter(key => params[key] !== undefined);`);
-    writer.writeLine(`const values = columns.map(col => params[col]!);`);
+    writer.writeLine('const columns = keys.filter(key => params[key] !== undefined);');
+    writer.writeLine('const values = columns.map(col => params[col]!);');
     writer.blankLine();
     writer.writeLine('const sql = columns.length == 0');
     writer.indent().write(`? \`INSERT INTO ${tableName} DEFAULT VALUES\``).newLine();
     writer.indent().write(`: \`INSERT INTO ${tableName}(\${columns.join(',')}) VALUES(\${columns.map(_ => '?').join(',')})\``).newLine();
     writer.blankLine();
-    if (client == 'sqlite') {
+    if (client === 'better-sqlite3') {
         writer.write('return db.prepare(sql)').newLine();
         writer.indent().write(`.run(values) as ${resultTypeName};`);
     }
+    else if (client == 'bun:sqlite') {
+        writer.write('return db.prepare(sql)').newLine();
+        writer.indent().write(`.run(...values) as ${resultTypeName};`);
+    }
     else {
-        writer.write(`return client.execute({ sql, args: values })`).newLine();
+        writer.write('return client.execute({ sql, args: values })').newLine();
         writer.indent().write(`.then(res => mapArrayTo${resultTypeName}(res));`).newLine();
     }
 }
 function writeExecuteUpdateCrudBlock(client, tableName, idColumn, paramTypeName, resultTypeName, writer) {
     writer.blankLine();
     writer.writeLine(`const keys = Object.keys(data) as Array<keyof ${paramTypeName}>;`);
-    writer.writeLine(`const columns = keys.filter(key => data[key] !== undefined);`);
+    writer.writeLine('const columns = keys.filter(key => data[key] !== undefined);');
     writer.writeLine(`const values = columns.map(col => data[col]!).concat(params.${idColumn});`);
     writer.blankLine();
     writer.writeLine('const sql = `');
@@ -801,12 +841,16 @@ function writeExecuteUpdateCrudBlock(client, tableName, idColumn, paramTypeName,
     writer.indent().write(`SET \${columns.map(col => \`\${col} = ?\`).join(', ')}`).newLine();
     writer.indent().write(`WHERE ${idColumn} = ?\``).newLine();
     writer.blankLine();
-    if (client == 'sqlite') {
+    if (client === 'better-sqlite3') {
         writer.write('return db.prepare(sql)').newLine();
         writer.indent().write(`.run(values) as ${resultTypeName};`);
     }
+    else if (client === 'bun:sqlite') {
+        writer.write('return db.prepare(sql)').newLine();
+        writer.indent().write(`.run(...values) as ${resultTypeName};`);
+    }
     else {
-        writer.write(`return client.execute({ sql, args: values })`).newLine();
+        writer.write('return client.execute({ sql, args: values })').newLine();
         writer.indent().write(`.then(res => mapArrayTo${resultTypeName}(res));`).newLine();
     }
 }
@@ -816,7 +860,11 @@ function writeExecutDeleteCrudBlock(client, tableName, idColumn, queryParams, re
     writer.indent().write(`FROM ${tableName}`).newLine();
     writer.indent().write(`WHERE ${idColumn} = ?\``).newLine();
     writer.blankLine();
-    if (client == 'sqlite') {
+    if (client === 'better-sqlite3') {
+        writer.write('return db.prepare(sql)').newLine();
+        writer.indent().write(`.run(${queryParams}) as ${resultTypeName};`).newLine();
+    }
+    else if (client === 'bun:sqlite') {
         writer.write('return db.prepare(sql)').newLine();
         writer.indent().write(`.run(${queryParams}) as ${resultTypeName};`).newLine();
     }
@@ -826,22 +874,20 @@ function writeExecutDeleteCrudBlock(client, tableName, idColumn, queryParams, re
     }
 }
 function toDriver(variableData, param) {
-    if (param.tsType == 'Date') {
+    if (param.tsType === 'Date') {
         if (param.notNull) {
             return `new Date(${variableData})`;
         }
-        else {
-            return `${variableData} != null ? new Date(${variableData}) : ${variableData}`;
-        }
+        return `${variableData} != null ? new Date(${variableData}) : ${variableData}`;
     }
     return variableData;
 }
 function fromDriver(variableName, param) {
     var _a;
-    if (param.tsType == 'Date') {
+    if (param.tsType === 'Date') {
         return `${variableName}.${param.name}?.toISOString()`;
     }
-    if ((_a = param.tsType) === null || _a === void 0 ? void 0 : _a.endsWith("[]")) {
+    if ((_a = param.tsType) === null || _a === void 0 ? void 0 : _a.endsWith('[]')) {
         return `...${variableName}.${param.name}`;
     }
     return `${variableName}.${param.name}`;
@@ -853,19 +899,22 @@ function writeCollectFunction(writer, relation, columns, capitalizedName, result
     writer.write(`function ${collectFunctionName}(selectResult: ${resultTypeName}[]): ${relationType}[]`).block(() => {
         const groupBy = columns[relation.groupIndex].name;
         writer.writeLine(`const grouped = groupBy(selectResult.filter(r => r.${groupBy} != null), r => r.${groupBy});`);
-        writer.write(`return [...grouped.values()].map(row => (`).inlineBlock(() => {
+        writer
+            .write('return [...grouped.values()].map(row => (')
+            .inlineBlock(() => {
             relation.fields.forEach((field, index) => {
-                const uniqueNameFields = (0, code_generator_1.renameInvalidNames)(relation.fields.map(f => f.name));
+                const uniqueNameFields = (0, code_generator_1.renameInvalidNames)(relation.fields.map((f) => f.name));
                 const separator = ',';
                 const fieldName = columns[field.index].name;
-                writer.writeLine(`${uniqueNameFields[index]}: row[0].${fieldName}!` + separator);
+                writer.writeLine(`${uniqueNameFields[index]}: row[0].${fieldName}!${separator}`);
             });
-            relation.relations.forEach(fieldRelation => {
+            relation.relations.forEach((fieldRelation) => {
                 const relationType = (0, code_generator_1.generateRelationType)(capitalizedName, fieldRelation.name);
                 const cardinality = fieldRelation.list ? '' : '[0]';
                 writer.writeLine(`${fieldRelation.name}: collect${relationType}(row)${cardinality},`);
             });
-        }).write('))');
+        })
+            .write('))');
     });
 }
 //# sourceMappingURL=code-generator.js.map