kysely 0.23.5 → 0.24.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (300) hide show
  1. package/README.md +46 -24
  2. package/dist/cjs/dialect/mysql/mysql-adapter.js +2 -2
  3. package/dist/cjs/dialect/mysql/mysql-driver.d.ts +1 -1
  4. package/dist/cjs/dialect/mysql/mysql-driver.js +1 -1
  5. package/dist/cjs/dialect/postgres/postgres-adapter.js +1 -1
  6. package/dist/cjs/dialect/sqlite/sqlite-dialect.d.ts +1 -0
  7. package/dist/cjs/dialect/sqlite/sqlite-dialect.js +1 -0
  8. package/dist/cjs/driver/runtime-driver.js +4 -2
  9. package/dist/cjs/expression/expression-builder.d.ts +386 -0
  10. package/dist/cjs/expression/expression-builder.js +92 -0
  11. package/dist/cjs/expression/expression-wrapper.d.ts +92 -0
  12. package/dist/cjs/expression/expression-wrapper.js +54 -0
  13. package/dist/cjs/expression/expression.d.ts +1 -1
  14. package/dist/cjs/helpers/mysql.d.ts +140 -0
  15. package/dist/cjs/helpers/mysql.js +170 -0
  16. package/dist/cjs/helpers/postgres.d.ts +133 -0
  17. package/dist/cjs/helpers/postgres.js +141 -0
  18. package/dist/cjs/index.d.ts +4 -3
  19. package/dist/cjs/index.js +4 -2
  20. package/dist/cjs/kysely.d.ts +10 -0
  21. package/dist/cjs/kysely.js +12 -1
  22. package/dist/cjs/migration/file-migration-provider.d.ts +5 -2
  23. package/dist/cjs/migration/migrator.d.ts +5 -2
  24. package/dist/cjs/operation-node/aggregate-function-node.d.ts +3 -3
  25. package/dist/cjs/operation-node/create-index-node.d.ts +2 -0
  26. package/dist/cjs/operation-node/delete-query-node.d.ts +0 -1
  27. package/dist/cjs/operation-node/delete-query-node.js +0 -6
  28. package/dist/cjs/operation-node/function-node.d.ts +13 -0
  29. package/dist/cjs/operation-node/function-node.js +19 -0
  30. package/dist/cjs/operation-node/operation-node-transformer.d.ts +2 -0
  31. package/dist/cjs/operation-node/operation-node-transformer.js +9 -0
  32. package/dist/cjs/operation-node/operation-node-visitor.d.ts +2 -0
  33. package/dist/cjs/operation-node/operation-node-visitor.js +1 -0
  34. package/dist/cjs/operation-node/operation-node.d.ts +1 -1
  35. package/dist/cjs/operation-node/operator-node.d.ts +13 -2
  36. package/dist/cjs/operation-node/operator-node.js +38 -3
  37. package/dist/cjs/operation-node/query-node.d.ts +25 -8
  38. package/dist/cjs/operation-node/query-node.js +9 -2
  39. package/dist/cjs/operation-node/select-query-node.d.ts +0 -1
  40. package/dist/cjs/operation-node/select-query-node.js +0 -6
  41. package/dist/cjs/operation-node/update-query-node.d.ts +0 -1
  42. package/dist/cjs/operation-node/update-query-node.js +0 -6
  43. package/dist/cjs/parser/binary-operation-parser.d.ts +9 -10
  44. package/dist/cjs/parser/binary-operation-parser.js +89 -39
  45. package/dist/cjs/parser/coalesce-parser.d.ts +0 -2
  46. package/dist/cjs/parser/coalesce-parser.js +0 -9
  47. package/dist/cjs/parser/expression-parser.d.ts +7 -3
  48. package/dist/cjs/parser/expression-parser.js +3 -3
  49. package/dist/cjs/parser/group-by-parser.d.ts +3 -2
  50. package/dist/cjs/parser/group-by-parser.js +3 -0
  51. package/dist/cjs/parser/insert-values-parser.d.ts +4 -1
  52. package/dist/cjs/parser/insert-values-parser.js +19 -13
  53. package/dist/cjs/parser/join-parser.js +1 -1
  54. package/dist/cjs/parser/parse-utils.d.ts +0 -2
  55. package/dist/cjs/parser/parse-utils.js +1 -8
  56. package/dist/cjs/parser/returning-parser.d.ts +2 -1
  57. package/dist/cjs/parser/select-parser.d.ts +5 -13
  58. package/dist/cjs/parser/select-parser.js +8 -4
  59. package/dist/cjs/parser/table-parser.d.ts +5 -3
  60. package/dist/cjs/parser/unary-operation-parser.d.ts +5 -2
  61. package/dist/cjs/parser/unary-operation-parser.js +9 -8
  62. package/dist/cjs/parser/update-set-parser.d.ts +4 -1
  63. package/dist/cjs/parser/update-set-parser.js +9 -4
  64. package/dist/cjs/parser/value-parser.d.ts +5 -0
  65. package/dist/cjs/parser/value-parser.js +1 -3
  66. package/dist/cjs/plugin/deduplicate-joins/deduplicate-joins-plugin.d.ts +1 -1
  67. package/dist/cjs/plugin/deduplicate-joins/deduplicate-joins-plugin.js +1 -1
  68. package/dist/cjs/query-builder/aggregate-function-builder.d.ts +40 -113
  69. package/dist/cjs/query-builder/aggregate-function-builder.js +23 -63
  70. package/dist/cjs/query-builder/delete-query-builder.d.ts +220 -201
  71. package/dist/cjs/query-builder/delete-query-builder.js +21 -27
  72. package/dist/cjs/query-builder/delete-result.js +3 -0
  73. package/dist/cjs/query-builder/deprecated-having-expression-builder.d.ts +62 -0
  74. package/dist/cjs/query-builder/deprecated-having-expression-builder.js +2 -0
  75. package/dist/cjs/query-builder/deprecated-on-expression-builder.d.ts +62 -0
  76. package/dist/cjs/query-builder/deprecated-on-expression-builder.js +2 -0
  77. package/dist/cjs/query-builder/deprecated-where-expression-builder.d.ts +62 -0
  78. package/dist/cjs/query-builder/deprecated-where-expression-builder.js +2 -0
  79. package/dist/cjs/query-builder/function-module.d.ts +40 -12
  80. package/dist/cjs/query-builder/function-module.js +43 -329
  81. package/dist/cjs/query-builder/having-interface.d.ts +19 -16
  82. package/dist/cjs/query-builder/insert-query-builder.d.ts +75 -26
  83. package/dist/cjs/query-builder/insert-query-builder.js +21 -29
  84. package/dist/cjs/query-builder/insert-result.js +3 -0
  85. package/dist/cjs/query-builder/join-builder.d.ts +23 -26
  86. package/dist/cjs/query-builder/join-builder.js +17 -22
  87. package/dist/cjs/query-builder/no-result-error.d.ts +1 -0
  88. package/dist/cjs/query-builder/no-result-error.js +5 -1
  89. package/dist/cjs/query-builder/on-conflict-builder.d.ts +158 -276
  90. package/dist/cjs/query-builder/on-conflict-builder.js +52 -36
  91. package/dist/cjs/query-builder/over-builder.d.ts +5 -0
  92. package/dist/cjs/query-builder/over-builder.js +7 -0
  93. package/dist/cjs/query-builder/returning-interface.d.ts +2 -2
  94. package/dist/cjs/query-builder/select-query-builder.d.ts +148 -237
  95. package/dist/cjs/query-builder/select-query-builder.js +333 -78
  96. package/dist/cjs/query-builder/update-query-builder.d.ts +145 -213
  97. package/dist/cjs/query-builder/update-query-builder.js +21 -115
  98. package/dist/cjs/query-builder/update-result.js +3 -0
  99. package/dist/cjs/query-builder/where-interface.d.ts +71 -184
  100. package/dist/cjs/query-compiler/default-query-compiler.d.ts +3 -0
  101. package/dist/cjs/query-compiler/default-query-compiler.js +17 -1
  102. package/dist/cjs/query-creator.d.ts +9 -2
  103. package/dist/cjs/query-creator.js +1 -24
  104. package/dist/cjs/query-executor/query-executor.d.ts +3 -3
  105. package/dist/cjs/raw-builder/raw-builder.d.ts +5 -3
  106. package/dist/cjs/raw-builder/raw-builder.js +13 -7
  107. package/dist/cjs/raw-builder/sql.d.ts +17 -9
  108. package/dist/cjs/raw-builder/sql.js +8 -2
  109. package/dist/cjs/schema/alter-column-builder.d.ts +5 -0
  110. package/dist/cjs/schema/alter-column-builder.js +7 -0
  111. package/dist/cjs/schema/alter-table-add-foreign-key-constraint-builder.d.ts +5 -0
  112. package/dist/cjs/schema/alter-table-add-foreign-key-constraint-builder.js +7 -0
  113. package/dist/cjs/schema/alter-table-drop-constraint-builder.d.ts +5 -0
  114. package/dist/cjs/schema/alter-table-drop-constraint-builder.js +7 -0
  115. package/dist/cjs/schema/column-definition-builder.d.ts +6 -1
  116. package/dist/cjs/schema/column-definition-builder.js +8 -1
  117. package/dist/cjs/schema/create-index-builder.d.ts +51 -9
  118. package/dist/cjs/schema/create-index-builder.js +17 -0
  119. package/dist/cjs/schema/create-schema-builder.d.ts +5 -0
  120. package/dist/cjs/schema/create-schema-builder.js +7 -0
  121. package/dist/cjs/schema/create-table-builder.d.ts +3 -1
  122. package/dist/cjs/schema/create-table-builder.js +3 -1
  123. package/dist/cjs/schema/create-type-builder.d.ts +5 -0
  124. package/dist/cjs/schema/create-type-builder.js +7 -0
  125. package/dist/cjs/schema/create-view-builder.d.ts +5 -0
  126. package/dist/cjs/schema/create-view-builder.js +7 -0
  127. package/dist/cjs/schema/drop-index-builder.d.ts +5 -0
  128. package/dist/cjs/schema/drop-index-builder.js +7 -0
  129. package/dist/cjs/schema/drop-schema-builder.d.ts +5 -0
  130. package/dist/cjs/schema/drop-schema-builder.js +7 -0
  131. package/dist/cjs/schema/drop-table-builder.d.ts +5 -0
  132. package/dist/cjs/schema/drop-table-builder.js +7 -0
  133. package/dist/cjs/schema/drop-type-builder.d.ts +5 -0
  134. package/dist/cjs/schema/drop-type-builder.js +7 -0
  135. package/dist/cjs/schema/drop-view-builder.d.ts +5 -0
  136. package/dist/cjs/schema/drop-view-builder.js +7 -0
  137. package/dist/cjs/schema/foreign-key-constraint-builder.d.ts +5 -0
  138. package/dist/cjs/schema/foreign-key-constraint-builder.js +7 -0
  139. package/dist/cjs/util/compilable.d.ts +1 -0
  140. package/dist/cjs/util/compilable.js +6 -0
  141. package/dist/cjs/util/explainable.d.ts +35 -0
  142. package/dist/cjs/util/log.d.ts +2 -0
  143. package/dist/cjs/util/object-utils.js +1 -1
  144. package/dist/cjs/util/streamable.d.ts +29 -0
  145. package/dist/cjs/util/streamable.js +2 -0
  146. package/dist/cjs/util/type-utils.d.ts +1 -0
  147. package/dist/esm/dialect/mysql/mysql-adapter.js +2 -2
  148. package/dist/esm/dialect/mysql/mysql-driver.d.ts +1 -1
  149. package/dist/esm/dialect/mysql/mysql-driver.js +1 -1
  150. package/dist/esm/dialect/postgres/postgres-adapter.js +1 -1
  151. package/dist/esm/dialect/sqlite/sqlite-dialect.d.ts +1 -0
  152. package/dist/esm/dialect/sqlite/sqlite-dialect.js +1 -0
  153. package/dist/esm/driver/runtime-driver.js +4 -2
  154. package/dist/esm/expression/expression-builder.d.ts +386 -0
  155. package/dist/esm/expression/expression-builder.js +88 -0
  156. package/dist/esm/expression/expression-wrapper.d.ts +92 -0
  157. package/dist/esm/expression/expression-wrapper.js +50 -0
  158. package/dist/esm/expression/expression.d.ts +1 -1
  159. package/dist/esm/helpers/mysql.d.ts +140 -0
  160. package/dist/esm/helpers/mysql.js +165 -0
  161. package/dist/esm/helpers/postgres.d.ts +133 -0
  162. package/dist/esm/helpers/postgres.js +136 -0
  163. package/dist/esm/index.d.ts +4 -3
  164. package/dist/esm/index.js +2 -1
  165. package/dist/esm/kysely.d.ts +10 -0
  166. package/dist/esm/kysely.js +13 -2
  167. package/dist/esm/migration/file-migration-provider.d.ts +5 -2
  168. package/dist/esm/migration/migrator.d.ts +5 -2
  169. package/dist/esm/operation-node/aggregate-function-node.d.ts +3 -3
  170. package/dist/esm/operation-node/create-index-node.d.ts +2 -0
  171. package/dist/esm/operation-node/delete-query-node.d.ts +0 -1
  172. package/dist/esm/operation-node/delete-query-node.js +0 -6
  173. package/dist/esm/operation-node/function-node.d.ts +13 -0
  174. package/dist/esm/operation-node/function-node.js +17 -0
  175. package/dist/esm/operation-node/operation-node-transformer.d.ts +2 -0
  176. package/dist/esm/operation-node/operation-node-transformer.js +9 -0
  177. package/dist/esm/operation-node/operation-node-visitor.d.ts +2 -0
  178. package/dist/esm/operation-node/operation-node-visitor.js +1 -0
  179. package/dist/esm/operation-node/operation-node.d.ts +1 -1
  180. package/dist/esm/operation-node/operator-node.d.ts +13 -2
  181. package/dist/esm/operation-node/operator-node.js +34 -3
  182. package/dist/esm/operation-node/query-node.d.ts +25 -8
  183. package/dist/esm/operation-node/query-node.js +9 -2
  184. package/dist/esm/operation-node/select-query-node.d.ts +0 -1
  185. package/dist/esm/operation-node/select-query-node.js +0 -6
  186. package/dist/esm/operation-node/update-query-node.d.ts +0 -1
  187. package/dist/esm/operation-node/update-query-node.js +0 -6
  188. package/dist/esm/parser/binary-operation-parser.d.ts +9 -10
  189. package/dist/esm/parser/binary-operation-parser.js +85 -37
  190. package/dist/esm/parser/coalesce-parser.d.ts +0 -2
  191. package/dist/esm/parser/coalesce-parser.js +1 -7
  192. package/dist/esm/parser/expression-parser.d.ts +7 -3
  193. package/dist/esm/parser/expression-parser.js +3 -3
  194. package/dist/esm/parser/group-by-parser.d.ts +3 -2
  195. package/dist/esm/parser/group-by-parser.js +3 -0
  196. package/dist/esm/parser/insert-values-parser.d.ts +4 -1
  197. package/dist/esm/parser/insert-values-parser.js +18 -12
  198. package/dist/esm/parser/join-parser.js +2 -2
  199. package/dist/esm/parser/parse-utils.d.ts +0 -2
  200. package/dist/esm/parser/parse-utils.js +0 -6
  201. package/dist/esm/parser/returning-parser.d.ts +2 -1
  202. package/dist/esm/parser/select-parser.d.ts +5 -13
  203. package/dist/esm/parser/select-parser.js +7 -3
  204. package/dist/esm/parser/table-parser.d.ts +5 -3
  205. package/dist/esm/parser/unary-operation-parser.d.ts +5 -2
  206. package/dist/esm/parser/unary-operation-parser.js +8 -8
  207. package/dist/esm/parser/update-set-parser.d.ts +4 -1
  208. package/dist/esm/parser/update-set-parser.js +7 -2
  209. package/dist/esm/parser/value-parser.d.ts +5 -0
  210. package/dist/esm/parser/value-parser.js +1 -3
  211. package/dist/esm/plugin/deduplicate-joins/deduplicate-joins-plugin.d.ts +1 -1
  212. package/dist/esm/plugin/deduplicate-joins/deduplicate-joins-plugin.js +1 -1
  213. package/dist/esm/query-builder/aggregate-function-builder.d.ts +40 -113
  214. package/dist/esm/query-builder/aggregate-function-builder.js +24 -64
  215. package/dist/esm/query-builder/delete-query-builder.d.ts +220 -201
  216. package/dist/esm/query-builder/delete-query-builder.js +24 -30
  217. package/dist/esm/query-builder/delete-result.js +3 -0
  218. package/dist/esm/query-builder/deprecated-having-expression-builder.d.ts +62 -0
  219. package/dist/esm/query-builder/deprecated-having-expression-builder.js +2 -0
  220. package/dist/esm/query-builder/deprecated-on-expression-builder.d.ts +62 -0
  221. package/dist/esm/query-builder/deprecated-on-expression-builder.js +2 -0
  222. package/dist/esm/query-builder/deprecated-where-expression-builder.d.ts +62 -0
  223. package/dist/esm/query-builder/deprecated-where-expression-builder.js +2 -0
  224. package/dist/esm/query-builder/function-module.d.ts +40 -12
  225. package/dist/esm/query-builder/function-module.js +42 -328
  226. package/dist/esm/query-builder/having-interface.d.ts +19 -16
  227. package/dist/esm/query-builder/insert-query-builder.d.ts +75 -26
  228. package/dist/esm/query-builder/insert-query-builder.js +25 -33
  229. package/dist/esm/query-builder/insert-result.js +3 -0
  230. package/dist/esm/query-builder/join-builder.d.ts +23 -26
  231. package/dist/esm/query-builder/join-builder.js +18 -23
  232. package/dist/esm/query-builder/no-result-error.d.ts +1 -0
  233. package/dist/esm/query-builder/no-result-error.js +3 -0
  234. package/dist/esm/query-builder/on-conflict-builder.d.ts +158 -276
  235. package/dist/esm/query-builder/on-conflict-builder.js +54 -38
  236. package/dist/esm/query-builder/over-builder.d.ts +5 -0
  237. package/dist/esm/query-builder/over-builder.js +7 -0
  238. package/dist/esm/query-builder/returning-interface.d.ts +2 -2
  239. package/dist/esm/query-builder/select-query-builder.d.ts +148 -237
  240. package/dist/esm/query-builder/select-query-builder.js +337 -82
  241. package/dist/esm/query-builder/update-query-builder.d.ts +145 -213
  242. package/dist/esm/query-builder/update-query-builder.js +25 -119
  243. package/dist/esm/query-builder/update-result.js +3 -0
  244. package/dist/esm/query-builder/where-interface.d.ts +71 -184
  245. package/dist/esm/query-compiler/default-query-compiler.d.ts +3 -0
  246. package/dist/esm/query-compiler/default-query-compiler.js +17 -1
  247. package/dist/esm/query-creator.d.ts +9 -2
  248. package/dist/esm/query-creator.js +1 -24
  249. package/dist/esm/query-executor/query-executor.d.ts +3 -3
  250. package/dist/esm/raw-builder/raw-builder.d.ts +5 -3
  251. package/dist/esm/raw-builder/raw-builder.js +13 -7
  252. package/dist/esm/raw-builder/sql.d.ts +17 -9
  253. package/dist/esm/raw-builder/sql.js +8 -2
  254. package/dist/esm/schema/alter-column-builder.d.ts +5 -0
  255. package/dist/esm/schema/alter-column-builder.js +7 -0
  256. package/dist/esm/schema/alter-table-add-foreign-key-constraint-builder.d.ts +5 -0
  257. package/dist/esm/schema/alter-table-add-foreign-key-constraint-builder.js +7 -0
  258. package/dist/esm/schema/alter-table-drop-constraint-builder.d.ts +5 -0
  259. package/dist/esm/schema/alter-table-drop-constraint-builder.js +7 -0
  260. package/dist/esm/schema/column-definition-builder.d.ts +6 -1
  261. package/dist/esm/schema/column-definition-builder.js +8 -1
  262. package/dist/esm/schema/create-index-builder.d.ts +51 -9
  263. package/dist/esm/schema/create-index-builder.js +17 -0
  264. package/dist/esm/schema/create-schema-builder.d.ts +5 -0
  265. package/dist/esm/schema/create-schema-builder.js +7 -0
  266. package/dist/esm/schema/create-table-builder.d.ts +3 -1
  267. package/dist/esm/schema/create-table-builder.js +3 -1
  268. package/dist/esm/schema/create-type-builder.d.ts +5 -0
  269. package/dist/esm/schema/create-type-builder.js +7 -0
  270. package/dist/esm/schema/create-view-builder.d.ts +5 -0
  271. package/dist/esm/schema/create-view-builder.js +7 -0
  272. package/dist/esm/schema/drop-index-builder.d.ts +5 -0
  273. package/dist/esm/schema/drop-index-builder.js +7 -0
  274. package/dist/esm/schema/drop-schema-builder.d.ts +5 -0
  275. package/dist/esm/schema/drop-schema-builder.js +7 -0
  276. package/dist/esm/schema/drop-table-builder.d.ts +5 -0
  277. package/dist/esm/schema/drop-table-builder.js +7 -0
  278. package/dist/esm/schema/drop-type-builder.d.ts +5 -0
  279. package/dist/esm/schema/drop-type-builder.js +7 -0
  280. package/dist/esm/schema/drop-view-builder.d.ts +5 -0
  281. package/dist/esm/schema/drop-view-builder.js +7 -0
  282. package/dist/esm/schema/foreign-key-constraint-builder.d.ts +5 -0
  283. package/dist/esm/schema/foreign-key-constraint-builder.js +7 -0
  284. package/dist/esm/util/compilable.d.ts +1 -0
  285. package/dist/esm/util/compilable.js +4 -1
  286. package/dist/esm/util/explainable.d.ts +35 -0
  287. package/dist/esm/util/log.d.ts +2 -0
  288. package/dist/esm/util/object-utils.js +1 -1
  289. package/dist/esm/util/streamable.d.ts +29 -0
  290. package/dist/esm/util/streamable.js +2 -0
  291. package/dist/esm/util/type-utils.d.ts +1 -0
  292. package/helpers/mysql.d.ts +1 -0
  293. package/helpers/mysql.js +1 -0
  294. package/helpers/postgres.d.ts +1 -0
  295. package/helpers/postgres.js +1 -0
  296. package/package.json +26 -9
  297. package/dist/cjs/query-builder/expression-builder.d.ts +0 -126
  298. package/dist/cjs/query-builder/expression-builder.js +0 -107
  299. package/dist/esm/query-builder/expression-builder.d.ts +0 -126
  300. package/dist/esm/query-builder/expression-builder.js +0 -104
