kysely 0.11.3 → 0.12.2

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 (250) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/dialect/dialect-adapter-base.d.ts +36 -0
  3. package/dist/cjs/dialect/mysql/mysql-adapter.d.ts +36 -0
  4. package/dist/cjs/dialect/mysql/mysql-dialect.d.ts +16 -0
  5. package/dist/cjs/dialect/mysql/mysql-driver.d.ts +29 -0
  6. package/dist/cjs/dialect/mysql/mysql-introspector.d.ts +3 -0
  7. package/dist/cjs/dialect/postgres/postgres-adapter.d.ts +36 -0
  8. package/dist/cjs/dialect/postgres/postgres-dialect.d.ts +16 -0
  9. package/dist/cjs/dialect/postgres/postgres-driver.d.ts +29 -0
  10. package/dist/cjs/dialect/postgres/postgres-introspector.d.ts +3 -0
  11. package/dist/cjs/dialect/sqlite/sqlite-adapter.d.ts +36 -0
  12. package/dist/cjs/dialect/sqlite/sqlite-adapter.js +6 -2
  13. package/dist/cjs/dialect/sqlite/sqlite-dialect.d.ts +16 -0
  14. package/dist/cjs/dialect/sqlite/sqlite-driver.d.ts +29 -0
  15. package/dist/cjs/dialect/sqlite/sqlite-introspector.d.ts +3 -0
  16. package/dist/cjs/driver/default-connection-provider.d.ts +4 -0
  17. package/dist/cjs/driver/runtime-driver.d.ts +29 -0
  18. package/dist/cjs/driver/single-connection-provider.d.ts +4 -0
  19. package/dist/cjs/dynamic/dynamic-reference-builder.d.ts +1 -0
  20. package/dist/cjs/dynamic/dynamic-reference-builder.js +9 -1
  21. package/dist/cjs/dynamic/dynamic.d.ts +6 -7
  22. package/dist/cjs/dynamic/dynamic.js +6 -7
  23. package/dist/cjs/index.d.ts +14 -3
  24. package/dist/cjs/index.js +12 -1
  25. package/dist/cjs/kysely.d.ts +170 -11
  26. package/dist/cjs/kysely.js +69 -9
  27. package/dist/cjs/migration/migration.d.ts +2 -2
  28. package/dist/cjs/operation-node/common-table-expression-name-node.d.ts +15 -0
  29. package/dist/cjs/operation-node/common-table-expression-name-node.js +23 -0
  30. package/dist/cjs/operation-node/common-table-expression-node.d.ts +3 -3
  31. package/dist/cjs/operation-node/create-table-node.d.ts +6 -2
  32. package/dist/cjs/operation-node/create-table-node.js +6 -6
  33. package/dist/cjs/operation-node/create-view-node.d.ts +1 -0
  34. package/dist/cjs/operation-node/insert-query-node.d.ts +4 -4
  35. package/dist/cjs/operation-node/operation-node-transformer.d.ts +4 -0
  36. package/dist/cjs/operation-node/operation-node-transformer.js +20 -1
  37. package/dist/cjs/operation-node/operation-node-visitor.d.ts +4 -0
  38. package/dist/cjs/operation-node/operation-node-visitor.js +2 -0
  39. package/dist/cjs/operation-node/operation-node.d.ts +1 -1
  40. package/dist/cjs/operation-node/query-node.d.ts +0 -2
  41. package/dist/cjs/operation-node/query-node.js +0 -10
  42. package/dist/cjs/operation-node/values-node.d.ts +15 -0
  43. package/dist/cjs/operation-node/values-node.js +18 -0
  44. package/dist/cjs/operation-node/with-node.d.ts +3 -1
  45. package/dist/cjs/operation-node/with-node.js +2 -1
  46. package/dist/cjs/package.json +1 -3
  47. package/dist/cjs/parser/complex-expression-parser.d.ts +9 -0
  48. package/dist/cjs/parser/complex-expression-parser.js +25 -0
  49. package/dist/cjs/parser/filter-parser.d.ts +13 -4
  50. package/dist/cjs/parser/filter-parser.js +21 -24
  51. package/dist/cjs/parser/insert-values-parser.d.ts +7 -10
  52. package/dist/cjs/parser/insert-values-parser.js +31 -39
  53. package/dist/cjs/parser/order-by-parser.d.ts +1 -1
  54. package/dist/cjs/parser/parse-context.d.ts +22 -8
  55. package/dist/cjs/parser/parse-context.js +10 -10
  56. package/dist/cjs/parser/reference-parser.d.ts +8 -7
  57. package/dist/cjs/parser/reference-parser.js +8 -17
  58. package/dist/cjs/parser/returning-parser.d.ts +1 -5
  59. package/dist/cjs/parser/select-parser.d.ts +12 -14
  60. package/dist/cjs/parser/select-parser.js +5 -9
  61. package/dist/cjs/parser/table-parser.d.ts +9 -11
  62. package/dist/cjs/parser/table-parser.js +2 -8
  63. package/dist/cjs/parser/union-parser.d.ts +2 -2
  64. package/dist/cjs/parser/union-parser.js +1 -6
  65. package/dist/cjs/parser/update-set-parser.d.ts +2 -8
  66. package/dist/cjs/parser/update-set-parser.js +6 -26
  67. package/dist/cjs/parser/value-parser.d.ts +9 -6
  68. package/dist/cjs/parser/value-parser.js +7 -30
  69. package/dist/cjs/parser/with-parser.d.ts +36 -6
  70. package/dist/cjs/parser/with-parser.js +13 -2
  71. package/dist/cjs/plugin/camel-case/camel-case-plugin.d.ts +34 -0
  72. package/dist/cjs/plugin/immediate-value.ts/immediate-value-plugin.d.ts +34 -0
  73. package/dist/cjs/plugin/immediate-value.ts/immediate-value-plugin.js +2 -2
  74. package/dist/cjs/plugin/with-schema/with-schema-plugin.d.ts +34 -0
  75. package/dist/cjs/plugin/with-schema/with-schema-transformer.js +8 -0
  76. package/dist/cjs/query-builder/delete-query-builder.d.ts +647 -0
  77. package/dist/cjs/query-builder/delete-query-builder.js +185 -0
  78. package/dist/cjs/query-builder/expression-builder.d.ts +8 -6
  79. package/dist/cjs/query-builder/expression-builder.js +3 -3
  80. package/dist/cjs/query-builder/function-builder.d.ts +2 -1
  81. package/dist/cjs/query-builder/function-builder.js +2 -1
  82. package/dist/cjs/query-builder/having-interface.d.ts +49 -0
  83. package/dist/cjs/query-builder/having-interface.js +2 -0
  84. package/dist/cjs/query-builder/insert-query-builder.d.ts +504 -0
  85. package/dist/cjs/query-builder/insert-query-builder.js +256 -0
  86. package/dist/cjs/query-builder/insert-result.d.ts +3 -2
  87. package/dist/cjs/query-builder/insert-result.js +3 -2
  88. package/dist/cjs/query-builder/join-builder.d.ts +19 -20
  89. package/dist/cjs/query-builder/join-builder.js +12 -12
  90. package/dist/cjs/query-builder/join-interface.d.ts +130 -0
  91. package/dist/cjs/query-builder/join-interface.js +2 -0
  92. package/dist/cjs/query-builder/no-result-error.d.ts +9 -0
  93. package/dist/cjs/query-builder/no-result-error.js +14 -0
  94. package/dist/cjs/query-builder/returning-interface.d.ts +73 -0
  95. package/dist/cjs/query-builder/returning-interface.js +2 -0
  96. package/dist/cjs/query-builder/{query-builder.d.ts → select-query-builder.d.ts} +145 -634
  97. package/dist/cjs/query-builder/select-query-builder.js +571 -0
  98. package/dist/cjs/query-builder/update-query-builder.d.ts +735 -0
  99. package/dist/cjs/query-builder/update-query-builder.js +279 -0
  100. package/dist/cjs/query-builder/where-interface.d.ts +378 -0
  101. package/dist/cjs/query-builder/where-interface.js +2 -0
  102. package/dist/cjs/query-compiler/default-query-compiler.d.ts +4 -0
  103. package/dist/cjs/query-compiler/default-query-compiler.js +33 -5
  104. package/dist/cjs/query-creator.d.ts +69 -43
  105. package/dist/cjs/query-creator.js +66 -29
  106. package/dist/cjs/query-executor/default-query-executor.d.ts +19 -0
  107. package/dist/cjs/query-executor/noop-query-executor.d.ts +19 -0
  108. package/dist/cjs/query-executor/query-executor.d.ts +1 -1
  109. package/dist/cjs/query-executor/query-executor.js +1 -1
  110. package/dist/cjs/raw-builder/raw-builder.d.ts +2 -0
  111. package/dist/cjs/raw-builder/raw-builder.js +7 -1
  112. package/dist/cjs/schema/alter-table-builder.d.ts +218 -2
  113. package/dist/cjs/schema/column-definition-builder.d.ts +135 -20
  114. package/dist/cjs/schema/create-index-builder.d.ts +2 -1
  115. package/dist/cjs/schema/create-index-builder.js +2 -1
  116. package/dist/cjs/schema/create-table-builder.d.ts +26 -9
  117. package/dist/cjs/schema/create-table-builder.js +42 -9
  118. package/dist/cjs/schema/create-view-builder.d.ts +17 -3
  119. package/dist/cjs/schema/create-view-builder.js +25 -16
  120. package/dist/cjs/schema/schema.d.ts +18 -11
  121. package/dist/cjs/schema/schema.js +18 -11
  122. package/dist/cjs/util/log.d.ts +3 -2
  123. package/dist/cjs/util/log.js +8 -15
  124. package/dist/cjs/util/type-utils.d.ts +7 -7
  125. package/dist/esm/dialect/dialect-adapter-base.d.ts +36 -0
  126. package/dist/esm/dialect/mysql/mysql-adapter.d.ts +36 -0
  127. package/dist/esm/dialect/mysql/mysql-dialect.d.ts +16 -0
  128. package/dist/esm/dialect/mysql/mysql-driver.d.ts +29 -0
  129. package/dist/esm/dialect/mysql/mysql-introspector.d.ts +3 -0
  130. package/dist/esm/dialect/postgres/postgres-adapter.d.ts +36 -0
  131. package/dist/esm/dialect/postgres/postgres-dialect.d.ts +16 -0
  132. package/dist/esm/dialect/postgres/postgres-driver.d.ts +29 -0
  133. package/dist/esm/dialect/postgres/postgres-introspector.d.ts +3 -0
  134. package/dist/esm/dialect/sqlite/sqlite-adapter.d.ts +36 -0
  135. package/dist/esm/dialect/sqlite/sqlite-adapter.js +6 -2
  136. package/dist/esm/dialect/sqlite/sqlite-dialect.d.ts +16 -0
  137. package/dist/esm/dialect/sqlite/sqlite-driver.d.ts +29 -0
  138. package/dist/esm/dialect/sqlite/sqlite-introspector.d.ts +3 -0
  139. package/dist/esm/driver/default-connection-provider.d.ts +4 -0
  140. package/dist/esm/driver/runtime-driver.d.ts +29 -0
  141. package/dist/esm/driver/single-connection-provider.d.ts +4 -0
  142. package/dist/esm/dynamic/dynamic-reference-builder.d.ts +1 -0
  143. package/dist/esm/dynamic/dynamic-reference-builder.js +7 -0
  144. package/dist/esm/dynamic/dynamic.d.ts +6 -7
  145. package/dist/esm/dynamic/dynamic.js +6 -7
  146. package/dist/esm/index.d.ts +14 -3
  147. package/dist/esm/index.js +12 -1
  148. package/dist/esm/kysely.d.ts +170 -11
  149. package/dist/esm/kysely.js +69 -9
  150. package/dist/esm/migration/migration.d.ts +2 -2
  151. package/dist/esm/operation-node/common-table-expression-name-node.d.ts +15 -0
  152. package/dist/esm/operation-node/common-table-expression-name-node.js +20 -0
  153. package/dist/esm/operation-node/common-table-expression-node.d.ts +3 -3
  154. package/dist/esm/operation-node/create-table-node.d.ts +6 -2
  155. package/dist/esm/operation-node/create-table-node.js +6 -6
  156. package/dist/esm/operation-node/create-view-node.d.ts +1 -0
  157. package/dist/esm/operation-node/insert-query-node.d.ts +4 -4
  158. package/dist/esm/operation-node/operation-node-transformer.d.ts +4 -0
  159. package/dist/esm/operation-node/operation-node-transformer.js +20 -1
  160. package/dist/esm/operation-node/operation-node-visitor.d.ts +4 -0
  161. package/dist/esm/operation-node/operation-node-visitor.js +2 -0
  162. package/dist/esm/operation-node/operation-node.d.ts +1 -1
  163. package/dist/esm/operation-node/query-node.d.ts +0 -2
  164. package/dist/esm/operation-node/query-node.js +0 -10
  165. package/dist/esm/operation-node/values-node.d.ts +15 -0
  166. package/dist/esm/operation-node/values-node.js +15 -0
  167. package/dist/esm/operation-node/with-node.d.ts +3 -1
  168. package/dist/esm/operation-node/with-node.js +2 -1
  169. package/dist/esm/package.json +1 -3
  170. package/dist/esm/parser/complex-expression-parser.d.ts +9 -0
  171. package/dist/esm/parser/complex-expression-parser.js +20 -0
  172. package/dist/esm/parser/filter-parser.d.ts +13 -4
  173. package/dist/esm/parser/filter-parser.js +21 -24
  174. package/dist/esm/parser/insert-values-parser.d.ts +7 -10
  175. package/dist/esm/parser/insert-values-parser.js +31 -38
  176. package/dist/esm/parser/order-by-parser.d.ts +1 -1
  177. package/dist/esm/parser/parse-context.d.ts +22 -8
  178. package/dist/esm/parser/parse-context.js +10 -10
  179. package/dist/esm/parser/reference-parser.d.ts +8 -7
  180. package/dist/esm/parser/reference-parser.js +9 -18
  181. package/dist/esm/parser/returning-parser.d.ts +1 -5
  182. package/dist/esm/parser/select-parser.d.ts +12 -14
  183. package/dist/esm/parser/select-parser.js +6 -10
  184. package/dist/esm/parser/table-parser.d.ts +9 -11
  185. package/dist/esm/parser/table-parser.js +3 -9
  186. package/dist/esm/parser/union-parser.d.ts +2 -2
  187. package/dist/esm/parser/union-parser.js +1 -6
  188. package/dist/esm/parser/update-set-parser.d.ts +2 -8
  189. package/dist/esm/parser/update-set-parser.js +5 -24
  190. package/dist/esm/parser/value-parser.d.ts +9 -6
  191. package/dist/esm/parser/value-parser.js +8 -31
  192. package/dist/esm/parser/with-parser.d.ts +36 -6
  193. package/dist/esm/parser/with-parser.js +13 -2
  194. package/dist/esm/plugin/camel-case/camel-case-plugin.d.ts +34 -0
  195. package/dist/esm/plugin/immediate-value.ts/immediate-value-plugin.d.ts +34 -0
  196. package/dist/esm/plugin/immediate-value.ts/immediate-value-plugin.js +2 -2
  197. package/dist/esm/plugin/with-schema/with-schema-plugin.d.ts +34 -0
  198. package/dist/esm/plugin/with-schema/with-schema-transformer.js +8 -0
  199. package/dist/esm/query-builder/delete-query-builder.d.ts +647 -0
  200. package/dist/esm/query-builder/delete-query-builder.js +181 -0
  201. package/dist/esm/query-builder/expression-builder.d.ts +8 -6
  202. package/dist/esm/query-builder/expression-builder.js +3 -3
  203. package/dist/esm/query-builder/function-builder.d.ts +2 -1
  204. package/dist/esm/query-builder/function-builder.js +2 -1
  205. package/dist/esm/query-builder/having-interface.d.ts +49 -0
  206. package/dist/esm/query-builder/having-interface.js +1 -0
  207. package/dist/esm/query-builder/insert-query-builder.d.ts +504 -0
  208. package/dist/esm/query-builder/insert-query-builder.js +252 -0
  209. package/dist/esm/query-builder/insert-result.d.ts +3 -2
  210. package/dist/esm/query-builder/insert-result.js +3 -2
  211. package/dist/esm/query-builder/join-builder.d.ts +19 -20
  212. package/dist/esm/query-builder/join-builder.js +12 -12
  213. package/dist/esm/query-builder/join-interface.d.ts +130 -0
  214. package/dist/esm/query-builder/join-interface.js +1 -0
  215. package/dist/esm/query-builder/no-result-error.d.ts +9 -0
  216. package/dist/esm/query-builder/no-result-error.js +10 -0
  217. package/dist/esm/query-builder/returning-interface.d.ts +73 -0
  218. package/dist/esm/query-builder/returning-interface.js +1 -0
  219. package/dist/esm/query-builder/{query-builder.d.ts → select-query-builder.d.ts} +145 -634
  220. package/dist/esm/query-builder/select-query-builder.js +566 -0
  221. package/dist/esm/query-builder/update-query-builder.d.ts +735 -0
  222. package/dist/esm/query-builder/update-query-builder.js +275 -0
  223. package/dist/esm/query-builder/where-interface.d.ts +378 -0
  224. package/dist/esm/query-builder/where-interface.js +1 -0
  225. package/dist/esm/query-compiler/default-query-compiler.d.ts +4 -0
  226. package/dist/esm/query-compiler/default-query-compiler.js +33 -5
  227. package/dist/esm/query-creator.d.ts +69 -43
  228. package/dist/esm/query-creator.js +66 -29
  229. package/dist/esm/query-executor/default-query-executor.d.ts +19 -0
  230. package/dist/esm/query-executor/noop-query-executor.d.ts +19 -0
  231. package/dist/esm/query-executor/query-executor.d.ts +1 -1
  232. package/dist/esm/query-executor/query-executor.js +1 -1
  233. package/dist/esm/raw-builder/raw-builder.d.ts +2 -0
  234. package/dist/esm/raw-builder/raw-builder.js +7 -1
  235. package/dist/esm/schema/alter-table-builder.d.ts +218 -2
  236. package/dist/esm/schema/column-definition-builder.d.ts +135 -20
  237. package/dist/esm/schema/create-index-builder.d.ts +2 -1
  238. package/dist/esm/schema/create-index-builder.js +2 -1
  239. package/dist/esm/schema/create-table-builder.d.ts +26 -9
  240. package/dist/esm/schema/create-table-builder.js +43 -10
  241. package/dist/esm/schema/create-view-builder.d.ts +17 -3
  242. package/dist/esm/schema/create-view-builder.js +25 -16
  243. package/dist/esm/schema/schema.d.ts +18 -11
  244. package/dist/esm/schema/schema.js +18 -11
  245. package/dist/esm/util/log.d.ts +3 -2
  246. package/dist/esm/util/log.js +7 -14
  247. package/dist/esm/util/type-utils.d.ts +7 -7
  248. package/package.json +10 -8
  249. package/dist/cjs/query-builder/query-builder.js +0 -1067
  250. package/dist/esm/query-builder/query-builder.js +0 -1061
