typesql-cli 0.19.2 → 0.21.0

package/code-generator2.js

@@ -11,7 +11,6 @@ const code_block_writer_1 = __importDefault(require("code-block-writer"));
 const code_generator_1 = require("./code-generator");
 const describe_1 = require("./postgres-query-analyzer/describe");
 const postgres_1 = require("./dialects/postgres");
-const describe_query_1 = require("./describe-query");
 const neverthrow_1 = require("neverthrow");
 const code_generator_2 = require("./sqlite-query-analyzer/code-generator");
 const ts_nested_descriptor_1 = require("./ts-nested-descriptor");
@@ -20,9 +19,8 @@ function generateCode(client, sql, queryName, schemaInfo) {
     if (isEmptySql(sql)) {
         return (0, neverthrow_1.okAsync)('');
     }
-    const { sql: processedSql, namedParameters } = (0, describe_query_1.preprocessSql)(sql, 'postgres');
-    return _describeQuery(client, processedSql, namedParameters, schemaInfo)
-        .map(schemaDef => generateTsCode(processedSql, queryName, schemaDef, client.type));
+    return _describeQuery(client, sql, schemaInfo)
+        .map(schemaDef => generateTsCode(sql, queryName, schemaDef, client.type));
 }
 function isEmptySql(sql) {
     if (sql.trim() === '') {
@@ -31,8 +29,8 @@ function isEmptySql(sql) {
     const lines = sql.split('\n');
     return lines.every(line => line.trim() === '' || line.trim().startsWith('//'));
 }
-function _describeQuery(databaseClient, sql, namedParameters, dbSchema) {
-    return (0, describe_1.describeQuery)(databaseClient.client, sql, namedParameters, dbSchema);
+function _describeQuery(databaseClient, sql, dbSchema) {
+    return (0, describe_1.describeQuery)(databaseClient.client, sql, dbSchema);
 }
 function createCodeBlockWriter() {
     const writer = new code_block_writer_1.default({
@@ -117,9 +115,9 @@ function generateTsCode(sqlOld, queryName, schemaDef, client, isCrud = false) {
         writer.blankLine();
         writer.write(`export type ${whereTypeName} =`).indent(() => {
             for (const col of tsDescriptor.columns) {
-                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.writeLine(`| { column: '${col.name}'; op: ${(0, code_generator_1.getOperator)(col.tsType)}; value: ${col.tsType} | null }`);
+                writer.writeLine(`| { column: '${col.name}'; op: SetOperator; value: ${col.tsType}[] }`);
+                writer.writeLine(`| { column: '${col.name}'; op: BetweenOperator; value: [${col.tsType} | null, ${col.tsType} | null] }`);
             }
         });
         writer.blankLine();
@@ -128,23 +126,25 @@ function generateTsCode(sqlOld, queryName, schemaDef, client, isCrud = false) {
         // 	functionParams += `, data: ${dataType}`;
         // }
         functionArguments += `, params?: ${dynamicParamsTypeName}`;
-        writer.writeLine('let currentIndex: number;');
         writer.write(`export async function ${camelCaseName}(${functionArguments}): Promise<${resultTypeName}[]>`).block(() => {
-            writer.writeLine(`currentIndex = ${tsDescriptor.parameters.length};`);
-            writer.writeLine('const where = whereConditionsToObject(params?.where);');
             // if (orderByField != null) {
             // 	writer.writeLine('const orderBy = orderByToObject(params.orderBy);');
             // }
-            writer.writeLine('const paramsValues: any = [];');
+            writer.writeLine(`const isSelected = (field: keyof ${selectColumnsTypeName}) =>`);
+            writer.indent().write('params?.select == null || params.select[field] === true;').newLine();
+            writer.blankLine();
+            writer.writeLine('const selectedSqlFragments: string[] = [];');
+            writer.writeLine(`const selectedFields: (keyof ${resultTypeName})[] = [];`);
+            writer.writeLine('const paramsValues: any[] = [];');
+            writer.blankLine();
+            writer.writeLine('const whereColumns = new Set(params?.where?.map(w => w.column) || []);');
+            writer.blankLine();
             if (dynamicQueryInfo.with.length > 0) {
-                writer.writeLine(`let withClause = '';`);
+                writer.writeLine(`const withFragments: string[] = [];`);
                 dynamicQueryInfo.with.forEach((withFragment) => {
                     var _a;
-                    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 selectConditions = withFragment.dependOnFields.map((fieldIndex) => `isSelected('${tsDescriptor.columns[fieldIndex].name}')`);
+                    const whereConditions = withFragment.dependOnFields.map((fieldIndex) => `whereColumns.has('${tsDescriptor.columns[fieldIndex].name}')`);
                     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((paramIndex) => {
@@ -152,43 +152,38 @@ function generateTsCode(sqlOld, queryName, schemaDef, client, isCrud = false) {
                         return `params?.params?.${param.name}`;
                     });
                     if (allConditions.length > 0) {
-                        writer.write(`if (${allConditions.join(`${node_os_1.EOL}\t|| `)})`).block(() => {
-                            writer.writeLine(`if (withClause !== '') withClause += ',' + EOL;`);
-                            writer.write(`withClause += \`${withFragment.fragment}\`;`);
+                        writer.writeLine(`if (`);
+                        writer.indent().write(`${allConditions.join(`${node_os_1.EOL}\t|| `)}`).newLine();
+                        writer.write(') ').inlineBlock(() => {
+                            writer.write(`withFragments.push(\`${withFragment.fragment}\`);`);
                             paramValues.forEach((paramValues) => {
                                 writer.writeLine(`paramsValues.push(${paramValues});`);
                             });
-                        });
+                        }).newLine();
                     }
                     else {
-                        writer.write(`withClause.push(\`${withFragment.fragment}\`);`);
+                        writer.writeLine(`withFragments.push(\`${withFragment.fragment}\`);`);
                         paramValues.forEach((paramValues) => {
                             writer.writeLine(`paramsValues.push(${paramValues});`);
                         });
                     }
                 });
             }
-            writer.writeLine(`let sql = 'SELECT';`);
-            if (dynamicQueryInfo.with.length > 0) {
-                writer.write('if (withClause)').block(() => {
-                    writer.writeLine(`sql = 'WITH' + EOL + withClause + EOL + sql;`);
-                });
-            }
             dynamicQueryInfo.select.forEach((select, index) => {
-                writer.write(`if (params?.select == null || params.select.${tsDescriptor.columns[index].name})`).block(() => {
-                    writer.writeLine(`sql = appendSelect(sql, \`${select.fragment}\`);`);
+                writer.write(`if (isSelected('${tsDescriptor.columns[index].name}'))`).block(() => {
+                    writer.writeLine(`selectedSqlFragments.push('${select.fragment}');`);
+                    writer.writeLine(`selectedFields.push('${tsDescriptor.columns[index].name}');`);
                     select.parameters.forEach((param) => {
                         writer.writeLine(`paramsValues.push(params?.params?.${param} ?? null);`);
                     });
                 });
             });
+            writer.blankLine();
+            writer.writeLine('const fromSqlFragments: string[] = [];');
             dynamicQueryInfo.from.forEach((from) => {
                 var _a;
-                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 selectConditions = from.dependOnFields.map((fieldIndex) => `isSelected('${tsDescriptor.columns[fieldIndex].name}')`);
+                const whereConditions = from.dependOnFields.map((fieldIndex) => `whereColumns.has('${tsDescriptor.columns[fieldIndex].name}')`);
                 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((paramIndex) => {
@@ -196,33 +191,41 @@ function generateTsCode(sqlOld, queryName, schemaDef, client, isCrud = false) {
                     return `params?.params?.${param.name}`;
                 });
                 if (allConditions.length > 0) {
-                    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});`);
-                        });
+                    writer.blankLine();
+                    writer.writeLine(`if (`);
+                    writer.indent().write(`${allConditions.join(`${node_os_1.EOL}\t|| `)}`).newLine();
+                    writer.write(') ').inlineBlock(() => {
+                        writer.write(`fromSqlFragments.push(\`${from.fragment}\`);`);
+                    });
+                    paramValues.forEach((paramValues) => {
+                        writer.writeLine(`paramsValues.push(${paramValues});`);
                     });
                 }
                 else {
-                    writer.writeLine(`sql += EOL + \`${from.fragment}\`;`);
+                    writer.writeLine(`fromSqlFragments.push(\`${from.fragment}\`);`);
                     paramValues.forEach((paramValues) => {
                         writer.writeLine(`paramsValues.push(${paramValues});`);
                     });
                 }
             });
-            writer.writeLine('sql += EOL + `WHERE 1 = 1`;');
+            writer.blankLine();
+            writer.writeLine('const whereSqlFragments: string[] = [];');
+            writer.blankLine();
             dynamicQueryInfo.where.forEach((fragment) => {
                 const paramValues = fragment.parameters.map((paramIndex) => {
                     const param = tsDescriptor.parameters[paramIndex];
                     return `params?.params?.${param.name} ?? null`;
                 });
-                writer.writeLine(`sql += EOL + \`${fragment.fragment}\`;`);
+                writer.writeLine(`whereSqlFragments.push(\`${fragment.fragment}\`);`);
                 paramValues.forEach((paramValues) => {
                     writer.writeLine(`paramsValues.push(${paramValues});`);
                 });
             });
+            writer.writeLine(`let currentIndex = paramsValues.length;`);
+            writer.writeLine('const placeholder = () => `$${++currentIndex}`;');
+            writer.blankLine();
             writer.write('params?.where?.forEach(condition => ').inlineBlock(() => {
-                writer.writeLine('const where = whereCondition(condition);');
+                writer.writeLine('const whereClause = whereCondition(condition, placeholder);');
                 dynamicQueryInfo.select.forEach((select, index) => {
                     if (select.parameters.length > 0) {
                         writer.write(`if (condition[0] == '${tsDescriptor.columns[index].name}')`).block(() => {
@@ -232,45 +235,44 @@ function generateTsCode(sqlOld, queryName, schemaDef, client, isCrud = false) {
                         });
                     }
                 });
-                writer.write('if (where?.hasValue)').block(() => {
-                    writer.writeLine(`sql += EOL + 'AND ' + where.sql;`);
-                    writer.write('paramsValues.push(...where.values);');
+                writer.write('if (whereClause?.hasValue)').block(() => {
+                    writer.writeLine(`whereSqlFragments.push(whereClause.sql);`);
+                    writer.write('paramsValues.push(...whereClause.values);');
                 });
             });
             writer.write(');').newLine();
+            if (dynamicQueryInfo.with.length > 0) {
+                writer.blankLine();
+                writer.writeLine('const withSql = withFragments.length > 0');
+                writer.indent().write('? `WITH${EOL}${withFragments.join(`,${EOL}`)}${EOL}`').newLine();
+                writer.indent().write(`: '';`).newLine();
+            }
+            writer.blankLine();
+            writer.writeLine('const whereSql = whereSqlFragments.length > 0 ? `WHERE ${whereSqlFragments.join(\' AND \')}` : \'\';');
+            writer.blankLine();
+            if (dynamicQueryInfo.with.length > 0) {
+                writer.writeLine('const sql = `${withSql}SELECT');
+            }
+            else {
+                writer.writeLine('const sql = `SELECT');
+            }
+            writer.indent().write('${selectedSqlFragments.join(`,${EOL}`)}').newLine();
+            writer.indent().write('${fromSqlFragments.join(EOL)}').newLine();
+            ;
+            writer.indent().write('${whereSql}`;').newLine();
+            writer.blankLine();
             writer.write(`return client.query({ text: sql, rowMode: 'array', values: paramsValues })`).newLine();
-            writer.indent().write(`.then(res => res.rows.map(row => mapArrayTo${resultTypeName}(row, params?.select)));`);
+            writer.indent().write(`.then(res => res.rows.map(row => mapArrayTo${resultTypeName}(row, selectedFields)));`);
         });
         writer.blankLine();
-        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.writeLine('rowIndex++;');
-                    writer.writeLine(`result.${tsField.name} = ${toDriver('data[rowIndex]', tsField)};`);
-                });
+        writer.write(`function mapArrayTo${resultTypeName}(data: any, selectedFields: (keyof ${resultTypeName})[])`).block(() => {
+            writer.writeLine(`const result: ${resultTypeName} = {};`);
+            writer.write(`selectedFields.forEach((field, index) => `).inlineBlock(() => {
+                writer.writeLine(`result[field] = data[index];`);
             });
+            writer.write(');').newLine();
             writer.write('return result;');
         });
-        writer.blankLine();
-        writer.write('function appendSelect(sql: string, selectField: string)').block(() => {
-            writer.write(`if (sql.toUpperCase().endsWith('SELECT'))`).block(() => {
-                writer.writeLine('return sql + EOL + selectField;');
-            });
-            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('obj[condition[0]] = true;');
-            });
-            writer.write(');');
-            writer.writeLine('return obj;');
-        });
         // if (orderByField != null) {
         // 	writer.blankLine();
         // 	writer.write(`function orderByToObject(orderBy: ${dynamicParamsTypeName}['orderBy'])`).block(() => {
@@ -289,47 +291,46 @@ function generateTsCode(sqlOld, queryName, schemaDef, client, isCrud = false) {
             writer.writeLine('values: any[];');
         });
         writer.blankLine();
-        writer.write(`function whereCondition(condition: ${whereTypeName}): WhereConditionResult | null `).block(() => {
-            writer.blankLine();
-            writer.writeLine('const selectFragment = selectFragments[condition[0]];');
-            writer.writeLine('const operator = condition[1];');
+        writer.write(`function whereCondition(condition: ${whereTypeName}, placeholder: () => string): WhereConditionResult | null `).block(() => {
+            writer.writeLine('const selectFragment = selectFragments[condition.column];');
+            writer.writeLine('const { op, value } = condition;');
             writer.blankLine();
             if ((0, code_generator_1.hasStringColumn)(tsDescriptor.columns)) {
-                writer.write(`if (operator == 'LIKE') `).block(() => {
+                writer.write(`if (op === 'LIKE') `).block(() => {
                     writer.write('return ').block(() => {
                         writer.writeLine("sql: `${selectFragment} LIKE ${placeholder()}`,");
-                        writer.writeLine('hasValue: condition[2] != null,');
-                        writer.writeLine('values: [condition[2]]');
+                        writer.writeLine('hasValue: value != null,');
+                        writer.writeLine('values: [value]');
                     });
                 });
             }
-            writer.write(`if (operator == 'BETWEEN') `).block(() => {
+            writer.write(`if (op === 'BETWEEN') `).block(() => {
+                writer.writeLine('const [from, to] = Array.isArray(value) ? value : [null, null];');
                 writer.write('return ').block(() => {
                     writer.writeLine('sql: `${selectFragment} BETWEEN ${placeholder()} AND ${placeholder()}`,');
-                    writer.writeLine('hasValue: condition[2] != null && condition[3] != null,');
-                    writer.writeLine('values: [condition[2], condition[3]]');
+                    writer.writeLine('hasValue: from != null && to != null,');
+                    writer.writeLine('values: [from, to]');
                 });
             });
-            writer.write(`if (operator == 'IN' || operator == 'NOT IN') `).block(() => {
+            writer.write(`if (op === 'IN' || op === 'NOT IN') `).block(() => {
+                writer.write('if (!Array.isArray(value) || value.length === 0)').block(() => {
+                    writer.writeLine(`return { sql: '', hasValue: false, values: [] };`);
+                });
                 writer.write('return ').block(() => {
-                    writer.writeLine("sql: `${selectFragment} ${operator} (${condition[2]?.map(_ => placeholder()).join(', ')})`,");
-                    writer.writeLine('hasValue: condition[2] != null && condition[2].length > 0,');
-                    writer.writeLine('values: condition[2]');
+                    writer.writeLine("sql: `${selectFragment} ${op} (${value.map(() => placeholder()).join(', ')})`,");
+                    writer.writeLine('hasValue: true,');
+                    writer.writeLine('values: value');
                 });
             });
-            writer.write('if (NumericOperatorList.includes(operator)) ').block(() => {
+            writer.write('if (NumericOperatorList.includes(op)) ').block(() => {
                 writer.write('return ').block(() => {
-                    writer.writeLine('sql: `${selectFragment} ${operator} ${placeholder()}`,');
-                    writer.writeLine('hasValue: condition[2] != null,');
-                    writer.writeLine('values: [condition[2]]');
+                    writer.writeLine('sql: `${selectFragment} ${op} ${placeholder()}`,');
+                    writer.writeLine('hasValue: value != null,');
+                    writer.writeLine('values: [value]');
                 });
             });
             writer.writeLine('return null;');
         });
-        writer.blankLine();
-        writer.write('function placeholder(): string').block(() => {
-            writer.writeLine('return `$${++currentIndex}`;');
-        });
     }
     if (tsDescriptor.nestedDescriptor2) {
         const relations = tsDescriptor.nestedDescriptor2;
@@ -339,13 +340,13 @@ function generateTsCode(sqlOld, queryName, schemaDef, client, isCrud = false) {
             writer.write(`export type ${relationType} = `).block(() => {
                 const uniqueNameFields = (0, code_generator_1.renameInvalidNames)(relation.fields.map((f) => f.name));
                 relation.fields.forEach((field, index) => {
-                    const nullableOperator = field.notNull ? '' : ' | null';
-                    writer.writeLine(`${uniqueNameFields[index]}: ${field.tsType}${nullableOperator};`);
+                    const nullable = field.notNull ? '' : ' | null';
+                    writer.writeLine(`${uniqueNameFields[index]}: ${field.tsType}${nullable};`);
                 });
                 relation.relations.forEach((field) => {
                     const nestedRelationType = (0, code_generator_1.generateRelationType)(capitalizedName, field.tsType);
-                    const nullableOperator = field.notNull ? '' : '?';
-                    writer.writeLine(`${field.name}${nullableOperator}: ${nestedRelationType};`);
+                    const nullable = field.notNull ? '' : ' | null';
+                    writer.writeLine(`${field.name}: ${nestedRelationType}${nullable};`);
                 });
             });
         });
@@ -364,8 +365,10 @@ function generateTsCode(sqlOld, queryName, schemaDef, client, isCrud = false) {
             parameters: tsDescriptor.parameters,
             data: tsDescriptor.data || [],
             returning: schemaDef.returning || false,
+            orderByTypeName: orderByTypeName,
+            orderByColumns: tsDescriptor.orderByColumns || [],
             generateNested: tsDescriptor.nestedDescriptor2 != null,
-            nestedType: tsDescriptor.nestedDescriptor2 ? tsDescriptor.nestedDescriptor2[0].name : ''
+            nestedType: tsDescriptor.nestedDescriptor2 ? tsDescriptor.nestedDescriptor2[0].name : '',
         };
         codeWriter.writeExecFunction(writer, execFunctionParams);
     }
@@ -436,15 +439,16 @@ function writeParamsType(writer, paramsTypeName, params, generateOrderBy, orderB
             writer.writeLine(`${field.name}${optionalOp}: ${field.tsType}${orNull};`);
         });
         if (generateOrderBy) {
-            writer.writeLine(`orderBy: [${orderByTypeName}, 'asc' | 'desc'][];`);
+            writer.writeLine(`orderBy: ${orderByTypeName}[];`);
         }
     });
 }
 function writeResultType(writer, resultTypeName, columns) {
     writer.write(`export type ${resultTypeName} =`).block(() => {
         columns.forEach((field) => {
-            const optionalOp = field.notNull ? '' : '?';
-            writer.writeLine(`${field.name}${optionalOp}: ${field.tsType};`);
+            const optionalOp = field.optional ? '?' : '';
+            const nullable = field.notNull ? '' : ' | null';
+            writer.writeLine(`${field.name}${optionalOp}: ${field.tsType}${nullable};`);
         });
     });
 }
@@ -457,9 +461,9 @@ function writeJsonTypes(writer, typeName, type) {
     writer.write(`export type ${typeName}Type =`).block(() => {
         type.properties.forEach((field) => {
             if (isJsonObjType(field.type)) {
-                const optionalOp = field.type.notNull ? '' : '?';
+                const nullable = field.type.notNull ? '' : ' | null';
                 const jsonTypeName = createJsonType(typeName, field.key);
-                writer.writeLine(`${field.key}${optionalOp}: ${jsonTypeName}Type;`);
+                writer.writeLine(`${field.key}: ${jsonTypeName}Type${nullable};`);
             }
             else if (isJsonArrayType(field.type)) {
                 const jsonParentName = createJsonType(typeName, field.key);
@@ -467,8 +471,8 @@ function writeJsonTypes(writer, typeName, type) {
                 writer.writeLine(`${field.key}: ${jsonTypeName};`);
             }
             else if (isJsonFieldType(field.type)) {
-                const optionalOp = field.type.notNull ? '' : '?';
-                writer.writeLine(`${field.key}${optionalOp}: ${(0, postgres_1.mapColumnType)(field.type.type, true)};`);
+                const nullable = field.type.notNull ? '' : ' | null';
+                writer.writeLine(`${field.key}: ${(0, postgres_1.mapColumnType)(field.type.type, true)}${nullable};`);
             }
         });
     });
@@ -484,6 +488,9 @@ function createTsDescriptor(capitalizedName, schemaDef) {
         parameterNames: [],
         data: (_a = schemaDef.data) === null || _a === void 0 ? void 0 : _a.map(param => mapParameterToTsFieldDescriptor(param))
     };
+    if (schemaDef.orderByColumns) {
+        tsDescriptor.orderByColumns = schemaDef.orderByColumns;
+    }
     if (schemaDef.nestedInfo) {
         const nestedDescriptor2 = schemaDef.nestedInfo.map((relation) => {
             const tsRelation = {
@@ -539,7 +546,8 @@ function mapColumnInfoToTsFieldDescriptor(capitalizedName, col, dynamicQuery) {
     const tsField = {
         name: col.name,
         tsType: createTsType(typeName, col.type),
-        notNull: dynamicQuery ? false : col.notNull
+        optional: dynamicQuery ? true : false,
+        notNull: dynamicQuery ? true : col.notNull
     };
     return tsField;
 }
@@ -601,12 +609,12 @@ function _writeCopyFunction(writer, params) {
     });
 }
 function _writeExecFunction(writer, params) {
-    const { functionName, paramsType, dataType, returnType, parameters, generateNested, nestedType } = params;
+    const { functionName, paramsType, dataType, returnType, parameters, orderByTypeName, orderByColumns, generateNested, nestedType } = params;
     let functionParams = params.queryType === 'Copy' ? 'client: pg.Client | pg.PoolClient' : 'client: pg.Client | pg.Pool | pg.PoolClient';
     if (params.data.length > 0) {
         functionParams += `, data: ${dataType}`;
     }
-    if (parameters.length > 0) {
+    if (parameters.length > 0 || orderByColumns.length > 0) {
         functionParams += `, params: ${paramsType}`;
     }
     const allParamters = [...params.data.map(param => paramToDriver(param, 'data')),
@@ -671,6 +679,34 @@ function _writeExecFunction(writer, params) {
         });
         writer.writeLine('return result;');
     });
+    if (orderByColumns.length > 0) {
+        writer.blankLine();
+        writer.writeLine(`const orderByColumns = [${orderByColumns.map(col => `'${col}'`).join(', ')}] as const;`);
+        writer.blankLine();
+        writer.write(`export type ${orderByTypeName} =`).block(() => {
+            writer.writeLine('column: typeof orderByColumns[number];');
+            writer.writeLine(`direction: 'asc' | 'desc';`);
+        });
+        writer.blankLine();
+        writer.write(`function buildOrderBy(orderBy: ${orderByTypeName}[]): string`).block(() => {
+            writer.write('if (!Array.isArray(orderBy) || orderBy.length === 0)').block(() => {
+                writer.writeLine(`throw new Error('orderBy must be a non-empty array');`);
+            });
+            writer.blankLine();
+            writer.write('for (const { column, direction } of orderBy)').block(() => {
+                writer.write('if (!orderByColumns.includes(column))').block(() => {
+                    writer.writeLine('throw new Error(`Invalid orderBy column: ${column}`);');
+                });
+                writer.write(`if (direction !== 'asc' && direction !== 'desc')`).block(() => {
+                    writer.writeLine('throw new Error(`Invalid orderBy direction: ${direction}`);');
+                });
+            });
+            writer.blankLine();
+            writer.writeLine('return orderBy');
+            writer.indent().write('.map(({ column, direction }) => `"${column}" ${direction.toUpperCase()}`)').newLine();
+            writer.indent().write(`.join(', ');`).newLine();
+        });
+    }
     if (generateNested) {
         writer.blankLine();
         const relationType = (0, code_generator_1.generateRelationType)(functionName, nestedType);
@@ -722,7 +758,7 @@ function getColumnsForQuery(capitalizedName, schemaDef) {
 }
 function toDriver(variableData, param) {
     if (param.tsType === 'Date') {
-        if (param.notNull) {
+        if (param.notNull && !param.optional) {
             return `new Date(${variableData})`;
         }
         return `${variableData} != null ? new Date(${variableData}) : ${variableData}`;
@@ -769,7 +805,7 @@ function generateCrud(queryType, tableName, dbSchema) {
         writeParamsType(writer, paramsTypeName, uniqueParams, false, '');
     }
     writer.blankLine();
-    const columns = allColumns.map(col => mapPostgresColumnSchemaToTsFieldDescriptor(col));
+    const columns = allColumns.map(col => (Object.assign(Object.assign({}, mapPostgresColumnSchemaToTsFieldDescriptor(col)), { optional: false })));
     writeResultType(writer, resultTypeName, columns);
     writer.blankLine();
     const crudParameters = {