@@ -1,8 +1,2 @@
1
1
  /// <reference types="./coalesce-parser.d.ts" />
2
- import { RawNode } from '../operation-node/raw-node.js';
3
- import { parseReferenceExpressionOrList, } from './reference-parser.js';
4
- export function parseCoalesce(values) {
5
- return RawNode.create(values.length > 1
6
- ? ['coalesce(', ...new Array(values.length - 1).fill(', '), ')']
7
- : ['coalesce(', ')'], parseReferenceExpressionOrList(values));
8
- }
2
+ export {};
@@ -1,10 +1,14 @@
1
1
  import { AliasedExpression, Expression } from '../expression/expression.js';
2
2
  import { AliasNode } from '../operation-node/alias-node.js';
3
3
  import { OperationNode } from '../operation-node/operation-node.js';
4
- import { ExpressionBuilder } from '../query-builder/expression-builder.js';
4
+ import { ExpressionBuilder } from '../expression/expression-builder.js';
5
5
  import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
6
- export declare type ExpressionOrFactory<DB, TB extends keyof DB, V> = SelectQueryBuilder<any, any, Record<string, V>> | ((eb: ExpressionBuilder<DB, TB>) => SelectQueryBuilder<any, any, Record<string, V>>) | Expression<V> | ((eb: ExpressionBuilder<DB, TB>) => Expression<V>);
7
- export declare type AliasedExpressionOrFactory<DB, TB extends keyof DB> = AliasedExpression<any, any> | ((qb: ExpressionBuilder<DB, TB>) => AliasedExpression<any, any>);
6
+ export declare type ExpressionOrFactory<DB, TB extends keyof DB, V> = SelectQueryBuilder<any, any, Record<string, V>> | SelectQueryBuilderFactory<DB, TB, Record<string, V>> | Expression<V> | ExpressionFactory<DB, TB, V>;
7
+ export declare type AliasedExpressionOrFactory<DB, TB extends keyof DB> = AliasedExpression<any, any> | AliasedExpressionFactory<DB, TB>;
8
+ declare type SelectQueryBuilderFactory<DB, TB extends keyof DB, V> = (eb: ExpressionBuilder<DB, TB>) => SelectQueryBuilder<any, any, V>;
9
+ declare type ExpressionFactory<DB, TB extends keyof DB, V> = (eb: ExpressionBuilder<DB, TB>) => Expression<V>;
10
+ declare type AliasedExpressionFactory<DB, TB extends keyof DB> = (eb: ExpressionBuilder<DB, TB>) => AliasedExpression<any, any>;
8
11
  export declare function parseExpression(exp: ExpressionOrFactory<any, any, any>): OperationNode;
