prostgles-server 4.2.183 → 4.2.185

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.
Files changed (432) hide show
  1. package/.github/workflows/main.yml +15 -15
  2. package/.prettierignore +2 -0
  3. package/README.md +1 -1
  4. package/dist/Auth/AuthHandler.d.ts +1 -1
  5. package/dist/Auth/AuthHandler.d.ts.map +1 -1
  6. package/dist/Auth/AuthHandler.js +64 -32
  7. package/dist/Auth/AuthHandler.js.map +1 -1
  8. package/dist/Auth/AuthTypes.d.ts +15 -1
  9. package/dist/Auth/AuthTypes.d.ts.map +1 -1
  10. package/dist/Auth/getSafeReturnURL.d.ts.map +1 -1
  11. package/dist/Auth/getSafeReturnURL.js.map +1 -1
  12. package/dist/Auth/sendEmail.d.ts.map +1 -1
  13. package/dist/Auth/sendEmail.js +6 -6
  14. package/dist/Auth/sendEmail.js.map +1 -1
  15. package/dist/Auth/setAuthProviders.d.ts +1 -1
  16. package/dist/Auth/setAuthProviders.d.ts.map +1 -1
  17. package/dist/Auth/setAuthProviders.js +15 -8
  18. package/dist/Auth/setAuthProviders.js.map +1 -1
  19. package/dist/Auth/setEmailProvider.d.ts.map +1 -1
  20. package/dist/Auth/setEmailProvider.js +23 -4
  21. package/dist/Auth/setEmailProvider.js.map +1 -1
  22. package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
  23. package/dist/Auth/setupAuthRoutes.js +27 -9
  24. package/dist/Auth/setupAuthRoutes.js.map +1 -1
  25. package/dist/DBEventsManager.d.ts.map +1 -1
  26. package/dist/DBEventsManager.js +24 -19
  27. package/dist/DBEventsManager.js.map +1 -1
  28. package/dist/DBSchemaBuilder.d.ts.map +1 -1
  29. package/dist/DBSchemaBuilder.js +18 -5
  30. package/dist/DBSchemaBuilder.js.map +1 -1
  31. package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
  32. package/dist/DboBuilder/DboBuilder.js +7 -2
  33. package/dist/DboBuilder/DboBuilder.js.map +1 -1
  34. package/dist/DboBuilder/DboBuilderTypes.d.ts +4 -4
  35. package/dist/DboBuilder/DboBuilderTypes.d.ts.map +1 -1
  36. package/dist/DboBuilder/DboBuilderTypes.js.map +1 -1
  37. package/dist/DboBuilder/QueryBuilder/Functions.d.ts +2 -2
  38. package/dist/DboBuilder/QueryBuilder/Functions.d.ts.map +1 -1
  39. package/dist/DboBuilder/QueryBuilder/Functions.js +293 -173
  40. package/dist/DboBuilder/QueryBuilder/Functions.js.map +1 -1
  41. package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts +2 -2
  42. package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts.map +1 -1
  43. package/dist/DboBuilder/QueryBuilder/QueryBuilder.js +52 -29
  44. package/dist/DboBuilder/QueryBuilder/QueryBuilder.js.map +1 -1
  45. package/dist/DboBuilder/QueryBuilder/getJoinQuery.d.ts.map +1 -1
  46. package/dist/DboBuilder/QueryBuilder/getJoinQuery.js +51 -32
  47. package/dist/DboBuilder/QueryBuilder/getJoinQuery.js.map +1 -1
  48. package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts.map +1 -1
  49. package/dist/DboBuilder/QueryBuilder/getNewQuery.js +48 -25
  50. package/dist/DboBuilder/QueryBuilder/getNewQuery.js.map +1 -1
  51. package/dist/DboBuilder/QueryBuilder/getSelectQuery.d.ts +1 -1
  52. package/dist/DboBuilder/QueryBuilder/getSelectQuery.d.ts.map +1 -1
  53. package/dist/DboBuilder/QueryBuilder/getSelectQuery.js +32 -23
  54. package/dist/DboBuilder/QueryBuilder/getSelectQuery.js.map +1 -1
  55. package/dist/DboBuilder/QueryStreamer.d.ts +2 -2
  56. package/dist/DboBuilder/QueryStreamer.d.ts.map +1 -1
  57. package/dist/DboBuilder/QueryStreamer.js +68 -23
  58. package/dist/DboBuilder/QueryStreamer.js.map +1 -1
  59. package/dist/DboBuilder/TableHandler/DataValidator.d.ts +1 -1
  60. package/dist/DboBuilder/TableHandler/DataValidator.d.ts.map +1 -1
  61. package/dist/DboBuilder/TableHandler/DataValidator.js +79 -43
  62. package/dist/DboBuilder/TableHandler/DataValidator.js.map +1 -1
  63. package/dist/DboBuilder/TableHandler/TableHandler.d.ts.map +1 -1
  64. package/dist/DboBuilder/TableHandler/TableHandler.js +39 -15
  65. package/dist/DboBuilder/TableHandler/TableHandler.js.map +1 -1
  66. package/dist/DboBuilder/TableHandler/delete.d.ts.map +1 -1
  67. package/dist/DboBuilder/TableHandler/delete.js +44 -13
  68. package/dist/DboBuilder/TableHandler/delete.js.map +1 -1
  69. package/dist/DboBuilder/TableHandler/insert.d.ts.map +1 -1
  70. package/dist/DboBuilder/TableHandler/insert.js +81 -22
  71. package/dist/DboBuilder/TableHandler/insert.js.map +1 -1
  72. package/dist/DboBuilder/TableHandler/insertTest.d.ts.map +1 -1
  73. package/dist/DboBuilder/TableHandler/insertTest.js.map +1 -1
  74. package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.d.ts +1 -1
  75. package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.d.ts.map +1 -1
  76. package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js +7 -4
  77. package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js.map +1 -1
  78. package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.d.ts.map +1 -1
  79. package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js +24 -5
  80. package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js.map +1 -1
  81. package/dist/DboBuilder/TableHandler/update.d.ts.map +1 -1
  82. package/dist/DboBuilder/TableHandler/update.js +16 -4
  83. package/dist/DboBuilder/TableHandler/update.js.map +1 -1
  84. package/dist/DboBuilder/TableHandler/updateBatch.d.ts.map +1 -1
  85. package/dist/DboBuilder/TableHandler/updateBatch.js +33 -10
  86. package/dist/DboBuilder/TableHandler/updateBatch.js.map +1 -1
  87. package/dist/DboBuilder/TableHandler/updateFile.d.ts.map +1 -1
  88. package/dist/DboBuilder/TableHandler/updateFile.js +24 -6
  89. package/dist/DboBuilder/TableHandler/updateFile.js.map +1 -1
  90. package/dist/DboBuilder/TableHandler/upsert.d.ts.map +1 -1
  91. package/dist/DboBuilder/TableHandler/upsert.js +22 -6
  92. package/dist/DboBuilder/TableHandler/upsert.js.map +1 -1
  93. package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +5 -5
  94. package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
  95. package/dist/DboBuilder/ViewHandler/ViewHandler.js +64 -36
  96. package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
  97. package/dist/DboBuilder/ViewHandler/count.d.ts.map +1 -1
  98. package/dist/DboBuilder/ViewHandler/count.js +21 -7
  99. package/dist/DboBuilder/ViewHandler/count.js.map +1 -1
  100. package/dist/DboBuilder/ViewHandler/find.d.ts.map +1 -1
  101. package/dist/DboBuilder/ViewHandler/find.js +76 -22
  102. package/dist/DboBuilder/ViewHandler/find.js.map +1 -1
  103. package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts.map +1 -1
  104. package/dist/DboBuilder/ViewHandler/getExistsCondition.js +19 -10
  105. package/dist/DboBuilder/ViewHandler/getExistsCondition.js.map +1 -1
  106. package/dist/DboBuilder/ViewHandler/getExistsFilters.d.ts.map +1 -1
  107. package/dist/DboBuilder/ViewHandler/getExistsFilters.js +12 -5
  108. package/dist/DboBuilder/ViewHandler/getExistsFilters.js.map +1 -1
  109. package/dist/DboBuilder/ViewHandler/getInfo.d.ts.map +1 -1
  110. package/dist/DboBuilder/ViewHandler/getInfo.js +27 -9
  111. package/dist/DboBuilder/ViewHandler/getInfo.js.map +1 -1
  112. package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts +2 -2
  113. package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts.map +1 -1
  114. package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js +42 -23
  115. package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js.map +1 -1
  116. package/dist/DboBuilder/ViewHandler/parseComplexFilter.d.ts.map +1 -1
  117. package/dist/DboBuilder/ViewHandler/parseComplexFilter.js +22 -9
  118. package/dist/DboBuilder/ViewHandler/parseComplexFilter.js.map +1 -1
  119. package/dist/DboBuilder/ViewHandler/parseFieldFilter.d.ts +4 -4
  120. package/dist/DboBuilder/ViewHandler/parseFieldFilter.d.ts.map +1 -1
  121. package/dist/DboBuilder/ViewHandler/parseFieldFilter.js +13 -11
  122. package/dist/DboBuilder/ViewHandler/parseFieldFilter.js.map +1 -1
  123. package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts +1 -1
  124. package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts.map +1 -1
  125. package/dist/DboBuilder/ViewHandler/parseJoinPath.js +44 -29
  126. package/dist/DboBuilder/ViewHandler/parseJoinPath.js.map +1 -1
  127. package/dist/DboBuilder/ViewHandler/prepareSortItems.d.ts.map +1 -1
  128. package/dist/DboBuilder/ViewHandler/prepareSortItems.js +36 -27
  129. package/dist/DboBuilder/ViewHandler/prepareSortItems.js.map +1 -1
  130. package/dist/DboBuilder/ViewHandler/prepareWhere.d.ts.map +1 -1
  131. package/dist/DboBuilder/ViewHandler/prepareWhere.js +16 -12
  132. package/dist/DboBuilder/ViewHandler/prepareWhere.js.map +1 -1
  133. package/dist/DboBuilder/ViewHandler/size.d.ts.map +1 -1
  134. package/dist/DboBuilder/ViewHandler/size.js +24 -7
  135. package/dist/DboBuilder/ViewHandler/size.js.map +1 -1
  136. package/dist/DboBuilder/ViewHandler/subscribe.d.ts.map +1 -1
  137. package/dist/DboBuilder/ViewHandler/subscribe.js +40 -12
  138. package/dist/DboBuilder/ViewHandler/subscribe.js.map +1 -1
  139. package/dist/DboBuilder/ViewHandler/validateViewRules.d.ts.map +1 -1
  140. package/dist/DboBuilder/ViewHandler/validateViewRules.js +20 -5
  141. package/dist/DboBuilder/ViewHandler/validateViewRules.js.map +1 -1
  142. package/dist/DboBuilder/dboBuilderUtils.d.ts.map +1 -1
  143. package/dist/DboBuilder/dboBuilderUtils.js +18 -7
  144. package/dist/DboBuilder/dboBuilderUtils.js.map +1 -1
  145. package/dist/DboBuilder/getColumns.d.ts.map +1 -1
  146. package/dist/DboBuilder/getColumns.js +22 -7
  147. package/dist/DboBuilder/getColumns.js.map +1 -1
  148. package/dist/DboBuilder/getCondition.d.ts.map +1 -1
  149. package/dist/DboBuilder/getCondition.js +43 -30
  150. package/dist/DboBuilder/getCondition.js.map +1 -1
  151. package/dist/DboBuilder/getSubscribeRelatedTables.d.ts.map +1 -1
  152. package/dist/DboBuilder/getSubscribeRelatedTables.js +38 -27
  153. package/dist/DboBuilder/getSubscribeRelatedTables.js.map +1 -1
  154. package/dist/DboBuilder/getTablesForSchemaPostgresSQL.d.ts.map +1 -1
  155. package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js +9 -9
  156. package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js.map +1 -1
  157. package/dist/DboBuilder/insertNestedRecords.d.ts +3 -3
  158. package/dist/DboBuilder/insertNestedRecords.d.ts.map +1 -1
  159. package/dist/DboBuilder/insertNestedRecords.js +79 -44
  160. package/dist/DboBuilder/insertNestedRecords.js.map +1 -1
  161. package/dist/DboBuilder/parseUpdateRules.d.ts.map +1 -1
  162. package/dist/DboBuilder/parseUpdateRules.js +38 -14
  163. package/dist/DboBuilder/parseUpdateRules.js.map +1 -1
  164. package/dist/DboBuilder/prepareShortestJoinPaths.d.ts.map +1 -1
  165. package/dist/DboBuilder/prepareShortestJoinPaths.js +56 -31
  166. package/dist/DboBuilder/prepareShortestJoinPaths.js.map +1 -1
  167. package/dist/DboBuilder/runSQL.d.ts.map +1 -1
  168. package/dist/DboBuilder/runSQL.js +41 -21
  169. package/dist/DboBuilder/runSQL.js.map +1 -1
  170. package/dist/DboBuilder/runTransaction.d.ts +1 -1
  171. package/dist/DboBuilder/runTransaction.d.ts.map +1 -1
  172. package/dist/DboBuilder/runTransaction.js +2 -2
  173. package/dist/DboBuilder/runTransaction.js.map +1 -1
  174. package/dist/DboBuilder/sqlErrCodeToMsg.d.ts.map +1 -1
  175. package/dist/DboBuilder/sqlErrCodeToMsg.js +297 -38
  176. package/dist/DboBuilder/sqlErrCodeToMsg.js.map +1 -1
  177. package/dist/DboBuilder/uploadFile.d.ts.map +1 -1
  178. package/dist/DboBuilder/uploadFile.js +33 -9
  179. package/dist/DboBuilder/uploadFile.js.map +1 -1
  180. package/dist/Event_Trigger_Tags.d.ts +1 -1
  181. package/dist/Event_Trigger_Tags.d.ts.map +1 -1
  182. package/dist/Event_Trigger_Tags.js +1 -1
  183. package/dist/Event_Trigger_Tags.js.map +1 -1
  184. package/dist/FileManager/FileManager.d.ts.map +1 -1
  185. package/dist/FileManager/FileManager.js +6 -3
  186. package/dist/FileManager/FileManager.js.map +1 -1
  187. package/dist/FileManager/getValidatedFileType.d.ts.map +1 -1
  188. package/dist/FileManager/getValidatedFileType.js +18 -16
  189. package/dist/FileManager/getValidatedFileType.js.map +1 -1
  190. package/dist/FileManager/initFileManager.d.ts.map +1 -1
  191. package/dist/FileManager/initFileManager.js +7 -1
  192. package/dist/FileManager/initFileManager.js.map +1 -1
  193. package/dist/FileManager/upload.d.ts +1 -1
  194. package/dist/FileManager/upload.d.ts.map +1 -1
  195. package/dist/FileManager/upload.js +3 -3
  196. package/dist/FileManager/upload.js.map +1 -1
  197. package/dist/FileManager/uploadStream.d.ts +1 -1
  198. package/dist/FileManager/uploadStream.d.ts.map +1 -1
  199. package/dist/FileManager/uploadStream.js +6 -7
  200. package/dist/FileManager/uploadStream.js.map +1 -1
  201. package/dist/Filtering.d.ts +3 -3
  202. package/dist/Filtering.d.ts.map +1 -1
  203. package/dist/Filtering.js +70 -37
  204. package/dist/Filtering.js.map +1 -1
  205. package/dist/JSONBValidation/validate_jsonb_schema_sql.d.ts.map +1 -1
  206. package/dist/JSONBValidation/validate_jsonb_schema_sql.js +1 -4
  207. package/dist/JSONBValidation/validate_jsonb_schema_sql.js.map +1 -1
  208. package/dist/JSONBValidation/validation.d.ts.map +1 -1
  209. package/dist/JSONBValidation/validation.js +46 -24
  210. package/dist/JSONBValidation/validation.js.map +1 -1
  211. package/dist/Logging.d.ts +2 -2
  212. package/dist/Logging.d.ts.map +1 -1
  213. package/dist/PostgresNotifListenManager.d.ts.map +1 -1
  214. package/dist/PostgresNotifListenManager.js +20 -22
  215. package/dist/PostgresNotifListenManager.js.map +1 -1
  216. package/dist/Prostgles.d.ts +1 -1
  217. package/dist/Prostgles.d.ts.map +1 -1
  218. package/dist/Prostgles.js +37 -11
  219. package/dist/Prostgles.js.map +1 -1
  220. package/dist/ProstglesTypes.d.ts.map +1 -1
  221. package/dist/ProstglesTypes.js +6 -1
  222. package/dist/ProstglesTypes.js.map +1 -1
  223. package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
  224. package/dist/PubSubManager/PubSubManager.js +10 -5
  225. package/dist/PubSubManager/PubSubManager.js.map +1 -1
  226. package/dist/PubSubManager/addSub.d.ts.map +1 -1
  227. package/dist/PubSubManager/addSub.js +4 -6
  228. package/dist/PubSubManager/addSub.js.map +1 -1
  229. package/dist/PubSubManager/addSync.d.ts.map +1 -1
  230. package/dist/PubSubManager/addSync.js +10 -6
  231. package/dist/PubSubManager/addSync.js.map +1 -1
  232. package/dist/PubSubManager/getCreatePubSubManagerError.d.ts.map +1 -1
  233. package/dist/PubSubManager/getCreatePubSubManagerError.js +3 -1
  234. package/dist/PubSubManager/getCreatePubSubManagerError.js.map +1 -1
  235. package/dist/PubSubManager/getPubSubManagerInitQuery.d.ts.map +1 -1
  236. package/dist/PubSubManager/getPubSubManagerInitQuery.js +8 -8
  237. package/dist/PubSubManager/getPubSubManagerInitQuery.js.map +1 -1
  238. package/dist/PubSubManager/initPubSubManager.d.ts.map +1 -1
  239. package/dist/PubSubManager/initPubSubManager.js +7 -9
  240. package/dist/PubSubManager/initPubSubManager.js.map +1 -1
  241. package/dist/PubSubManager/notifListener.d.ts.map +1 -1
  242. package/dist/PubSubManager/notifListener.js +23 -12
  243. package/dist/PubSubManager/notifListener.js.map +1 -1
  244. package/dist/PubSubManager/orphanTriggerCheck.d.ts.map +1 -1
  245. package/dist/PubSubManager/orphanTriggerCheck.js.map +1 -1
  246. package/dist/PubSubManager/pushSubData.d.ts.map +1 -1
  247. package/dist/PubSubManager/pushSubData.js +1 -1
  248. package/dist/PubSubManager/pushSubData.js.map +1 -1
  249. package/dist/PublishParser/PublishParser.d.ts +1 -1
  250. package/dist/PublishParser/PublishParser.d.ts.map +1 -1
  251. package/dist/PublishParser/PublishParser.js +25 -14
  252. package/dist/PublishParser/PublishParser.js.map +1 -1
  253. package/dist/PublishParser/getFileTableRules.d.ts.map +1 -1
  254. package/dist/PublishParser/getFileTableRules.js +23 -16
  255. package/dist/PublishParser/getFileTableRules.js.map +1 -1
  256. package/dist/PublishParser/getSchemaFromPublish.d.ts.map +1 -1
  257. package/dist/PublishParser/getSchemaFromPublish.js +39 -16
  258. package/dist/PublishParser/getSchemaFromPublish.js.map +1 -1
  259. package/dist/PublishParser/getTableRulesWithoutFileTable.d.ts.map +1 -1
  260. package/dist/PublishParser/getTableRulesWithoutFileTable.js +42 -22
  261. package/dist/PublishParser/getTableRulesWithoutFileTable.js.map +1 -1
  262. package/dist/PublishParser/publishTypesAndUtils.d.ts.map +1 -1
  263. package/dist/PublishParser/publishTypesAndUtils.js +5 -1
  264. package/dist/PublishParser/publishTypesAndUtils.js.map +1 -1
  265. package/dist/RestApi.d.ts +1 -1
  266. package/dist/RestApi.d.ts.map +1 -1
  267. package/dist/RestApi.js +1 -1
  268. package/dist/RestApi.js.map +1 -1
  269. package/dist/SchemaWatch/SchemaWatch.d.ts +2 -2
  270. package/dist/SchemaWatch/SchemaWatch.d.ts.map +1 -1
  271. package/dist/SchemaWatch/SchemaWatch.js +11 -9
  272. package/dist/SchemaWatch/SchemaWatch.js.map +1 -1
  273. package/dist/SchemaWatch/getValidatedWatchSchemaType.d.ts.map +1 -1
  274. package/dist/SchemaWatch/getValidatedWatchSchemaType.js +3 -3
  275. package/dist/SchemaWatch/getValidatedWatchSchemaType.js.map +1 -1
  276. package/dist/SchemaWatch/getWatchSchemaTagList.d.ts.map +1 -1
  277. package/dist/SchemaWatch/getWatchSchemaTagList.js +12 -6
  278. package/dist/SchemaWatch/getWatchSchemaTagList.js.map +1 -1
  279. package/dist/SyncReplication.d.ts.map +1 -1
  280. package/dist/SyncReplication.js +84 -42
  281. package/dist/SyncReplication.js.map +1 -1
  282. package/dist/TableConfig/TableConfig.d.ts +5 -5
  283. package/dist/TableConfig/TableConfig.d.ts.map +1 -1
  284. package/dist/TableConfig/TableConfig.js +18 -5
  285. package/dist/TableConfig/TableConfig.js.map +1 -1
  286. package/dist/TableConfig/getColumnDefinitionQuery.d.ts +2 -2
  287. package/dist/TableConfig/getColumnDefinitionQuery.d.ts.map +1 -1
  288. package/dist/TableConfig/getColumnDefinitionQuery.js +20 -9
  289. package/dist/TableConfig/getColumnDefinitionQuery.js.map +1 -1
  290. package/dist/TableConfig/getConstraintDefinitionQueries.d.ts +3 -3
  291. package/dist/TableConfig/getConstraintDefinitionQueries.d.ts.map +1 -1
  292. package/dist/TableConfig/getConstraintDefinitionQueries.js +12 -7
  293. package/dist/TableConfig/getConstraintDefinitionQueries.js.map +1 -1
  294. package/dist/TableConfig/getFutureTableSchema.d.ts +1 -1
  295. package/dist/TableConfig/getFutureTableSchema.d.ts.map +1 -1
  296. package/dist/TableConfig/getFutureTableSchema.js +6 -4
  297. package/dist/TableConfig/getFutureTableSchema.js.map +1 -1
  298. package/dist/TableConfig/getPGIndexes.d.ts.map +1 -1
  299. package/dist/TableConfig/getPGIndexes.js.map +1 -1
  300. package/dist/TableConfig/getTableColumnQueries.d.ts +1 -1
  301. package/dist/TableConfig/getTableColumnQueries.d.ts.map +1 -1
  302. package/dist/TableConfig/getTableColumnQueries.js +38 -19
  303. package/dist/TableConfig/getTableColumnQueries.js.map +1 -1
  304. package/dist/TableConfig/initTableConfig.d.ts.map +1 -1
  305. package/dist/TableConfig/initTableConfig.js +91 -43
  306. package/dist/TableConfig/initTableConfig.js.map +1 -1
  307. package/dist/index.d.ts.map +1 -1
  308. package/dist/index.js.map +1 -1
  309. package/dist/initProstgles.d.ts.map +1 -1
  310. package/dist/initProstgles.js +14 -10
  311. package/dist/initProstgles.js.map +1 -1
  312. package/dist/onSocketConnected.d.ts.map +1 -1
  313. package/dist/onSocketConnected.js +38 -16
  314. package/dist/onSocketConnected.js.map +1 -1
  315. package/dist/runClientRequest.d.ts.map +1 -1
  316. package/dist/runClientRequest.js +33 -14
  317. package/dist/runClientRequest.js.map +1 -1
  318. package/dist/shortestPath.d.ts.map +1 -1
  319. package/dist/shortestPath.js +1 -1
  320. package/dist/shortestPath.js.map +1 -1
  321. package/dist/typeTests/dboTypeCheck.js.map +1 -1
  322. package/examples/full-example-typescript/DBoGenerated.d.ts +112 -54
  323. package/examples/full-example-typescript/DBoGenerated.js +3 -3
  324. package/examples/full-example-typescript/home.html +28 -26
  325. package/examples/full-example-typescript/index.d.ts +1 -1
  326. package/examples/full-example-typescript/index.js +80 -53
  327. package/examples/full-example-vanilla/home.html +151 -125
  328. package/examples/server/javascript/index.js +17 -19
  329. package/lib/Auth/AuthHandler.ts +234 -155
  330. package/lib/Auth/AuthTypes.ts +27 -4
  331. package/lib/Auth/getSafeReturnURL.ts +35 -21
  332. package/lib/Auth/sendEmail.ts +34 -31
  333. package/lib/Auth/setAuthProviders.ts +94 -71
  334. package/lib/Auth/setEmailProvider.ts +45 -27
  335. package/lib/Auth/setupAuthRoutes.ts +164 -100
  336. package/lib/DBEventsManager.ts +87 -65
  337. package/lib/DBSchemaBuilder.ts +62 -28
  338. package/lib/DboBuilder/DboBuilder.ts +45 -21
  339. package/lib/DboBuilder/DboBuilderTypes.ts +99 -95
  340. package/lib/DboBuilder/QueryBuilder/Functions.ts +862 -580
  341. package/lib/DboBuilder/QueryBuilder/QueryBuilder.ts +202 -141
  342. package/lib/DboBuilder/QueryBuilder/getJoinQuery.ts +199 -124
  343. package/lib/DboBuilder/QueryBuilder/getNewQuery.ts +209 -148
  344. package/lib/DboBuilder/QueryBuilder/getSelectQuery.ts +101 -75
  345. package/lib/DboBuilder/QueryBuilder/prepareHaving.ts +10 -5
  346. package/lib/DboBuilder/QueryStreamer.ts +207 -100
  347. package/lib/DboBuilder/TableHandler/DataValidator.ts +253 -148
  348. package/lib/DboBuilder/TableHandler/TableHandler.ts +155 -60
  349. package/lib/DboBuilder/TableHandler/delete.ts +82 -29
  350. package/lib/DboBuilder/TableHandler/insert.ts +177 -81
  351. package/lib/DboBuilder/TableHandler/insertTest.ts +13 -7
  352. package/lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts +35 -21
  353. package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts +95 -45
  354. package/lib/DboBuilder/TableHandler/update.ts +54 -14
  355. package/lib/DboBuilder/TableHandler/updateBatch.ts +59 -21
  356. package/lib/DboBuilder/TableHandler/updateFile.ts +57 -26
  357. package/lib/DboBuilder/TableHandler/upsert.ts +58 -13
  358. package/lib/DboBuilder/ViewHandler/ViewHandler.ts +264 -121
  359. package/lib/DboBuilder/ViewHandler/count.ts +56 -25
  360. package/lib/DboBuilder/ViewHandler/find.ts +153 -68
  361. package/lib/DboBuilder/ViewHandler/getExistsCondition.ts +59 -32
  362. package/lib/DboBuilder/ViewHandler/getExistsFilters.ts +31 -19
  363. package/lib/DboBuilder/ViewHandler/getInfo.ts +47 -16
  364. package/lib/DboBuilder/ViewHandler/getTableJoinQuery.ts +91 -57
  365. package/lib/DboBuilder/ViewHandler/parseComplexFilter.ts +51 -29
  366. package/lib/DboBuilder/ViewHandler/parseFieldFilter.ts +35 -29
  367. package/lib/DboBuilder/ViewHandler/parseJoinPath.ts +130 -76
  368. package/lib/DboBuilder/ViewHandler/prepareSortItems.ts +140 -92
  369. package/lib/DboBuilder/ViewHandler/prepareWhere.ts +66 -26
  370. package/lib/DboBuilder/ViewHandler/size.ts +56 -22
  371. package/lib/DboBuilder/ViewHandler/subscribe.ts +122 -46
  372. package/lib/DboBuilder/ViewHandler/validateViewRules.ts +39 -14
  373. package/lib/DboBuilder/dboBuilderUtils.ts +41 -18
  374. package/lib/DboBuilder/getColumns.ts +44 -12
  375. package/lib/DboBuilder/getCondition.ts +120 -79
  376. package/lib/DboBuilder/getSubscribeRelatedTables.ts +144 -83
  377. package/lib/DboBuilder/getTablesForSchemaPostgresSQL.ts +61 -44
  378. package/lib/DboBuilder/insertNestedRecords.ts +370 -235
  379. package/lib/DboBuilder/parseUpdateRules.ts +117 -61
  380. package/lib/DboBuilder/prepareShortestJoinPaths.ts +115 -56
  381. package/lib/DboBuilder/runSQL.ts +135 -74
  382. package/lib/DboBuilder/runTransaction.ts +27 -16
  383. package/lib/DboBuilder/sqlErrCodeToMsg.ts +502 -244
  384. package/lib/DboBuilder/uploadFile.ts +67 -31
  385. package/lib/Event_Trigger_Tags.ts +6 -4
  386. package/lib/FileManager/FileManager.ts +53 -21
  387. package/lib/FileManager/getValidatedFileType.ts +79 -35
  388. package/lib/FileManager/initFileManager.ts +21 -9
  389. package/lib/FileManager/upload.ts +21 -19
  390. package/lib/FileManager/uploadStream.ts +33 -34
  391. package/lib/Filtering.ts +249 -197
  392. package/lib/JSONBValidation/validate_jsonb_schema_sql.ts +2 -7
  393. package/lib/JSONBValidation/validation.ts +147 -82
  394. package/lib/Logging.ts +107 -97
  395. package/lib/PostgresNotifListenManager.ts +96 -63
  396. package/lib/Prostgles.ts +106 -35
  397. package/lib/ProstglesTypes.ts +31 -9
  398. package/lib/PubSubManager/PubSubManager.ts +62 -27
  399. package/lib/PubSubManager/addSub.ts +56 -37
  400. package/lib/PubSubManager/addSync.ts +50 -33
  401. package/lib/PubSubManager/getCreatePubSubManagerError.ts +29 -21
  402. package/lib/PubSubManager/getPubSubManagerInitQuery.ts +45 -27
  403. package/lib/PubSubManager/initPubSubManager.ts +27 -18
  404. package/lib/PubSubManager/notifListener.ts +77 -59
  405. package/lib/PubSubManager/orphanTriggerCheck.ts +5 -4
  406. package/lib/PubSubManager/pushSubData.ts +11 -9
  407. package/lib/PublishParser/PublishParser.ts +102 -44
  408. package/lib/PublishParser/getFileTableRules.ts +97 -54
  409. package/lib/PublishParser/getSchemaFromPublish.ts +146 -74
  410. package/lib/PublishParser/getTableRulesWithoutFileTable.ts +101 -51
  411. package/lib/PublishParser/publishTypesAndUtils.ts +74 -23
  412. package/lib/RestApi.ts +10 -2
  413. package/lib/SchemaWatch/SchemaWatch.ts +52 -34
  414. package/lib/SchemaWatch/createSchemaWatchEventTrigger.ts +1 -1
  415. package/lib/SchemaWatch/getValidatedWatchSchemaType.ts +32 -22
  416. package/lib/SchemaWatch/getWatchSchemaTagList.ts +24 -16
  417. package/lib/SyncReplication.ts +376 -190
  418. package/lib/TableConfig/TableConfig.ts +200 -136
  419. package/lib/TableConfig/getColumnDefinitionQuery.ts +65 -44
  420. package/lib/TableConfig/getConstraintDefinitionQueries.ts +41 -25
  421. package/lib/TableConfig/getFutureTableSchema.ts +31 -21
  422. package/lib/TableConfig/getPGIndexes.ts +7 -4
  423. package/lib/TableConfig/getTableColumnQueries.ts +101 -54
  424. package/lib/TableConfig/initTableConfig.ts +192 -101
  425. package/lib/index.ts +6 -5
  426. package/lib/initProstgles.ts +57 -51
  427. package/lib/onSocketConnected.ts +75 -40
  428. package/lib/runClientRequest.ts +148 -79
  429. package/lib/shortestPath.ts +80 -76
  430. package/lib/typeTests/DBoGenerated.d.ts +5 -1
  431. package/lib/typeTests/dboTypeCheck.ts +8 -8
  432. package/package.json +1 -1
