typesql-cli 0.15.0-experimental.5 → 0.15.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/README.md +5 -1
  2. package/cli.js +33 -15
  3. package/cli.js.map +1 -1
  4. package/code-generator.js +17 -7
  5. package/code-generator.js.map +1 -1
  6. package/code-generator2.d.ts +4 -1
  7. package/code-generator2.d.ts.map +1 -1
  8. package/code-generator2.js +274 -69
  9. package/code-generator2.js.map +1 -1
  10. package/drivers/postgres.d.ts +2 -0
  11. package/drivers/postgres.d.ts.map +1 -1
  12. package/drivers/postgres.js +32 -4
  13. package/drivers/postgres.js.map +1 -1
  14. package/drivers/types.d.ts +2 -0
  15. package/drivers/types.d.ts.map +1 -1
  16. package/mysql-query-analyzer/types.d.ts +2 -2
  17. package/mysql-query-analyzer/types.d.ts.map +1 -1
  18. package/package.json +53 -52
  19. package/postgres-query-analyzer/describe.d.ts.map +1 -1
  20. package/postgres-query-analyzer/describe.js +10 -41
  21. package/postgres-query-analyzer/describe.js.map +1 -1
  22. package/postgres-query-analyzer/parser.d.ts +2 -0
  23. package/postgres-query-analyzer/parser.d.ts.map +1 -1
  24. package/postgres-query-analyzer/parser.js +12 -0
  25. package/postgres-query-analyzer/parser.js.map +1 -1
  26. package/postgres-query-analyzer/traverse.d.ts +2 -0
  27. package/postgres-query-analyzer/traverse.d.ts.map +1 -1
  28. package/postgres-query-analyzer/traverse.js +378 -76
  29. package/postgres-query-analyzer/traverse.js.map +1 -1
  30. package/sqlite-query-analyzer/code-generator.d.ts +1 -0
  31. package/sqlite-query-analyzer/code-generator.d.ts.map +1 -1
  32. package/sqlite-query-analyzer/code-generator.js +1 -7
  33. package/sqlite-query-analyzer/code-generator.js.map +1 -1
  34. package/sqlite-query-analyzer/replace-list-params.js +3 -3
  35. package/sqlite-query-analyzer/replace-list-params.js.map +1 -1
  36. package/sqlite-query-analyzer/traverse.d.ts +2 -2
  37. package/sqlite-query-analyzer/traverse.d.ts.map +1 -1
  38. package/sqlite-query-analyzer/traverse.js +55 -21
  39. package/sqlite-query-analyzer/traverse.js.map +1 -1
  40. package/types.d.ts +1 -1
  41. package/types.d.ts.map +1 -1
package/code-generator2.js CHANGED
@@ -4,16 +4,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.generateCode = generateCode;
7
+ exports.generateCrud = generateCrud;
8
+ exports.mapPostgresColumnSchemaToTsFieldDescriptor = mapPostgresColumnSchemaToTsFieldDescriptor;
7
9
  const code_block_writer_1 = __importDefault(require("code-block-writer"));
8
10
  const code_generator_1 = require("./code-generator");
9
11
  const describe_1 = require("./postgres-query-analyzer/describe");
10
12
  const postgres_1 = require("./dialects/postgres");
11
13
  const describe_query_1 = require("./describe-query");
14
+ const neverthrow_1 = require("neverthrow");
15
+ const code_generator_2 = require("./sqlite-query-analyzer/code-generator");
12
16
  function generateCode(client, sql, queryName) {
17
+ if (isEmptySql(sql)) {
18
+ return (0, neverthrow_1.okAsync)('');
19
+ }
13
20
  const { sql: processedSql, namedParameters } = (0, describe_query_1.preprocessSql)(sql, 'postgres');
14
21
  return _describeQuery(client, processedSql, namedParameters)
15
22
  .map(schemaDef => generateTsCode(processedSql, queryName, schemaDef, client.type));
16
23
  }
24
+ function isEmptySql(sql) {
25
+ if (sql.trim() === '') {
26
+ return true;
27
+ }
28
+ const lines = sql.split('\n');
29
+ return lines.every(line => line.trim() === '' || line.trim().startsWith('//'));
30
+ }
17
31
  function _describeQuery(databaseClient, sql, namedParameters) {
18
32
  return (0, describe_1.describeQuery)(databaseClient.client, sql, namedParameters);
19
33
  }
