kysely 0.22.0 → 0.23.0

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 (326) hide show
  1. package/CONTRIBUTING.md +70 -0
  2. package/README.md +25 -2
  3. package/dist/cjs/dialect/database-introspector.d.ts +4 -0
  4. package/dist/cjs/dialect/mysql/mysql-driver.js +6 -3
  5. package/dist/cjs/dialect/postgres/postgres-adapter.js +1 -1
  6. package/dist/cjs/dialect/postgres/postgres-driver.js +7 -2
  7. package/dist/cjs/dialect/postgres/postgres-introspector.js +8 -0
  8. package/dist/cjs/dialect/sqlite/sqlite-driver.js +4 -3
  9. package/dist/cjs/dialect/sqlite/sqlite-introspector.js +1 -0
  10. package/dist/cjs/driver/database-connection.d.ts +6 -2
  11. package/dist/cjs/dynamic/dynamic-reference-builder.d.ts +2 -3
  12. package/dist/cjs/dynamic/dynamic-reference-builder.js +1 -1
  13. package/dist/cjs/expression/expression.d.ts +100 -0
  14. package/dist/cjs/expression/expression.js +16 -0
  15. package/dist/cjs/index.d.ts +10 -6
  16. package/dist/cjs/index.js +8 -2
  17. package/dist/cjs/migration/file-migration-provider.js +5 -3
  18. package/dist/cjs/operation-node/aggregate-function-node.d.ts +7 -4
  19. package/dist/cjs/operation-node/aggregate-function-node.js +17 -0
  20. package/dist/cjs/operation-node/alias-node.d.ts +3 -11
  21. package/dist/cjs/operation-node/alter-column-node.d.ts +1 -2
  22. package/dist/cjs/operation-node/alter-table-node.d.ts +5 -7
  23. package/dist/cjs/operation-node/alter-table-node.js +9 -1
  24. package/dist/cjs/operation-node/and-node.d.ts +3 -4
  25. package/dist/cjs/operation-node/binary-operation-node.d.ts +14 -0
  26. package/dist/cjs/operation-node/binary-operation-node.js +20 -0
  27. package/dist/cjs/operation-node/check-constraint-node.d.ts +2 -3
  28. package/dist/cjs/operation-node/column-definition-node.d.ts +6 -5
  29. package/dist/cjs/operation-node/column-definition-node.js +16 -0
  30. package/dist/cjs/operation-node/column-update-node.d.ts +2 -3
  31. package/dist/cjs/operation-node/common-table-expression-node.d.ts +2 -4
  32. package/dist/cjs/operation-node/create-index-node.d.ts +1 -3
  33. package/dist/cjs/operation-node/create-table-node.d.ts +4 -5
  34. package/dist/cjs/operation-node/create-type-node.d.ts +1 -1
  35. package/dist/cjs/operation-node/create-type-node.js +1 -2
  36. package/dist/cjs/operation-node/default-value-node.d.ts +2 -4
  37. package/dist/cjs/operation-node/delete-query-node.d.ts +1 -2
  38. package/dist/cjs/operation-node/drop-type-node.d.ts +1 -1
  39. package/dist/cjs/operation-node/drop-type-node.js +1 -2
  40. package/dist/cjs/operation-node/explain-node.d.ts +2 -4
  41. package/dist/cjs/operation-node/explain-node.js +1 -1
  42. package/dist/cjs/operation-node/from-node.d.ts +3 -4
  43. package/dist/cjs/operation-node/generated-node.d.ts +2 -3
  44. package/dist/cjs/operation-node/group-by-item-node.d.ts +2 -3
  45. package/dist/cjs/operation-node/having-node.d.ts +3 -4
  46. package/dist/cjs/operation-node/having-node.js +4 -4
  47. package/dist/cjs/operation-node/insert-query-node.d.ts +1 -5
  48. package/dist/cjs/operation-node/join-node.d.ts +5 -9
  49. package/dist/cjs/operation-node/join-node.js +6 -6
  50. package/dist/cjs/operation-node/on-conflict-node.d.ts +5 -7
  51. package/dist/cjs/operation-node/on-conflict-node.js +12 -12
  52. package/dist/cjs/operation-node/on-node.d.ts +3 -4
  53. package/dist/cjs/operation-node/on-node.js +4 -4
  54. package/dist/cjs/operation-node/operation-node-transformer.d.ts +4 -2
  55. package/dist/cjs/operation-node/operation-node-transformer.js +22 -15
  56. package/dist/cjs/operation-node/operation-node-visitor.d.ts +4 -2
  57. package/dist/cjs/operation-node/operation-node-visitor.js +2 -1
  58. package/dist/cjs/operation-node/operation-node.d.ts +1 -1
  59. package/dist/cjs/operation-node/operator-node.d.ts +5 -3
  60. package/dist/cjs/operation-node/operator-node.js +3 -5
  61. package/dist/cjs/operation-node/or-node.d.ts +3 -4
  62. package/dist/cjs/operation-node/order-by-item-node.d.ts +3 -5
  63. package/dist/cjs/operation-node/parens-node.d.ts +2 -3
  64. package/dist/cjs/operation-node/partition-by-item-node.d.ts +3 -4
  65. package/dist/cjs/operation-node/query-node.d.ts +2 -3
  66. package/dist/cjs/operation-node/query-node.js +6 -6
  67. package/dist/cjs/operation-node/select-modifier-node.d.ts +2 -3
  68. package/dist/cjs/operation-node/select-modifier-node.js +1 -1
  69. package/dist/cjs/operation-node/select-query-node.d.ts +5 -6
  70. package/dist/cjs/operation-node/select-query-node.js +10 -10
  71. package/dist/cjs/operation-node/selection-node.d.ts +2 -3
  72. package/dist/cjs/operation-node/set-operation-node.d.ts +2 -5
  73. package/dist/cjs/operation-node/simple-reference-expression-node.d.ts +3 -0
  74. package/dist/cjs/operation-node/{operation-node-utils.js → simple-reference-expression-node.js} +0 -0
  75. package/dist/cjs/operation-node/unary-operation-node.d.ts +13 -0
  76. package/dist/cjs/operation-node/unary-operation-node.js +19 -0
  77. package/dist/cjs/operation-node/update-query-node.d.ts +3 -4
  78. package/dist/cjs/operation-node/value-list-node.d.ts +2 -9
  79. package/dist/cjs/operation-node/where-node.d.ts +3 -4
  80. package/dist/cjs/operation-node/where-node.js +4 -4
  81. package/dist/cjs/parser/binary-operation-parser.d.ts +20 -0
  82. package/dist/cjs/parser/binary-operation-parser.js +99 -0
  83. package/dist/cjs/parser/coalesce-parser.d.ts +4 -0
  84. package/dist/cjs/parser/coalesce-parser.js +11 -0
  85. package/dist/cjs/parser/data-type-parser.d.ts +5 -5
  86. package/dist/cjs/parser/default-value-parser.d.ts +4 -5
  87. package/dist/cjs/parser/default-value-parser.js +2 -2
  88. package/dist/cjs/parser/expression-parser.d.ts +10 -0
  89. package/dist/cjs/parser/{complex-expression-parser.js → expression-parser.js} +9 -8
  90. package/dist/cjs/parser/identifier-parser.d.ts +2 -0
  91. package/dist/cjs/parser/identifier-parser.js +23 -0
  92. package/dist/cjs/parser/insert-values-parser.d.ts +1 -1
  93. package/dist/cjs/parser/insert-values-parser.js +2 -2
  94. package/dist/cjs/parser/join-parser.js +2 -2
  95. package/dist/cjs/parser/order-by-parser.d.ts +2 -2
  96. package/dist/cjs/parser/reference-parser.d.ts +14 -14
  97. package/dist/cjs/parser/reference-parser.js +12 -9
  98. package/dist/cjs/parser/select-parser.d.ts +6 -7
  99. package/dist/cjs/parser/select-parser.js +2 -2
  100. package/dist/cjs/parser/set-operation-parser.d.ts +2 -4
  101. package/dist/cjs/parser/table-parser.d.ts +11 -12
  102. package/dist/cjs/parser/table-parser.js +2 -2
  103. package/dist/cjs/parser/unary-operation-parser.d.ts +5 -0
  104. package/dist/cjs/parser/unary-operation-parser.js +17 -0
  105. package/dist/cjs/parser/update-set-parser.d.ts +1 -1
  106. package/dist/cjs/parser/value-parser.d.ts +5 -9
  107. package/dist/cjs/parser/value-parser.js +4 -4
  108. package/dist/cjs/parser/with-parser.d.ts +3 -4
  109. package/dist/cjs/plugin/camel-case/camel-case-plugin.js +1 -1
  110. package/dist/cjs/query-builder/aggregate-function-builder.d.ts +245 -14
  111. package/dist/cjs/query-builder/aggregate-function-builder.js +164 -12
  112. package/dist/cjs/query-builder/delete-query-builder.d.ts +20 -20
  113. package/dist/cjs/query-builder/delete-query-builder.js +19 -16
  114. package/dist/cjs/query-builder/function-module.d.ts +123 -22
  115. package/dist/cjs/query-builder/function-module.js +91 -48
  116. package/dist/cjs/query-builder/having-interface.d.ts +9 -8
  117. package/dist/cjs/query-builder/insert-query-builder.d.ts +7 -6
  118. package/dist/cjs/query-builder/insert-query-builder.js +11 -9
  119. package/dist/cjs/query-builder/insert-result.d.ts +8 -1
  120. package/dist/cjs/query-builder/insert-result.js +12 -1
  121. package/dist/cjs/query-builder/join-builder.d.ts +9 -8
  122. package/dist/cjs/query-builder/join-builder.js +10 -9
  123. package/dist/cjs/query-builder/on-conflict-builder.d.ts +25 -24
  124. package/dist/cjs/query-builder/on-conflict-builder.js +18 -17
  125. package/dist/cjs/query-builder/select-query-builder.d.ts +82 -51
  126. package/dist/cjs/query-builder/select-query-builder.js +39 -37
  127. package/dist/cjs/query-builder/update-query-builder.d.ts +20 -20
  128. package/dist/cjs/query-builder/update-query-builder.js +19 -16
  129. package/dist/cjs/query-builder/where-interface.d.ts +12 -11
  130. package/dist/cjs/query-compiler/compiled-query.d.ts +1 -1
  131. package/dist/cjs/query-compiler/default-query-compiler.d.ts +5 -3
  132. package/dist/cjs/query-compiler/default-query-compiler.js +37 -33
  133. package/dist/cjs/query-executor/query-executor-base.js +16 -1
  134. package/dist/cjs/raw-builder/raw-builder.d.ts +49 -13
  135. package/dist/cjs/raw-builder/raw-builder.js +24 -14
  136. package/dist/cjs/raw-builder/sql.d.ts +4 -4
  137. package/dist/cjs/schema/alter-column-builder.d.ts +28 -0
  138. package/dist/cjs/schema/alter-column-builder.js +55 -0
  139. package/dist/cjs/schema/alter-table-builder.d.ts +39 -341
  140. package/dist/cjs/schema/alter-table-builder.js +65 -280
  141. package/dist/cjs/schema/column-definition-builder.d.ts +43 -155
  142. package/dist/cjs/schema/column-definition-builder.js +189 -0
  143. package/dist/cjs/schema/create-index-builder.d.ts +2 -2
  144. package/dist/cjs/schema/create-table-builder.d.ts +38 -5
  145. package/dist/cjs/schema/create-table-builder.js +36 -1
  146. package/dist/cjs/schema/create-view-builder.d.ts +3 -2
  147. package/dist/cjs/schema/schema.d.ts +2 -2
  148. package/dist/cjs/schema/schema.js +6 -5
  149. package/dist/cjs/util/compilable.d.ts +2 -2
  150. package/dist/cjs/util/explainable.d.ts +2 -2
  151. package/dist/cjs/util/infer-result.d.ts +46 -0
  152. package/dist/cjs/util/infer-result.js +2 -0
  153. package/dist/cjs/util/log-once.d.ts +5 -0
  154. package/dist/cjs/util/log-once.js +16 -0
  155. package/dist/cjs/util/object-utils.d.ts +1 -0
  156. package/dist/cjs/util/object-utils.js +5 -1
  157. package/dist/cjs/util/type-utils.d.ts +3 -17
  158. package/dist/esm/dialect/database-introspector.d.ts +4 -0
  159. package/dist/esm/dialect/mysql/mysql-driver.js +6 -3
  160. package/dist/esm/dialect/postgres/postgres-adapter.js +1 -1
  161. package/dist/esm/dialect/postgres/postgres-driver.js +7 -2
  162. package/dist/esm/dialect/postgres/postgres-introspector.js +8 -0
  163. package/dist/esm/dialect/sqlite/sqlite-driver.js +4 -3
  164. package/dist/esm/dialect/sqlite/sqlite-introspector.js +1 -0
  165. package/dist/esm/driver/database-connection.d.ts +6 -2
  166. package/dist/esm/dynamic/dynamic-reference-builder.d.ts +2 -3
  167. package/dist/esm/dynamic/dynamic-reference-builder.js +2 -2
  168. package/dist/esm/expression/expression.d.ts +100 -0
  169. package/dist/esm/expression/expression.js +12 -0
  170. package/dist/esm/index.d.ts +10 -6
  171. package/dist/esm/index.js +6 -2
  172. package/dist/esm/migration/file-migration-provider.js +5 -3
  173. package/dist/esm/operation-node/aggregate-function-node.d.ts +7 -4
  174. package/dist/esm/operation-node/aggregate-function-node.js +17 -0
  175. package/dist/esm/operation-node/alias-node.d.ts +3 -11
  176. package/dist/esm/operation-node/alter-column-node.d.ts +1 -2
  177. package/dist/esm/operation-node/alter-table-node.d.ts +5 -7
  178. package/dist/esm/operation-node/alter-table-node.js +9 -1
  179. package/dist/esm/operation-node/and-node.d.ts +3 -4
  180. package/dist/esm/operation-node/binary-operation-node.d.ts +14 -0
  181. package/dist/esm/operation-node/binary-operation-node.js +18 -0
  182. package/dist/esm/operation-node/check-constraint-node.d.ts +2 -3
  183. package/dist/esm/operation-node/column-definition-node.d.ts +6 -5
  184. package/dist/esm/operation-node/column-definition-node.js +16 -0
  185. package/dist/esm/operation-node/column-update-node.d.ts +2 -3
  186. package/dist/esm/operation-node/common-table-expression-node.d.ts +2 -4
  187. package/dist/esm/operation-node/create-index-node.d.ts +1 -3
  188. package/dist/esm/operation-node/create-table-node.d.ts +4 -5
  189. package/dist/esm/operation-node/create-type-node.d.ts +1 -1
  190. package/dist/esm/operation-node/create-type-node.js +1 -2
  191. package/dist/esm/operation-node/default-value-node.d.ts +2 -4
  192. package/dist/esm/operation-node/delete-query-node.d.ts +1 -2
  193. package/dist/esm/operation-node/drop-type-node.d.ts +1 -1
  194. package/dist/esm/operation-node/drop-type-node.js +1 -2
  195. package/dist/esm/operation-node/explain-node.d.ts +2 -4
  196. package/dist/esm/operation-node/explain-node.js +1 -1
  197. package/dist/esm/operation-node/from-node.d.ts +3 -4
  198. package/dist/esm/operation-node/generated-node.d.ts +2 -3
  199. package/dist/esm/operation-node/group-by-item-node.d.ts +2 -3
  200. package/dist/esm/operation-node/having-node.d.ts +3 -4
  201. package/dist/esm/operation-node/having-node.js +4 -4
  202. package/dist/esm/operation-node/insert-query-node.d.ts +1 -5
  203. package/dist/esm/operation-node/join-node.d.ts +5 -9
  204. package/dist/esm/operation-node/join-node.js +6 -6
  205. package/dist/esm/operation-node/on-conflict-node.d.ts +5 -7
  206. package/dist/esm/operation-node/on-conflict-node.js +12 -12
  207. package/dist/esm/operation-node/on-node.d.ts +3 -4
  208. package/dist/esm/operation-node/on-node.js +4 -4
  209. package/dist/esm/operation-node/operation-node-transformer.d.ts +4 -2
  210. package/dist/esm/operation-node/operation-node-transformer.js +22 -15
  211. package/dist/esm/operation-node/operation-node-visitor.d.ts +4 -2
  212. package/dist/esm/operation-node/operation-node-visitor.js +2 -1
  213. package/dist/esm/operation-node/operation-node.d.ts +1 -1
  214. package/dist/esm/operation-node/operator-node.d.ts +5 -3
  215. package/dist/esm/operation-node/operator-node.js +2 -4
  216. package/dist/esm/operation-node/or-node.d.ts +3 -4
  217. package/dist/esm/operation-node/order-by-item-node.d.ts +3 -5
  218. package/dist/esm/operation-node/parens-node.d.ts +2 -3
  219. package/dist/esm/operation-node/partition-by-item-node.d.ts +3 -4
  220. package/dist/esm/operation-node/query-node.d.ts +2 -3
  221. package/dist/esm/operation-node/query-node.js +6 -6
  222. package/dist/esm/operation-node/select-modifier-node.d.ts +2 -3
  223. package/dist/esm/operation-node/select-modifier-node.js +1 -1
  224. package/dist/esm/operation-node/select-query-node.d.ts +5 -6
  225. package/dist/esm/operation-node/select-query-node.js +10 -10
  226. package/dist/esm/operation-node/selection-node.d.ts +2 -3
  227. package/dist/esm/operation-node/set-operation-node.d.ts +2 -5
  228. package/dist/esm/operation-node/simple-reference-expression-node.d.ts +3 -0
  229. package/dist/esm/operation-node/simple-reference-expression-node.js +2 -0
  230. package/dist/esm/operation-node/unary-operation-node.d.ts +13 -0
  231. package/dist/esm/operation-node/unary-operation-node.js +17 -0
  232. package/dist/esm/operation-node/update-query-node.d.ts +3 -4
  233. package/dist/esm/operation-node/value-list-node.d.ts +2 -9
  234. package/dist/esm/operation-node/where-node.d.ts +3 -4
  235. package/dist/esm/operation-node/where-node.js +4 -4
  236. package/dist/esm/parser/binary-operation-parser.d.ts +20 -0
  237. package/dist/esm/parser/binary-operation-parser.js +92 -0
  238. package/dist/esm/parser/coalesce-parser.d.ts +4 -0
  239. package/dist/esm/parser/coalesce-parser.js +8 -0
  240. package/dist/esm/parser/data-type-parser.d.ts +5 -5
  241. package/dist/esm/parser/default-value-parser.d.ts +4 -5
  242. package/dist/esm/parser/default-value-parser.js +2 -2
  243. package/dist/esm/parser/expression-parser.d.ts +10 -0
  244. package/dist/esm/parser/{complex-expression-parser.js → expression-parser.js} +6 -5
  245. package/dist/esm/parser/identifier-parser.d.ts +2 -0
  246. package/dist/esm/parser/identifier-parser.js +20 -0
  247. package/dist/esm/parser/insert-values-parser.d.ts +1 -1
  248. package/dist/esm/parser/insert-values-parser.js +2 -2
  249. package/dist/esm/parser/join-parser.js +2 -2
  250. package/dist/esm/parser/order-by-parser.d.ts +2 -2
  251. package/dist/esm/parser/reference-parser.d.ts +14 -14
  252. package/dist/esm/parser/reference-parser.js +10 -8
  253. package/dist/esm/parser/select-parser.d.ts +6 -7
  254. package/dist/esm/parser/select-parser.js +2 -2
  255. package/dist/esm/parser/set-operation-parser.d.ts +2 -4
  256. package/dist/esm/parser/table-parser.d.ts +11 -12
  257. package/dist/esm/parser/table-parser.js +2 -2
  258. package/dist/esm/parser/unary-operation-parser.d.ts +5 -0
  259. package/dist/esm/parser/unary-operation-parser.js +13 -0
  260. package/dist/esm/parser/update-set-parser.d.ts +1 -1
  261. package/dist/esm/parser/value-parser.d.ts +5 -9
  262. package/dist/esm/parser/value-parser.js +4 -4
  263. package/dist/esm/parser/with-parser.d.ts +3 -4
  264. package/dist/esm/plugin/camel-case/camel-case-plugin.js +2 -2
  265. package/dist/esm/query-builder/aggregate-function-builder.d.ts +245 -14
  266. package/dist/esm/query-builder/aggregate-function-builder.js +164 -12
  267. package/dist/esm/query-builder/delete-query-builder.d.ts +20 -20
  268. package/dist/esm/query-builder/delete-query-builder.js +19 -16
  269. package/dist/esm/query-builder/function-module.d.ts +123 -22
  270. package/dist/esm/query-builder/function-module.js +92 -49
  271. package/dist/esm/query-builder/having-interface.d.ts +9 -8
  272. package/dist/esm/query-builder/insert-query-builder.d.ts +7 -6
  273. package/dist/esm/query-builder/insert-query-builder.js +11 -9
  274. package/dist/esm/query-builder/insert-result.d.ts +8 -1
  275. package/dist/esm/query-builder/insert-result.js +12 -1
  276. package/dist/esm/query-builder/join-builder.d.ts +9 -8
  277. package/dist/esm/query-builder/join-builder.js +10 -9
  278. package/dist/esm/query-builder/on-conflict-builder.d.ts +25 -24
  279. package/dist/esm/query-builder/on-conflict-builder.js +18 -17
  280. package/dist/esm/query-builder/select-query-builder.d.ts +82 -51
  281. package/dist/esm/query-builder/select-query-builder.js +38 -36
  282. package/dist/esm/query-builder/update-query-builder.d.ts +20 -20
  283. package/dist/esm/query-builder/update-query-builder.js +19 -16
  284. package/dist/esm/query-builder/where-interface.d.ts +12 -11
  285. package/dist/esm/query-compiler/compiled-query.d.ts +1 -1
  286. package/dist/esm/query-compiler/default-query-compiler.d.ts +5 -3
  287. package/dist/esm/query-compiler/default-query-compiler.js +38 -34
  288. package/dist/esm/query-executor/query-executor-base.js +16 -1
  289. package/dist/esm/raw-builder/raw-builder.d.ts +49 -13
  290. package/dist/esm/raw-builder/raw-builder.js +23 -14
  291. package/dist/esm/raw-builder/sql.d.ts +4 -4
  292. package/dist/esm/schema/alter-column-builder.d.ts +28 -0
  293. package/dist/esm/schema/alter-column-builder.js +51 -0
  294. package/dist/esm/schema/alter-table-builder.d.ts +39 -341
  295. package/dist/esm/schema/alter-table-builder.js +61 -274
  296. package/dist/esm/schema/column-definition-builder.d.ts +43 -155
  297. package/dist/esm/schema/column-definition-builder.js +189 -0
  298. package/dist/esm/schema/create-index-builder.d.ts +2 -2
  299. package/dist/esm/schema/create-table-builder.d.ts +38 -5
  300. package/dist/esm/schema/create-table-builder.js +36 -1
  301. package/dist/esm/schema/create-view-builder.d.ts +3 -2
  302. package/dist/esm/schema/schema.d.ts +2 -2
  303. package/dist/esm/schema/schema.js +6 -5
  304. package/dist/esm/util/compilable.d.ts +2 -2
  305. package/dist/esm/util/explainable.d.ts +2 -2
  306. package/dist/esm/util/infer-result.d.ts +46 -0
  307. package/dist/esm/util/infer-result.js +2 -0
  308. package/dist/esm/util/log-once.d.ts +5 -0
  309. package/dist/esm/util/log-once.js +13 -0
  310. package/dist/esm/util/object-utils.d.ts +1 -0
  311. package/dist/esm/util/object-utils.js +3 -0
  312. package/dist/esm/util/type-utils.d.ts +3 -17
  313. package/package.json +1 -1
  314. package/dist/cjs/operation-node/filter-node.d.ts +0 -18
  315. package/dist/cjs/operation-node/filter-node.js +0 -20
  316. package/dist/cjs/operation-node/operation-node-utils.d.ts +0 -18
  317. package/dist/cjs/parser/complex-expression-parser.d.ts +0 -12
  318. package/dist/cjs/parser/filter-parser.d.ts +0 -24
  319. package/dist/cjs/parser/filter-parser.js +0 -109
  320. package/dist/esm/operation-node/filter-node.d.ts +0 -18
  321. package/dist/esm/operation-node/filter-node.js +0 -18
  322. package/dist/esm/operation-node/operation-node-utils.d.ts +0 -18
  323. package/dist/esm/operation-node/operation-node-utils.js +0 -2
  324. package/dist/esm/parser/complex-expression-parser.d.ts +0 -12
  325. package/dist/esm/parser/filter-parser.d.ts +0 -24
  326. package/dist/esm/parser/filter-parser.js +0 -100
