prostgles-server 3.0.155 → 4.0.1
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/AuthHandler.d.ts.map +1 -1
- package/dist/AuthHandler.js +6 -3
- package/dist/AuthHandler.js.map +1 -1
- package/dist/DBEventsManager.d.ts.map +1 -1
- package/dist/DBEventsManager.js +5 -4
- package/dist/DBEventsManager.js.map +1 -1
- package/dist/DBSchemaBuilder.js +14 -14
- package/dist/DBSchemaBuilder.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions.js +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/makeSelectQuery.js.map +1 -1
- package/dist/DboBuilder/TableHandler.js +1 -2
- package/dist/DboBuilder/TableHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler.js +10 -8
- package/dist/DboBuilder/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/getCondition.js +1 -1
- package/dist/DboBuilder/getCondition.js.map +1 -1
- package/dist/DboBuilder/insert.js +1 -1
- package/dist/DboBuilder/insert.js.map +1 -1
- package/dist/DboBuilder/insertDataParse.js +4 -3
- package/dist/DboBuilder/insertDataParse.js.map +1 -1
- package/dist/DboBuilder/subscribe.d.ts +2 -2
- package/dist/DboBuilder/subscribe.d.ts.map +1 -1
- package/dist/DboBuilder/subscribe.js +3 -4
- package/dist/DboBuilder/subscribe.js.map +1 -1
- package/dist/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder.js +5 -4
- package/dist/DboBuilder.js.map +1 -1
- package/dist/FileManager.js +1 -1
- package/dist/FileManager.js.map +1 -1
- package/dist/Filtering.js.map +1 -1
- package/dist/JSONBValidation/validation.js.map +1 -1
- package/dist/Prostgles.js +1 -1
- package/dist/Prostgles.js.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts +9 -2
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js +16 -46
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PubSubManager/addSub.d.ts +2 -1
- package/dist/PubSubManager/addSub.d.ts.map +1 -1
- package/dist/PubSubManager/addSub.js +26 -16
- package/dist/PubSubManager/addSub.js.map +1 -1
- package/dist/PubSubManager/notifListener.d.ts.map +1 -1
- package/dist/PubSubManager/notifListener.js +5 -3
- package/dist/PubSubManager/notifListener.js.map +1 -1
- package/dist/PubSubManager/pushSubData.d.ts +3 -0
- package/dist/PubSubManager/pushSubData.d.ts.map +1 -0
- package/dist/PubSubManager/pushSubData.js +48 -0
- package/dist/PubSubManager/pushSubData.js.map +1 -0
- package/dist/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser.js +4 -3
- package/dist/PublishParser.js.map +1 -1
- package/dist/TableConfig/TableConfig.js.map +1 -1
- package/dist/TableConfig/getConstraintDefinitionQueries.js.map +1 -1
- package/dist/TableConfig/getTableColumnQueries.js.map +1 -1
- package/lib/AuthHandler.d.ts.map +1 -1
- package/lib/AuthHandler.js +6 -3
- package/lib/AuthHandler.ts +12 -7
- package/lib/DBEventsManager.d.ts.map +1 -1
- package/lib/DBEventsManager.js +5 -4
- package/lib/DBEventsManager.ts +10 -9
- package/lib/DBSchemaBuilder.js +14 -14
- package/lib/DBSchemaBuilder.ts +14 -14
- package/lib/DboBuilder/QueryBuilder/Functions.js +1 -1
- package/lib/DboBuilder/QueryBuilder/Functions.ts +2 -2
- package/lib/DboBuilder/QueryBuilder/makeSelectQuery.ts +1 -1
- package/lib/DboBuilder/TableHandler.js +1 -2
- package/lib/DboBuilder/TableHandler.ts +3 -3
- package/lib/DboBuilder/ViewHandler.d.ts.map +1 -1
- package/lib/DboBuilder/ViewHandler.js +10 -8
- package/lib/DboBuilder/ViewHandler.ts +22 -20
- package/lib/DboBuilder/getCondition.js +1 -1
- package/lib/DboBuilder/getCondition.ts +2 -2
- package/lib/DboBuilder/insert.js +1 -1
- package/lib/DboBuilder/insert.ts +1 -1
- package/lib/DboBuilder/insertDataParse.js +4 -3
- package/lib/DboBuilder/insertDataParse.ts +15 -13
- package/lib/DboBuilder/subscribe.d.ts +2 -2
- package/lib/DboBuilder/subscribe.d.ts.map +1 -1
- package/lib/DboBuilder/subscribe.js +3 -4
- package/lib/DboBuilder/subscribe.ts +8 -9
- package/lib/DboBuilder.d.ts.map +1 -1
- package/lib/DboBuilder.js +5 -4
- package/lib/DboBuilder.ts +15 -21
- package/lib/FileManager.js +1 -1
- package/lib/FileManager.ts +5 -5
- package/lib/Filtering.ts +1 -1
- package/lib/JSONBValidation/validation.ts +3 -3
- package/lib/Prostgles.js +1 -1
- package/lib/Prostgles.ts +3 -3
- package/lib/PubSubManager/PubSubManager.d.ts +8 -1
- package/lib/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/lib/PubSubManager/PubSubManager.js +14 -44
- package/lib/PubSubManager/PubSubManager.ts +17 -44
- package/lib/PubSubManager/addSub.d.ts +2 -1
- package/lib/PubSubManager/addSub.d.ts.map +1 -1
- package/lib/PubSubManager/addSub.js +26 -16
- package/lib/PubSubManager/addSub.ts +28 -20
- package/lib/PubSubManager/notifListener.d.ts.map +1 -1
- package/lib/PubSubManager/notifListener.js +5 -3
- package/lib/PubSubManager/notifListener.ts +5 -3
- package/lib/PubSubManager/pushSubData.d.ts +3 -0
- package/lib/PubSubManager/pushSubData.d.ts.map +1 -0
- package/lib/PubSubManager/pushSubData.js +47 -0
- package/lib/PubSubManager/pushSubData.ts +47 -0
- package/lib/PublishParser.d.ts.map +1 -1
- package/lib/PublishParser.js +4 -3
- package/lib/PublishParser.ts +4 -3
- package/lib/TableConfig/TableConfig.ts +7 -7
- package/lib/TableConfig/getConstraintDefinitionQueries.ts +1 -1
- package/lib/TableConfig/getTableColumnQueries.ts +2 -2
- package/package.json +2 -2
- package/tests/client/PID.txt +1 -1
- package/tests/client/package-lock.json +15 -15
- package/tests/client/package.json +1 -1
- package/tests/server/DBoGenerated.d.ts +2 -2
- package/tests/server/package-lock.json +3 -3
- package/tsconfig.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTableColumnQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getTableColumnQueries.ts"],"names":[],"mappings":";;;AAAA,qDAA+E;AAE/E,4FAAyF;AACzF,yEAAuF;AAGvF,iEAA8D;AASvD,MAAM,qBAAqB,GAAG,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAQ,EAKzF,EAAE;IAEH,IAAI,aAAa,GAAa,EAAE,CAAC;IACjC,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,MAAM,iBAAiB,GAAa,EAAE,CAAC;IACvC,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,IAAI,SAAS,IAAI,SAAS,IAAI,SAAS,CAAC,OAAO,EAAE;QAE/C,MAAM,kBAAkB,GAAG,IAAA,yBAAO,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC7D,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;YACrC,OAAO,KAAK,IAAI,IAAA,0BAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;QACjF,CAAC,CAAC,CAAC;QAEH,uCAAuC;QACvC,IAAG,kBAAkB,EAAC;YACpB,IAAI;gBACF,MAAM,EAAE,CAAC,GAAG,CAAC,qDAAyB,CAAC,CAAC;aACzC;YAAC,OAAM,GAAQ,EAAC;gBACf,OAAO,CAAC,KAAK,CAAC,gEAAgE,EAAE,GAAG,CAAC,CAAC;gBACrF,MAAM,GAAG,CAAC;aACX;SACF;QAED,MAAM,OAAO,GAAG,IAAA,yBAAO,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YACpD,MAAM,MAAM,GAAG,SAAS,CAAC,OAAQ,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"getTableColumnQueries.js","sourceRoot":"","sources":["../../lib/TableConfig/getTableColumnQueries.ts"],"names":[],"mappings":"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"}
|
package/lib/AuthHandler.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["AuthHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,EAAE,SAAS,EAAoE,MAAM,iBAAiB,CAAC;AAC9G,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAc,SAAS,EAAE,MAAM,aAAa,CAAC;AACzE,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AACnC,KAAK,gBAAgB,GAAG;IACtB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,KAAK,UAAU,GAAG,OAAO,CAAC;AAC1B,KAAK,UAAU,GAAG,QAAQ,CAAC;AAE3B,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IAEzB,iCAAiC;IACjC,GAAG,EAAE,MAAM,CAAC;IAEZ,iCAAiC;IACjC,OAAO,EAAE,MAAM,CAAC;IAEhB,iBAAiB;IACjB,YAAY,EAAE,UAAU,GAAG,YAAY,CAAC;CACzC,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,UAAU,CAAA;CAAE,CAAC;AAC1E,MAAM,MAAM,WAAW,CAAC,UAAU,SAAS,SAAS,GAAG,SAAS,EAAE,UAAU,SAAS,SAAS,GAAG,SAAS,IAAI;IAC5G;;SAEK;IACL,IAAI,EAAE,UAAU,CAAC;IACjB;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;CACxB,CAAA;AAED,MAAM,MAAM,UAAU,CAAC,EAAE,GAAG,WAAW,IAAI,EAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;CAAE,GAAG;IACjE,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,SAAS,CAAA;AAGb,MAAM,MAAM,iBAAiB,CAAC,CAAC,EAAE,KAAK,SAAS,WAAW,IAAI;IAAE,EAAE,EAAE,EAAE,CAAC;IAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;CAAE,CAAA;AAE1I,MAAM,MAAM,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,IAAI;IACpE;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,aAAa,CAAC,EAAE;QACd;;WAEG;QACH,GAAG,EAAE,OAAO,CAAC;QAEb;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB;;WAEG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;QAEvB;;WAEG;QACH,aAAa,CAAC,EAAE,SAAS,CAAC;QAE1B;;WAEG;QACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;QAEjC;;;WAGG;QACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QAExB;;;WAGG;QACH,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE;YAAE,GAAG,EAAE,UAAU,CAAC;YAAC,GAAG,EAAE,UAAU,CAAC;YAAC,IAAI,EAAE,YAAY,CAAA;SAAE,GAAG,iBAAiB,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7H;;;WAGG;QACH,cAAc,CAAC,EAAE,CACf,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,UAAU,EACf,MAAM,EAAE,iBAAiB,CAAC,CAAC,EAAE,KAAK,CAAC,KAChC,GAAG,CAAC;QAET;;;WAGG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;QAEnB,UAAU,CAAC,EAAE;YAEX;;eAEG;YACH,KAAK,CAAC,EAAE,MAAM,CAAC;YAEf;;eAEG;YACH,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,eAAe,KAAK,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC;SACzH,CAAA;KAEF,CAAA;IAED;;OAEG;IACH,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,iBAAiB,KAAK,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAE7H,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,SAAS,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;IACxG,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,eAAe,KAAK,SAAS,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;IAC9H,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,SAAS,CAAC,GAAG,CAAC,CAAC;IAEpF;;OAEG;IACH,YAAY,CAAC,EAAE;QACb,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,SAAS,CAAC,YAAY,CAAC,CAAA;KAChG,CAAA;CACF,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;IACtB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;IACP,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,MAAM,EAAE;QACN,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE;YACX,KAAK,EAAE,MAAM,CAAC;YACd,YAAY,EAAE,MAAM,CAAC;SACtB,CAAA;QACD,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;KACxB,CAEA;gBAEW,SAAS,EAAE,SAAS;IAsBhC,WAAW,QAAS,MAAM,GAAG,SAAS,YAIrC;IAED,YAAY,UAAW,MAAM,GAAG,SAAS,mBAAmB,MAAM,aAKjE;IAED,WAAW,aAAc,MAAM,aAW9B;IAED,OAAO,CAAC,8BAA8B,CAmCrC;IAED,OAAO,cAAqB;QAAE,OAAO,EAAE,UAAU,CAAC;KAAE,KAAG,QAAQ,UAAU,CAAC,CAczE;IAEK,IAAI;IA4JV,OAAO,aAIN;IAED,aAAa,+DA8BZ;IAED,cAAc,WAAkB,SAAS,UAAU,eAAe,KAAG,QAAQ,YAAY,CAAC,CAqBzF;IAGD;;;;;OAKG;IACH,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS;
|
|
1
|
+
{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["AuthHandler.ts"],"names":[],"mappings":"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"}
|
package/lib/AuthHandler.js
CHANGED
|
@@ -40,7 +40,7 @@ class AuthHandler {
|
|
|
40
40
|
};
|
|
41
41
|
matchesRoute = (route, clientFullRoute) => {
|
|
42
42
|
return route && clientFullRoute && (route === clientFullRoute ||
|
|
43
|
-
clientFullRoute.startsWith(route) && ["/", "?", "#"].includes(clientFullRoute[route.length]));
|
|
43
|
+
clientFullRoute.startsWith(route) && ["/", "?", "#"].includes(clientFullRoute[route.length] ?? ""));
|
|
44
44
|
};
|
|
45
45
|
isUserRoute = (pathname) => {
|
|
46
46
|
const pubRoutes = [
|
|
@@ -324,9 +324,12 @@ class AuthHandler {
|
|
|
324
324
|
else
|
|
325
325
|
throw "socket OR httpReq missing from localParams";
|
|
326
326
|
function parseCookieStr(cookie_str) {
|
|
327
|
-
if (!cookie_str || typeof cookie_str !== "string")
|
|
327
|
+
if (!cookie_str || typeof cookie_str !== "string") {
|
|
328
328
|
return {};
|
|
329
|
-
|
|
329
|
+
}
|
|
330
|
+
return cookie_str.replace(/\s/g, '')
|
|
331
|
+
.split(";")
|
|
332
|
+
.reduce((prev, current) => {
|
|
330
333
|
const [name, value] = current.split('=');
|
|
331
334
|
prev[name] = value;
|
|
332
335
|
return prev;
|
package/lib/AuthHandler.ts
CHANGED
|
@@ -201,7 +201,7 @@ export default class AuthHandler {
|
|
|
201
201
|
matchesRoute = (route: string | undefined, clientFullRoute: string) => {
|
|
202
202
|
return route && clientFullRoute && (
|
|
203
203
|
route === clientFullRoute ||
|
|
204
|
-
clientFullRoute.startsWith(route) && ["/", "?", "#"].includes(clientFullRoute[route.length])
|
|
204
|
+
clientFullRoute.startsWith(route) && ["/", "?", "#"].includes(clientFullRoute[route.length] ?? "")
|
|
205
205
|
)
|
|
206
206
|
}
|
|
207
207
|
|
|
@@ -519,12 +519,17 @@ export default class AuthHandler {
|
|
|
519
519
|
} else throw "socket OR httpReq missing from localParams";
|
|
520
520
|
|
|
521
521
|
function parseCookieStr(cookie_str: string | undefined): any {
|
|
522
|
-
if (!cookie_str || typeof cookie_str !== "string")
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
522
|
+
if (!cookie_str || typeof cookie_str !== "string") {
|
|
523
|
+
return {}
|
|
524
|
+
}
|
|
525
|
+
|
|
526
|
+
return cookie_str.replace(/\s/g, '')
|
|
527
|
+
.split(";")
|
|
528
|
+
.reduce<AnyObject>((prev, current) => {
|
|
529
|
+
const [name, value] = current.split('=');
|
|
530
|
+
prev[name!] = value;
|
|
531
|
+
return prev;
|
|
532
|
+
}, {});
|
|
528
533
|
}
|
|
529
534
|
}
|
|
530
535
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBEventsManager.d.ts","sourceRoot":"","sources":["DBEventsManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAqB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,qBAAa,eAAe;IAE1B,QAAQ,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,aAAa,EAAE,MAAM,CAAC;YACtB,OAAO,EAAE,GAAG,EAAE,CAAC;YACf,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC;YAC1C,QAAQ,EAAE,0BAA0B,CAAC;SACtC,CAAA;KACF,CAAM;IAEP,MAAM,EAAE;QACN,aAAa,EAAE,MAAM,CAAC;QACtB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,OAAO,EAAE,GAAG,EAAE,CAAC;KAChB,CAIC;IAEF,YAAY,CAAC,EAAE,0BAA0B,CAAC;IAE1C,KAAK,EAAE,EAAE,CAAC;IACV,GAAG,EAAE,GAAG,CAAA;gBACI,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG;IAK/B,OAAO,CAAC,OAAO,CAgBd;IAED,QAAQ,WAAY,GAAG,UAMtB;IAED,mBAAmB,YAAmB,MAAM,kBAG3C;IAEK,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC;QACzE,aAAa,EAAE,MAAM,CAAC;QACtB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;KAC1B,CAAC;IAmEF,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"DBEventsManager.d.ts","sourceRoot":"","sources":["DBEventsManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAqB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,qBAAa,eAAe;IAE1B,QAAQ,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,aAAa,EAAE,MAAM,CAAC;YACtB,OAAO,EAAE,GAAG,EAAE,CAAC;YACf,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC;YAC1C,QAAQ,EAAE,0BAA0B,CAAC;SACtC,CAAA;KACF,CAAM;IAEP,MAAM,EAAE;QACN,aAAa,EAAE,MAAM,CAAC;QACtB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,OAAO,EAAE,GAAG,EAAE,CAAC;KAChB,CAIC;IAEF,YAAY,CAAC,EAAE,0BAA0B,CAAC;IAE1C,KAAK,EAAE,EAAE,CAAC;IACV,GAAG,EAAE,GAAG,CAAA;gBACI,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG;IAK/B,OAAO,CAAC,OAAO,CAgBd;IAED,QAAQ,WAAY,GAAG,UAMtB;IAED,mBAAmB,YAAmB,MAAM,kBAG3C;IAEK,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC;QACzE,aAAa,EAAE,MAAM,CAAC;QACtB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;KAC1B,CAAC;IAmEF,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,GAAG;IAmBhE,SAAS,CAAC,MAAM,EAAE,YAAY;;;;IAiB9B,YAAY,CAAC,MAAM,EAAE,YAAY;CAIlC"}
|
package/lib/DBEventsManager.js
CHANGED
|
@@ -19,7 +19,7 @@ class DBEventsManager {
|
|
|
19
19
|
}
|
|
20
20
|
onNotif = ({ channel, payload }) => {
|
|
21
21
|
// console.log(36, { channel, payload }, Object.keys(this.notifies));
|
|
22
|
-
|
|
22
|
+
(0, prostgles_types_1.getKeys)(this.notifies)
|
|
23
23
|
.filter(ch => ch === channel)
|
|
24
24
|
.map(ch => {
|
|
25
25
|
const sub = this.notifies[ch];
|
|
@@ -102,12 +102,13 @@ class DBEventsManager {
|
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
104
|
removeNotify(channel, socket, func) {
|
|
105
|
-
|
|
105
|
+
const notifChannel = channel && this.notifies[channel];
|
|
106
|
+
if (notifChannel) {
|
|
106
107
|
if (socket) {
|
|
107
|
-
|
|
108
|
+
notifChannel.sockets = notifChannel.sockets.filter(s => s.id !== socket.id);
|
|
108
109
|
}
|
|
109
110
|
else if (func) {
|
|
110
|
-
|
|
111
|
+
notifChannel.localFuncs = notifChannel.localFuncs.filter(f => f !== func);
|
|
111
112
|
}
|
|
112
113
|
/* UNLISTEN if no listeners ?? */
|
|
113
114
|
}
|
package/lib/DBEventsManager.ts
CHANGED
|
@@ -37,10 +37,10 @@ export class DBEventsManager {
|
|
|
37
37
|
|
|
38
38
|
// console.log(36, { channel, payload }, Object.keys(this.notifies));
|
|
39
39
|
|
|
40
|
-
|
|
40
|
+
getKeys(this.notifies)
|
|
41
41
|
.filter(ch => ch === channel)
|
|
42
42
|
.map(ch => {
|
|
43
|
-
const sub = this.notifies[ch]
|
|
43
|
+
const sub = this.notifies[ch]!;
|
|
44
44
|
|
|
45
45
|
sub.sockets.map(s => {
|
|
46
46
|
s.emit(sub.socketChannel, payload)
|
|
@@ -113,11 +113,11 @@ export class DBEventsManager {
|
|
|
113
113
|
}
|
|
114
114
|
|
|
115
115
|
} else {
|
|
116
|
-
if(socket && !this.notifies[notifChannel]
|
|
117
|
-
this.notifies[notifChannel]
|
|
116
|
+
if(socket && !this.notifies[notifChannel]!.sockets.find(s => s.id === socket.id)) {
|
|
117
|
+
this.notifies[notifChannel]!.sockets.push(socket);
|
|
118
118
|
|
|
119
119
|
} else if(func) {
|
|
120
|
-
this.notifies[notifChannel]
|
|
120
|
+
this.notifies[notifChannel]!.localFuncs.push(func);
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
123
|
|
|
@@ -137,11 +137,12 @@ export class DBEventsManager {
|
|
|
137
137
|
}
|
|
138
138
|
|
|
139
139
|
removeNotify(channel?: string, socket?: PRGLIOSocket, func?: any){
|
|
140
|
-
|
|
140
|
+
const notifChannel = channel && this.notifies[channel]
|
|
141
|
+
if(notifChannel){
|
|
141
142
|
if(socket){
|
|
142
|
-
|
|
143
|
+
notifChannel.sockets = notifChannel.sockets.filter(s => s.id !== socket.id);
|
|
143
144
|
} else if(func){
|
|
144
|
-
|
|
145
|
+
notifChannel.localFuncs = notifChannel.localFuncs.filter(f => f !== func);
|
|
145
146
|
}
|
|
146
147
|
|
|
147
148
|
/* UNLISTEN if no listeners ?? */
|
|
@@ -149,7 +150,7 @@ export class DBEventsManager {
|
|
|
149
150
|
|
|
150
151
|
if(socket){
|
|
151
152
|
getKeys(this.notifies).forEach(channel => {
|
|
152
|
-
this.notifies[channel]
|
|
153
|
+
this.notifies[channel]!.sockets = this.notifies[channel]!.sockets.filter(s => s.id !== socket.id);
|
|
153
154
|
})
|
|
154
155
|
}
|
|
155
156
|
}
|
package/lib/DBSchemaBuilder.js
CHANGED
|
@@ -61,43 +61,43 @@ exports.getDBSchema = getDBSchema;
|
|
|
61
61
|
/** Type checks */
|
|
62
62
|
(() => {
|
|
63
63
|
const ddb = 1;
|
|
64
|
-
ddb.dwad
|
|
65
|
-
ddb.dwad
|
|
64
|
+
ddb.dwad?.insert;
|
|
65
|
+
ddb.dwad?.delete;
|
|
66
66
|
const d = 1;
|
|
67
|
-
d.dwad
|
|
68
|
-
d.dwad
|
|
67
|
+
d.dwad?.insert;
|
|
68
|
+
d.dwad?.delete;
|
|
69
69
|
const p = 1;
|
|
70
|
-
p.dbo.dwad
|
|
71
|
-
ddb.dwad
|
|
70
|
+
p.dbo.dwad?.insert;
|
|
71
|
+
ddb.dwad?.delete;
|
|
72
72
|
(0, _1.default)({
|
|
73
73
|
dbConnection: 1,
|
|
74
74
|
publish: async (params) => {
|
|
75
|
-
const row = await params.dbo.dwadwa
|
|
75
|
+
const row = await params.dbo.dwadwa?.find?.({});
|
|
76
76
|
return "*";
|
|
77
77
|
},
|
|
78
78
|
onReady: (dbo) => {
|
|
79
|
-
dbo.tdwa
|
|
79
|
+
dbo.tdwa?.find();
|
|
80
80
|
}
|
|
81
81
|
});
|
|
82
82
|
const auth = {
|
|
83
83
|
sidKeyName: "sid_token",
|
|
84
84
|
getUser: async (sid, db, _db) => {
|
|
85
|
-
db.dwadaw
|
|
85
|
+
db.dwadaw?.find;
|
|
86
86
|
return 1;
|
|
87
87
|
}
|
|
88
88
|
};
|
|
89
89
|
/** Test the created schema */
|
|
90
90
|
const c = 1;
|
|
91
|
-
const
|
|
91
|
+
const _test = c;
|
|
92
92
|
const dbt = 1;
|
|
93
93
|
dbt.tx(t => {
|
|
94
94
|
t.tbl1.delete();
|
|
95
95
|
});
|
|
96
96
|
const db = 1;
|
|
97
97
|
db.tx(t => {
|
|
98
|
-
t.wadwa
|
|
98
|
+
t.wadwa?.find();
|
|
99
99
|
});
|
|
100
|
-
const
|
|
100
|
+
const _publish = () => {
|
|
101
101
|
const r = {
|
|
102
102
|
tbl1: {
|
|
103
103
|
select: {
|
|
@@ -136,9 +136,9 @@ exports.getDBSchema = getDBSchema;
|
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
};
|
|
139
|
-
const
|
|
139
|
+
const _res1 = r;
|
|
140
140
|
const p = 1;
|
|
141
|
-
p.dbo.dwadaw
|
|
141
|
+
p.dbo.dwadaw?.find?.();
|
|
142
142
|
return res;
|
|
143
143
|
};
|
|
144
144
|
});
|
package/lib/DBSchemaBuilder.ts
CHANGED
|
@@ -93,26 +93,26 @@ export type PublishFullyTyped<Schema = void> = Schema extends DBSchema? (
|
|
|
93
93
|
(() => {
|
|
94
94
|
|
|
95
95
|
const ddb: DBOFullyTyped = 1 as any;
|
|
96
|
-
ddb.dwad
|
|
97
|
-
ddb.dwad
|
|
96
|
+
ddb.dwad?.insert;
|
|
97
|
+
ddb.dwad?.delete;
|
|
98
98
|
|
|
99
99
|
const d: DBOFullyTyped<undefined> = 1 as any;
|
|
100
|
-
d.dwad
|
|
101
|
-
d.dwad
|
|
100
|
+
d.dwad?.insert;
|
|
101
|
+
d.dwad?.delete;
|
|
102
102
|
|
|
103
103
|
const p: PublishParams = 1 as any;
|
|
104
|
-
p.dbo.dwad
|
|
105
|
-
ddb.dwad
|
|
104
|
+
p.dbo.dwad?.insert;
|
|
105
|
+
ddb.dwad?.delete;
|
|
106
106
|
|
|
107
107
|
prostgles({
|
|
108
108
|
dbConnection: 1 as any,
|
|
109
109
|
publish: async (params) => {
|
|
110
|
-
const row = await params.dbo.dwadwa
|
|
110
|
+
const row = await params.dbo.dwadwa?.find?.({});
|
|
111
111
|
|
|
112
112
|
return "*" as const
|
|
113
113
|
},
|
|
114
114
|
onReady: (dbo) => {
|
|
115
|
-
dbo.tdwa
|
|
115
|
+
dbo.tdwa?.find!()
|
|
116
116
|
}
|
|
117
117
|
});
|
|
118
118
|
|
|
@@ -120,7 +120,7 @@ export type PublishFullyTyped<Schema = void> = Schema extends DBSchema? (
|
|
|
120
120
|
const auth: Auth = {
|
|
121
121
|
sidKeyName: "sid_token",
|
|
122
122
|
getUser: async (sid, db, _db) => {
|
|
123
|
-
db.dwadaw
|
|
123
|
+
db.dwadaw?.find;
|
|
124
124
|
return 1 as any;
|
|
125
125
|
}
|
|
126
126
|
}
|
|
@@ -143,7 +143,7 @@ export type PublishFullyTyped<Schema = void> = Schema extends DBSchema? (
|
|
|
143
143
|
|
|
144
144
|
/** Test the created schema */
|
|
145
145
|
const c: S = 1 as any;
|
|
146
|
-
const
|
|
146
|
+
const _test: DBSchema = c;
|
|
147
147
|
const dbt: DBOFullyTyped<S> = 1 as any;
|
|
148
148
|
|
|
149
149
|
dbt.tx!(t => {
|
|
@@ -152,10 +152,10 @@ export type PublishFullyTyped<Schema = void> = Schema extends DBSchema? (
|
|
|
152
152
|
|
|
153
153
|
const db: DBHandlerServer = 1 as any;
|
|
154
154
|
db.tx!(t => {
|
|
155
|
-
t.wadwa
|
|
155
|
+
t.wadwa?.find!()
|
|
156
156
|
});
|
|
157
157
|
|
|
158
|
-
const
|
|
158
|
+
const _publish = (): PublishFullyTyped<S> => {
|
|
159
159
|
const r = {
|
|
160
160
|
tbl1: {
|
|
161
161
|
select: {
|
|
@@ -194,11 +194,11 @@ export type PublishFullyTyped<Schema = void> = Schema extends DBSchema? (
|
|
|
194
194
|
}
|
|
195
195
|
}
|
|
196
196
|
}
|
|
197
|
-
const
|
|
197
|
+
const _res1: PublishFullyTyped = r
|
|
198
198
|
|
|
199
199
|
const p: PublishParams<undefined> = 1 as any;
|
|
200
200
|
|
|
201
|
-
p.dbo.dwadaw
|
|
201
|
+
p.dbo.dwadaw?.find?.();
|
|
202
202
|
|
|
203
203
|
return res;
|
|
204
204
|
}
|
|
@@ -134,7 +134,7 @@ const FTS_Funcs =
|
|
|
134
134
|
singleColArg: true,
|
|
135
135
|
numArgs: 2,
|
|
136
136
|
getFields: ([column]) => [column],
|
|
137
|
-
getQuery: ({
|
|
137
|
+
getQuery: ({ args }) => {
|
|
138
138
|
const col = (0, prostgles_types_1.asName)(args[0]);
|
|
139
139
|
let qVal = args[1], qType = "to_tsquery";
|
|
140
140
|
const _type = type ? (asValue(type) + ",") : "";
|
|
@@ -214,7 +214,7 @@ const FTS_Funcs: FunctionSpec[] =
|
|
|
214
214
|
singleColArg: true,
|
|
215
215
|
numArgs: 2,
|
|
216
216
|
getFields: ([column]) => [column],
|
|
217
|
-
getQuery: ({
|
|
217
|
+
getQuery: ({ args }) => {
|
|
218
218
|
const col = asName(args[0]);
|
|
219
219
|
let qVal = args[1], qType = "to_tsquery";
|
|
220
220
|
const _type = type? (asValue(type) + ",") : "";
|
|
@@ -226,7 +226,7 @@ const FTS_Funcs: FunctionSpec[] =
|
|
|
226
226
|
const keys = Object.keys(qVal);
|
|
227
227
|
if(!keys.length) throw "Bad arg";
|
|
228
228
|
if(keys.length !==1 || !searchTypes.includes(keys[0] as any)) throw "Expecting a an object with a single key named one of: " + searchTypes.join(", ");
|
|
229
|
-
qType = keys[0]
|
|
229
|
+
qType = keys[0]!;
|
|
230
230
|
qVal = asValue(qVal[qType]);
|
|
231
231
|
|
|
232
232
|
/* 'search term' */
|
|
@@ -66,7 +66,7 @@ export function makeSelectQuery(
|
|
|
66
66
|
|
|
67
67
|
// console.log(JSON.stringify({i, table, on, q1, q2}, null, 2));
|
|
68
68
|
|
|
69
|
-
const prevTable = i === 0? t1Alias : (paths[i - 1]
|
|
69
|
+
const prevTable = i === 0? t1Alias : (paths[i - 1]!.table);
|
|
70
70
|
const thisAlias = getTableJoinAliasAsName(q2.tableAlias, table);
|
|
71
71
|
|
|
72
72
|
const prevAlias = i === 0? getTableAliasAsName(q1) : getTableJoinAliasAsName(q2.tableAlias, prevTable);
|
|
@@ -42,11 +42,10 @@ class TableHandler extends ViewHandler_1.ViewHandler {
|
|
|
42
42
|
async updateBatch(data, params, tableRules, localParams) {
|
|
43
43
|
try {
|
|
44
44
|
const queries = await Promise.all(data.map(async ([filter, data]) => await this.update(filter, data, { ...(params || {}), returning: undefined }, tableRules, { ...(localParams || {}), returnQuery: true })));
|
|
45
|
-
const keys = (data && data.length) ? Object.keys(data[0]) : [];
|
|
46
45
|
return this.db.tx(t => {
|
|
47
46
|
const _queries = queries.map(q => t.none(q));
|
|
48
47
|
return t.batch(_queries);
|
|
49
|
-
}).catch(err => (0, DboBuilder_1.makeErrorFromPGError)(err, localParams, this,
|
|
48
|
+
}).catch(err => (0, DboBuilder_1.makeErrorFromPGError)(err, localParams, this, []));
|
|
50
49
|
}
|
|
51
50
|
catch (e) {
|
|
52
51
|
if (localParams && localParams.testRule)
|
|
@@ -73,12 +73,12 @@ export class TableHandler extends ViewHandler {
|
|
|
73
73
|
{ ...(localParams || {}), returnQuery: true }
|
|
74
74
|
)
|
|
75
75
|
)
|
|
76
|
-
);
|
|
77
|
-
|
|
76
|
+
);
|
|
77
|
+
|
|
78
78
|
return this.db.tx(t => {
|
|
79
79
|
const _queries = queries.map(q => t.none(q as unknown as string))
|
|
80
80
|
return t.batch(_queries)
|
|
81
|
-
}).catch(err => makeErrorFromPGError(err, localParams, this,
|
|
81
|
+
}).catch(err => makeErrorFromPGError(err, localParams, this, []));
|
|
82
82
|
} catch (e) {
|
|
83
83
|
if (localParams && localParams.testRule) throw e;
|
|
84
84
|
throw parseError(e, `dbo.${this.name}.update()`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["ViewHandler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAExC,OAAO,EACL,UAAU,EAAE,WAAW,EAAE,YAAY,EACrC,OAAO,EAGP,SAAS,IAAI,KAAK,EAClB,SAAS,EAEgB,eAAe,EACzC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EACL,UAAU,EAAiB,kBAAkB,EAAC,MAAM,EACpD,QAAQ,EAAE,WAAW,EAA2D,QAAQ,EACxF,aAAa,EAAE,WAAW,EAAE,mBAAmB,EAChD,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGtE,OAAO,EAA6B,UAAU,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAGzG,OAAO,EAAE,SAAS,EAAa,MAAM,aAAa,CAAC;AACnD,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,EAAE,CAAC;AAEJ,KAAK,kBAAkB,GAAG;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAA;CACjC,CAAC;AAEF,cAAM,MAAM;IACV,IAAI,EAAE;QACJ,OAAO,EAAE,UAAU,EAAE,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC;gBAEU,OAAO,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM;YAItC,MAAM;
|
|
1
|
+
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ class ColSet {
|
|
|
36
36
|
* Add conversion functions for PostGIS data
|
|
37
37
|
*/
|
|
38
38
|
let escapedVal = "";
|
|
39
|
-
if (["geometry", "geography"].includes(col.udt_name) &&
|
|
39
|
+
if (["geometry", "geography"].includes(col.udt_name) && (0, prostgles_types_1.isObject)(row[key])) {
|
|
40
40
|
const basicFunc = (args) => {
|
|
41
41
|
return args.map(arg => (0, PubSubManager_1.asValue)(arg)).join(", ");
|
|
42
42
|
};
|
|
@@ -212,10 +212,10 @@ class ViewHandler {
|
|
|
212
212
|
const getJoinCondition = (on, leftTable, rightTable) => {
|
|
213
213
|
return on.map(cond => Object.keys(cond).map(lKey => `${leftTable}.${lKey} = ${rightTable}.${cond[lKey]}`).join("\nAND ")).join(" OR ");
|
|
214
214
|
};
|
|
215
|
-
let toOne = true;
|
|
215
|
+
// let toOne = true;
|
|
216
216
|
const query = this.joins.map(({ tables, on, type }, i) => {
|
|
217
217
|
if (type.split("-")[1] === "many") {
|
|
218
|
-
toOne = false;
|
|
218
|
+
// toOne = false;
|
|
219
219
|
}
|
|
220
220
|
const tl = `tl${startAlias + i}`, tr = `tr${startAlias + i}`;
|
|
221
221
|
return `FROM ${tables[0]} ${tl} ${isInner ? "INNER" : "LEFT"} JOIN ${tables[1]} ${tr} ON ${getJoinCondition(on, tl, tr)}`;
|
|
@@ -278,7 +278,7 @@ class ViewHandler {
|
|
|
278
278
|
const on = [];
|
|
279
279
|
jo.on.map(cond => {
|
|
280
280
|
const condArr = [];
|
|
281
|
-
|
|
281
|
+
(0, prostgles_types_1.getKeys)(cond).map(leftKey => {
|
|
282
282
|
const rightKey = cond[leftKey];
|
|
283
283
|
/* Left table is joining on keys */
|
|
284
284
|
if (jo.tables[0] === t1) {
|
|
@@ -727,7 +727,7 @@ class ViewHandler {
|
|
|
727
727
|
const thisTable = this.name;
|
|
728
728
|
const isNotExists = ["$notExists", "$notExistsJoined"].includes(eConfig.existType);
|
|
729
729
|
const { f2, tables, isJoined } = eConfig;
|
|
730
|
-
const t2 = tables
|
|
730
|
+
const t2 = tables.at(-1);
|
|
731
731
|
tables.forEach(t => {
|
|
732
732
|
if (!this.dboBuilder.dbo[t])
|
|
733
733
|
throw { stack: ["prepareExistCondition()"], message: `Invalid or dissallowed table: ${t}` };
|
|
@@ -740,7 +740,7 @@ class ViewHandler {
|
|
|
740
740
|
let joinPaths = [];
|
|
741
741
|
let expectOne = true;
|
|
742
742
|
tables.map((t2, depth) => {
|
|
743
|
-
const t1 = depth ? tables[depth - 1] : thisTable;
|
|
743
|
+
const t1 = (depth ? tables[depth - 1] : thisTable);
|
|
744
744
|
let exactPaths = [t1, t2];
|
|
745
745
|
if (!depth && eConfig.shortestJoin)
|
|
746
746
|
exactPaths = undefined;
|
|
@@ -753,8 +753,10 @@ class ViewHandler {
|
|
|
753
753
|
function makeJoin(joinInfo, ji) {
|
|
754
754
|
const { paths } = joinInfo;
|
|
755
755
|
const jp = paths[ji];
|
|
756
|
+
if (!jp)
|
|
757
|
+
throw "jp undef";
|
|
756
758
|
// let prevTable = ji? paths[ji - 1].table : jp.source;
|
|
757
|
-
const table =
|
|
759
|
+
const table = jp.table;
|
|
758
760
|
const tableAlias = (0, prostgles_types_1.asName)(ji < paths.length - 1 ? `jd${ji}` : table);
|
|
759
761
|
const prevTableAlias = (0, prostgles_types_1.asName)(ji ? `jd${ji - 1}` : thisTable);
|
|
760
762
|
const cond = `${jp.on.map(c => {
|
|
@@ -867,7 +869,7 @@ class ViewHandler {
|
|
|
867
869
|
/* [string] */
|
|
868
870
|
_ob = _orderBy.map(key => ({ key, asc: true }));
|
|
869
871
|
}
|
|
870
|
-
else if (_orderBy.find(v => (0,
|
|
872
|
+
else if (_orderBy.find(v => (0, prostgles_types_1.isObject)(v) && !(0, prostgles_types_1.isEmpty)(v))) {
|
|
871
873
|
_ob = _orderBy.map(v => parseOrderObj(v, true)[0]);
|
|
872
874
|
}
|
|
873
875
|
else
|
|
@@ -77,7 +77,7 @@ class ColSet {
|
|
|
77
77
|
* Add conversion functions for PostGIS data
|
|
78
78
|
*/
|
|
79
79
|
let escapedVal = "";
|
|
80
|
-
if (["geometry", "geography"].includes(col.udt_name) &&
|
|
80
|
+
if (["geometry", "geography"].includes(col.udt_name) && isObject(row[key])) {
|
|
81
81
|
|
|
82
82
|
const basicFunc = (args: any[]) => {
|
|
83
83
|
return args.map(arg => asValue(arg)).join(", ")
|
|
@@ -86,13 +86,14 @@ class ColSet {
|
|
|
86
86
|
type ConvertionFunc = { name: string; getQuery: (args: any[]) => string; }
|
|
87
87
|
const convertionFuncs: ConvertionFunc[] = [
|
|
88
88
|
...[
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
89
|
+
"ST_GeomFromText",
|
|
90
|
+
"ST_Point",
|
|
91
|
+
"ST_MakePoint",
|
|
92
|
+
"ST_MakePointM",
|
|
93
|
+
"ST_PointFromText",
|
|
94
|
+
"ST_GeomFromEWKT",
|
|
95
|
+
"ST_GeomFromGeoJSON"
|
|
96
|
+
].map(name => ({
|
|
96
97
|
name,
|
|
97
98
|
getQuery: () => `${name}(${basicFunc(funcArgs)})`
|
|
98
99
|
})),
|
|
@@ -103,7 +104,7 @@ class ColSet {
|
|
|
103
104
|
];
|
|
104
105
|
|
|
105
106
|
const dataKeys = Object.keys(row[key]);
|
|
106
|
-
const funcName = dataKeys[0]
|
|
107
|
+
const funcName = dataKeys[0]!;
|
|
107
108
|
const func = convertionFuncs.find(f => f.name === funcName);
|
|
108
109
|
const funcArgs = row[key]?.[funcName]
|
|
109
110
|
if (dataKeys.length !== 1 || !func || !Array.isArray(funcArgs)) {
|
|
@@ -287,10 +288,10 @@ export class ViewHandler {
|
|
|
287
288
|
return on.map(cond => Object.keys(cond).map(lKey => `${leftTable}.${lKey} = ${rightTable}.${cond[lKey]}`).join("\nAND ")).join(" OR ")
|
|
288
289
|
}
|
|
289
290
|
|
|
290
|
-
let toOne = true;
|
|
291
|
+
// let toOne = true;
|
|
291
292
|
const query = this.joins.map(({ tables, on, type }, i) => {
|
|
292
293
|
if (type.split("-")[1] === "many") {
|
|
293
|
-
toOne = false;
|
|
294
|
+
// toOne = false;
|
|
294
295
|
}
|
|
295
296
|
const tl = `tl${startAlias + i}`,
|
|
296
297
|
tr = `tr${startAlias + i}`;
|
|
@@ -347,7 +348,7 @@ export class ViewHandler {
|
|
|
347
348
|
|
|
348
349
|
/* Make the join chain info excluding root table */
|
|
349
350
|
paths = (path || jp.path).slice(1).map((t2, i, arr) => {
|
|
350
|
-
const t1 = i === 0 ? source : arr[i - 1]
|
|
351
|
+
const t1 = i === 0 ? source : arr[i - 1]!;
|
|
351
352
|
|
|
352
353
|
this.joins ??= this.dboBuilder.joins;
|
|
353
354
|
|
|
@@ -359,8 +360,8 @@ export class ViewHandler {
|
|
|
359
360
|
|
|
360
361
|
jo.on.map(cond => {
|
|
361
362
|
const condArr: [string, string][] = [];
|
|
362
|
-
|
|
363
|
-
const rightKey = cond[leftKey]
|
|
363
|
+
getKeys(cond).map(leftKey => {
|
|
364
|
+
const rightKey = cond[leftKey]!;
|
|
364
365
|
|
|
365
366
|
/* Left table is joining on keys */
|
|
366
367
|
if (jo.tables[0] === t1) {
|
|
@@ -857,7 +858,7 @@ export class ViewHandler {
|
|
|
857
858
|
const isNotExists = ["$notExists", "$notExistsJoined"].includes(eConfig.existType);
|
|
858
859
|
|
|
859
860
|
const { f2, tables, isJoined } = eConfig;
|
|
860
|
-
const t2 = tables
|
|
861
|
+
const t2 = tables.at(-1)!;
|
|
861
862
|
|
|
862
863
|
tables.forEach(t => {
|
|
863
864
|
if (!this.dboBuilder.dbo[t]) throw { stack: ["prepareExistCondition()"], message: `Invalid or dissallowed table: ${t}` };
|
|
@@ -874,7 +875,7 @@ export class ViewHandler {
|
|
|
874
875
|
let joinPaths: JoinInfo["paths"] = [];
|
|
875
876
|
let expectOne = true;
|
|
876
877
|
tables.map((t2, depth) => {
|
|
877
|
-
const t1 = depth ? tables[depth - 1] : thisTable
|
|
878
|
+
const t1 = (depth ? tables[depth - 1] : thisTable)!;
|
|
878
879
|
let exactPaths: string[] | undefined = [t1, t2];
|
|
879
880
|
|
|
880
881
|
if (!depth && eConfig.shortestJoin) exactPaths = undefined;
|
|
@@ -889,9 +890,10 @@ export class ViewHandler {
|
|
|
889
890
|
function makeJoin(joinInfo: JoinInfo, ji: number) {
|
|
890
891
|
const { paths } = joinInfo;
|
|
891
892
|
const jp = paths[ji];
|
|
893
|
+
if(!jp) throw "jp undef";
|
|
892
894
|
|
|
893
895
|
// let prevTable = ji? paths[ji - 1].table : jp.source;
|
|
894
|
-
const table =
|
|
896
|
+
const table = jp.table;
|
|
895
897
|
const tableAlias = asName(ji < paths.length - 1 ? `jd${ji}` : table);
|
|
896
898
|
const prevTableAlias = asName(ji ? `jd${ji - 1}` : thisTable);
|
|
897
899
|
|
|
@@ -1024,8 +1026,8 @@ export class ViewHandler {
|
|
|
1024
1026
|
if (_orderBy && !_orderBy.find(v => typeof v !== "string")) {
|
|
1025
1027
|
/* [string] */
|
|
1026
1028
|
_ob = _orderBy.map(key => ({ key, asc: true }));
|
|
1027
|
-
} else if (_orderBy.find(v =>
|
|
1028
|
-
_ob = _orderBy.map(v => parseOrderObj(v, true)[0]);
|
|
1029
|
+
} else if (_orderBy.find(v => isObject(v) && !isEmpty(v))) {
|
|
1030
|
+
_ob = _orderBy.map(v => parseOrderObj(v, true)[0]!);
|
|
1029
1031
|
} else return throwErr();
|
|
1030
1032
|
} else return throwErr();
|
|
1031
1033
|
|
|
@@ -1090,7 +1092,7 @@ export class ViewHandler {
|
|
|
1090
1092
|
/* If no limit then set as the lesser of (100, maxLimit) */
|
|
1091
1093
|
// } else
|
|
1092
1094
|
if (_limit !== null && !Number.isInteger(_limit) && p.select.maxLimit !== null) {
|
|
1093
|
-
_limit = [100, p.select.maxLimit].filter(Number.isInteger).sort((a, b) => a - b)[0]
|
|
1095
|
+
_limit = [100, p.select.maxLimit].filter(Number.isInteger).sort((a, b) => a - b)[0]!;
|
|
1094
1096
|
} else {
|
|
1095
1097
|
|
|
1096
1098
|
/* If a limit higher than maxLimit specified throw error */
|
|
@@ -21,7 +21,7 @@ async function getCondition(params) {
|
|
|
21
21
|
const ERR = "Invalid exists filter. \nExpecting somethibng like: \n | { $exists: { tableName.tableName2: Filter } } \n | { $exists: { \"**.tableName3\": Filter } }\n | { path: string[]; filter: AnyObject }";
|
|
22
22
|
const SP_WILDCARD = "**";
|
|
23
23
|
const exists = (0, prostgles_types_1.getKeys)(filter)
|
|
24
|
-
.filter(k => prostgles_types_1.EXISTS_KEYS.includes(k) && Object.keys(filter[k] ?? {}).length)
|
|
24
|
+
.filter((k) => prostgles_types_1.EXISTS_KEYS.includes(k) && !!Object.keys(filter[k] ?? {}).length)
|
|
25
25
|
.map(key => {
|
|
26
26
|
const isJoined = key.toLowerCase().includes("join");
|
|
27
27
|
const filterValue = filter[key];
|