@@ -36,37 +50,14 @@ function generateTsCode(sqlOld, queryName, dbSchema, client, isCrud = false) {
36
50
  const uniqueDataParams = (0, code_generator_1.removeDuplicatedParameters2)(tsDescriptor.data || []);
37
51
  if (uniqueDataParams.length > 0) {
38
52
  writer.blankLine();
39
- writer.write(`export type ${dataTypeName} =`).block(() => {
40
- uniqueDataParams.forEach((field) => {
41
- const optionalOp = field.optional ? '?' : '';
42
- const orNull = field.notNull ? '' : ' | null';
43
- writer.writeLine(`${field.name}${optionalOp}: ${field.tsType}${orNull};`);
44
- });
45
- if (generateOrderBy) {
46
- writer.writeLine(`orderBy: [${orderByTypeName}, 'asc' | 'desc'][];`);
47
- }
48
- });
53
+ writeDataType(writer, dataTypeName, uniqueDataParams);
49
54
  }
50
55
  if (uniqueParams.length > 0 || generateOrderBy) {
51
56
  writer.blankLine();
52
- writer.write(`export type ${paramsTypeName} =`).block(() => {
53
- uniqueParams.forEach((field) => {
54
- const optionalOp = field.optional ? '?' : '';
55
- const orNull = field.notNull ? '' : ' | null';
56
- writer.writeLine(`${field.name}${optionalOp}: ${field.tsType}${orNull};`);
57
- });
58
- if (generateOrderBy) {
59
- writer.writeLine(`orderBy: [${orderByTypeName}, 'asc' | 'desc'][];`);
60
- }
61
- });
57
+ writeParamsType(writer, paramsTypeName, uniqueParams, generateOrderBy, orderByTypeName);
62
58
  }
63
59
  writer.blankLine();
64
- writer.write(`export type ${resultTypeName} =`).block(() => {
65
- tsDescriptor.columns.forEach((field) => {
66
- const optionalOp = field.notNull ? '' : '?';
67
- writer.writeLine(`${field.name}${optionalOp}: ${field.tsType};`);
68
- });
69
- });
60
+ writeResultType(writer, resultTypeName, tsDescriptor.columns);
70
61
  writer.blankLine();
71
62
  const execFunctionParams = {
72
63
  sql,
@@ -78,11 +69,41 @@ function generateTsCode(sqlOld, queryName, dbSchema, client, isCrud = false) {
78
69
  returnType: resultTypeName,
79
70
  columns: tsDescriptor.columns,
80
71
  parameters: tsDescriptor.parameters,
81
- data: tsDescriptor.data || []
72
+ data: tsDescriptor.data || [],
73
+ returning: dbSchema.returning || false
82
74
  };
83
75
  codeWriter.writeExecFunction(writer, execFunctionParams);
84
76
  return writer.toString();
85
77
  }
78
+ function writeDataType(writer, dataTypeName, params) {
79
+ writer.write(`export type ${dataTypeName} =`).block(() => {
80
+ params.forEach((field) => {
81
+ const optionalOp = field.optional ? '?' : '';
82
+ const orNull = field.notNull ? '' : ' | null';
83
+ writer.writeLine(`${field.name}${optionalOp}: ${field.tsType}${orNull};`);
84
+ });
85
+ });
86
+ }
87
+ function writeParamsType(writer, paramsTypeName, params, generateOrderBy, orderByTypeName) {
88
+ writer.write(`export type ${paramsTypeName} =`).block(() => {
89
+ params.forEach((field) => {
90
+ const optionalOp = field.optional ? '?' : '';
91
+ const orNull = field.notNull ? '' : ' | null';
92
+ writer.writeLine(`${field.name}${optionalOp}: ${field.tsType}${orNull};`);
93
+ });
94
+ if (generateOrderBy) {
95
+ writer.writeLine(`orderBy: [${orderByTypeName}, 'asc' | 'desc'][];`);
96
+ }
97
+ });
98
+ }
99
+ function writeResultType(writer, resultTypeName, columns) {
100
+ writer.write(`export type ${resultTypeName} =`).block(() => {
101
+ columns.forEach((field) => {
102
+ const optionalOp = field.notNull ? '' : '?';
103
+ writer.writeLine(`${field.name}${optionalOp}: ${field.tsType};`);
104
+ });
105
+ });
106
+ }
86
107
  function createTsDescriptor(schemaDef) {
87
108
  var _a;
88
109
  const tsDescriptor = {
@@ -130,9 +151,11 @@ const postgresCodeWriter = {
130
151
  if (parameters.length > 0) {
131
152
  functionParams += `, params: ${paramsType}`;
132
153
  }
133
- const allParamters = [...params.data.map(param => paramToDriver(param, 'data')), ...parameters.map(param => paramToDriver(param, 'params'))];
154
+ const allParamters = [...params.data.map(param => paramToDriver(param, 'data')),
155
+ ...parameters.map(param => paramToDriver(param, 'params')),
156
+ ...parameters.filter(param => isList(param)).map(param => `...params.${param.name}.slice(1)`)];
134
157
  const paramValues = allParamters.length > 0 ? `, values: [${allParamters.join(', ')}]` : '';
135
- const orNull = params.queryType === 'Insert' || params.queryType === 'Update' || params.queryType === 'Delete' ? '' : ' | null';
158
+ const orNull = params.queryType === 'Select' ? ' | null' : '';
136
159
  const functionReturnType = params.multipleRowsResult ? `${returnType}[]` : `${returnType}${orNull}`;
137
160
  const hasListParams = parameters.some(param => !param.isArray && param.tsType.endsWith('[]'));
138
161
  if (hasListParams) {
@@ -140,28 +163,34 @@ const postgresCodeWriter = {
140
163
  }
141
164
  writer.write(`export async function ${functionName}(${functionParams}): Promise<${functionReturnType}>`).block(() => {
142
165
  if (hasListParams) {
143
- writer.writeLine('currentIndex = 0;');
166
+ writer.writeLine(`currentIndex = ${params.data.length + params.parameters.length};`);
144
167
  }
145
168
  writeSql(writer, params.sql);
146
- if (params.queryType === 'Insert' || params.queryType === 'Update' || params.queryType === 'Delete') {
147
- writer.write(`return client.query({ text: sql${paramValues} })`).newLine();
148
- writer.indent().write(`.then(res => mapArrayTo${returnType}(res));`);
149
- }
150
- else {
169
+ if (params.queryType === 'Select' || params.returning) {
151
170
  writer.write(`return client.query({ text: sql, rowMode: 'array'${paramValues} })`).newLine();
152
171
  if (params.multipleRowsResult) {
153
172
  writer.indent().write(`.then(res => res.rows.map(row => mapArrayTo${returnType}(row)));`);
154
173
  }
174
+ else if (params.returning) {
175
+ writer.indent().write(`.then(res => mapArrayTo${returnType}(res.rows[0]));`);
176
+ }
155
177
  else {
156
178
  writer.indent().write(`.then(res => res.rows.length > 0 ? mapArrayTo${returnType}(res.rows[0]) : null);`);
157
179
  }
158
180
  }
181
+ else {
182
+ writer.write(`return client.query({ text: sql${paramValues} })`).newLine();
183
+ writer.indent().write(`.then(res => mapArrayTo${returnType}(res));`);
184
+ }
159
185
  });
160
186
  if (hasListParams) {
161
187
  writer.blankLine();
162
- writer.write(`function generatePlaceholders(paramsArray: any[]): string`).block(() => {
188
+ writer.write(`function generatePlaceholders(param: string, paramsArray: any[]): string`).block(() => {
163
189
  writer.write('return paramsArray').newLine();
164
- writer.indent().write('.map(() => {').newLine();
190
+ writer.indent().write('.map((_, index) => {').newLine();
191
+ writer.indent(2).write(`if (index === 0) {`).newLine();
192
+ writer.indent(3).write(`return param`).newLine();
193
+ writer.indent(2).write(`}`).newLine();
165
194
  writer.indent(2).write('currentIndex++;').newLine();
166
195
  writer.indent(2).write('return `$${currentIndex}`;').newLine();
167
196
  writer.indent().write('})');
@@ -174,11 +203,11 @@ const postgresCodeWriter = {
174
203
  writer.write(`const result: ${returnType} = `).block(() => {
175
204
  params.columns.forEach((col, index) => {
176
205
  const separator = index < params.columns.length - 1 ? ',' : '';
177
- if (params.queryType === 'Insert' || params.queryType === 'Update' || params.queryType === 'Delete') {
178
- writer.writeLine(`${col.name}: data.${col.name}${separator}`);
206
+ if (params.queryType === 'Select' || params.returning) {
207
+ writer.writeLine(`${col.name}: ${toDriver(`data[${index}]`, col)}${separator}`);
179
208
  }
180
209
  else {
181
- writer.writeLine(`${col.name}: ${toDriver(`data[${index}]`, col)}${separator}`);
210
+ writer.writeLine(`${col.name}: data.${col.name}${separator}`);
182
211
  }
183
212
  });
184
213
  });
@@ -192,38 +221,214 @@ const postgresCodeWriter = {
192
221
  });
193
222
  writer.indent().write('`').newLine();
194
223
  }
195
- function toDriver(variableData, param) {
196
- if (param.tsType === 'Date') {
197
- if (param.notNull) {
198
- return `new Date(${variableData})`;
199
- }
200
- return `${variableData} != null ? new Date(${variableData}) : ${variableData}`;
201
- }
202
- if (param.tsType === 'boolean') {
203
- return `${variableData} != null ? Boolean(${variableData}) : ${variableData}`;
204
- }
205
- return variableData;
206
- }
207
- function paramToDriver(param, objName) {
208
- if (!param.tsType.endsWith('[]')) {
209
- return `${objName}.${param.name}`;
210
- }
211
- const listParam = `...${objName}.${param.name}`;
212
- return param.isArray ? `[${listParam}]` : listParam;
213
- }
214
224
  }
215
225
  };
216
226
  function getColumnsForQuery(schemaDef) {
217
- if (schemaDef.queryType === 'Insert' || schemaDef.queryType === 'Update' || schemaDef.queryType === 'Delete') {
218
- const columns = [
219
- {
220
- name: 'rowCount',
221
- tsType: 'number',
222
- notNull: true
223
- }
224
- ];
225
- return columns;
227
+ if (schemaDef.queryType === 'Select' || schemaDef.returning) {
228
+ return schemaDef.columns.map(col => mapColumnInfoToTsFieldDescriptor(col));
229
+ }
230
+ const columns = [
231
+ {
232
+ name: 'rowCount',
233
+ tsType: 'number',
234
+ notNull: true
235
+ }
236
+ ];
237
+ return columns;
238
+ }
239
+ function toDriver(variableData, param) {
240
+ if (param.tsType === 'Date') {
241
+ if (param.notNull) {
242
+ return `new Date(${variableData})`;
243
+ }
244
+ return `${variableData} != null ? new Date(${variableData}) : ${variableData}`;
226
245
  }
227
- return schemaDef.columns.map(col => mapColumnInfoToTsFieldDescriptor(col));
246
+ if (param.tsType === 'boolean') {
247
+ return `${variableData} != null ? Boolean(${variableData}) : ${variableData}`;
248
+ }
249
+ return variableData;
250
+ }
251
+ function paramToDriver(param, objName) {
252
+ if (!param.tsType.endsWith('[]')) {
253
+ return `${objName}.${param.name}`;
254
+ }
255
+ return param.isArray ? `[...${objName}.${param.name}]` : `${objName}.${param.name}[0]`;
256
+ }
257
+ function isList(param) {
258
+ return param.tsType.endsWith('[]') && !param.isArray;
259
+ }
260
+ function generateCrud(client, queryType, tableName, dbSchema) {
261
+ const queryName = (0, code_generator_2.getQueryName)(queryType, tableName);
262
+ const camelCaseName = (0, code_generator_1.convertToCamelCaseName)(queryName);
263
+ const capitalizedName = (0, code_generator_1.capitalize)(camelCaseName);
264
+ const dataTypeName = `${capitalizedName}Data`;
265
+ const resultTypeName = `${capitalizedName}Result`;
266
+ const paramsTypeName = `${capitalizedName}Params`;
267
+ const writer = new code_block_writer_1.default({
268
+ useTabs: true
269
+ });
270
+ const allColumns = dbSchema.filter((col) => col.table === tableName);
271
+ const keys = allColumns.filter((col) => col.columnKey === 'PRI');
272
+ if (keys.length === 0) {
273
+ keys.push(...allColumns.filter((col) => col.columnKey === 'UNI'));
274
+ }
275
+ const nonKeys = allColumns.filter(col => col.columnKey !== 'PRI');
276
+ const codeWriter = getCodeWriter(client);
277
+ codeWriter.writeImports(writer);
278
+ const uniqueDataParams = queryType === 'Update' ? nonKeys.map(col => mapPostgresColumnSchemaToTsFieldDescriptor(col)) : [];
279
+ if (uniqueDataParams.length > 0) {
280
+ writer.blankLine();
281
+ writeDataType(writer, dataTypeName, uniqueDataParams);
282
+ }
283
+ const uniqueParams = queryType === 'Insert' ? nonKeys.map(col => mapPostgresColumnSchemaToTsFieldDescriptor(col)) : keys.map(col => mapPostgresColumnSchemaToTsFieldDescriptor(col));
284
+ if (uniqueParams.length > 0) {
285
+ writer.blankLine();
286
+ writeParamsType(writer, paramsTypeName, uniqueParams, false, '');
287
+ }
288
+ writer.blankLine();
289
+ const columns = allColumns.map(col => mapPostgresColumnSchemaToTsFieldDescriptor(col));
290
+ writeResultType(writer, resultTypeName, columns);
291
+ writer.blankLine();
292
+ const crudParameters = {
293
+ queryType,
294
+ tableName,
295
+ queryName,
296
+ dataTypeName,
297
+ paramsTypeName,
298
+ resultTypeName,
299
+ columns,
300
+ nonKeys: nonKeys.map(col => col.column),
301
+ keys: keys.map(col => col.column)
302
+ };
303
+ const result = writeCrud(writer, crudParameters);
304
+ return result;
305
+ }
306
+ function writeCrud(writer, crudParamters) {
307
+ const { queryType } = crudParamters;
308
+ switch (queryType) {
309
+ case 'Select':
310
+ return writeCrudSelect(writer, crudParamters);
311
+ case 'Insert':
312
+ return writeCrudInsert(writer, crudParamters);
313
+ case 'Update':
314
+ return writeCrudUpdate(writer, crudParamters);
315
+ case 'Delete':
316
+ return writeCrudDelete(writer, crudParamters);
317
+ }
318
+ }
319
+ function writeCrudSelect(writer, crudParamters) {
320
+ const { tableName, queryName, paramsTypeName, resultTypeName, columns, keys } = crudParamters;
321
+ writer.write(`export async function ${queryName}(client: pg.Client | pg.Pool, params: ${paramsTypeName}): Promise<${resultTypeName} | null>`).block(() => {
322
+ writer.writeLine('const sql = `');
323
+ writer.indent().write('SELECT').newLine();
324
+ columns.forEach((col, columnIndex) => {
325
+ writer.indent(2).write(col.name);
326
+ writer.conditionalWrite(columnIndex < columns.length - 1, ',');
327
+ writer.newLine();
328
+ });
329
+ writer.indent().write(`FROM ${tableName}`).newLine();
330
+ const keyName = keys[0];
331
+ writer.indent().write(`WHERE ${keyName} = $1`).newLine();
332
+ writer.indent().write('`').newLine();
333
+ writer.writeLine(`return client.query({ text: sql, rowMode: 'array', values: [params.${keyName}] })`);
334
+ writer.indent(1).write(`.then(res => res.rows.length > 0 ? mapArrayTo${resultTypeName}(res.rows[0]) : null);`).newLine();
335
+ });
336
+ writer.blankLine();
337
+ writer.write(`function mapArrayTo${resultTypeName}(data: any) `).block(() => {
338
+ writer.write(`const result: ${resultTypeName} = `).block(() => {
339
+ columns.forEach((col, index) => {
340
+ const separator = index < columns.length - 1 ? ',' : '';
341
+ writer.writeLine(`${col.name}: ${toDriver(`data[${index}]`, col)}${separator}`);
342
+ });
343
+ });
344
+ writer.writeLine('return result;');
345
+ });
346
+ return writer.toString();
347
+ }
348
+ function writeCrudInsert(writer, crudParamters) {
349
+ const { tableName, queryName, dataTypeName, paramsTypeName, resultTypeName, columns, nonKeys, keys } = crudParamters;
350
+ writer.write(`export async function ${queryName}(client: pg.Client | pg.Pool, params: ${paramsTypeName}): Promise<${resultTypeName} | null>`).block(() => {
351
+ writer.writeLine('const sql = `');
352
+ writer.indent().write(`INSERT INTO ${tableName} (${nonKeys.join(',')})`).newLine();
353
+ writer.indent().write(`VALUES (${nonKeys.map((_, index) => `$${index + 1}`).join(',')})`).newLine();
354
+ writer.indent().write('RETURNING *').newLine();
355
+ writer.indent().write('`').newLine();
356
+ writer.writeLine(`return client.query({ text: sql, values: [${nonKeys.map(col => `params.${col}`)}] })`);
357
+ writer.indent().write(`.then(res => mapArrayTo${resultTypeName}(res));`);
358
+ });
359
+ writer.blankLine();
360
+ writer.write(`function mapArrayTo${resultTypeName}(data: any) `).block(() => {
361
+ writer.write(`const result: ${resultTypeName} = `).block(() => {
362
+ columns.forEach((col, index) => {
363
+ const separator = index < columns.length - 1 ? ',' : '';
364
+ writer.writeLine(`${col.name}: ${toDriver(`data[${index}]`, col)}${separator}`);
365
+ });
366
+ });
367
+ writer.writeLine('return result;');
368
+ });
369
+ return writer.toString();
370
+ }
371
+ function writeCrudUpdate(writer, crudParamters) {
372
+ const { tableName, queryName, dataTypeName, paramsTypeName, resultTypeName, columns, nonKeys, keys } = crudParamters;
373
+ writer.write(`export async function ${queryName}(client: pg.Client | pg.Pool, data: ${dataTypeName}, params: ${paramsTypeName}): Promise<${resultTypeName} | null>`).block(() => {
374
+ writer.writeLine(`let sql = 'UPDATE ${tableName} SET';`);
375
+ writer.writeLine('const values: any[] = [];');
376
+ writer.writeLine('let update = false;');
377
+ nonKeys.forEach((col, index) => {
378
+ writer.write(`if (data.${col} !== undefined)`).block(() => {
379
+ writer.writeLine(`sql += ' ${col} = $${index + 1}';`);
380
+ writer.writeLine(`values.push(data.${col});`);
381
+ writer.writeLine('update = true;');
382
+ });
383
+ });
384
+ const keyName = keys[0];
385
+ writer.writeLine(`sql += ' WHERE ${keyName} = $${nonKeys.length + 1} RETURNING *';`);
386
+ writer.writeLine(`values.push(params.${keyName});`);
387
+ writer.write('if (update)').block(() => {
388
+ writer.writeLine('return client.query({ text: sql, values })');
389
+ writer.indent().write(`.then(res => mapArrayTo${resultTypeName}(res));`);
390
+ });
391
+ writer.writeLine('return null;');
392
+ });
393
+ writer.blankLine();
394
+ writer.write(`function mapArrayTo${resultTypeName}(data: any) `).block(() => {
395
+ writer.write(`const result: ${resultTypeName} = `).block(() => {
396
+ columns.forEach((col, index) => {
397
+ const separator = index < columns.length - 1 ? ',' : '';
398
+ writer.writeLine(`${col.name}: ${toDriver(`data[${index}]`, col)}${separator}`);
399
+ });
400
+ });
401
+ writer.writeLine('return result;');
402
+ });
403
+ return writer.toString();
404
+ }
405
+ function writeCrudDelete(writer, crudParamters) {
406
+ const { tableName, queryName, paramsTypeName, resultTypeName, columns, keys } = crudParamters;
407
+ const keyName = keys[0];
408
+ writer.write(`export async function ${queryName}(client: pg.Client | pg.Pool, params: ${paramsTypeName}): Promise<${resultTypeName} | null>`).block(() => {
409
+ writer.writeLine('const sql = `');
410
+ writer.indent().write(`DELETE FROM ${tableName} WHERE ${keyName} = $1`).newLine();
411
+ writer.indent().write('`').newLine();
412
+ writer.writeLine(`return client.query({ text: sql, rowMode: 'array', values: [params.${keyName}] })`);
413
+ writer.indent(1).write(`.then(res => res.rows.length > 0 ? mapArrayTo${resultTypeName}(res.rows[0]) : null);`).newLine();
414
+ });
415
+ writer.blankLine();
416
+ writer.write(`function mapArrayTo${resultTypeName}(data: any) `).block(() => {
417
+ writer.write(`const result: ${resultTypeName} = `).block(() => {
418
+ columns.forEach((col, index) => {
419
+ const separator = index < columns.length - 1 ? ',' : '';
420
+ writer.writeLine(`${col.name}: ${toDriver(`data[${index}]`, col)}${separator}`);
421
+ });
422
+ });
423
+ writer.writeLine('return result;');
424
+ });
425
+ return writer.toString();
426
+ }
427
+ function mapPostgresColumnSchemaToTsFieldDescriptor(col) {
428
+ return {
429
+ name: col.column,
430
+ notNull: col.notNull,
431
+ tsType: (0, postgres_1.mapColumnType)(col.column_type),
432
+ };
228
433
  }
229
434
  //# sourceMappingURL=code-generator2.js.map
package/code-generator2.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"code-generator2.js","sourceRoot":"","sources":["../../src/code-generator2.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"code-generator2.js","sourceRoot":"","sources":["../../src/code-generator2.ts"],"names":[],"mappings":"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"}
package/drivers/postgres.d.ts CHANGED
@@ -4,7 +4,9 @@ import { TaskEither } from 'fp-ts/lib/TaskEither';
4
4
  import { DatabaseClient, TypeSqlError } from '../types';
5
5
  import { Either } from 'fp-ts/lib/Either';
6
6
  import { ResultAsync } from 'neverthrow';
7
+ import { ColumnSchema } from '../mysql-query-analyzer/types';
7
8
  export declare function loadDbSchema(sql: Sql): ResultAsync<PostgresColumnSchema[], string>;
9
+ export declare function mapToColumnSchema(col: PostgresColumnSchema): ColumnSchema;
8
10
  export declare const postgresDescribe: (sql: Sql, sqlQuery: string) => ResultAsync<PostgresDescribe, string>;
9
11
  export declare function postgresAnalyze(sql: Sql, sqlQuery: string): ResultAsync<string[], string>;
10
12
  export declare function loadTypes(postgres: Sql): TaskEither<string, PostgresType[]>;
package/drivers/postgres.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAuB,gBAAgB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpG,OAAO,EAAE,UAAU,EAAY,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,MAAM,EAAS,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW,CAAC,oBAAoB,EAAE,EAAE,MAAM,CAAC,CAsClF;AAED,eAAO,MAAM,gBAAgB,QAAS,GAAG,YAAY,MAAM,KAAG,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAuBjG,CAAA;AAGD,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAezF;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,GAAG,GAAG,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,CAU3E;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CAM9F"}
1
+ {"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAuB,gBAAgB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpG,OAAO,EAAE,UAAU,EAAY,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,MAAM,EAAS,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW,CAAC,oBAAoB,EAAE,EAAE,MAAM,CAAC,CAoDlF;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,oBAAoB,GAAG,YAAY,CAWzE;AAED,eAAO,MAAM,gBAAgB,QAAS,GAAG,YAAY,MAAM,KAAG,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAuBjG,CAAA;AAGD,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAezF;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,GAAG,GAAG,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,CAU3E;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CAM9F"}
package/drivers/postgres.js CHANGED
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.postgresDescribe = void 0;
16
16
  exports.loadDbSchema = loadDbSchema;
17
+ exports.mapToColumnSchema = mapToColumnSchema;
17
18
  exports.postgresAnalyze = postgresAnalyze;
18
19
  exports.loadTypes = loadTypes;
19
20
  exports.createPostgresClient = createPostgresClient;
@@ -21,14 +22,22 @@ const postgres_1 = __importDefault(require("postgres"));
21
22
  const TaskEither_1 = require("fp-ts/lib/TaskEither");
22
23
  const Either_1 = require("fp-ts/lib/Either");
23
24
  const neverthrow_1 = require("neverthrow");
25
+ const postgres_2 = require("../dialects/postgres");
24
26
  function loadDbSchema(sql) {
25
27
  return neverthrow_1.ResultAsync.fromThrowable(() => __awaiter(this, void 0, void 0, function* () {
26
- const result = yield sql `SELECT
28
+ const result = yield sql `
29
+ SELECT
27
30
  c.oid,
28
31
  t.table_schema,
29
32
  t.table_name,
30
33
  col.column_name,
31
- col.is_nullable
34
+ ty.oid as type_id,
35
+ col.is_nullable,
36
+ CASE
37
+ WHEN con.contype = 'p' THEN 'PRI' -- Primary key
38
+ WHEN con.contype = 'u' THEN 'UNI' -- Unique constraint
39
+ ELSE '' -- Otherwise, empty string
40
+ END AS column_key
32
41
  FROM
33
42
  information_schema.tables t
34
43
  JOIN
@@ -37,17 +46,24 @@ function loadDbSchema(sql) {
37
46
  information_schema.columns col
38
47
  ON t.table_name = col.table_name
39
48
  AND t.table_schema = col.table_schema
49
+ JOIN
50
+ pg_catalog.pg_type ty on pg_catalog.format_type(ty.oid, NULL) = col.data_type
51
+ LEFT JOIN
52
+ pg_constraint con ON con.conrelid = c.oid
53
+ AND col.ordinal_position = ANY (con.conkey)
40
54
  WHERE
41
55
  t.table_type = 'BASE TABLE' -- Only regular tables, excluding views
42
56
  AND t.table_schema NOT IN ('information_schema', 'pg_catalog') -- Exclude system schemas
43
57
  ORDER BY
44
- t.table_schema, t.table_name, col.ordinal_position;`;
58
+ t.table_schema, t.table_name, col.ordinal_position`;
45
59
  return result.map((row) => ({
46
60
  oid: row.oid,
47
61
  table_schema: row.table_schema,
48
62
  table_name: row.table_name,
49
63
  column_name: row.column_name,
50
- is_nullable: row.is_nullable === 'YES'
64
+ type_id: row.type_id,
65
+ is_nullable: row.is_nullable === 'YES',
66
+ column_key: row.column_key
51
67
  }));
52
68
  }), (reason) => {
53
69
  if (reason.errors && reason.errors.length > 0) {
@@ -56,6 +72,18 @@ function loadDbSchema(sql) {
56
72
  return 'Unknown error';
57
73
  })();
58
74
  }
75
+ function mapToColumnSchema(col) {
76
+ const columnSchema = {
77
+ column: col.column_name,
78
+ column_type: postgres_2.postgresTypes[col.type_id],
79
+ columnKey: col.column_key,
80
+ notNull: !col.is_nullable,
81
+ schema: col.table_schema,
82
+ table: col.table_name,
83
+ hidden: 0
84
+ };
85
+ return columnSchema;
86
+ }
59
87
  const postgresDescribe = (sql, sqlQuery) => {
60
88
  return neverthrow_1.ResultAsync.fromThrowable(() => __awaiter(void 0, void 0, void 0, function* () {
61
89
  const describeResult = yield sql.unsafe(sqlQuery).describe();
package/drivers/postgres.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":"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"}
package/drivers/types.d.ts CHANGED
@@ -4,7 +4,9 @@ export type PostgresColumnSchema = {
4
4
  table_schema: string;
5
5
  table_name: string;
6
6
  column_name: string;
7
+ type_id: number;
7
8
  is_nullable: boolean;
9
+ column_key: 'PRI' | 'UNI' | '';
8
10
  };
9
11
  export type DescribeQueryColumn = {
10
12
  name: string;
package/drivers/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/drivers/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,MAAM,oBAAoB,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAEf,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC9B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAC/B,CAAA;AACD,MAAM,MAAM,mBAAmB,GAAG,gBAAgB,GAAG;IACpD,kBAAkB,EAAE,OAAO,CAAC;CAC5B,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAEpD,MAAM,MAAM,MAAM,CAAC,UAAU,IAAI;IAChC,YAAY,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,UAAU,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;CAC/E,CAAA"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/drivers/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,MAAM,oBAAoB,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,KAAK,GAAG,KAAK,GAAG,EAAE,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAEf,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC9B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAC/B,CAAA;AACD,MAAM,MAAM,mBAAmB,GAAG,gBAAgB,GAAG;IACpD,kBAAkB,EAAE,OAAO,CAAC;CAC5B,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAEpD,MAAM,MAAM,MAAM,CAAC,UAAU,IAAI;IAChC,YAAY,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,UAAU,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;CAC/E,CAAA"}
package/mysql-query-analyzer/types.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import type { NestedResultInfo } from '../describe-nested-query';
2
2
  import type { MySqlType, InferType, DbType } from '../mysql-mapping';
3
3
  import type { Relation2 } from '../sqlite-query-analyzer/sqlite-describe-nested-query';
4
- import type { SQLiteType } from '../sqlite-query-analyzer/types';
4
+ import type { PostgresType, SQLiteType } from '../sqlite-query-analyzer/types';
5
5
  import type { ParameterDef } from '../types';
6
6
  export type TypeVar = {
7
7
  kind: 'TypeVar';
@@ -41,7 +41,7 @@ export type Constraint = {
41
41
  mostGeneralType?: true;
42
42
  coercionType?: CoercionType;
43
43
  };
44
- export type ColumnSchema = GenericColumnSchema<MySqlType> | GenericColumnSchema<SQLiteType>;
44
+ export type ColumnSchema = GenericColumnSchema<MySqlType> | GenericColumnSchema<SQLiteType> | GenericColumnSchema<PostgresType>;
45
45
  export type GenericColumnSchema<DbType> = {
46
46
  schema: string;
47
47
  table: string;