9
12
  export declare function parseAliasedExpression(exp: AliasedExpressionOrFactory<any, any>): AliasNode;
10
13
  export declare function isExpressionOrFactory(obj: unknown): obj is ExpressionOrFactory<any, any, any>;
14
+ export {};
@@ -1,14 +1,14 @@
1
1
  /// <reference types="./expression-parser.d.ts" />
2
2
  import { isAliasedExpression, isExpression, } from '../expression/expression.js';
3
3
  import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
4
+ import { expressionBuilder, } from '../expression/expression-builder.js';
4
5
  import { isFunction } from '../util/object-utils.js';
5
- import { createExpressionBuilder } from './parse-utils.js';
6
6
  export function parseExpression(exp) {
7
7
  if (isOperationNodeSource(exp)) {
8
8
  return exp.toOperationNode();
9
9
  }
10
10
  else if (isFunction(exp)) {
11
- return exp(createExpressionBuilder()).toOperationNode();
11
+ return exp(expressionBuilder()).toOperationNode();
12
12
  }
13
13
  throw new Error(`invalid expression: ${JSON.stringify(exp)}`);
14
14
  }
@@ -17,7 +17,7 @@ export function parseAliasedExpression(exp) {
17
17
  return exp.toOperationNode();
18
18
  }
19
19
  else if (isFunction(exp)) {
20
- return exp(createExpressionBuilder()).toOperationNode();
20
+ return exp(expressionBuilder()).toOperationNode();
21
21
  }
