typesql-cli 0.15.0 → 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.
- package/cli.js +33 -15
- package/cli.js.map +1 -1
- package/code-generator.js +17 -7
- package/code-generator.js.map +1 -1
- package/code-generator2.d.ts +4 -1
- package/code-generator2.d.ts.map +1 -1
- package/code-generator2.js +230 -47
- package/code-generator2.js.map +1 -1
- package/drivers/postgres.d.ts +2 -0
- package/drivers/postgres.d.ts.map +1 -1
- package/drivers/postgres.js +18 -0
- package/drivers/postgres.js.map +1 -1
- package/drivers/types.d.ts +1 -0
- package/drivers/types.d.ts.map +1 -1
- package/mysql-query-analyzer/types.d.ts +2 -2
- package/mysql-query-analyzer/types.d.ts.map +1 -1
- package/package.json +18 -17
- package/postgres-query-analyzer/traverse.js +39 -7
- package/postgres-query-analyzer/traverse.js.map +1 -1
- package/sqlite-query-analyzer/code-generator.d.ts +1 -0
- package/sqlite-query-analyzer/code-generator.d.ts.map +1 -1
- package/sqlite-query-analyzer/code-generator.js +1 -7
- package/sqlite-query-analyzer/code-generator.js.map +1 -1
- package/types.d.ts +1 -1
- package/types.d.ts.map +1 -1
package/code-generator2.js
CHANGED
@@ -4,12 +4,15 @@ 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");
|
12
14
|
const neverthrow_1 = require("neverthrow");
|
15
|
+
const code_generator_2 = require("./sqlite-query-analyzer/code-generator");
|
13
16
|
function generateCode(client, sql, queryName) {
|
14
17
|
if (isEmptySql(sql)) {
|
15
18
|
return (0, neverthrow_1.okAsync)('');
|
@@ -47,37 +50,14 @@ function generateTsCode(sqlOld, queryName, dbSchema, client, isCrud = false) {
|
|
47
50
|
const uniqueDataParams = (0, code_generator_1.removeDuplicatedParameters2)(tsDescriptor.data || []);
|
48
51
|
if (uniqueDataParams.length > 0) {
|
49
52
|
writer.blankLine();
|
50
|
-
writer
|
51
|
-
uniqueDataParams.forEach((field) => {
|
52
|
-
const optionalOp = field.optional ? '?' : '';
|
53
|
-
const orNull = field.notNull ? '' : ' | null';
|
54
|
-
writer.writeLine(`${field.name}${optionalOp}: ${field.tsType}${orNull};`);
|
55
|
-
});
|
56
|
-
if (generateOrderBy) {
|
57
|
-
writer.writeLine(`orderBy: [${orderByTypeName}, 'asc' | 'desc'][];`);
|
58
|
-
}
|
59
|
-
});
|
53
|
+
writeDataType(writer, dataTypeName, uniqueDataParams);
|
60
54
|
}
|
61
55
|
if (uniqueParams.length > 0 || generateOrderBy) {
|
62
56
|
writer.blankLine();
|
63
|
-
writer
|
64
|
-
uniqueParams.forEach((field) => {
|
65
|
-
const optionalOp = field.optional ? '?' : '';
|
66
|
-
const orNull = field.notNull ? '' : ' | null';
|
67
|
-
writer.writeLine(`${field.name}${optionalOp}: ${field.tsType}${orNull};`);
|
68
|
-
});
|
69
|
-
if (generateOrderBy) {
|
70
|
-
writer.writeLine(`orderBy: [${orderByTypeName}, 'asc' | 'desc'][];`);
|
71
|
-
}
|
72
|
-
});
|
57
|
+
writeParamsType(writer, paramsTypeName, uniqueParams, generateOrderBy, orderByTypeName);
|
73
58
|
}
|
74
59
|
writer.blankLine();
|
75
|
-
writer
|
76
|
-
tsDescriptor.columns.forEach((field) => {
|
77
|
-
const optionalOp = field.notNull ? '' : '?';
|
78
|
-
writer.writeLine(`${field.name}${optionalOp}: ${field.tsType};`);
|
79
|
-
});
|
80
|
-
});
|
60
|
+
writeResultType(writer, resultTypeName, tsDescriptor.columns);
|
81
61
|
writer.blankLine();
|
82
62
|
const execFunctionParams = {
|
83
63
|
sql,
|
@@ -95,6 +75,35 @@ function generateTsCode(sqlOld, queryName, dbSchema, client, isCrud = false) {
|
|
95
75
|
codeWriter.writeExecFunction(writer, execFunctionParams);
|
96
76
|
return writer.toString();
|
97
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
|
+
}
|
98
107
|
function createTsDescriptor(schemaDef) {
|
99
108
|
var _a;
|
100
109
|
const tsDescriptor = {
|
@@ -212,27 +221,6 @@ const postgresCodeWriter = {
|
|
212
221
|
});
|
213
222
|
writer.indent().write('`').newLine();
|
214
223
|
}
|
215
|
-
function toDriver(variableData, param) {
|
216
|
-
if (param.tsType === 'Date') {
|
217
|
-
if (param.notNull) {
|
218
|
-
return `new Date(${variableData})`;
|
219
|
-
}
|
220
|
-
return `${variableData} != null ? new Date(${variableData}) : ${variableData}`;
|
221
|
-
}
|
222
|
-
if (param.tsType === 'boolean') {
|
223
|
-
return `${variableData} != null ? Boolean(${variableData}) : ${variableData}`;
|
224
|
-
}
|
225
|
-
return variableData;
|
226
|
-
}
|
227
|
-
function paramToDriver(param, objName) {
|
228
|
-
if (!param.tsType.endsWith('[]')) {
|
229
|
-
return `${objName}.${param.name}`;
|
230
|
-
}
|
231
|
-
return param.isArray ? `[...${objName}.${param.name}]` : `${objName}.${param.name}[0]`;
|
232
|
-
}
|
233
|
-
function isList(param) {
|
234
|
-
return param.tsType.endsWith('[]') && !param.isArray;
|
235
|
-
}
|
236
224
|
}
|
237
225
|
};
|
238
226
|
function getColumnsForQuery(schemaDef) {
|
@@ -248,4 +236,199 @@ function getColumnsForQuery(schemaDef) {
|
|
248
236
|
];
|
249
237
|
return columns;
|
250
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}`;
|
245
|
+
}
|
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
|
+
};
|
433
|
+
}
|
251
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[]>;
|
@@ -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;
|
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,6 +22,7 @@ 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
28
|
const result = yield sql `
|
@@ -29,6 +31,7 @@ function loadDbSchema(sql) {
|
|
29
31
|
t.table_schema,
|
30
32
|
t.table_name,
|
31
33
|
col.column_name,
|
34
|
+
ty.oid as type_id,
|
32
35
|
col.is_nullable,
|
33
36
|
CASE
|
34
37
|
WHEN con.contype = 'p' THEN 'PRI' -- Primary key
|
@@ -43,6 +46,8 @@ function loadDbSchema(sql) {
|
|
43
46
|
information_schema.columns col
|
44
47
|
ON t.table_name = col.table_name
|
45
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
|
46
51
|
LEFT JOIN
|
47
52
|
pg_constraint con ON con.conrelid = c.oid
|
48
53
|
AND col.ordinal_position = ANY (con.conkey)
|
@@ -56,6 +61,7 @@ function loadDbSchema(sql) {
|
|
56
61
|
table_schema: row.table_schema,
|
57
62
|
table_name: row.table_name,
|
58
63
|
column_name: row.column_name,
|
64
|
+
type_id: row.type_id,
|
59
65
|
is_nullable: row.is_nullable === 'YES',
|
60
66
|
column_key: row.column_key
|
61
67
|
}));
|
@@ -66,6 +72,18 @@ function loadDbSchema(sql) {
|
|
66
72
|
return 'Unknown error';
|
67
73
|
})();
|
68
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
|
+
}
|
69
87
|
const postgresDescribe = (sql, sqlQuery) => {
|
70
88
|
return neverthrow_1.ResultAsync.fromThrowable(() => __awaiter(void 0, void 0, void 0, function* () {
|
71
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":";;;;;;;;;;;;;;;
|
1
|
+
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":"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"}
|
package/drivers/types.d.ts
CHANGED
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;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"}
|
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"}
|
@@ -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;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "typesql-cli",
|
3
|
-
"version": "0.15.
|
3
|
+
"version": "0.15.1",
|
4
4
|
"description": "",
|
5
5
|
"main": "index.js",
|
6
6
|
"bin": {
|
@@ -21,30 +21,31 @@
|
|
21
21
|
"access": "public"
|
22
22
|
},
|
23
23
|
"devDependencies": {
|
24
|
-
"@biomejs/biome": "^1.
|
25
|
-
"@cloudflare/workers-types": "^4.
|
26
|
-
"@types/better-sqlite3": "^7.6.
|
27
|
-
"@types/
|
28
|
-
"@types/mocha": "^10.0.
|
29
|
-
"@types/node": "^20.
|
30
|
-
"@types/yargs": "^17.0.
|
31
|
-
"mocha": "^10.
|
32
|
-
"prettier": "3.
|
24
|
+
"@biomejs/biome": "^1.9.4",
|
25
|
+
"@cloudflare/workers-types": "^4.20241218.0",
|
26
|
+
"@types/better-sqlite3": "^7.6.12",
|
27
|
+
"@types/lodash.uniqby": "^4.7.9",
|
28
|
+
"@types/mocha": "^10.0.10",
|
29
|
+
"@types/node": "^20.17.10",
|
30
|
+
"@types/yargs": "^17.0.33",
|
31
|
+
"mocha": "^10.8.2",
|
32
|
+
"prettier": "^3.4.2",
|
33
33
|
"shx": "^0.3.4",
|
34
34
|
"ts-node": "^10.9.2",
|
35
|
-
"typescript": "^5.
|
35
|
+
"typescript": "^5.7.2"
|
36
36
|
},
|
37
37
|
"dependencies": {
|
38
38
|
"@wsporto/typesql-parser": "^0.0.3",
|
39
|
-
"better-sqlite3": "^11.
|
39
|
+
"better-sqlite3": "^11.7.0",
|
40
40
|
"camelcase": "^6.3.0",
|
41
41
|
"chokidar": "^3.6.0",
|
42
|
-
"code-block-writer": "^13.0.
|
43
|
-
"fp-ts": "^2.16.
|
44
|
-
"glob": "^
|
45
|
-
"libsql": "^0.4.
|
42
|
+
"code-block-writer": "^13.0.3",
|
43
|
+
"fp-ts": "^2.16.9",
|
44
|
+
"glob": "^11.0.0",
|
45
|
+
"libsql": "^0.4.7",
|
46
|
+
"lodash.uniqby": "^4.7.0",
|
46
47
|
"moment": "^2.30.1",
|
47
|
-
"mysql2": "^3.
|
48
|
+
"mysql2": "^3.11.5",
|
48
49
|
"neverthrow": "^8.1.1",
|
49
50
|
"postgres": "^3.4.5",
|
50
51
|
"yargs": "^17.7.2"
|