taon-type-sql 19.0.3 → 19.0.5

package/client/fesm2022/taon-type-sql.mjs

@@ -1,9 +1,8 @@
 import { Log } from 'ng2-logger/browser';
 
+// TODO I had to copy-paste the method implementations to every child class to avoid circular dependencies
 class QueryCondition {
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/condition/query-condition.ts
 
 class QueryConditionChain extends QueryCondition {
     constructor(sibling, child, chainType) {
@@ -14,6 +13,7 @@ class QueryConditionChain extends QueryCondition {
         this._child = child;
         this._chainType = chainType;
     }
+    // TODO how to call this
     $() {
         this._parenthesis = true;
         return this;
@@ -29,8 +29,6 @@ class QueryConditionChain extends QueryCondition {
         return new QueryConditionChain(this, condition, 'or');
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/condition/query-condition-chain.ts
 
 class QueryColumnCondition extends QueryCondition {
     constructor(column, type, ...values) {
@@ -46,8 +44,6 @@ class QueryColumnCondition extends QueryCondition {
         return new QueryConditionChain(this, condition, 'or');
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/condition/query-column-condition.ts
 
 class QueryColumn {
     constructor(_table, _name, _modifiers = []) {
@@ -65,8 +61,6 @@ class QueryColumn {
         return new QueryColumnCondition(this, 'is-not-null');
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/column/query-column.ts
 
 class QueryOrdering {
     constructor(column, direction) {
@@ -82,8 +76,6 @@ class QueryOrdering {
         return this;
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/other/query-ordering.ts
 
 class QueryJoinCondition extends QueryCondition {
     constructor(column, type, otherColumn) {
@@ -99,8 +91,6 @@ class QueryJoinCondition extends QueryCondition {
         return new QueryConditionChain(this, condition, 'or');
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/condition/query-join-condition.ts
 
 class ValueColumn extends QueryColumn {
     constructor(table, name, modifiers = []) {
@@ -124,8 +114,6 @@ class ValueColumn extends QueryColumn {
         return new QueryColumnCondition(this, 'ne', value);
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/column/value-column.ts
 
 class ComparableColumn extends ValueColumn {
     constructor(table, name, modifiers = []) {
@@ -155,6 +143,7 @@ class ComparableColumn extends ValueColumn {
     notBetween(value1, value2) {
         return new QueryColumnCondition(this, 'not-between', value1, value2);
     }
+    // min/max exists for text columns too, not just numeric and date
     min() {
         return new this.constructor(this._table, this._name, this._modifiers.concat({ name: 'min' }));
     }
@@ -162,8 +151,6 @@ class ComparableColumn extends ValueColumn {
         return new this.constructor(this._table, this._name, this._modifiers.concat({ name: 'max' }));
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/column/comparable-column.ts
 
 class NumberColumn extends ComparableColumn {
     constructor(table, name, modifiers = []) {
@@ -180,9 +167,8 @@ class NumberColumn extends ComparableColumn {
         return new NumberColumn(this._table, this._name, this._modifiers.concat({ name: 'avg' }));
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/column/number-column.ts
 
+// This file is only needed because the QueryColumn can't implement its count method b. of circular dependencies
 class BasicColumn extends QueryColumn {
     constructor(table, name, modifiers = []) {
         super(table, name, modifiers);
@@ -191,8 +177,6 @@ class BasicColumn extends QueryColumn {
         return new NumberColumn(this._table, this._name, this._modifiers.concat({ name: 'count' }));
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/column/basic-column.ts
 
 class BooleanColumn extends ValueColumn {
     constructor(table, name, modifiers = []) {
@@ -203,8 +187,6 @@ class BooleanColumn extends ValueColumn {
         return new NumberColumn(this._table, this._name, this._modifiers.concat({ name: 'count' }));
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/column/boolean-column.ts
 
 class DateColumn extends ComparableColumn {
     constructor(table, name, modifiers = []) {
@@ -215,8 +197,6 @@ class DateColumn extends ComparableColumn {
         return new NumberColumn(this._table, this._name, this._modifiers.concat({ name: 'count' }));
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/column/date-column.ts
 
 class StringColumn extends ComparableColumn {
     constructor(table, name, modifiers = []) {
@@ -248,8 +228,6 @@ class StringColumn extends ComparableColumn {
         return new QueryColumnCondition(this, 'not-like', value);
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/column/string-column.ts
 
 class JoinedTablesChain {
     constructor(_table, _modifier, _parent) {
@@ -261,8 +239,6 @@ class JoinedTablesChain {
         return new JoinedTables(condition, this);
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/join/joined-tables-chain.ts
 
 class JoinedTables {
     constructor(_condition, _parent) {
@@ -282,8 +258,6 @@ class JoinedTables {
         return new JoinedTablesChain(table, 'full', this);
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/join/joined-tables.ts
 
 class SelectQuery {
     constructor(_queryProcessor, _tables) {
@@ -330,8 +304,6 @@ class SelectQuery {
         return this._queryProcessor(this);
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/query/select-query.ts
 
 class TableConditionQuery {
     constructor(_queryProcessor, _table, _conditions) {
@@ -355,8 +327,6 @@ class TableConditionQuery {
         return this._queryProcessor(this).then((rows) => rows[0]);
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/query/table-condition-query.ts
 
 class TableQuery {
     constructor(_queryProcessor, _table) {
@@ -398,6 +368,7 @@ class TableQuery {
             .then((rows) => rows[0]);
     }
     _whereId(id) {
+        // TODO remove assertions if $id typing is fixed
         let $id = this._table.$id;
         if ($id instanceof ValueColumn) {
             return this.where($id.eq(id));
@@ -407,8 +378,6 @@ class TableQuery {
         }
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/query/table-query.ts
 
 class QuerySource {
     constructor(_queryProcessor) {
@@ -425,12 +394,11 @@ class QuerySource {
         return new TableQuery(this._queryProcessor, table);
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/query-source.ts
 
 class QueryTable {
     constructor(_$name) {
         this._$name = _$name;
+        // abstract readonly $id; // FIXME I got a dozen incomprehensible type errors
         this.$all = new BasicColumn(this, '*');
     }
     innerJoin(table) {
@@ -446,8 +414,6 @@ class QueryTable {
         return new JoinedTablesChain(table, 'full', this);
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/builder/query-table.ts
 
 function number(param) {
     let result = Number(param);
@@ -485,8 +451,6 @@ function string(param) {
         return param.valueOf();
     throw new Error('Invalid string parameter in SQL query: ' + param);
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/converter/type-converter.ts
 
 function createQueryConverter(paramConverter, options, engine) {
     return convertQuery;
@@ -676,6 +640,7 @@ function createQueryConverter(paramConverter, options, engine) {
             preprocessParams(condition);
         });
     }
+    // this is only needed, so that the $1, $2... numbering is not reversed
     function preprocessParams(condition) {
         if (condition._sibling) {
             preprocessParams(condition._sibling);
@@ -766,8 +731,6 @@ function createQueryConverter(paramConverter, options, engine) {
         return param;
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/converter/query-converter.ts
 
 function convertSubstitutionParam(param) {
     if (param == null)
@@ -786,6 +749,8 @@ function convertSubstitutionParam(param) {
     }
     return `'${JSON.stringify(param)}'`;
 }
+// node mysql doesn't have an typeCast equivalent solution for the other direction
+// node-postgres: https://github.com/brianc/node-postgres/issues/442
 function convertEscapedParam(param) {
     if (typeof param === 'object' && !(param == null || param instanceof String || param instanceof Number ||
         param instanceof Boolean || param instanceof Date)) {
@@ -793,8 +758,6 @@ function convertEscapedParam(param) {
     }
     return param;
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/converter/param-converter.ts
 
 let pgParamConverter = (index) => '$' + index;
 let mySqlParamConverter = (index) => '?';
@@ -808,14 +771,10 @@ function convertQueryToParameterizedSQL(query, options, engine) {
     let sql = createQueryConverter((param) => convertSingleParam(param, params, paramConverter), options, engine)(query);
     return { sql, params };
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/converter/parameterized-converter.ts
 
 function convertQueryToSQL(query, options, engine) {
     return createQueryConverter((param) => convertSubstitutionParam(param), options, engine)(query);
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/converter/sql-converter.ts
 
 const log = Log.create('query processor');
 const DEFAULT_OPTIONS = {
@@ -845,29 +804,52 @@ function createQueryProcessor(client, _options = {}, engine = 'pg') {
         lineBreak: options.lineBreaks ? '\n' : ' ',
         nameEscape: _options.identifierQuote || (engine === 'mysql' ? '`' : '"')
     };
+    // function processSql(query: any, sql: string, params: any[] | undefined, callback: any): Promise<any> {
+    //   if (options.logging) log.i(sql);
+    //   if (options.logger) options.logger(sql, params);
+    //   return new Promise((resolve, reject) => {
+    //     callback(sql, params, (err: any, result: any) => {
+    //       if (err) reject(err);
+    //       else resolve(convertResult(query, result, engine));
+    //     });
+    //   });
+    // }
+    // function executeSql(sql: string, params: any[] | undefined, cb: any) {
+    //   if (engine === 'pg') {
+    //     client.query(sql, params || cb, params ? cb : undefined);
+    //   } else if (engine === 'mysql') {
+    //     client.query({
+    //       sql,
+    //       values: params,
+    //       typeCast: mySqlTypeCast
+    //     }, cb);
+    //   } else throw new Error('Unknown DB engine: ' + engine);
+    // }
     return (query) => {
         if (options.parameterized) {
             let { sql, params } = convertQueryToParameterizedSQL(query, queryOptions, engine);
+            // if (Helpers.isWebSQL || Helpers.isNode) {
             return client.query(sql, params);
+            // }
+            // return processSql(query, sql, params, (sql: string, params: any[], cb: any) => executeSql(sql, params, cb));
         }
         else {
             let sql = convertQueryToSQL(query, queryOptions, engine);
+            // if (Helpers.isWebSQL || Helpers.isNode) {
             return client.query(sql, undefined);
+            // }
+            // return processSql(query, sql, undefined, (sql: string, params: undefined, cb: any) => executeSql(sql, undefined, cb));
         }
     };
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/client/query-processor.ts
 
 class MySqlQuerySource extends QuerySource {
     constructor(client, options = {}) {
         super(createQueryProcessor(client, options, 'mysql'));
     }
 }
-;
-({}); // @--end-of-file-for-module=taon-type-sql lib/client/mysql.ts
 
-({}); // @--end-of-file-for-module=taon-type-sql lib/index.ts
+// Builder:
 
 /**
  * Generated bundle index. Do not edit.