22
22
  throw new Error(`invalid aliased expression: ${JSON.stringify(exp)}`);
23
23
  }
@@ -1,5 +1,6 @@
1
1
  import { GroupByItemNode } from '../operation-node/group-by-item-node.js';
2
+ import { ExpressionBuilder } from '../expression/expression-builder.js';
2
3
  import { ReferenceExpression } from './reference-parser.js';
3
4
  export declare type GroupByExpression<DB, TB extends keyof DB, O> = ReferenceExpression<DB, TB> | (keyof O & string);
4
- export declare type GroupByExpressionOrList<DB, TB extends keyof DB, O> = ReadonlyArray<GroupByExpression<DB, TB, O>> | GroupByExpression<DB, TB, O>;
5
- export declare function parseGroupBy(groupBy: GroupByExpressionOrList<any, any, any>): GroupByItemNode[];
5
+ export declare type GroupByArg<DB, TB extends keyof DB, O> = GroupByExpression<DB, TB, O> | ReadonlyArray<GroupByExpression<DB, TB, O>> | ((eb: ExpressionBuilder<DB, TB>) => ReadonlyArray<GroupByExpression<DB, TB, O>>);
6
+ export declare function parseGroupBy(groupBy: GroupByArg<any, any, any>): GroupByItemNode[];
@@ -1,6 +1,9 @@
1
1
  /// <reference types="./group-by-parser.d.ts" />
2
2
  import { GroupByItemNode } from '../operation-node/group-by-item-node.js';
3
+ import { expressionBuilder, } from '../expression/expression-builder.js';
4
+ import { isFunction } from '../util/object-utils.js';
3
5
  import { parseReferenceExpressionOrList, } from './reference-parser.js';
4
6
  export function parseGroupBy(groupBy) {
7
+ groupBy = isFunction(groupBy) ? groupBy(expressionBuilder()) : groupBy;
5
8
  return parseReferenceExpressionOrList(groupBy).map(GroupByItemNode.create);
6
9
  }
@@ -2,10 +2,13 @@ import { ColumnNode } from '../operation-node/column-node.js';
2
2
  import { ValueExpression } from './value-parser.js';
3
3
  import { ValuesNode } from '../operation-node/values-node.js';
