@sqb/builder 4.12.1 → 4.14.0

package/cjs/classes.ns.js

@@ -1,41 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./query/delete-query.js"), exports);
+tslib_1.__exportStar(require("./query/insert-query.js"), exports);
 tslib_1.__exportStar(require("./query/query.js"), exports);
 tslib_1.__exportStar(require("./query/returning-query.js"), exports);
 tslib_1.__exportStar(require("./query/select-query.js"), exports);
-tslib_1.__exportStar(require("./query/insert-query.js"), exports);
 tslib_1.__exportStar(require("./query/update-query.js"), exports);
-tslib_1.__exportStar(require("./query/delete-query.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/field-expression.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/table-name.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/order-column.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/group-column.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/base-field.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operator.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/case-statement.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/join-statement.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/raw-statement.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/count-statement.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/field-expression.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/group-column.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/join-statement.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operator.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/comp-operator.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/operators/logical-operator.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/operators/op-and.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-not-exists.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-between.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-eq.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/operators/op-exists.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-not-ilike.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-not-like.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-not-in.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-not-between.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-ne.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-gt.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-gte.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/operators/op-ilike.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-like.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-is-not.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-is.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/operators/op-in.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-between.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-lte.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-is.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-is-not.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-like.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/operators/op-lt.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-gte.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-gt.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/op-eq.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-lte.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-ne.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-not-between.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-not-exists.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-not-ilike.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-not-in.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/op-not-like.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/operators/op-or.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/comp-operator.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/order-column.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/raw-statement.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/table-name.js"), exports);

package/cjs/extensions.js

