prostgles-server 4.2.520 → 4.2.522
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/dist/DBSchemaBuilder/getColumnTypescriptDefinition.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/getColumnTypescriptDefinition.js +8 -1
- package/dist/DBSchemaBuilder/getColumnTypescriptDefinition.js.map +1 -1
- package/lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts +10 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnTypescriptDefinition.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"getColumnTypescriptDefinition.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAG9D,eAAO,MAAM,6BAA6B,GAAI,iDAK3C;IACD,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;CACxC,WAeA,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,iDAKzB;IACD,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;CACxC,WAyDA,CAAC"}
|
|
@@ -70,11 +70,18 @@ const getDataType = ({ config, tablesOrViews, tableOrView, column, }) => {
|
|
|
70
70
|
return typeFromUdtName;
|
|
71
71
|
};
|
|
72
72
|
exports.getDataType = getDataType;
|
|
73
|
+
/**
|
|
74
|
+
* TODO: need to separate pg-ts output type vs json-to-pg input type (pg casts can resolve strings to numbers)
|
|
75
|
+
*/
|
|
73
76
|
const getColTypeForDBSchema = (udt_name) => {
|
|
74
77
|
if (udt_name === "interval") {
|
|
75
78
|
const units = ["years", "months", "days", "hours", "minutes", "seconds", "milliseconds"];
|
|
76
79
|
return `{ ${units.map((u) => `${u}?: number;`).join(" ")} }`;
|
|
77
80
|
}
|
|
78
|
-
|
|
81
|
+
const tsType = (0, prostgles_types_1.postgresToTsType)(udt_name);
|
|
82
|
+
if (tsType === "string" && (0, prostgles_types_1.includes)(prostgles_types_1._PG_numbers, udt_name)) {
|
|
83
|
+
return "number | string";
|
|
84
|
+
}
|
|
85
|
+
return tsType;
|
|
79
86
|
};
|
|
80
87
|
//# sourceMappingURL=getColumnTypescriptDefinition.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnTypescriptDefinition.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getColumnTypescriptDefinition.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
|
+
_PG_numbers,
|
|
2
3
|
getJSONBSchemaTSTypes,
|
|
4
|
+
includes,
|
|
3
5
|
isDefined,
|
|
4
6
|
isObject,
|
|
5
7
|
postgresToTsType,
|
|
@@ -107,6 +109,9 @@ export const getDataType = ({
|
|
|
107
109
|
return typeFromUdtName;
|
|
108
110
|
};
|
|
109
111
|
|
|
112
|
+
/**
|
|
113
|
+
* TODO: need to separate pg-ts output type vs json-to-pg input type (pg casts can resolve strings to numbers)
|
|
114
|
+
*/
|
|
110
115
|
const getColTypeForDBSchema = (udt_name: TableSchemaColumn["udt_name"]): string => {
|
|
111
116
|
if (udt_name === "interval") {
|
|
112
117
|
const units = ["years", "months", "days", "hours", "minutes", "seconds", "milliseconds"];
|
|
@@ -114,5 +119,9 @@ const getColTypeForDBSchema = (udt_name: TableSchemaColumn["udt_name"]): string
|
|
|
114
119
|
return `{ ${units.map((u) => `${u}?: number;`).join(" ")} }`;
|
|
115
120
|
}
|
|
116
121
|
|
|
117
|
-
|
|
122
|
+
const tsType = postgresToTsType(udt_name);
|
|
123
|
+
if (tsType === "string" && includes(_PG_numbers, udt_name)) {
|
|
124
|
+
return "number | string";
|
|
125
|
+
}
|
|
126
|
+
return tsType;
|
|
118
127
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.522",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"pg": "^8.19.0",
|
|
58
58
|
"pg-cursor": "^2.19.0",
|
|
59
59
|
"pg-promise": "^12.6.2",
|
|
60
|
-
"prostgles-types": "^4.0.
|
|
60
|
+
"prostgles-types": "^4.0.238"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
63
|
"@eslint/js": "^9.22.0",
|