prostgles-server 4.2.322 → 4.2.324
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.d.ts.map +1 -1
- package/dist/DBSchemaBuilder.js +10 -11
- package/dist/DBSchemaBuilder.js.map +1 -1
- package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilder.js +6 -4
- package/dist/DboBuilder/DboBuilder.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getValidatedSubscribeOptions.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getValidatedSubscribeOptions.js +1 -2
- package/dist/DboBuilder/ViewHandler/getValidatedSubscribeOptions.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.js +3 -3
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareSortItems.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareSortItems.js +1 -2
- package/dist/DboBuilder/ViewHandler/prepareSortItems.js.map +1 -1
- package/dist/{JSONBValidation/validate_jsonb_schema_sql.d.ts → JSONBSchemaValidation/validateJSONBSchemaSQL.d.ts} +1 -1
- package/dist/JSONBSchemaValidation/validateJSONBSchemaSQL.d.ts.map +1 -0
- package/dist/{JSONBValidation/validate_jsonb_schema_sql.js → JSONBSchemaValidation/validateJSONBSchemaSQL.js} +1 -1
- package/dist/{JSONBValidation/validate_jsonb_schema_sql.js.map → JSONBSchemaValidation/validateJSONBSchemaSQL.js.map} +1 -1
- package/dist/TableConfig/getColumnDefinitionQuery.js +3 -3
- package/dist/TableConfig/getColumnDefinitionQuery.js.map +1 -1
- package/dist/TableConfig/getTableColumnQueries.js +2 -2
- package/dist/TableConfig/getTableColumnQueries.js.map +1 -1
- package/lib/DBSchemaBuilder.ts +10 -10
- package/lib/DboBuilder/DboBuilder.ts +3 -1
- package/lib/DboBuilder/ViewHandler/getValidatedSubscribeOptions.ts +6 -2
- package/lib/DboBuilder/ViewHandler/parseFieldFilter.ts +4 -4
- package/lib/DboBuilder/ViewHandler/prepareSortItems.ts +8 -2
- package/lib/TableConfig/getColumnDefinitionQuery.ts +1 -1
- package/lib/TableConfig/getTableColumnQueries.ts +1 -1
- package/package.json +2 -3
- package/dist/JSONBValidation/JSONBValidation.d.ts +0 -18
- package/dist/JSONBValidation/JSONBValidation.d.ts.map +0 -1
- package/dist/JSONBValidation/JSONBValidation.js +0 -230
- package/dist/JSONBValidation/JSONBValidation.js.map +0 -1
- package/dist/JSONBValidation/JSONBValidation.spec.d.ts +0 -2
- package/dist/JSONBValidation/JSONBValidation.spec.d.ts.map +0 -1
- package/dist/JSONBValidation/JSONBValidation.spec.js +0 -68
- package/dist/JSONBValidation/JSONBValidation.spec.js.map +0 -1
- package/dist/JSONBValidation/getJSONBSchemaTSTypes.d.ts +0 -8
- package/dist/JSONBValidation/getJSONBSchemaTSTypes.d.ts.map +0 -1
- package/dist/JSONBValidation/getJSONBSchemaTSTypes.js +0 -120
- package/dist/JSONBValidation/getJSONBSchemaTSTypes.js.map +0 -1
- package/dist/JSONBValidation/validate_jsonb_schema_sql.d.ts.map +0 -1
- package/lib/JSONBValidation/JSONBValidation.spec.ts +0 -129
- package/lib/JSONBValidation/JSONBValidation.ts +0 -246
- package/lib/JSONBValidation/getJSONBSchemaTSTypes.ts +0 -139
- /package/lib/{JSONBValidation/validate_jsonb_schema_sql.ts → JSONBSchemaValidation/validateJSONBSchemaSQL.ts} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,WAAW,EACX,QAAQ,
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,WAAW,EACX,QAAQ,EAIR,UAAU,EACV,YAAY,EACZ,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,UAAU,EAAmC,MAAM,yBAAyB,CAAC;AACtF,OAAO,EACL,mBAAmB,EAEnB,gBAAgB,EAChB,eAAe,EACf,KAAK,aAAa,EACnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAsC,EAAE,EAAE,MAAM,8BAA8B,CAAC;AAEtF,eAAO,MAAM,WAAW,eAAgB,UAAU,KAAG,MAuEpD,CAAC;AAEF,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,oBAAoB,CAC9B,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAChD,gBAAgB,GAAG,IAAI,IACrB;IACF,GAAG,EAAE,UAAU,CAAC;CACjB,GAAG,OAAO,CAAC,WAAW,CAAC,GACtB,CAAC,gBAAgB,SAAS,IAAI,GAAG;IAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AAE3E,MAAM,MAAM,aAAa,CACvB,MAAM,GAAG,IAAI,EACb,gBAAgB,GAAG,IAAI,IACrB,yBAAyB,CAAC,MAAM,CAAC,GACnC,oBAAoB,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAE5E,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"}
|
package/dist/DBSchemaBuilder.js
CHANGED
|
@@ -4,7 +4,6 @@ exports.getDBSchema = void 0;
|
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const _1 = require(".");
|
|
6
6
|
const DboBuilder_1 = require("./DboBuilder/DboBuilder");
|
|
7
|
-
const getJSONBSchemaTSTypes_1 = require("./JSONBValidation/getJSONBSchemaTSTypes");
|
|
8
7
|
const getDBSchema = (dboBuilder) => {
|
|
9
8
|
const tables = [];
|
|
10
9
|
const getColTypeForDBSchema = (udt_name) => {
|
|
@@ -29,7 +28,7 @@ const getDBSchema = (dboBuilder) => {
|
|
|
29
28
|
...colConf,
|
|
30
29
|
type: colConf.jsonbSchemaType,
|
|
31
30
|
};
|
|
32
|
-
type = (0,
|
|
31
|
+
type = (0, prostgles_types_1.getJSONBSchemaTSTypes)(schema, { nullable: colConf.nullable }, " ", dboBuilder.tablesOrViews ?? []);
|
|
33
32
|
}
|
|
34
33
|
else if ((0, prostgles_types_1.isObject)(colConf) && "enum" in colConf) {
|
|
35
34
|
if (!colConf.enum)
|
|
@@ -69,18 +68,18 @@ export type DBGeneratedSchema = {
|
|
|
69
68
|
exports.getDBSchema = getDBSchema;
|
|
70
69
|
/** Type checks */
|
|
71
70
|
() => {
|
|
72
|
-
const ddb =
|
|
71
|
+
const ddb = {};
|
|
73
72
|
ddb.dwad?.insert;
|
|
74
73
|
ddb.dwad?.delete;
|
|
75
|
-
const d =
|
|
74
|
+
const d = {};
|
|
76
75
|
d.dwad?.insert;
|
|
77
76
|
d.dwad?.delete;
|
|
78
|
-
const p =
|
|
77
|
+
const p = {};
|
|
79
78
|
p.dbo.dwad?.insert;
|
|
80
79
|
ddb.dwad?.delete;
|
|
81
80
|
//@ts-ignore
|
|
82
81
|
void (0, _1.default)({
|
|
83
|
-
dbConnection:
|
|
82
|
+
dbConnection: "",
|
|
84
83
|
publish: async (params) => {
|
|
85
84
|
const _rows = await params.dbo.dwadwa?.find?.({});
|
|
86
85
|
return "*";
|
|
@@ -97,17 +96,17 @@ exports.getDBSchema = getDBSchema;
|
|
|
97
96
|
sidKeyName: "sid_token",
|
|
98
97
|
getUser: (sid, db, _db) => {
|
|
99
98
|
db.dwadaw?.find;
|
|
100
|
-
return
|
|
99
|
+
return {};
|
|
101
100
|
},
|
|
102
101
|
};
|
|
103
102
|
/** Test the created schema */
|
|
104
|
-
const c =
|
|
103
|
+
const c = {};
|
|
105
104
|
const _test = c;
|
|
106
|
-
const dbt =
|
|
105
|
+
const dbt = {};
|
|
107
106
|
void dbt.tx((t) => {
|
|
108
107
|
void t.tbl1.delete();
|
|
109
108
|
});
|
|
110
|
-
const db =
|
|
109
|
+
const db = {};
|
|
111
110
|
void db.tx((t) => {
|
|
112
111
|
void t.wadwa?.find();
|
|
113
112
|
});
|
|
@@ -151,7 +150,7 @@ exports.getDBSchema = getDBSchema;
|
|
|
151
150
|
},
|
|
152
151
|
};
|
|
153
152
|
const _res1 = r;
|
|
154
|
-
const p =
|
|
153
|
+
const p = {};
|
|
155
154
|
void p.dbo.dwadaw?.find?.();
|
|
156
155
|
return res;
|
|
157
156
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBSchemaBuilder.js","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.js","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,uBAAuB,EACvB,UAAU,
|
|
1
|
+
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,6 @@ const dboBuilderUtils_1 = require("./dboBuilderUtils");
|
|
|
34
34
|
const getTablesForSchemaPostgresSQL_1 = require("./getTablesForSchemaPostgresSQL");
|
|
35
35
|
const prepareShortestJoinPaths_1 = require("./prepareShortestJoinPaths");
|
|
36
36
|
const runSQL_1 = require("./runSQL");
|
|
37
|
-
const getJSONBSchemaTSTypes_1 = require("../JSONBValidation/getJSONBSchemaTSTypes");
|
|
38
37
|
__exportStar(require("./DboBuilderTypes"), exports);
|
|
39
38
|
__exportStar(require("./dboBuilderUtils"), exports);
|
|
40
39
|
class DboBuilder {
|
|
@@ -140,9 +139,12 @@ class DboBuilder {
|
|
|
140
139
|
this.shortestJoinPaths = shortestJoinPaths;
|
|
141
140
|
};
|
|
142
141
|
runSQL = async (query, params, options, localParams) => {
|
|
142
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
|
|
143
143
|
return runSQL_1.runSQL
|
|
144
144
|
.bind(this)(query, params, options, localParams)
|
|
145
|
-
.catch((error) =>
|
|
145
|
+
.catch((error) =>
|
|
146
|
+
// eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
|
|
147
|
+
Promise.reject((0, dboBuilderUtils_1.getSerializedClientErrorFromPGError)(error, {
|
|
146
148
|
type: "sql",
|
|
147
149
|
localParams,
|
|
148
150
|
})));
|
|
@@ -213,11 +215,11 @@ class DboBuilder {
|
|
|
213
215
|
const v2Methods = (0, PublishParser_1.getV2Methods)(this.prostgles.opts.publishMethods);
|
|
214
216
|
if (v2Methods) {
|
|
215
217
|
const methodDefinitions = (0, prostgles_types_1.getObjectEntries)(v2Methods).map(([name, method]) => {
|
|
216
|
-
const argumentTypes = (0,
|
|
218
|
+
const argumentTypes = (0, prostgles_types_1.getJSONBTSTypes)(this.tablesOrViews ?? [], {
|
|
217
219
|
type: method.input,
|
|
218
220
|
});
|
|
219
221
|
const removeSemicolon = (v) => v.trim().endsWith(";") ? v.trim().slice(0, -1) : v.trim();
|
|
220
|
-
const returnType = !method.output ? "void" : ((0,
|
|
222
|
+
const returnType = !method.output ? "void" : ((0, prostgles_types_1.getJSONBTSTypes)(this.tablesOrViews ?? [], {
|
|
221
223
|
type: method.output,
|
|
222
224
|
}));
|
|
223
225
|
return ` ${JSON.stringify(name)}: (args: ${removeSemicolon(argumentTypes)}, ctx: MethodContext<DBHandler, DB, User>) => Promise<${removeSemicolon(returnType)}>`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilder.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;;;;;;;;;;;;;;;AAEhG,
|
|
1
|
+
{"version":3,"file":"DboBuilder.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getValidatedSubscribeOptions.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getValidatedSubscribeOptions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"getValidatedSubscribeOptions.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getValidatedSubscribeOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAE1F,eAAO,MAAM,4BAA4B,WAC/B,aAAa,gBAAgB,CAAC,iBACvB,aAAa,GAAG,SAAS,KACvC,aAAa,gBAAgB,CAwE/B,CAAC"}
|
|
@@ -2,9 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getValidatedSubscribeOptions = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
-
const JSONBValidation_1 = require("../../JSONBValidation/JSONBValidation");
|
|
6
5
|
const getValidatedSubscribeOptions = (rawVal, subscribeRule) => {
|
|
7
|
-
const { data, error } = (0,
|
|
6
|
+
const { data, error } = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)({
|
|
8
7
|
throttle: { type: "integer", optional: true },
|
|
9
8
|
throttleOpts: {
|
|
10
9
|
type: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getValidatedSubscribeOptions.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getValidatedSubscribeOptions.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getValidatedSubscribeOptions.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getValidatedSubscribeOptions.ts"],"names":[],"mappings":";;;AAAA,qDAKyB;AAGlB,MAAM,4BAA4B,GAAG,CAC1C,MAAsC,EACtC,aAAwC,EACR,EAAE;IAClC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,qDAAmC,EACzD;QACE,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC7C,YAAY,EAAE;YACZ,IAAI,EAAE;gBACJ,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;aAC/C;YACD,QAAQ,EAAE,IAAI;SACf;QACD,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC9C,uBAAuB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC5D,OAAO,EAAE;YACP,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE;wBACN,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;wBACxC,OAAO,EAAE,IAAI;wBACb,MAAM,EAAE;4BACN,IAAI,EAAE,CAAC,IAAI,CAAC;yBACb;qBACF;iBACF;gBACD;oBACE,MAAM,EAAE;wBACN,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;wBACxC,OAAO,EAAE,IAAI;wBACb,MAAM,EAAE;4BACN,IAAI,EAAE,CAAC,KAAK,CAAC;yBACd;qBACF;iBACF;aACF;YACD,QAAQ,EAAE,IAAI;SACf;KACO,EACV,MAAM,EACN,iBAAiB,CAClB,CAAC;IACF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,iBAAiB,GAAG,aAAa,EAAE,QAAQ,IAAI,CAAC,CAAC;IACvD,MAAM,EACJ,OAAO,EACP,YAAY,EACZ,SAAS,EACT,QAAQ,GAAG,iBAAiB,EAC5B,uBAAuB,GACxB,GAAG,IAAI,CAAC;IACT,IAAI,OAAO,IAAI,IAAA,yBAAO,EAAC,OAAO,CAAC,EAAE,CAAC;QAChC,MAAM,iCAAiC,CAAC;IAC1C,CAAC;IACD,IACE,iBAAiB;QACjB,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC;QACnC,iBAAiB,GAAG,CAAC;QACrB,QAAQ,GAAG,iBAAiB,EAC5B,CAAC;QACD,MAAM,oBAAoB,QAAQ,8CAA8C,iBAAiB,EAAE,CAAC;IACtG,CAAC;IACD,IAAI,IAAA,2BAAS,EAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvD,MAAM,oBAAoB,QAAQ,qBAAqB,CAAC;IAC1D,CAAC;IACD,OAAO;QACL,OAAO,EAAE,OAAO;QAChB,SAAS;QACT,QAAQ;QACR,YAAY;QACZ,uBAAuB;KACxB,CAAC;AACJ,CAAC,CAAC;AA3EW,QAAA,4BAA4B,gCA2EvC"}
|
|
@@ -21,12 +21,12 @@ const parseFieldFilter = (fieldParams = "*", allow_empty = true, all_cols) => {
|
|
|
21
21
|
/* string[] */
|
|
22
22
|
if (Array.isArray(fieldParams) && !fieldParams.find((f) => typeof f !== "string")) {
|
|
23
23
|
/*
|
|
24
|
-
|
|
24
|
+
["*"]
|
|
25
25
|
*/
|
|
26
26
|
if (fieldParams[0] === "*") {
|
|
27
27
|
return all_cols.slice(0);
|
|
28
28
|
/*
|
|
29
|
-
|
|
29
|
+
[""]
|
|
30
30
|
*/
|
|
31
31
|
}
|
|
32
32
|
else if (fieldParams[0] === "") {
|
|
@@ -37,7 +37,7 @@ const parseFieldFilter = (fieldParams = "*", allow_empty = true, all_cols) => {
|
|
|
37
37
|
throw "Empty value not allowed";
|
|
38
38
|
}
|
|
39
39
|
/*
|
|
40
|
-
|
|
40
|
+
["field1", "field2", "field3"]
|
|
41
41
|
*/
|
|
42
42
|
}
|
|
43
43
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseFieldFilter.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseFieldFilter.ts"],"names":[],"mappings":";;;AAAA,qDAAuD;AACvD,8CAA8C;AAE9C;;;;GAIG;AACI,MAAM,gBAAgB,GAAG,CAC9B,cAAoE,GAAG,EACvE,WAAW,GAAG,IAAI,EAClB,QAAqB,EACD,EAAE;IACtB,IAAI,QAAQ,GAAa,EAAE,CAAC;IAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAElD,IAAI,WAAW,EAAE,CAAC;QAChB;;UAEE;QACF,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YACpC,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,cAAc;QACd,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,EAAE,CAAC;YAClF;;cAEE;YACF,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC3B,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAoB,CAAC;gBAE5C;;kBAEE;YACJ,CAAC;iBAAM,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBACjC,IAAI,WAAW,EAAE,CAAC;oBAChB,OAAO,CAAC,EAAE,CAAC,CAAC;gBACd,CAAC;qBAAM,CAAC;oBACN,MAAM,yBAAyB,CAAC;gBAClC,CAAC;gBACD;;kBAEE;YACJ,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAgB,CAAC;YACjD,CAAC;YAED;;;cAGE;QACJ,CAAC;aAAM,IAAI,IAAA,0BAAa,EAAC,WAAW,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,IAAA,yBAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"parseFieldFilter.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseFieldFilter.ts"],"names":[],"mappings":";;;AAAA,qDAAuD;AACvD,8CAA8C;AAE9C;;;;GAIG;AACI,MAAM,gBAAgB,GAAG,CAC9B,cAAoE,GAAG,EACvE,WAAW,GAAG,IAAI,EAClB,QAAqB,EACD,EAAE;IACtB,IAAI,QAAQ,GAAa,EAAE,CAAC;IAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAElD,IAAI,WAAW,EAAE,CAAC;QAChB;;UAEE;QACF,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YACpC,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,cAAc;QACd,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,EAAE,CAAC;YAClF;;cAEE;YACF,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC3B,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAoB,CAAC;gBAE5C;;kBAEE;YACJ,CAAC;iBAAM,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBACjC,IAAI,WAAW,EAAE,CAAC;oBAChB,OAAO,CAAC,EAAE,CAAC,CAAC;gBACd,CAAC;qBAAM,CAAC;oBACN,MAAM,yBAAyB,CAAC;gBAClC,CAAC;gBACD;;kBAEE;YACJ,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAgB,CAAC;YACjD,CAAC;YAED;;;cAGE;QACJ,CAAC;aAAM,IAAI,IAAA,0BAAa,EAAC,WAAW,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,IAAA,yBAAO,EAAC,WAAkC,CAAC,CAAC,MAAM,EAAE,CAAC;gBACxD,OAAO,EAAgC,CAAC,CAAC,2CAA2C;YACtF,CAAC;YAED,MAAM,IAAI,GAAG,IAAA,yBAAO,EAClB,WAEC,CACa,CAAC;YACjB,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBACnB,IAAI,WAAW,EAAE,CAAC;oBAChB,OAAO,CAAC,EAAE,CAAC,CAAC;gBACd,CAAC;qBAAM,CAAC;oBACN,MAAM,yBAAyB,CAAC;gBAClC,CAAC;YACH,CAAC;YAED,QAAQ,CAAC,IAAI,CAAC,CAAC;YAEf,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACnB,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBACxC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAE,WAAmB,CAAC,GAAG,CAAC,CAAC;oBAClD,MAAM,wCAAwC,GAAG,KAAM,WAAmB,CAAC,GAAG,CAAC,0BAA0B,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACxI,CAAC,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,WAAmB,CAAC,GAAG,CAAC,CAAC,EAC7D,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAE,WAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;YAEhE,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBACtB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAoB,CAAC;YAChF,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,OAAO,CAAuB,CAAC;YAC5C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CACJ,4GAA4G;gBAC5G,aAAa,CACd,CAAC;QACJ,CAAC;QAED,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC;IACD,OAAO,QAA8B,CAAC;IAEtC,SAAS,QAAQ,CAAC,IAAc;QAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/D,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,oCAAoC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AA/FW,QAAA,gBAAgB,oBA+F3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareSortItems.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"prepareSortItems.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAMR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAe,MAAM,8BAA8B,CAAC;AAG9F,eAAO,MAAM,gBAAgB,eACf,OAAO,GAAG,SAAS,gBACjB,MAAM,EAAE,cACV,MAAM,GAAG,SAAS,UACtB,mBAAmB,EAAE,eAChB,YAAY,EAAE,KAC1B,QAAQ,EAoHV,CAAC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.prepareSortItems = void 0;
|
|
4
4
|
const dist_1 = require("prostgles-types/dist");
|
|
5
5
|
const QueryBuilder_1 = require("../QueryBuilder/QueryBuilder");
|
|
6
|
-
const JSONBValidation_1 = require("../../JSONBValidation/JSONBValidation");
|
|
7
6
|
/* This relates only to SELECT */
|
|
8
7
|
const prepareSortItems = (rawOrderBy, allowed_cols, tableAlias, select, joinQueries) => {
|
|
9
8
|
if (!rawOrderBy)
|
|
@@ -121,7 +120,7 @@ const parseOrderObj = (orderBy, expectOne = false) => {
|
|
|
121
120
|
}
|
|
122
121
|
const keys = Object.keys(orderBy);
|
|
123
122
|
if (typeof orderBy.key === "string") {
|
|
124
|
-
const { error, data } = (0,
|
|
123
|
+
const { error, data } = (0, dist_1.getJSONBObjectSchemaValidationError)({
|
|
125
124
|
key: "string",
|
|
126
125
|
asc: { enum: [1, -1, false, true, null], optional: true },
|
|
127
126
|
nulls: { enum: ["first", "last", null], optional: true },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareSortItems.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"prepareSortItems.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":";;;AAAA,+CAO8B;AAE9B,+DAA8F;AAE9F,iCAAiC;AAC1B,MAAM,gBAAgB,GAAG,CAC9B,UAA+B,EAC/B,YAAsB,EACtB,UAA8B,EAC9B,MAA6B,EAC7B,WAA2B,EACf,EAAE;IACd,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAE3B,IAAI,OAAO,GAKL,EAAE,CAAC;IACT,IAAI,IAAA,eAAQ,EAAC,UAAU,CAAC,EAAE,CAAC;QACzB,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;SAAM,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC1C,YAAY;QACZ,OAAO,GAAG,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7C,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACrC,2DAA2D;QAC3D,MAAM,QAAQ,GAAG,UAAmB,CAAC;QACrC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,EAAE,CAAC;YACjD,cAAc;YACd,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACxD,CAAC;aAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAQ,EAAC,CAAC,CAAC,IAAI,CAAC,IAAA,cAAO,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC;QAC5D,CAAC;;YAAM,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;;QAAM,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEnC,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,mBAAmB,GAAG,MAAM;SAC/B,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,cAAc;QACzB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CACxE;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAEvB,MAAM,qBAAqB,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CACvD,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAC3B,MAAM,SAAS,GAAG,EAAE,CAAC,UAAU,IAAI,EAAE,CAAC,KAAK,CAAC;QAC5C,OAAO;YACL,GAAG,EAAE;YACL,UAAU;YACV,SAAS;YACT,GAAG,EAAE,GAAG,SAAS,IAAI,UAAU,CAAC,KAAK,EAAE;SACxC,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IACF,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAC5B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CACV,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC;QACjD,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC;QAClC,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAC9B,CAAC;IACF,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,+CAA+C,GAAG,SAAS,CAAC,GAAG,CAAC;IACxE,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAE7E,MAAM,MAAM,GAAe,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAE,EAAE,EAAE;QAChF,MAAM,WAAW,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QACrE,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC;YAErD,MAAM,sBAAsB,GAC1B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7E,MAAM,aAAa,GAAG,IAAA,aAAM,EAAC,yBAAyB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;YAE1E,OAAO;gBACL,GAAG;gBACH,IAAI,EAAE,OAAO;gBACb,GAAG;gBACH,KAAK;gBACL,SAAS;gBACT,MAAM,EAAE;oBACN,KAAK;oBACL,SAAS;oBACT,eAAe,EAAE,UAAU,CAAC,KAAK;oBACjC,SAAS,EAAE,UAAU,CAAC,UAAU,KAAK,QAAQ;oBAC7C,oBAAoB,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,IAAA,0BAAW,EAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG,sBAAsB,QAAQ,aAAa,EAAE;iBACzI;gBACD,UAAU,EAAE,GAAG,IAAA,aAAM,EAAC,SAAS,CAAC,IAAI,aAAa,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,SAAS,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;aAC1I,CAAC;QACJ,CAAC;QACD;;UAEE;QAEF,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,MAAM,GACR,KAAK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,gBAAS,CAAC,CAAC,GAAG,CAAC,aAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9F,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,GAAG,eAAe,MAAM,cAAc,CAAC;QAC/C,CAAC;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,OAAO;gBACL,GAAG;gBACH,IAAI,EAAE,UAAU;gBAChB,GAAG;gBACH,KAAK;gBACL,SAAS;gBACT,aAAa,EAAE,MAAM;aACtB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG;YACH,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,MAAM;YAClB,KAAK;YACL,SAAS;YACT,GAAG;SACJ,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA1HW,QAAA,gBAAgB,oBA0H3B;AAEF,MAAM,QAAQ,GAAG,CAAC,UAAe,EAAE,EAAE;IACnC,MAAM,CACJ,8BAA8B;QAC9B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;QAC1B;;;;;yEAKqE,CACtE,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CACpB,OAAY,EACZ,SAAS,GAAG,KAAK,EAMf,EAAE;IACJ,IAAI,CAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,EAAE,CAAC;QACvB,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClC,IAAI,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAA,0CAAmC,EACzD;YACE,GAAG,EAAE,QAAQ;YACb,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE;YACzD,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE;YACxD,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE;SAChD,EACV,OAAO,EACP,SAAS,CACV,CAAC;QACF,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC;YAC3D,OAAO;gBACL;oBACE,GAAG;oBACH,GAAG,EAAE,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,CAAC;oBAC9B,KAAK,EAAE,KAAK,IAAI,SAAS;oBACzB,SAAS,EAAE,SAAS,IAAI,SAAS;iBAClC;aACF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM;gBACJ,KAAK;gBACL,2BAA2B,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG;gBAC9D,4GAA4G;aAC7G,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC;IACH,CAAC;IAED,IAAI,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,MAAM,CACJ,oBAAoB;YACpB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACvB,4DAA4D,CAC7D,CAAC;IACJ,CAAC;IACD,iCAAiC;IACjC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEhE,2BAA2B;IAC7B,CAAC;SAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QAE7D,mCAAmC;IACrC,CAAC;SAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC;;QAAM,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare const VALIDATE_SCHEMA_FUNCNAME = "validate_jsonb_schema";
|
|
2
2
|
export declare const JSONB_DATA_TYPES: readonly ["boolean", "number", "integer", "string", "Date", "time", "timestamp", "any", ...("number[]" | "boolean[]" | "string[]" | "any[]" | "time[]" | "timestamp[]" | "integer[]" | "Date[]")[], "Lookup", "Lookup[]"];
|
|
3
3
|
export declare const validate_jsonb_schema_sql: string;
|
|
4
|
-
//# sourceMappingURL=
|
|
4
|
+
//# sourceMappingURL=validateJSONBSchemaSQL.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validateJSONBSchemaSQL.d.ts","sourceRoot":"","sources":["../../lib/JSONBSchemaValidation/validateJSONBSchemaSQL.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,wBAAwB,0BAA0B,CAAC;AAChE,eAAO,MAAM,gBAAgB,2NAAiD,CAAC;AAE/E,eAAO,MAAM,yBAAyB,QAkerC,CAAC"}
|
|
@@ -495,4 +495,4 @@ SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "type": "Date"}', '"2222-22-22"');
|
|
|
495
495
|
|
|
496
496
|
SELECT ${exports.VALIDATE_SCHEMA_FUNCNAME}('{ "oneOf": ["number"]}','2');
|
|
497
497
|
`;
|
|
498
|
-
//# sourceMappingURL=
|
|
498
|
+
//# sourceMappingURL=validateJSONBSchemaSQL.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"
|
|
1
|
+
{"version":3,"file":"validateJSONBSchemaSQL.js","sourceRoot":"","sources":["../../lib/JSONBSchemaValidation/validateJSONBSchemaSQL.ts"],"names":[],"mappings":";;;AAAA,qDAA6C;AAC7C,4EAAyF;AAEzF,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC;;;;oBAIpB,GAAG;;CAEtB,CAAC;AAEW,QAAA,wBAAwB,GAAG,uBAAuB,CAAC;AACnD,QAAA,gBAAgB,GAAG,CAAC,GAAG,4BAAU,EAAE,QAAQ,EAAE,UAAU,CAAU,CAAC;AAElE,QAAA,yBAAyB,GAAG;;;IAGrC,uDAAkC;;;6BAGT,gCAAwB;;;;;;;;;;;;;6BAaxB,wBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAoDjD,cAAc,CAAC,yBAAyB,CAAC;;;;;;;;;;;;;MAazC,cAAc,CAAC,2GAA2G,CAAC;;;;;;;QAOzH,cAAc,CAAC,4BAA4B,CAAC;;;;;;;;;;;QAW5C,cAAc,CAAC,8EAA8E,CAAC;;;;QAI9F,cAAc,CAAC,8DAA8D,CAAC;;;;;;;;;;;aAWzE,gCAAwB;;;;;;;;;;aAUxB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;UAwB3B,cAAc,CAAC,yEAAyE,CAAC;;;;;;;;;YASvF,cAAc,CAAC,mDAAmD,CAAC;;;;;;;mBAO5D,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;YAyB/B,cAAc,CAAC,wFAAwF,CAAC;;;;;;;;cAQtG,cAAc,CAAC,iHAAiH,CAAC;;;;;;;;cAQjI,cAAc,CAAC,oIAAoI,CAAC;;;YAGtJ,cAAc,CAAC,oEAAoE,CAAC;;;;;;;;;;UAUtF,cAAc,CAAC,oCAAoC,CAAC;;;;;;;;;;UAUpD,cAAc,CAAC,2HAA2H,CAAC;;;;;;;;;;;cAWvI,cAAc,CAAC,oFAAoF,CAAC;;;oBAG9F,gCAAwB;;;;;;;;;;;;;;QAcpC,cAAc,CAAC,sEAAsE,CAAC;;;;;;;;;QAStF,cAAc,CAAC,iGAAiG,CAAC;;;;;;;;;;;aAW5G,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAuC/B,cAAc,CAAC,gEAAgE,CAAC;;;;;;;;QAQ9E,cAAc,CAAC,4BAA4B,CAAC;;;;;;;eAOrC,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;QAuB/B,cAAc,CAAC,kIAAkI,CAAC;;;;QAIlJ,cAAc,CAAC,6BAA6B,CAAC;;;;;;;6EAOwB,gCAAwB;;;;;;;oEAOjC,gCAAwB;;;;;;;;;MAStF,cAAc,CAAC,yCAAyC,CAAC;;;;;;;sBAOzC,gCAAwB,QAAQ,uDAAkC;;;;;;;;;;;;SAY/E,gCAAwB;;;;;;SAMxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;SAIxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;;;;;;;;;;;;SAgBxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;;;;SAKxB,gCAAwB;;SAExB,gCAAwB;;SAExB,gCAAwB;;;SAGxB,gCAAwB;SACxB,gCAAwB;SACxB,gCAAwB;SACxB,gCAAwB;SACxB,gCAAwB;SACxB,gCAAwB;;SAExB,gCAAwB;SACxB,gCAAwB;;;SAGxB,gCAAwB;CAChC,CAAC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getTableColumns = exports.getColumnDefinitionQuery = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const PubSubManagerUtils_1 = require("../PubSubManager/PubSubManagerUtils");
|
|
6
|
-
const
|
|
6
|
+
const validateJSONBSchemaSQL_1 = require("../JSONBSchemaValidation/validateJSONBSchemaSQL");
|
|
7
7
|
/**
|
|
8
8
|
* Column create statement for a given config
|
|
9
9
|
*/
|
|
@@ -28,7 +28,7 @@ const getColumnDefinitionQuery = async ({ colConf: colConfRaw, column, escapedCo
|
|
|
28
28
|
: jsonbSchema.jsonbSchema),
|
|
29
29
|
}) + "::TEXT";
|
|
30
30
|
/** Validate default value against jsonbSchema */
|
|
31
|
-
const validationQuery = `SELECT ${
|
|
31
|
+
const validationQuery = `SELECT ${validateJSONBSchemaSQL_1.VALIDATE_SCHEMA_FUNCNAME}(${jsonbSchemaStr}, ${(0, PubSubManagerUtils_1.asValue)(colConf.defaultValue) + "::JSONB"}, ${(0, PubSubManagerUtils_1.asValue)({ table, column })}) as v`;
|
|
32
32
|
if (colConf.defaultValue !== undefined) {
|
|
33
33
|
try {
|
|
34
34
|
const row = await db.oneOrNone(validationQuery);
|
|
@@ -43,7 +43,7 @@ const getColumnDefinitionQuery = async ({ colConf: colConfRaw, column, escapedCo
|
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
|
-
return `${getColTypeDef(colConf, "JSONB")} CHECK(${
|
|
46
|
+
return `${getColTypeDef(colConf, "JSONB")} CHECK(${validateJSONBSchemaSQL_1.VALIDATE_SCHEMA_FUNCNAME}(${jsonbSchemaStr}, ${colNameEsc}, ${(0, PubSubManagerUtils_1.asValue)({ table, column })} ))`;
|
|
47
47
|
}
|
|
48
48
|
else if ("references" in colConf && colConf.references) {
|
|
49
49
|
const { tableName: lookupTable, columnName: lookupCol = "id" } = colConf.references;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumnDefinitionQuery.js","sourceRoot":"","sources":["../../lib/TableConfig/getColumnDefinitionQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAmD;AAEnD,4EAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"getColumnDefinitionQuery.js","sourceRoot":"","sources":["../../lib/TableConfig/getColumnDefinitionQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAmD;AAEnD,4EAA8D;AAC9D,4FAA2F;AAa3F;;GAEG;AACI,MAAM,wBAAwB,GAAG,KAAK,EAAE,EAC7C,OAAO,EAAE,UAAU,EACnB,MAAM,EACN,iBAAiB,EACjB,EAAE,EACF,KAAK,EACL,WAAW,GACN,EAA+B,EAAE;IACtC,MAAM,OAAO,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;IAC5F,MAAM,UAAU,GAAG,iBAAiB,IAAI,IAAA,wBAAM,EAAC,MAAM,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,CAAC,OAAwB,EAAE,MAAwB,EAAE,EAAE;QAC3E,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QAC3C,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,IAAI,YAAY,CAAC,CAAC,CAAC,YAAY,IAAA,4BAAO,EAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAClH,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;QAC/B,MAAM,WAAW,GACf,aAAa,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;YAC/C,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,eAAe,EAAE,SAAS,EAAE;YAClE,CAAC,CAAC,iBAAiB,IAAI,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;gBACzD,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;gBACtE,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,cAAc,GAClB,IAAA,4BAAO,EAAC;gBACN,GAAG,IAAA,0BAAQ,EAAC,OAAO,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;gBAClD,GAAG,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;oBAC/B,EAAE,IAAI,EAAE,WAAW,CAAC,eAAe,EAAE;oBACvC,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC;aAC3B,CAAC,GAAG,QAAQ,CAAC;YAEhB,kDAAkD;YAClD,MAAM,eAAe,GAAG,UAAU,iDAAwB,IAAI,cAAc,KAAK,IAAA,4BAAO,EAAC,OAAO,CAAC,YAAY,CAAC,GAAG,SAAS,KAAK,IAAA,4BAAO,EAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC;YAClK,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gBACvC,IAAI,CAAC;oBACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,SAAS,CAAyB,eAAe,CAAC,CAAC;oBACxE,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;wBACZ,MAAM,OAAO,CAAC;oBAChB,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM;wBACJ,GAAG,EAAE,kBAAkB,OAAO,CAAC,YAAY,SAAS,KAAK,IAAI,MAAM,iDAAiD,eAAe,EAAE;wBACrI,GAAG,EAAE,CAAC;qBACP,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,OAAO,GAAG,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,iDAAwB,IAAI,cAAc,KAAK,UAAU,KAAK,IAAA,4BAAO,EAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC;QACnJ,CAAC;aAAM,IAAI,YAAY,IAAI,OAAO,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACzD,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;YACpF,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,eAAe,WAAW,KAAK,SAAS,IAAI,CAAC;QAClG,CAAC;aAAM,IAAI,eAAe,IAAI,OAAO,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/D,OAAO,GAAG,OAAO,CAAC,aAAa,GAAG,CAAC;QACrC,CAAC;aAAM,IAAI,QAAQ,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACjD,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,MAAM,SAAS,GAAa,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;gBACvB,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,YAAY,UAAU,GAAG,CAAC,CAAC;YACzD,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,YAAY,UAAU,GAAG,CAAC,CAAC;YACzD,CAAC;YACD,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACrB,MAAM,GAAG,UAAU,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;YAChD,CAAC;YACD,OAAO,GAAG,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvD,CAAC;aAAM,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YAC7E,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;YAChF,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,UAAU,MAAM,IAAA,4BAAO,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrF,OAAO,GAAG,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,IAAI,cAAc,IAAI,OAAO,CAAC,CAAC,CAAC,YAAY,IAAA,4BAAO,EAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,MAAM,GAAG,CAAC;QAC1J,CAAC;aAAM,CAAC;YACN,OAAO,SAAS,CAAC;YACjB,6DAA6D;QAC/D,CAAC;IACH,CAAC,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;IACzC,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAClC,OAAO,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,UAAU,EAAE,CAAC;AAClE,CAAC,CAAC;AAhFW,QAAA,wBAAwB,4BAgFnC;AAUK,MAAM,eAAe,GAAG,CAAC,EAC9B,EAAE,EACF,KAAK,GAIN,EAAgC,EAAE;IACjC,OAAO,EAAE,CAAC,UAAU,CAClB;;;;;;;GAOD,EACC,CAAC,KAAK,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,eAAe,mBAkB1B"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTableColumnQueries = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
-
const
|
|
5
|
+
const validateJSONBSchemaSQL_1 = require("../JSONBSchemaValidation/validateJSONBSchemaSQL");
|
|
6
6
|
const getColumnDefinitionQuery_1 = require("./getColumnDefinitionQuery");
|
|
7
7
|
const getFutureTableSchema_1 = require("./getFutureTableSchema");
|
|
8
8
|
/**
|
|
@@ -26,7 +26,7 @@ const getTableColumnQueries = async ({ db, tableConf, tableName, tableHandler, }
|
|
|
26
26
|
/** Must install validation function */
|
|
27
27
|
if (hasJSONBValidation) {
|
|
28
28
|
try {
|
|
29
|
-
await db.any(
|
|
29
|
+
await db.any(validateJSONBSchemaSQL_1.validate_jsonb_schema_sql);
|
|
30
30
|
}
|
|
31
31
|
catch (err) {
|
|
32
32
|
console.error("Could not install the jsonb validation function due to error: ", err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTableColumnQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getTableColumnQueries.ts"],"names":[],"mappings":";;;AAAA,qDAAyF;AACzF,
|
|
1
|
+
{"version":3,"file":"getTableColumnQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getTableColumnQueries.ts"],"names":[],"mappings":"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"}
|
package/lib/DBSchemaBuilder.ts
CHANGED
|
@@ -2,6 +2,7 @@ import {
|
|
|
2
2
|
AnyObject,
|
|
3
3
|
DbJoinMaker,
|
|
4
4
|
DBSchema,
|
|
5
|
+
getJSONBSchemaTSTypes,
|
|
5
6
|
isObject,
|
|
6
7
|
JSONB,
|
|
7
8
|
SQLHandler,
|
|
@@ -18,7 +19,6 @@ import {
|
|
|
18
19
|
PublishViewRule,
|
|
19
20
|
type PublishObject,
|
|
20
21
|
} from "./PublishParser/PublishParser";
|
|
21
|
-
import { getJSONBSchemaTSTypes } from "./JSONBValidation/getJSONBSchemaTSTypes";
|
|
22
22
|
import { DBHandlerServer, TableSchemaColumn, TX } from "./DboBuilder/DboBuilderTypes";
|
|
23
23
|
|
|
24
24
|
export const getDBSchema = (dboBuilder: DboBuilder): string => {
|
|
@@ -139,21 +139,21 @@ export type PublishFullyTyped<Schema = void> =
|
|
|
139
139
|
|
|
140
140
|
/** Type checks */
|
|
141
141
|
() => {
|
|
142
|
-
const ddb
|
|
142
|
+
const ddb = {} as DBOFullyTyped;
|
|
143
143
|
ddb.dwad?.insert;
|
|
144
144
|
ddb.dwad?.delete;
|
|
145
145
|
|
|
146
|
-
const d
|
|
146
|
+
const d = {} as DBOFullyTyped<undefined>;
|
|
147
147
|
d.dwad?.insert;
|
|
148
148
|
d.dwad?.delete;
|
|
149
149
|
|
|
150
|
-
const p
|
|
150
|
+
const p = {} as PublishParams;
|
|
151
151
|
p.dbo.dwad?.insert;
|
|
152
152
|
ddb.dwad?.delete;
|
|
153
153
|
|
|
154
154
|
//@ts-ignore
|
|
155
155
|
void prostgles({
|
|
156
|
-
dbConnection:
|
|
156
|
+
dbConnection: "",
|
|
157
157
|
publish: async (params) => {
|
|
158
158
|
const _rows = await params.dbo.dwadwa?.find?.({});
|
|
159
159
|
|
|
@@ -172,7 +172,7 @@ export type PublishFullyTyped<Schema = void> =
|
|
|
172
172
|
sidKeyName: "sid_token",
|
|
173
173
|
getUser: (sid, db, _db) => {
|
|
174
174
|
db.dwadaw?.find;
|
|
175
|
-
return
|
|
175
|
+
return {};
|
|
176
176
|
},
|
|
177
177
|
};
|
|
178
178
|
|
|
@@ -192,15 +192,15 @@ export type PublishFullyTyped<Schema = void> =
|
|
|
192
192
|
};
|
|
193
193
|
|
|
194
194
|
/** Test the created schema */
|
|
195
|
-
const c
|
|
195
|
+
const c = {} as S;
|
|
196
196
|
const _test: DBSchema = c;
|
|
197
|
-
const dbt
|
|
197
|
+
const dbt = {} as DBOFullyTyped<S>;
|
|
198
198
|
|
|
199
199
|
void dbt.tx((t) => {
|
|
200
200
|
void t.tbl1.delete();
|
|
201
201
|
});
|
|
202
202
|
|
|
203
|
-
const db
|
|
203
|
+
const db = {} as DBHandlerServer;
|
|
204
204
|
void db.tx!((t) => {
|
|
205
205
|
void t.wadwa?.find!();
|
|
206
206
|
});
|
|
@@ -246,7 +246,7 @@ export type PublishFullyTyped<Schema = void> =
|
|
|
246
246
|
};
|
|
247
247
|
const _res1: PublishFullyTyped = r;
|
|
248
248
|
|
|
249
|
-
const p
|
|
249
|
+
const p = {} as PublishParams<undefined>;
|
|
250
250
|
|
|
251
251
|
void p.dbo.dwadaw?.find?.();
|
|
252
252
|
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
import {
|
|
7
7
|
PG_COLUMN_UDT_DATA_TYPE,
|
|
8
8
|
SQLOptions,
|
|
9
|
+
getJSONBTSTypes,
|
|
9
10
|
getJoinHandlers,
|
|
10
11
|
getObjectEntries,
|
|
11
12
|
getSerialisableError,
|
|
@@ -42,7 +43,6 @@ import {
|
|
|
42
43
|
import { getTablesForSchemaPostgresSQL } from "./getTablesForSchemaPostgresSQL";
|
|
43
44
|
import { prepareShortestJoinPaths } from "./prepareShortestJoinPaths";
|
|
44
45
|
import { cacheDBTypes, runSQL } from "./runSQL";
|
|
45
|
-
import { getJSONBTSTypes } from "../JSONBValidation/getJSONBSchemaTSTypes";
|
|
46
46
|
|
|
47
47
|
export * from "./DboBuilderTypes";
|
|
48
48
|
export * from "./dboBuilderUtils";
|
|
@@ -198,9 +198,11 @@ export class DboBuilder {
|
|
|
198
198
|
options: SQLOptions | undefined,
|
|
199
199
|
localParams: LocalParams | undefined
|
|
200
200
|
) => {
|
|
201
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
|
|
201
202
|
return runSQL
|
|
202
203
|
.bind(this)(query, params, options, localParams)
|
|
203
204
|
.catch((error) =>
|
|
205
|
+
// eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
|
|
204
206
|
Promise.reject(
|
|
205
207
|
getSerializedClientErrorFromPGError(error, {
|
|
206
208
|
type: "sql",
|
|
@@ -1,5 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import {
|
|
2
|
+
getJSONBObjectSchemaValidationError,
|
|
3
|
+
isDefined,
|
|
4
|
+
isEmpty,
|
|
5
|
+
type SubscribeOptions,
|
|
6
|
+
} from "prostgles-types";
|
|
3
7
|
import { type Required_ish, type SubscribeRule } from "../../PublishParser/PublishParser";
|
|
4
8
|
|
|
5
9
|
export const getValidatedSubscribeOptions = (
|
|
@@ -25,13 +25,13 @@ export const parseFieldFilter = <AllowedKeys extends string[]>(
|
|
|
25
25
|
/* string[] */
|
|
26
26
|
if (Array.isArray(fieldParams) && !fieldParams.find((f) => typeof f !== "string")) {
|
|
27
27
|
/*
|
|
28
|
-
|
|
28
|
+
["*"]
|
|
29
29
|
*/
|
|
30
30
|
if (fieldParams[0] === "*") {
|
|
31
31
|
return all_cols.slice(0) as typeof all_cols;
|
|
32
32
|
|
|
33
33
|
/*
|
|
34
|
-
|
|
34
|
+
[""]
|
|
35
35
|
*/
|
|
36
36
|
} else if (fieldParams[0] === "") {
|
|
37
37
|
if (allow_empty) {
|
|
@@ -40,7 +40,7 @@ export const parseFieldFilter = <AllowedKeys extends string[]>(
|
|
|
40
40
|
throw "Empty value not allowed";
|
|
41
41
|
}
|
|
42
42
|
/*
|
|
43
|
-
|
|
43
|
+
["field1", "field2", "field3"]
|
|
44
44
|
*/
|
|
45
45
|
} else {
|
|
46
46
|
colNames = fieldParams.slice(0) as AllowedKeys;
|
|
@@ -51,7 +51,7 @@ export const parseFieldFilter = <AllowedKeys extends string[]>(
|
|
|
51
51
|
{ field1: false, field2: false } = all fields except field1 and field2
|
|
52
52
|
*/
|
|
53
53
|
} else if (isPlainObject(fieldParams)) {
|
|
54
|
-
if (!getKeys(fieldParams).length) {
|
|
54
|
+
if (!getKeys(fieldParams as Record<string, any>).length) {
|
|
55
55
|
return [] as unknown as typeof all_cols; //all_fields.slice(0) as typeof all_fields;
|
|
56
56
|
}
|
|
57
57
|
|