typesql-cli 0.10.0 → 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");
@@ -25,11 +27,8 @@ function validateAndGenerateCode(client, sql, queryName, sqliteDbSchema, isCrud
     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,
@@ -46,9 +45,7 @@ function generateCrud(client, queryType, tableName, dbSchema) {
     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 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 tsDescriptor = {
@@ -58,15 +55,12 @@ function generateCrud(client, queryType, tableName, dbSchema) {
         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); })
-            : []
+        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);
@@ -90,7 +84,6 @@ function generateTsCode(sql, queryName, sqliteDbSchema, client, isCrud = false)
     const code = generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud);
     return (0, Either_1.right)(code);
 }
-exports.generateTsCode = generateTsCode;
 function createTsDescriptor(queryInfo, client) {
     var _a;
     const tsDescriptor = {
@@ -145,14 +138,10 @@ function mapColumns(client, queryType, columns, returning = false) {
         }
     ];
     if (queryType === 'Insert' && !returning) {
-        return client === 'better-sqlite3'
-            ? sqliteInsertColumns
-            : libSqlInsertColumns;
+        return client === 'better-sqlite3' || client == 'bun:sqlite' ? sqliteInsertColumns : libSqlInsertColumns;
     }
     if (queryType === 'Update' || queryType === 'Delete') {
-        return client === 'better-sqlite3'
-            ? [sqliteInsertColumns[0]]
-            : [libSqlInsertColumns[0]];
+        return client === 'better-sqlite3' || client == 'bun:sqlite' ? [sqliteInsertColumns[0]] : [libSqlInsertColumns[0]];
     }
     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));
@@ -223,38 +212,30 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
     const selectColumnsTypeName = `${capitalizedName}Select`;
     const whereTypeName = `${capitalizedName}Where`;
     const orderByTypeName = `${capitalizedName}OrderBy`;
-    const generateOrderBy = tsDescriptor.orderByColumns != null &&
-        tsDescriptor.orderByColumns.length > 0;
+    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 === 'better-sqlite3'
-        ? 'db: Database'
-        : 'client: Client | Transaction';
+    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 === '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 returnType = tsDescriptor.multipleRowsResult
-        ? `${resultTypeName}[]`
-        : `${resultTypeName}${orNull}`;
+    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(', ')}]` : '';
+    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 === 'bun:sqlite') {
+        writer.writeLine(`import type { Database } from 'bun:sqlite';`);
+    }
     if (client === 'libsql') {
         writer.writeLine(`import type { Client, Transaction } from '@libsql/client';`);
     }
@@ -273,9 +254,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         });
         writer.blankLine();
         (0, code_generator_1.writeTypeBlock)(writer, paramsTypes, paramsTypeName, false, tsDescriptor.dynamicQuery2 ? undefined : orderByField);
-        const resultTypes = tsDescriptor.dynamicQuery2 == null
-            ? tsDescriptor.columns
-            : (0, ts_dynamic_query_descriptor_1.mapToDynamicResultColumns)(tsDescriptor.columns);
+        const resultTypes = tsDescriptor.dynamicQuery2 == null ? tsDescriptor.columns : (0, ts_dynamic_query_descriptor_1.mapToDynamicResultColumns)(tsDescriptor.columns);
         (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);
@@ -306,13 +285,9 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         writer.blankLine();
         const asyncModified = client === 'libsql' ? 'async ' : '';
         const returnTypeModifier = client === 'libsql' ? `Promise<${returnType}>` : returnType;
-        writer
-            .write(`export ${asyncModified}function ${camelCaseName}(${functionArguments}): ${returnTypeModifier}`)
-            .block(() => {
+        writer.write(`export ${asyncModified}function ${camelCaseName}(${functionArguments}): ${returnTypeModifier}`).block(() => {
             var _a, _b, _c, _d, _e, _f;
-            writer
-                .write('const where = whereConditionsToObject(params?.where);')
-                .newLine();
+            writer.write('const where = whereConditionsToObject(params?.where);').newLine();
             if (orderByField != null) {
                 writer.writeLine('const orderBy = orderByToObject(params.orderBy);');
             }
@@ -328,32 +303,22 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                     }
                     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 allConditions = [...selectConditions, ...whereConditions, ...orderByConditions];
                     const paramValues = withFragment.parameters.map((param) => `params?.params?.${param}`);
-                    writer
-                        .write(`if (${allConditions.join(`${node_os_1.EOL}\t|| `)})`)
-                        .block(() => {
+                    writer.write(`if (${allConditions.join(`${node_os_1.EOL}\t|| `)})`).block(() => {
                         writer.write(`withClause += EOL + \`${withFragment.fragment}\`;`);
                         paramValues.forEach((paramValues) => {
                             writer.writeLine(`paramsValues.push(${paramValues});`);
                         });
                     });
                 });
