prostgles-server 4.2.187 → 4.2.188

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 (338) hide show
  1. package/.eslintignore +2 -1
  2. package/.eslintrc.json +2 -0
  3. package/dist/Auth/AuthHandler.d.ts +18 -11
  4. package/dist/Auth/AuthHandler.d.ts.map +1 -1
  5. package/dist/Auth/AuthHandler.js +94 -120
  6. package/dist/Auth/AuthHandler.js.map +1 -1
  7. package/dist/Auth/AuthTypes.d.ts +78 -71
  8. package/dist/Auth/AuthTypes.d.ts.map +1 -1
  9. package/dist/Auth/{setEmailProvider.d.ts → authProviders/setEmailProvider.d.ts} +1 -1
  10. package/dist/Auth/authProviders/setEmailProvider.d.ts.map +1 -0
  11. package/dist/Auth/authProviders/setEmailProvider.js +27 -0
  12. package/dist/Auth/authProviders/setEmailProvider.js.map +1 -0
  13. package/dist/Auth/authProviders/setOAuthProviders.d.ts +5 -0
  14. package/dist/Auth/authProviders/setOAuthProviders.d.ts.map +1 -0
  15. package/dist/Auth/authProviders/setOAuthProviders.js +78 -0
  16. package/dist/Auth/authProviders/setOAuthProviders.js.map +1 -0
  17. package/dist/Auth/endpoints/getConfirmEmailRequestHandler.d.ts +7 -0
  18. package/dist/Auth/endpoints/getConfirmEmailRequestHandler.d.ts.map +1 -0
  19. package/dist/Auth/endpoints/getConfirmEmailRequestHandler.js +29 -0
  20. package/dist/Auth/endpoints/getConfirmEmailRequestHandler.js.map +1 -0
  21. package/dist/Auth/endpoints/getRegisterRequestHandler.d.ts +7 -0
  22. package/dist/Auth/endpoints/getRegisterRequestHandler.d.ts.map +1 -0
  23. package/dist/Auth/endpoints/getRegisterRequestHandler.js +74 -0
  24. package/dist/Auth/endpoints/getRegisterRequestHandler.js.map +1 -0
  25. package/dist/Auth/setAuthProviders.d.ts.map +1 -1
  26. package/dist/Auth/setAuthProviders.js +4 -74
  27. package/dist/Auth/setAuthProviders.js.map +1 -1
  28. package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
  29. package/dist/Auth/setupAuthRoutes.js +23 -33
  30. package/dist/Auth/setupAuthRoutes.js.map +1 -1
  31. package/dist/Auth/utils/checkDmarc.d.ts +2 -0
  32. package/dist/Auth/utils/checkDmarc.d.ts.map +1 -0
  33. package/dist/Auth/utils/checkDmarc.js +22 -0
  34. package/dist/Auth/utils/checkDmarc.js.map +1 -0
  35. package/dist/Auth/utils/getClientRequestIPsInfo.d.ts +3 -0
  36. package/dist/Auth/utils/getClientRequestIPsInfo.d.ts.map +1 -0
  37. package/dist/Auth/utils/getClientRequestIPsInfo.js +29 -0
  38. package/dist/Auth/utils/getClientRequestIPsInfo.js.map +1 -0
  39. package/dist/Auth/utils/getReturnUrl.d.ts +3 -0
  40. package/dist/Auth/utils/getReturnUrl.d.ts.map +1 -0
  41. package/dist/Auth/utils/getReturnUrl.js +15 -0
  42. package/dist/Auth/utils/getReturnUrl.js.map +1 -0
  43. package/dist/Auth/utils/getSafeReturnURL.d.ts.map +1 -0
  44. package/dist/Auth/utils/getSafeReturnURL.js.map +1 -0
  45. package/dist/DBEventsManager.d.ts.map +1 -1
  46. package/dist/DBEventsManager.js +4 -5
  47. package/dist/DBEventsManager.js.map +1 -1
  48. package/dist/DBSchemaBuilder.js +1 -1
  49. package/dist/DBSchemaBuilder.js.map +1 -1
  50. package/dist/DboBuilder/DboBuilder.d.ts +0 -1
  51. package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
  52. package/dist/DboBuilder/DboBuilder.js +3 -12
  53. package/dist/DboBuilder/DboBuilder.js.map +1 -1
  54. package/dist/DboBuilder/DboBuilderTypes.d.ts +4 -4
  55. package/dist/DboBuilder/DboBuilderTypes.d.ts.map +1 -1
  56. package/dist/DboBuilder/DboBuilderTypes.js.map +1 -1
  57. package/dist/DboBuilder/QueryBuilder/Functions.d.ts.map +1 -1
  58. package/dist/DboBuilder/QueryBuilder/Functions.js +38 -76
  59. package/dist/DboBuilder/QueryBuilder/Functions.js.map +1 -1
  60. package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts.map +1 -1
  61. package/dist/DboBuilder/QueryBuilder/QueryBuilder.js +4 -12
  62. package/dist/DboBuilder/QueryBuilder/QueryBuilder.js.map +1 -1
  63. package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts.map +1 -1
  64. package/dist/DboBuilder/QueryBuilder/getNewQuery.js +23 -33
  65. package/dist/DboBuilder/QueryBuilder/getNewQuery.js.map +1 -1
  66. package/dist/DboBuilder/QueryBuilder/getSelectQuery.d.ts +1 -1
  67. package/dist/DboBuilder/QueryBuilder/getSelectQuery.d.ts.map +1 -1
  68. package/dist/DboBuilder/QueryBuilder/getSelectQuery.js +6 -6
  69. package/dist/DboBuilder/QueryBuilder/getSelectQuery.js.map +1 -1
  70. package/dist/DboBuilder/QueryStreamer.d.ts.map +1 -1
  71. package/dist/DboBuilder/QueryStreamer.js +13 -19
  72. package/dist/DboBuilder/QueryStreamer.js.map +1 -1
  73. package/dist/DboBuilder/TableHandler/DataValidator.d.ts +1 -1
  74. package/dist/DboBuilder/TableHandler/DataValidator.d.ts.map +1 -1
  75. package/dist/DboBuilder/TableHandler/DataValidator.js +7 -16
  76. package/dist/DboBuilder/TableHandler/DataValidator.js.map +1 -1
  77. package/dist/DboBuilder/TableHandler/TableHandler.d.ts.map +1 -1
  78. package/dist/DboBuilder/TableHandler/TableHandler.js +7 -5
  79. package/dist/DboBuilder/TableHandler/TableHandler.js.map +1 -1
  80. package/dist/DboBuilder/TableHandler/delete.d.ts.map +1 -1
  81. package/dist/DboBuilder/TableHandler/delete.js +5 -8
  82. package/dist/DboBuilder/TableHandler/delete.js.map +1 -1
  83. package/dist/DboBuilder/TableHandler/insert.d.ts.map +1 -1
  84. package/dist/DboBuilder/TableHandler/insert.js +10 -15
  85. package/dist/DboBuilder/TableHandler/insert.js.map +1 -1
  86. package/dist/DboBuilder/TableHandler/insertTest.js +1 -1
  87. package/dist/DboBuilder/TableHandler/insertTest.js.map +1 -1
  88. package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.d.ts.map +1 -1
  89. package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js +1 -1
  90. package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js.map +1 -1
  91. package/dist/DboBuilder/TableHandler/update.d.ts.map +1 -1
  92. package/dist/DboBuilder/TableHandler/update.js +5 -9
  93. package/dist/DboBuilder/TableHandler/update.js.map +1 -1
  94. package/dist/DboBuilder/TableHandler/updateFile.d.ts +1 -1
  95. package/dist/DboBuilder/TableHandler/updateFile.d.ts.map +1 -1
  96. package/dist/DboBuilder/TableHandler/updateFile.js +7 -9
  97. package/dist/DboBuilder/TableHandler/updateFile.js.map +1 -1
  98. package/dist/DboBuilder/TableHandler/upsert.d.ts.map +1 -1
  99. package/dist/DboBuilder/TableHandler/upsert.js +1 -1
  100. package/dist/DboBuilder/TableHandler/upsert.js.map +1 -1
  101. package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
  102. package/dist/DboBuilder/ViewHandler/ViewHandler.js +11 -13
  103. package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
  104. package/dist/DboBuilder/ViewHandler/count.js +1 -1
  105. package/dist/DboBuilder/ViewHandler/count.js.map +1 -1
  106. package/dist/DboBuilder/ViewHandler/find.d.ts.map +1 -1
  107. package/dist/DboBuilder/ViewHandler/find.js +20 -27
  108. package/dist/DboBuilder/ViewHandler/find.js.map +1 -1
  109. package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts.map +1 -1
  110. package/dist/DboBuilder/ViewHandler/getExistsCondition.js +4 -10
  111. package/dist/DboBuilder/ViewHandler/getExistsCondition.js.map +1 -1
  112. package/dist/DboBuilder/ViewHandler/getInfo.js +2 -2
  113. package/dist/DboBuilder/ViewHandler/getInfo.js.map +1 -1
  114. package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts.map +1 -1
  115. package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js +6 -22
  116. package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js.map +1 -1
  117. package/dist/DboBuilder/ViewHandler/parseFieldFilter.d.ts.map +1 -1
  118. package/dist/DboBuilder/ViewHandler/parseFieldFilter.js +6 -10
  119. package/dist/DboBuilder/ViewHandler/parseFieldFilter.js.map +1 -1
  120. package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts.map +1 -1
  121. package/dist/DboBuilder/ViewHandler/parseJoinPath.js +8 -11
  122. package/dist/DboBuilder/ViewHandler/parseJoinPath.js.map +1 -1
  123. package/dist/DboBuilder/ViewHandler/prepareSortItems.d.ts.map +1 -1
  124. package/dist/DboBuilder/ViewHandler/prepareSortItems.js +7 -12
  125. package/dist/DboBuilder/ViewHandler/prepareSortItems.js.map +1 -1
  126. package/dist/DboBuilder/ViewHandler/prepareWhere.d.ts.map +1 -1
  127. package/dist/DboBuilder/ViewHandler/prepareWhere.js +6 -10
  128. package/dist/DboBuilder/ViewHandler/prepareWhere.js.map +1 -1
  129. package/dist/DboBuilder/dboBuilderUtils.d.ts.map +1 -1
  130. package/dist/DboBuilder/dboBuilderUtils.js +8 -23
  131. package/dist/DboBuilder/dboBuilderUtils.js.map +1 -1
  132. package/dist/DboBuilder/getColumns.d.ts.map +1 -1
  133. package/dist/DboBuilder/getColumns.js +19 -26
  134. package/dist/DboBuilder/getColumns.js.map +1 -1
  135. package/dist/DboBuilder/getCondition.d.ts.map +1 -1
  136. package/dist/DboBuilder/getCondition.js +7 -9
  137. package/dist/DboBuilder/getCondition.js.map +1 -1
  138. package/dist/DboBuilder/getSubscribeRelatedTables.js +2 -2
  139. package/dist/DboBuilder/getSubscribeRelatedTables.js.map +1 -1
  140. package/dist/DboBuilder/getTablesForSchemaPostgresSQL.d.ts.map +1 -1
  141. package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js +14 -15
  142. package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js.map +1 -1
  143. package/dist/DboBuilder/insertNestedRecords.d.ts.map +1 -1
  144. package/dist/DboBuilder/insertNestedRecords.js +26 -40
  145. package/dist/DboBuilder/insertNestedRecords.js.map +1 -1
  146. package/dist/DboBuilder/parseUpdateRules.js +1 -1
  147. package/dist/DboBuilder/parseUpdateRules.js.map +1 -1
  148. package/dist/DboBuilder/prepareShortestJoinPaths.d.ts.map +1 -1
  149. package/dist/DboBuilder/prepareShortestJoinPaths.js +12 -18
  150. package/dist/DboBuilder/prepareShortestJoinPaths.js.map +1 -1
  151. package/dist/DboBuilder/runSQL.d.ts +1 -1
  152. package/dist/DboBuilder/runSQL.d.ts.map +1 -1
  153. package/dist/DboBuilder/runSQL.js +14 -27
  154. package/dist/DboBuilder/runSQL.js.map +1 -1
  155. package/dist/DboBuilder/uploadFile.d.ts +1 -1
  156. package/dist/DboBuilder/uploadFile.d.ts.map +1 -1
  157. package/dist/DboBuilder/uploadFile.js +4 -11
  158. package/dist/DboBuilder/uploadFile.js.map +1 -1
  159. package/dist/FileManager/FileManager.d.ts.map +1 -1
  160. package/dist/FileManager/FileManager.js +11 -13
  161. package/dist/FileManager/FileManager.js.map +1 -1
  162. package/dist/FileManager/initFileManager.d.ts.map +1 -1
  163. package/dist/FileManager/initFileManager.js +60 -62
  164. package/dist/FileManager/initFileManager.js.map +1 -1
  165. package/dist/FileManager/uploadStream.js +2 -2
  166. package/dist/FileManager/uploadStream.js.map +1 -1
  167. package/dist/Filtering.d.ts +1 -1
  168. package/dist/Filtering.d.ts.map +1 -1
  169. package/dist/Filtering.js +12 -35
  170. package/dist/Filtering.js.map +1 -1
  171. package/dist/JSONBValidation/validation.d.ts.map +1 -1
  172. package/dist/JSONBValidation/validation.js +20 -26
  173. package/dist/JSONBValidation/validation.js.map +1 -1
  174. package/dist/Logging.d.ts +1 -0
  175. package/dist/Logging.d.ts.map +1 -1
  176. package/dist/PostgresNotifListenManager.d.ts.map +1 -1
  177. package/dist/PostgresNotifListenManager.js +1 -5
  178. package/dist/PostgresNotifListenManager.js.map +1 -1
  179. package/dist/Prostgles.d.ts +1 -1
  180. package/dist/Prostgles.d.ts.map +1 -1
  181. package/dist/Prostgles.js +18 -33
  182. package/dist/Prostgles.js.map +1 -1
  183. package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
  184. package/dist/PubSubManager/PubSubManager.js +8 -13
  185. package/dist/PubSubManager/PubSubManager.js.map +1 -1
  186. package/dist/PubSubManager/addSub.d.ts.map +1 -1
  187. package/dist/PubSubManager/addSub.js +1 -1
  188. package/dist/PubSubManager/addSub.js.map +1 -1
  189. package/dist/PubSubManager/addSync.d.ts.map +1 -1
  190. package/dist/PubSubManager/addSync.js +4 -7
  191. package/dist/PubSubManager/addSync.js.map +1 -1
  192. package/dist/PubSubManager/getCreatePubSubManagerError.js +6 -6
  193. package/dist/PubSubManager/getCreatePubSubManagerError.js.map +1 -1
  194. package/dist/PubSubManager/initPubSubManager.d.ts.map +1 -1
  195. package/dist/PubSubManager/initPubSubManager.js +2 -3
  196. package/dist/PubSubManager/initPubSubManager.js.map +1 -1
  197. package/dist/PubSubManager/pushSubData.d.ts.map +1 -1
  198. package/dist/PubSubManager/pushSubData.js +0 -2
  199. package/dist/PubSubManager/pushSubData.js.map +1 -1
  200. package/dist/PublishParser/PublishParser.d.ts.map +1 -1
  201. package/dist/PublishParser/PublishParser.js +8 -13
  202. package/dist/PublishParser/PublishParser.js.map +1 -1
  203. package/dist/PublishParser/getFileTableRules.js +1 -1
  204. package/dist/PublishParser/getFileTableRules.js.map +1 -1
  205. package/dist/PublishParser/getSchemaFromPublish.d.ts.map +1 -1
  206. package/dist/PublishParser/getSchemaFromPublish.js +6 -13
  207. package/dist/PublishParser/getSchemaFromPublish.js.map +1 -1
  208. package/dist/PublishParser/getTableRulesWithoutFileTable.d.ts.map +1 -1
  209. package/dist/PublishParser/getTableRulesWithoutFileTable.js +14 -19
  210. package/dist/PublishParser/getTableRulesWithoutFileTable.js.map +1 -1
  211. package/dist/RestApi.d.ts +1 -1
  212. package/dist/RestApi.d.ts.map +1 -1
  213. package/dist/RestApi.js +2 -2
  214. package/dist/RestApi.js.map +1 -1
  215. package/dist/SchemaWatch/SchemaWatch.d.ts.map +1 -1
  216. package/dist/SchemaWatch/SchemaWatch.js +2 -2
  217. package/dist/SchemaWatch/SchemaWatch.js.map +1 -1
  218. package/dist/SyncReplication.d.ts.map +1 -1
  219. package/dist/SyncReplication.js +31 -41
  220. package/dist/SyncReplication.js.map +1 -1
  221. package/dist/TableConfig/TableConfig.d.ts.map +1 -1
  222. package/dist/TableConfig/TableConfig.js +7 -9
  223. package/dist/TableConfig/TableConfig.js.map +1 -1
  224. package/dist/TableConfig/getConstraintDefinitionQueries.d.ts.map +1 -1
  225. package/dist/TableConfig/getConstraintDefinitionQueries.js +1 -6
  226. package/dist/TableConfig/getConstraintDefinitionQueries.js.map +1 -1
  227. package/dist/TableConfig/getFutureTableSchema.d.ts.map +1 -1
  228. package/dist/TableConfig/getFutureTableSchema.js +16 -28
  229. package/dist/TableConfig/getFutureTableSchema.js.map +1 -1
  230. package/dist/TableConfig/getTableColumnQueries.d.ts.map +1 -1
  231. package/dist/TableConfig/getTableColumnQueries.js +5 -9
  232. package/dist/TableConfig/getTableColumnQueries.js.map +1 -1
  233. package/dist/TableConfig/initTableConfig.d.ts.map +1 -1
  234. package/dist/TableConfig/initTableConfig.js +22 -25
  235. package/dist/TableConfig/initTableConfig.js.map +1 -1
  236. package/dist/initProstgles.js +1 -1
  237. package/dist/initProstgles.js.map +1 -1
  238. package/dist/onSocketConnected.d.ts.map +1 -1
  239. package/dist/onSocketConnected.js +2 -4
  240. package/dist/onSocketConnected.js.map +1 -1
  241. package/dist/runClientRequest.d.ts.map +1 -1
  242. package/dist/runClientRequest.js +14 -13
  243. package/dist/runClientRequest.js.map +1 -1
  244. package/lib/Auth/AuthHandler.ts +117 -137
  245. package/lib/Auth/AuthTypes.ts +97 -81
  246. package/lib/Auth/authProviders/setEmailProvider.ts +29 -0
  247. package/lib/Auth/authProviders/setOAuthProviders.ts +97 -0
  248. package/lib/Auth/endpoints/getConfirmEmailRequestHandler.ts +39 -0
  249. package/lib/Auth/endpoints/getRegisterRequestHandler.ts +83 -0
  250. package/lib/Auth/setAuthProviders.ts +8 -111
  251. package/lib/Auth/setupAuthRoutes.ts +105 -148
  252. package/lib/Auth/utils/checkDmarc.ts +19 -0
  253. package/lib/Auth/utils/getClientRequestIPsInfo.ts +25 -0
  254. package/lib/Auth/utils/getReturnUrl.ts +13 -0
  255. package/lib/DBEventsManager.ts +12 -26
  256. package/lib/DBSchemaBuilder.ts +1 -1
  257. package/lib/DboBuilder/DboBuilder.ts +23 -52
  258. package/lib/DboBuilder/DboBuilderTypes.ts +9 -23
  259. package/lib/DboBuilder/QueryBuilder/Functions.ts +86 -188
  260. package/lib/DboBuilder/QueryBuilder/QueryBuilder.ts +11 -36
  261. package/lib/DboBuilder/QueryBuilder/getNewQuery.ts +102 -129
  262. package/lib/DboBuilder/QueryBuilder/getSelectQuery.ts +14 -27
  263. package/lib/DboBuilder/QueryStreamer.ts +26 -57
  264. package/lib/DboBuilder/TableHandler/DataValidator.ts +58 -90
  265. package/lib/DboBuilder/TableHandler/TableHandler.ts +19 -45
  266. package/lib/DboBuilder/TableHandler/delete.ts +9 -18
  267. package/lib/DboBuilder/TableHandler/insert.ts +18 -31
  268. package/lib/DboBuilder/TableHandler/insertTest.ts +1 -1
  269. package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts +8 -19
  270. package/lib/DboBuilder/TableHandler/update.ts +17 -46
  271. package/lib/DboBuilder/TableHandler/updateFile.ts +18 -21
  272. package/lib/DboBuilder/TableHandler/upsert.ts +7 -24
  273. package/lib/DboBuilder/ViewHandler/ViewHandler.ts +13 -15
  274. package/lib/DboBuilder/ViewHandler/count.ts +1 -1
  275. package/lib/DboBuilder/ViewHandler/find.ts +28 -35
  276. package/lib/DboBuilder/ViewHandler/getExistsCondition.ts +8 -30
  277. package/lib/DboBuilder/ViewHandler/getInfo.ts +2 -2
  278. package/lib/DboBuilder/ViewHandler/getTableJoinQuery.ts +16 -32
  279. package/lib/DboBuilder/ViewHandler/parseFieldFilter.ts +9 -16
  280. package/lib/DboBuilder/ViewHandler/parseJoinPath.ts +26 -44
  281. package/lib/DboBuilder/ViewHandler/prepareSortItems.ts +58 -82
  282. package/lib/DboBuilder/ViewHandler/prepareWhere.ts +14 -27
  283. package/lib/DboBuilder/dboBuilderUtils.ts +19 -46
  284. package/lib/DboBuilder/getColumns.ts +24 -46
  285. package/lib/DboBuilder/getCondition.ts +18 -30
  286. package/lib/DboBuilder/getSubscribeRelatedTables.ts +2 -2
  287. package/lib/DboBuilder/getTablesForSchemaPostgresSQL.ts +44 -62
  288. package/lib/DboBuilder/insertNestedRecords.ts +67 -135
  289. package/lib/DboBuilder/parseUpdateRules.ts +1 -1
  290. package/lib/DboBuilder/prepareShortestJoinPaths.ts +23 -58
  291. package/lib/DboBuilder/runSQL.ts +41 -76
  292. package/lib/DboBuilder/uploadFile.ts +26 -37
  293. package/lib/FileManager/FileManager.ts +27 -58
  294. package/lib/FileManager/initFileManager.ts +68 -76
  295. package/lib/FileManager/uploadStream.ts +2 -2
  296. package/lib/Filtering.ts +30 -87
  297. package/lib/JSONBValidation/validation.ts +36 -75
  298. package/lib/Logging.ts +1 -1
  299. package/lib/PostgresNotifListenManager.ts +11 -35
  300. package/lib/Prostgles.ts +42 -100
  301. package/lib/PubSubManager/PubSubManager.ts +30 -66
  302. package/lib/PubSubManager/addSub.ts +11 -18
  303. package/lib/PubSubManager/addSync.ts +5 -12
  304. package/lib/PubSubManager/getCreatePubSubManagerError.ts +9 -9
  305. package/lib/PubSubManager/initPubSubManager.ts +7 -13
  306. package/lib/PubSubManager/pushSubData.ts +1 -7
  307. package/lib/PublishParser/PublishParser.ts +8 -12
  308. package/lib/PublishParser/getFileTableRules.ts +1 -1
  309. package/lib/PublishParser/getSchemaFromPublish.ts +26 -42
  310. package/lib/PublishParser/getTableRulesWithoutFileTable.ts +22 -37
  311. package/lib/RestApi.ts +4 -12
  312. package/lib/SchemaWatch/SchemaWatch.ts +11 -24
  313. package/lib/SyncReplication.ts +96 -190
  314. package/lib/TableConfig/TableConfig.ts +16 -38
  315. package/lib/TableConfig/getConstraintDefinitionQueries.ts +2 -8
  316. package/lib/TableConfig/getFutureTableSchema.ts +20 -34
  317. package/lib/TableConfig/getTableColumnQueries.ts +13 -35
  318. package/lib/TableConfig/initTableConfig.ts +40 -64
  319. package/lib/initProstgles.ts +1 -1
  320. package/lib/onSocketConnected.ts +8 -12
  321. package/lib/runClientRequest.ts +31 -54
  322. package/package.json +2 -2
  323. package/dist/Auth/getSafeReturnURL.d.ts.map +0 -1
  324. package/dist/Auth/getSafeReturnURL.js.map +0 -1
  325. package/dist/Auth/setEmailProvider.d.ts.map +0 -1
  326. package/dist/Auth/setEmailProvider.js +0 -133
  327. package/dist/Auth/setEmailProvider.js.map +0 -1
  328. package/dist/DboBuilder/runTransaction.d.ts +0 -9
  329. package/dist/DboBuilder/runTransaction.d.ts.map +0 -1
  330. package/dist/DboBuilder/runTransaction.js +0 -49
  331. package/dist/DboBuilder/runTransaction.js.map +0 -1
  332. package/lib/Auth/setEmailProvider.ts +0 -132
  333. package/lib/DboBuilder/QueryBuilder/prepareHaving.ts +0 -27
  334. package/lib/DboBuilder/runTransaction.ts +0 -61
  335. package/lib/SchemaWatch/createSchemaWatchEventTrigger.ts +0 -3
  336. /package/dist/Auth/{getSafeReturnURL.d.ts → utils/getSafeReturnURL.d.ts} +0 -0
  337. /package/dist/Auth/{getSafeReturnURL.js → utils/getSafeReturnURL.js} +0 -0
  338. /package/lib/Auth/{getSafeReturnURL.ts → utils/getSafeReturnURL.ts} +0 -0
