typesql-cli 0.9.6 → 0.10.0

package/code-generator.js

@@ -36,8 +36,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTsFileFromContent = exports.generateTsFile = exports.convertToCamelCaseName = exports.capitalize = exports.writeFile = exports.replaceOrderByParam = exports.hasDateColumn = exports.hasStringColumn = exports.escapeInvalidTsField = exports.renameInvalidNames = exports.removeDuplicatedParameters2 = exports.removeDuplicatedParameters = exports.generateTsDescriptor = exports.writeTypeBlock = exports.generateRelationType = exports.getOperator = exports.generateTsCodeForMySQL = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importStar(require("path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importStar(require("node:path"));
 const camelcase_1 = __importDefault(require("camelcase"));
 const Either_1 = require("fp-ts/lib/Either");
 const mysql_mapping_1 = require("./mysql-mapping");
@@ -45,37 +45,38 @@ const describe_query_1 = require("./describe-query");
 const code_block_writer_1 = __importDefault(require("code-block-writer"));
 const ts_nested_descriptor_1 = require("./ts-nested-descriptor");
 const ts_dynamic_query_descriptor_1 = require("./ts-dynamic-query-descriptor");
-const os_1 = require("os");
+const node_os_1 = require("node:os");
 const code_generator_1 = require("./sqlite-query-analyzer/code-generator");
-function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
+function generateTsCodeForMySQL(tsDescriptor, fileName, crud = false) {
     var _a;
     const writer = new code_block_writer_1.default();
     const camelCaseName = convertToCamelCaseName(fileName);
     const capitalizedName = capitalize(camelCaseName);
-    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 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;
     // Import declarations
-    if (target == 'deno') {
-        writer.writeLine(`import { Client } from "https://deno.land/x/mysql/mod.ts";`);
-    }
-    else {
-        writer.writeLine(`import type { Connection } from 'mysql2/promise';`);
-        if (tsDescriptor.dynamicQuery != null) {
-            writer.writeLine(`import { EOL } from 'os';`);
-        }
+    writer.writeLine(`import type { Connection } from 'mysql2/promise';`);
+    if (tsDescriptor.dynamicQuery != null) {
+        writer.writeLine(`import { EOL } from 'os';`);
     }
     writer.blankLine();
-    if (tsDescriptor.data) { //update
+    if (tsDescriptor.data) {
+        //update
         writeTypeBlock(writer, tsDescriptor.data, dataTypeName, crud);
     }
-    const orderByField = generateOrderBy ? `orderBy: [${orderByTypeName}, ...${orderByTypeName}[]]` : undefined;
-    const paramsTypes = tsDescriptor.dynamicQuery == null ? tsDescriptor.parameters : (0, ts_dynamic_query_descriptor_1.mapToDynamicParams)(tsDescriptor.parameters);
+    const orderByField = generateOrderBy
+        ? `orderBy: [${orderByTypeName}, ...${orderByTypeName}[]]`
+        : undefined;
+    const paramsTypes = tsDescriptor.dynamicQuery == null
+        ? tsDescriptor.parameters
+        : (0, ts_dynamic_query_descriptor_1.mapToDynamicParams)(tsDescriptor.parameters);
     if (tsDescriptor.dynamicQuery != null) {
         writer.write(`export type ${dynamicParamsTypeName} = `).block(() => {
             writer.writeLine(`select?: ${selectColumnsTypeName};`);
@@ -90,12 +91,14 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
         writer.blankLine();
     }
     writeTypeBlock(writer, paramsTypes, paramsTypeName, false, tsDescriptor.dynamicQuery ? undefined : orderByField);
-    const resultTypes = tsDescriptor.dynamicQuery == null ? tsDescriptor.columns : (0, ts_dynamic_query_descriptor_1.mapToDynamicResultColumns)(tsDescriptor.columns);
+    const resultTypes = tsDescriptor.dynamicQuery == null
+        ? tsDescriptor.columns
+        : (0, ts_dynamic_query_descriptor_1.mapToDynamicResultColumns)(tsDescriptor.columns);
     writeTypeBlock(writer, resultTypes, resultTypeName, false);
     if (tsDescriptor.dynamicQuery) {
         const selectFields = (0, ts_dynamic_query_descriptor_1.mapToDynamicSelectColumns)(tsDescriptor.columns);
         writeTypeBlock(writer, selectFields, selectColumnsTypeName, false);
-        writer.write(`const selectFragments = `).inlineBlock(() => {
+        writer.write('const selectFragments = ').inlineBlock(() => {
             var _a;
             (_a = tsDescriptor.dynamicQuery) === null || _a === void 0 ? void 0 : _a.select.forEach((fragment, index) => {
                 const field = tsDescriptor.columns[index].name;
@@ -105,17 +108,16 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
         writer.write(' as const;');
         if (orderByField != null) {
             writer.blankLine();
-            writer.write(`const orderByFragments = `).inlineBlock(() => {
-                var _a;
-                (_a = tsDescriptor.orderByColumns) === null || _a === void 0 ? void 0 : _a.forEach((col) => {
+            writer.write('const orderByFragments = ').inlineBlock(() => {
+                for (const col of tsDescriptor.orderByColumns || []) {
                     writer.writeLine(`'${col}': \`${col}\`,`);
-                });
+                }
             });
             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 (hasStringColumn(tsDescriptor.columns)) {
             writer.writeLine(`type StringOperator = '=' | '<>' | '>' | '<' | '>=' | '<=' | 'LIKE';`);
         }
@@ -123,41 +125,55 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
         writer.writeLine(`type BetweenOperator = 'BETWEEN';`);
         writer.blankLine();
         writer.write(`export type ${whereTypeName} =`).indent(() => {
-            tsDescriptor.columns.forEach(col => {
+            for (const col of tsDescriptor.columns) {
                 writer.writeLine(`| ['${col.name}', ${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();
     }
     let functionReturnType = resultTypeName;
-    functionReturnType += tsDescriptor.multipleRowsResult ? '[]' : tsDescriptor.queryType == 'Select' ? ' | null' : '';
-    let functionArguments = target == 'deno' ? 'client: Client' : 'connection: Connection';
-    functionArguments += tsDescriptor.data && tsDescriptor.data.length > 0 ? ', data: ' + dataTypeName : '';
+    functionReturnType += tsDescriptor.multipleRowsResult
+        ? '[]'
+        : tsDescriptor.queryType === 'Select'
+            ? ' | null'
+            : '';
+    let functionArguments = 'connection: Connection';
+    functionArguments +=
+        tsDescriptor.data && tsDescriptor.data.length > 0
+            ? `, data: ${dataTypeName}`
+            : '';
     if (tsDescriptor.dynamicQuery == null) {
-        functionArguments += tsDescriptor.parameters.length > 0 || generateOrderBy ? ', params: ' + paramsTypeName : '';
+        functionArguments +=
+            tsDescriptor.parameters.length > 0 || generateOrderBy
+                ? `, params: ${paramsTypeName}`
+                : '';
     }
     else {
         functionArguments += `, ${orderByField ? 'params' : 'params?'}: ${dynamicParamsTypeName}`;
     }
-    const allParameters = tsDescriptor.data ? tsDescriptor.data.map((field, index) => {
-        //:nameIsSet, :name, :valueIsSet, :value....
-        if (crud && index % 2 == 0) {
-            const nextField = tsDescriptor.data[index + 1];
-            return `data.${nextField.name} !== undefined`;
-        }
-        return 'data.' + field.name;
-    }) : [];
-    allParameters.push(...tsDescriptor.parameterNames.map((paramName) => generateParam(target, paramName)));
-    const queryParams = allParameters.length > 0 ? ', [' + allParameters.join(', ') + ']' : '';
+    const allParameters = tsDescriptor.data
+        ? tsDescriptor.data.map((field, index) => {
+            //:nameIsSet, :name, :valueIsSet, :value....
+            if (crud && index % 2 === 0) {
+                const nextField = tsDescriptor.data[index + 1];
+                return `data.${nextField.name} !== undefined`;
+            }
+            return `data.${field.name}`;
+        })
+        : [];
+    allParameters.push(...tsDescriptor.parameterNames.map((paramName) => generateParam(paramName)));
+    const queryParams = allParameters.length > 0 ? `, [${allParameters.join(', ')}]` : '';
     const escapedBackstick = scapeBackStick(tsDescriptor.sql);
     const processedSql = replaceOrderByParam(escapedBackstick);
     const sqlSplit = processedSql.split('\n');
-    writer.write(`export async function ${camelCaseName}(${functionArguments}): Promise<${functionReturnType}>`).block(() => {
+    writer
+        .write(`export async function ${camelCaseName}(${functionArguments}): Promise<${functionReturnType}>`)
+        .block(() => {
         if (tsDescriptor.dynamicQuery == null) {
             writer.writeLine('const sql = `');
-            sqlSplit.forEach(sqlLine => {
+            sqlSplit.forEach((sqlLine) => {
                 writer.indent().write(sqlLine);
                 writer.newLine();
             });
@@ -165,34 +181,36 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
             writer.blankLine();
         }
         else {
-            writer.writeLine(`const where = whereConditionsToObject(params?.where);`);
+            writer.writeLine('const where = whereConditionsToObject(params?.where);');
             if (orderByField != null) {
-                writer.writeLine(`const orderBy = orderByToObject(params.orderBy);`);
+                writer.writeLine('const orderBy = orderByToObject(params.orderBy);');
             }
             writer.writeLine('const paramsValues: any = [];');
             if (tsDescriptor.dynamicQuery.with) {
                 writer.writeLine(`let withClause = '';`);
-                tsDescriptor.dynamicQuery.with.forEach(withFragment => {
+                tsDescriptor.dynamicQuery.with.forEach((withFragment) => {
                     generateDynamicQueryFrom(writer, 'withClause', withFragment, tsDescriptor.columns);
                 });
             }
             writer.writeLine(`let sql = 'SELECT';`);
-            tsDescriptor.dynamicQuery.select.forEach(fragment => {
-                writer.write(`if (params?.select == null || ${fragment.dependOnFields.map(fieldIndex => 'params.select.' + tsDescriptor.columns[fieldIndex].name).join('&&')})`).block(() => {
+            tsDescriptor.dynamicQuery.select.forEach((fragment) => {
+                writer
+                    .write(`if (params?.select == null || ${fragment.dependOnFields.map((fieldIndex) => `params.select.${tsDescriptor.columns[fieldIndex].name}`).join('&&')})`)
+                    .block(() => {
                     writer.write(`sql = appendSelect(sql, \`${fragment.fragment}\`);`);
                 });
             });
-            tsDescriptor.dynamicQuery.from.forEach(fragment => {
+            tsDescriptor.dynamicQuery.from.forEach((fragment) => {
                 generateDynamicQueryFrom(writer, 'sql', fragment, tsDescriptor.columns, tsDescriptor.orderByColumns != null);
             });
-            writer.writeLine(`sql += EOL + \`WHERE 1 = 1\`;`);
-            tsDescriptor.dynamicQuery.where.forEach(fragment => {
-                const ifParamConditions = fragment.dependOnParams.map(param => 'params?.params?.' + param + ' != null');
-                const paramValues = fragment.parameters.map(param => 'params.params.' + param);
+            writer.writeLine('sql += EOL + `WHERE 1 = 1`;');
+            tsDescriptor.dynamicQuery.where.forEach((fragment) => {
+                const ifParamConditions = fragment.dependOnParams.map((param) => `params?.params?.${param} != null`);
+                const paramValues = fragment.parameters.map((param) => `params.params.${param}`);
                 if (ifParamConditions.length > 0) {
                     writer.write(`if (${ifParamConditions.join(' || ')})`).block(() => {
                         writer.writeLine(`sql += EOL + \`${fragment.fragment}\`;`);
-                        paramValues.forEach(paramValues => {
+                        paramValues.forEach((paramValues) => {
                             writer.writeLine(`paramsValues.push(${paramValues});`);
                         });
                     });
@@ -206,11 +224,11 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
                     writer.writeLine(`sql = 'WITH ' + withClause + EOL + sql;`);
                 });
             }
-            writer.write(`params?.where?.forEach(condition => `).inlineBlock(() => {
-                writer.writeLine(`const where = whereCondition(condition);`);
-                writer.write(`if (where?.hasValue)`).block(() => {
+            writer.write('params?.where?.forEach(condition => ').inlineBlock(() => {
+                writer.writeLine('const where = whereCondition(condition);');
+                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(');');
@@ -218,40 +236,44 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
                 writer.writeLine('sql += EOL + `ORDER BY ${escapeOrderBy(params.orderBy)}`;');
             }
         }
-        const singleRowSelect = tsDescriptor.queryType == 'Select' && tsDescriptor.multipleRowsResult === false;
-        if (target == 'deno') {
-            writer.writeLine(`return client.query(sql${queryParams})`);
-            writer.indent().write(`.then(res => res${singleRowSelect ? '[0]' : ''});`);
-        }
-        else {
-            if (tsDescriptor.queryType == 'Select') {
-                if (tsDescriptor.dynamicQuery == null) {
-                    writer.writeLine(`return connection.query({sql, rowsAsArray: true}${queryParams})`);
-                    writer.indent().write(`.then(res => res[0] as any[])`);
-                    writer.newLine().indent().write(`.then(res => res.map(data => mapArrayTo${resultTypeName}(data)))`);
-                }
-                else {
-                    writer.writeLine(`return connection.query({ sql, rowsAsArray: true }, paramsValues)`);
-                    writer.indent().write(`.then(res => res[0] as any[])`);
-                    writer.newLine().indent().write(`.then(res => res.map(data => mapArrayTo${resultTypeName}(data, params?.select)))`);
-                }
-            }
-            else {
-                writer.writeLine(`return connection.query(sql${queryParams})`);
-                writer.indent().write(`.then(res => res[0] as ${resultTypeName})`);
-            }
-            if (tsDescriptor.queryType == 'Select' && tsDescriptor.multipleRowsResult == false) {
-                writer.newLine().indent().write(`.then(res => res[0]);`);
+        const singleRowSelect = tsDescriptor.queryType === 'Select' &&
+            tsDescriptor.multipleRowsResult === false;
+        if (tsDescriptor.queryType === 'Select') {
+            if (tsDescriptor.dynamicQuery == null) {
+                writer.writeLine(`return connection.query({sql, rowsAsArray: true}${queryParams})`);
+                writer.indent().write('.then(res => res[0] as any[])');
+                writer
+                    .newLine()
+                    .indent()
+                    .write(`.then(res => res.map(data => mapArrayTo${resultTypeName}(data)))`);
             }
             else {
-                writer.write(';');
+                writer.writeLine('return connection.query({ sql, rowsAsArray: true }, paramsValues)');
+                writer.indent().write('.then(res => res[0] as any[])');
+                writer
+                    .newLine()
+                    .indent()
+                    .write(`.then(res => res.map(data => mapArrayTo${resultTypeName}(data, params?.select)))`);
             }
         }
+        else {
+            writer.writeLine(`return connection.query(sql${queryParams})`);
+            writer.indent().write(`.then(res => res[0] as ${resultTypeName})`);
+        }
+        if (tsDescriptor.queryType === 'Select' &&
+            tsDescriptor.multipleRowsResult === false) {
+            writer.newLine().indent().write('.then(res => res[0]);');
+        }
+        else {
+            writer.write(';');
+        }
     });
-    if (target == 'node' && tsDescriptor.queryType == 'Select') {
+    if (tsDescriptor.queryType === 'Select') {
         writer.blankLine();
         if (tsDescriptor.dynamicQuery == null) {
-            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((tsField, index) => {
                         writer.writeLine(`${tsField.name}: data[${index}]${commaSeparator(tsDescriptor.columns.length, index)}`);
@@ -261,85 +283,101 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
             });
         }
         else {
-            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 = 0;`);
+                writer.writeLine('let rowIndex = 0;');
                 tsDescriptor.columns.forEach((tsField) => {
-                    writer.write(`if (select == null || select.${tsField.name})`).block(() => {
+                    writer
+                        .write(`if (select == null || select.${tsField.name})`)
+                        .block(() => {
                         writer.writeLine(`result.${tsField.name} = data[rowIndex++];`);
                     });
                 });
                 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
+                .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.write(');');
-                writer.writeLine(`return obj;`);
+                writer.writeLine('return obj;');
             });
             if (orderByField != null) {
                 writer.blankLine();
                 writer.write(`function orderByToObject(${orderByField})`).block(() => {
-                    writer.writeLine(`const obj = {} as any;`);
-                    writer.write(`orderBy?.forEach(order => `).inlineBlock(() => {
-                        writer.writeLine(`obj[order.column] = true;`);
+                    writer.writeLine('const obj = {} as any;');
+                    writer.write('orderBy?.forEach(order => ').inlineBlock(() => {
+                        writer.writeLine('obj[order.column] = 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[];');
             });
             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];');
                 writer.blankLine();
                 if (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]]');
                         });
                     });
                 }
                 writer.write(`if (operator == 'BETWEEN') `).block(() => {
-                    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]]');
                     });
                 });
-                writer.write(`if (operator == 'IN' || operator == 'NOT IN') `).block(() => {
-                    writer.write(`return `).block(() => {
+                writer
+                    .write(`if (operator == 'IN' || operator == 'NOT IN') `)
+                    .block(() => {
+                    writer.write('return ').block(() => {
                         writer.writeLine('sql: `${selectFragment} ${operator} (?)`,');
                         writer.writeLine('hasValue: condition[2] != null && condition[2].length > 0,');
                         writer.writeLine('values: [condition[2]]');
                     });
                 });
-                writer.write(`if (NumericOperatorList.includes(operator)) `).block(() => {
-                    writer.write(`return `).block(() => {
+                writer
+                    .write('if (NumericOperatorList.includes(operator)) ')
+                    .block(() => {
+                    writer.write('return ').block(() => {
                         writer.writeLine('sql: `${selectFragment} ${operator} ?`,');
                         writer.writeLine('hasValue: condition[2] != null,');
                         writer.writeLine('values: [condition[2]]');
@@ -349,19 +387,21 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
         }
     }
     if (generateOrderBy) {
-        const orderByColumnsType = (_a = tsDescriptor.orderByColumns) === null || _a === void 0 ? void 0 : _a.map(col => `'${col}'`).join(' | ');
+        const orderByColumnsType = (_a = tsDescriptor.orderByColumns) === null || _a === void 0 ? void 0 : _a.map((col) => `'${col}'`).join(' | ');
         writer.blankLine();
         writer.write(`export type ${orderByTypeName} = `).block(() => {
             if (tsDescriptor.dynamicQuery == null) {
                 writer.writeLine(`column: ${orderByColumnsType};`);
             }
             else {
-                writer.writeLine(`column: keyof typeof orderByFragments;`);
+                writer.writeLine('column: keyof typeof orderByFragments;');
             }
             writer.writeLine(`direction: 'asc' | 'desc';`);
         });
         writer.blankLine();
-        writer.write(`function escapeOrderBy(orderBy: ${orderByTypeName}[]): string`).block(() => {
+        writer
+            .write(`function escapeOrderBy(orderBy: ${orderByTypeName}[]): string`)
+            .block(() => {
             if (tsDescriptor.dynamicQuery == null) {
                 writer.writeLine(`return orderBy.map(order => \`\\\`\${order.column}\\\` \${order.direction == 'desc' ? 'desc' : 'asc' }\`).join(', ');`);
             }
@@ -376,12 +416,12 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
             const relationType = generateRelationType(capitalizedName, relation.name);
             writer.blankLine();
             writer.write(`export type ${relationType} = `).block(() => {
-                const uniqueNameFields = renameInvalidNames(relation.fields.map(f => f.name));
+                const uniqueNameFields = renameInvalidNames(relation.fields.map((f) => f.name));
                 relation.fields.forEach((field, index) => {
-                    if (field.type == 'field') {
+                    if (field.type === 'field') {
                         writer.writeLine(`${uniqueNameFields[index]}: ${field.tsType};`);
                     }
-                    if (field.type == 'relation') {
+                    if (field.type === 'relation') {
                         const nestedRelationType = generateRelationType(capitalizedName, field.tsType);
                         const nullableOperator = field.notNull ? '' : '?';
                         writer.writeLine(`${field.name}${nullableOperator}: ${nestedRelationType};`);
@@ -391,9 +431,12 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
         });
         relations.forEach((relation, index) => {
             const relationType = generateRelationType(capitalizedName, relation.name);
-            if (index == 0) { //first
+            if (index === 0) {
+                //first
                 writer.blankLine();
-                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}(connection${params});`);
                     writer.write('if (selectResult.length == 0)').block(() => {
@@ -405,26 +448,30 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
             const collectFunctionName = `collect${relationType}`;
             const mapFunctionName = `mapTo${relationType}`;
             writer.blankLine();
-            writer.write(`function ${collectFunctionName}(selectResult: ${resultTypeName}[]): ${relationType}[]`).block(() => {
+            writer
+                .write(`function ${collectFunctionName}(selectResult: ${resultTypeName}[]): ${relationType}[]`)
+                .block(() => {
                 const groupKey = tsDescriptor.columns[relation.groupKeyIndex].name;
                 writer.writeLine(`const grouped = groupBy(selectResult.filter(r => r.${groupKey} != null), r => r.${groupKey});`);
                 writer.writeLine(`return [...grouped.values()].map(r => ${mapFunctionName}(r))`);
             });
             writer.blankLine();
-            writer.write(`function ${mapFunctionName}(selectResult: ${resultTypeName}[]): ${relationType}`).block(() => {
-                writer.writeLine(`const firstRow = selectResult[0];`);
+            writer
+                .write(`function ${mapFunctionName}(selectResult: ${resultTypeName}[]): ${relationType}`)
+                .block(() => {
+                writer.writeLine('const firstRow = selectResult[0];');
                 writer.write(`const result: ${relationType} = `).block(() => {
-                    const uniqueNameFields = renameInvalidNames(relation.fields.map(f => f.name));
+                    const uniqueNameFields = renameInvalidNames(relation.fields.map((f) => f.name));
                     relation.fields.forEach((field, index) => {
                         const separator = commaSeparator(relation.fields.length, index);
-                        if (field.type == 'field') {
+                        if (field.type === 'field') {
                             const fieldName = tsDescriptor.columns[field.index].name;
-                            writer.writeLine(`${uniqueNameFields[index]}: firstRow.${fieldName}!` + separator);
+                            writer.writeLine(`${uniqueNameFields[index]}: firstRow.${fieldName}!${separator}`);
                         }
-                        if (field.type == 'relation') {
+                        if (field.type === 'relation') {
                             const nestedRelationType = generateRelationType(capitalizedName, field.name);
                             const cardinality = field.list ? '' : '[0]';
-                            writer.writeLine(`${field.name}: collect${nestedRelationType}(selectResult)${cardinality}` + separator);
+                            writer.writeLine(`${field.name}: collect${nestedRelationType}(selectResult)${cardinality}${separator}`);
                         }
                     });
                 });
@@ -432,12 +479,17 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
             });
         });
         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('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.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();
@@ -445,45 +497,52 @@ function generateTsCodeForMySQL(tsDescriptor, fileName, target, crud = false) {
 exports.generateTsCodeForMySQL = generateTsCodeForMySQL;
 function generateDynamicQueryFrom(writer, sqlVar, fragment, columns, includeOrderBy = false) {
     var _a;
-    const selectConditions = fragment.dependOnFields.map(fieldIndex => 'params.select.' + columns[fieldIndex].name);
+    const selectConditions = fragment.dependOnFields.map((fieldIndex) => `params.select.${columns[fieldIndex].name}`);
     if (selectConditions.length > 0) {
         selectConditions.unshift('params?.select == null');
     }
-    const paramConditions = fragment.dependOnParams.map(param => 'params.params?.' + param + ' != null');
-    const whereConditions = fragment.dependOnFields.map(fieldIndex => 'where.' + columns[fieldIndex].name + ' != null');
-    const orderByConditions = includeOrderBy ? ((_a = fragment.dependOnOrderBy) === null || _a === void 0 ? void 0 : _a.map(orderBy => 'orderBy[\'' + orderBy + '\'] != null')) || [] : [];
-    const allConditions = [...selectConditions, ...paramConditions, ...whereConditions, ...orderByConditions];
-    const paramValues = fragment.parameters.map(param => 'params?.params?.' + param);
+    const paramConditions = fragment.dependOnParams.map((param) => `params.params?.${param} != null`);
+    const whereConditions = fragment.dependOnFields.map((fieldIndex) => `where.${columns[fieldIndex].name} != null`);
+    const orderByConditions = includeOrderBy
+        ? ((_a = fragment.dependOnOrderBy) === null || _a === void 0 ? void 0 : _a.map((orderBy) => `orderBy['${orderBy}'] != null`)) || []
+        : [];
+    const allConditions = [
+        ...selectConditions,
+        ...paramConditions,
+        ...whereConditions,
+        ...orderByConditions
+    ];
+    const paramValues = fragment.parameters.map((param) => `params?.params?.${param}`);
     if (allConditions.length > 0) {
-        writer.write(`if (${allConditions.join(os_1.EOL + '    || ')})`).block(() => {
+        writer.write(`if (${allConditions.join(`${node_os_1.EOL}    || `)})`).block(() => {
             writer.write(`${sqlVar} += EOL + \`${fragment.fragment}\`;`);
-            paramValues.forEach(paramValues => {
-                writer.writeLine(`paramsValues.push(${paramValues});`);
-            });
+            for (const paramValue of paramValues) {
+                writer.writeLine(`paramsValues.push(${paramValue});`);
+            }
         });
     }
     else {
         writer.writeLine(`${sqlVar} += EOL + \`${fragment.fragment}\`;`);
-        paramValues.forEach(paramValues => {
-            writer.writeLine(`paramsValues.push(${paramValues});`);
-        });
+        for (const paramValue of paramValues) {
+            writer.writeLine(`paramsValues.push(${paramValue});`);
+        }
     }
 }
 function getOperator(type) {
-    if (type == 'number' || type == 'Date') {
+    if (type === 'number' || type === 'Date') {
         return 'NumericOperator';
     }
     return 'StringOperator';
 }
 exports.getOperator = getOperator;
-function generateParam(target, param) {
-    if (target == 'node' && param.isList) {
+function generateParam(param) {
+    if (param.isList) {
         return `params.${param.name}.length == 0? null : params.${param.name}`;
     }
     return `params.${param.name}`;
 }
 function generateRelationType(capitalizedName, relationName) {
-    return capitalizedName + 'Nested' + capitalizeStr(relationName);
+    return `${capitalizedName}Nested${capitalizeStr(relationName)}`;
 }
 exports.generateRelationType = generateRelationType;
 function writeTypeBlock(writer, fields, typeName, updateCrud, extraField) {
@@ -492,15 +551,16 @@ function writeTypeBlock(writer, fields, typeName, updateCrud, extraField) {
         writer.write(`export type ${typeName} =`).block(() => {
             fields.forEach((tsField, index) => {
                 // :nameSet, :name, valueSet, :value...
-                if (updateCrud && index % 2 != 0) { //only odd fields (:name, :value)
-                    writer.writeLine(tsFieldToStr(tsField, true) + ';');
+                if (updateCrud && index % 2 !== 0) {
+                    //only odd fields (:name, :value)
+                    writer.writeLine(`${tsFieldToStr(tsField, true)};`);
                 }
                 else if (!updateCrud) {
-                    writer.writeLine(tsFieldToStr(tsField, false) + ';');
+                    writer.writeLine(`${tsFieldToStr(tsField, false)};`);
                 }
             });
             if (extraField) {
-                writer.write(extraField + ';');
+                writer.write(`${extraField};`);
             }
         });
         writer.blankLine();
@@ -510,13 +570,13 @@ exports.writeTypeBlock = writeTypeBlock;
 function tsFieldToStr(tsField, isCrudUpdate) {
     if (isCrudUpdate) {
         //all fields are optionals
-        return tsField.name + '?: ' + tsField.tsType + (tsField.notNull == false ? ' | null' : '');
+        return `${tsField.name}?: ${tsField.tsType}${tsField.notNull === false ? ' | null' : ''}`;
     }
     return tsField.name + (tsField.notNull ? ': ' : '?: ') + tsField.tsType;
 }
 function generateTsDescriptor(queryInfo) {
     var _a;
-    const escapedColumnsNames = renameInvalidNames(queryInfo.columns.map(col => col.columnName));
+    const escapedColumnsNames = renameInvalidNames(queryInfo.columns.map((col) => col.columnName));
     const columns = queryInfo.columns.map((col, columnIndex) => {
         const tsDesc = {
             name: escapedColumnsNames[columnIndex],
@@ -525,15 +585,15 @@ function generateTsDescriptor(queryInfo) {
         };
         return tsDesc;
     });
-    const parameterNames = queryInfo.parameters.map(p => {
+    const parameterNames = queryInfo.parameters.map((p) => {
         const paramInfo = {
             name: p.name,
-            isList: p.columnType.endsWith('[]') ? true : false
+            isList: !!p.columnType.endsWith('[]')
         };
         return paramInfo;
     });
     const uniqueParams = removeDuplicatedParameters(queryInfo.parameters);
-    const escapedParametersNames = renameInvalidNames(uniqueParams.map(col => col.name));
+    const escapedParametersNames = renameInvalidNames(uniqueParams.map((col) => col.name));
     const parameters = uniqueParams.map((col, paramIndex) => {
         const arraySymbol = col.list ? '[]' : '';
         const tsDesc = {
@@ -543,7 +603,9 @@ function generateTsDescriptor(queryInfo) {
         };
         return tsDesc;
     });
-    const escapedDataNames = queryInfo.data ? renameInvalidNames(queryInfo.data.map(col => col.name)) : [];
+    const escapedDataNames = queryInfo.data
+        ? renameInvalidNames(queryInfo.data.map((col) => col.name))
+        : [];
     const data = (_a = queryInfo.data) === null || _a === void 0 ? void 0 : _a.map((col, dataIndex) => {
         const tsDesc = {
             name: escapedDataNames[dataIndex],
@@ -560,7 +622,7 @@ function generateTsDescriptor(queryInfo) {
         orderByColumns: queryInfo.orderByColumns,
         parameterNames,
         parameters,
-        data,
+        data
     };
     if (queryInfo.nestedResultInfo) {
         const nestedDescriptor = (0, ts_nested_descriptor_1.createNestedTsDescriptor)(queryInfo.columns, queryInfo.nestedResultInfo);
@@ -578,10 +640,11 @@ function generateTsDescriptor(queryInfo) {
 exports.generateTsDescriptor = generateTsDescriptor;
 function removeDuplicatedParameters(parameters) {
     const columnsCount = new Map();
-    parameters.forEach(param => {
+    parameters.forEach((param) => {
         const dupParam = columnsCount.get(param.name);
-        if (dupParam != null) { //duplicated - two parameter null and notNull, resturn the null param (notNull == false)
-            if (param.notNull == false) {
+        if (dupParam != null) {
+            //duplicated - two parameter null and notNull, resturn the null param (notNull == false)
+            if (param.notNull === false) {
                 columnsCount.set(param.name, param);
             }
             // return param;
@@ -596,10 +659,11 @@ exports.removeDuplicatedParameters = removeDuplicatedParameters;
 //TODO - remove duplicated code
 function removeDuplicatedParameters2(parameters) {
     const columnsCount = new Map();
-    parameters.forEach(param => {
+    parameters.forEach((param) => {
         const dupParam = columnsCount.get(param.name);
-        if (dupParam != null) { //duplicated - two parameter null and notNull, resturn the null param (notNull == false)
-            if (param.notNull == false) {
+        if (dupParam != null) {
+            //duplicated - two parameter null and notNull, resturn the null param (notNull == false)
+            if (param.notNull === false) {
                 columnsCount.set(param.name, param);
             }
             // return param;
@@ -613,23 +677,21 @@ function removeDuplicatedParameters2(parameters) {
 exports.removeDuplicatedParameters2 = removeDuplicatedParameters2;
 function renameInvalidNames(columnNames) {
     const columnsCount = new Map();
-    return columnNames.map(columnName => {
+    return columnNames.map((columnName) => {
         if (columnsCount.has(columnName)) {
             const count = columnsCount.get(columnName) + 1;
             columnsCount.set(columnName, count);
-            const newName = columnName + '_' + count;
+            const newName = `${columnName}_${count}`;
             return escapeInvalidTsField(newName);
         }
-        else {
-            columnsCount.set(columnName, 1);
-            return escapeInvalidTsField(columnName);
-        }
+        columnsCount.set(columnName, 1);
+        return escapeInvalidTsField(columnName);
     });
 }
 exports.renameInvalidNames = renameInvalidNames;
 function scapeBackStick(sql) {
     const pattern = /`/g;
-    return sql.replace(pattern, "\\`");
+    return sql.replace(pattern, '\\`');
 }
 function escapeInvalidTsField(columnName) {
     const validPattern = /^[a-zA-Z0-9_$]+$/g;
@@ -640,28 +702,28 @@ function escapeInvalidTsField(columnName) {
 }
 exports.escapeInvalidTsField = escapeInvalidTsField;
 function mapColumnType(columnType) {
-    if (columnType == 'any')
+    if (columnType === 'any')
         return 'any';
     const types = [].concat(columnType);
-    const mappedTypes = types.map(type => (0, mysql_mapping_1.converToTsType)(type));
+    const mappedTypes = types.map((type) => (0, mysql_mapping_1.converToTsType)(type));
     return mappedTypes.join(' | '); // number | string
 }
 function hasStringColumn(columns) {
-    return columns.some(c => c.tsType == 'string');
+    return columns.some((c) => c.tsType === 'string');
 }
 exports.hasStringColumn = hasStringColumn;
 function hasDateColumn(columns) {
-    return columns.some(c => c.tsType == 'Date');
+    return columns.some((c) => c.tsType === 'Date');
 }
 exports.hasDateColumn = hasDateColumn;
 function replaceOrderByParam(sql) {
     const patern = /(.*order\s+by\s*)(\?)(.\n$)*/i;
-    const newSql = sql.replace(patern, "$1${escapeOrderBy(params.orderBy)}$3");
+    const newSql = sql.replace(patern, '$1${escapeOrderBy(params.orderBy)}$3');
     return newSql;
 }
 exports.replaceOrderByParam = replaceOrderByParam;
 function writeFile(filePath, tsContent) {
-    fs_1.default.writeFileSync(filePath, tsContent);
+    node_fs_1.default.writeFileSync(filePath, tsContent);
 }
 exports.writeFile = writeFile;
 function capitalize(name) {
@@ -669,7 +731,7 @@ function capitalize(name) {
 }
 exports.capitalize = capitalize;
 function capitalizeStr(name) {
-    if (name.length == 0)
+    if (name.length === 0)
         return name;
     return name.charAt(0).toUpperCase() + name.slice(1);
 }
@@ -680,16 +742,18 @@ function convertToCamelCaseName(name) {
 exports.convertToCamelCaseName = convertToCamelCaseName;
 function generateTsFile(client, sqlFile, dbSchema, isCrudFile) {
     return __awaiter(this, void 0, void 0, function* () {
-        const sqlContent = fs_1.default.readFileSync(sqlFile, 'utf8');
-        if (sqlContent.trim() == '') { //ignore empty file
+        const sqlContent = node_fs_1.default.readFileSync(sqlFile, 'utf8');
+        if (sqlContent.trim() === '') {
+            //ignore empty file
             return;
         }
-        const fileName = (0, path_1.parse)(sqlFile).name;
-        const dirPath = (0, path_1.parse)(sqlFile).dir;
+        const fileName = (0, node_path_1.parse)(sqlFile).name;
+        const dirPath = (0, node_path_1.parse)(sqlFile).dir;
         const queryName = convertToCamelCaseName(fileName);
-        const tsContentResult = client.type == 'mysql' ? yield generateTsFileFromContent(client, queryName, sqlContent, 'node', isCrudFile)
+        const tsContentResult = client.type === 'mysql2'
+            ? yield generateTsFileFromContent(client, queryName, sqlContent, isCrudFile)
             : (0, code_generator_1.validateAndGenerateCode)(client, sqlContent, queryName, dbSchema, isCrudFile);
-        const tsFilePath = path_1.default.resolve(dirPath, fileName) + ".ts";
+        const tsFilePath = `${node_path_1.default.resolve(dirPath, fileName)}.ts`;
         if ((0, Either_1.isLeft)(tsContentResult)) {
             console.error('ERROR: ', tsContentResult.left.description);
             console.error('at ', sqlFile);
@@ -701,19 +765,19 @@ function generateTsFile(client, sqlFile, dbSchema, isCrudFile) {
     });
 }
 exports.generateTsFile = generateTsFile;
-function generateTsFileFromContent(client_1, queryName_1, sqlContent_1, target_1) {
-    return __awaiter(this, arguments, void 0, function* (client, queryName, sqlContent, target, crud = false) {
+function generateTsFileFromContent(client_1, queryName_1, sqlContent_1) {
+    return __awaiter(this, arguments, void 0, function* (client, queryName, sqlContent, crud = false) {
         const queryInfoResult = yield (0, describe_query_1.parseSql)(client, sqlContent);
         if ((0, Either_1.isLeft)(queryInfoResult)) {
             return queryInfoResult;
         }
         const tsDescriptor = generateTsDescriptor(queryInfoResult.right);
-        const tsContent = generateTsCodeForMySQL(tsDescriptor, queryName, target, crud);
+        const tsContent = generateTsCodeForMySQL(tsDescriptor, queryName, crud);
         return (0, Either_1.right)(tsContent);
     });
 }
 exports.generateTsFileFromContent = generateTsFileFromContent;
 function commaSeparator(length, index) {
-    return length > 1 && index != length - 1 ? ',' : '';
+    return length > 1 && index !== length - 1 ? ',' : '';
 }
 //# sourceMappingURL=code-generator.js.map