drizzle-orm 0.21.0 → 0.21.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 (42) hide show
  1. package/mysql-core/dialect.d.ts +1 -1
  2. package/mysql-core/dialect.d.ts.map +1 -1
  3. package/mysql-core/dialect.js +4 -3
  4. package/mysql-core/dialect.js.map +1 -1
  5. package/mysql-core/query-builders/select.d.ts +6 -3
  6. package/mysql-core/query-builders/select.d.ts.map +1 -1
  7. package/mysql-core/query-builders/select.js +29 -4
  8. package/mysql-core/query-builders/select.js.map +1 -1
  9. package/mysql-core/query-builders/select.types.d.ts +3 -2
  10. package/mysql-core/query-builders/select.types.d.ts.map +1 -1
  11. package/operations.d.ts.map +1 -1
  12. package/operations.js +7 -0
  13. package/operations.js.map +1 -1
  14. package/package.json +1 -1
  15. package/pg-core/dialect.d.ts +1 -1
  16. package/pg-core/dialect.d.ts.map +1 -1
  17. package/pg-core/dialect.js +4 -3
  18. package/pg-core/dialect.js.map +1 -1
  19. package/pg-core/query-builders/select.d.ts +8 -5
  20. package/pg-core/query-builders/select.d.ts.map +1 -1
  21. package/pg-core/query-builders/select.js +30 -5
  22. package/pg-core/query-builders/select.js.map +1 -1
  23. package/pg-core/query-builders/select.types.d.ts +3 -2
  24. package/pg-core/query-builders/select.types.d.ts.map +1 -1
  25. package/sql/index.js +1 -1
  26. package/sql/index.js.map +1 -1
  27. package/sqlite-core/dialect.d.ts +1 -1
  28. package/sqlite-core/dialect.d.ts.map +1 -1
  29. package/sqlite-core/dialect.js +4 -3
  30. package/sqlite-core/dialect.js.map +1 -1
  31. package/sqlite-core/query-builders/select.d.ts +6 -3
  32. package/sqlite-core/query-builders/select.d.ts.map +1 -1
  33. package/sqlite-core/query-builders/select.js +30 -5
  34. package/sqlite-core/query-builders/select.js.map +1 -1
  35. package/sqlite-core/query-builders/select.types.d.ts +4 -3
  36. package/sqlite-core/query-builders/select.types.d.ts.map +1 -1
  37. package/subquery.d.ts +3 -3
  38. package/subquery.d.ts.map +1 -1
  39. package/subquery.js +17 -8
  40. package/subquery.js.map +1 -1
  41. package/utils.d.ts +1 -0
  42. package/utils.d.ts.map +1 -1
package/mysql-core/dialect.d.ts CHANGED
@@ -26,7 +26,7 @@ export declare class MySqlDialect {
26
26
  * If `isSingleTable` is true, then columns won't be prefixed with table name
27
27
  */
28
28
  private buildSelection;
29
- buildSelectQuery({ withList, fieldsList: fields, where, table, joins, orderBy, groupBy, limit, offset, lockingClause }: MySqlSelectConfig): SQL;
29
+ buildSelectQuery({ withList, fieldsList: fields, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClause }: MySqlSelectConfig): SQL;
30
30
  buildInsertQuery({ table, values, onConflict, returning }: MySqlInsertConfig): SQL;
31
31
  sqlToQuery(sql: SQL): Query;
32
32
  }
