prostgles-server 4.2.426 → 4.2.427
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/DBSchemaBuilder.d.ts +1 -6
- package/dist/DBSchemaBuilder/DBSchemaBuilder.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/DBSchemaBuilder.js +0 -32
- package/dist/DBSchemaBuilder/DBSchemaBuilder.js.map +1 -1
- package/dist/DBSchemaBuilder/getDBGeneratedSchema.d.ts +7 -0
- package/dist/DBSchemaBuilder/getDBGeneratedSchema.d.ts.map +1 -0
- package/dist/DBSchemaBuilder/getDBGeneratedSchema.js +43 -0
- package/dist/DBSchemaBuilder/getDBGeneratedSchema.js.map +1 -0
- package/dist/DboBuilder/DboBuilder.js +2 -2
- package/dist/DboBuilder/DboBuilder.js.map +1 -1
- package/lib/DBSchemaBuilder/DBSchemaBuilder.ts +1 -49
- package/lib/DBSchemaBuilder/getDBGeneratedSchema.ts +54 -0
- package/lib/DboBuilder/DboBuilder.ts +2 -2
- package/package.json +1 -1
|
@@ -1,12 +1,7 @@
|
|
|
1
|
-
import type { AnyObject, DBSchema, TableHandler,
|
|
1
|
+
import type { AnyObject, DBSchema, TableHandler, ViewHandler } from "prostgles-types";
|
|
2
2
|
import type { TX } from "../DboBuilder/DboBuilderTypes";
|
|
3
3
|
import type { PublishAllOrNothing, PublishTableRule, PublishViewRule } from "../PublishParser/PublishParser";
|
|
4
4
|
import { type PublishObject } from "../PublishParser/PublishParser";
|
|
5
|
-
import type { TableConfig } from "../TableConfig/TableConfig";
|
|
6
|
-
export declare const getDBTypescriptSchema: ({ tablesOrViews, config, }: {
|
|
7
|
-
tablesOrViews: TableSchema[];
|
|
8
|
-
config: TableConfig | undefined;
|
|
9
|
-
}) => string;
|
|
10
5
|
export type ServerViewHandler<T extends AnyObject = AnyObject, Schema extends DBSchema | void = void> = ViewHandler<T, Schema> & {
|
|
11
6
|
is_view: true;
|
|
12
7
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACtF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EAChB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAEpE,MAAM,MAAM,iBAAiB,CAC3B,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IACnC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC;AAC/C,MAAM,MAAM,kBAAkB,CAC5B,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IACnC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,OAAO,EAAE,KAAK,CAAA;CAAE,CAAC;AAEjD,MAAM,MAAM,yBAAyB,CAAC,MAAM,GAAG,IAAI,IACjD,MAAM,SAAS,QAAQ,GACrB;KACG,QAAQ,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAClE,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACtD,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC1D,GACD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAEhD,MAAM,MAAM,qBAAqB,CAC/B,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAChD,gBAAgB,GAAG,IAAI,IACrB,gBAAgB,SAAS,IAAI,GAAG;IAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAE3E,MAAM,MAAM,aAAa,CACvB,MAAM,GAAG,IAAI,EACb,gBAAgB,GAAG,IAAI,IACrB,yBAAyB,CAAC,MAAM,CAAC,GACnC,qBAAqB,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAE7E,MAAM,MAAM,iBAAiB,CAAC,MAAM,GAAG,IAAI,IACzC,MAAM,SAAS,QAAQ,GACrB;KACG,QAAQ,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,mBAAmB,GACnB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GACvC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACpD,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;CAC7D,GACD,aAAa,CAAC"}
|
|
@@ -1,35 +1,3 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getDBTypescriptSchema = void 0;
|
|
4
|
-
const utils_1 = require("../utils/utils");
|
|
5
|
-
const getColumnTypescriptDefinition_1 = require("./getColumnTypescriptDefinition");
|
|
6
|
-
const getDBTypescriptSchema = ({ tablesOrViews, config, }) => {
|
|
7
|
-
const tables = [];
|
|
8
|
-
/** Tables and columns are sorted to avoid infinite loops due to changing order */
|
|
9
|
-
tablesOrViews
|
|
10
|
-
.slice(0)
|
|
11
|
-
.sort((a, b) => a.name.localeCompare(b.name))
|
|
12
|
-
.forEach((tableOrView) => {
|
|
13
|
-
const { privileges, columns } = tableOrView;
|
|
14
|
-
const cols = columns.slice(0).sort((a, b) => a.name.localeCompare(b.name));
|
|
15
|
-
tables.push(`${(0, utils_1.escapeTSNames)(tableOrView.name)}: {
|
|
16
|
-
is_view: ${tableOrView.is_view};
|
|
17
|
-
select: ${privileges.select};
|
|
18
|
-
insert: ${privileges.insert};
|
|
19
|
-
update: ${privileges.update};
|
|
20
|
-
delete: ${privileges.delete};
|
|
21
|
-
columns: {${cols
|
|
22
|
-
.map((column) => `
|
|
23
|
-
${(0, getColumnTypescriptDefinition_1.getColumnTypescriptDefinition)({ tablesOrViews, config, tableOrView, column })}`)
|
|
24
|
-
.join("")}
|
|
25
|
-
};
|
|
26
|
-
};\n `);
|
|
27
|
-
});
|
|
28
|
-
return `
|
|
29
|
-
export type DBGeneratedSchema = {
|
|
30
|
-
${tables.join("")}
|
|
31
|
-
}
|
|
32
|
-
`;
|
|
33
|
-
};
|
|
34
|
-
exports.getDBTypescriptSchema = getDBTypescriptSchema;
|
|
35
3
|
//# sourceMappingURL=DBSchemaBuilder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBSchemaBuilder.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { TableSchema } from "prostgles-types";
|
|
2
|
+
import type { TableConfig } from "../TableConfig/TableConfig";
|
|
3
|
+
export declare const getDBGeneratedSchema: ({ tablesOrViews, config, }: {
|
|
4
|
+
tablesOrViews: TableSchema[];
|
|
5
|
+
config: TableConfig | undefined;
|
|
6
|
+
}) => string;
|
|
7
|
+
//# sourceMappingURL=getDBGeneratedSchema.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getDBGeneratedSchema.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getDBGeneratedSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,eAAO,MAAM,oBAAoB,GAAI,4BAGlC;IACD,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;CACjC,KAAG,MAoCH,CAAC"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getDBGeneratedSchema = void 0;
|
|
4
|
+
const utils_1 = require("../utils/utils");
|
|
5
|
+
const getColumnTypescriptDefinition_1 = require("./getColumnTypescriptDefinition");
|
|
6
|
+
const getDBGeneratedSchema = ({ tablesOrViews, config, }) => {
|
|
7
|
+
const tables = [];
|
|
8
|
+
/** Tables and columns are sorted to avoid infinite loops due to changing order */
|
|
9
|
+
tablesOrViews
|
|
10
|
+
.slice(0)
|
|
11
|
+
.sort((a, b) => a.name.localeCompare(b.name))
|
|
12
|
+
.forEach((tableOrView) => {
|
|
13
|
+
const { privileges, columns, is_view } = tableOrView;
|
|
14
|
+
const { select, insert, update, delete: del } = privileges;
|
|
15
|
+
const cols = columns.slice(0).sort((a, b) => a.name.localeCompare(b.name));
|
|
16
|
+
tables.push(`${(0, utils_1.escapeTSNames)(tableOrView.name)}: {
|
|
17
|
+
${addIfTrue({
|
|
18
|
+
is_view,
|
|
19
|
+
select,
|
|
20
|
+
insert,
|
|
21
|
+
update,
|
|
22
|
+
delete: del,
|
|
23
|
+
}, " ")}
|
|
24
|
+
columns: {${cols
|
|
25
|
+
.map((column) => `
|
|
26
|
+
${(0, getColumnTypescriptDefinition_1.getColumnTypescriptDefinition)({ tablesOrViews, config, tableOrView, column })}`)
|
|
27
|
+
.join("")}
|
|
28
|
+
};
|
|
29
|
+
};\n `);
|
|
30
|
+
});
|
|
31
|
+
return `
|
|
32
|
+
export type DBGeneratedSchema = {
|
|
33
|
+
${tables.join("")}
|
|
34
|
+
}
|
|
35
|
+
`;
|
|
36
|
+
};
|
|
37
|
+
exports.getDBGeneratedSchema = getDBGeneratedSchema;
|
|
38
|
+
const addIfTrue = (obj, leadingText) => {
|
|
39
|
+
return Object.entries(obj)
|
|
40
|
+
.filter(([, v]) => v)
|
|
41
|
+
.map(([k]) => `${leadingText}${k}: true;`);
|
|
42
|
+
};
|
|
43
|
+
//# sourceMappingURL=getDBGeneratedSchema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getDBGeneratedSchema.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getDBGeneratedSchema.ts"],"names":[],"mappings":";;;AAEA,0CAA+C;AAC/C,mFAAgF;AAEzE,MAAM,oBAAoB,GAAG,CAAC,EACnC,aAAa,EACb,MAAM,GAIP,EAAU,EAAE;IACX,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,kFAAkF;IAClF,aAAa;SACV,KAAK,CAAC,CAAC,CAAC;SACR,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAC5C,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QACvB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;QACrD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;QAC3D,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3E,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,qBAAa,EAAC,WAAW,CAAC,IAAI,CAAC;EAClD,SAAS,CACT;YACE,OAAO;YACP,MAAM;YACN,MAAM;YACN,MAAM;YACN,MAAM,EAAE,GAAG;SACZ,EACD,IAAI,CACL;gBACe,IAAI;aACb,GAAG,CACF,CAAC,MAAM,EAAE,EAAE,CAAC;QACZ,IAAA,6DAA6B,EAAC,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,CAChF;aACA,IAAI,CAAC,EAAE,CAAC;;SAEN,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACL,OAAO;;IAEL,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;;CAElB,CAAC;AACF,CAAC,CAAC;AA1CW,QAAA,oBAAoB,wBA0C/B;AAEF,MAAM,SAAS,GAAG,CAAC,GAAwC,EAAE,WAAmB,EAAE,EAAE;IAClF,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;SACvB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACpB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,WAAW,GAAG,CAAC,SAAS,CAAC,CAAC;AAC/C,CAAC,CAAC"}
|
|
@@ -16,7 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.DboBuilder = void 0;
|
|
18
18
|
const prostgles_types_1 = require("prostgles-types");
|
|
19
|
-
const
|
|
19
|
+
const getDBGeneratedSchema_1 = require("../DBSchemaBuilder/getDBGeneratedSchema");
|
|
20
20
|
const getFunctionsTypescriptSchema_1 = require("../DBSchemaBuilder/getFunctionsTypescriptSchema");
|
|
21
21
|
const PubSubManager_1 = require("../PubSubManager/PubSubManager");
|
|
22
22
|
const getCreatePubSubManagerError_1 = require("../PubSubManager/getCreatePubSubManagerError");
|
|
@@ -213,7 +213,7 @@ class DboBuilder {
|
|
|
213
213
|
}
|
|
214
214
|
this.tsTypesDefinition = [
|
|
215
215
|
`/* Schema definition generated by prostgles-server */`,
|
|
216
|
-
(0,
|
|
216
|
+
(0, getDBGeneratedSchema_1.getDBGeneratedSchema)({
|
|
217
217
|
config: this.prostgles.opts.tableConfig,
|
|
218
218
|
tablesOrViews,
|
|
219
219
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilder.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,qDAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"DboBuilder.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
AnyObject,
|
|
3
|
-
DBSchema,
|
|
4
|
-
SQLHandler,
|
|
5
|
-
TableHandler,
|
|
6
|
-
TableSchema,
|
|
7
|
-
ViewHandler,
|
|
8
|
-
} from "prostgles-types";
|
|
1
|
+
import type { AnyObject, DBSchema, TableHandler, ViewHandler } from "prostgles-types";
|
|
9
2
|
import type { TX } from "../DboBuilder/DboBuilderTypes";
|
|
10
3
|
import type {
|
|
11
4
|
PublishAllOrNothing,
|
|
@@ -13,47 +6,6 @@ import type {
|
|
|
13
6
|
PublishViewRule,
|
|
14
7
|
} from "../PublishParser/PublishParser";
|
|
15
8
|
import { type PublishObject } from "../PublishParser/PublishParser";
|
|
16
|
-
import type { TableConfig } from "../TableConfig/TableConfig";
|
|
17
|
-
import { escapeTSNames } from "../utils/utils";
|
|
18
|
-
import { getColumnTypescriptDefinition } from "./getColumnTypescriptDefinition";
|
|
19
|
-
|
|
20
|
-
export const getDBTypescriptSchema = ({
|
|
21
|
-
tablesOrViews,
|
|
22
|
-
config,
|
|
23
|
-
}: {
|
|
24
|
-
tablesOrViews: TableSchema[];
|
|
25
|
-
config: TableConfig | undefined;
|
|
26
|
-
}): string => {
|
|
27
|
-
const tables: string[] = [];
|
|
28
|
-
|
|
29
|
-
/** Tables and columns are sorted to avoid infinite loops due to changing order */
|
|
30
|
-
tablesOrViews
|
|
31
|
-
.slice(0)
|
|
32
|
-
.sort((a, b) => a.name.localeCompare(b.name))
|
|
33
|
-
.forEach((tableOrView) => {
|
|
34
|
-
const { privileges, columns } = tableOrView;
|
|
35
|
-
const cols = columns.slice(0).sort((a, b) => a.name.localeCompare(b.name));
|
|
36
|
-
tables.push(`${escapeTSNames(tableOrView.name)}: {
|
|
37
|
-
is_view: ${tableOrView.is_view};
|
|
38
|
-
select: ${privileges.select};
|
|
39
|
-
insert: ${privileges.insert};
|
|
40
|
-
update: ${privileges.update};
|
|
41
|
-
delete: ${privileges.delete};
|
|
42
|
-
columns: {${cols
|
|
43
|
-
.map(
|
|
44
|
-
(column) => `
|
|
45
|
-
${getColumnTypescriptDefinition({ tablesOrViews, config, tableOrView, column })}`,
|
|
46
|
-
)
|
|
47
|
-
.join("")}
|
|
48
|
-
};
|
|
49
|
-
};\n `);
|
|
50
|
-
});
|
|
51
|
-
return `
|
|
52
|
-
export type DBGeneratedSchema = {
|
|
53
|
-
${tables.join("")}
|
|
54
|
-
}
|
|
55
|
-
`;
|
|
56
|
-
};
|
|
57
9
|
|
|
58
10
|
export type ServerViewHandler<
|
|
59
11
|
T extends AnyObject = AnyObject,
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import type { TableSchema } from "prostgles-types";
|
|
2
|
+
import type { TableConfig } from "../TableConfig/TableConfig";
|
|
3
|
+
import { escapeTSNames } from "../utils/utils";
|
|
4
|
+
import { getColumnTypescriptDefinition } from "./getColumnTypescriptDefinition";
|
|
5
|
+
|
|
6
|
+
export const getDBGeneratedSchema = ({
|
|
7
|
+
tablesOrViews,
|
|
8
|
+
config,
|
|
9
|
+
}: {
|
|
10
|
+
tablesOrViews: TableSchema[];
|
|
11
|
+
config: TableConfig | undefined;
|
|
12
|
+
}): string => {
|
|
13
|
+
const tables: string[] = [];
|
|
14
|
+
|
|
15
|
+
/** Tables and columns are sorted to avoid infinite loops due to changing order */
|
|
16
|
+
tablesOrViews
|
|
17
|
+
.slice(0)
|
|
18
|
+
.sort((a, b) => a.name.localeCompare(b.name))
|
|
19
|
+
.forEach((tableOrView) => {
|
|
20
|
+
const { privileges, columns, is_view } = tableOrView;
|
|
21
|
+
const { select, insert, update, delete: del } = privileges;
|
|
22
|
+
const cols = columns.slice(0).sort((a, b) => a.name.localeCompare(b.name));
|
|
23
|
+
tables.push(`${escapeTSNames(tableOrView.name)}: {
|
|
24
|
+
${addIfTrue(
|
|
25
|
+
{
|
|
26
|
+
is_view,
|
|
27
|
+
select,
|
|
28
|
+
insert,
|
|
29
|
+
update,
|
|
30
|
+
delete: del,
|
|
31
|
+
},
|
|
32
|
+
" ",
|
|
33
|
+
)}
|
|
34
|
+
columns: {${cols
|
|
35
|
+
.map(
|
|
36
|
+
(column) => `
|
|
37
|
+
${getColumnTypescriptDefinition({ tablesOrViews, config, tableOrView, column })}`,
|
|
38
|
+
)
|
|
39
|
+
.join("")}
|
|
40
|
+
};
|
|
41
|
+
};\n `);
|
|
42
|
+
});
|
|
43
|
+
return `
|
|
44
|
+
export type DBGeneratedSchema = {
|
|
45
|
+
${tables.join("")}
|
|
46
|
+
}
|
|
47
|
+
`;
|
|
48
|
+
};
|
|
49
|
+
|
|
50
|
+
const addIfTrue = (obj: Record<string, boolean | undefined>, leadingText: string) => {
|
|
51
|
+
return Object.entries(obj)
|
|
52
|
+
.filter(([, v]) => v)
|
|
53
|
+
.map(([k]) => `${leadingText}${k}: true;`);
|
|
54
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { PG_COLUMN_UDT_DATA_TYPE, SQLHandler, SQLOptions } from "prostgles-types";
|
|
2
2
|
import { getSerialisableError, isDefined, tryCatchV2 } from "prostgles-types";
|
|
3
|
-
import {
|
|
3
|
+
import { getDBGeneratedSchema } from "../DBSchemaBuilder/getDBGeneratedSchema";
|
|
4
4
|
import { getFunctionsTypescriptSchema } from "../DBSchemaBuilder/getFunctionsTypescriptSchema";
|
|
5
5
|
import type { DB, Prostgles } from "../Prostgles";
|
|
6
6
|
import type { Join } from "../ProstglesTypes";
|
|
@@ -289,7 +289,7 @@ export class DboBuilder {
|
|
|
289
289
|
}
|
|
290
290
|
this.tsTypesDefinition = [
|
|
291
291
|
`/* Schema definition generated by prostgles-server */`,
|
|
292
|
-
|
|
292
|
+
getDBGeneratedSchema({
|
|
293
293
|
config: this.prostgles.opts.tableConfig,
|
|
294
294
|
tablesOrViews,
|
|
295
295
|
}),
|