@@ -33,8 +33,18 @@ const parseComplexFilter = ({ filter, complexFilterKey, tableAlias, allowed_coln
33
33
  return (0, QueryBuilder_1.asNameAlias)(column, tableAlias);
34
34
  }
35
35
  const { funcName, args } = (0, QueryBuilder_1.parseFunctionObject)(funcData);
36
- const funcDef = (0, Functions_1.parseFunction)({ func: funcName, args, functions: Functions_1.FUNCTIONS, allowedFields: allowed_colnames });
37
- return funcDef.getQuery({ args, tableAlias, allColumns: columns, allowedFields: allowed_colnames });
36
+ const funcDef = (0, Functions_1.parseFunction)({
37
+ func: funcName,
38
+ args,
39
+ functions: Functions_1.FUNCTIONS,
40
+ allowedFields: allowed_colnames,
41
+ });
42
+ return funcDef.getQuery({
43
+ args,
44
+ tableAlias,
45
+ allColumns: columns,
46
+ allowedFields: allowed_colnames,
47
+ });
38
48
  };
39
49
  const complexFilter = filter[complexFilterKey];
40
50
  if (!Array.isArray(complexFilter)) {
@@ -44,7 +54,8 @@ const parseComplexFilter = ({ filter, complexFilterKey, tableAlias, allowed_coln
44
54
  const leftVal = getFuncQuery(leftFilter);
45
55
  let result = leftVal;
46
56
  if (comparator) {
47
- if (typeof comparator !== "string" || !allowedComparators.includes(comparator)) {
57
+ if (typeof comparator !== "string" ||
58
+ !allowedComparators.includes(comparator)) {
48
59
  throw `Invalid $filter. comparator ${JSON.stringify(comparator)} is not valid. Expecting one of: ${allowedComparators}`;
49
60
  }
50
61
  if (!rightFilterOrValue) {
@@ -55,20 +66,22 @@ const parseComplexFilter = ({ filter, complexFilterKey, tableAlias, allowed_coln
55
66
  if (!sqlOperand) {
56
67
  throw `Invalid $filter. comparator ${comparator} is not valid. Expecting one of: ${allowedComparators}`;
57
68
  }
58
- let rightVal = (0, prostgles_types_1.isObject)(rightFilterOrValue) ?
59
- getFuncQuery(rightFilterOrValue) :
60
- (0, Filtering_1.parseFilterRightValue)(rightFilterOrValue, {
69
+ let rightVal = (0, prostgles_types_1.isObject)(rightFilterOrValue)
70
+ ? getFuncQuery(rightFilterOrValue)
71
+ : (0, Filtering_1.parseFilterRightValue)(rightFilterOrValue, {
61
72
  selectItem: undefined,
62
- expect: ["$in", "$nin"].includes(comparator) ? "csv" : undefined
73
+ expect: ["$in", "$nin"].includes(comparator) ? "csv" : undefined,
63
74
  });
64
- if (maybeValidComparator === "$between" || maybeValidComparator === "$notBetween") {
75
+ if (maybeValidComparator === "$between" ||
76
+ maybeValidComparator === "$notBetween") {
65
77
  if (!Array.isArray(rightVal) || rightVal.length !== 2) {
66
78
  throw "Between filter expects an array of two values";
67
79
  }
68
80
  rightVal = (0, PubSubManager_1.asValue)(rightVal[0]) + " AND " + (0, PubSubManager_1.asValue)(rightVal[1]);
69
81
  }
70
82
  if (leftVal === rightVal) {
71
- throw "Invalid $filter. Cannot compare two identical function signatures: " + JSON.stringify(leftFilter);
83
+ throw ("Invalid $filter. Cannot compare two identical function signatures: " +
84
+ JSON.stringify(leftFilter));
72
85
  }
73
86
  result += ` ${sqlOperand} ${rightVal}`;
74
87
  }
@@ -1 +1 @@
1
- {"version":3,"file":"parseComplexFilter.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseComplexFilter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parseComplexFilter.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseComplexFilter.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,8 @@
1
1
  import { FieldFilter } from "prostgles-types";
2
2
  /**
3
- * Filter string array
4
- * @param {FieldFilter} fieldParams - { col1: 0, col2: 0 } | { col1: true, col2: true } | "*" | ["key1", "key2"] | []
5
- * @param {boolean} allow_empty - allow empty select. defaults to true
6
- */
3
+ * Filter string array
4
+ * @param {FieldFilter} fieldParams - { col1: 0, col2: 0 } | { col1: true, col2: true } | "*" | ["key1", "key2"] | []
5
+ * @param {boolean} allow_empty - allow empty select. defaults to true
6
+ */
7
7
  export declare const parseFieldFilter: <AllowedKeys extends string[]>(fieldParams: FieldFilter<Record<AllowedKeys[number], any>> | undefined, allow_empty: boolean | undefined, all_cols: AllowedKeys) => AllowedKeys | [""];
8
8
  //# sourceMappingURL=parseFieldFilter.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"parseFieldFilter.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseFieldFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAW,MAAM,iBAAiB,CAAC;AAGvD;;;;EAIE;AACF,eAAO,MAAM,gBAAgB,uLAgG5B,CAAA"}
1
+ {"version":3,"file":"parseFieldFilter.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseFieldFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAW,MAAM,iBAAiB,CAAC;AAGvD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,uLAsG5B,CAAC"}
@@ -4,10 +4,10 @@ exports.parseFieldFilter = void 0;
4
4
  const prostgles_types_1 = require("prostgles-types");
5
5
  const DboBuilder_1 = require("../DboBuilder");
6
6
  /**
7
- * Filter string array
8
- * @param {FieldFilter} fieldParams - { col1: 0, col2: 0 } | { col1: true, col2: true } | "*" | ["key1", "key2"] | []
9
- * @param {boolean} allow_empty - allow empty select. defaults to true
10
- */
7
+ * Filter string array
8
+ * @param {FieldFilter} fieldParams - { col1: 0, col2: 0 } | { col1: true, col2: true } | "*" | ["key1", "key2"] | []
9
+ * @param {boolean} allow_empty - allow empty select. defaults to true
10
+ */
11
11
  const parseFieldFilter = (fieldParams = "*", allow_empty = true, all_cols) => {
12
12
  if (!all_cols)
13
13
  throw "all_cols missing";
@@ -19,10 +19,11 @@ const parseFieldFilter = (fieldParams = "*", allow_empty = true, all_cols) => {
19
19
  "field1, field2, field4" | "*"
20
20
  */
21
21
  if (typeof fieldParams === "string") {
22
- fieldParams = fieldParams.split(",").map(k => k.trim());
22
+ fieldParams = fieldParams.split(",").map((k) => k.trim());
23
23
  }
24
24
  /* string[] */
25
- if (Array.isArray(fieldParams) && !fieldParams.find(f => typeof f !== "string")) {
25
+ if (Array.isArray(fieldParams) &&
26
+ !fieldParams.find((f) => typeof f !== "string")) {
26
27
  /*
27
28
  ["*"]
28
29
  */
@@ -65,27 +66,28 @@ const parseFieldFilter = (fieldParams = "*", allow_empty = true, all_cols) => {
65
66
  }
66
67
  }
67
68
  validate(keys);
68
- keys.forEach(key => {
69
+ keys.forEach((key) => {
69
70
  const allowedVals = [true, false, 0, 1];
70
71
  if (!allowedVals.includes(fieldParams[key]))
71
72
  throw `Invalid field selection value for: { ${key}: ${fieldParams[key]} }. \n Allowed values: ${allowedVals.join(" OR ")}`;
72
73
  });
73
- const allowed = keys.filter(key => fieldParams[key]), disallowed = keys.filter(key => !fieldParams[key]);
74
+ const allowed = keys.filter((key) => fieldParams[key]), disallowed = keys.filter((key) => !fieldParams[key]);
74
75
  if (disallowed && disallowed.length) {
75
- return all_fields.filter(col => !disallowed.includes(col));
76
+ return all_fields.filter((col) => !disallowed.includes(col));
76
77
  }
77
78
  else {
78
79
  return [...allowed];
79
80
  }
80
81
  }
81
82
  else {
82
- throw " Unrecognised field filter.\nExpecting any of: string | string[] | { [field]: boolean } \n Received -> " + initialParams;
83
+ throw (" Unrecognised field filter.\nExpecting any of: string | string[] | { [field]: boolean } \n Received -> " +
84
+ initialParams);
83
85
  }
84
86
  validate(colNames);
85
87
  }
86
88
  return colNames;
87
89
  function validate(cols) {
88
- const bad_keys = cols.filter(col => !all_fields.includes(col));
90
+ const bad_keys = cols.filter((col) => !all_fields.includes(col));
89
91
  if (bad_keys && bad_keys.length) {
90
92
  throw "\nUnrecognised or illegal fields: " + bad_keys.join(", ");
91
93
  }
@@ -1 +1 @@
1
- {"version":3,"file":"parseFieldFilter.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseFieldFilter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parseFieldFilter.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseFieldFilter.ts"],"names":[],"mappings":"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"}
@@ -14,6 +14,6 @@ export type ParsedJoinPath = {
14
14
  /**
15
15
  * Return a valid join path
16
16
  */
17
- export declare const parseJoinPath: ({ rawPath, rootTable, viewHandler, allowMultiOrJoin, addShortestJoinIfMissing }: parseJoinPathArgs) => ParsedJoinPath[];
17
+ export declare const parseJoinPath: ({ rawPath, rootTable, viewHandler, allowMultiOrJoin, addShortestJoinIfMissing, }: parseJoinPathArgs) => ParsedJoinPath[];
18
18
  export {};
19
19
  //# sourceMappingURL=parseJoinPath.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"parseJoinPath.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,WAAW,EAAiB,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAA;AACD,MAAM,MAAM,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CAAE,CAAC;AAE7E;;GAEG;AACH,eAAO,MAAM,aAAa,oFAA6F,iBAAiB,KAAG,cAAc,EA4CxJ,CAAA"}
1
+ {"version":3,"file":"parseJoinPath.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,WAAW,EAAiB,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AACF,MAAM,MAAM,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CAAE,CAAC;AAE7E;;GAEG;AACH,eAAO,MAAM,aAAa,qFAMvB,iBAAiB,KAAG,cAAc,EAkDpC,CAAC"}
@@ -5,7 +5,7 @@ const prostgles_types_1 = require("prostgles-types");
5
5
  /**
6
6
  * Return a valid join path
7
7
  */
8
- const parseJoinPath = ({ rawPath, rootTable, viewHandler, allowMultiOrJoin = false, addShortestJoinIfMissing }) => {
8
+ const parseJoinPath = ({ rawPath, rootTable, viewHandler, allowMultiOrJoin = false, addShortestJoinIfMissing, }) => {
9
9
  const result = [];
10
10
  let cleanPath = typeof rawPath === "string" ? [{ table: rawPath }] : rawPath;
11
11
  if (addShortestJoinIfMissing && cleanPath[0] !== "**") {
@@ -17,15 +17,21 @@ const parseJoinPath = ({ rawPath, rootTable, viewHandler, allowMultiOrJoin = fal
17
17
  throw `prevTable missing`;
18
18
  const pushJoinPath = (targetPath) => {
19
19
  const getShortestJoin = i === 1 && cleanPath[0] === "**";
20
- const joinInfo = getJoins(viewHandler, prevTable, [targetPath], { allowMultiOrJoin, getShortestJoin });
21
- joinInfo.paths.forEach(path => {
20
+ const joinInfo = getJoins(viewHandler, prevTable, [targetPath], {
21
+ allowMultiOrJoin,
22
+ getShortestJoin,
23
+ });
24
+ joinInfo.paths.forEach((path) => {
22
25
  /** Check if join tables are valid */
23
26
  if (!viewHandler.dboBuilder.dbo[path.table]) {
24
- throw { stack: ["prepareExistCondition()"], message: `Invalid or dissallowed table in join path: ${path.table}` };
27
+ throw {
28
+ stack: ["prepareExistCondition()"],
29
+ message: `Invalid or dissallowed table in join path: ${path.table}`,
30
+ };
25
31
  }
26
32
  result.push({
27
33
  table: path.table,
28
- on: path.on.map(constraint => Object.fromEntries(constraint))
34
+ on: path.on.map((constraint) => Object.fromEntries(constraint)),
29
35
  });
30
36
  });
31
37
  };
@@ -40,7 +46,7 @@ const parseJoinPath = ({ rawPath, rootTable, viewHandler, allowMultiOrJoin = fal
40
46
  pushJoinPath(item);
41
47
  }
42
48
  });
43
- const missingPath = result.find(r => !r.on.length || r.on.some(v => !Object.keys(v).length));
49
+ const missingPath = result.find((r) => !r.on.length || r.on.some((v) => !Object.keys(v).length));
44
50
  if (missingPath) {
45
51
  throw `Missing join on condition for: ${missingPath.table}`;
46
52
  }
@@ -65,15 +71,15 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
65
71
  }
66
72
  /* Self join */
67
73
  if (source === target) {
68
- const tableHandler = viewHandler.dboBuilder.tablesOrViews?.find(t => t.name === source);
74
+ const tableHandler = viewHandler.dboBuilder.tablesOrViews?.find((t) => t.name === source);
69
75
  if (!tableHandler)
70
76
  throw `Table not found for joining ${source}`;
71
- const fcols = tableHandler.columns.filter(c => c.references?.some(({ ftable }) => ftable === viewHandler.name));
77
+ const fcols = tableHandler.columns.filter((c) => c.references?.some(({ ftable }) => ftable === viewHandler.name));
72
78
  if (!fcols.length) {
73
79
  throw `There is no self-join foreign key relationship for table ${JSON.stringify(target)}`;
74
80
  }
75
81
  let allOnJoins = [];
76
- fcols.forEach(fc => {
82
+ fcols.forEach((fc) => {
77
83
  fc.references.forEach(({ fcols, cols }) => {
78
84
  const fieldArr = fcols.map((fcol, i) => [fcol, cols[i]]);
79
85
  allOnJoins.push(fieldArr);
@@ -82,29 +88,37 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
82
88
  allOnJoins = [
83
89
  ...allOnJoins,
84
90
  /** Reverse as well */
85
- ...allOnJoins.map(constraint => (constraint).map(([left, right]) => [right, left]))
91
+ ...allOnJoins.map((constraint) => constraint.map(([left, right]) => [right, left])),
86
92
  ];
87
93
  return {
88
- paths: [{
94
+ paths: [
95
+ {
89
96
  source,
90
97
  target,
91
98
  table: target,
92
- on: getValidOn(lastItem.on, allOnJoins.map(v => Object.fromEntries(v)))
93
- }],
94
- expectOne: false
99
+ on: getValidOn(lastItem.on, allOnJoins.map((v) => Object.fromEntries(v))),
100
+ },
101
+ ],
102
+ expectOne: false,
95
103
  };
96
104
  }
97
105
  /* Find the join path between tables */
98
106
  const tableConfigJoinInfo = viewHandler.dboBuilder?.prostgles?.tableConfigurator?.getJoinInfo(source, target);
99
107
  if (tableConfigJoinInfo)
100
108
  return tableConfigJoinInfo;
101
- const actualPath = getShortestJoin ?
102
- viewHandler.joinPaths.find(j => {
109
+ const actualPath = getShortestJoin
110
+ ? viewHandler.joinPaths
111
+ .find((j) => {
103
112
  return j.t1 === source && j.t2 === target;
104
- })?.path.map(table => ({ table, on: undefined })).slice(1) :
105
- viewHandler.joinPaths.find(j => {
106
- return j.path.join() === [{ table: source }, ...path].map(p => p.table).join();
107
- }) ? path : undefined;
113
+ })
114
+ ?.path.map((table) => ({ table, on: undefined }))
115
+ .slice(1)
116
+ : viewHandler.joinPaths.find((j) => {
117
+ return (j.path.join() ===
118
+ [{ table: source }, ...path].map((p) => p.table).join());
119
+ })
120
+ ? path
121
+ : undefined;
108
122
  if (getShortestJoin && actualPath?.length && lastItem.on?.length) {
109
123
  actualPath[actualPath.length - 1].on = lastItem.on;
110
124
  }
@@ -118,7 +132,7 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
118
132
  const t1 = i === 0 ? source : prevTable.table;
119
133
  viewHandler.joins ??= viewHandler.dboBuilder.joins;
120
134
  /* Get join options */
121
- const join = viewHandler.joins.find(j => j.tables.includes(t1) && j.tables.includes(tablePath.table));
135
+ const join = viewHandler.joins.find((j) => j.tables.includes(t1) && j.tables.includes(tablePath.table));
122
136
  if (!join) {
123
137
  throw `Joining ${t1} <-> ${tablePath} dissallowed or missing`;
124
138
  }
@@ -129,7 +143,7 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
129
143
  source,
130
144
  target,
131
145
  table: tablePath.table,
132
- on
146
+ on,
133
147
  });
134
148
  });
135
149
  const expectOne = false;
@@ -143,33 +157,34 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
143
157
  // expectOne = sCol.is_pkey && tCol.is_pkey
144
158
  // }
145
159
  // })
146
- const isMultiOrJoin = paths.find(p => p.on.length > 1);
160
+ const isMultiOrJoin = paths.find((p) => p.on.length > 1);
147
161
  if (!allowMultiOrJoin && isMultiOrJoin) {
148
162
  throw `Table ${JSON.stringify(source)} can join to ${JSON.stringify(target)} through multiple constraints. Must chose one of ${JSON.stringify(isMultiOrJoin.on)}`;
149
163
  }
150
164
  return {
151
165
  paths,
152
- expectOne
166
+ expectOne,
153
167
  };
154
168
  }
155
169
  const getValidOn = (requested, possible) => {
156
170
  if (!requested) {
157
- return possible.map(v => Object.entries(v));
171
+ return possible.map((v) => Object.entries(v));
158
172
  }
159
173
  if (!requested.length) {
160
174
  throw `Invalid requested "tablePath.on". Cannot be empty`;
161
175
  }
162
- const isValid = requested.every(requestedConstraint => {
163
- return possible.some(possibleConstraint => conditionsMatch(possibleConstraint, requestedConstraint));
176
+ const isValid = requested.every((requestedConstraint) => {
177
+ return possible.some((possibleConstraint) => conditionsMatch(possibleConstraint, requestedConstraint));
164
178
  });
165
179
  if (!isValid) {
166
180
  throw `Invalid path specified for join: ${JSON.stringify(requested)}. Allowed paths: ${JSON.stringify(possible)}`;
167
181
  }
168
- return requested.map(v => Object.entries(v));
182
+ return requested.map((v) => Object.entries(v));
169
183
  };
170
184
  const conditionsMatch = (c1, c2) => {
171
185
  const keys1 = Object.keys(c1);
172
186
  const keys2 = Object.keys(c2);
173
- return keys1.sort().join() === keys2.sort().join() && keys1.every(key => c1[key] === c2[key]);
187
+ return (keys1.sort().join() === keys2.sort().join() &&
188
+ keys1.every((key) => c1[key] === c2[key]));
174
189
  };
175
190
  //# sourceMappingURL=parseJoinPath.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"parseJoinPath.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parseJoinPath.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"prepareSortItems.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAwC,MAAM,sBAAsB,CAAC;AACrF,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,EA0GV,CAAA"}
1
+ {"version":3,"file":"prepareSortItems.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAKR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,mBAAmB,EAEpB,MAAM,8BAA8B,CAAC;AAGtC,eAAO,MAAM,gBAAgB,eACf,OAAO,GAAG,SAAS,gBACjB,MAAM,EAAE,cACV,MAAM,GAAG,SAAS,UACtB,mBAAmB,EAAE,eAChB,YAAY,EAAE,KAC1B,QAAQ,EA6HV,CAAC"}
@@ -18,12 +18,12 @@ const prepareSortItems = (rawOrderBy, allowed_cols, tableAlias, select, joinQuer
18
18
  else if (Array.isArray(rawOrderBy)) {
19
19
  /* Order by is formed of a list of ascending field names */
20
20
  const _orderBy = rawOrderBy;
21
- if (_orderBy && !_orderBy.find(v => typeof v !== "string")) {
21
+ if (_orderBy && !_orderBy.find((v) => typeof v !== "string")) {
22
22
  /* [string] */
23
- orderBy = _orderBy.map(key => ({ key, asc: true }));
23
+ orderBy = _orderBy.map((key) => ({ key, asc: true }));
24
24
  }
25
- else if (_orderBy.find(v => (0, dist_1.isObject)(v) && !(0, dist_1.isEmpty)(v))) {
26
- orderBy = _orderBy.map(v => parseOrderObj(v, true)[0]);
25
+ else if (_orderBy.find((v) => (0, dist_1.isObject)(v) && !(0, dist_1.isEmpty)(v))) {
26
+ orderBy = _orderBy.map((v) => parseOrderObj(v, true)[0]);
27
27
  }
28
28
  else
29
29
  return throwErr(rawOrderBy);
@@ -32,29 +32,33 @@ const prepareSortItems = (rawOrderBy, allowed_cols, tableAlias, select, joinQuer
32
32
  return throwErr(rawOrderBy);
33
33
  if (!orderBy || !orderBy.length)
34
34
  return [];
35
- const validatedAggAliases = select.filter(s => s.type !== "joinedColumn" &&
36
- (!s.fields.length || s.fields.every(f => allowed_cols.includes(f)))).map(s => s.alias);
37
- const sortableNestedColumns = joinQueries.flatMap(jq => jq.select.map(selectItem => {
35
+ const validatedAggAliases = select
36
+ .filter((s) => s.type !== "joinedColumn" &&
37
+ (!s.fields.length || s.fields.every((f) => allowed_cols.includes(f))))
38
+ .map((s) => s.alias);
39
+ const sortableNestedColumns = joinQueries.flatMap((jq) => jq.select.map((selectItem) => {
38
40
  const joinAlias = jq.tableAlias ?? jq.table;
39
41
  return {
40
42
  ...jq,
41
43
  selectItem,
42
44
  joinAlias,
43
- key: `${joinAlias}.${selectItem.alias}`
45
+ key: `${joinAlias}.${selectItem.alias}`,
44
46
  };
45
47
  }));
46
- const bad_param = orderBy.find(({ key }) => !sortableNestedColumns.some(v => v.key === key) &&
48
+ const bad_param = orderBy.find(({ key }) => !sortableNestedColumns.some((v) => v.key === key) &&
47
49
  !validatedAggAliases.includes(key) &&
48
50
  !allowed_cols.includes(key));
49
51
  if (bad_param) {
50
52
  throw "Invalid/disallowed orderBy fields or params: " + bad_param.key;
51
53
  }
52
- const selectedAliases = select.filter(s => s.selected).map(s => s.alias);
54
+ const selectedAliases = select.filter((s) => s.selected).map((s) => s.alias);
53
55
  const result = orderBy.map(({ key, asc, nulls, nullEmpty = false }) => {
54
- const nestedField = sortableNestedColumns.find(f => f.key === key);
56
+ const nestedField = sortableNestedColumns.find((f) => f.key === key);
55
57
  if (nestedField) {
56
58
  const { table, selectItem, joinAlias } = nestedField;
57
- const comparableDataTypeCast = ["uuid", "xml"].includes(selectItem.column_udt_type ?? "") ? "::TEXT" : "";
59
+ const comparableDataTypeCast = ["uuid", "xml"].includes(selectItem.column_udt_type ?? "")
60
+ ? "::TEXT"
61
+ : "";
58
62
  const sortItemAlias = (0, dist_1.asName)(`prostgles_nested_sort_${selectItem.alias}`);
59
63
  return {
60
64
  key,
@@ -73,10 +77,12 @@ const prepareSortItems = (rawOrderBy, allowed_cols, tableAlias, select, joinQuer
73
77
  };
74
78
  }
75
79
  /* Order by column index when possible to bypass name collision when ordering by a computed column.
76
- (Postgres will sort by existing columns wheundefined possible)
77
- */
80
+ (Postgres will sort by existing columns wheundefined possible)
81
+ */
78
82
  const index = selectedAliases.indexOf(key) + 1;
79
- let colKey = (index > 0 && !nullEmpty) ? index : [tableAlias, key].filter(dist_1.isDefined).map(dist_1.asName).join(".");
83
+ let colKey = index > 0 && !nullEmpty
84
+ ? index
85
+ : [tableAlias, key].filter(dist_1.isDefined).map(dist_1.asName).join(".");
80
86
  if (nullEmpty) {
81
87
  colKey = `nullif(trim(${colKey}::text), '')`;
82
88
  }
@@ -87,7 +93,7 @@ const prepareSortItems = (rawOrderBy, allowed_cols, tableAlias, select, joinQuer
87
93
  asc,
88
94
  nulls,
89
95
  nullEmpty,
90
- fieldPosition: colKey
96
+ fieldPosition: colKey,
91
97
  };
92
98
  }
93
99
  return {
@@ -103,18 +109,20 @@ const prepareSortItems = (rawOrderBy, allowed_cols, tableAlias, select, joinQuer
103
109
  };
104
110
  exports.prepareSortItems = prepareSortItems;
105
111
  const throwErr = (rawOrderBy) => {
106
- throw "\nInvalid orderBy option -> " + JSON.stringify(rawOrderBy) +
112
+ throw ("\nInvalid orderBy option -> " +
113
+ JSON.stringify(rawOrderBy) +
107
114
  "Expecting: \
108
115
  { key2: false, \"nested.key2\": false, key1: true } \
109
116
  { key1: 1, key2: -1 } \
110
117
  [{ key1: true }, { key2: false }] \
111
- [{ key: 'colName', asc: true, nulls: 'first', nullEmpty: true }]";
118
+ [{ key: 'colName', asc: true, nulls: 'first', nullEmpty: true }]");
112
119
  };
113
120
  const parseOrderObj = (orderBy, expectOne = false) => {
114
121
  if (!(0, dist_1.isObject)(orderBy))
115
122
  return throwErr(orderBy);
116
123
  const keys = Object.keys(orderBy);
117
- if (keys.length && keys.find(k => ["key", "asc", "nulls", "nullEmpty"].includes(k))) {
124
+ if (keys.length &&
125
+ keys.find((k) => ["key", "asc", "nulls", "nullEmpty"].includes(k))) {
118
126
  const { key, asc, nulls, nullEmpty = false } = orderBy;
119
127
  if (!["string"].includes(typeof key) ||
120
128
  !["boolean"].includes(typeof asc) ||
@@ -126,20 +134,21 @@ const parseOrderObj = (orderBy, expectOne = false) => {
126
134
  return [{ key, asc, nulls, nullEmpty }];
127
135
  }
128
136
  if (expectOne && keys.length > 1) {
129
- throw "\nInvalid orderBy " + JSON.stringify(orderBy) +
130
- "\nEach orderBy array element cannot have more than one key";
137
+ throw ("\nInvalid orderBy " +
138
+ JSON.stringify(orderBy) +
139
+ "\nEach orderBy array element cannot have more than one key");
131
140
  }
132
141
  /* { key2: true, key1: false } */
133
- if (!Object.values(orderBy).find(v => ![true, false].includes(v))) {
134
- return keys.map(key => ({ key, asc: Boolean(orderBy[key]) }));
142
+ if (!Object.values(orderBy).find((v) => ![true, false].includes(v))) {
143
+ return keys.map((key) => ({ key, asc: Boolean(orderBy[key]) }));
135
144
  /* { key2: -1, key1: 1 } */
136
145
  }
137
- else if (!Object.values(orderBy).find(v => ![-1, 1].includes(v))) {
138
- return keys.map(key => ({ key, asc: orderBy[key] === 1 }));
146
+ else if (!Object.values(orderBy).find((v) => ![-1, 1].includes(v))) {
147
+ return keys.map((key) => ({ key, asc: orderBy[key] === 1 }));
139
148
  /* { key2: "asc", key1: "desc" } */
140
149
  }
141
- else if (!Object.values(orderBy).find(v => !["asc", "desc"].includes(v))) {
142
- return keys.map(key => ({ key, asc: orderBy[key] === "asc" }));
150
+ else if (!Object.values(orderBy).find((v) => !["asc", "desc"].includes(v))) {
151
+ return keys.map((key) => ({ key, asc: orderBy[key] === "asc" }));
143
152
  }
144
153
  else
145
154
  return throwErr(orderBy);
@@ -1 +1 @@
1
- {"version":3,"file":"prepareSortItems.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prepareSortItems.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"prepareWhere.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareWhere.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAgC,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAG9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC;IACjC,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,wBAAsB,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAAE,CAAC,CAsEjL"}
1
+ {"version":3,"file":"prepareWhere.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareWhere.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,WAAW,EAIZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAG9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC;IACjC,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,wBAAsB,YAAY,CAChC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B,CAAC,CAgGD"}