@@ -34,17 +34,18 @@ async function insertNestedRecords({ data, param2, tableRules, localParams = {}
34
34
  * Nested insert is not allowed for the file table
35
35
  * */
36
36
  const isMultiInsert = Array.isArray(data);
37
- const hasNestedInserts = this.is_media
38
- ? false
39
- : (isMultiInsert ? data : [data]).some((d) => getExtraKeys(d).length || (0, exports.getReferenceColumnInserts)(this, d).length);
37
+ const hasNestedInserts = this.is_media ? false : ((isMultiInsert ? data : [data]).some((d) => getExtraKeys(d).length || (0, exports.getReferenceColumnInserts)(this, d).length));
40
38
  /**
41
39
  * Make sure nested insert uses a transaction
42
40
  */
43
41
  const dbTX = this.getFinalDBtx(localParams);
44
- const t = localParams?.tx?.t || this.tx?.t;
42
+ const t = localParams.tx?.t || this.tx?.t;
45
43
  if (hasNestedInserts && (!dbTX || !t)) {
46
44
  return {
47
- insertResult: await this.dboBuilder.getTX((dbTX, _t) => dbTX[this.name].insert(data, param2, undefined, tableRules, { tx: { dbTX, t: _t }, ...localParams })),
45
+ insertResult: await this.dboBuilder.getTX((dbTX, _t) => dbTX[this.name].insert(data, param2, undefined, tableRules, {
46
+ tx: { dbTX, t: _t },
47
+ ...localParams,
48
+ })),
48
49
  };
49
50
  }
50
51
  const _data = await Promise.all((isMultiInsert ? data : [data]).map(async (row) => {
@@ -73,7 +74,7 @@ async function insertNestedRecords({ data, param2, tableRules, localParams = {}
73
74
  if (colInserts.length) {
74
75
  for await (const colInsert of colInsertsResult) {
75
76
  const newLocalParams = {
76
- ...(localParams ?? {}),
77
+ ...localParams,
77
78
  nestedInsert: {
78
79
  depth: (localParams.nestedInsert?.depth ?? 0) + 1,
79
80
  previousData: rootData,
@@ -85,8 +86,7 @@ async function insertNestedRecords({ data, param2, tableRules, localParams = {}
85
86
  if (!Array.isArray(colRows) ||
86
87
  colRows.length !== 1 ||
87
88
  [null, undefined].includes(colRows[0][colInsert.fcol])) {
88
- throw new Error("Could not do nested column insert: Unexpected return " +
89
- JSON.stringify(colRows));
89
+ throw new Error("Could not do nested column insert: Unexpected return " + JSON.stringify(colRows));
90
90
  }
91
91
  colInsert.inserted = colRows;
92
92
  const foreignKey = colRows[0][colInsert.fcol];
@@ -103,30 +103,27 @@ async function insertNestedRecords({ data, param2, tableRules, localParams = {}
103
103
  .filter((s) => s.selected)
104
104
  .map((rs) => {
105
105
  const colInsertResult = colInsertsResult.find(({ col }) => col === rs.columnName);
106
- const inserted = colInsertResult?.singleInsert
107
- ? colInsertResult.inserted?.[0]
106
+ const inserted = colInsertResult?.singleInsert ?
107
+ colInsertResult.inserted?.[0]
108
108
  : colInsertResult?.inserted;
109
109
  returnData[rs.alias] = inserted ?? fullRootResult[rs.alias];
110
110
  });
111
111
  }
112
112
  await Promise.all(extraKeys.map(async (targetTable) => {
113
- const childDataItems = Array.isArray(row[targetTable])
114
- ? row[targetTable]
115
- : [row[targetTable]];
113
+ const childDataItems = Array.isArray(row[targetTable]) ? row[targetTable] : [row[targetTable]];
116
114
  const childInsert = async (cdata, tableName) => {
117
115
  return referencedInsert(this, dbTX, localParams, tableName, cdata);
118
116
  };
119
117
  const joinPath = await getJoinPath(this, targetTable);
120
118
  const { path } = joinPath;
121
119
  const [tbl1, tbl2, tbl3] = path;
122
- targetTableRules = await (0, exports.getInsertTableRules)(this, targetTable, localParams); // tbl3
120
+ targetTableRules = await (0, exports.getInsertTableRules)(this, targetTable, localParams);
123
121
  const cols2 = this.dboBuilder.dbo[tbl2].columns || [];
124
122
  if (!this.dboBuilder.dbo[tbl2])
125
123
  throw "Invalid/disallowed table: " + tbl2;
126
- const colsRefT1 = cols2?.filter((c) => c.references?.some((rc) => rc.cols.length === 1 && rc.ftable === tbl1));
124
+ const colsRefT1 = cols2.filter((c) => c.references?.some((rc) => rc.cols.length === 1 && rc.ftable === tbl1));
127
125
  if (!path.length) {
128
- throw ("Nested inserts join path not found for " +
129
- [this.name, targetTable]);
126
+ throw "Nested inserts join path not found for " + [this.name, targetTable];
130
127
  }
131
128
  else if (path.length === 2) {
132
129
  if (targetTable !== tbl2)
@@ -146,7 +143,7 @@ async function insertNestedRecords({ data, param2, tableRules, localParams = {}
146
143
  else if (path.length === 3) {
147
144
  if (targetTable !== tbl3)
148
145
  throw "Did not expect this";
149
- const colsRefT3 = cols2?.filter((c) => c.references?.some((rc) => rc.cols.length === 1 && rc.ftable === tbl3));
146
+ const colsRefT3 = cols2.filter((c) => c.references?.some((rc) => rc.cols.length === 1 && rc.ftable === tbl3));
150
147
  if (!colsRefT1.length || !colsRefT3.length)
151
148
  throw "Incorrectly referenced or missing columns for nested insert";
152
149
  const fileTable = this.dboBuilder.prostgles.fileManager?.tableName;
@@ -154,11 +151,8 @@ async function insertNestedRecords({ data, param2, tableRules, localParams = {}
154
151
  throw "Only media allowed to have nested inserts more than 2 tables apart";
155
152
  }
156
153
  /* We expect tbl2 to have only 2 columns (media_id and foreign_id) */
157
- if (!cols2 ||
158
- !(cols2.filter((c) => c.references?.[0]?.ftable === fileTable)
159
- .length === 1 &&
160
- cols2.filter((c) => c.references?.[0]?.ftable === _this.name)
161
- .length === 1)) {
154
+ if (!(cols2.filter((c) => c.references?.[0]?.ftable === fileTable).length === 1 &&
155
+ cols2.filter((c) => c.references?.[0]?.ftable === _this.name).length === 1)) {
162
156
  console.log({
163
157
  tbl1,
164
158
  tbl2,
@@ -178,8 +172,7 @@ async function insertNestedRecords({ data, param2, tableRules, localParams = {}
178
172
  tbl2Row[col.name] = t3Child[col.references[0].fcols[0]];
179
173
  });
180
174
  colsRefT1.map((col) => {
181
- tbl2Row[col.name] =
182
- fullRootResult[col.references[0].fcols[0]];
175
+ tbl2Row[col.name] = fullRootResult[col.references[0].fcols[0]];
183
176
  });
184
177
  await childInsert(tbl2Row, tbl2); //.then(() => {});
185
178
  }));
@@ -189,9 +182,9 @@ async function insertNestedRecords({ data, param2, tableRules, localParams = {}
189
182
  throw "Unexpected path for Nested inserts";
190
183
  }
191
184
  /* Return also the nested inserted data */
192
- if (targetTableRules && insertedChildren?.length && returning) {
185
+ if (insertedChildren.length && returning) {
193
186
  const targetTableHandler = dbTX[targetTable];
194
- const targetReturning = await targetTableHandler.prepareReturning("*", targetTableHandler.parseFieldFilter(targetTableRules?.insert?.returningFields));
187
+ const targetReturning = await targetTableHandler.prepareReturning("*", targetTableHandler.parseFieldFilter(targetTableRules.insert?.returningFields));
195
188
  const clientTargetInserts = insertedChildren.map((d) => {
196
189
  const _d = { ...d };
197
190
  const res = {};
@@ -201,9 +194,7 @@ async function insertNestedRecords({ data, param2, tableRules, localParams = {}
201
194
  return res;
202
195
  });
203
196
  returnData[targetTable] =
204
- clientTargetInserts.length === 1
205
- ? clientTargetInserts[0]
206
- : clientTargetInserts;
197
+ clientTargetInserts.length === 1 ? clientTargetInserts[0] : clientTargetInserts;
207
198
  }
208
199
  }));
209
200
  return returnData;
@@ -230,21 +221,16 @@ exports.getInsertTableRules = getInsertTableRules;
230
221
  const getJoinPath = async (tableHandler, targetTable) => {
231
222
  const jp = tableHandler.dboBuilder.getShortestJoinPath(tableHandler, targetTable);
232
223
  if (!jp) {
233
- const pref = tableHandler.dboBuilder.prostgles.opts.joins !== "inferred"
234
- ? "Joins are not inferred! "
235
- : "";
224
+ const pref = tableHandler.dboBuilder.prostgles.opts.joins !== "inferred" ? "Joins are not inferred! " : "";
236
225
  throw new Error(`${pref}Could not find a single join path for the nested data ( sourceTable: ${tableHandler.name} targetTable: ${targetTable} ) `);
237
226
  }
238
227
  return jp;
239
228
  };
240
229
  const referencedInsert = async (tableHandler, dbTX, localParams, targetTable, targetData) => {
241
- // const thisInfo = await tableHandler.getInfo();
242
230
  await getJoinPath(tableHandler, targetTable);
243
- if (!targetData ||
244
- !dbTX?.[targetTable] ||
245
- !("insert" in dbTX[targetTable])) {
246
- throw new Error("childInsertErr: Table handler missing for referenced table: " +
247
- targetTable);
231
+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
232
+ if (!targetData || !dbTX?.[targetTable] || !("insert" in dbTX[targetTable])) {
233
+ throw new Error("childInsertErr: Table handler missing for referenced table: " + targetTable);
248
234
  }
249
235
  const childRules = await (0, exports.getInsertTableRules)(tableHandler, targetTable, localParams);
250
236
  // if (thisInfo.has_media === "one" && thisInfo.media_table_name === targetTable && Array.isArray(targetData) && targetData.length > 1) {
@@ -282,7 +268,7 @@ const getReferenceColumnInserts = (tableHandler, parentRow, expectSingleInsert)
282
268
  if (insertedRefColRef.length !== 1) {
283
269
  throw "Cannot do a nested insert on column that references multiple tables";
284
270
  }
285
- const referencesMultipleColumns = insertedRefColRef?.some((refs) => refs.fcols.length !== 1);
271
+ const referencesMultipleColumns = insertedRefColRef.some((refs) => refs.fcols.length !== 1);
286
272
  if (referencesMultipleColumns) {
287
273
  throw "Cannot do a nested insert on multi-column foreign key reference";
288
274
  }
@@ -1 +1 @@
1
- {"version":3,"file":"insertNestedRecords.js","sourceRoot":"","sources":["../../lib/DboBuilder/insertNestedRecords.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"insertNestedRecords.js","sourceRoot":"","sources":["../../lib/DboBuilder/insertNestedRecords.ts"],"names":[],"mappings":"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"}
@@ -20,7 +20,7 @@ async function parseUpdateRules(filter, params, tableRules, localParams) {
20
20
  ({ forcedFilter, forcedData, fields, filterFields, validate } =
21
21
  tableRules.update);
22
22
  returningFields =
23
- tableRules.update.returningFields ?? tableRules?.select?.fields ?? "";
23
+ tableRules.update.returningFields ?? tableRules.select?.fields ?? "";
24
24
  if (!returningFields && params?.returning) {
25
25
  throw "You are not allowed to return any fields from the update";
26
26
  }
@@ -1 +1 @@
1
- {"version":3,"file":"parseUpdateRules.js","sourceRoot":"","sources":["../../lib/DboBuilder/parseUpdateRules.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parseUpdateRules.js","sourceRoot":"","sources":["../../lib/DboBuilder/parseUpdateRules.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"prepareShortestJoinPaths.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/prepareShortestJoinPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAc,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAoB,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,KAAK,MAAM,GAAG;IACZ,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,iBAAiB,EAAE,SAAS,CAAC;CAC9B,CAAC;AACF,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,MAAM,CAAC,CAgKjB"}
1
+ {"version":3,"file":"prepareShortestJoinPaths.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/prepareShortestJoinPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAc,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAoB,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,KAAK,MAAM,GAAG;IACZ,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,iBAAiB,EAAE,SAAS,CAAC;CAC9B,CAAC;AACF,wBAAsB,wBAAwB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CA2ItF"}
@@ -17,6 +17,7 @@ async function prepareShortestJoinPaths(dboBuilder) {
17
17
  else if (Array.isArray(joinConfig)) {
18
18
  const joinTables = joinConfig.map((j) => j.tables).flat();
19
19
  joinConfig = joinConfig.concat(inferredJoins.filter((j) => !j.tables.find((t) => joinTables.includes(t))));
20
+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
20
21
  }
21
22
  else if (joinConfig) {
22
23
  throw new Error("Unexpected joins init param. Expecting 'inferred' OR joinConfig but got: " +
@@ -27,9 +28,7 @@ async function prepareShortestJoinPaths(dboBuilder) {
27
28
  try {
28
29
  const tovNames = dboBuilder.tablesOrViews.map((t) => t.name);
29
30
  // 2 find incorrect tables
30
- const missing = joins
31
- .flatMap((j) => j.tables)
32
- .find((t) => !tovNames.includes(t));
31
+ const missing = joins.flatMap((j) => j.tables).find((t) => !tovNames.includes(t));
33
32
  if (missing) {
34
33
  throw "Table not found: " + missing;
35
34
  }
@@ -47,25 +46,21 @@ async function prepareShortestJoinPaths(dboBuilder) {
47
46
  if (!tov)
48
47
  throw "Table not found: " + t;
49
48
  const m1 = f.filter((k) => !tov.columns.map((c) => c.name).includes(k));
50
- if (m1 && m1.length) {
49
+ if (m1.length) {
51
50
  throw `Table ${t}(${tov.columns.map((c) => c.name).join()}) has no fields named: ${m1.join()}`;
52
51
  }
53
52
  });
54
53
  });
55
54
  });
56
55
  // 4 find incorrect/missing join types
57
- const expected_types = " \n\n-> Expecting: " +
58
- ProstglesTypes_1.JOIN_TYPES.map((t) => JSON.stringify(t)).join(` | `);
56
+ const expected_types = " \n\n-> Expecting: " + ProstglesTypes_1.JOIN_TYPES.map((t) => JSON.stringify(t)).join(` | `);
57
+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
59
58
  const mt = joins.find((j) => !j.type);
60
59
  if (mt)
61
- throw ("Join type missing for: " +
62
- JSON.stringify(mt, null, 2) +
63
- expected_types);
60
+ throw "Join type missing for: " + JSON.stringify(mt, null, 2) + expected_types;
64
61
  const it = joins.find((j) => !ProstglesTypes_1.JOIN_TYPES.includes(j.type));
65
62
  if (it)
66
- throw ("Incorrect join type for: " +
67
- JSON.stringify(it, null, 2) +
68
- expected_types);
63
+ throw "Incorrect join type for: " + JSON.stringify(it, null, 2) + expected_types;
69
64
  }
70
65
  catch (e) {
71
66
  const errMsg = (joinConfig === "inferred" ? "INFERRED " : "") +
@@ -86,14 +81,14 @@ async function prepareShortestJoinPaths(dboBuilder) {
86
81
  });
87
82
  const tables = Array.from(new Set(joins.flatMap((t) => t.tables)));
88
83
  const shortestJoinPaths = [];
89
- tables.forEach((t1, i1) => {
90
- tables.forEach((t2, i2) => {
84
+ tables.forEach((t1) => {
85
+ tables.forEach((t2) => {
91
86
  /** Prevent recursion */
92
87
  if (t1 === t2 ||
93
88
  shortestJoinPaths.some((jp) => {
94
89
  if (arrayValuesMatch([jp.t1, jp.t2], [t1, t2])) {
95
90
  const spath = (0, shortestPath_1.findShortestPath)(joinGraph, t1, t2);
96
- if (spath && arrayValuesMatch(spath.path, jp.path)) {
91
+ if (arrayValuesMatch(spath.path, jp.path)) {
97
92
  return true;
98
93
  }
99
94
  }
@@ -101,7 +96,7 @@ async function prepareShortestJoinPaths(dboBuilder) {
101
96
  return;
102
97
  }
103
98
  const spath = (0, shortestPath_1.findShortestPath)(joinGraph, t1, t2);
104
- if (!(spath && spath.distance < Infinity))
99
+ if (!(spath.distance < Infinity))
105
100
  return;
106
101
  const existing1 = shortestJoinPaths.find((j) => j.t1 === t1 && j.t2 === t2);
107
102
  if (!existing1) {
@@ -170,8 +165,7 @@ async function getInferredJoins2(schema) {
170
165
  const ftablePkeys = schema
171
166
  .find((_tov) => _tov.name === r.ftable)
172
167
  ?.columns.filter((fcol) => fcol.is_pkey);
173
- if (ftablePkeys?.length &&
174
- ftablePkeys.every((fkey) => r.fcols.includes(fkey.name))) {
168
+ if (ftablePkeys?.length && ftablePkeys.every((fkey) => r.fcols.includes(fkey.name))) {
175
169
  type = "one-one";
176
170
  }
177
171
  upsertJoin(tov.name, r.ftable, joinCols, type);
@@ -1 +1 @@
1
- {"version":3,"file":"prepareShortestJoinPaths.js","sourceRoot":"","sources":["../../lib/DboBuilder/prepareShortestJoinPaths.ts"],"names":[],"mappings":";;;AACA,sDAAqD;AACrD,kDAA0D;AASnD,KAAK,UAAU,wBAAwB,CAC5C,UAAsB;IAEtB,IAAI,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACpC,IAAI,UAAU,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;QACvD,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CACb,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACxE,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;YAC9B,UAAU,GAAG,aAAa,CAAC;YAC3B,mFAAmF;QACrF,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YACrC,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1D,UAAU,GAAG,UAAU,CAAC,MAAM,CAC5B,aAAa,CAAC,MAAM,CAClB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CACrD,CACF,CAAC;QACJ,CAAC;aAAM,IAAI,UAAU,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CACb,2EAA2E;gBACzE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAC7B,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAW,CAAC;QAE/D,iBAAiB;QACjB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,UAAU,CAAC,aAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAE9D,0BAA0B;YAC1B,MAAM,OAAO,GAAG,KAAK;iBAClB,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;iBACxB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACtC,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,mBAAmB,GAAG,OAAO,CAAC;YACtC,CAAC;YAED,0BAA0B;YAC1B,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE;gBAC3B,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAClB,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACjB,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACd,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAC3B,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC5B;wBACE,CAAC,EAAE,EAAE,GAAG,CAAC;wBACT,CAAC,EAAE,EAAE,GAAG,CAAC;qBACV,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;wBACV,MAAM,CAAC,GAAW,CAAC,CAAC,CAAC,CAAC,EACpB,CAAC,GAAa,CAAC,CAAC,CAAC,CAAC,CAAC;wBAErB,MAAM,GAAG,GAAG,UAAU,CAAC,aAAc,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;wBAClE,IAAI,CAAC,GAAG;4BAAE,MAAM,mBAAmB,GAAG,CAAC,CAAC;wBACxC,MAAM,EAAE,GAAG,CAAC,CAAC,MAAM,CACjB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CACpD,CAAC;wBACF,IAAI,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;4BACpB,MAAM,SAAS,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,0BAA0B,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;wBACjG,CAAC;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,sCAAsC;YACtC,MAAM,cAAc,GAClB,qBAAqB;gBACrB,2BAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvD,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,EAAE;gBACJ,MAAM,CACJ,yBAAyB;oBACzB,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC3B,cAAc,CACf,CAAC;YAEJ,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,2BAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3D,IAAI,EAAE;gBACJ,MAAM,CACJ,2BAA2B;oBAC3B,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC3B,cAAc,CACf,CAAC;QACN,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,MAAM,GACV,CAAE,UAAkB,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvD,8BAA8B;gBAC9B,CAAC,CAAC;YACJ,MAAM,MAAM,CAAC;QACf,CAAC;QAED,mBAAmB;QACnB,MAAM,SAAS,GAAU,EAAE,CAAC;QAC5B,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;YAC3B,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAC9B,EAAE,GAAG,EAAE,CAAC,CAAC,CAAE,EACX,EAAE,GAAG,EAAE,CAAC,CAAC,CAAE,CAAC;YAEd,IAAI,EAAE,KAAK,EAAE;gBAAE,OAAO;YAEtB,SAAU,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;YACtB,SAAU,CAAC,EAAE,CAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;YAExB,SAAU,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;YACtB,SAAU,CAAC,EAAE,CAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACnE,MAAM,iBAAiB,GAAc,EAAE,CAAC;QACxC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;YACxB,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;gBACxB,wBAAwB;gBACxB,IACE,EAAE,KAAK,EAAE;oBACT,iBAAiB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;wBAC5B,IAAI,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;4BAC/C,MAAM,KAAK,GAAG,IAAA,+BAAgB,EAAC,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;4BAClD,IAAI,KAAK,IAAI,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gCACnD,OAAO,IAAI,CAAC;4BACd,CAAC;wBACH,CAAC;oBACH,CAAC,CAAC,EACF,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,MAAM,KAAK,GAAG,IAAA,+BAAgB,EAAC,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBAClD,IAAI,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBAAE,OAAO;gBAElD,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,CAClC,CAAC;gBACF,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC/D,CAAC;gBAED,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,CAClC,CAAC;gBACF,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,iBAAiB,CAAC,IAAI,CAAC;wBACrB,EAAE,EAAE,EAAE;wBACN,EAAE,EAAE,EAAE;wBACN,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE;qBACnC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO;YACL,KAAK;YACL,iBAAiB;YACjB,SAAS;SACV,CAAC;IACJ,CAAC;IAED,OAAO;QACL,KAAK,EAAE,EAAE;QACT,iBAAiB,EAAE,EAAE;KACtB,CAAC;AACJ,CAAC;AAlKD,4DAkKC;AAED,MAAM,gBAAgB,GAAG,CAAI,IAAS,EAAE,IAAS,EAAW,EAAE;IAC5D,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;AACnE,CAAC,CAAC;AAEF,KAAK,UAAU,iBAAiB,CAAC,MAAqB;IACpD,MAAM,KAAK,GAAW,EAAE,CAAC;IACzB,MAAM,UAAU,GAAG,CACjB,EAAU,EACV,EAAU,EACV,IAAsC,EACtC,IAAkB,EAClB,EAAE;QACF,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAC9C,CAAC;QACF,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;QACpC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,EACtC,EAAE,CACH,CAAC;QACF,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YACxC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC;YAE/C,iFAAiF;YACjF,qFAAqF;YAErF,uBAAuB;YACvB,IACE,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CACf,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAC1D,EACD,CAAC;gBACD,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACvB,KAAK,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC;YAChC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC;gBACT,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;gBAChB,EAAE,EAAE,CAAC,UAAU,CAAC;gBAChB,IAAI;aACL,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACjB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACtB,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;gBACnB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC3B,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;wBACrC,IAAI,EAAE,CAAC;wBACP,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAE;qBAClB,CAAC,CAAC,CAAC;oBACJ,IAAI,IAAI,GAAiB,UAAU,CAAC;oBACpC,MAAM,WAAW,GAAG,MAAM;yBACvB,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,MAAM,CAAC;wBACvC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC3C,IACE,WAAW,EAAE,MAAM;wBACnB,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EACxD,CAAC;wBACD,IAAI,GAAG,SAAS,CAAC;oBACnB,CAAC;oBACD,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;gBACjD,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"prepareShortestJoinPaths.js","sourceRoot":"","sources":["../../lib/DboBuilder/prepareShortestJoinPaths.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ import { DboBuilder, LocalParams } from "./DboBuilder";
5
5
  export declare function runSQL(this: DboBuilder, queryWithoutRLS: string, args: undefined | AnyObject | any[], options: SQLOptions | undefined, localParams?: LocalParams): Promise<any>;
6
6
  export declare function cacheDBTypes(this: DboBuilder, force?: boolean): Promise<void>;
7
7
  export declare function getDetailedFieldInfo(this: DboBuilder, fields: pg.IColumn[]): {
8
- tsDataType: "string" | "number" | "boolean" | "any" | "number[]" | "boolean[]" | "string[]" | "any[]";
8
+ tsDataType: "string" | "number" | "boolean" | "number[]" | "boolean[]" | "string[]" | "any[]" | "any";
9
9
  dataType: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
10
10
  udt_name: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
11
11
  tableName: string | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,EACL,SAAS,EACT,UAAU,EAGX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,cAAc,CAAC;AAE9E,wBAAsB,MAAM,CAC1B,IAAI,EAAE,UAAU,EAChB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,GAAG,EAAE,EACnC,OAAO,EAAE,UAAU,GAAG,SAAS,EAC/B,WAAW,CAAC,EAAE,WAAW,gBAqH1B;AA4BD,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,UAAQ,iBAgCjE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE;;;;;;;;;;;;;;;IAuB1E;AAED,eAAO,MAAM,SAAS,cACT,SAAS,gBACN,WAAW,KACxB,QAAQ,OAAO,CAUjB,CAAC;AAEF,eAAO,MAAM,eAAe,cAAmB,QAAQ,OAAO,CAI7D,CAAC"}
1
+ {"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,UAAU,EAA4B,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,cAAc,CAAC;AAE9E,wBAAsB,MAAM,CAC1B,IAAI,EAAE,UAAU,EAChB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,GAAG,EAAE,EACnC,OAAO,EAAE,UAAU,GAAG,SAAS,EAC/B,WAAW,CAAC,EAAE,WAAW,gBAmG1B;AAyBD,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,UAAQ,iBA8BjE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE;;;;;;;;;;;;;;;IAmB1E;AAED,eAAO,MAAM,SAAS,cACT,SAAS,gBACN,WAAW,KACxB,QAAQ,OAAO,CAUjB,CAAC;AAEF,eAAO,MAAM,eAAe,cAAmB,QAAQ,OAAO,CAI7D,CAAC"}
@@ -6,7 +6,7 @@ const DboBuilder_1 = require("./DboBuilder");
6
6
  async function runSQL(queryWithoutRLS, args, options, localParams) {
7
7
  const queryWithRLS = queryWithoutRLS;
8
8
  if (queryWithRLS
9
- ?.replace(/\s\s+/g, " ")
9
+ .replace(/\s\s+/g, " ")
10
10
  .toLowerCase()
11
11
  .includes("create extension pg_stat_statements")) {
12
12
  const { shared_preload_libraries } = await this.db.oneOrNone("SHOW shared_preload_libraries");
@@ -19,7 +19,7 @@ async function runSQL(queryWithoutRLS, args, options, localParams) {
19
19
  if (!(await (0, exports.canRunSQL)(this.prostgles, localParams))) {
20
20
  throw "Not allowed to run SQL";
21
21
  }
22
- const { returnType, allowListen, hasParams = true, } = options || {};
22
+ const { returnType, allowListen, hasParams = true } = options || {};
23
23
  const { socket } = localParams || {};
24
24
  const db = localParams?.tx?.t || this.db;
25
25
  if (returnType === "stream") {
@@ -47,9 +47,6 @@ async function runSQL(queryWithoutRLS, args, options, localParams) {
47
47
  throw err.toString();
48
48
  }
49
49
  }
50
- if (!db) {
51
- throw "db is missing";
52
- }
53
50
  let finalQuery = queryWithRLS + "";
54
51
  const isNotListenOrNotify = returnType === "arrayMode" &&
55
52
  !["listen ", "notify "].find((c) => queryWithoutRLS.toLowerCase().trim().startsWith(c));
@@ -62,16 +59,9 @@ async function runSQL(queryWithoutRLS, args, options, localParams) {
62
59
  const params = hasParams ? args : undefined;
63
60
  let queryResult;
64
61
  if (returnType === "default-with-rollback") {
65
- const ROLLBACK = "Rollback";
66
- await db
67
- .tx(async (t) => {
62
+ await db.tx(async (t) => {
68
63
  queryResult = await t.result(finalQuery, params);
69
- /** Rollback */
70
- return Promise.reject(new Error(ROLLBACK));
71
- })
72
- .catch((e) => {
73
- if (!(e instanceof Error && e.message === ROLLBACK))
74
- throw e;
64
+ await t.none("ROLLBACK");
75
65
  });
76
66
  }
77
67
  else {
@@ -91,10 +81,10 @@ async function runSQL(queryWithoutRLS, args, options, localParams) {
91
81
  return rows[0];
92
82
  }
93
83
  else if (returnType === "value") {
94
- return Object.values(rows?.[0] ?? {})?.[0];
84
+ return Object.values(rows[0] ?? {})[0];
95
85
  }
96
86
  else if (returnType === "values") {
97
- return rows.map((r) => Object.values(r ?? {})[0]);
87
+ return rows.map((r) => Object.values(r)[0]);
98
88
  }
99
89
  else {
100
90
  const qres = {
@@ -126,10 +116,8 @@ async function cacheDBTypes(force = false) {
126
116
  this.USER_TABLES = undefined;
127
117
  this.USER_TABLE_COLUMNS = undefined;
128
118
  }
129
- this.DATA_TYPES ??=
130
- (await this.db.any("SELECT oid, typname FROM pg_type")) ?? [];
131
- this.USER_TABLES ??=
132
- (await this.db.any(`
119
+ this.DATA_TYPES ??= await this.db.any("SELECT oid, typname FROM pg_type");
120
+ this.USER_TABLES ??= await this.db.any(`
133
121
  SELECT
134
122
  relid,
135
123
  relname,
@@ -145,7 +133,7 @@ async function cacheDBTypes(force = false) {
145
133
  ) c
146
134
  ON t.relid = c.table_oid
147
135
  GROUP BY relid, relname, schemaname
148
- `)) ?? [];
136
+ `);
149
137
  this.USER_TABLE_COLUMNS ??= await this.db.any(`
150
138
  SELECT t.relid, t.schemaname,t.relname, c.column_name, c.udt_name, c.ordinal_position
151
139
  FROM information_schema.columns c
@@ -155,9 +143,8 @@ async function cacheDBTypes(force = false) {
155
143
  }
156
144
  exports.cacheDBTypes = cacheDBTypes;
157
145
  function getDetailedFieldInfo(fields) {
158
- return (fields?.map((f) => {
159
- const dataType = this.DATA_TYPES.find((dt) => +dt.oid === +f.dataTypeID)?.typname ??
160
- "text", table = this.USER_TABLES.find((t) => +t.relid === +f.tableID), column = this.USER_TABLE_COLUMNS.find((c) => +c.relid === +f.tableID && c.ordinal_position === f.columnID), tsDataType = (0, DboBuilder_1.postgresToTsType)(dataType);
146
+ return fields.map((f) => {
147
+ const dataType = this.DATA_TYPES.find((dt) => +dt.oid === +f.dataTypeID)?.typname ?? "text", table = this.USER_TABLES.find((t) => +t.relid === +f.tableID), column = this.USER_TABLE_COLUMNS.find((c) => +c.relid === +f.tableID && c.ordinal_position === f.columnID), tsDataType = (0, DboBuilder_1.postgresToTsType)(dataType);
161
148
  return {
162
149
  ...f,
163
150
  tsDataType,
@@ -167,11 +154,11 @@ function getDetailedFieldInfo(fields) {
167
154
  tableSchema: table?.schemaname,
168
155
  columnName: column?.column_name,
169
156
  };
170
- }) ?? []);
157
+ });
171
158
  }
172
159
  exports.getDetailedFieldInfo = getDetailedFieldInfo;
173
160
  const canRunSQL = async (prostgles, localParams) => {
174
- if (!localParams?.socket || !localParams?.httpReq)
161
+ if (!localParams?.socket || !localParams.httpReq)
175
162
  return true;
176
163
  const { socket } = localParams;
177
164
  const publishParams = await prostgles.publishParser.getPublishParams({
@@ -185,7 +172,7 @@ exports.canRunSQL = canRunSQL;
185
172
  const canCreateTables = async (db) => {
186
173
  return db
187
174
  .any(`SELECT has_database_privilege(current_database(), 'create') as yes`)
188
- .then((rows) => rows?.[0].yes === true);
175
+ .then((rows) => rows[0].yes === true);
189
176
  };
190
177
  exports.canCreateTables = canCreateTables;
191
178
  //# sourceMappingURL=runSQL.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { AnyObject } from "prostgles-types";
2
2
  import { LocalParams, Media } from "./DboBuilder";
3
3
  import { ValidateRowBasic } from "../PublishParser/PublishParser";
4
4
  import { TableHandler } from "./TableHandler/TableHandler";
5
- export declare const isFile: (row: AnyObject) => boolean;
5
+ export declare const isFile: (row: any) => boolean;
6
6
  type UploadFileArgs = {
7
7
  row: AnyObject;
8
8
  validate: ValidateRowBasic | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/uploadFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAqB,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,eAAO,MAAM,MAAM,QAAS,SAAS,YASpC,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,GAAG,EAAE,SAAS,CAAC;IACf,QAAQ,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACvC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAsB,UAAU,CAC9B,IAAI,EAAE,YAAY,EAClB,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,cAAc,GACtD,OAAO,CAAC,KAAK,CAAC,CA2EhB"}
1
+ {"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/uploadFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAqB,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,eAAO,MAAM,MAAM,QAAS,GAAG,YAS9B,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,GAAG,EAAE,SAAS,CAAC;IACf,QAAQ,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACvC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAsB,UAAU,CAC9B,IAAI,EAAE,YAAY,EAClB,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,cAAc,GACtD,OAAO,CAAC,KAAK,CAAC,CAgEhB"}
@@ -12,7 +12,7 @@ const isFile = (row) => {
12
12
  };
13
13
  exports.isFile = isFile;
14
14
  async function uploadFile({ row, localParams, validate, mediaId }) {
15
- if (!this.dboBuilder.prostgles?.fileManager)
15
+ if (!this.dboBuilder.prostgles.fileManager)
16
16
  throw "fileManager not set up";
17
17
  if (!(0, exports.isFile)(row))
18
18
  throw ("Expecting only two properties for file upload: { name: string; data: File | string | Buffer }; but got: " +
@@ -20,8 +20,7 @@ async function uploadFile({ row, localParams, validate, mediaId }) {
20
20
  .map(([k, v]) => `${k}: ${typeof v}`)
21
21
  .join(", "));
22
22
  const { data, name } = row;
23
- const media_id = mediaId ??
24
- (await this.db.oneOrNone("SELECT gen_random_uuid() as name")).name;
23
+ const media_id = mediaId ?? (await this.db.oneOrNone("SELECT gen_random_uuid() as name")).name;
25
24
  const nestedInsert = localParams?.nestedInsert;
26
25
  const type = await this.dboBuilder.prostgles.fileManager.getValidatedFileType({
27
26
  file: data,
@@ -30,13 +29,7 @@ async function uploadFile({ row, localParams, validate, mediaId }) {
30
29
  colName: nestedInsert?.referencingColumn,
31
30
  });
32
31
  const media_name = `${media_id}.${type.ext}`;
33
- const parsedMediaKeys = [
34
- "id",
35
- "name",
36
- "original_name",
37
- "extension",
38
- "content_type",
39
- ];
32
+ const parsedMediaKeys = ["id", "name", "original_name", "extension", "content_type"];
40
33
  const media = {
41
34
  id: media_id,
42
35
  name: media_name,
@@ -60,7 +53,7 @@ async function uploadFile({ row, localParams, validate, mediaId }) {
60
53
  const _media = await this.dboBuilder.prostgles.fileManager.uploadAsMedia({
61
54
  item: {
62
55
  data,
63
- name: media.name ?? "????",
56
+ name: media.name,
64
57
  content_type: media.content_type,
65
58
  extension: media.extension,
66
59
  },