typesql-cli 0.16.0-experimental.3 → 0.16.0
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/drivers/postgres.d.ts +2 -3
- package/drivers/postgres.d.ts.map +1 -1
- package/drivers/postgres.js +10 -33
- package/drivers/postgres.js.map +1 -1
- package/package.json +1 -1
- package/postgres-query-analyzer/describe.d.ts.map +1 -1
- package/postgres-query-analyzer/describe.js +8 -7
- package/postgres-query-analyzer/describe.js.map +1 -1
- package/schema-info.d.ts.map +1 -1
- package/schema-info.js +1 -8
- package/schema-info.js.map +1 -1
package/drivers/postgres.d.ts
CHANGED
|
@@ -4,10 +4,9 @@ import { DatabaseClient, TypeSqlError } from '../types';
|
|
|
4
4
|
import { Result, ResultAsync } from 'neverthrow';
|
|
5
5
|
import { ColumnSchema } from '../mysql-query-analyzer/types';
|
|
6
6
|
import { ForeignKeyInfo } from '../sqlite-query-analyzer/query-executor';
|
|
7
|
-
export declare function loadDbSchema(sql: Sql): ResultAsync<PostgresColumnSchema[],
|
|
7
|
+
export declare function loadDbSchema(sql: Sql): ResultAsync<PostgresColumnSchema[], TypeSqlError>;
|
|
8
8
|
export declare function mapToColumnSchema(col: PostgresColumnSchema): ColumnSchema;
|
|
9
|
-
export declare const postgresDescribe: (sql: Sql, sqlQuery: string) => ResultAsync<PostgresDescribe,
|
|
10
|
-
export declare function postgresAnalyze(sql: Sql, sqlQuery: string): ResultAsync<string[], string>;
|
|
9
|
+
export declare const postgresDescribe: (sql: Sql, sqlQuery: string) => ResultAsync<PostgresDescribe, TypeSqlError>;
|
|
11
10
|
export declare function createPostgresClient(databaseUri: string): Result<DatabaseClient, TypeSqlError>;
|
|
12
11
|
export declare function loadForeignKeys(sql: Sql): ResultAsync<ForeignKeyInfo[], TypeSqlError>;
|
|
13
12
|
//# sourceMappingURL=postgres.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":"AAAA,OAAiB,
|
|
1
|
+
{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAiB,GAAG,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAuB,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACtF,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAM,MAAM,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEzE,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW,CAAC,oBAAoB,EAAE,EAAE,YAAY,CAAC,CA0DxF;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,oBAAoB,GAAG,YAAY,CAYzE;AAED,eAAO,MAAM,gBAAgB,QAAS,GAAG,YAAY,MAAM,KAAG,WAAW,CAAC,gBAAgB,EAAE,YAAY,CAkBvG,CAAA;AAWD,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC,CAM9F;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW,CAAC,cAAc,EAAE,EAAE,YAAY,CAAC,CA8BrF"}
|
package/drivers/postgres.js
CHANGED
|
@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.postgresDescribe = void 0;
|
|
16
16
|
exports.loadDbSchema = loadDbSchema;
|
|
17
17
|
exports.mapToColumnSchema = mapToColumnSchema;
|
|
18
|
-
exports.postgresAnalyze = postgresAnalyze;
|
|
19
18
|
exports.createPostgresClient = createPostgresClient;
|
|
20
19
|
exports.loadForeignKeys = loadForeignKeys;
|
|
21
20
|
const postgres_1 = __importDefault(require("postgres"));
|
|
@@ -74,12 +73,7 @@ function loadDbSchema(sql) {
|
|
|
74
73
|
column_key: row.column_key,
|
|
75
74
|
autoincrement: row.autoincrement
|
|
76
75
|
}));
|
|
77
|
-
}),
|
|
78
|
-
if (reason.errors && reason.errors.length > 0) {
|
|
79
|
-
return reason.errors.map((e) => e.message).join(', '); // Join all error messages into one string
|
|
80
|
-
}
|
|
81
|
-
return 'Unknown error';
|
|
82
|
-
})();
|
|
76
|
+
}), err => convertPostgresErrorToTypeSQLError(err))();
|
|
83
77
|
}
|
|
84
78
|
function mapToColumnSchema(col) {
|
|
85
79
|
const columnSchema = {
|
|
@@ -108,26 +102,16 @@ const postgresDescribe = (sql, sqlQuery) => {
|
|
|
108
102
|
parameters
|
|
109
103
|
};
|
|
110
104
|
return result;
|
|
111
|
-
}),
|
|
112
|
-
if (reason instanceof Error) {
|
|
113
|
-
return reason.message;
|
|
114
|
-
}
|
|
115
|
-
return 'Unknown error';
|
|
116
|
-
})();
|
|
105
|
+
}), err => convertPostgresErrorToTypeSQLError(err))();
|
|
117
106
|
};
|
|
118
107
|
exports.postgresDescribe = postgresDescribe;
|
|
119
|
-
function
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
if (reason.errors && reason.errors.length > 0) {
|
|
127
|
-
return reason.errors.map((e) => e.message).join(', '); // Join all error messages into one string
|
|
128
|
-
}
|
|
129
|
-
return reason.message;
|
|
130
|
-
})();
|
|
108
|
+
function convertPostgresErrorToTypeSQLError(err) {
|
|
109
|
+
const error = err;
|
|
110
|
+
const typesqlError = {
|
|
111
|
+
name: error.name,
|
|
112
|
+
description: error.message
|
|
113
|
+
};
|
|
114
|
+
return typesqlError;
|
|
131
115
|
}
|
|
132
116
|
function createPostgresClient(databaseUri) {
|
|
133
117
|
const db = (0, postgres_1.default)(databaseUri);
|
|
@@ -161,13 +145,6 @@ function loadForeignKeys(sql) {
|
|
|
161
145
|
WHERE
|
|
162
146
|
c.contype = 'f'`;
|
|
163
147
|
return result;
|
|
164
|
-
}),
|
|
165
|
-
const error = err;
|
|
166
|
-
const typesqlError = {
|
|
167
|
-
name: error.name,
|
|
168
|
-
description: error.message
|
|
169
|
-
};
|
|
170
|
-
return typesqlError;
|
|
171
|
-
})();
|
|
148
|
+
}), err => convertPostgresErrorToTypeSQLError(err))();
|
|
172
149
|
}
|
|
173
150
|
//# sourceMappingURL=postgres.js.map
|
package/drivers/postgres.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAQA,
|
|
1
|
+
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/drivers/postgres.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"describe.d.ts","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/describe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGjE,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAI/B,OAAO,EAAc,WAAW,EAAO,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"describe.d.ts","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/describe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGjE,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAI/B,OAAO,EAAc,WAAW,EAAO,MAAM,YAAY,CAAC;AAmE1D,MAAM,MAAM,kBAAkB,GAAG;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB,CAAC;AAoBF,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,SAAS,EAAE,YAAY,CAAC,CAMzH"}
|
|
@@ -15,7 +15,10 @@ function describeQueryRefine(sql, postgresDescribeResult, dbSchema, namedParamet
|
|
|
15
15
|
const generateDynamicQueryInfo = (0, describe_query_1.hasAnnotation)(sql, '@dynamicQuery');
|
|
16
16
|
const parseResult = (0, parser_1.safeParseSql)(sql, dbSchema, { collectNestedInfo: generateNestedInfo, collectDynamicQueryInfo: generateDynamicQueryInfo });
|
|
17
17
|
if (parseResult.isErr()) {
|
|
18
|
-
return (0, neverthrow_1.err)(
|
|
18
|
+
return (0, neverthrow_1.err)({
|
|
19
|
+
name: 'ParserError',
|
|
20
|
+
description: parseResult.error
|
|
21
|
+
});
|
|
19
22
|
}
|
|
20
23
|
const traverseResult = parseResult.value;
|
|
21
24
|
const paramNames = postgresDescribeResult.parameters.map((_, index) => namedParameters[index] ? namedParameters[index] : `param${index + 1}`);
|
|
@@ -38,7 +41,10 @@ function describeQueryRefine(sql, postgresDescribeResult, dbSchema, namedParamet
|
|
|
38
41
|
if (traverseResult.relations) {
|
|
39
42
|
const nestedResult = (0, sqlite_describe_nested_query_1.describeNestedQuery)(descResult.columns, traverseResult.relations || []);
|
|
40
43
|
if ((0, Either_1.isLeft)(nestedResult)) {
|
|
41
|
-
return (0, neverthrow_1.err)(
|
|
44
|
+
return (0, neverthrow_1.err)({
|
|
45
|
+
name: 'ParserError',
|
|
46
|
+
description: 'Error during nested query result: ' + nestedResult.left.description
|
|
47
|
+
});
|
|
42
48
|
}
|
|
43
49
|
descResult.nestedInfo = nestedResult.right;
|
|
44
50
|
}
|
|
@@ -77,11 +83,6 @@ function describeQuery(postgres, sql, namedParameters) {
|
|
|
77
83
|
.andThen(dbSchema => {
|
|
78
84
|
return (0, postgres_1.postgresDescribe)(postgres, sql)
|
|
79
85
|
.andThen(analyzeResult => describeQueryRefine(sql, analyzeResult, dbSchema, namedParameters));
|
|
80
|
-
}).mapErr(err => {
|
|
81
|
-
return {
|
|
82
|
-
name: 'error',
|
|
83
|
-
description: err
|
|
84
|
-
};
|
|
85
86
|
});
|
|
86
87
|
}
|
|
87
88
|
function getColumnsForQuery(traverseResult, postgresDescribeResult) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"describe.js","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/describe.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"describe.js","sourceRoot":"","sources":["../../../src/postgres-query-analyzer/describe.ts"],"names":[],"mappings":"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"}
|
package/schema-info.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-info.d.ts","sourceRoot":"","sources":["../../src/schema-info.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,EAAsB,cAAc,EAAwF,MAAM,wCAAwC,CAAC;AAClL,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvE,OAAO,EAAW,WAAW,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,MAAM,EAAS,MAAM,kBAAkB,CAAC;AAEjD,KAAK,UAAU,GAAG;IACjB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,WAAW,EAAE,cAAc,EAAE,CAAC;CAC9B,CAAA;AAED,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC,cAAc,EAAE,YAAY,CAAC,CAatL;AAED,wBAAgB,UAAU,CAAC,cAAc,EAAE,cAAc,GAAG,WAAW,CAAC,YAAY,EAAE,EAAE,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"schema-info.d.ts","sourceRoot":"","sources":["../../src/schema-info.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,EAAsB,cAAc,EAAwF,MAAM,wCAAwC,CAAC;AAClL,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvE,OAAO,EAAW,WAAW,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,MAAM,EAAS,MAAM,kBAAkB,CAAC;AAEjD,KAAK,UAAU,GAAG;IACjB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,WAAW,EAAE,cAAc,EAAE,CAAC;CAC9B,CAAA;AAED,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC,cAAc,EAAE,YAAY,CAAC,CAatL;AAED,wBAAgB,UAAU,CAAC,cAAc,EAAE,cAAc,GAAG,WAAW,CAAC,YAAY,EAAE,EAAE,YAAY,CAAC,CAepG;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC,YAAY,EAAE,EAAE,YAAY,CAAC,CAY5H;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,WAAW,CAAC,cAAc,EAAE,EAAE,YAAY,CAAC,CAY3G;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAkBjH;AAED,wBAAsB,WAAW,CAAC,EAAE,EAAE,cAAc,iBAqBnD;AAGD,wBAAsB,YAAY,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC,CAYzG"}
|
package/schema-info.js
CHANGED
|
@@ -49,14 +49,7 @@ function loadSchema(databaseClient) {
|
|
|
49
49
|
return (0, query_executor_1.loadDbSchema)(databaseClient.client).asyncAndThen(res => (0, neverthrow_1.okAsync)(res));
|
|
50
50
|
case 'pg':
|
|
51
51
|
const result = (0, postgres_2.loadDbSchema)(databaseClient.client)
|
|
52
|
-
.map(schema => schema.map(col => (0, postgres_2.mapToColumnSchema)(col)))
|
|
53
|
-
.mapErr(err => {
|
|
54
|
-
const typesqlError = {
|
|
55
|
-
description: err,
|
|
56
|
-
name: err
|
|
57
|
-
};
|
|
58
|
-
return typesqlError;
|
|
59
|
-
});
|
|
52
|
+
.map(schema => schema.map(col => (0, postgres_2.mapToColumnSchema)(col)));
|
|
60
53
|
return result;
|
|
61
54
|
}
|
|
62
55
|
}
|
package/schema-info.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-info.js","sourceRoot":"","sources":["../../src/schema-info.ts"],"names":[],"mappings":";;;;;;;;;;;AAeA,oCAaC;AAED,
|
|
1
|
+
{"version":3,"file":"schema-info.js","sourceRoot":"","sources":["../../src/schema-info.ts"],"names":[],"mappings":"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"}
|