@@ -1,16 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unRegisterSerializer = exports.registerSerializer = exports.serializers = void 0;
-exports.serializers = [];
-function registerSerializer(...extension) {
-    for (const ext of extension) {
-        if (!ext.dialect)
-            throw new TypeError('A SerializerExtension must contain "dialect" property');
-        exports.serializers.push(ext);
+exports.SerializerRegistry = void 0;
+class SerializerRegistry {
+    static get size() {
+        return this.serializers.length;
+    }
+    static register(...extension) {
+        for (const ext of extension) {
+            if (!ext.dialect)
+                throw new TypeError('A SerializerExtension must contain "dialect" property');
+            this.serializers.push(ext);
+        }
+    }
+    static forEach(callback, thisArg) {
+        return this.serializers.forEach(callback, thisArg);
+    }
+    static items() {
+        return this.serializers.values();
+    }
+    static unRegister(...extensions) {
+        this.serializers = extensions.filter(x => !extensions.includes(x));
+    }
+    static getAll(dialect) {
+        return this.serializers.filter(x => x.dialect === dialect);
+    }
+    static get(index) {
+        return this.serializers[index];
+    }
+    static findDialect(dialect) {
+        return this.serializers.find(x => x.dialect === dialect);
+    }
+    static has(extension) {
+        return !!this.serializers.find(x => x === extension);
     }
 }
-exports.registerSerializer = registerSerializer;
-function unRegisterSerializer(...extension) {
-    exports.serializers = exports.serializers.filter(x => !extension.includes(x));
-}
-exports.unRegisterSerializer = unRegisterSerializer;
+exports.SerializerRegistry = SerializerRegistry;
+SerializerRegistry.serializers = [];

package/cjs/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printArray = void 0;
+exports.printArray = printArray;
 /**
  * Prints array with line feeding
  */
@@ -28,4 +28,3 @@ function printArray(arr, sep, lfLen) {
         out += (out ? '\n' : '') + line;
     return out;
 }
-exports.printArray = printArray;

package/cjs/index.js

@@ -1,27 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.classes = exports.op = exports.unRegisterSerializer = exports.registerSerializer = void 0;
+exports.op = exports.classes = void 0;
 const tslib_1 = require("tslib");
-var extensions_js_1 = require("./extensions.js");
-Object.defineProperty(exports, "registerSerializer", { enumerable: true, get: function () { return extensions_js_1.registerSerializer; } });
-Object.defineProperty(exports, "unRegisterSerializer", { enumerable: true, get: function () { return extensions_js_1.unRegisterSerializer; } });
+exports.classes = tslib_1.__importStar(require("./classes.ns.js"));
+tslib_1.__exportStar(require("./enums.js"), exports);
+tslib_1.__exportStar(require("./extensions.js"), exports);
 tslib_1.__exportStar(require("./helpers.js"), exports);
-tslib_1.__exportStar(require("./serializable.js"), exports);
-tslib_1.__exportStar(require("./serialize-context.js"), exports);
+tslib_1.__exportStar(require("./op.initializers.js"), exports);
+var op_initializers_js_1 = require("./op.initializers.js");
+Object.defineProperty(exports, "op", { enumerable: true, get: function () { return op_initializers_js_1.op; } });
+tslib_1.__exportStar(require("./query/delete-query.js"), exports);
+tslib_1.__exportStar(require("./query/insert-query.js"), exports);
 tslib_1.__exportStar(require("./query/query.js"), exports);
 tslib_1.__exportStar(require("./query/select-query.js"), exports);
-tslib_1.__exportStar(require("./query/insert-query.js"), exports);
 tslib_1.__exportStar(require("./query/update-query.js"), exports);
-tslib_1.__exportStar(require("./query/delete-query.js"), exports);
+tslib_1.__exportStar(require("./serializable.js"), exports);
+tslib_1.__exportStar(require("./serialize-context.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/join-statement.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/operator.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/operators/logical-operator.js"), exports);
 tslib_1.__exportStar(require("./sql-objects/operators/comp-operator.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/join-statement.js"), exports);
-tslib_1.__exportStar(require("./types.js"), exports);
-tslib_1.__exportStar(require("./enums.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/logical-operator.js"), exports);
 tslib_1.__exportStar(require("./sqlobject.initializers.js"), exports);
-tslib_1.__exportStar(require("./op.initializers.js"), exports);
 tslib_1.__exportStar(require("./typeguards.js"), exports);
-var op_initializers_js_1 = require("./op.initializers.js");
-Object.defineProperty(exports, "op", { enumerable: true, get: function () { return op_initializers_js_1.op; } });
-exports.classes = tslib_1.__importStar(require("./classes.ns.js"));
+tslib_1.__exportStar(require("./types.js"), exports);

package/cjs/op.initializers.js

@@ -1,6 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Not = exports.NotExists = exports.Exists = exports.IsNot = exports.Is = exports.Nilike = exports.NotILike = exports.Ilike = exports.NLike = exports.NotLike = exports.Like = exports.Nin = exports.NotIn = exports.In = exports.NotBetween = exports.Between = exports.LowerAndEqualTo = exports.Lte = exports.LowerThan = exports.Lt = exports.GreaterAnEqualTo = exports.Gte = exports.GreaterThan = exports.Gt = exports.NotEqual = exports.Ne = exports.Equal = exports.Eq = exports.Or = exports.And = exports.op = void 0;
+exports.op = void 0;
+exports.And = And;
+exports.Between = Between;
+exports.Eq = Eq;
+exports.Equal = Eq;
+exports.Exists = Exists;
+exports.GreaterAnEqualTo = Gte;
+exports.Gte = Gte;
+exports.GreaterThan = Gt;
+exports.Gt = Gt;
+exports.Ilike = Ilike;
+exports.In = In;
+exports.Is = Is;
+exports.IsNot = IsNot;
+exports.Like = Like;
+exports.LowerAndEqualTo = Lte;
+exports.Lte = Lte;
+exports.LowerThan = Lt;
+exports.Lt = Lt;
+exports.Ne = Ne;
+exports.NotEqual = Ne;
+exports.Nilike = NotILike;
+exports.NotILike = NotILike;
+exports.Nin = NotIn;
+exports.NotIn = NotIn;
+exports.NLike = NotLike;
+exports.NotLike = NotLike;
+exports.Not = Not;
+exports.NotBetween = NotBetween;
+exports.NotExists = NotExists;
+exports.Or = Or;
 const logical_operator_js_1 = require("./sql-objects/operators/logical-operator.js");
 const op_and_js_1 = require("./sql-objects/operators/op-and.js");
 const op_between_js_1 = require("./sql-objects/operators/op-between.js");
@@ -26,98 +56,68 @@ const op_or_js_1 = require("./sql-objects/operators/op-or.js");
 function And(...args) {
     return new op_and_js_1.OpAnd(...args);
 }
-exports.And = And;
 function Or(...args) {
     return new op_or_js_1.OpOr(...args);
 }
-exports.Or = Or;
 function Eq(expression, value) {
     return new op_eq_js_1.OpEq(expression, value);
 }
-exports.Eq = Eq;
-exports.Equal = Eq;
 function Ne(expression, value) {
     return new op_ne_js_1.OpNe(expression, value);
 }
-exports.Ne = Ne;
-exports.NotEqual = Ne;
 function Gt(expression, value) {
     return new op_gt_js_1.OpGt(expression, value);
 }
-exports.Gt = Gt;
-exports.GreaterThan = Gt;
 function Gte(expression, value) {
     return new op_gte_js_1.OpGte(expression, value);
 }
-exports.Gte = Gte;
-exports.GreaterAnEqualTo = Gte;
 function Lt(expression, value) {
     return new op_lt_js_1.OpLt(expression, value);
 }
-exports.Lt = Lt;
-exports.LowerThan = Lt;
 function Lte(expression, value) {
     return new op_lte_js_1.OpLte(expression, value);
 }
-exports.Lte = Lte;
-exports.LowerAndEqualTo = Lte;
 function Between(expression, value1, value2) {
     const values = Array.isArray(value1) ? value1 : [value1, value2];
     return new op_between_js_1.OpBetween(expression, values);
 }
-exports.Between = Between;
 function NotBetween(expression, value1, value2) {
     const values = Array.isArray(value1) ? value1 : [value1, value2];
     return new op_not_between_js_1.OpNotBetween(expression, values);
 }
-exports.NotBetween = NotBetween;
 function In(expression, value) {
     return new op_in_js_1.OpIn(expression, value);
 }
-exports.In = In;
 function NotIn(expression, value) {
     return new op_not_in_js_1.OpNotIn(expression, value);
 }
-exports.NotIn = NotIn;
-exports.Nin = NotIn;
 function Like(expression, value) {
     return new op_like_js_1.OpLike(expression, value);
 }
-exports.Like = Like;
 function NotLike(expression, value) {
     return new op_not_like_js_1.OpNotLike(expression, value);
 }
-exports.NotLike = NotLike;
-exports.NLike = NotLike;
 function Ilike(expression, value) {
     return new op_ilike_js_1.OpILike(expression, value);
 }
-exports.Ilike = Ilike;
 function NotILike(expression, value) {
     return new op_not_ilike_js_1.OpNotILike(expression, value);
 }
-exports.NotILike = NotILike;
-exports.Nilike = NotILike;
 function Is(expression, value) {
     return new op_is_js_1.OpIs(expression, value);
 }
-exports.Is = Is;
 function IsNot(expression, value) {
     return new op_is_not_js_1.OpIsNot(expression, value);
 }
-exports.IsNot = IsNot;
 function Exists(expression) {
     return new op_exists_js_1.OpExists(expression);
 }
-exports.Exists = Exists;
 function NotExists(expression) {
     return new op_not_exists_js_1.OpNotExists(expression);
 }
-exports.NotExists = NotExists;
 function Not(expression) {
     return new op_not_js_1.OpNot(expression);
 }
-exports.Not = Not;
 const op = {
     and: And,
     or: Or,

package/cjs/query/delete-query.js

@@ -9,8 +9,9 @@ const query_js_1 = require("./query.js");
 class DeleteQuery extends query_js_1.Query {
     constructor(tableName) {
         super();
-        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_js_1.isRawStatement)(tableName)))
+        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_js_1.isRawStatement)(tableName))) {
             throw new TypeError('String or Raw instance required as first argument (tableName) for UpdateQuery');
+        }
         this._table = typeof tableName === 'string' ? new table_name_js_1.TableName(tableName) : tableName;
     }
     get _type() {
@@ -44,10 +45,9 @@ class DeleteQuery extends query_js_1.Query {
         if (!this._where)
             return '';
         const s = this._where._serialize(ctx);
-        return ctx.serialize(enums_js_1.SerializationType.CONDITIONS_BLOCK, s, () => {
-            /* istanbul ignore next */
-            return s ? 'where ' + s : '';
-        });
+        return ctx.serialize(enums_js_1.SerializationType.CONDITIONS_BLOCK, s, () => 
+        /* istanbul ignore next */
+        s ? 'where ' + s : '');
     }
 }
 exports.DeleteQuery = DeleteQuery;