@@ -44,6 +44,7 @@ import { ReferencesNode } from './references-node.js';
44
44
  import { CheckConstraintNode } from './check-constraint-node.js';
45
45
  import { WithNode } from './with-node.js';
46
46
  import { CommonTableExpressionNode } from './common-table-expression-node.js';
47
+ import { CommonTableExpressionNameNode } from './common-table-expression-name-node.js';
47
48
  import { HavingNode } from './having-node.js';
48
49
  import { CreateSchemaNode } from './create-schema-node.js';
49
50
  import { DropSchemaNode } from './drop-schema-node.js';
@@ -63,6 +64,7 @@ import { DropViewNode } from './drop-view-node.js';
63
64
  import { GeneratedAlwaysAsNode } from './generated-always-as-node.js';
64
65
  import { DefaultValueNode } from './default-value-node.js';
65
66
  import { OnNode } from './on-node.js';
67
+ import { ValuesNode } from './values-node.js';
66
68
  export declare abstract class OperationNodeVisitor {
67
69
  #private;
68
70
  protected readonly nodeStack: OperationNode[];
@@ -109,6 +111,7 @@ export declare abstract class OperationNodeVisitor {
109
111
  protected abstract visitCheckConstraint(node: CheckConstraintNode): void;
110
112
  protected abstract visitWith(node: WithNode): void;
111
113
  protected abstract visitCommonTableExpression(node: CommonTableExpressionNode): void;
114
+ protected abstract visitCommonTableExpressionName(node: CommonTableExpressionNameNode): void;
112
115
  protected abstract visitHaving(node: HavingNode): void;
113
116
  protected abstract visitCreateSchema(node: CreateSchemaNode): void;
114
117
  protected abstract visitDropSchema(node: DropSchemaNode): void;
@@ -132,4 +135,5 @@ export declare abstract class OperationNodeVisitor {
132
135
  protected abstract visitGeneratedAlwaysAs(node: GeneratedAlwaysAsNode): void;
133
136
  protected abstract visitDefaultValue(node: DefaultValueNode): void;
134
137
  protected abstract visitOn(node: OnNode): void;
138
+ protected abstract visitValues(node: ValuesNode): void;
135
139
  }
@@ -52,6 +52,7 @@ export class OperationNodeVisitor {
52
52
  CheckConstraintNode: this.visitCheckConstraint.bind(this),
53
53
  WithNode: this.visitWith.bind(this),
54
54
  CommonTableExpressionNode: this.visitCommonTableExpression.bind(this),
55
+ CommonTableExpressionNameNode: this.visitCommonTableExpressionName.bind(this),
55
56
  HavingNode: this.visitHaving.bind(this),
56
57
  CreateSchemaNode: this.visitCreateSchema.bind(this),
57
58
  DropSchemaNode: this.visitDropSchema.bind(this),
@@ -69,6 +70,7 @@ export class OperationNodeVisitor {
69
70
  GeneratedAlwaysAsNode: this.visitGeneratedAlwaysAs.bind(this),
70
71
  DefaultValueNode: this.visitDefaultValue.bind(this),
71
72
  OnNode: this.visitOn.bind(this),
73
+ ValuesNode: this.visitValues.bind(this),
72
74
  });
73
75
  visitNode = (node) => {
74
76
  this.nodeStack.push(node);
@@ -1,4 +1,4 @@
1
- export declare type OperationNodeKind = 'IdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | 'FilterNode' | 'AndNode' | 'OrNode' | 'ParensNode' | 'ValueNode' | 'ValueListNode' | 'PrimitiveValueListNode' | 'JoinNode' | 'OperatorNode' | 'WhereNode' | 'InsertQueryNode' | 'DeleteQueryNode' | 'ReturningNode' | 'CreateTableNode' | 'ColumnDefinitionNode' | 'AddColumnNode' | 'DropTableNode' | 'DataTypeNode' | 'OrderByNode' | 'OrderByItemNode' | 'GroupByNode' | 'GroupByItemNode' | 'UpdateQueryNode' | 'ColumnUpdateNode' | 'LimitNode' | 'OffsetNode' | 'OnConflictNode' | 'OnDuplicateKeyNode' | 'CreateIndexNode' | 'DropIndexNode' | 'ListNode' | 'ReferencesNode' | 'PrimaryKeyConstraintNode' | 'UniqueConstraintNode' | 'CheckConstraintNode' | 'ForeignKeyConstraintNode' | 'WithNode' | 'CommonTableExpressionNode' | 'HavingNode' | 'CreateSchemaNode' | 'DropSchemaNode' | 'AlterTableNode' | 'ModifyColumnNode' | 'DropColumnNode' | 'RenameColumnNode' | 'AlterColumnNode' | 'AddConstraintNode' | 'DropConstraintNode' | 'UnionNode' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedAlwaysAsNode' | 'DefaultValueNode' | 'OnNode';
1
+ export declare type OperationNodeKind = 'IdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | 'FilterNode' | 'AndNode' | 'OrNode' | 'ParensNode' | 'ValueNode' | 'ValueListNode' | 'PrimitiveValueListNode' | 'JoinNode' | 'OperatorNode' | 'WhereNode' | 'InsertQueryNode' | 'DeleteQueryNode' | 'ReturningNode' | 'CreateTableNode' | 'ColumnDefinitionNode' | 'AddColumnNode' | 'DropTableNode' | 'DataTypeNode' | 'OrderByNode' | 'OrderByItemNode' | 'GroupByNode' | 'GroupByItemNode' | 'UpdateQueryNode' | 'ColumnUpdateNode' | 'LimitNode' | 'OffsetNode' | 'OnConflictNode' | 'OnDuplicateKeyNode' | 'CreateIndexNode' | 'DropIndexNode' | 'ListNode' | 'ReferencesNode' | 'PrimaryKeyConstraintNode' | 'UniqueConstraintNode' | 'CheckConstraintNode' | 'ForeignKeyConstraintNode' | 'WithNode' | 'CommonTableExpressionNode' | 'HavingNode' | 'CreateSchemaNode' | 'DropSchemaNode' | 'AlterTableNode' | 'ModifyColumnNode' | 'DropColumnNode' | 'RenameColumnNode' | 'AlterColumnNode' | 'AddConstraintNode' | 'DropConstraintNode' | 'UnionNode' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedAlwaysAsNode' | 'DefaultValueNode' | 'OnNode' | 'ValuesNode' | 'CommonTableExpressionNameNode';
2
2
  export interface OperationNode {
3
3
  readonly kind: OperationNodeKind;
4
4
  }
@@ -14,8 +14,6 @@ export declare type FilterableQueryNode = SelectQueryNode | DeleteQueryNode | Up
14
14
  */
15
15
  export declare const QueryNode: Readonly<{
16
16
  is(node: OperationNode): node is QueryNode;
17
- isMutating(node: OperationNode): node is MutatingQueryNode;
18
- isFilterable(node: OperationNode): node is FilterableQueryNode;
19
17
  cloneWithWhere<T extends FilterableQueryNode>(node: T, filter: FilterExpressionNode): T;
20
18
  cloneWithOrWhere<T_1 extends FilterableQueryNode>(node: T_1, filter: FilterExpressionNode): T_1;
21
19
  cloneWithJoin<T_2 extends FilterableQueryNode>(node: T_2, join: JoinNode): T_2;
@@ -15,16 +15,6 @@ export const QueryNode = freeze({
15
15
  UpdateQueryNode.is(node) ||
16
16
  SelectQueryNode.is(node));
17
17
  },
18
- isMutating(node) {
19
- return (DeleteQueryNode.is(node) ||
20
- InsertQueryNode.is(node) ||
21
- UpdateQueryNode.is(node));
22
- },
23
- isFilterable(node) {
24
- return (SelectQueryNode.is(node) ||
25
- DeleteQueryNode.is(node) ||
26
- UpdateQueryNode.is(node));
27
- },
28
18
  cloneWithWhere(node, filter) {
29
19
  return freeze({
30
20
  ...node,
@@ -0,0 +1,15 @@
1
+ import { OperationNode } from './operation-node.js';
2
+ import { PrimitiveValueListNode } from './primitive-value-list-node.js';
3
+ import { ValueListNode } from './value-list-node.js';
4
+ export declare type ValuesItemNode = ValueListNode | PrimitiveValueListNode;
5
+ export interface ValuesNode extends OperationNode {
6
+ readonly kind: 'ValuesNode';
7
+ readonly values: ReadonlyArray<ValuesItemNode>;
8
+ }
9
+ /**
10
+ * @internal
11
+ */
12
+ export declare const ValuesNode: Readonly<{
13
+ is(node: OperationNode): node is ValuesNode;
14
+ create(values: ReadonlyArray<ValuesItemNode>): ValuesNode;
15
+ }>;
@@ -0,0 +1,15 @@
1
+ import { freeze } from '../util/object-utils.js';
2
+ /**
3
+ * @internal
4
+ */
5
+ export const ValuesNode = freeze({
6
+ is(node) {
7
+ return node.kind === 'ValuesNode';
8
+ },
9
+ create(values) {
10
+ return freeze({
11
+ kind: 'ValuesNode',
12
+ values: freeze(values),
13
+ });
14
+ },
15
+ });
@@ -1,14 +1,16 @@
1
1
  import { OperationNode } from './operation-node.js';
2
2
  import { CommonTableExpressionNode } from './common-table-expression-node.js';
3
+ export declare type WithNodeParams = Omit<WithNode, 'kind' | 'expressions'>;
3
4
  export interface WithNode extends OperationNode {
4
5
  readonly kind: 'WithNode';
5
6
  readonly expressions: ReadonlyArray<CommonTableExpressionNode>;
7
+ readonly recursive?: boolean;
6
8
  }
7
9
  /**
8
10
  * @internal
9
11
  */
10
12
  export declare const WithNode: Readonly<{
11
13
  is(node: OperationNode): node is WithNode;
12
- create(expression: CommonTableExpressionNode): WithNode;
14
+ create(expression: CommonTableExpressionNode, params?: WithNodeParams | undefined): WithNode;
13
15
  cloneWithExpression(withNode: WithNode, expression: CommonTableExpressionNode): WithNode;
14
16
  }>;
@@ -6,10 +6,11 @@ export const WithNode = freeze({
6
6
  is(node) {
7
7
  return node.kind === 'WithNode';
8
8
  },
9
- create(expression) {
9
+ create(expression, params) {
10
10
  return freeze({
11
11
  kind: 'WithNode',
12
12
  expressions: freeze([expression]),
13
+ ...params,
13
14
  });
14
15
  },
15
16
  cloneWithExpression(withNode, expression) {
@@ -1,3 +1 @@
1
- {
2
- "type": "module"
3
- }
1
+ {"type":"module"}
@@ -0,0 +1,9 @@
1
+ import { AliasNode } from '../operation-node/alias-node.js';
2
+ import { RawNode } from '../operation-node/raw-node.js';
3
+ import { SelectQueryNode } from '../operation-node/select-query-node.js';
4
+ import { AliasedQueryBuilderFactory, AliasedRawBuilderFactory, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, AnySelectQueryBuilder, AnyRawBuilder, SelectQueryBuilderFactory, RawBuilderFactory } from '../util/type-utils.js';
5
+ import { ParseContext } from './parse-context.js';
6
+ export declare type ComplexExpression<DB, TB extends keyof DB> = AnySelectQueryBuilder | SelectQueryBuilderFactory<DB, TB> | AnyRawBuilder | RawBuilderFactory<DB, TB>;
7
+ export declare type AliasedComplexExpression<DB, TB extends keyof DB> = AnyAliasedQueryBuilder | AliasedQueryBuilderFactory<DB, TB> | AnyAliasedRawBuilder | AliasedRawBuilderFactory<DB, TB>;
8
+ export declare function parseComplexExpression(ctx: ParseContext, exp: ComplexExpression<any, any>): SelectQueryNode | RawNode;
9
+ export declare function parseAliasedComplexExpression(ctx: ParseContext, exp: AliasedComplexExpression<any, any>): AliasNode;
@@ -0,0 +1,20 @@
1
+ import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
2
+ import { isFunction } from '../util/object-utils.js';
3
+ export function parseComplexExpression(ctx, exp) {
4
+ if (isOperationNodeSource(exp)) {
5
+ return exp.toOperationNode();
6
+ }
7
+ else if (isFunction(exp)) {
8
+ return exp(ctx.createExpressionBuilder()).toOperationNode();
9
+ }
10
+ throw new Error(`invalid expression: ${JSON.stringify(exp)}`);
11
+ }
12
+ export function parseAliasedComplexExpression(ctx, exp) {
13
+ if (isOperationNodeSource(exp)) {
14
+ return exp.toOperationNode();
15
+ }
16
+ else if (isFunction(exp)) {
17
+ return exp(ctx.createExpressionBuilder()).toOperationNode();
18
+ }
19
+ throw new Error(`invalid aliased expression: ${JSON.stringify(exp)}`);
20
+ }
@@ -1,15 +1,24 @@
1
1
  import { FilterNode } from '../operation-node/filter-node.js';
2
- import { AnyQueryBuilder, AnyRawBuilder, QueryBuilderFactory, RawBuilderFactory } from '../util/type-utils.js';
2
+ import { AnyRawBuilder } from '../util/type-utils.js';
3
3
  import { Operator } from '../operation-node/operator-node.js';
4
- import { ReferenceExpression } from './reference-parser.js';
4
+ import { ExtractTypeFromReferenceExpression, ReferenceExpression } from './reference-parser.js';
5
+ import { ValueExpression, ValueExpressionOrList } from './value-parser.js';
5
6
  import { FilterExpressionNode } from '../operation-node/operation-node-utils.js';
6
7
  import { ParseContext } from './parse-context.js';
7
- export declare type ExistsExpression<DB, TB extends keyof DB> = AnyQueryBuilder | QueryBuilderFactory<DB, TB> | AnyRawBuilder | RawBuilderFactory<DB, TB>;
8
+ import { WhereInterface } from '../query-builder/where-interface.js';
9
+ import { HavingInterface } from '../query-builder/having-interface.js';
10
+ export declare type FilterValueExpression<DB, TB extends keyof DB, RE> = ValueExpression<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
11
+ export declare type FilterValueExpressionOrList<DB, TB extends keyof DB, RE> = ValueExpressionOrList<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
12
+ export declare type ExistsExpression<DB, TB extends keyof DB> = ValueExpression<DB, TB, never>;
13
+ export declare type WhereGrouper<DB, TB extends keyof DB> = (qb: WhereInterface<DB, TB>) => WhereInterface<DB, TB>;
14
+ export declare type HavingGrouper<DB, TB extends keyof DB> = (qb: HavingInterface<DB, TB>) => HavingInterface<DB, TB>;
8
15
  export declare type FilterOperator = Operator | AnyRawBuilder;
16
+ declare type FilterType = 'where' | 'having' | 'on';
9
17
  export declare function parseWhereFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
10
18
  export declare function parseHavingFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
11
19
  export declare function parseOnFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
12
20
  export declare function parseReferenceFilter(ctx: ParseContext, lhs: ReferenceExpression<any, any>, op: FilterOperator, rhs: ReferenceExpression<any, any>): FilterNode;
13
21
  export declare function parseExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
14
22
  export declare function parseNotExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
15
- export declare function parseFilter(ctx: ParseContext, type: 'where' | 'having' | 'on', args: any[]): FilterExpressionNode;
23
+ export declare function parseFilter(ctx: ParseContext, type: FilterType, args: any[]): FilterExpressionNode;
24
+ export {};
@@ -6,7 +6,6 @@ import { OperatorNode, OPERATORS, } from '../operation-node/operator-node.js';
6
6
  import { ParensNode } from '../operation-node/parens-node.js';
7
7
  import { parseReferenceExpression, } from './reference-parser.js';
8
8
  import { parseValueExpressionOrList, } from './value-parser.js';
9
- import { SelectQueryNode } from '../operation-node/select-query-node.js';
10
9
  import { ValueNode } from '../operation-node/value-node.js';
11
10
  export function parseWhereFilter(ctx, args) {
12
11
  return parseFilter(ctx, 'where', args);
@@ -31,18 +30,9 @@ export function parseFilter(ctx, type, args) {
31
30
  return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
32
31
  }
33
32
  else if (args.length === 1) {
34
- const arg = args[0];
35
- if (isFunction(arg)) {
36
- return GROUP_PARSERS[type](ctx, arg);
37
- }
38
- else if (isOperationNodeSource(arg)) {
39
- const node = arg.toOperationNode();
40
- if (RawNode.is(node)) {
41
- return node;
42
- }
43
- }
33
+ return parseOneArgFilter(ctx, type, args[0]);
44
34
  }
45
- throw new Error(`invalid arguments passed to a '${type}' method: ${JSON.stringify(args)}`);
35
+ throw createFilterError(type, args);
46
36
  }
47
37
  function parseThreeArgFilter(ctx, left, op, right) {
48
38
  if ((op === 'is' || op === 'is not') && (isNull(right) || isBoolean(right))) {
@@ -54,10 +44,8 @@ function parseIsFilter(ctx, left, op, right) {
54
44
  return FilterNode.create(parseReferenceExpression(ctx, left), parseFilterOperator(op), ValueNode.createImmediate(right));
55
45
  }
56
46
  function parseFilterOperator(op) {
57
- if (isString(op)) {
58
- if (OPERATORS.includes(op)) {
59
- return OperatorNode.create(op);
60
- }
47
+ if (isString(op) && OPERATORS.includes(op)) {
48
+ return OperatorNode.create(op);
61
49
  }
62
50
  else if (isOperationNodeSource(op)) {
63
51
  return op.toOperationNode();
@@ -65,17 +53,26 @@ function parseFilterOperator(op) {
65
53
  throw new Error(`invalid comparison operator ${JSON.stringify(op)} passed to a filter method`);
66
54
  }
67
55
  function parseExistExpression(ctx, type, arg) {
68
- const node = isFunction(arg)
69
- ? arg(ctx.createExpressionBuilder()).toOperationNode()
70
- : arg.toOperationNode();
71
- if (!SelectQueryNode.is(node) && !RawNode.is(node)) {
72
- throw new Error('invalid where exists arg');
56
+ return FilterNode.create(undefined, OperatorNode.create(type), parseValueExpressionOrList(ctx, arg));
57
+ }
58
+ function parseOneArgFilter(ctx, type, arg) {
59
+ if (isFunction(arg)) {
60
+ return GROUP_PARSERS[type](ctx, arg);
73
61
  }
74
- return FilterNode.create(undefined, OperatorNode.create(type), node);
62
+ else if (isOperationNodeSource(arg)) {
63
+ const node = arg.toOperationNode();
64
+ if (RawNode.is(node)) {
65
+ return node;
66
+ }
67
+ }
68
+ throw createFilterError(type, arg);
69
+ }
70
+ function createFilterError(type, args) {
71
+ return new Error(`invalid arguments passed to a '${type}' method: ${JSON.stringify(args)}`);
75
72
  }
76
73
  const GROUP_PARSERS = freeze({
77
74
  where(ctx, callback) {
78
- const query = callback(ctx.createSelectQueryBuilder([]));
75
+ const query = callback(ctx.createSelectQueryBuilder());
79
76
  const queryNode = query.toOperationNode();
80
77
  if (!queryNode.where) {
81
78
  throw new Error('no `where` methods called insided a group callback');
@@ -83,7 +80,7 @@ const GROUP_PARSERS = freeze({
83
80
  return ParensNode.create(queryNode.where.where);
84
81
  },
85
82
  having(ctx, callback) {
86
- const query = callback(ctx.createSelectQueryBuilder([]));
83
+ const query = callback(ctx.createSelectQueryBuilder());
87
84
  const queryNode = query.toOperationNode();
88
85
  if (!queryNode.having) {
89
86
  throw new Error('no `having` methods called insided a group callback');
@@ -1,15 +1,12 @@
1
1
  import { ColumnNode } from '../operation-node/column-node.js';
2
- import { InsertValuesNode } from '../operation-node/insert-query-node.js';
3
- import { RawNode } from '../operation-node/raw-node.js';
4
- import { SelectQueryNode } from '../operation-node/select-query-node.js';
5
- import { ValueNode } from '../operation-node/value-node.js';
6
- import { AnyQueryBuilder, AnyRawBuilder, GeneratedPlaceholder } from '../util/type-utils.js';
7
- import { PrimitiveValue } from '../util/object-utils.js';
2
+ import { GeneratedPlaceholder } from '../util/type-utils.js';
3
+ import { ParseContext } from './parse-context.js';
4
+ import { ValueExpression } from './value-parser.js';
5
+ import { ValuesNode } from '../operation-node/values-node.js';
8
6
  export declare type InsertObject<DB, TB extends keyof DB> = {
9
- [C in keyof DB[TB]]: InsertValueExpression<DB[TB][C]>;
7
+ [C in keyof DB[TB]]: InsertValueExpression<DB, TB, DB[TB][C]>;
10
8
  };
11
9
  export declare type InsertObjectOrList<DB, TB extends keyof DB> = InsertObject<DB, TB> | ReadonlyArray<InsertObject<DB, TB>>;
12
- declare type InsertValueExpression<T> = T | AnyQueryBuilder | AnyRawBuilder | GeneratedPlaceholder;
13
- export declare function parseInsertObjectOrList(args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>, ReadonlyArray<InsertValuesNode>];
14
- export declare function parseInsertValueExpression(value: InsertValueExpression<PrimitiveValue>): ValueNode | RawNode | SelectQueryNode;
10
+ declare type InsertValueExpression<DB, TB extends keyof DB, T> = ValueExpression<DB, TB, T> | GeneratedPlaceholder;
11
+ export declare function parseInsertObjectOrList(ctx: ParseContext, args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>, ValuesNode];
15
12
  export {};
@@ -1,51 +1,44 @@
1
1
  import { ColumnNode } from '../operation-node/column-node.js';
2
- import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
3
2
  import { PrimitiveValueListNode } from '../operation-node/primitive-value-list-node.js';
4
- import { QueryNode } from '../operation-node/query-node.js';
5
3
  import { ValueListNode } from '../operation-node/value-list-node.js';
6
- import { ValueNode } from '../operation-node/value-node.js';
7
4
  import { isGeneratedPlaceholder } from '../util/generated-placeholder.js';
8
- import { isPrimitive } from '../util/object-utils.js';
9
- export function parseInsertObjectOrList(args) {
10
- return parseInsertColumnsAndValues(Array.isArray(args) ? args : [args]);
5
+ import { freeze, isPrimitive } from '../util/object-utils.js';
6
+ import { parseValueExpression } from './value-parser.js';
7
+ import { ValuesNode } from '../operation-node/values-node.js';
8
+ export function parseInsertObjectOrList(ctx, args) {
9
+ return parseInsertColumnsAndValues(ctx, Array.isArray(args) ? args : [args]);
11
10
  }
12
- function parseInsertColumnsAndValues(rows) {
13
- const columns = [];
14
- const values = [];
11
+ function parseInsertColumnsAndValues(ctx, rows) {
12
+ const columns = parseColumnNamesAndIndexes(rows);
13
+ return [
14
+ freeze([...columns.keys()].map(ColumnNode.create)),
15
+ ValuesNode.create(rows.map((row) => parseRowValues(ctx, row, columns))),
16
+ ];
17
+ }
18
+ function parseColumnNamesAndIndexes(rows) {
19
+ const columns = new Map();
15
20
  for (const row of rows) {
16
- for (const column of Object.keys(row)) {
17
- const value = row[column];
18
- if (!columns.includes(column) && !isGeneratedPlaceholder(value)) {
19
- columns.push(column);
21
+ const cols = Object.keys(row);
22
+ for (const col of cols) {
23
+ if (!columns.has(col) && !isGeneratedPlaceholder(row[col])) {
24
+ columns.set(col, columns.size);
20
25
  }
21
26
  }
22
27
  }
23
- for (const row of rows) {
24
- const rowValues = columns.map(() => null);
25
- for (const column of Object.keys(row)) {
26
- const columnIdx = columns.indexOf(column);
27
- if (columnIdx !== -1) {
28
- rowValues[columnIdx] = row[column];
29
- }
30
- }
31
- if (rowValues.every(isPrimitive)) {
32
- values.push(PrimitiveValueListNode.create(rowValues));
33
- }
34
- else {
35
- values.push(ValueListNode.create(rowValues.map(parseInsertValueExpression)));
36
- }
37
- }
38
- return [columns.map(ColumnNode.create), values];
28
+ return columns;
39
29
  }
40
- export function parseInsertValueExpression(value) {
41
- if (isPrimitive(value)) {
42
- return ValueNode.create(value);
43
- }
44
- else if (isOperationNodeSource(value)) {
45
- const node = value.toOperationNode();
46
- if (!QueryNode.isMutating(node)) {
47
- return node;
30
+ function parseRowValues(ctx, row, columns) {
31
+ const rowColumns = Object.keys(row);
32
+ const rowValues = new Array(columns.size).fill(null);
33
+ for (const col of rowColumns) {
34
+ const columnIdx = columns.get(col);
35
+ const value = row[col];
36
+ if (columnIdx !== undefined && !isGeneratedPlaceholder(value)) {
37
+ rowValues[columnIdx] = value;
48
38
  }
49
39
  }
50
- throw new Error(`unsupported value for insert object ${JSON.stringify(value)}`);
40
+ if (rowValues.every(isPrimitive)) {
41
+ return PrimitiveValueListNode.create(rowValues);
42
+ }
43
+ return ValueListNode.create(rowValues.map((it) => parseValueExpression(ctx, it)));
51
44
  }
@@ -3,6 +3,6 @@ import { AnyRawBuilder } from '../util/type-utils.js';
3
3
  import { ParseContext } from './parse-context.js';
4
4
  import { ReferenceExpression } from './reference-parser.js';
5
5
  export declare type OrderByDirection = 'asc' | 'desc';
6
- export declare type OrderByExpression<DB, TB extends keyof DB, O> = ReferenceExpression<DB, TB> | keyof O;
6
+ export declare type OrderByExpression<DB, TB extends keyof DB, O> = ReferenceExpression<DB, TB> | (keyof O & string);
7
7
  export declare type OrderByDirectionExpression = OrderByDirection | AnyRawBuilder;
8
8
  export declare function parseOrderBy(ctx: ParseContext, orderBy: OrderByExpression<any, any, any>, direction?: OrderByDirectionExpression): OrderByItemNode;
@@ -1,7 +1,7 @@
1
1
  import { DialectAdapter } from '../dialect/dialect-adapter.js';
2
2
  import { JoinType } from '../operation-node/join-node.js';
3
3
  import { JoinBuilder } from '../query-builder/join-builder.js';
4
- import { QueryBuilder } from '../query-builder/query-builder.js';
4
+ import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
5
5
  import { ExpressionBuilder } from '../query-builder/expression-builder.js';
6
6
  import { QueryCreator } from '../query-creator.js';
7
7
  import { TableExpression } from './table-parser.js';
@@ -14,11 +14,7 @@ export interface ParseContext {
14
14
  /**
15
15
  * Creates a select query builder with a {@link NoopQueryExecutor}.
16
16
  */
17
- createSelectQueryBuilder(tables: ReadonlyArray<TableExpression<any, any>>): QueryBuilder<any, any>;
18
- /**
19
- * Creates an instance of a join builder.
20
- */
21
- createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
17
+ createSelectQueryBuilder(): SelectQueryBuilder<any, any, any>;
22
18
  /**
23
19
  * Creates an expression builder for building stuff like subqueries.
24
20
  * {@link NoopQueryExecutor} is used as the executor and the queries
@@ -29,13 +25,31 @@ export interface ParseContext {
29
25
  * Creates a query creator with a {@link NoopQueryExecutor}.
30
26
  */
31
27
  createQueryCreator(): QueryCreator<any>;
28
+ /**
29
+ * Creates an instance of a join builder.
30
+ */
31
+ createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
32
32
  }
33
33
  export declare class DefaultParseContext implements ParseContext {
34
34
  #private;
35
35
  constructor(adapter: DialectAdapter);
36
36
  get adapter(): DialectAdapter;
37
- createSelectQueryBuilder(tables: ReadonlyArray<TableExpression<any, any>>): QueryBuilder<any, any>;
38
- createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
37
+ /**
38
+ * Creates a select query builder with a {@link NoopQueryExecutor}.
39
+ */
40
+ createSelectQueryBuilder(): SelectQueryBuilder<any, any, any>;
41
+ /**
42
+ * Creates an expression builder for building stuff like subqueries.
43
+ * {@link NoopQueryExecutor} is used as the executor and the queries
44
+ * built using the returned builder can never be executed.
45
+ */
39
46
  createExpressionBuilder(): ExpressionBuilder<any, any>;
47
+ /**
48
+ * Creates a query creator with a {@link NoopQueryExecutor}.
49
+ */
40
50
  createQueryCreator(): QueryCreator<any>;
51
+ /**
52
+ * Creates an instance of a join builder.
53
+ */
54
+ createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
41
55
  }
@@ -1,7 +1,7 @@
1
1
  import { JoinNode } from '../operation-node/join-node.js';
2
2
  import { SelectQueryNode } from '../operation-node/select-query-node.js';
3
3
  import { JoinBuilder } from '../query-builder/join-builder.js';
4
- import { QueryBuilder } from '../query-builder/query-builder.js';
4
+ import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
5
5
  import { ExpressionBuilder } from '../query-builder/expression-builder.js';
6
6
  import { QueryCreator } from '../query-creator.js';
7
7
  import { NoopQueryExecutor } from '../query-executor/noop-query-executor.js';
@@ -17,18 +17,12 @@ export class DefaultParseContext {
17
17
  get adapter() {
18
18
  return this.#adapter;
19
19
  }
20
- createSelectQueryBuilder(tables) {
21
- return new QueryBuilder({
20
+ createSelectQueryBuilder() {
21
+ return new SelectQueryBuilder({
22
22
  queryId: createQueryId(),
23
23
  executor: this.#noopExecutor,
24
24
  parseContext: this,
25
- queryNode: SelectQueryNode.create(parseTableExpressionOrList(this, tables)),
26
- });
27
- }
28
- createJoinBuilder(joinType, table) {
29
- return new JoinBuilder({
30
- joinNode: JoinNode.create(joinType, parseTableExpression(this, table)),
31
- parseContext: this,
25
+ queryNode: SelectQueryNode.create(parseTableExpressionOrList(this, [])),
32
26
  });
33
27
  }
34
28
  createExpressionBuilder() {
@@ -43,4 +37,10 @@ export class DefaultParseContext {
43
37
  parseContext: this,
44
38
  });
45
39
  }
40
+ createJoinBuilder(joinType, table) {
41
+ return new JoinBuilder({
42
+ joinNode: JoinNode.create(joinType, parseTableExpression(this, table)),
43
+ parseContext: this,
44
+ });
45
+ }
46
46
  }
@@ -3,18 +3,19 @@ import { ColumnNode } from '../operation-node/column-node.js';
3
3
  import { ReferenceExpressionNode } from '../operation-node/operation-node-utils.js';
4
4
  import { ReferenceNode } from '../operation-node/reference-node.js';
5
5
  import { PrimitiveValue } from '../util/object-utils.js';
6
- import { AnyColumn, AnyColumnWithTable, AnyQueryBuilder, AnyRawBuilder, QueryBuilderFactory, RawBuilderFactory, RowType, ValueType } from '../util/type-utils.js';
7
- import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
6
+ import { AnyColumn, AnyColumnWithTable, RowType, ValueType } from '../util/type-utils.js';
8
7
  import { RawBuilder } from '../raw-builder/raw-builder.js';
9
- import { QueryBuilder } from '../query-builder/query-builder.js';
8
+ import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
10
9
  import { ParseContext } from './parse-context.js';
11
- export declare type ReferenceExpression<DB, TB extends keyof DB> = StringReference<DB, TB> | AnyQueryBuilder | QueryBuilderFactory<DB, TB> | AnyRawBuilder | RawBuilderFactory<DB, TB> | DynamicReferenceBuilder<any>;
10
+ import { ComplexExpression } from './complex-expression-parser.js';
11
+ import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
12
+ export declare type ReferenceExpression<DB, TB extends keyof DB> = StringReference<DB, TB> | DynamicReferenceBuilder<any> | ComplexExpression<DB, TB>;
12
13
  export declare type ReferenceExpressionOrList<DB, TB extends keyof DB> = ReferenceExpression<DB, TB> | ReadonlyArray<ReferenceExpression<DB, TB>>;
13
14
  export declare type StringReference<DB, TB extends keyof DB> = AnyColumn<DB, TB> | AnyColumnWithTable<DB, TB>;
14
- export declare type ExtractTypeFromReferenceExpression<DB, TB extends keyof DB, RE> = RE extends string ? ExtractTypeFromStringReference<DB, TB, RE> : RE extends RawBuilder<infer O> ? O : RE extends (qb: any) => RawBuilder<infer O> ? O : RE extends QueryBuilder<any, any, infer O> ? ValueType<O> : RE extends (qb: any) => QueryBuilder<any, any, infer O> ? ValueType<O> : PrimitiveValue;
15
- declare type ExtractTypeFromStringReference<DB, TB extends keyof DB, S extends string, R = RowType<DB, TB>> = S extends `${infer SC}.${infer T}.${infer C}` ? `${SC}.${T}` extends TB ? C extends keyof DB[`${SC}.${T}`] ? DB[`${SC}.${T}`][C] : never : never : S extends `${infer T}.${infer C}` ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : S extends keyof R ? R[S] : PrimitiveValue;
15
+ export declare type ExtractTypeFromReferenceExpression<DB, TB extends keyof DB, RE> = RE extends string ? ExtractTypeFromStringReference<DB, TB, RE> : RE extends RawBuilder<infer O> ? O : RE extends (qb: any) => RawBuilder<infer O> ? O : RE extends SelectQueryBuilder<any, any, infer O> ? ValueType<O> : RE extends (qb: any) => SelectQueryBuilder<any, any, infer O> ? ValueType<O> : PrimitiveValue;
16
+ declare type ExtractTypeFromStringReference<DB, TB extends keyof DB, RE extends string, R = RowType<DB, TB>> = RE extends `${infer SC}.${infer T}.${infer C}` ? `${SC}.${T}` extends TB ? C extends keyof DB[`${SC}.${T}`] ? DB[`${SC}.${T}`][C] : never : never : RE extends `${infer T}.${infer C}` ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : RE extends keyof R ? R[RE] : PrimitiveValue;
16
17
  export declare function parseReferenceExpressionOrList(ctx: ParseContext, arg: ReferenceExpressionOrList<any, any>): ReferenceExpressionNode[];
17
- export declare function parseReferenceExpression(ctx: ParseContext, arg: ReferenceExpression<any, any>): ReferenceExpressionNode;
18
+ export declare function parseReferenceExpression(ctx: ParseContext, exp: ReferenceExpression<any, any>): ReferenceExpressionNode;
18
19
  export declare function parseStringReference(ref: string): ColumnNode | ReferenceNode;
19
20
  export declare function parseAliasedStringReference(ref: string): ColumnNode | ReferenceNode | AliasNode;
20
21
  export declare function parseColumnName(column: AnyColumn<any, any>): ColumnNode;
@@ -1,10 +1,10 @@
1
1
  import { AliasNode } from '../operation-node/alias-node.js';
2
2
  import { ColumnNode } from '../operation-node/column-node.js';
3
- import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
4
3
  import { ReferenceNode } from '../operation-node/reference-node.js';
5
4
  import { TableNode } from '../operation-node/table-node.js';
6
- import { isFunction, isReadonlyArray, isString, } from '../util/object-utils.js';
7
- import { QueryNode } from '../operation-node/query-node.js';
5
+ import { isReadonlyArray, isString, } from '../util/object-utils.js';
6
+ import { parseComplexExpression, } from './complex-expression-parser.js';
7
+ import { isDynamicReferenceBuilder, } from '../dynamic/dynamic-reference-builder.js';
8
8
  export function parseReferenceExpressionOrList(ctx, arg) {
9
9
  if (isReadonlyArray(arg)) {
10
10
  return arg.map((it) => parseReferenceExpression(ctx, it));
@@ -13,23 +13,14 @@ export function parseReferenceExpressionOrList(ctx, arg) {
13
13
  return [parseReferenceExpression(ctx, arg)];
14
14
  }
15
15
  }
16
- export function parseReferenceExpression(ctx, arg) {
17
- if (isString(arg)) {
18
- return parseStringReference(arg);
16
+ export function parseReferenceExpression(ctx, exp) {
17
+ if (isString(exp)) {
18
+ return parseStringReference(exp);
19
19
  }
20
- else if (isOperationNodeSource(arg)) {
21
- const node = arg.toOperationNode();
22
- if (!QueryNode.isMutating(node)) {
23
- return node;
24
- }
25
- }
26
- else if (isFunction(arg)) {
27
- const node = arg(ctx.createExpressionBuilder()).toOperationNode();
28
- if (!QueryNode.isMutating(node)) {
29
- return node;
30
- }
20
+ else if (isDynamicReferenceBuilder(exp)) {
21
+ return exp.toOperationNode();
31
22
  }
32
- throw new Error(`invalid reference expression ${JSON.stringify(arg)}`);
23
+ return parseComplexExpression(ctx, exp);
33
24
  }
34
25
  export function parseStringReference(ref) {
35
26
  const COLUMN_SEPARATOR = '.';
@@ -1,9 +1,5 @@
1
1
  import { DeleteResult } from '../query-builder/delete-result.js';
2
2
  import { InsertResult } from '../query-builder/insert-result.js';
3
- import { QueryBuilder } from '../query-builder/query-builder.js';
4
3
  import { UpdateResult } from '../query-builder/update-result.js';
5
4
  import { Selection } from './select-parser.js';
6
- /**
7
- * `returning` method output query builder type
8
- */
9
- export declare type QueryBuilderWithReturning<DB, TB extends keyof DB, O, S> = QueryBuilder<DB, TB, O extends InsertResult ? Selection<DB, TB, S> : O extends DeleteResult ? Selection<DB, TB, S> : O extends UpdateResult ? Selection<DB, TB, S> : O & Selection<DB, TB, S>>;
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>;