prostgles-server 4.2.519 → 4.2.521
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/dist/TableConfig/getColumnSQLDefinitionQuery.d.ts +1 -1
- package/dist/TableConfig/getColumnSQLDefinitionQuery.d.ts.map +1 -1
- package/dist/TableConfig/getColumnSQLDefinitionQuery.js +5 -4
- package/dist/TableConfig/getColumnSQLDefinitionQuery.js.map +1 -1
- package/lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts +10 -1
- package/lib/TableConfig/getColumnSQLDefinitionQuery.ts +11 -16
- package/package.json +1 -1
|
@@ -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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnSQLDefinitionQuery.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getColumnSQLDefinitionQuery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getColumnSQLDefinitionQuery.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getColumnSQLDefinitionQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAGxC,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,eAAe,CAAC;AAEnE,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,YAAY,CAAC;IACtB,EAAE,EAAE,EAAE,CAAC;IACP,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B,GAAU,6EAO/C,IAAI,KAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CA+GnC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AACF,eAAO,MAAM,eAAe,GAAI,gBAG7B;IACD,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;CACf,KAAG,OAAO,CAAC,iBAAiB,EAAE,CAY9B,CAAC"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTableColumns = exports.getColumnSQLDefinitionQuery = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
-
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
6
5
|
const validateJSONBSchemaSQL_1 = require("../JSONBSchemaValidation/validateJSONBSchemaSQL");
|
|
7
6
|
const applyScopeToTableRules_1 = require("../PublishParser/applyScopeToTableRules");
|
|
7
|
+
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
8
8
|
/**
|
|
9
9
|
* Column create statement for a given config
|
|
10
10
|
*/
|
|
@@ -28,18 +28,19 @@ const getColumnSQLDefinitionQuery = async ({ colConf: colConfRaw, column, escape
|
|
|
28
28
|
return jsonbSchema;
|
|
29
29
|
const { title, description, ...withoutInfo } = jsonbSchema;
|
|
30
30
|
const { allowedValues, type, oneOf, oneOfType, arrayOf, arrayOfType, record } = withoutInfo;
|
|
31
|
+
const parseType = (type) => (0, applyScopeToTableRules_1.fromEntries)((0, prostgles_types_1.getObjectEntries)(type).map(([k, v]) => [k, getJsonbSchemaCoreData(v)]));
|
|
31
32
|
return {
|
|
32
33
|
...withoutInfo,
|
|
33
34
|
...(allowedValues && {
|
|
34
35
|
allowedValues: allowedValues.map((v) => ((0, prostgles_types_1.isObject)(v) ? v.value : v)),
|
|
35
36
|
}),
|
|
36
37
|
...((0, prostgles_types_1.isObject)(type) && {
|
|
37
|
-
type: (
|
|
38
|
+
type: parseType(type),
|
|
38
39
|
}),
|
|
39
40
|
...(oneOf && { oneOf: oneOf.map((v) => getJsonbSchemaCoreData(v)) }),
|
|
40
|
-
...(oneOfType && { oneOfType: oneOfType.map((
|
|
41
|
+
...(oneOfType && { oneOfType: oneOfType.map((type) => parseType(type)) }),
|
|
41
42
|
...(arrayOf && { arrayOf: getJsonbSchemaCoreData(arrayOf) }),
|
|
42
|
-
...(arrayOfType && { arrayOfType:
|
|
43
|
+
...(arrayOfType && { arrayOfType: parseType(arrayOfType) }),
|
|
43
44
|
...(record && {
|
|
44
45
|
record: { ...record, values: record.values && getJsonbSchemaCoreData(record.values) },
|
|
45
46
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnSQLDefinitionQuery.js","sourceRoot":"","sources":["../../lib/TableConfig/getColumnSQLDefinitionQuery.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"getColumnSQLDefinitionQuery.js","sourceRoot":"","sources":["../../lib/TableConfig/getColumnSQLDefinitionQuery.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
|
};
|
|
@@ -1,17 +1,10 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
isObject,
|
|
5
|
-
omitKeys,
|
|
6
|
-
pickKeys,
|
|
7
|
-
type JSONB,
|
|
8
|
-
} from "prostgles-types";
|
|
1
|
+
import type pgPromise from "pg-promise";
|
|
2
|
+
import { asName, getObjectEntries, isObject, pickKeys, type JSONB } from "prostgles-types";
|
|
3
|
+
import { VALIDATE_SCHEMA_FUNCNAME } from "../JSONBSchemaValidation/validateJSONBSchemaSQL";
|
|
9
4
|
import type { DB } from "../Prostgles";
|
|
5
|
+
import { fromEntries } from "../PublishParser/applyScopeToTableRules";
|
|
10
6
|
import { asValue } from "../PubSubManager/PubSubManagerUtils";
|
|
11
|
-
import { VALIDATE_SCHEMA_FUNCNAME } from "../JSONBSchemaValidation/validateJSONBSchemaSQL";
|
|
12
7
|
import type { BaseColumnTypes, ColumnConfig } from "./TableConfig";
|
|
13
|
-
import type pgPromise from "pg-promise";
|
|
14
|
-
import { fromEntries } from "../PublishParser/applyScopeToTableRules";
|
|
15
8
|
|
|
16
9
|
type Args = {
|
|
17
10
|
column: string;
|
|
@@ -58,20 +51,22 @@ export const getColumnSQLDefinitionQuery = async ({
|
|
|
58
51
|
|
|
59
52
|
const { title, description, ...withoutInfo } = jsonbSchema as JSONB.FieldTypeObj;
|
|
60
53
|
const { allowedValues, type, oneOf, oneOfType, arrayOf, arrayOfType, record } = withoutInfo;
|
|
54
|
+
const parseType = (type: JSONB.ObjectType["type"]) =>
|
|
55
|
+
fromEntries(
|
|
56
|
+
getObjectEntries(type).map(([k, v]) => [k, getJsonbSchemaCoreData(v)] as const),
|
|
57
|
+
);
|
|
61
58
|
return {
|
|
62
59
|
...withoutInfo,
|
|
63
60
|
...(allowedValues && {
|
|
64
61
|
allowedValues: allowedValues.map((v) => (isObject(v) ? v.value : v)),
|
|
65
62
|
}),
|
|
66
63
|
...(isObject(type) && {
|
|
67
|
-
type:
|
|
68
|
-
getObjectEntries(type).map(([k, v]) => [k, getJsonbSchemaCoreData(v)] as const),
|
|
69
|
-
),
|
|
64
|
+
type: parseType(type),
|
|
70
65
|
}),
|
|
71
66
|
...(oneOf && { oneOf: oneOf.map((v) => getJsonbSchemaCoreData(v)) }),
|
|
72
|
-
...(oneOfType && { oneOfType: oneOfType.map((
|
|
67
|
+
...(oneOfType && { oneOfType: oneOfType.map((type) => parseType(type)) }),
|
|
73
68
|
...(arrayOf && { arrayOf: getJsonbSchemaCoreData(arrayOf) }),
|
|
74
|
-
...(arrayOfType && { arrayOfType:
|
|
69
|
+
...(arrayOfType && { arrayOfType: parseType(arrayOfType) }),
|
|
75
70
|
...(record && {
|
|
76
71
|
record: { ...record, values: record.values && getJsonbSchemaCoreData(record.values) },
|
|
77
72
|
}),
|