@@ -4,7 +4,7 @@ exports.parseTable = exports.parseAliasedTable = exports.parseTableExpression =
4
4
  const object_utils_js_1 = require("../util/object-utils.js");
5
5
  const alias_node_js_1 = require("../operation-node/alias-node.js");
6
6
  const table_node_js_1 = require("../operation-node/table-node.js");
7
- const complex_expression_parser_js_1 = require("./complex-expression-parser.js");
7
+ const expression_parser_js_1 = require("./expression-parser.js");
8
8
  const identifier_node_js_1 = require("../operation-node/identifier-node.js");
9
9
  function parseTableExpressionOrList(table) {
10
10
  if ((0, object_utils_js_1.isReadonlyArray)(table)) {
@@ -20,7 +20,7 @@ function parseTableExpression(table) {
20
20
  return parseAliasedTable(table);
21
21
  }
22
22
  else {
23
- return (0, complex_expression_parser_js_1.parseAliasedComplexExpression)(table);
23
+ return (0, expression_parser_js_1.parseAliasedExpression)(table);
24
24
  }
25
25
  }
26
26
  exports.parseTableExpression = parseTableExpression;
@@ -0,0 +1,5 @@
1
+ import { UnaryOperationNode } from '../operation-node/unary-operation-node.js';
2
+ import { ExpressionOrFactory } from './expression-parser.js';
3
+ export declare type ExistsExpression<DB, TB extends keyof DB> = ExpressionOrFactory<DB, TB, any>;
4
+ export declare function parseExists(arg: ExistsExpression<any, any>): UnaryOperationNode;
5
+ export declare function parseNotExists(arg: ExistsExpression<any, any>): UnaryOperationNode;
@@ -0,0 +1,17 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.parseNotExists = exports.parseExists = void 0;
4
+ const operator_node_js_1 = require("../operation-node/operator-node.js");
5
+ const unary_operation_node_js_1 = require("../operation-node/unary-operation-node.js");
6
+ const value_parser_js_1 = require("./value-parser.js");
7
+ function parseExists(arg) {
8
+ return parseUnaryOperation('exists', arg);
9
+ }
10
+ exports.parseExists = parseExists;
11
+ function parseNotExists(arg) {
12
+ return parseUnaryOperation('not exists', arg);
13
+ }
14
+ exports.parseNotExists = parseNotExists;
15
+ function parseUnaryOperation(type, arg) {
16
+ return unary_operation_node_js_1.UnaryOperationNode.create(operator_node_js_1.OperatorNode.create(type), (0, value_parser_js_1.parseValueExpressionOrList)(arg));
17
+ }
@@ -2,6 +2,6 @@ import { ColumnUpdateNode } from '../operation-node/column-update-node.js';
2
2
  import { UpdateKeys, UpdateType } from '../util/column-type.js';
3
3
  import { ValueExpression } from './value-parser.js';
4
4
  export declare type MutationObject<DB, TB extends keyof DB, TM extends keyof DB> = {
5
- [C in UpdateKeys<DB[TM]>]?: ValueExpression<DB, TB, UpdateType<DB[TM][C]>>;
5
+ [C in UpdateKeys<DB[TM]>]?: ValueExpression<DB, TB, UpdateType<DB[TM][C]>> | undefined;
6
6
  };
7
7
  export declare function parseUpdateObject(row: MutationObject<any, any, any>): ReadonlyArray<ColumnUpdateNode>;
@@ -1,10 +1,6 @@
1
- import { ValueExpressionNode } from '../operation-node/operation-node-utils.js';
2
- import { ValueNode } from '../operation-node/value-node.js';
3
- import { SelectQueryNode } from '../operation-node/select-query-node.js';
4
- import { RawNode } from '../operation-node/raw-node.js';
5
- import { ComplexExpression } from './complex-expression-parser.js';
6
- import { AggregateFunctionNode } from '../operation-node/aggregate-function-node.js';
7
- export declare type ValueExpression<DB, TB extends keyof DB, V> = V | ComplexExpression<DB, TB, V>;
1
+ import { ExpressionOrFactory } from './expression-parser.js';
2
+ import { OperationNode } from '../operation-node/operation-node.js';
3
+ export declare type ValueExpression<DB, TB extends keyof DB, V> = V | ExpressionOrFactory<DB, TB, V>;
8
4
  export declare type ValueExpressionOrList<DB, TB extends keyof DB, V> = ValueExpression<DB, TB, V> | ReadonlyArray<ValueExpression<DB, TB, V>>;
9
- export declare function parseValueExpressionOrList(arg: ValueExpressionOrList<any, any, unknown>): ValueExpressionNode;
10
- export declare function parseValueExpression(exp: ValueExpression<any, any, unknown>): ValueNode | SelectQueryNode | RawNode | AggregateFunctionNode;
5
+ export declare function parseValueExpressionOrList(arg: ValueExpressionOrList<any, any, unknown>): OperationNode;
6
+ export declare function parseValueExpression(exp: ValueExpression<any, any, unknown>): OperationNode;
@@ -5,7 +5,7 @@ const primitive_value_list_node_js_1 = require("../operation-node/primitive-valu
5
5
  const value_list_node_js_1 = require("../operation-node/value-list-node.js");
6
6
  const value_node_js_1 = require("../operation-node/value-node.js");
7
7
  const object_utils_js_1 = require("../util/object-utils.js");
8
- const complex_expression_parser_js_1 = require("./complex-expression-parser.js");
8
+ const expression_parser_js_1 = require("./expression-parser.js");
9
9
  function parseValueExpressionOrList(arg) {
10
10
  if ((0, object_utils_js_1.isReadonlyArray)(arg)) {
11
11
  return parseValueExpressionList(arg);
@@ -16,14 +16,14 @@ function parseValueExpressionOrList(arg) {
16
16
  }
17
17
  exports.parseValueExpressionOrList = parseValueExpressionOrList;
18
18
  function parseValueExpression(exp) {
19
- if ((0, complex_expression_parser_js_1.isComplexExpression)(exp)) {
20
- return (0, complex_expression_parser_js_1.parseComplexExpression)(exp);
19
+ if ((0, expression_parser_js_1.isExpressionOrFactory)(exp)) {
20
+ return (0, expression_parser_js_1.parseExpression)(exp);
21
21
  }
22
22
  return value_node_js_1.ValueNode.create(exp);
23
23
  }
24
24
  exports.parseValueExpression = parseValueExpression;
25
25
  function parseValueExpressionList(arg) {
26
- if (arg.some(complex_expression_parser_js_1.isComplexExpression)) {
26
+ if (arg.some(expression_parser_js_1.isExpressionOrFactory)) {
27
27
  return value_list_node_js_1.ValueListNode.create(arg.map((it) => parseValueExpression(it)));
28
28
  }
29
29
  return primitive_value_list_node_js_1.PrimitiveValueListNode.create(arg);
@@ -1,21 +1,20 @@
1
- import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
2
1
  import { UpdateQueryBuilder } from '../query-builder/update-query-builder.js';
3
2
  import { DeleteQueryBuilder } from '../query-builder/delete-query-builder.js';
4
3
  import { InsertQueryBuilder } from '../query-builder/insert-query-builder.js';
5
4
  import { CommonTableExpressionNode } from '../operation-node/common-table-expression-node.js';
6
5
  import { QueryCreator } from '../query-creator.js';
7
- import { RawBuilder } from '../raw-builder/raw-builder.js';
6
+ import { Expression } from '../expression/expression.js';
8
7
  export declare type CommonTableExpression<DB, CN extends string> = (creator: QueryCreator<DB>) => CommonTableExpressionOutput<DB, CN>;
9
8
  export declare type RecursiveCommonTableExpression<DB, CN extends string> = (creator: QueryCreator<DB & Record<ExtractTableFromCommonTableExpressionName<CN>, ExtractRowFromCommonTableExpressionName<CN>>>) => CommonTableExpressionOutput<DB, CN>;
10
9
  export declare type QueryCreatorWithCommonTableExpression<DB, CN extends string, CTE> = QueryCreator<DB & Record<ExtractTableFromCommonTableExpressionName<CN>, ExtractRowFromCommonTableExpression<CTE>>>;
11
- declare type CommonTableExpressionOutput<DB, CN extends string> = SelectQueryBuilder<DB, any, ExtractRowFromCommonTableExpressionName<CN>> | InsertQueryBuilder<DB, any, ExtractRowFromCommonTableExpressionName<CN>> | UpdateQueryBuilder<DB, any, any, ExtractRowFromCommonTableExpressionName<CN>> | DeleteQueryBuilder<DB, any, ExtractRowFromCommonTableExpressionName<CN>> | RawBuilder<ExtractRowFromCommonTableExpressionName<CN>>;
10
+ declare type CommonTableExpressionOutput<DB, CN extends string> = Expression<ExtractRowFromCommonTableExpressionName<CN>> | InsertQueryBuilder<DB, any, ExtractRowFromCommonTableExpressionName<CN>> | UpdateQueryBuilder<DB, any, any, ExtractRowFromCommonTableExpressionName<CN>> | DeleteQueryBuilder<DB, any, ExtractRowFromCommonTableExpressionName<CN>>;
12
11
  /**
13
12
  * Given a common CommonTableExpression CTE extracts the row type from it.
14
13
  *
15
14
  * For example a CTE `(db) => db.selectFrom('person').select(['id', 'first_name'])`
16
15
  * would result in `Pick<Person, 'id' | 'first_name'>`.
17
16
  */
18
- declare type ExtractRowFromCommonTableExpression<CTE> = CTE extends (creator: QueryCreator<any>) => infer Q ? Q extends SelectQueryBuilder<any, any, infer QO> ? QO : Q extends InsertQueryBuilder<any, any, infer QO> ? QO : Q extends UpdateQueryBuilder<any, any, any, infer QO> ? QO : Q extends DeleteQueryBuilder<any, any, infer QO> ? QO : Q extends RawBuilder<infer RO> ? RO : never : never;
17
+ declare type ExtractRowFromCommonTableExpression<CTE> = CTE extends (creator: QueryCreator<any>) => infer Q ? Q extends Expression<infer QO> ? QO : Q extends InsertQueryBuilder<any, any, infer QO> ? QO : Q extends UpdateQueryBuilder<any, any, any, infer QO> ? QO : Q extends DeleteQueryBuilder<any, any, infer QO> ? QO : never : never;
19
18
  /**
20
19
  * Extracts 'person' from a string like 'person(id, first_name)'.
21
20
  */
@@ -111,5 +111,5 @@ class CamelCasePlugin {
111
111
  }
112
112
  exports.CamelCasePlugin = CamelCasePlugin;
113
113
  function canMap(obj) {
114
- return (0, object_utils_js_1.isObject)(obj) && !(0, object_utils_js_1.isDate)(obj) && !(0, object_utils_js_1.isBuffer)(obj);
114
+ return ((0, object_utils_js_1.isObject)(obj) && !(0, object_utils_js_1.isDate)(obj) && !(0, object_utils_js_1.isBuffer)(obj) && !(0, object_utils_js_1.isArrayBufferOrView)(obj));
115
115
  }
@@ -1,10 +1,31 @@
1
1
  import { AggregateFunctionNode } from '../operation-node/aggregate-function-node.js';
2
- import { OperationNodeSource } from '../operation-node/operation-node-source.js';
3
2
  import { AliasNode } from '../operation-node/alias-node.js';
4
3
  import { OverBuilder } from './over-builder.js';
5
- export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unknown> implements OperationNodeSource {
4
+ import { AliasedExpression, Expression } from '../expression/expression.js';
5
+ import { ReferenceExpression } from '../parser/reference-parser.js';
6
+ import { ComparisonOperatorExpression, OperandValueExpressionOrList, WhereGrouper } from '../parser/binary-operation-parser.js';
7
+ import { ExistsExpression } from '../parser/unary-operation-parser.js';
8
+ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unknown> implements Expression<O> {
6
9
  #private;
7
10
  constructor(props: AggregateFunctionBuilderProps);
11
+ /** @private */
12
+ /**
13
+ * All expressions need to have this getter for complicated type-related reasons.
14
+ * Simply add this getter for your expression and always return `undefined` from it:
15
+ *
16
+ * ```ts
17
+ * class SomeExpression<T> implements Expression<T> {
18
+ * get expressionType(): T | undefined {
19
+ * return undefined
20
+ * }
21
+ * }
22
+ * ```
23
+ *
24
+ * The getter is needed to make the expression assignable to another expression only
25
+ * if the types `T` are assignable. Without this property (or some other property
26
+ * that references `T`), you could assing `Expression<string>` to `Expression<number>`.
27
+ */
28
+ get expressionType(): O | undefined;
8
29
  /**
9
30
  * Returns an aliased version of the function.
10
31
  *
@@ -32,13 +53,15 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
32
53
  */
33
54
  as<A extends string>(alias: A): AliasedAggregateFunctionBuilder<DB, TB, O, A>;
34
55
  /**
35
- * Adds a distinct clause inside the function.
56
+ * Adds a `distinct` clause inside the function.
57
+ *
58
+ * ### Examples
36
59
  *
37
60
  * ```ts
38
61
  * const result = await db
39
62
  * .selectFrom('person')
40
- * .select(
41
- * eb => eb.fn.count<number>('first_name').distinct().as('first_name_count')
63
+ * .select((eb) =>
64
+ * eb.fn.count<number>('first_name').distinct().as('first_name_count')
42
65
  * )
43
66
  * .executeTakeFirstOrThrow()
44
67
  * ```
@@ -52,7 +75,197 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
52
75
  */
53
76
  distinct(): AggregateFunctionBuilder<DB, TB, O>;
54
77
  /**
55
- * Adds an over clause (window functions) after the function.
78
+ * Adds a `filter` clause with a nested `where` clause after the function.
79
+ *
80
+ * Similar to {@link WhereInterface}'s `where` method.
81
+ *
82
+ * Also see {@link orFilterWhere}, {@link filterWhereExists} and {@link filterWhereRef}.
83
+ *
84
+ * ### Examples
85
+ *
86
+ * Count by gender:
87
+ *
88
+ * ```ts
89
+ * const result = await db
90
+ * .selectFrom('person')
91
+ * .select([
92
+ * (eb) =>
93
+ * eb.fn
94
+ * .count<number>('id')
95
+ * .filterWhere('gender', '=', 'female')
96
+ * .as('female_count'),
97
+ * (eb) =>
98
+ * eb.fn
99
+ * .count<number>('id')
100
+ * .filterWhere('gender', '=', 'male')
101
+ * .as('male_count'),
102
+ * (eb) =>
103
+ * eb.fn
104
+ * .count<number>('id')
105
+ * .filterWhere('gender', '=', 'other')
106
+ * .as('other_count'),
107
+ * ])
108
+ * .executeTakeFirstOrThrow()
109
+ * ```
110
+ *
111
+ * The generated SQL (PostgreSQL):
112
+ *
113
+ * ```sql
114
+ * select
115
+ * count("id") filter(where "gender" = $1) as "female_count",
116
+ * count("id") filter(where "gender" = $2) as "male_count",
117
+ * count("id") filter(where "gender" = $3) as "other_count"
118
+ * from "person"
119
+ * ```
120
+ */
121
+ filterWhere<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: ComparisonOperatorExpression, rhs: OperandValueExpressionOrList<DB, TB, RE>): AggregateFunctionBuilder<DB, TB, O>;
122
+ filterWhere(grouper: WhereGrouper<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
123
+ filterWhere(expression: Expression<any>): AggregateFunctionBuilder<DB, TB, O>;
124
+ /**
125
+ * Adds a `filter` clause with a nested `where exists` clause after the function.
126
+ *
127
+ * Similar to {@link WhereInterface}'s `whereExists` method.
128
+ *
129
+ * ### Examples
130
+ *
131
+ * Count pet owners versus general public:
132
+ *
133
+ * ```ts
134
+ * const result = await db
135
+ * .selectFrom('person')
136
+ * .select([
137
+ * (eb) =>
138
+ * eb.fn
139
+ * .count<number>('person.id')
140
+ * .filterWhereExists((qb) =>
141
+ * qb
142
+ * .selectFrom('pet')
143
+ * .select('pet.id')
144
+ * .whereRef('pet.owner_id', '=', 'person.id')
145
+ * )
146
+ * .as('pet_owner_count'),
147
+ * (eb) => eb.fn.count<number>('person.id').as('total_count'),
148
+ * ])
149
+ * .executeTakeFirstOrThrow()
150
+ * ```
151
+ *
152
+ * The generated SQL (PostgreSQL):
153
+ *
154
+ * ```sql
155
+ * select count("person"."id") filter(where exists (
156
+ * select "pet"."id"
157
+ * from "pet"
158
+ * where "pet"."owner_id" = "person"."id"
159
+ * )) as "pet_ower_count",
160
+ * count("person"."id") as "total_count"
161
+ * from "person"
162
+ * ```
163
+ */
164
+ filterWhereExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
165
+ /**
166
+ * Just like {@link filterWhereExists} but creates a `not exists` clause inside
167
+ * the `filter` clause.
168
+ */
169
+ filterWhereNotExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
170
+ /**
171
+ * Adds a `filter` clause with a nested `where` clause after the function, where
172
+ * both sides of the operator are references to columns.
173
+ *
174
+ * Similar to {@link WhereInterface}'s `whereRef` method.
175
+ *
176
+ * ### Examples
177
+ *
178
+ * Count people with same first and last names versus general public:
179
+ *
180
+ * ```ts
181
+ * const result = await db
182
+ * .selectFrom('person')
183
+ * .select([
184
+ * (eb) =>
185
+ * eb.fn
186
+ * .count<number>('id')
187
+ * .filterWhereRef('first_name', '=', 'last_name')
188
+ * .as('repeat_name_count'),
189
+ * (eb) => eb.fn.count<number>('id').as('total_count'),
190
+ * ])
191
+ * .executeTakeFirstOrThrow()
192
+ * ```
193
+ *
194
+ * The generated SQL (PostgreSQL):
195
+ *
196
+ * ```sql
197
+ * select
198
+ * count("id") filter(where "first_name" = "last_name") as "repeat_name_count",
199
+ * count("id") as "total_count"
200
+ * from "person"
201
+ * ```
202
+ */
203
+ filterWhereRef(lhs: ReferenceExpression<DB, TB>, op: ComparisonOperatorExpression, rhs: ReferenceExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
204
+ /**
205
+ * Adds a `filter` clause with a nested `or where` clause after the function.
206
+ * Otherwise works just like {@link filterWhere}.
207
+ *
208
+ * Similar to {@link WhereInterface}'s `orWhere` method.
209
+ *
210
+ * ### Examples
211
+ *
212
+ * For some reason you're tasked with counting adults (18+) or people called
213
+ * "Bob" versus general public:
214
+ *
215
+ * ```ts
216
+ * const result = await db
217
+ * .selectFrom('person')
218
+ * .select([
219
+ * (eb) =>
220
+ * eb.fn
221
+ * .count<number>('id')
222
+ * .filterWhere('age', '>=', '18')
223
+ * .orFilterWhere('first_name', '=', 'Bob')
224
+ * .as('adult_or_bob_count'),
225
+ * (eb) => eb.fn.count<number>('id').as('total_count'),
226
+ * ])
227
+ * .executeTakeFirstOrThrow()
228
+ * ```
229
+ *
230
+ * The generated SQL (PostgreSQL):
231
+ *
232
+ * ```sql
233
+ * select
234
+ * count("id") filter(where "age" >= $1 or "first_name" = $2) as "adult_or_bob_count",
235
+ * count("id") as "total_count"
236
+ * from "person"
237
+ * ```
238
+ */
239
+ orFilterWhere<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: ComparisonOperatorExpression, rhs: OperandValueExpressionOrList<DB, TB, RE>): AggregateFunctionBuilder<DB, TB, O>;
240
+ orFilterWhere(grouper: WhereGrouper<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
241
+ orFilterWhere(expression: Expression<any>): AggregateFunctionBuilder<DB, TB, O>;
242
+ /**
243
+ * Just like {@link filterWhereExists} but creates an `or exists` clause inside
244
+ * the `filter` clause.
245
+ *
246
+ * Similar to {@link WhereInterface}'s `orWhereExists` method.
247
+ */
248
+ orFilterWhereExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
249
+ /**
250
+ * Just like {@link filterWhereExists} but creates an `or not exists` clause inside
251
+ * the `filter` clause.
252
+ *
253
+ * Similar to {@link WhereInterface}'s `orWhereNotExists` method.
254
+ */
255
+ orFilterWhereNotExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
256
+ /**
257
+ * Adds an `or where` clause inside the `filter` clause. Otherwise works just
258
+ * like {@link filterWhereRef}.
259
+ *
260
+ * Also see {@link orFilterWhere} and {@link filterWhere}.
261
+ *
262
+ * Similar to {@link WhereInterface}'s `orWhereRef` method.
263
+ */
264
+ orFilterWhereRef(lhs: ReferenceExpression<DB, TB>, op: ComparisonOperatorExpression, rhs: ReferenceExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
265
+ /**
266
+ * Adds an `over` clause (window functions) after the function.
267
+ *
268
+ * ### Examples
56
269
  *
57
270
  * ```ts
58
271
  * const result = await db
@@ -92,23 +305,41 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
92
305
  * ```
93
306
  */
94
307
  over(over?: OverBuilderCallback<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
308
+ /**
309
+ * Creates the OperationNode that describes how to compile this expression into SQL.
310
+ *
311
+ * If you are creating a custom expression, it's often easiest to use the {@link sql}
312
+ * template tag to build the node:
313
+ *
314
+ * ```ts
315
+ * class SomeExpression<T> implements Expression<T> {
316
+ * toOperationNode(): OperationNode {
317
+ * return sql`some sql here`.toOperationNode()
318
+ * }
319
+ * }
320
+ * ```
321
+ */
95
322
  toOperationNode(): AggregateFunctionNode;
96
323
  }
97
324
  /**
98
325
  * {@link AggregateFunctionBuilder} with an alias. The result of calling {@link AggregateFunctionBuilder.as}.
99
326
  */
100
- export declare class AliasedAggregateFunctionBuilder<DB, TB extends keyof DB, O = unknown, A extends string = never> implements OperationNodeSource {
327
+ export declare class AliasedAggregateFunctionBuilder<DB, TB extends keyof DB, O = unknown, A extends string = never> implements AliasedExpression<O, A> {
101
328
  #private;
102
329
  constructor(aggregateFunctionBuilder: AggregateFunctionBuilder<DB, TB, O>, alias: A);
330
+ /** @private */
103
331
  /**
104
- * @private
105
- *
106
- * This needs to be here just so that the typings work. Without this
107
- * the generated .d.ts file contains no reference to the type param A
108
- * which causes this type to be equal to AliasedAggregateFunctionBuilder with any A
109
- * as long as O is the same.
332
+ * Returns the aliased expression.
333
+ */
334
+ get expression(): Expression<O>;
335
+ /** @private */
336
+ /**
337
+ * Returns the alias.
338
+ */
339
+ get alias(): A;
340
+ /**
341
+ * Creates the OperationNode that describes how to compile this expression into SQL.
110
342
  */
111
- protected get alias(): A;
112
343
  toOperationNode(): AliasNode;
113
344
  }
114
345
  export interface AggregateFunctionBuilderProps {
@@ -7,11 +7,17 @@ const alias_node_js_1 = require("../operation-node/alias-node.js");
7
7
  const identifier_node_js_1 = require("../operation-node/identifier-node.js");
8
8
  const prevent_await_js_1 = require("../util/prevent-await.js");
9
9
  const parse_utils_js_1 = require("../parser/parse-utils.js");
10
+ const binary_operation_parser_js_1 = require("../parser/binary-operation-parser.js");
11
+ const unary_operation_parser_js_1 = require("../parser/unary-operation-parser.js");
10
12
  class AggregateFunctionBuilder {
11
13
  #props;
12
14
  constructor(props) {
13
15
  this.#props = (0, object_utils_js_1.freeze)(props);
14
16
  }
17
+ /** @private */
18
+ get expressionType() {
19
+ return undefined;
20
+ }
15
21
  /**
16
22
  * Returns an aliased version of the function.
17
23
  *
@@ -41,13 +47,15 @@ class AggregateFunctionBuilder {
41
47
  return new AliasedAggregateFunctionBuilder(this, alias);
42
48
  }
43
49
  /**
44
- * Adds a distinct clause inside the function.
50
+ * Adds a `distinct` clause inside the function.
51
+ *
52
+ * ### Examples
45
53
  *
46
54
  * ```ts
47
55
  * const result = await db
48
56
  * .selectFrom('person')
49
- * .select(
50
- * eb => eb.fn.count<number>('first_name').distinct().as('first_name_count')
57
+ * .select((eb) =>
58
+ * eb.fn.count<number>('first_name').distinct().as('first_name_count')
51
59
  * )
52
60
  * .executeTakeFirstOrThrow()
53
61
  * ```
@@ -65,8 +73,155 @@ class AggregateFunctionBuilder {
65
73
  aggregateFunctionNode: aggregate_function_node_js_1.AggregateFunctionNode.cloneWithDistinct(this.#props.aggregateFunctionNode),
66
74
  });
67
75
  }
76
+ filterWhere(...args) {
77
+ return new AggregateFunctionBuilder({
78
+ ...this.#props,
79
+ aggregateFunctionNode: aggregate_function_node_js_1.AggregateFunctionNode.cloneWithFilter(this.#props.aggregateFunctionNode, (0, binary_operation_parser_js_1.parseWhere)(args)),
80
+ });
81
+ }
82
+ /**
83
+ * Adds a `filter` clause with a nested `where exists` clause after the function.
84
+ *
85
+ * Similar to {@link WhereInterface}'s `whereExists` method.
86
+ *
87
+ * ### Examples
88
+ *
89
+ * Count pet owners versus general public:
90
+ *
91
+ * ```ts
92
+ * const result = await db
93
+ * .selectFrom('person')
94
+ * .select([
95
+ * (eb) =>
96
+ * eb.fn
97
+ * .count<number>('person.id')
98
+ * .filterWhereExists((qb) =>
99
+ * qb
100
+ * .selectFrom('pet')
101
+ * .select('pet.id')
102
+ * .whereRef('pet.owner_id', '=', 'person.id')
103
+ * )
104
+ * .as('pet_owner_count'),
105
+ * (eb) => eb.fn.count<number>('person.id').as('total_count'),
106
+ * ])
107
+ * .executeTakeFirstOrThrow()
108
+ * ```
109
+ *
110
+ * The generated SQL (PostgreSQL):
111
+ *
112
+ * ```sql
113
+ * select count("person"."id") filter(where exists (
114
+ * select "pet"."id"
115
+ * from "pet"
116
+ * where "pet"."owner_id" = "person"."id"
117
+ * )) as "pet_ower_count",
118
+ * count("person"."id") as "total_count"
119
+ * from "person"
120
+ * ```
121
+ */
122
+ filterWhereExists(arg) {
123
+ return new AggregateFunctionBuilder({
124
+ ...this.#props,
125
+ aggregateFunctionNode: aggregate_function_node_js_1.AggregateFunctionNode.cloneWithFilter(this.#props.aggregateFunctionNode, (0, unary_operation_parser_js_1.parseExists)(arg)),
126
+ });
127
+ }
128
+ /**
129
+ * Just like {@link filterWhereExists} but creates a `not exists` clause inside
130
+ * the `filter` clause.
131
+ */
132
+ filterWhereNotExists(arg) {
133
+ return new AggregateFunctionBuilder({
134
+ ...this.#props,
135
+ aggregateFunctionNode: aggregate_function_node_js_1.AggregateFunctionNode.cloneWithFilter(this.#props.aggregateFunctionNode, (0, unary_operation_parser_js_1.parseNotExists)(arg)),
136
+ });
137
+ }
138
+ /**
139
+ * Adds a `filter` clause with a nested `where` clause after the function, where
140
+ * both sides of the operator are references to columns.
141
+ *
142
+ * Similar to {@link WhereInterface}'s `whereRef` method.
143
+ *
144
+ * ### Examples
145
+ *
146
+ * Count people with same first and last names versus general public:
147
+ *
148
+ * ```ts
149
+ * const result = await db
150
+ * .selectFrom('person')
151
+ * .select([
152
+ * (eb) =>
153
+ * eb.fn
154
+ * .count<number>('id')
155
+ * .filterWhereRef('first_name', '=', 'last_name')
156
+ * .as('repeat_name_count'),
157
+ * (eb) => eb.fn.count<number>('id').as('total_count'),
158
+ * ])
159
+ * .executeTakeFirstOrThrow()
160
+ * ```
161
+ *
162
+ * The generated SQL (PostgreSQL):
163
+ *
164
+ * ```sql
165
+ * select
166
+ * count("id") filter(where "first_name" = "last_name") as "repeat_name_count",
167
+ * count("id") as "total_count"
168
+ * from "person"
169
+ * ```
170
+ */
171
+ filterWhereRef(lhs, op, rhs) {
172
+ return new AggregateFunctionBuilder({
173
+ ...this.#props,
174
+ aggregateFunctionNode: aggregate_function_node_js_1.AggregateFunctionNode.cloneWithFilter(this.#props.aggregateFunctionNode, (0, binary_operation_parser_js_1.parseReferentialFilter)(lhs, op, rhs)),
175
+ });
176
+ }
177
+ orFilterWhere(...args) {
178
+ return new AggregateFunctionBuilder({
179
+ ...this.#props,
180
+ aggregateFunctionNode: aggregate_function_node_js_1.AggregateFunctionNode.cloneWithOrFilter(this.#props.aggregateFunctionNode, (0, binary_operation_parser_js_1.parseWhere)(args)),
181
+ });
182
+ }
68
183
  /**
69
- * Adds an over clause (window functions) after the function.
184
+ * Just like {@link filterWhereExists} but creates an `or exists` clause inside
185
+ * the `filter` clause.
186
+ *
187
+ * Similar to {@link WhereInterface}'s `orWhereExists` method.
188
+ */
189
+ orFilterWhereExists(arg) {
190
+ return new AggregateFunctionBuilder({
191
+ ...this.#props,
192
+ aggregateFunctionNode: aggregate_function_node_js_1.AggregateFunctionNode.cloneWithOrFilter(this.#props.aggregateFunctionNode, (0, unary_operation_parser_js_1.parseExists)(arg)),
193
+ });
194
+ }
195
+ /**
196
+ * Just like {@link filterWhereExists} but creates an `or not exists` clause inside
197
+ * the `filter` clause.
198
+ *
199
+ * Similar to {@link WhereInterface}'s `orWhereNotExists` method.
200
+ */
201
+ orFilterWhereNotExists(arg) {
202
+ return new AggregateFunctionBuilder({
203
+ ...this.#props,
204
+ aggregateFunctionNode: aggregate_function_node_js_1.AggregateFunctionNode.cloneWithOrFilter(this.#props.aggregateFunctionNode, (0, unary_operation_parser_js_1.parseNotExists)(arg)),
205
+ });
206
+ }
207
+ /**
208
+ * Adds an `or where` clause inside the `filter` clause. Otherwise works just
209
+ * like {@link filterWhereRef}.
210
+ *
211
+ * Also see {@link orFilterWhere} and {@link filterWhere}.
212
+ *
213
+ * Similar to {@link WhereInterface}'s `orWhereRef` method.
214
+ */
215
+ orFilterWhereRef(lhs, op, rhs) {
216
+ return new AggregateFunctionBuilder({
217
+ ...this.#props,
218
+ aggregateFunctionNode: aggregate_function_node_js_1.AggregateFunctionNode.cloneWithOrFilter(this.#props.aggregateFunctionNode, (0, binary_operation_parser_js_1.parseReferentialFilter)(lhs, op, rhs)),
219
+ });
220
+ }
221
+ /**
222
+ * Adds an `over` clause (window functions) after the function.
223
+ *
224
+ * ### Examples
70
225
  *
71
226
  * ```ts
72
227
  * const result = await db
@@ -128,14 +283,11 @@ class AliasedAggregateFunctionBuilder {
128
283
  this.#aggregateFunctionBuilder = aggregateFunctionBuilder;
129
284
  this.#alias = alias;
130
285
  }
131
- /**
132
- * @private
133
- *
134
- * This needs to be here just so that the typings work. Without this
135
- * the generated .d.ts file contains no reference to the type param A
136
- * which causes this type to be equal to AliasedAggregateFunctionBuilder with any A
137
- * as long as O is the same.
138
- */
286
+ /** @private */
287
+ get expression() {
288
+ return this.#aggregateFunctionBuilder;
289
+ }
290
+ /** @private */
139
291
  get alias() {
140
292
  return this.#alias;
141
293
  }