4
4
  import { NonNullableInsertKeys, NullableInsertKeys, InsertType } from '../util/column-type.js';
5
+ import { ExpressionBuilder } from '../expression/expression-builder.js';
5
6
  export declare type InsertObject<DB, TB extends keyof DB> = {
6
7
  [C in NonNullableInsertKeys<DB[TB]>]: ValueExpression<DB, TB, InsertType<DB[TB][C]>>;
7
8
  } & {
8
9
  [C in NullableInsertKeys<DB[TB]>]?: ValueExpression<DB, TB, InsertType<DB[TB][C]>> | undefined;
9
10
  };
10
11
  export declare type InsertObjectOrList<DB, TB extends keyof DB> = InsertObject<DB, TB> | ReadonlyArray<InsertObject<DB, TB>>;
11
- export declare function parseInsertObjectOrList(args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>, ValuesNode];
12
+ export declare type InsertObjectOrListFactory<DB, TB extends keyof DB> = (eb: ExpressionBuilder<DB, TB>) => InsertObjectOrList<DB, TB>;
13
+ export declare type InsertExpression<DB, TB extends keyof DB> = InsertObjectOrList<DB, TB> | InsertObjectOrListFactory<DB, TB>;
14
+ export declare function parseInsertExpression(arg: InsertExpression<any, any>): [ReadonlyArray<ColumnNode>, ValuesNode];
@@ -2,13 +2,18 @@
2
2
  import { ColumnNode } from '../operation-node/column-node.js';
3
3
  import { PrimitiveValueListNode } from '../operation-node/primitive-value-list-node.js';
4
4
  import { ValueListNode } from '../operation-node/value-list-node.js';
5
- import { freeze, isUndefined } from '../util/object-utils.js';
5
+ import { freeze, isFunction, isReadonlyArray, isUndefined, } from '../util/object-utils.js';
6
6
  import { parseValueExpression } from './value-parser.js';
7
7
  import { ValuesNode } from '../operation-node/values-node.js';
8
8
  import { isExpressionOrFactory } from './expression-parser.js';
9
9
  import { DefaultInsertValueNode } from '../operation-node/default-insert-value-node.js';