package/mysql-core/dialect.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAQ,KAAK,EAAE,GAAG,EAAuB,MAAM,OAAO,CAAC;AAG9D,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAuB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,aAAa,EAAc,MAAM,SAAS,CAAC;AAUpD,qBAAa,YAAY;IAClB,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAmChF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIhC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAUrE,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,SAAS,GAAG,GAAG;IAkBzD,gBAAgB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAY1E;;;;;;;;;;OAUG;IACH,OAAO,CAAC,cAAc;IAoDtB,gBAAgB,CACf,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,EACpG,iBAAiB,GAChB,GAAG;IA4GN,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAoClF,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;CAM3B"}
1
+ {"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAQ,KAAK,EAAE,GAAG,EAAuB,MAAM,OAAO,CAAC;AAG9D,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAuB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,aAAa,EAAc,MAAM,SAAS,CAAC;AAUpD,qBAAa,YAAY;IAClB,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAmChF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIhC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAUrE,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,SAAS,GAAG,GAAG;IAkBzD,gBAAgB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAY1E;;;;;;;;;;OAUG;IACH,OAAO,CAAC,cAAc;IAoDtB,gBAAgB,CACf,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,EAC5G,iBAAiB,GAChB,GAAG;IA8GN,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAoClF,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;CAM3B"}
package/mysql-core/dialect.js CHANGED
@@ -119,7 +119,7 @@ class MySqlDialect {
119
119
  const chunks = fields
120
120
  .map(({ field }, i) => {
121
121
  const chunk = [];
122
- if (field instanceof sql_1.SQL.Aliased && field.isSubquerySelectionField) {
122
+ if (field instanceof sql_1.SQL.Aliased && field.isSelectionField) {
123
123
  chunk.push(new sql_1.Name(field.fieldAlias));
124
124
  }
125
125
  else if (field instanceof sql_1.SQL.Aliased || field instanceof sql_1.SQL) {
@@ -155,7 +155,7 @@ class MySqlDialect {
155
155
  .flat(1);
156
156
  return sql_1.sql.fromList(chunks);
157
157
  }
158
- buildSelectQuery({ withList, fieldsList: fields, where, table, joins, orderBy, groupBy, limit, offset, lockingClause }) {
158
+ buildSelectQuery({ withList, fieldsList: fields, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClause }) {
159
159
  fields.forEach((f) => {
160
160
  let tableName;
161
161
  if (f.field instanceof column_1.Column
@@ -203,6 +203,7 @@ class MySqlDialect {
203
203
  });
204
204
  const joinsSql = sql_1.sql.fromList(joinsArray);
205
205
  const whereSql = where ? (0, sql_1.sql) ` where ${where}` : undefined;
206
+ const havingSql = having ? (0, sql_1.sql) ` having ${having}` : undefined;
206
207
  const orderByList = [];
207
208
  orderBy.forEach((orderByValue, index) => {
208
209
  orderByList.push(orderByValue);
@@ -232,7 +233,7 @@ class MySqlDialect {
232
233
  lockingClausesSql.append((0, sql_1.sql) ` skip locked`);
233
234
  }
234
235
  }
235
- return (0, sql_1.sql) `${withSql}select ${selection} from ${table}${joinsSql}${whereSql}${groupBySql}${orderBySql}${limitSql}${offsetSql}${lockingClausesSql}`;
236
+ return (0, sql_1.sql) `${withSql}select ${selection} from ${table}${joinsSql}${whereSql}${groupBySql}${havingSql}${orderBySql}${limitSql}${offsetSql}${lockingClausesSql}`;
236
237
  }
237
238
  buildInsertQuery({ table, values, onConflict, returning }) {
238
239
  const isSingleValue = values.length === 1;
package/mysql-core/dialect.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"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"}
package/mysql-core/query-builders/select.d.ts CHANGED
@@ -5,7 +5,7 @@ import { AnyMySqlTable, GetTableConfig } from '../table';
5
5
  import { QueryPromise } from '../../query-promise';
6
6
  import { Query, SQL, SQLWrapper } from '../../sql';
7
7
  import { GetSubquerySelection, Subquery, SubqueryWithSelection, WithSubqueryWithSelection } from '../../subquery';
8
- import { Simplify } from '../../utils';
8
+ import { Simplify, ValueOrArray } from '../../utils';
9
9
  import { BuildSubquerySelection, GetSelectTableName, JoinFn, JoinNullability, JoinType, LockConfig, LockStrength, MySqlSelectConfig, SelectFields, SelectMode, SelectResult } from './select.types';
10
10
  export declare class MySqlSelectBuilder<TSelection extends SelectFields | undefined> {
11
11
  private fields;
@@ -34,8 +34,11 @@ export declare class MySqlSelect<TTable extends AnyMySqlTable | Subquery, TSelec
34
34
  rightJoin: JoinFn<TTable, TSelectMode, "right", TSelection, TNullability>;
35
35
  innerJoin: JoinFn<TTable, TSelectMode, "inner", TSelection, TNullability>;
36
36
  fullJoin: JoinFn<TTable, TSelectMode, "full", TSelection, TNullability>;
37
- where(where: SQL | undefined): Omit<this, 'where' | `${JoinType}Join`>;
38
- groupBy(...columns: (AnyMySqlColumn | SQL)[]): Omit<this, 'where' | `${JoinType}Join`>;
37
+ where(where: ((aliases: TSelection) => SQL | undefined) | SQL | undefined): Omit<this, 'where' | `${JoinType}Join`>;
38
+ having(having: ((aliases: TSelection) => SQL | undefined) | SQL | undefined): Omit<this, 'where' | `${JoinType}Join`>;
39
+ groupBy(builder: (aliases: TSelection) => ValueOrArray<AnyMySqlColumn | SQL | SQL.Aliased>): Omit<this, 'where' | `${JoinType}Join` | 'groupBy'>;
40
+ groupBy(...columns: (AnyMySqlColumn | SQL)[]): Omit<this, 'where' | `${JoinType}Join` | 'groupBy'>;
41
+ orderBy(builder: (aliases: TSelection) => ValueOrArray<AnyMySqlColumn | SQL | SQL.Aliased>): Omit<this, 'where' | `${JoinType}Join` | 'orderBy'>;
39
42
  orderBy(...columns: (AnyMySqlColumn | SQL)[]): Omit<this, 'where' | `${JoinType}Join` | 'orderBy'>;
40
43
  limit(limit: number): Omit<this, 'where' | `${JoinType}Join` | 'limit'>;
41
44
  offset(offset: number): Omit<this, 'where' | `${JoinType}Join` | 'offset'>;
package/mysql-core/query-builders/select.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
package/mysql-core/query-builders/select.js CHANGED
@@ -80,6 +80,9 @@ class MySqlSelect extends query_promise_1.QueryPromise {
80
80
  }
81
81
  this.config.fieldsList.push(...(0, utils_2.orderSelectedFields)(table instanceof subquery_1.Subquery ? table[subquery_1.SubqueryConfig].selection : table[table_1.Table.Symbol.Columns], [tableName]));
82
82
  }
83
+ if (typeof on === 'function') {
84
+ on = on(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' })));
85
+ }
83
86
  this.config.joins[tableName] = { on, table, joinType };
84
87
  switch (joinType) {
85
88
  case 'left':
@@ -101,15 +104,37 @@ class MySqlSelect extends query_promise_1.QueryPromise {
101
104
  };
102
105
  }
103
106
  where(where) {
107
+ if (typeof where === 'function') {
108
+ where = where(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'sql', sqlBehavior: 'sql' })));
109
+ }
104
110
  this.config.where = where;
105
111
  return this;
106
112
  }
113
+ having(having) {
114
+ if (typeof having === 'function') {
115
+ having = having(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'sql', sqlBehavior: 'sql' })));
116
+ }
117
+ this.config.having = having;
118
+ return this;
119
+ }
107
120
  groupBy(...columns) {
108
- this.config.groupBy = columns;
121
+ if (typeof columns[0] === 'function') {
122
+ const groupBy = columns[0](new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' })));
123
+ this.config.groupBy = Array.isArray(groupBy) ? groupBy : [groupBy];
124
+ }
125
+ else {
126
+ this.config.groupBy = columns;
127
+ }
109
128
  return this;
110
129
  }
111
130
  orderBy(...columns) {
112
- this.config.orderBy = columns;
131
+ if (typeof columns[0] === 'function') {
132
+ const orderBy = columns[0](new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' })));
133
+ this.config.orderBy = Array.isArray(orderBy) ? orderBy : [orderBy];
134
+ }
135
+ else {
136
+ this.config.orderBy = columns;
137
+ }
113
138
  return this;
114
139
  }
115
140
  limit(limit) {
@@ -141,10 +166,10 @@ class MySqlSelect extends query_promise_1.QueryPromise {
141
166
  return this._prepare(name);
142
167
  }
143
168
  as(alias) {
144
- return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SubquerySelectionProxyHandler(alias));
169
+ return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'throw' }));
145
170
  }
146
171
  prepareWithSubquery(alias) {
147
- return new Proxy(new subquery_1.WithSubquery(this.getSQL(), this.config.fields, alias, true), new subquery_1.SubquerySelectionProxyHandler(alias));
172
+ return new Proxy(new subquery_1.WithSubquery(this.getSQL(), this.config.fields, alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'throw' }));
148
173
  }
149
174
  }
150
175
  exports.MySqlSelect = MySqlSelect;
package/mysql-core/query-builders/select.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAIA,8CAAqD;AACrD,mDAA+C;AAE/C,yCAQoB;AACpB,mCAAgC;AAChC,mCAAsE;AAiBtE,MAAa,kBAAkB;IAC9B,YACS,MAAkB,EAClB,OAAqB,EACrB,OAAqB,EACrB,WAAuB,EAAE;QAHzB,WAAM,GAAN,MAAM,CAAY;QAClB,YAAO,GAAP,OAAO,CAAc;QACrB,YAAO,GAAP,OAAO,CAAc;QACrB,aAAQ,GAAR,QAAQ,CAAiB;IAC/B,CAAC;IAgBJ,IAAI,CAAC,KAA+B;QACnC,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QAEtC,IAAI,MAAoB,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;SACrB;aAAM,IAAI,KAAK,YAAY,mBAAQ,EAAE;YACrC,8FAA8F;YAC9F,MAAM,GAAG,MAAM,CAAC,WAAW,CAC1B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAChD,GAAG,EACF,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,GAAoC,CAAoC,CAAC,CAAC,CAC3F,CAAC;SACF;aAAM;YACN,MAAM,GAAG,IAAA,uBAAe,EAAC,KAAK,CAAC,CAAC;SAChC;QAED,MAAM,UAAU,GAAG,IAAA,2BAAmB,EAAiB,MAAM,CAAC,CAAC;QAC/D,OAAO,IAAI,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC/G,CAAC;CACD;AA1CD,gDA0CC;AASD,MAAa,WAMX,SAAQ,4BAAmE;IAS5E,YACC,KAAiC,EACjC,MAAmC,EACnC,UAA2C,EACnC,eAAwB,EACxB,OAAqB,EACrB,OAAqB,EAC7B,QAAoB;QAEpB,KAAK,EAAE,CAAC;QALA,oBAAe,GAAf,eAAe,CAAS;QACxB,YAAO,GAAP,OAAO,CAAc;QACrB,YAAO,GAAP,OAAO,CAAc;QAkF9B,aAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAEnC,cAAS,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAErC,cAAS,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAErC,aAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QA2H1B,YAAO,GAA2C,CAAC,iBAAiB,EAAE,EAAE;YAChF,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnD,CAAC,CAAC;QAjND,IAAI,CAAC,MAAM,GAAG;YACb,QAAQ;YACR,KAAK;YACL,MAAM;YACN,UAAU;YACV,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,EAAE;SACX,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,KAAK,YAAY,mBAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpG,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC;IACpD,CAAC;IAEO,UAAU,CACjB,QAAmB;QAEnB,OAAO,CACN,KAA+B,EAC/B,EAAgE,EAC/C,EAAE;YACnB,MAAM,SAAS,GAAG,KAAK,YAAY,mBAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAErG,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;gBACjC,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,iCAAiC,CAAC,CAAC;aACtE;YAED,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBAC1B,yHAAyH;gBACzH,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBACpD,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iCAC3D,KAAK,KACR,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,IACpC,CAAC,CAAC;iBACJ;gBACD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAC1B,GAAG,IAAA,2BAAmB,EACrB,KAAK,YAAY,mBAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EACzF,CAAC,SAAS,CAAC,CACX,CACD,CAAC;aACF;YAED,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;gBAC7B,EAAE,GAAG,EAAE,CACN,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAChE,CACf,CAAC;aACF;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;YAEvD,QAAQ,QAAQ,EAAE;gBACjB,KAAK,MAAM;oBACV,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;oBACzC,MAAM;gBACP,KAAK,OAAO;oBACX,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,WAAW,CACzC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAClE,CAAC;oBACF,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;oBACxC,MAAM;gBACP,KAAK,OAAO;oBACX,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;oBACxC,MAAM;gBACP,KAAK,MAAM;oBACV,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,WAAW,CACzC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAClE,CAAC;oBACF,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;oBACzC,MAAM;aACP;YAED,OAAO,IAAI,CAAC;QACb,CAAC,CAAC;IACH,CAAC;IAUD,KAAK,CACJ,KAAmE;QAEnE,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;YAChC,KAAK,GAAG,KAAK,CACZ,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAC9D,CACf,CAAC;SACF;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,CACL,MAAoE;QAEpE,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;YACjC,MAAM,GAAG,MAAM,CACd,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAC9D,CACf,CAAC;SACF;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAC5B,OAAO,IAAI,CAAC;IACb,CAAC;IAMD,OAAO,CACN,GAAG,OAEwB;QAE3B,IAAI,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE;YACrC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CACzB,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAChE,CACf,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SACnE;aAAM;YACN,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,OAAmC,CAAC;SAC1D;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAMD,OAAO,CACN,GAAG,OAEwB;QAE3B,IAAI,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE;YACrC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CACzB,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAChE,CACf,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SACnE;aAAM;YACN,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,OAAmC,CAAC;SAC1D;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,KAAa;QAClB,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,CAAC,MAAc;QACpB,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAC5B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,GAAG,CAAC,QAAsB,EAAE,SAAqB,EAAE;QAClD,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QACjD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,gBAAgB;IAChB,MAAM;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,KAAK;QACJ,MAAM,KAAuB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAA7D,EAAE,OAAO,OAAoD,EAA/C,IAAI,cAAlB,WAAoB,CAAyC,CAAC;QACpE,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,QAAQ,CAAC,IAAa;QAK7B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAErC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACxE,KAAK,CAAC,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAClD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO,CAAC,IAAY;QAKnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAMD,EAAE,CACD,KAAa;QAEb,OAAO,IAAI,KAAK,CACf,IAAI,mBAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EACtD,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACc,CAAC;IACxG,CAAC;IAED,mBAAmB,CAClB,KAAa;QAEb,OAAO,IAAI,KAAK,CACf,IAAI,uBAAY,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,EAChE,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACkB,CAAC;IAC5G,CAAC;CACD;AA7PD,kCA6PC"}
package/mysql-core/query-builders/select.types.d.ts CHANGED
@@ -59,12 +59,13 @@ export interface MySqlSelectConfig {
59
59
  fields: SelectFields;
60
60
  fieldsList: SelectFieldsOrdered;
61
61
  where?: SQL;
62
+ having?: SQL;
62
63
  table: AnyMySqlTable | Subquery;
63
64
  limit?: number | Placeholder;
64
65
  offset?: number | Placeholder;
65
66
  joins: Record<string, JoinsValue>;
66
- orderBy: (AnyMySqlColumn | SQL)[];
67
- groupBy: (AnyMySqlColumn | SQL)[];
67
+ orderBy: (AnyMySqlColumn | SQL | SQL.Aliased)[];
68
+ groupBy: (AnyMySqlColumn | SQL | SQL.Aliased)[];
68
69
  lockingClause?: {
69
70
  strength: LockStrength;
70
71
  config: LockConfig;
package/mysql-core/query-builders/select.types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.types.ts"],"names":[],"mappings":"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"}
package/operations.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../src/operations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,oBAAY,eAAe,CAAC,IAAI,SAAS,MAAM,EAAE,CAAC,SAAS,SAAS,IAAI,CAAC,SAAS,SAAS,CAAC;IAC3F,OAAO,EAAE,IAAI,CAAC;IACd,UAAU,EAAE,KAAK,CAAC;CAClB,CAAC,GAAG,IAAI,GACN,KAAK,CAAC;AAET,oBAAY,eAAe,CAC1B,IAAI,SAAS,MAAM,EACnB,CAAC,SAAS,SAAS,IAChB,IAAI,SAAS,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC;AAEzD,oBAAY,gBAAgB,CAAC,OAAO,SAAS,SAAS,IAAI,MAAM,CAC/D,MAAM,EACN,OAAO,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAC3B,CAAC;AAEF,oBAAY,YAAY,CAAC,OAAO,SAAS,SAAS,EAAE,MAAM,SAAS,KAAK,IAAI,MAAM,CACjF,MAAM,EACN,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,CACtE,CAAC;AAEF,oBAAY,mBAAmB,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,EAAE,OAAO,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;CACnC,EAAE,CAAC"}
1
+ {"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../src/operations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,oBAAY,eAAe,CAAC,IAAI,SAAS,MAAM,EAAE,CAAC,SAAS,SAAS,IAAI,CAAC,SAAS,SAAS,CAAC;IAC3F,OAAO,EAAE,IAAI,CAAC;IACd,UAAU,EAAE,KAAK,CAAC;CAClB,CAAC,GAAG,IAAI,GACN,KAAK,CAAC;AAET,oBAAY,eAAe,CAC1B,IAAI,SAAS,MAAM,EACnB,CAAC,SAAS,SAAS,IAChB,IAAI,SAAS,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC;AAEzD,oBAAY,gBAAgB,CAAC,OAAO,SAAS,SAAS,IAAI,MAAM,CAC/D,MAAM,EACN,OAAO,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAC3B,CAAC;AAEF,oBAAY,YAAY,CAAC,OAAO,SAAS,SAAS,EAAE,MAAM,SAAS,KAAK,IAAI,MAAM,CACjF,MAAM,EACN,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,CACtE,CAAC;AAEF,oBAAY,mBAAmB,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,EAAE,OAAO,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;CACnC,EAAE,CAAC"}
package/operations.js CHANGED
@@ -1,3 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ // export function normalizeSQLCallback<TReturn, TTable extends Table, TColumn extends AnyColumn, TSelection>(
4
+ // builder: (fields: TSelection) => TReturn,
5
+ // fields: SelectFields<TColumn, TTable>,
6
+ // ): TReturn {
7
+ // const aliases = new Proxy(fields, new SelectionProxyHandler()) as TSelection;
8
+ // return builder(aliases);
9
+ // }
3
10
  //# sourceMappingURL=operations.js.map
package/operations.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"operations.js","sourceRoot":"","sources":["../src/operations.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"operations.js","sourceRoot":"","sources":["../src/operations.ts"],"names":[],"mappings":";;AAgCA,8GAA8G;AAC9G,6CAA6C;AAC7C,0CAA0C;AAC1C,eAAe;AACf,iFAAiF;AACjF,4BAA4B;AAC5B,IAAI"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "drizzle-orm",
3
- "version": "0.21.0",
3
+ "version": "0.21.1",
4
4
  "description": "Drizzle ORM package for SQL databases",
5
5
  "scripts": {
6
6
  "build": "tsc && resolve-tspaths && cp ../README.md package.json dist/",
package/pg-core/dialect.d.ts CHANGED
@@ -24,7 +24,7 @@ export declare class PgDialect {
24
24
  * If `isSingleTable` is true, then columns won't be prefixed with table name
25
25
  */
26
26
  private buildSelection;
27
- buildSelectQuery({ withList, fieldsList: fields, where, table, joins, orderBy, groupBy, limit, offset, lockingClauses }: PgSelectConfig): SQL;
27
+ buildSelectQuery({ withList, fieldsList: fields, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClauses }: PgSelectConfig): SQL;
28
28
  buildInsertQuery({ table, values, onConflict, returning }: PgInsertConfig): SQL;
29
29
  prepareTyping(encoder: DriverValueEncoder<unknown, unknown>): QueryTypingsValue;
30
30
  sqlToQuery(sql: SQL): Query;
package/pg-core/dialect.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/pg-core/dialect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAY3C,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAuB,MAAM,uCAAuC,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAQ,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAuB,MAAM,OAAO,CAAC;AAGrG,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,qBAAa,SAAS;IACf,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC7E,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIhC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,cAAc,GAAG,GAAG;IAUlE,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,GAAG,GAAG;IAkBtD,gBAAgB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,cAAc,GAAG,GAAG;IAYvE;;;;;;;;;;OAUG;IACH,OAAO,CAAC,cAAc;IAoDtB,gBAAgB,CACf,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,EACrG,cAAc,GACb,GAAG;IA+GN,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,cAAc,GAAG,GAAG;IAoC/E,aAAa,CAAC,OAAO,EAAE,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,iBAAiB;IAoB/E,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;CAM3B"}
1
+ {"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/pg-core/dialect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAY3C,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAuB,MAAM,uCAAuC,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAQ,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAuB,MAAM,OAAO,CAAC;AAGrG,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,qBAAa,SAAS;IACf,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC7E,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIhC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,cAAc,GAAG,GAAG;IAUlE,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,GAAG,GAAG;IAkBtD,gBAAgB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,cAAc,GAAG,GAAG;IAYvE;;;;;;;;;;OAUG;IACH,OAAO,CAAC,cAAc;IAoDtB,gBAAgB,CACf,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,EAC7G,cAAc,GACb,GAAG;IAiHN,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,cAAc,GAAG,GAAG;IAoC/E,aAAa,CAAC,OAAO,EAAE,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,iBAAiB;IAoB/E,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;CAM3B"}
package/pg-core/dialect.js CHANGED
@@ -115,7 +115,7 @@ class PgDialect {
115
115
  const chunks = fields
116
116
  .map(({ field }, i) => {
117
117
  const chunk = [];
118
- if (field instanceof sql_1.SQL.Aliased && field.isSubquerySelectionField) {
118
+ if (field instanceof sql_1.SQL.Aliased && field.isSelectionField) {
119
119
  chunk.push(new sql_1.Name(field.fieldAlias));
120
120
  }
121
121
  else if (field instanceof sql_1.SQL.Aliased || field instanceof sql_1.SQL) {
@@ -151,7 +151,7 @@ class PgDialect {
151
151
  .flat(1);
152
152
  return sql_1.sql.fromList(chunks);
153
153
  }
154
- buildSelectQuery({ withList, fieldsList: fields, where, table, joins, orderBy, groupBy, limit, offset, lockingClauses }) {
154
+ buildSelectQuery({ withList, fieldsList: fields, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClauses }) {
155
155
  fields.forEach((f) => {
156
156
  let tableName;
157
157
  if (f.field instanceof column_1.Column
@@ -199,6 +199,7 @@ class PgDialect {
199
199
  });
200
200
  const joinsSql = sql_1.sql.fromList(joinsArray);
201
201
  const whereSql = where ? (0, sql_1.sql) ` where ${where}` : undefined;
202
+ const havingSql = having ? (0, sql_1.sql) ` having ${having}` : undefined;
202
203
  const orderByList = [];
203
204
  orderBy.forEach((orderByValue, index) => {
204
205
  orderByList.push(orderByValue);
@@ -231,7 +232,7 @@ class PgDialect {
231
232
  }
232
233
  lockingClausesSql.append(clauseSql);
233
234
  });
234
- return (0, sql_1.sql) `${withSql}select ${selection} from ${table}${joinsSql}${whereSql}${groupBySql}${orderBySql}${limitSql}${offsetSql}${lockingClausesSql}`;
235
+ return (0, sql_1.sql) `${withSql}select ${selection} from ${table}${joinsSql}${whereSql}${groupBySql}${havingSql}${orderBySql}${limitSql}${offsetSql}${lockingClausesSql}`;
235
236
  }
236
237
  buildInsertQuery({ table, values, onConflict, returning }) {
237
238
  const isSingleValue = values.length === 1;
package/pg-core/dialect.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/pg-core/dialect.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/pg-core/dialect.ts"],"names":[],"mappings":"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"}
package/pg-core/query-builders/select.d.ts CHANGED
@@ -1,11 +1,11 @@
1
- import { QueryPromise } from '../../query-promise';
2
- import { Query, SQL, SQLWrapper } from '../../sql';
3
1
  import { AnyPgColumn } from '../columns';
4
2
  import { PgDialect } from '../dialect';
5
3
  import { PgSession, PreparedQuery, PreparedQueryConfig } from '../session';
6
4
  import { AnyPgTable, GetTableConfig } from '../table';
5
+ import { QueryPromise } from '../../query-promise';
6
+ import { Query, SQL, SQLWrapper } from '../../sql';
7
7
  import { GetSubquerySelection, Subquery, SubqueryWithSelection, WithSubqueryWithSelection } from '../../subquery';
8
- import { Simplify } from '../../utils';
8
+ import { Simplify, ValueOrArray } from '../../utils';
9
9
  import { BuildSubquerySelection, GetSelectTableName, JoinFn, JoinNullability, JoinType, LockConfig, LockStrength, PgSelectConfig, SelectFields, SelectMode, SelectResult } from './select.types';
10
10
  export declare class PgSelectBuilder<TSelection extends SelectFields | undefined> {
11
11
  private fields;
@@ -34,8 +34,11 @@ export declare class PgSelect<TTable extends AnyPgTable | Subquery, TSelection,
34
34
  rightJoin: JoinFn<TTable, TSelectMode, "right", TSelection, TNullability>;
35
35
  innerJoin: JoinFn<TTable, TSelectMode, "inner", TSelection, TNullability>;
36
36
  fullJoin: JoinFn<TTable, TSelectMode, "full", TSelection, TNullability>;
37
- where(where: SQL | undefined): Omit<this, 'where' | `${JoinType}Join`>;
38
- groupBy(...columns: (AnyPgColumn | SQL)[]): Omit<this, 'where' | `${JoinType}Join`>;
37
+ where(where: ((aliases: TSelection) => SQL | undefined) | SQL | undefined): Omit<this, 'where' | `${JoinType}Join`>;
38
+ having(having: ((aliases: TSelection) => SQL | undefined) | SQL | undefined): Omit<this, 'where' | `${JoinType}Join`>;
39
+ groupBy(builder: (aliases: TSelection) => ValueOrArray<AnyPgColumn | SQL | SQL.Aliased>): Omit<this, 'where' | `${JoinType}Join` | 'groupBy'>;
40
+ groupBy(...columns: (AnyPgColumn | SQL)[]): Omit<this, 'where' | `${JoinType}Join` | 'groupBy'>;
41
+ orderBy(builder: (aliases: TSelection) => ValueOrArray<AnyPgColumn | SQL | SQL.Aliased>): Omit<this, 'where' | `${JoinType}Join` | 'orderBy'>;
39
42
  orderBy(...columns: (AnyPgColumn | SQL)[]): Omit<this, 'where' | `${JoinType}Join` | 'orderBy'>;
40
43
  limit(limit: number): Omit<this, 'where' | `${JoinType}Join` | 'limit'>;
41
44
  offset(offset: number): Omit<this, 'where' | `${JoinType}Join` | 'offset'>;
package/pg-core/query-builders/select.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/pg-core/query-builders/select.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/pg-core/query-builders/select.ts"],"names":[],"mappings":"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"}
package/pg-core/query-builders/select.js CHANGED
@@ -13,8 +13,8 @@ var __rest = (this && this.__rest) || function (s, e) {
13
13
  Object.defineProperty(exports, "__esModule", { value: true });
14
14
  exports.PgSelect = exports.PgSelectBuilder = void 0;
15
15
  const query_promise_1 = require("../../query-promise");
16
- const table_1 = require("../../table");
17
16
  const subquery_1 = require("../../subquery");
17
+ const table_1 = require("../../table");
18
18
  const utils_1 = require("../../utils");
19
19
  const utils_2 = require("../utils");
20
20
  class PgSelectBuilder {
@@ -81,6 +81,9 @@ class PgSelect extends query_promise_1.QueryPromise {
81
81
  }
82
82
  this.config.fieldsList.push(...(0, utils_1.orderSelectedFields)(table instanceof subquery_1.Subquery ? table[subquery_1.SubqueryConfig].selection : table[table_1.Table.Symbol.Columns], [tableName]));
83
83
  }
84
+ if (typeof on === 'function') {
85
+ on = on(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' })));
86
+ }
84
87
  this.config.joins[tableName] = { on, table, joinType };
85
88
  switch (joinType) {
86
89
  case 'left':
@@ -102,15 +105,37 @@ class PgSelect extends query_promise_1.QueryPromise {
102
105
  };
103
106
  }
104
107
  where(where) {
108
+ if (typeof where === 'function') {
109
+ where = where(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'sql', sqlBehavior: 'sql' })));
110
+ }
105
111
  this.config.where = where;
106
112
  return this;
107
113
  }
114
+ having(having) {
115
+ if (typeof having === 'function') {
116
+ having = having(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'sql', sqlBehavior: 'sql' })));
117
+ }
118
+ this.config.having = having;
119
+ return this;
120
+ }
108
121
  groupBy(...columns) {
109
- this.config.groupBy = columns;
122
+ if (typeof columns[0] === 'function') {
123
+ const groupBy = columns[0](new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' })));
124
+ this.config.groupBy = Array.isArray(groupBy) ? groupBy : [groupBy];
125
+ }
126
+ else {
127
+ this.config.groupBy = columns;
128
+ }
110
129
  return this;
111
130
  }
112
131
  orderBy(...columns) {
113
- this.config.orderBy = columns;
132
+ if (typeof columns[0] === 'function') {
133
+ const orderBy = columns[0](new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' })));
134
+ this.config.orderBy = Array.isArray(orderBy) ? orderBy : [orderBy];
135
+ }
136
+ else {
137
+ this.config.orderBy = columns;
138
+ }
114
139
  return this;
115
140
  }
116
141
  limit(limit) {
@@ -142,10 +167,10 @@ class PgSelect extends query_promise_1.QueryPromise {
142
167
  return this._prepare(name);
143
168
  }
144
169
  as(alias) {
145
- return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SubquerySelectionProxyHandler(alias));
170
+ return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'throw' }));
146
171
  }
147
172
  prepareWithSubquery(alias) {
148
- return new Proxy(new subquery_1.WithSubquery(this.getSQL(), this.config.fields, alias, true), new subquery_1.SubquerySelectionProxyHandler(alias));
173
+ return new Proxy(new subquery_1.WithSubquery(this.getSQL(), this.config.fields, alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'throw' }));
149
174
  }
150
175
  }
151
176
  exports.PgSelect = PgSelect;
package/pg-core/query-builders/select.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/pg-core/query-builders/select.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/pg-core/query-builders/select.ts"],"names":[],"mappings":"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"}
package/pg-core/query-builders/select.types.d.ts CHANGED
@@ -59,12 +59,13 @@ export interface PgSelectConfig {
59
59
  fields: SelectFields;
60
60
  fieldsList: SelectFieldsOrdered;
61
61
  where?: SQL;
62
+ having?: SQL;
62
63
  table: AnyPgTable | Subquery;
63
64
  limit?: number | Placeholder;
64
65
  offset?: number | Placeholder;
65
66
  joins: Record<string, JoinsValue>;
66
- orderBy: (AnyPgColumn | SQL)[];
67
- groupBy: (AnyPgColumn | SQL)[];
67
+ orderBy: (AnyPgColumn | SQL | SQL.Aliased)[];
68
+ groupBy: (AnyPgColumn | SQL | SQL.Aliased)[];
68
69
  lockingClauses: {
69
70
  strength: LockStrength;
70
71
  config: LockConfig;
package/pg-core/query-builders/select.types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/pg-core/query-builders/select.types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/pg-core/query-builders/select.types.ts"],"names":[],"mappings":"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"}
package/sql/index.js CHANGED
@@ -207,7 +207,7 @@ exports.sql = sql;
207
207
  this.sql = sql;
208
208
  this.fieldAlias = fieldAlias;
209
209
  /** @internal */
210
- this.isSubquerySelectionField = false;
210
+ this.isSelectionField = false;
211
211
  }
212
212
  getSQL() {
213
213
  return this.sql;
package/sql/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"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"}
package/sqlite-core/dialect.d.ts CHANGED
@@ -23,7 +23,7 @@ export declare abstract class SQLiteDialect {
23
23
  * If `isSingleTable` is true, then columns won't be prefixed with table name
24
24
  */
25
25
  private buildSelection;
26
- buildSelectQuery({ withList, fieldsList: fields, where, table, joins, orderBy, groupBy, limit, offset }: SQLiteSelectConfig): SQL;
26
+ buildSelectQuery({ withList, fieldsList: fields, where, having, table, joins, orderBy, groupBy, limit, offset }: SQLiteSelectConfig): SQL;
27
27
  buildInsertQuery({ table, values, onConflict, returning }: SQLiteInsertConfig): SQL;
28
28
  sqlToQuery(sql: SQL): Query;
29
29
  }
package/sqlite-core/dialect.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/sqlite-core/dialect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAe,KAAK,EAAE,GAAG,EAAuB,MAAM,OAAO,CAAC;AAErE,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAC1G,OAAO,EAAE,cAAc,EAAe,MAAM,qBAAqB,CAAC;AAGlE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAuB,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,8BAAsB,aAAa;IAClC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIhC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,kBAAkB,GAAG,GAAG;IAUtE,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,SAAS,GAAG,GAAG;IAkB1D,gBAAgB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,kBAAkB,GAAG,GAAG;IAY3E;;;;;;;;;;OAUG;IACH,OAAO,CAAC,cAAc;IAoDtB,gBAAgB,CACf,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,kBAAkB,GACxG,GAAG;IAiGN,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,kBAAkB,GAAG,GAAG;IA8CnF,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;CAM3B;AAED,qBAAa,iBAAkB,SAAQ,aAAa;IACnD,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,IAAI;CA+B1E;AAED,qBAAa,kBAAmB,SAAQ,aAAa;IAC9C,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CA+B1F"}
1
+ {"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/sqlite-core/dialect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAe,KAAK,EAAE,GAAG,EAAuB,MAAM,OAAO,CAAC;AAErE,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAC1G,OAAO,EAAE,cAAc,EAAe,MAAM,qBAAqB,CAAC;AAGlE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAuB,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,8BAAsB,aAAa;IAClC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIhC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,kBAAkB,GAAG,GAAG;IAUtE,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,SAAS,GAAG,GAAG;IAkB1D,gBAAgB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,kBAAkB,GAAG,GAAG;IAY3E;;;;;;;;;;OAUG;IACH,OAAO,CAAC,cAAc;IAoDtB,gBAAgB,CACf,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,kBAAkB,GAChH,GAAG;IAmGN,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,kBAAkB,GAAG,GAAG;IA8CnF,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;CAM3B;AAED,qBAAa,iBAAkB,SAAQ,aAAa;IACnD,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,IAAI;CA+B1E;AAED,qBAAa,kBAAmB,SAAQ,aAAa;IAC9C,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CA+B1F"}
package/sqlite-core/dialect.js CHANGED
@@ -68,7 +68,7 @@ class SQLiteDialect {
68
68
  const chunks = fields
69
69
  .map(({ field }, i) => {
70
70
  const chunk = [];
71
- if (field instanceof sql_1.SQL.Aliased && field.isSubquerySelectionField) {
71
+ if (field instanceof sql_1.SQL.Aliased && field.isSelectionField) {
72
72
  chunk.push(new sql_1.Name(field.fieldAlias));
73
73
  }
74
74
  else if (field instanceof sql_1.SQL.Aliased || field instanceof sql_1.SQL) {
@@ -104,7 +104,7 @@ class SQLiteDialect {
104
104
  .flat(1);
105
105
  return sql_1.sql.fromList(chunks);
106
106
  }
107
- buildSelectQuery({ withList, fieldsList: fields, where, table, joins, orderBy, groupBy, limit, offset }) {
107
+ buildSelectQuery({ withList, fieldsList: fields, where, having, table, joins, orderBy, groupBy, limit, offset }) {
108
108
  fields.forEach((f) => {
109
109
  let tableName;
110
110
  if (f.field instanceof column_1.Column
@@ -152,6 +152,7 @@ class SQLiteDialect {
152
152
  });
153
153
  const joinsSql = sql_1.sql.fromList(joinsArray);
154
154
  const whereSql = where ? (0, sql_1.sql) ` where ${where}` : undefined;
155
+ const havingSql = having ? (0, sql_1.sql) ` having ${having}` : undefined;
155
156
  const orderByList = [];
156
157
  orderBy.forEach((orderByValue, index) => {
157
158
  orderByList.push(orderByValue);
@@ -170,7 +171,7 @@ class SQLiteDialect {
170
171
  const orderBySql = orderByList.length > 0 ? (0, sql_1.sql) ` order by ${sql_1.sql.fromList(orderByList)}` : undefined;
171
172
  const limitSql = limit ? (0, sql_1.sql) ` limit ${limit}` : undefined;
172
173
  const offsetSql = offset ? (0, sql_1.sql) ` offset ${offset}` : undefined;
173
- return (0, sql_1.sql) `${withSql}select ${selection} from ${table}${joinsSql}${whereSql}${groupBySql}${orderBySql}${limitSql}${offsetSql}`;
174
+ return (0, sql_1.sql) `${withSql}select ${selection} from ${table}${joinsSql}${whereSql}${groupBySql}${havingSql}${orderBySql}${limitSql}${offsetSql}`;
174
175
  }
175
176
  buildInsertQuery({ table, values, onConflict, returning }) {
176
177
  const isSingleValue = values.length === 1;
package/sqlite-core/dialect.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/sqlite-core/dialect.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/sqlite-core/dialect.ts"],"names":[],"mappings":"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"}
package/sqlite-core/query-builders/select.d.ts CHANGED
@@ -4,7 +4,7 @@ import { SQLiteDialect } from '../dialect';
4
4
  import { PreparedQuery, SQLiteSession } from '../session';
5
5
  import { AnySQLiteTable, GetTableConfig } from '../table';
6
6
  import { GetSubquerySelection, Subquery, SubqueryWithSelection, WithSubqueryWithSelection } from '../../subquery';
7
- import { Simplify } from '../../utils';
7
+ import { Simplify, ValueOrArray } from '../../utils';
8
8
  import { BuildSubquerySelection, GetSelectTableName, JoinFn, JoinNullability, JoinType, SelectFields, SelectMode, SelectResult, SQLiteSelectConfig } from './select.types';
9
9
  export declare class SQLiteSelectBuilder<TSelection extends SelectFields | undefined, TResultType extends 'sync' | 'async', TRunResult> {
10
10
  private fields;
@@ -34,9 +34,12 @@ export declare class SQLiteSelect<TTable extends AnySQLiteTable | Subquery, TRes
34
34
  rightJoin: JoinFn<TTable, TResultType, TRunResult, TSelectMode, "right", TSelection, TNullability>;
35
35
  innerJoin: JoinFn<TTable, TResultType, TRunResult, TSelectMode, "inner", TSelection, TNullability>;
36
36
  fullJoin: JoinFn<TTable, TResultType, TRunResult, TSelectMode, "full", TSelection, TNullability>;
37
- where(where: SQL | undefined): Omit<this, 'where' | `${JoinType}Join`>;
37
+ where(where: ((aliases: TSelection) => SQL | undefined) | SQL | undefined): Omit<this, 'where' | `${JoinType}Join`>;
38
+ having(having: ((aliases: TSelection) => SQL | undefined) | SQL | undefined): Omit<this, 'where' | `${JoinType}Join`>;
39
+ groupBy(builder: (aliases: TSelection) => ValueOrArray<AnySQLiteColumn | SQL | SQL.Aliased>): Omit<this, 'where' | `${JoinType}Join` | 'groupBy'>;
40
+ groupBy(...columns: (AnySQLiteColumn | SQL)[]): Omit<this, 'where' | `${JoinType}Join` | 'groupBy'>;
41
+ orderBy(builder: (aliases: TSelection) => ValueOrArray<AnySQLiteColumn | SQL | SQL.Aliased>): Omit<this, 'where' | `${JoinType}Join` | 'orderBy'>;
38
42
  orderBy(...columns: (AnySQLiteColumn | SQL)[]): Omit<this, 'where' | `${JoinType}Join` | 'orderBy'>;
39
- groupBy(...columns: (AnySQLiteColumn | SQL)[]): Omit<this, 'where' | `${JoinType}Join`>;
40
43
  limit(limit: number | Placeholder): Omit<this, 'where' | `${JoinType}Join` | 'limit'>;
41
44
  offset(offset: number | Placeholder): Omit<this, 'where' | `${JoinType}Join` | 'offset'>;
42
45
  toSQL(): Omit<Query, 'typings'>;
package/sqlite-core/query-builders/select.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/sqlite-core/query-builders/select.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/sqlite-core/query-builders/select.ts"],"names":[],"mappings":"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"}
package/sqlite-core/query-builders/select.js CHANGED
@@ -88,6 +88,9 @@ class SQLiteSelect {
88
88
  }
89
89
  this.config.fieldsList.push(...(0, utils_1.orderSelectedFields)(table instanceof subquery_1.Subquery ? table[subquery_1.SubqueryConfig].selection : table[table_1.Table.Symbol.Columns], [tableName]));
90
90
  }
91
+ if (typeof on === 'function') {
92
+ on = on(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' })));
93
+ }
91
94
  this.config.joins[tableName] = { on, table, joinType };
92
95
  switch (joinType) {
93
96
  case 'left':
@@ -109,15 +112,37 @@ class SQLiteSelect {
109
112
  };
110
113
  }
111
114
  where(where) {
115
+ if (typeof where === 'function') {
116
+ where = where(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'sql', sqlBehavior: 'sql' })));
117
+ }
112
118
  this.config.where = where;
113
119
  return this;
114
120
  }
115
- orderBy(...columns) {
116
- this.config.orderBy = columns;
121
+ having(having) {
122
+ if (typeof having === 'function') {
123
+ having = having(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'sql', sqlBehavior: 'sql' })));
124
+ }
125
+ this.config.having = having;
117
126
  return this;
118
127
  }
119
128
  groupBy(...columns) {
120
- this.config.groupBy = columns;
129
+ if (typeof columns[0] === 'function') {
130
+ const groupBy = columns[0](new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' })));
131
+ this.config.groupBy = Array.isArray(groupBy) ? groupBy : [groupBy];
132
+ }
133
+ else {
134
+ this.config.groupBy = columns;
135
+ }
136
+ return this;
137
+ }
138
+ orderBy(...columns) {
139
+ if (typeof columns[0] === 'function') {
140
+ const orderBy = columns[0](new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' })));
141
+ this.config.orderBy = Array.isArray(orderBy) ? orderBy : [orderBy];
142
+ }
143
+ else {
144
+ this.config.orderBy = columns;
145
+ }
121
146
  return this;
122
147
  }
123
148
  limit(limit) {
@@ -142,10 +167,10 @@ class SQLiteSelect {
142
167
  return query;
143
168
  }
144
169
  as(alias) {
145
- return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SubquerySelectionProxyHandler(alias));
170
+ return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'throw' }));
146
171
  }
147
172
  prepareWithSubquery(alias) {
148
- return new Proxy(new subquery_1.WithSubquery(this.getSQL(), this.config.fields, alias, true), new subquery_1.SubquerySelectionProxyHandler(alias));
173
+ return new Proxy(new subquery_1.WithSubquery(this.getSQL(), this.config.fields, alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'throw' }));
149
174
  }
150
175
  }
151
176
  exports.SQLiteSelect = SQLiteSelect;
package/sqlite-core/query-builders/select.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/sqlite-core/query-builders/select.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/sqlite-core/query-builders/select.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAGA,mCAAgC;AAKhC,yCAQoB;AACpB,mCAAsE;AACtE,oCAA2C;AAc3C,MAAa,mBAAmB;IAK/B,YACS,MAAkB,EAClB,OAAsB,EACtB,OAAsB,EACtB,WAAuB,EAAE;QAHzB,WAAM,GAAN,MAAM,CAAY;QAClB,YAAO,GAAP,OAAO,CAAe;QACtB,YAAO,GAAP,OAAO,CAAe;QACtB,aAAQ,GAAR,QAAQ,CAAiB;IAC/B,CAAC;IAoBJ,IAAI,CAAC,KAAgC;QACpC,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QAEtC,IAAI,MAAoB,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;SACrB;aAAM,IAAI,KAAK,YAAY,mBAAQ,EAAE;YACrC,8FAA8F;YAC9F,MAAM,GAAG,MAAM,CAAC,WAAW,CAC1B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAChD,GAAG,EACF,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,GAAoC,CAAoC,CAAC,CAAC,CAC3F,CAAC;SACF;aAAM;YACN,MAAM,GAAG,IAAA,uBAAe,EAAC,KAAK,CAAC,CAAC;SAChC;QAED,MAAM,UAAU,GAAG,IAAA,2BAAmB,EAAkB,MAAM,CAAC,CAAC;QAChE,OAAO,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChH,CAAC;CACD;AAlDD,kDAkDC;AAWD,MAAa,YAAY;IAgBxB,YACC,KAAkC,EAClC,MAAoC,EACpC,UAA4C,EACpC,eAAwB,EACxB,OAAsB,EACtB,OAAsB,EACtB,QAAoB;QAHpB,oBAAe,GAAf,eAAe,CAAS;QACxB,YAAO,GAAP,OAAO,CAAe;QACtB,YAAO,GAAP,OAAO,CAAe;QACtB,aAAQ,GAAR,QAAQ,CAAY;QAgF7B,aAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAEnC,cAAS,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAErC,cAAS,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAErC,aAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAgHnC,QAAG,GAAuC,CAAC,iBAAiB,EAAE,EAAE;YAC/D,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC9C,CAAC,CAAC;QAEF,QAAG,GAAuC,CAAC,iBAAiB,EAAE,EAAE;YAC/D,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC9C,CAAC,CAAC;QAEF,QAAG,GAAuC,CAAC,iBAAiB,EAAE,EAAE;YAC/D,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC9C,CAAC,CAAC;QAEF,WAAM,GAA0C,CAAC,iBAAiB,EAAE,EAAE;YACrE,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QACjD,CAAC,CAAC;QAlND,IAAI,CAAC,MAAM,GAAG;YACb,QAAQ;YACR,KAAK;YACL,MAAM;YACN,UAAU;YACV,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,EAAE;SACX,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,KAAK,YAAY,mBAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpG,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC;IACpD,CAAC;IAEO,UAAU,CACjB,QAAmB;QAEnB,OAAO,CACN,KAAgC,EAChC,EAAgE,EAC9C,EAAE;YACpB,MAAM,SAAS,GAAG,KAAK,YAAY,mBAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAErG,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;gBACjC,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,iCAAiC,CAAC,CAAC;aACtE;YAED,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBAC1B,yHAAyH;gBACzH,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBACpD,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iCAC3D,KAAK,KACR,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,IACpC,CAAC,CAAC;iBACJ;gBACD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAC1B,GAAG,IAAA,2BAAmB,EACrB,KAAK,YAAY,mBAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EACzF,CAAC,SAAS,CAAC,CACX,CACD,CAAC;aACF;YAED,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;gBAC7B,EAAE,GAAG,EAAE,CACN,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAChE,CACf,CAAC;aACF;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;YAEvD,QAAQ,QAAQ,EAAE;gBACjB,KAAK,MAAM;oBACV,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;oBACzC,MAAM;gBACP,KAAK,OAAO;oBACX,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,WAAW,CACzC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAClE,CAAC;oBACF,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;oBACxC,MAAM;gBACP,KAAK,OAAO;oBACX,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;oBACxC,MAAM;gBACP,KAAK,MAAM;oBACV,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,WAAW,CACzC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAClE,CAAC;oBACF,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;oBACzC,MAAM;aACP;YAED,OAAO,IAAI,CAAC;QACb,CAAC,CAAC;IACH,CAAC;IAUD,KAAK,CACJ,KAAmE;QAEnE,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;YAChC,KAAK,GAAG,KAAK,CACZ,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAC9D,CACf,CAAC;SACF;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,CACL,MAAoE;QAEpE,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;YACjC,MAAM,GAAG,MAAM,CACd,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAC9D,CACf,CAAC;SACF;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAC5B,OAAO,IAAI,CAAC;IACb,CAAC;IAMD,OAAO,CACN,GAAG,OAEyB;QAE5B,IAAI,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE;YACrC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CACzB,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAChE,CACf,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SACnE;aAAM;YACN,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,OAAoC,CAAC;SAC3D;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAMD,OAAO,CACN,GAAG,OAEyB;QAE5B,IAAI,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE;YACrC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CACzB,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAChE,CACf,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SACnE;aAAM;YACN,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,OAAoC,CAAC;SAC3D;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,KAA2B;QAChC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,CAAC,MAA4B;QAClC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAC5B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,gBAAgB;IAChB,MAAM;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,KAAK;QACJ,MAAM,KAAuB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAA7D,EAAE,OAAO,OAAoD,EAA/C,IAAI,cAAlB,WAAoB,CAAyC,CAAC;QACpE,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO;QASN,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxG,KAAK,CAAC,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAClD,OAAO,KAAK,CAAC;IACd,CAAC;IAkBD,EAAE,CACD,KAAa;QAEb,OAAO,IAAI,KAAK,CACf,IAAI,mBAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EACtD,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACc,CAAC;IACxG,CAAC;IAED,mBAAmB,CAClB,KAAa;QAEb,OAAO,IAAI,KAAK,CACf,IAAI,uBAAY,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,EAChE,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACkB,CAAC;IAC5G,CAAC;CACD;AA9PD,oCA8PC"}
package/sqlite-core/query-builders/select.types.d.ts CHANGED
@@ -58,13 +58,14 @@ export interface SQLiteSelectConfig {
58
58
  withList: Subquery[];
59
59
  fields: SelectFields;
60
60
  fieldsList: SelectFieldsOrdered;
61
- where?: SQL | undefined;
61
+ where?: SQL;
62
+ having?: SQL;
62
63
  table: AnySQLiteTable | Subquery;
63
64
  limit?: number | Placeholder;
64
65
  offset?: number | Placeholder;
65
66
  joins: Record<string, JoinsValue>;
66
- orderBy: (AnySQLiteColumn | SQL)[];
67
- groupBy: (AnySQLiteColumn | SQL)[];
67
+ orderBy: (AnySQLiteColumn | SQL | SQL.Aliased)[];
68
+ groupBy: (AnySQLiteColumn | SQL | SQL.Aliased)[];
68
69
  }
69
70
  export declare type JoinFn<TTable extends AnySQLiteTable | Subquery, TResultType extends 'sync' | 'async', TRunResult, TSelectMode extends SelectMode, TJoinType extends JoinType, TResult, TJoinsNotNullable extends Record<string, JoinNullability> = Record<GetSelectTableName<TTable>, 'not-null'>> = <TJoinedTable extends AnySQLiteTable | Subquery, TJoinedName extends GetSelectTableName<TJoinedTable> = GetSelectTableName<TJoinedTable>>(table: TJoinedTable, on: SQL | undefined) => SQLiteSelect<TTable, TResultType, TRunResult, AppendToResult<GetSelectTableName<TTable>, TResult, TJoinedName, TJoinedTable extends AnySQLiteTable ? GetTableConfig<TJoinedTable, 'columns'> : TJoinedName extends Subquery ? Assume<GetSubquerySelection<TJoinedName>, SelectFields> : never, TSelectMode>, TSelectMode extends 'partial' ? TSelectMode : 'multiple', AppendToJoinsNotNull<TJoinsNotNullable, TJoinedName, TJoinType>>;
70
71
  export declare type GetSelectTableName<TTable extends AnySQLiteTable | Subquery> = TTable extends AnySQLiteTable ? GetTableConfig<TTable, 'name'> : TTable extends Subquery ? GetSubqueryAlias<TTable> : never;
package/sqlite-core/query-builders/select.types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/sqlite-core/query-builders/select.types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/sqlite-core/query-builders/select.types.ts"],"names":[],"mappings":"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"}
package/subquery.d.ts CHANGED
@@ -16,9 +16,9 @@ export declare class WithSubquery<TSelection = unknown, TAlias extends string =
16
16
  export declare type WithSubqueryWithSelection<TSelection, TAlias extends string> = WithSubquery<TSelection, TAlias> & TSelection;
17
17
  export declare type GetSubquerySelection<T extends Subquery> = T extends Subquery<infer TSelection> ? TSelection : never;
18
18
  export declare type GetSubqueryAlias<T extends Subquery> = T extends Subquery<any, infer TAlias> ? TAlias : never;
19
- export declare class SubquerySelectionProxyHandler<T extends Subquery | SelectFields<AnyColumn, Table>> implements ProxyHandler<Subquery | SelectFields<AnyColumn, Table>> {
20
- private alias;
21
- constructor(alias: string);
19
+ export declare class SelectionProxyHandler<T extends Subquery | SelectFields<AnyColumn, Table>> implements ProxyHandler<Subquery | SelectFields<AnyColumn, Table>> {
20
+ private config;
21
+ constructor(config: SelectionProxyHandler<T>['config']);
22
22
  get(subquery: T, prop: string | symbol, receiver: any): any;
23
23
  }
24
24
  //# sourceMappingURL=subquery.d.ts.map
package/subquery.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"subquery.d.ts","sourceRoot":"","sources":["../src/subquery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAU,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,eAAO,MAAM,cAAc,eAA2B,CAAC;AAEvD,qBAAa,QAAQ,CAAC,UAAU,GAAG,OAAO,EAAE,MAAM,SAAS,MAAM,GAAG,MAAM;IACzE,UAAkB,MAAM,EAAE,UAAU,CAAC;IACrC,UAAkB,UAAU,EAAE,UAAU,CAAC;IACzC,UAAkB,MAAM,EAAE,MAAM,CAAC;gBAUrB,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe;CAQvG;AAED,oBAAY,qBAAqB,CAAC,UAAU,EAAE,MAAM,SAAS,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,UAAU,CAAC;AAEjH,qBAAa,YAAY,CAAC,UAAU,GAAG,OAAO,EAAE,MAAM,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IACnH,UAAkB,cAAc,EAAE,cAAc,CAAC;CACjD;AAED,oBAAY,yBAAyB,CAAC,UAAU,EAAE,MAAM,SAAS,MAAM,IACpE,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,GAChC,UAAU,CAAC;AAEd,oBAAY,oBAAoB,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS,QAAQ,CAAC,MAAM,UAAU,CAAC,GAAG,UAAU,GAAG,KAAK,CAAC;AACjH,oBAAY,gBAAgB,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS,QAAQ,CAAC,GAAG,EAAE,MAAM,MAAM,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC;AAE1G,qBAAa,6BAA6B,CAAC,CAAC,SAAS,QAAQ,GAAG,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAC7F,YAAW,YAAY,CAAC,QAAQ,GAAG,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAEtD,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,MAAM;IAEjC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG;CAiC3D"}
1
+ {"version":3,"file":"subquery.d.ts","sourceRoot":"","sources":["../src/subquery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAU,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,eAAO,MAAM,cAAc,eAA2B,CAAC;AAEvD,qBAAa,QAAQ,CAAC,UAAU,GAAG,OAAO,EAAE,MAAM,SAAS,MAAM,GAAG,MAAM;IACzE,UAAkB,MAAM,EAAE,UAAU,CAAC;IACrC,UAAkB,UAAU,EAAE,UAAU,CAAC;IACzC,UAAkB,MAAM,EAAE,MAAM,CAAC;gBAUrB,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe;CAQvG;AAED,oBAAY,qBAAqB,CAAC,UAAU,EAAE,MAAM,SAAS,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,UAAU,CAAC;AAEjH,qBAAa,YAAY,CAAC,UAAU,GAAG,OAAO,EAAE,MAAM,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IACnH,UAAkB,cAAc,EAAE,cAAc,CAAC;CACjD;AAED,oBAAY,yBAAyB,CAAC,UAAU,EAAE,MAAM,SAAS,MAAM,IACpE,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,GAChC,UAAU,CAAC;AAEd,oBAAY,oBAAoB,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS,QAAQ,CAAC,MAAM,UAAU,CAAC,GAAG,UAAU,GAAG,KAAK,CAAC;AACjH,oBAAY,gBAAgB,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS,QAAQ,CAAC,GAAG,EAAE,MAAM,MAAM,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC;AAE1G,qBAAa,qBAAqB,CAAC,CAAC,SAAS,QAAQ,GAAG,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CACrF,YAAW,YAAY,CAAC,QAAQ,GAAG,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAElE,OAAO,CAAC,MAAM,CAIZ;gBAEU,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAItD,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG;CA4C3D"}
package/subquery.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.SubquerySelectionProxyHandler = exports.WithSubquery = exports.Subquery = exports.SubqueryConfig = void 0;
3
+ exports.SelectionProxyHandler = exports.WithSubquery = exports.Subquery = exports.SubqueryConfig = void 0;
4
4
  const alias_1 = require("./alias");
5
5
  const column_1 = require("./column");
6
6
  const sql_1 = require("./sql");
@@ -19,9 +19,9 @@ exports.Subquery = Subquery;
19
19
  class WithSubquery extends Subquery {
20
20
  }
21
21
  exports.WithSubquery = WithSubquery;
22
- class SubquerySelectionProxyHandler {
23
- constructor(alias) {
24
- this.alias = alias;
22
+ class SelectionProxyHandler {
23
+ constructor(config) {
24
+ this.config = Object.assign({}, config);
25
25
  }
26
26
  get(subquery, prop, receiver) {
27
27
  if (typeof prop === 'symbol') {
@@ -30,21 +30,30 @@ class SubquerySelectionProxyHandler {
30
30
  const columns = subquery instanceof Subquery ? subquery[exports.SubqueryConfig].selection : subquery;
31
31
  const value = columns[prop];
32
32
  if (value instanceof sql_1.SQL.Aliased) {
33
+ if (this.config.sqlAliasedBehavior === 'sql') {
34
+ return value.sql;
35
+ }
33
36
  const newValue = value.clone();
34
- newValue.isSubquerySelectionField = true;
37
+ newValue.isSelectionField = true;
35
38
  return newValue;
36
39
  }
37
40
  if (value instanceof sql_1.SQL) {
41
+ if (this.config.sqlBehavior === 'sql') {
42
+ return value;
43
+ }
38
44
  throw new Error(`You tried to reference "${prop}" field from a subquery, which is a raw SQL field, but it doesn't have an alias. Please add an alias to the field using ".as('alias')" method.`);
39
45
  }
40
46
  if (value instanceof column_1.Column) {
41
- return new Proxy(value, new alias_1.ColumnAliasProxyHandler(new Proxy(value.table, new alias_1.TableAliasProxyHandler(this.alias))));
47
+ if (this.config.alias) {
48
+ return new Proxy(value, new alias_1.ColumnAliasProxyHandler(new Proxy(value.table, new alias_1.TableAliasProxyHandler(this.config.alias))));
49
+ }
50
+ return value;
42
51
  }
43
52
  if (typeof value !== 'object' || value === null) {
44
53
  return value;
45
54
  }
46
- return new Proxy(value, new SubquerySelectionProxyHandler(this.alias));
55
+ return new Proxy(value, new SelectionProxyHandler(this.config));
47
56
  }
48
57
  }
49
- exports.SubquerySelectionProxyHandler = SubquerySelectionProxyHandler;
58
+ exports.SelectionProxyHandler = SelectionProxyHandler;
50
59
  //# sourceMappingURL=subquery.js.map
package/subquery.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"subquery.js","sourceRoot":"","sources":["../src/subquery.ts"],"names":[],"mappings":";;;AAAA,mCAA0E;AAC1E,qCAA6C;AAE7C,+BAA4B;AAGf,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAEvD,MAAa,QAAQ;IAapB,YAAY,GAAQ,EAAE,SAAyC,EAAE,KAAa,EAAE,SAAkB,KAAK;QACtG,IAAI,CAAC,sBAAc,CAAC,GAAG;YACtB,GAAG;YACH,SAAS;YACT,KAAK;YACL,MAAM;SACN,CAAC;IACH,CAAC;CACD;AArBD,4BAqBC;AAID,MAAa,YAAmE,SAAQ,QAA4B;CAEnH;AAFD,oCAEC;AASD,MAAa,6BAA6B;IAGzC,YAAoB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAAG,CAAC;IAErC,GAAG,CAAC,QAAW,EAAE,IAAqB,EAAE,QAAa;QACpD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC7B,OAAO,QAAQ,CAAC,IAA6B,CAAC,CAAC;SAC/C;QAED,MAAM,OAAO,GAAG,QAAQ,YAAY,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,sBAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC7F,MAAM,KAAK,GAAY,OAAO,CAAC,IAA4B,CAAC,CAAC;QAE7D,IAAI,KAAK,YAAY,SAAG,CAAC,OAAO,EAAE;YACjC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAC/B,QAAQ,CAAC,wBAAwB,GAAG,IAAI,CAAC;YACzC,OAAO,QAAQ,CAAC;SAChB;QAED,IAAI,KAAK,YAAY,SAAG,EAAE;YACzB,MAAM,IAAI,KAAK,CACd,2BAA2B,IAAI,gJAAgJ,CAC/K,CAAC;SACF;QAED,IAAI,KAAK,YAAY,eAAM,EAAE;YAC5B,OAAO,IAAI,KAAK,CACf,KAAK,EACL,IAAI,+BAAuB,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,8BAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAC3F,CAAC;SACF;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;YAChD,OAAO,KAAK,CAAC;SACb;QAED,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,6BAA6B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACxE,CAAC;CACD;AAtCD,sEAsCC"}
1
+ {"version":3,"file":"subquery.js","sourceRoot":"","sources":["../src/subquery.ts"],"names":[],"mappings":";;;AAAA,mCAA0E;AAC1E,qCAA6C;AAE7C,+BAA4B;AAGf,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAEvD,MAAa,QAAQ;IAapB,YAAY,GAAQ,EAAE,SAAyC,EAAE,KAAa,EAAE,SAAkB,KAAK;QACtG,IAAI,CAAC,sBAAc,CAAC,GAAG;YACtB,GAAG;YACH,SAAS;YACT,KAAK;YACL,MAAM;SACN,CAAC;IACH,CAAC;CACD;AArBD,4BAqBC;AAID,MAAa,YAAmE,SAAQ,QAA4B;CAEnH;AAFD,oCAEC;AASD,MAAa,qBAAqB;IASjC,YAAY,MAA0C;QACrD,IAAI,CAAC,MAAM,qBAAQ,MAAM,CAAE,CAAC;IAC7B,CAAC;IAED,GAAG,CAAC,QAAW,EAAE,IAAqB,EAAE,QAAa;QACpD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC7B,OAAO,QAAQ,CAAC,IAA6B,CAAC,CAAC;SAC/C;QAED,MAAM,OAAO,GAAG,QAAQ,YAAY,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,sBAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC7F,MAAM,KAAK,GAAY,OAAO,CAAC,IAA4B,CAAC,CAAC;QAE7D,IAAI,KAAK,YAAY,SAAG,CAAC,OAAO,EAAE;YACjC,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,KAAK,KAAK,EAAE;gBAC7C,OAAO,KAAK,CAAC,GAAG,CAAC;aACjB;YAED,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAC/B,QAAQ,CAAC,gBAAgB,GAAG,IAAI,CAAC;YACjC,OAAO,QAAQ,CAAC;SAChB;QAED,IAAI,KAAK,YAAY,SAAG,EAAE;YACzB,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,KAAK,EAAE;gBACtC,OAAO,KAAK,CAAC;aACb;YAED,MAAM,IAAI,KAAK,CACd,2BAA2B,IAAI,gJAAgJ,CAC/K,CAAC;SACF;QAED,IAAI,KAAK,YAAY,eAAM,EAAE;YAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACtB,OAAO,IAAI,KAAK,CACf,KAAK,EACL,IAAI,+BAAuB,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,8BAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAClG,CAAC;aACF;YACD,OAAO,KAAK,CAAC;SACb;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;YAChD,OAAO,KAAK,CAAC;SACb;QAED,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACjE,CAAC;CACD;AAzDD,sDAyDC"}
package/utils.d.ts CHANGED
@@ -97,5 +97,6 @@ export interface DrizzleTypeError<T extends string> {
97
97
  $brand: 'DrizzleTypeError';
98
98
  message: T;
99
99
  }
100
+ export declare type ValueOrArray<T> = T | T[];
100
101
  export {};
101
102
  //# sourceMappingURL=utils.d.ts.map
package/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAmC,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AACpE,OAAO,EAAgB,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9C;;;GAGG;AACH,eAAO,MAAM,UAAU,IAAI,CAAC;AAC5B;;;GAGG;AACH,eAAO,MAAM,UAAU,WAAW,CAAC;AAEnC,wBAAgB,YAAY,CAAC,OAAO,EACnC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,EACvC,GAAG,EAAE,OAAO,EAAE,EACd,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACtD,OAAO,CAwDT;AAED,wBAAgB,mBAAmB,CAAC,OAAO,SAAS,SAAS,EAC5D,MAAM,EAAE,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,EACtC,UAAU,CAAC,EAAE,MAAM,EAAE,GACnB,mBAAmB,CAAC,OAAO,CAAC,CAoB9B;AAeD,oBAAY,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,GAAG,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;AAEvE,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAEnC,oBAAY,MAAM,CAAC,CAAC,EAAE,OAAO,IAAI,QAAQ,CACtC,IAAI,CAAC,CAAC,EAAE,MAAM,OAAO,CAAC,GACtB,OAAO,CACT,CAAC;AAIF;;EAEE;AACF,MAAM,WAAW,eAAe;IAC/B;;;;MAIE;IACF,IAAI,CAAC,EAAE,OAAO,CAAC;CACf;AAGD,aAAK,OAAO,CACX,OAAO,EACP,OAAO,SAAS,eAAe,GAAG,EAAE,IACjC,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,GAAG;KAAG,OAAO,IAAI,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAAE,GACnG;KAAG,OAAO,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAAE,CAAC;AAEpD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwDE;AACF,oBAAY,QAAQ,CACnB,OAAO,EACP,OAAO,SAAS,eAAe,GAAG,EAAE,IACjC,OAAO,CAAC,OAAO,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,GAC7D,OAAO,CAAC;AAEX,oBAAY,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE/C,oBAAY,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAE/G,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,MAAM;IACjD,MAAM,EAAE,kBAAkB,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC;CACX"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAmC,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AACpE,OAAO,EAAgB,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9C;;;GAGG;AACH,eAAO,MAAM,UAAU,IAAI,CAAC;AAC5B;;;GAGG;AACH,eAAO,MAAM,UAAU,WAAW,CAAC;AAEnC,wBAAgB,YAAY,CAAC,OAAO,EACnC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,EACvC,GAAG,EAAE,OAAO,EAAE,EACd,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACtD,OAAO,CAwDT;AAED,wBAAgB,mBAAmB,CAAC,OAAO,SAAS,SAAS,EAC5D,MAAM,EAAE,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,EACtC,UAAU,CAAC,EAAE,MAAM,EAAE,GACnB,mBAAmB,CAAC,OAAO,CAAC,CAoB9B;AAeD,oBAAY,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,GAAG,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;AAEvE,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAEnC,oBAAY,MAAM,CAAC,CAAC,EAAE,OAAO,IAAI,QAAQ,CACtC,IAAI,CAAC,CAAC,EAAE,MAAM,OAAO,CAAC,GACtB,OAAO,CACT,CAAC;AAIF;;EAEE;AACF,MAAM,WAAW,eAAe;IAC/B;;;;MAIE;IACF,IAAI,CAAC,EAAE,OAAO,CAAC;CACf;AAGD,aAAK,OAAO,CACX,OAAO,EACP,OAAO,SAAS,eAAe,GAAG,EAAE,IACjC,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,GAAG;KAAG,OAAO,IAAI,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAAE,GACnG;KAAG,OAAO,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAAE,CAAC;AAEpD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwDE;AACF,oBAAY,QAAQ,CACnB,OAAO,EACP,OAAO,SAAS,eAAe,GAAG,EAAE,IACjC,OAAO,CAAC,OAAO,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,GAC7D,OAAO,CAAC;AAEX,oBAAY,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE/C,oBAAY,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAE/G,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,MAAM;IACjD,MAAM,EAAE,kBAAkB,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC;CACX;AAED,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC"}