-                writer
-                    .write(`let sql = 'WITH ' + withClause + EOL + 'SELECT';`)
-                    .newLine();
+                writer.write(`let sql = 'WITH ' + withClause + EOL + 'SELECT';`).newLine();
             }
             else {
                 writer.write(`let sql = 'SELECT';`).newLine();
             }
             (_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.write(`if (params?.select == null || params.select.${tsDescriptor.columns[index].name})`).block(() => {
                     writer.writeLine(`sql = appendSelect(sql, \`${select.fragment}\`);`);
                     select.parameters.forEach((param) => {
                         writer.writeLine(`paramsValues.push(params?.params?.${param} ?? null);`);
@@ -372,15 +337,9 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                     }
                     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 allConditions = [...selectConditions, ...whereConditions, ...orderByConditions];
                     const paramValues = from.parameters.map((param) => `params?.params?.${param}`);
-                    writer
-                        .write(`if (${allConditions.join(`${node_os_1.EOL}\t|| `)})`)
-                        .block(() => {
+                    writer.write(`if (${allConditions.join(`${node_os_1.EOL}\t|| `)})`).block(() => {
                         writer.write(`sql += EOL + \`${from.fragment}\`;`);
                         paramValues.forEach((paramValues) => {
                             writer.writeLine(`paramsValues.push(${paramValues});`);
@@ -401,9 +360,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                 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(() => {
+                        writer.write(`if (condition[0] == '${tsDescriptor.columns[index].name}')`).block(() => {
                             select.parameters.forEach((param) => {
                                 writer.writeLine(`paramsValues.push(params?.params?.${param} ?? null);`);
                             });
@@ -434,10 +391,15 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                     .indent()
                     .write(`.map(data => mapArrayTo${resultTypeName}(data, params?.select))${tsDescriptor.multipleRowsResult ? '' : '[0]'};`);
             }
-            if (client === 'libsql') {
+            if (client === 'bun:sqlite') {
+                writer.write('return db.prepare(sql)').newLine();
+                writer.indent().write('.values(paramsValues)').newLine();
                 writer
-                    .write('return client.execute({ sql, args: paramsValues })')
-                    .newLine();
+                    .indent()
+                    .write(`.map(data => mapArrayTo${resultTypeName}(data, params?.select))${tsDescriptor.multipleRowsResult ? '' : '[0]'};`);
+            }
+            if (client === 'libsql') {
+                writer.write('return client.execute({ sql, args: paramsValues })').newLine();
                 writer.indent().write('.then(res => res.rows)').newLine();
                 writer
                     .indent()
@@ -445,15 +407,11 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             }
         });
         writer.blankLine();
-        writer
-            .write(`function mapArrayTo${resultTypeName}(data: any, select?: ${selectColumnsTypeName})`)
-            .block(() => {
+        writer.write(`function mapArrayTo${resultTypeName}(data: any, select?: ${selectColumnsTypeName})`).block(() => {
             writer.writeLine(`const result = {} as ${resultTypeName};`);
             writer.writeLine('let rowIndex = -1;');
             tsDescriptor.columns.forEach((tsField) => {
-                writer
-                    .write(`if (select == null || select.${tsField.name})`)
-                    .block(() => {
+                writer.write(`if (select == null || select.${tsField.name})`).block(() => {
                     writer.writeLine('rowIndex++;');
                     writer.writeLine(`result.${tsField.name} = ${toDriver('data[rowIndex]', tsField)};`);
                 });
@@ -461,9 +419,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             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;');
             });
@@ -472,13 +428,9 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             });
         });
         writer.blankLine();
-        writer
-            .write(`function whereConditionsToObject(whereConditions?: ${whereTypeName}[])`)
-            .block(() => {
+        writer.write(`function whereConditionsToObject(whereConditions?: ${whereTypeName}[])`).block(() => {
             writer.writeLine('const obj = {} as any;');
-            writer
-                .write('whereConditions?.forEach(condition => ')
-                .inlineBlock(() => {
+            writer.write('whereConditions?.forEach(condition => ').inlineBlock(() => {
                 writer.writeLine('const where = whereCondition(condition);');
                 writer.write('if (where?.hasValue) ').block(() => {
                     writer.writeLine('obj[condition[0]] = true;');
@@ -489,9 +441,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         });
         if (orderByField != null) {
             writer.blankLine();
-            writer
-                .write(`function orderByToObject(orderBy: ${dynamicParamsTypeName}['orderBy'])`)
-                .block(() => {
+            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;');
@@ -507,9 +457,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             writer.writeLine('values: any[];');
         });
         writer.blankLine();
-        writer
-            .write(`function whereCondition(condition: ${whereTypeName}): WhereConditionResult | undefined `)
-            .block(() => {
+        writer.write(`function whereCondition(condition: ${whereTypeName}): WhereConditionResult | undefined `).block(() => {
             writer.blankLine();
             writer.writeLine('const selectFragment = selectFragments[condition[0]];');
             writer.writeLine('const operator = condition[1];');
@@ -542,9 +490,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                     });
                 }
             });
-            writer
-                .write(`if (operator == 'IN' || operator == 'NOT IN') `)
-                .block(() => {
+            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(', ')})`,");
@@ -560,9 +506,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                     });
                 }
             });
-            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 param = isDate(condition[2]) ? 'date(?)' : '?';`);
@@ -627,20 +571,13 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             : `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 (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;
+            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) => {
@@ -650,18 +587,26 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                 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))${tsDescriptor.multipleRowsResult ? '' : '[0]'};`);
+                writer.indent().write(`.map(data => mapArrayTo${resultTypeName}(data))${tsDescriptor.multipleRowsResult ? '' : '[0]'};`);
+            });
+        }
+        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;
+            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) => {
@@ -673,47 +618,33 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                 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)));`);
+                        writer.indent().write(`.then(rows => rows.map(row => mapArrayTo${resultTypeName}(row)));`);
                     }
                     else {
-                        writer
-                            .indent()
-                            .write(`.then(rows => mapArrayTo${resultTypeName}(rows[0]));`);
+                        writer.indent().write(`.then(rows => mapArrayTo${resultTypeName}(rows[0]));`);
                     }
                 }
                 if (queryType === 'Insert') {
                     if (tsDescriptor.returning) {
                         writer.indent().write('.then(res => res.rows)').newLine();
-                        writer
-                            .indent()
-                            .write(`.then(rows => mapArrayTo${resultTypeName}(rows[0]));`);
+                        writer.indent().write(`.then(rows => mapArrayTo${resultTypeName}(rows[0]));`);
                     }
                     else {
-                        writer
-                            .indent()
-                            .write(`.then(res => mapArrayTo${resultTypeName}(res));`);
+                        writer.indent().write(`.then(res => mapArrayTo${resultTypeName}(res));`);
                     }
                 }
             });
         }
     }
-    if (!isCrud &&
-        (queryType === 'Update' ||
-            queryType === 'Delete' ||
-            (queryType === 'Insert' && !tsDescriptor.returning))) {
-        if (client === 'better-sqlite3') {
-            writer
-                .write(`export function ${camelCaseName}(${functionArguments}): ${resultTypeName}`)
-                .block(() => {
-                writeExecuteBlock(sql, queryParams, resultTypeName, writer);
+    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(() => {
+                const params = client === 'better-sqlite3' ? queryParams : queryParamsWithoutBrackets;
+                writeExecuteBlock(sql, params, resultTypeName, writer);
             });
         }
         if (client === 'libsql') {
-            writer
-                .write(`export async function ${camelCaseName}(${functionArguments}): Promise<${resultTypeName}>`)
-                .block(() => {
+            writer.write(`export async function ${camelCaseName}(${functionArguments}): Promise<${resultTypeName}>`).block(() => {
                 const sqlSplit = sql.split('\n');
                 writer.write('const sql = `').newLine();
                 sqlSplit.forEach((sqlLine) => {
@@ -722,18 +653,13 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                 writer.indent().write('`').newLine();
                 const executeParams = queryParams !== '' ? `{ sql, args: ${queryParams} }` : 'sql';
                 writer.write(`return client.execute(${executeParams})`).newLine();
-                writer
-                    .indent()
-                    .write(`.then(res => mapArrayTo${resultTypeName}(res));`);
+                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(`function mapArrayTo${resultTypeName}(data: any) `).block(() => {
             writer.write(`const result: ${resultTypeName} = `).block(() => {
                 tsDescriptor.columns.forEach((col, index) => {
                     const separator = index < tsDescriptor.columns.length - 1 ? ',' : '';
@@ -743,13 +669,9 @@ 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(`function mapArrayTo${resultTypeName}(data: any) `).block(() => {
             writer.write(`const result: ${resultTypeName} = `).block(() => {
                 tsDescriptor.columns.forEach((col, index) => {
                     const separator = index < tsDescriptor.columns.length - 1 ? ',' : '';
@@ -760,9 +682,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         });
     }
     if (tsDescriptor.orderByColumns) {
-        const orderByType = tsDescriptor.dynamicQuery2 == null
-            ? paramsTypeName
-            : dynamicParamsTypeName;
+        const orderByType = tsDescriptor.dynamicQuery2 == null ? paramsTypeName : dynamicParamsTypeName;
         if (orderByField != null) {
             writer.blankLine();
             writer.write('const orderByFragments = ').inlineBlock(() => {
@@ -776,9 +696,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         writer.blankLine();
         writer.writeLine(`export type ${orderByTypeName} = keyof typeof orderByFragments;`);
         writer.blankLine();
-        writer
-            .write(`function escapeOrderBy(orderBy: ${orderByType}['orderBy']): string`)
-            .block(() => {
+        writer.write(`function escapeOrderBy(orderBy: ${orderByType}['orderBy']): string`).block(() => {
             writer.writeLine(`return orderBy.map(order => \`\${orderByFragments[order[0]]} \${order[1] == 'desc' ? 'desc' : 'asc'}\`).join(', ');`);
         });
     }
@@ -803,10 +721,8 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
         relations.forEach((relation, index) => {
             const relationType = (0, code_generator_1.generateRelationType)(capitalizedName, relation.name);
             if (index === 0) {
-                if (client === 'better-sqlite3') {
-                    writer
-                        .write(`export function ${camelCaseName}Nested(${functionArguments}): ${relationType}[]`)
-                        .block(() => {
+                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});`);
                         writer.write('if (selectResult.length == 0)').block(() => {
@@ -816,9 +732,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
                     });
                 }
                 else if (client === 'libsql') {
-                    writer
-                        .write(`export async function ${camelCaseName}Nested(${functionArguments}): Promise<${relationType}[]>`)
-                        .block(() => {
+                    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});`);
                         writer.write('if (selectResult.length == 0)').block(() => {
@@ -831,9 +745,7 @@ function generateCodeFromTsDescriptor(client, queryName, tsDescriptor, isCrud =
             writeCollectFunction(writer, relation, tsDescriptor.columns, capitalizedName, resultTypeName);
         });
         writer.blankLine();
-        writer
-            .write('const groupBy = <T, Q>(array: T[], predicate: (value: T, index: number, array: T[]) => Q) =>')
-            .block(() => {
+        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(() => {
@@ -882,18 +794,17 @@ function writeExecutSelectCrudBlock(client, tableName, idColumn, columns, queryP
         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];`);
+        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.write(`return client.execute({ sql, args: ${queryParams} })`).newLine();
         writer.indent().write('.then(res => res.rows)').newLine();
-        writer
-            .indent()
-            .write(`.then(rows => mapArrayTo${resultTypeName}(rows[0]));`);
+        writer.indent().write(`.then(rows => mapArrayTo${resultTypeName}(rows[0]));`);
     }
 }
 function writeExecuteInsertCrudBlock(client, tableName, paramTypeName, resultTypeName, writer) {
@@ -903,25 +814,20 @@ function writeExecuteInsertCrudBlock(client, tableName, paramTypeName, resultTyp
     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.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 === '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
-            .indent()
-            .write(`.then(res => mapArrayTo${resultTypeName}(res));`)
-            .newLine();
+        writer.indent().write(`.then(res => mapArrayTo${resultTypeName}(res));`).newLine();
     }
 }
 function writeExecuteUpdateCrudBlock(client, tableName, idColumn, paramTypeName, resultTypeName, writer) {
@@ -932,22 +838,20 @@ function writeExecuteUpdateCrudBlock(client, tableName, idColumn, paramTypeName,
     writer.blankLine();
     writer.writeLine('const sql = `');
     writer.indent().write(`UPDATE ${tableName}`).newLine();
-    writer
-        .indent()
-        .write(`SET \${columns.map(col => \`\${col} = ?\`).join(', ')}`)
-        .newLine();
+    writer.indent().write(`SET \${columns.map(col => \`\${col} = ?\`).join(', ')}`).newLine();
     writer.indent().write(`WHERE ${idColumn} = ?\``).newLine();
     writer.blankLine();
     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
-            .indent()
-            .write(`.then(res => mapArrayTo${resultTypeName}(res));`)
-            .newLine();
+        writer.indent().write(`.then(res => mapArrayTo${resultTypeName}(res));`).newLine();
     }
 }
 function writeExecutDeleteCrudBlock(client, tableName, idColumn, queryParams, resultTypeName, writer) {
@@ -958,19 +862,15 @@ function writeExecutDeleteCrudBlock(client, tableName, idColumn, queryParams, re
     writer.blankLine();
     if (client === 'better-sqlite3') {
         writer.write('return db.prepare(sql)').newLine();
-        writer
-            .indent()
-            .write(`.run(${queryParams}) as ${resultTypeName};`)
-            .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();
     }
     else {
-        writer
-            .write(`return client.execute({ sql, args: ${queryParams} })`)
-            .newLine();
-        writer
-            .indent()
-            .write(`.then(res => mapArrayTo${resultTypeName}(res));`)
-            .newLine();
+        writer.write(`return client.execute({ sql, args: ${queryParams} })`).newLine();
+        writer.indent().write(`.then(res => mapArrayTo${resultTypeName}(res));`).newLine();
     }
 }
 function toDriver(variableData, param) {
@@ -996,9 +896,7 @@ function writeCollectFunction(writer, relation, columns, capitalizedName, result
     const relationType = (0, code_generator_1.generateRelationType)(capitalizedName, relation.name);
     const collectFunctionName = `collect${relationType}`;
     writer.blankLine();
-    writer
-        .write(`function ${collectFunctionName}(selectResult: ${resultTypeName}[]): ${relationType}[]`)
-        .block(() => {
+    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