10
- export function parseInsertObjectOrList(args) {
11
- return parseInsertColumnsAndValues(Array.isArray(args) ? args : [args]);
10
+ import { expressionBuilder, } from '../expression/expression-builder.js';
11
+ export function parseInsertExpression(arg) {
12
+ const objectOrList = isFunction(arg) ? arg(expressionBuilder()) : arg;
13
+ const list = isReadonlyArray(objectOrList)
14
+ ? objectOrList
15
+ : freeze([objectOrList]);
16
+ return parseInsertColumnsAndValues(list);
12
17
  }
13
18
  function parseInsertColumnsAndValues(rows) {
14
19
  const columns = parseColumnNamesAndIndexes(rows);
@@ -34,19 +39,20 @@ function parseRowValues(row, columns) {
34
39
  const rowValues = Array.from({
35
40
  length: columns.size,
36
41
  });
37
- let complexColumn = false;
42
+ let hasUndefinedOrComplexColumns = false;
38
43
  for (const col of rowColumns) {
39
44
  const columnIdx = columns.get(col);
40
- if (columnIdx !== undefined) {
41
- const value = row[col];
42
- if (isExpressionOrFactory(value)) {
43
- complexColumn = true;
44
- }
45
- rowValues[columnIdx] = value;
45
+ if (isUndefined(columnIdx)) {
46
+ continue;
47
+ }
48
+ const value = row[col];
49
+ if (isUndefined(value) || isExpressionOrFactory(value)) {
50
+ hasUndefinedOrComplexColumns = true;
46
51
  }
52
+ rowValues[columnIdx] = value;
47
53
  }
48
- const columnMissing = rowColumns.length < columns.size;
49
- if (columnMissing || complexColumn) {
54
+ const hasMissingColumns = rowColumns.length < columns.size;
55
+ if (hasMissingColumns || hasUndefinedOrComplexColumns) {
50
56
  const defaultValue = DefaultInsertValueNode.create();
51
57
  return ValueListNode.create(rowValues.map((it) => isUndefined(it) ? defaultValue : parseValueExpression(it)));
52
58
  }
@@ -1,7 +1,7 @@
1
1
  /// <reference types="./join-parser.d.ts" />
2
2
  import { JoinNode } from '../operation-node/join-node.js';
3
3
  import { parseTableExpression, } from './table-parser.js';
4
- import { parseReferentialFilter } from './binary-operation-parser.js';
4
+ import { parseReferentialComparison } from './binary-operation-parser.js';
5
5
  import { createJoinBuilder } from './parse-utils.js';
6
6
  export function parseJoin(joinType, args) {
7
7
  if (args.length === 3) {
@@ -19,5 +19,5 @@ function parseCallbackJoin(joinType, from, callback) {
19
19
  return joinBuilder.toOperationNode();
20
20
  }
21
21
  function parseSingleOnJoin(joinType, from, lhsColumn, rhsColumn) {
22
- return JoinNode.createWithOn(joinType, parseTableExpression(from), parseReferentialFilter(lhsColumn, '=', rhsColumn));
22
+ return JoinNode.createWithOn(joinType, parseTableExpression(from), parseReferentialComparison(lhsColumn, '=', rhsColumn));
23
23
  }
@@ -1,12 +1,10 @@
1
1
  import { JoinType } from '../operation-node/join-node.js';
2
- import { ExpressionBuilder } from '../query-builder/expression-builder.js';
3
2
  import { JoinBuilder } from '../query-builder/join-builder.js';
4
3
  import { OverBuilder } from '../query-builder/over-builder.js';
5
4
  import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
6
5
  import { QueryCreator } from '../query-creator.js';
7
6
  import { TableExpression } from './table-parser.js';
8
7
  export declare function createSelectQueryBuilder(): SelectQueryBuilder<any, any, any>;
9
- export declare function createExpressionBuilder(): ExpressionBuilder<any, any>;
10
8
  export declare function createQueryCreator(): QueryCreator<any>;
11
9
  export declare function createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
12
10
  export declare function createOverBuilder(): OverBuilder<any, any>;
@@ -2,7 +2,6 @@
2
2
  import { JoinNode } from '../operation-node/join-node.js';
3
3
  import { OverNode } from '../operation-node/over-node.js';
4
4
  import { SelectQueryNode } from '../operation-node/select-query-node.js';
5
- import { ExpressionBuilder } from '../query-builder/expression-builder.js';
6
5
  import { JoinBuilder } from '../query-builder/join-builder.js';
7
6
  import { OverBuilder } from '../query-builder/over-builder.js';
8
7
  import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
@@ -17,11 +16,6 @@ export function createSelectQueryBuilder() {
17
16
  queryNode: SelectQueryNode.create(parseTableExpressionOrList([])),
18
17
  });
19
18
  }
20
- export function createExpressionBuilder() {
21
- return new ExpressionBuilder({
22
- executor: NOOP_QUERY_EXECUTOR,
23
- });
24
- }
25
19
  export function createQueryCreator() {
26
20
  return new QueryCreator({
27
21
  executor: NOOP_QUERY_EXECUTOR,
@@ -1,5 +1,6 @@
1
1
  import { DeleteResult } from '../query-builder/delete-result.js';
2
2
  import { InsertResult } from '../query-builder/insert-result.js';
3
3
  import { UpdateResult } from '../query-builder/update-result.js';
4
- import { Selection } from './select-parser.js';
4
+ import { Selection, AllSelection } from './select-parser.js';
5
5
  export declare type ReturningRow<DB, TB extends keyof DB, O, SE> = O extends InsertResult ? Selection<DB, TB, SE> : O extends DeleteResult ? Selection<DB, TB, SE> : O extends UpdateResult ? Selection<DB, TB, SE> : O & Selection<DB, TB, SE>;
6
+ export declare type ReturningAllRow<DB, TB extends keyof DB, O> = O extends InsertResult ? AllSelection<DB, TB> : O extends DeleteResult ? AllSelection<DB, TB> : O extends UpdateResult ? AllSelection<DB, TB> : O & AllSelection<DB, TB>;
@@ -1,21 +1,13 @@
1
- import { AliasedSelectQueryBuilder, SelectQueryBuilder } from '../query-builder/select-query-builder.js';
1
+ import { AliasedSelectQueryBuilder } from '../query-builder/select-query-builder.js';
2
2
  import { SelectionNode } from '../operation-node/selection-node.js';
3
3
  import { AnyAliasedColumn, AnyAliasedColumnWithTable, AnyColumn, AnyColumnWithTable, ExtractColumnType, ValueType } from '../util/type-utils.js';
4
4
  import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
5
5
  import { AliasedExpressionOrFactory } from './expression-parser.js';
6
6
  import { Selectable, SelectType } from '../util/column-type.js';
7
7
  import { AliasedExpression } from '../expression/expression.js';
8
+ import { ExpressionBuilder } from '../expression/expression-builder.js';
8
9
  export declare type SelectExpression<DB, TB extends keyof DB> = AnyAliasedColumnWithTable<DB, TB> | AnyAliasedColumn<DB, TB> | AnyColumnWithTable<DB, TB> | AnyColumn<DB, TB> | DynamicReferenceBuilder<any> | AliasedExpressionOrFactory<DB, TB>;
9
- export declare type SelectExpressionOrList<DB, TB extends keyof DB> = SelectExpression<DB, TB> | ReadonlyArray<SelectExpression<DB, TB>>;
10
- /**
11
- * Given a selection expression returns a query builder type that
12
- * has the selection.
13
- */
14
- export declare type QueryBuilderWithSelection<DB, TB extends keyof DB, O, SE> = SelectQueryBuilder<DB, TB, O & Selection<DB, TB, SE>>;
15
- /**
16
- * `selectAll` output query builder type.
17
- */
18
- export declare type SelectAllQueryBuilder<DB, TB extends keyof DB, O, S extends keyof DB> = SelectQueryBuilder<DB, TB, O & AllSelection<DB, S>>;
10
+ export declare type SelectArg<DB, TB extends keyof DB, SE extends SelectExpression<DB, TB>> = SE | ReadonlyArray<SE> | ((eb: ExpressionBuilder<DB, TB>) => ReadonlyArray<SE>);
19
11
  export declare type Selection<DB, TB extends keyof DB, SE> = {
20
12
  [A in ExtractAliasFromSelectExpression<SE>]: SelectType<ExtractTypeFromSelectExpression<DB, TB, SE, A>>;
21
13
  };
@@ -23,11 +15,11 @@ declare type ExtractAliasFromSelectExpression<SE> = SE extends string ? ExtractA
23
15
  declare type ExtractAliasFromStringSelectExpression<SE extends string> = SE extends `${string}.${string}.${string} as ${infer A}` ? A : SE extends `${string}.${string} as ${infer A}` ? A : SE extends `${string} as ${infer A}` ? A : SE extends `${string}.${string}.${infer C}` ? C : SE extends `${string}.${infer C}` ? C : SE;
24
16
  declare type ExtractTypeFromSelectExpression<DB, TB extends keyof DB, SE, A extends keyof any> = SE extends string ? ExtractTypeFromStringSelectExpression<DB, TB, SE, A> : SE extends AliasedSelectQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<O> : never : SE extends (qb: any) => AliasedSelectQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<O> : never : SE extends AliasedExpression<infer O, infer EA> ? EA extends A ? O : never : SE extends (qb: any) => AliasedExpression<infer O, infer EA> ? EA extends A ? O : never : SE extends DynamicReferenceBuilder<infer RA> ? A extends ExtractAliasFromStringSelectExpression<RA> ? ExtractTypeFromStringSelectExpression<DB, TB, RA, A> | undefined : never : never;
25
17
  declare type ExtractTypeFromStringSelectExpression<DB, TB extends keyof DB, SE extends string, A extends keyof any> = SE extends `${infer SC}.${infer T}.${infer C} as ${infer RA}` ? RA extends A ? `${SC}.${T}` extends TB ? C extends keyof DB[`${SC}.${T}`] ? DB[`${SC}.${T}`][C] : never : never : never : SE extends `${infer T}.${infer C} as ${infer RA}` ? RA extends A ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : never : SE extends `${infer C} as ${infer RA}` ? RA extends A ? C extends AnyColumn<DB, TB> ? ExtractColumnType<DB, TB, C> : never : never : SE extends `${infer SC}.${infer T}.${infer C}` ? C extends A ? `${SC}.${T}` extends TB ? C extends keyof DB[`${SC}.${T}`] ? DB[`${SC}.${T}`][C] : never : never : never : SE extends `${infer T}.${infer C}` ? C extends A ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : never : SE extends A ? SE extends AnyColumn<DB, TB> ? ExtractColumnType<DB, TB, SE> : never : never;
26
- declare type AllSelection<DB, TB extends keyof DB> = Selectable<{
18
+ export declare type AllSelection<DB, TB extends keyof DB> = Selectable<{
27
19
  [C in AnyColumn<DB, TB>]: {
28
20
  [T in TB]: C extends keyof DB[T] ? DB[T][C] : never;
29
21
  }[TB];
30
22
  }>;
31
- export declare function parseSelectExpressionOrList(selection: SelectExpressionOrList<any, any>): SelectionNode[];
23
+ export declare function parseSelectArg(selection: SelectArg<any, any, SelectExpression<any, any>>): SelectionNode[];
32
24
  export declare function parseSelectAll(table?: string | string[]): SelectionNode[];
33
25
  export {};
@@ -1,12 +1,16 @@
1
1
  /// <reference types="./select-parser.d.ts" />
2
- import { isReadonlyArray, isString } from '../util/object-utils.js';
2
+ import { isFunction, isReadonlyArray, isString } from '../util/object-utils.js';
3
3
  import { SelectionNode } from '../operation-node/selection-node.js';
4
4
  import { parseAliasedStringReference } from './reference-parser.js';
5
5
  import { isDynamicReferenceBuilder, } from '../dynamic/dynamic-reference-builder.js';
6
6
  import { parseAliasedExpression, } from './expression-parser.js';
7
7
  import { parseTable } from './table-parser.js';
8
- export function parseSelectExpressionOrList(selection) {
9
- if (isReadonlyArray(selection)) {
8
+ import { expressionBuilder, } from '../expression/expression-builder.js';
9
+ export function parseSelectArg(selection) {
10
+ if (isFunction(selection)) {
11
+ return parseSelectArg(selection(expressionBuilder()));
12
+ }
13
+ else if (isReadonlyArray(selection)) {
10
14
  return selection.map((it) => parseSelectExpression(it));
11
15
  }
12
16
  else {
@@ -3,17 +3,19 @@ import { TableNode } from '../operation-node/table-node.js';
3
3
  import { AliasedExpressionOrFactory } from './expression-parser.js';
4
4
  import { OperationNode } from '../operation-node/operation-node.js';
5
5
  import { AliasedExpression } from '../expression/expression.js';
6
- export declare type TableExpression<DB, TB extends keyof DB> = TableReference<DB> | AliasedExpressionOrFactory<DB, TB>;
6
+ export declare type TableExpression<DB, TB extends keyof DB> = AnyAliasedTable<DB> | AnyTable<DB> | AliasedExpressionOrFactory<DB, TB>;
7
7
  export declare type TableExpressionOrList<DB, TB extends keyof DB> = TableExpression<DB, TB> | ReadonlyArray<TableExpression<DB, TB>>;
8
8
  export declare type TableReference<DB> = AnyAliasedTable<DB> | AnyTable<DB> | AliasedExpression<any, any>;
9
+ export declare type AnyAliasedTable<DB> = `${AnyTable<DB>} as ${string}`;
9
10
  export declare type TableReferenceOrList<DB> = TableReference<DB> | ReadonlyArray<TableReference<DB>>;
10
11
  export declare type From<DB, TE> = {
11
12
  [C in keyof DB | ExtractAliasFromTableExpression<DB, TE>]: C extends ExtractAliasFromTableExpression<DB, TE> ? ExtractRowTypeFromTableExpression<DB, TE, C> : C extends keyof DB ? DB[C] : never;
12
13
  };
13
14
  export declare type FromTables<DB, TB extends keyof DB, TE> = TB | ExtractAliasFromTableExpression<DB, TE>;
14
- declare type ExtractAliasFromTableExpression<DB, TE> = TE extends `${string} as ${infer TA}` ? TA : TE extends keyof DB ? TE : TE extends AliasedExpression<any, infer QA> ? QA : TE extends (qb: any) => AliasedExpression<any, infer QA> ? QA : never;
15
+ export declare type ExtractTableAlias<DB, TE> = TE extends `${string} as ${infer TA}` ? TA : TE extends keyof DB ? TE : never;
16
+ export declare type PickTableWithAlias<DB, T extends AnyAliasedTable<DB>> = T extends `${infer TB} as ${infer A}` ? TB extends keyof DB ? Record<A, DB[TB]> : never : never;
17
+ declare type ExtractAliasFromTableExpression<DB, TE> = TE extends string ? ExtractTableAlias<DB, TE> : TE extends AliasedExpression<any, infer QA> ? QA : TE extends (qb: any) => AliasedExpression<any, infer QA> ? QA : never;
15
18
  declare type ExtractRowTypeFromTableExpression<DB, TE, A extends keyof any> = TE extends `${infer T} as ${infer TA}` ? TA extends A ? T extends keyof DB ? DB[T] : never : never : TE extends A ? TE extends keyof DB ? DB[TE] : never : TE extends AliasedExpression<infer O, infer QA> ? QA extends A ? O : never : TE extends (qb: any) => AliasedExpression<infer O, infer QA> ? QA extends A ? O : never : never;
16
- declare type AnyAliasedTable<DB> = `${AnyTable<DB>} as ${string}`;
17
19
  declare type AnyTable<DB> = keyof DB & string;
18
20
  export declare function parseTableExpressionOrList(table: TableExpressionOrList<any, any>): OperationNode[];
19
21
  export declare function parseTableExpression(table: TableExpression<any, any>): OperationNode;
@@ -1,5 +1,8 @@
1
+ import { UnaryOperator } from '../operation-node/operator-node.js';
1
2
  import { UnaryOperationNode } from '../operation-node/unary-operation-node.js';
2
3
  import { ExpressionOrFactory } from './expression-parser.js';
4
+ import { ReferenceExpression } from './reference-parser.js';
3
5
  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;
6
+ export declare function parseExists(operand: ExistsExpression<any, any>): UnaryOperationNode;
7
+ export declare function parseNotExists(operand: ExistsExpression<any, any>): UnaryOperationNode;
8
+ export declare function parseUnaryOperation(operator: UnaryOperator, operand: ReferenceExpression<any, any>): UnaryOperationNode;
@@ -1,13 +1,13 @@
1
1
  /// <reference types="./unary-operation-parser.d.ts" />
2
- import { OperatorNode, } from '../operation-node/operator-node.js';
2
+ import { OperatorNode } from '../operation-node/operator-node.js';
3
3
  import { UnaryOperationNode } from '../operation-node/unary-operation-node.js';
4
- import { parseValueExpressionOrList } from './value-parser.js';
5
- export function parseExists(arg) {
6
- return parseUnaryOperation('exists', arg);
4
+ import { parseReferenceExpression, } from './reference-parser.js';
5
+ export function parseExists(operand) {
6
+ return parseUnaryOperation('exists', operand);
7
7
  }
8
- export function parseNotExists(arg) {
9
- return parseUnaryOperation('not exists', arg);
8
+ export function parseNotExists(operand) {
9
+ return parseUnaryOperation('not exists', operand);
10
10
  }
11
- function parseUnaryOperation(type, arg) {
12
- return UnaryOperationNode.create(OperatorNode.create(type), parseValueExpressionOrList(arg));
11
+ export function parseUnaryOperation(operator, operand) {
12
+ return UnaryOperationNode.create(OperatorNode.create(operator), parseReferenceExpression(operand));
13
13
  }
@@ -1,7 +1,10 @@
1
1
  import { ColumnUpdateNode } from '../operation-node/column-update-node.js';
2
+ import { ExpressionBuilder } from '../expression/expression-builder.js';
2
3
  import { UpdateKeys, UpdateType } from '../util/column-type.js';
3
4
  import { ValueExpression } from './value-parser.js';
4
5
  export declare type UpdateObject<DB, TB extends keyof DB, UT extends keyof DB = TB> = {
5
6
  [C in UpdateKeys<DB[UT]>]?: ValueExpression<DB, TB, UpdateType<DB[UT][C]>> | undefined;
6
7
  };
7
- export declare function parseUpdateObject(update: UpdateObject<any, any, any>): ReadonlyArray<ColumnUpdateNode>;
8
+ export declare type UpdateObjectFactory<DB, TB extends keyof DB, UT extends keyof DB> = (eb: ExpressionBuilder<DB, TB>) => UpdateObject<DB, TB, UT>;
9
+ export declare type UpdateExpression<DB, TB extends keyof DB, UT extends keyof DB = TB> = UpdateObject<DB, TB, UT> | UpdateObjectFactory<DB, TB, UT>;
10
+ export declare function parseUpdateExpression(update: UpdateExpression<any, any, any>): ReadonlyArray<ColumnUpdateNode>;
@@ -1,9 +1,14 @@
1
1
  /// <reference types="./update-set-parser.d.ts" />
2
2
  import { ColumnNode } from '../operation-node/column-node.js';
3
3
  import { ColumnUpdateNode } from '../operation-node/column-update-node.js';
4
+ import { expressionBuilder } from '../expression/expression-builder.js';
5
+ import { isFunction } from '../util/object-utils.js';
4
6
  import { parseValueExpression } from './value-parser.js';
5
- export function parseUpdateObject(update) {
6
- return Object.entries(update)
7
+ export function parseUpdateExpression(update) {
8
+ const updateObj = isFunction(update)
9
+ ? update(expressionBuilder())
10
+ : update;
11
+ return Object.entries(updateObj)
7
12
  .filter(([_, value]) => value !== undefined)
8
13
  .map(([key, value]) => {
9
14
  return ColumnUpdateNode.create(ColumnNode.create(key), parseValueExpression(value));
@@ -1,6 +1,11 @@
1
1
  import { ExpressionOrFactory } from './expression-parser.js';
2
2
  import { OperationNode } from '../operation-node/operation-node.js';
3
+ import { Expression } from '../expression/expression.js';
4
+ import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
3
5
  export declare type ValueExpression<DB, TB extends keyof DB, V> = V | ExpressionOrFactory<DB, TB, V>;
4
6
  export declare type ValueExpressionOrList<DB, TB extends keyof DB, V> = ValueExpression<DB, TB, V> | ReadonlyArray<ValueExpression<DB, TB, V>>;
7
+ export declare type ExtractTypeFromValueExpressionOrList<VE> = VE extends ReadonlyArray<infer AV> ? ExtractTypeFromValueExpression<AV> : ExtractTypeFromValueExpression<VE>;
8
+ declare type ExtractTypeFromValueExpression<VE> = VE extends SelectQueryBuilder<any, any, Record<string, infer SV>> ? SV : VE extends Expression<infer V> ? V : VE;
5
9
  export declare function parseValueExpressionOrList(arg: ValueExpressionOrList<any, any, unknown>): OperationNode;
6
10
  export declare function parseValueExpression(exp: ValueExpression<any, any, unknown>): OperationNode;
11
+ export {};
@@ -8,9 +8,7 @@ export function parseValueExpressionOrList(arg) {
8
8
  if (isReadonlyArray(arg)) {
9
9
  return parseValueExpressionList(arg);
10
10
  }
11
- else {
12
- return parseValueExpression(arg);
13
- }
11
+ return parseValueExpression(arg);
14
12
  }
15
13
  export function parseValueExpression(exp) {
16
14
  if (isExpressionOrFactory(exp)) {
@@ -5,7 +5,7 @@ import { KyselyPlugin, PluginTransformQueryArgs, PluginTransformResultArgs } fro
5
5
  /**
6
6
  * Plugin that removes duplicate joins from queries.
7
7
  *
8
- * See [this recipe](https://github.com/koskimas/kysely/tree/master/recipes/deduplicate-joins.md)
8
+ * See [this recipe](https://github.com/koskimas/kysely/tree/master/site/docs/recipes/deduplicate-joins.md)
9
9
  */
10
10
  export declare class DeduplicateJoinsPlugin implements KyselyPlugin {
11
11
  #private;
@@ -3,7 +3,7 @@ import { DeduplicateJoinsTransformer } from './deduplicate-joins-transformer.js'
3
3
  /**
4
4
  * Plugin that removes duplicate joins from queries.
5
5
  *
6
- * See [this recipe](https://github.com/koskimas/kysely/tree/master/recipes/deduplicate-joins.md)
6
+ * See [this recipe](https://github.com/koskimas/kysely/tree/master/site/docs/recipes/deduplicate-joins.md)
7
7
  */
8
8
  export class DeduplicateJoinsPlugin {
9
9
  #transformer = new DeduplicateJoinsTransformer();
@@ -3,8 +3,9 @@ import { AliasNode } from '../operation-node/alias-node.js';
3
3
  import { OverBuilder } from './over-builder.js';
4
4
  import { AliasedExpression, Expression } from '../expression/expression.js';
5
5
  import { ReferenceExpression } from '../parser/reference-parser.js';
6
- import { ComparisonOperatorExpression, OperandValueExpressionOrList, WhereGrouper } from '../parser/binary-operation-parser.js';
6
+ import { ComparisonOperatorExpression, OperandValueExpressionOrList } from '../parser/binary-operation-parser.js';
7
7
  import { ExistsExpression } from '../parser/unary-operation-parser.js';
8
+ import { WhereExpressionFactory } from './where-interface.js';
8
9
  export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unknown> implements Expression<O> {
9
10
  #private;
10
11
  constructor(props: AggregateFunctionBuilderProps);
@@ -88,22 +89,19 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
88
89
  * ```ts
89
90
  * const result = await db
90
91
  * .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'),
92
+ * .select((eb) => [
93
+ * eb.fn
94
+ * .count<number>('id')
95
+ * .filterWhere('gender', '=', 'female')
96
+ * .as('female_count'),
97
+ * eb.fn
98
+ * .count<number>('id')
99
+ * .filterWhere('gender', '=', 'male')
100
+ * .as('male_count'),
101
+ * eb.fn
102
+ * .count<number>('id')
103
+ * .filterWhere('gender', '=', 'other')
104
+ * .as('other_count'),
107
105
  * ])
108
106
  * .executeTakeFirstOrThrow()
109
107
  * ```
@@ -119,52 +117,14 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
119
117
  * ```
120
118
  */
121
119
  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>;
120
+ filterWhere(factory: WhereExpressionFactory<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
123
121
  filterWhere(expression: Expression<any>): AggregateFunctionBuilder<DB, TB, O>;
124
122
  /**
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
- * ```
123
+ * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
163
124
  */
164
125
  filterWhereExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
165
126
  /**
166
- * Just like {@link filterWhereExists} but creates a `not exists` clause inside
167
- * the `filter` clause.
127
+ * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
168
128
  */
169
129
  filterWhereNotExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
170
130
  /**
@@ -180,13 +140,12 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
180
140
  * ```ts
181
141
  * const result = await db
182
142
  * .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'),
143
+ * .select((eb) => [
144
+ * eb.fn
145
+ * .count<number>('id')
146
+ * .filterWhereRef('first_name', '=', 'last_name')
147
+ * .as('repeat_name_count'),
148
+ * eb.fn.count<number>('id').as('total_count'),
190
149
  * ])
191
150
  * .executeTakeFirstOrThrow()
192
151
  * ```
@@ -202,64 +161,27 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
202
161
  */
203
162
  filterWhereRef(lhs: ReferenceExpression<DB, TB>, op: ComparisonOperatorExpression, rhs: ReferenceExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
204
163
  /**
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
- * ```
164
+ * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
238
165
  */
239
166
  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>;
167
+ /**
168
+ * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
169
+ */
170
+ orFilterWhere(factory: WhereExpressionFactory<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
171
+ /**
172
+ * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
173
+ */
241
174
  orFilterWhere(expression: Expression<any>): AggregateFunctionBuilder<DB, TB, O>;
242
175
  /**
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.
176
+ * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
247
177
  */
248
178
  orFilterWhereExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
249
179
  /**
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.
180
+ * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
254
181
  */
255
182
  orFilterWhereNotExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
256
183
  /**
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.
184
+ * @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
263
185
  */
264
186
  orFilterWhereRef(lhs: ReferenceExpression<DB, TB>, op: ComparisonOperatorExpression, rhs: ReferenceExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
265
187
  /**
@@ -305,6 +227,11 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
305
227
  * ```
306
228
  */
307
229
  over(over?: OverBuilderCallback<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
230
+ /**
231
+ * Simply calls the provided function passing `this` as the only argument. `$call` returns
232
+ * what the provided function returns.
233
+ */
234
+ $call<T>(func: (qb: this) => T): T;
308
235
  /**
309
236
  * Creates the OperationNode that describes how to compile this expression into SQL.
310
237
  *