package/cjs/query/insert-query.js

@@ -9,10 +9,12 @@ const returning_query_js_1 = require("./returning-query.js");
 class InsertQuery extends returning_query_js_1.ReturningQuery {
     constructor(tableName, input) {
         super();
-        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_js_1.isRawStatement)(tableName)))
+        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_js_1.isRawStatement)(tableName))) {
             throw new TypeError('String or Raw instance required as first argument (tableName) for InsertQuery');
-        if (!input || !((typeof input === 'object' && !Array.isArray(input)) || input.isSelect))
+        }
+        if (!input || !((typeof input === 'object' && !Array.isArray(input)) || input.isSelect)) {
             throw new TypeError('Object or SelectQuery instance required as second argument (input) for InsertQuery');
+        }
         this._table = typeof tableName === 'string' ? new table_name_js_1.TableName(tableName) : tableName;
         this._input = input;
     }

package/cjs/query/select-query.js

@@ -177,7 +177,7 @@ class SelectQuery extends query_js_1.Query {
      */
     __serializeSelectColumns(ctx) {
         const arr = [];
-        if (this._columns)
+        if (this._columns) {
             for (const t of this._columns) {
                 const s = ctx.anyToSQL(t);
                 // t._serialize(ctx);
@@ -191,6 +191,7 @@ class SelectQuery extends query_js_1.Query {
                         arr.push(s);
                 }
             }
+        }
         return ctx.serialize(enums_js_1.SerializationType.SELECT_QUERY_COLUMNS, arr, () => (0, helpers_js_1.printArray)(arr) || '*');
     }
     /**
@@ -198,7 +199,7 @@ class SelectQuery extends query_js_1.Query {
      */
     __serializeFrom(ctx) {
         const arr = [];
-        if (this._tables)
+        if (this._tables) {
             for (const t of this._tables) {
                 const s = t._serialize(ctx);
                 /* istanbul ignore else */
@@ -212,6 +213,7 @@ class SelectQuery extends query_js_1.Query {
                         arr.push(s);
                 }
             }
+        }
         return ctx.serialize(enums_js_1.SerializationType.SELECT_QUERY_FROM, arr, () => {
             const s = arr.join(',');
             return s ? 'from' + (s.substring(0, 1) !== '\n' ? ' ' : '') + s : '';
@@ -222,16 +224,15 @@ class SelectQuery extends query_js_1.Query {
      */
     __serializeJoins(ctx) {
         const arr = [];
-        if (this._joins)
+        if (this._joins) {
             for (const t of this._joins) {
                 const s = t._serialize(ctx);
                 /* istanbul ignore else */
                 if (s)
                     arr.push(s);
             }
-        return ctx.serialize(enums_js_1.SerializationType.SELECT_QUERY_JOIN, arr, () => {
-            return arr.join('\n');
-        });
+        }
+        return ctx.serialize(enums_js_1.SerializationType.SELECT_QUERY_JOIN, arr, () => arr.join('\n'));
     }
     /**
      *
@@ -240,23 +241,23 @@ class SelectQuery extends query_js_1.Query {
         if (!this._where)
             return '';
         const s = this._where._serialize(ctx);
-        return ctx.serialize(enums_js_1.SerializationType.CONDITIONS_BLOCK, s, () => {
-            /* istanbul ignore next */
-            return s ? 'where ' + s : '';
-        });
+        return ctx.serialize(enums_js_1.SerializationType.CONDITIONS_BLOCK, s, () => 
+        /* istanbul ignore next */
+        s ? 'where ' + s : '');
     }
     /**
      *
      */
     __serializeGroupColumns(ctx) {
         const arr = [];
-        if (this._groupBy)
+        if (this._groupBy) {
             for (const t of this._groupBy) {
                 const s = t._serialize(ctx);
                 /* istanbul ignore else */
                 if (s)
                     arr.push(s);
             }
+        }
         return ctx.serialize(enums_js_1.SerializationType.SELECT_QUERY_GROUPBY, arr, () => {
             const s = (0, helpers_js_1.printArray)(arr);
             return s ? 'group by ' + s : '';
@@ -264,13 +265,14 @@ class SelectQuery extends query_js_1.Query {
     }
     __serializeOrderColumns(ctx) {
         const arr = [];
-        if (this._orderBy)
+        if (this._orderBy) {
             for (const t of this._orderBy) {
                 const s = t._serialize(ctx);
                 /* istanbul ignore else */
                 if (s)
                     arr.push(s);
             }
+        }
         return ctx.serialize(enums_js_1.SerializationType.SELECT_QUERY_ORDERBY, arr, () => {
             const s = (0, helpers_js_1.printArray)(arr);
             return s ? 'order by ' + s : '';

package/cjs/query/update-query.js

@@ -10,10 +10,12 @@ const returning_query_js_1 = require("./returning-query.js");
 class UpdateQuery extends returning_query_js_1.ReturningQuery {
     constructor(tableName, input) {
         super();
-        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_js_1.isRawStatement)(tableName)))
+        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_js_1.isRawStatement)(tableName))) {
             throw new TypeError('String or Raw instance required as first argument (tableName) for UpdateQuery');
-        if (!input || !((typeof input === 'object' && !Array.isArray(input)) || input.isSelect))
+        }
+        if (!input || !((typeof input === 'object' && !Array.isArray(input)) || input.isSelect)) {
             throw new TypeError('Object or Raw instance required as second argument (input) for UpdateQuery');
+        }
         this._table = typeof tableName === 'string' ? new table_name_js_1.TableName(tableName) : tableName;
         this._input = input;
     }
@@ -70,10 +72,9 @@ class UpdateQuery extends returning_query_js_1.ReturningQuery {
         if (!this._where)
             return '';
         const s = this._where._serialize(ctx);
-        return ctx.serialize(enums_js_1.SerializationType.CONDITIONS_BLOCK, s, () => {
-            /* istanbul ignore next */
-            return s ? 'where ' + s : '';
-        });
+        return ctx.serialize(enums_js_1.SerializationType.CONDITIONS_BLOCK, s, () => 
+        /* istanbul ignore next */
+        s ? 'where ' + s : '');
     }
 }
 exports.UpdateQuery = UpdateQuery;

package/cjs/serialize-context.js

@@ -79,7 +79,7 @@ class SerializeContext {
                     return s;
             }
         }
-        for (const ext of extensions_js_1.serializers) {
+        for (const ext of extensions_js_1.SerializerRegistry.items()) {
             if (ext.dialect === this.dialect && ext.serialize) {
                 const s = ext.serialize(this, type, o, fallback);
                 if (s != null)
@@ -163,7 +163,7 @@ class SerializeContext {
             return false;
         if (this.reservedWords.includes(s.toLowerCase()))
             return true;
-        for (const ext of extensions_js_1.serializers) {
+        for (const ext of extensions_js_1.SerializerRegistry.items()) {
             if (ext.dialect === this.dialect && ext.isReservedWord) {
                 if (ext.isReservedWord(this, s))
                     return true;

package/cjs/sql-objects/case-statement.js

@@ -26,11 +26,12 @@ class CaseStatement extends serializable_js_1.Serializable {
      * Defines "then" part of Case expression.
      */
     then(value) {
-        if (this._condition)
+        if (this._condition) {
             this._expressions.push({
                 condition: this._condition,
                 value,
             });
+        }
         return this;
     }
     /**

package/cjs/sql-objects/group-column.js

@@ -28,11 +28,9 @@ class GroupColumn extends base_field_js_1.BaseField {
             field: this._field,
             isReservedWord: !!(this._field && ctx.isReservedWord(this._field)),
         };
-        return ctx.serialize(this._type, o, () => {
-            return ((this._schema ? this._schema + '.' : '') +
-                (this._table ? this._table + '.' : '') +
-                (o.isReservedWord ? '"' + this._field + '"' : this._field));
-        });
+        return ctx.serialize(this._type, o, () => (this._schema ? this._schema + '.' : '') +
+            (this._table ? this._table + '.' : '') +
+            (o.isReservedWord ? '"' + this._field + '"' : this._field));
     }
 }
 exports.GroupColumn = GroupColumn;

package/cjs/sql-objects/join-statement.js

@@ -11,8 +11,9 @@ class JoinStatement extends serializable_js_1.Serializable {
         super();
         this._conditions = new op_and_js_1.OpAnd();
         // noinspection SuspiciousTypeOfGuard
-        if (!((0, typeguards_js_1.isSelectQuery)(table) || (0, typeguards_js_1.isRawStatement)(table) || (0, typeguards_js_1.isTableName)(table) || typeof table === 'string'))
+        if (!((0, typeguards_js_1.isSelectQuery)(table) || (0, typeguards_js_1.isRawStatement)(table) || (0, typeguards_js_1.isTableName)(table) || typeof table === 'string')) {
             throw new TypeError('Table name, select query or raw object required for Join');
+        }
         this._joinType = joinType;
         this._table = typeof table === 'string' ? new table_name_js_1.TableName(table) : table;
     }
@@ -62,7 +63,7 @@ class JoinStatement extends serializable_js_1.Serializable {
                 const alias = this._table._alias;
                 if (!alias)
                     throw new Error('Alias required for sub-select in Join');
-                out += ' (' + (lf ? '\n\t' : '') + o.table + (lf ? '\n\b' : '') + ')' + ' ' + alias;
+                out += ' (' + (lf ? '\n\t' : '') + o.table + (lf ? '\n\b' : '') + ') ' + alias;
             }
             else
                 out += ' ' + o.table;

package/cjs/sql-objects/operators/comp-operator.js

@@ -65,14 +65,12 @@ class CompOperator extends operator_js_1.Operator {
             }
             return result;
         }
-        else {
-            const result = {
-                expression: isRight || typeof x !== 'string' ? ctx.anyToSQL(x) : x,
-            };
-            if (isRight || typeof x !== 'string')
-                result.isArray = Array.isArray(x);
-            return result;
-        }
+        const result = {
+            expression: isRight || typeof x !== 'string' ? ctx.anyToSQL(x) : x,
+        };
+        if (isRight || typeof x !== 'string')
+            result.isArray = Array.isArray(x);
+        return result;
     }
     __serialize(ctx, o) {
         return ctx.serialize(this._type, o, (_ctx, _o) => this.__defaultSerialize(_ctx, _o));

package/cjs/sql-objects/operators/op-exists.js

@@ -9,8 +9,9 @@ class OpExists extends comp_operator_js_1.CompOperator {
         super(query);
         this._operatorType = enums_js_1.OperatorType.exists;
         this._symbol = 'exists';
-        if (!(typeof query === 'object' && (0, typeguards_js_1.isSelectQuery)(query)))
+        if (!(typeof query === 'object' && (0, typeguards_js_1.isSelectQuery)(query))) {
             throw new TypeError('You must provide a SelectQuery in `exists()`');
+        }
     }
     _serialize(ctx) {
         const left = this.__serializeItem(ctx, this._left);

package/cjs/sql-objects/operators/op-not.js

@@ -14,9 +14,7 @@ class OpNot extends operator_js_1.Operator {
     }
     _serialize(ctx) {
         const expression = ctx.anyToSQL(this._expression);
-        return ctx.serialize(this._type, expression, () => {
-            return expression ? 'not ' + expression : '';
-        });
+        return ctx.serialize(this._type, expression, () => (expression ? 'not ' + expression : ''));
     }
 }
 exports.OpNot = OpNot;

package/cjs/sql-objects/order-column.js

@@ -31,12 +31,10 @@ class OrderColumn extends base_field_js_1.BaseField {
             descending: !!this._descending,
             isReservedWord: !!(this._field && ctx.isReservedWord(this._field)),
         };
-        return ctx.serialize(this._type, o, () => {
-            return ((o.schema ? o.schema + '.' : '') +
-                (o.table ? o.table + '.' : '') +
-                (o.isReservedWord ? '"' + o.field + '"' : o.field) +
-                (o.descending ? ' desc' : ''));
-        });
+        return ctx.serialize(this._type, o, () => (o.schema ? o.schema + '.' : '') +
+            (o.table ? o.table + '.' : '') +
+            (o.isReservedWord ? '"' + o.field + '"' : o.field) +
+            (o.descending ? ' desc' : ''));
     }
 }
 exports.OrderColumn = OrderColumn;

package/cjs/sql-objects/returning-column.js

@@ -23,9 +23,7 @@ class ReturningColumn extends base_field_js_1.BaseField {
         };
         ctx.returningFields = ctx.returningFields || [];
         ctx.returningFields.push(o);
-        return ctx.serialize(this._type, o, () => {
-            return ctx.escapeReserved(o.field) + (o.alias ? ' as ' + ctx.escapeReserved(o.alias) : '');
-        });
+        return ctx.serialize(this._type, o, () => ctx.escapeReserved(o.field) + (o.alias ? ' as ' + ctx.escapeReserved(o.alias) : ''));
     }
 }
 exports.ReturningColumn = ReturningColumn;

package/cjs/sql-objects/string-agg-statement.js

@@ -56,13 +56,14 @@ class StringAGGStatement extends serializable_js_1.Serializable {
     }
     __serializeOrderColumns(ctx) {
         const arr = [];
-        if (this._orderBy)
+        if (this._orderBy) {
             for (const t of this._orderBy) {
                 const s = t._serialize(ctx);
                 /* istanbul ignore else */
                 if (s)
                     arr.push(s);
             }
+        }
         return ctx.serialize(enums_js_1.SerializationType.SELECT_QUERY_ORDERBY, arr, () => {
             const s = (0, helpers_js_1.printArray)(arr);
             return s ? 'order by ' + s : '';