@sqb/builder 4.15.0 → 4.16.0

package/esm/classes.ns.js

@@ -1,41 +1,38 @@
-"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/update-query.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/base-field.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/case-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-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-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-in.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-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/order-column.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/raw-statement.js"), exports);
-tslib_1.__exportStar(require("./sql-objects/table-name.js"), exports);
+export * from './query/delete-query.js';
+export * from './query/insert-query.js';
+export * from './query/query.js';
+export * from './query/returning-query.js';
+export * from './query/select-query.js';
+export * from './query/update-query.js';
+export * from './sql-objects/base-field.js';
+export * from './sql-objects/case-statement.js';
+export * from './sql-objects/count-statement.js';
+export * from './sql-objects/field-expression.js';
+export * from './sql-objects/group-column.js';
+export * from './sql-objects/join-statement.js';
+export * from './sql-objects/operator.js';
+export * from './sql-objects/operators/comp-operator.js';
+export * from './sql-objects/operators/logical-operator.js';
+export * from './sql-objects/operators/op-and.js';
+export * from './sql-objects/operators/op-between.js';
+export * from './sql-objects/operators/op-eq.js';
+export * from './sql-objects/operators/op-exists.js';
+export * from './sql-objects/operators/op-gt.js';
+export * from './sql-objects/operators/op-gte.js';
+export * from './sql-objects/operators/op-ilike.js';
+export * from './sql-objects/operators/op-in.js';
+export * from './sql-objects/operators/op-is.js';
+export * from './sql-objects/operators/op-is-not.js';
+export * from './sql-objects/operators/op-like.js';
+export * from './sql-objects/operators/op-lt.js';
+export * from './sql-objects/operators/op-lte.js';
+export * from './sql-objects/operators/op-ne.js';
+export * from './sql-objects/operators/op-not-between.js';
+export * from './sql-objects/operators/op-not-exists.js';
+export * from './sql-objects/operators/op-not-ilike.js';
+export * from './sql-objects/operators/op-not-in.js';
+export * from './sql-objects/operators/op-not-like.js';
+export * from './sql-objects/operators/op-or.js';
+export * from './sql-objects/order-column.js';
+export * from './sql-objects/raw-statement.js';
+export * from './sql-objects/table-name.js';

package/esm/enums.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataType = exports.OperatorType = exports.SerializationType = exports.JoinType = void 0;
-var JoinType;
+export var JoinType;
 (function (JoinType) {
     JoinType["INNER"] = "inner";
     JoinType["LEFT"] = "left";
@@ -11,8 +8,8 @@ var JoinType;
     JoinType["OUTER"] = "outer";
     JoinType["FULL_OUTER"] = "full outer";
     JoinType["CROSS"] = "cross";
-})(JoinType || (exports.JoinType = JoinType = {}));
-var SerializationType;
+})(JoinType || (JoinType = {}));
+export var SerializationType;
 (function (SerializationType) {
     SerializationType["SELECT_QUERY"] = "select_query";
     SerializationType["SELECT_QUERY_COLUMNS"] = "select_query.columns";
@@ -55,8 +52,8 @@ var SerializationType;
     SerializationType["ARRAY"] = "array";
     SerializationType["SEQUENCE_GETTER_STATEMENT"] = "sequence_getter_statement";
     SerializationType["STRINGAGG_STATEMENT"] = "String_agg_statement";
-})(SerializationType || (exports.SerializationType = SerializationType = {}));
-var OperatorType;
+})(SerializationType || (SerializationType = {}));
+export var OperatorType;
 (function (OperatorType) {
     OperatorType["and"] = "and";
     OperatorType["or"] = "or";
@@ -79,8 +76,8 @@ var OperatorType;
     OperatorType["exists"] = "exists";
     OperatorType["notExists"] = "notExists";
     OperatorType["not"] = "not";
-})(OperatorType || (exports.OperatorType = OperatorType = {}));
-var DataType;
+})(OperatorType || (OperatorType = {}));
+export var DataType;
 (function (DataType) {
     DataType["BOOL"] = "BOOL";
     DataType["CHAR"] = "CHAR";
@@ -99,4 +96,4 @@ var DataType;
     DataType["TEXT"] = "TEXT";
     DataType["GUID"] = "GUID";
     DataType["JSON"] = "JSON";
-})(DataType || (exports.DataType = DataType = {}));
+})(DataType || (DataType = {}));

package/esm/extensions.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SerializerRegistry = void 0;
-class SerializerRegistry {
+export class SerializerRegistry {
     static get size() {
         return this.serializers.length;
     }
@@ -34,5 +31,4 @@ class SerializerRegistry {
         return !!this.serializers.find(x => x === extension);
     }
 }
-exports.SerializerRegistry = SerializerRegistry;
 SerializerRegistry.serializers = [];

package/esm/helpers.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.printArray = printArray;
 /**
  * Prints array with line feeding
  */
-function printArray(arr, sep, lfLen) {
+export function printArray(arr, sep, lfLen) {
     let out = '';
     let line = '';
     let k = 0;

package/esm/index.js

@@ -1,25 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.op = exports.classes = void 0;
-const tslib_1 = require("tslib");
-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("./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/update-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/comp-operator.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("./typeguards.js"), exports);
-tslib_1.__exportStar(require("./types.js"), exports);
+export * as classes from './classes.ns.js';
+export * from './enums.js';
+export * from './extensions.js';
+export * from './helpers.js';
+export * from './op.initializers.js';
+export { op } from './op.initializers.js';
+export * from './query/delete-query.js';
+export * from './query/insert-query.js';
+export * from './query/query.js';
+export * from './query/select-query.js';
+export * from './query/update-query.js';
+export * from './serializable.js';
+export * from './serialize-context.js';
+export * from './sql-objects/join-statement.js';
+export * from './sql-objects/operator.js';
+export * from './sql-objects/operators/comp-operator.js';
+export * from './sql-objects/operators/logical-operator.js';
+export * from './sqlobject.initializers.js';
+export * from './typeguards.js';
+export * from './types.js';

package/esm/op.initializers.js

@@ -1,122 +1,89 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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");
-const op_eq_js_1 = require("./sql-objects/operators/op-eq.js");
-const op_exists_js_1 = require("./sql-objects/operators/op-exists.js");
-const op_gt_js_1 = require("./sql-objects/operators/op-gt.js");
-const op_gte_js_1 = require("./sql-objects/operators/op-gte.js");
-const op_ilike_js_1 = require("./sql-objects/operators/op-ilike.js");
-const op_in_js_1 = require("./sql-objects/operators/op-in.js");
-const op_is_js_1 = require("./sql-objects/operators/op-is.js");
-const op_is_not_js_1 = require("./sql-objects/operators/op-is-not.js");
-const op_like_js_1 = require("./sql-objects/operators/op-like.js");
-const op_lt_js_1 = require("./sql-objects/operators/op-lt.js");
-const op_lte_js_1 = require("./sql-objects/operators/op-lte.js");
-const op_ne_js_1 = require("./sql-objects/operators/op-ne.js");
-const op_not_js_1 = require("./sql-objects/operators/op-not.js");
-const op_not_between_js_1 = require("./sql-objects/operators/op-not-between.js");
-const op_not_exists_js_1 = require("./sql-objects/operators/op-not-exists.js");
-const op_not_ilike_js_1 = require("./sql-objects/operators/op-not-ilike.js");
-const op_not_in_js_1 = require("./sql-objects/operators/op-not-in.js");
-const op_not_like_js_1 = require("./sql-objects/operators/op-not-like.js");
-const op_or_js_1 = require("./sql-objects/operators/op-or.js");
+import { WrapOps } from './sql-objects/operators/logical-operator.js';
+import { OpAnd } from './sql-objects/operators/op-and.js';
+import { OpBetween } from './sql-objects/operators/op-between.js';
+import { OpEq } from './sql-objects/operators/op-eq.js';
+import { OpExists } from './sql-objects/operators/op-exists.js';
+import { OpGt } from './sql-objects/operators/op-gt.js';
+import { OpGte } from './sql-objects/operators/op-gte.js';
+import { OpILike } from './sql-objects/operators/op-ilike.js';
+import { OpIn } from './sql-objects/operators/op-in.js';
+import { OpIs } from './sql-objects/operators/op-is.js';
+import { OpIsNot } from './sql-objects/operators/op-is-not.js';
+import { OpLike } from './sql-objects/operators/op-like.js';
+import { OpLt } from './sql-objects/operators/op-lt.js';
+import { OpLte } from './sql-objects/operators/op-lte.js';
+import { OpNe } from './sql-objects/operators/op-ne.js';
+import { OpNot } from './sql-objects/operators/op-not.js';
+import { OpNotBetween } from './sql-objects/operators/op-not-between.js';
+import { OpNotExists } from './sql-objects/operators/op-not-exists.js';
+import { OpNotILike } from './sql-objects/operators/op-not-ilike.js';
+import { OpNotIn } from './sql-objects/operators/op-not-in.js';
+import { OpNotLike } from './sql-objects/operators/op-not-like.js';
+import { OpOr } from './sql-objects/operators/op-or.js';
 function And(...args) {
-    return new op_and_js_1.OpAnd(...args);
+    return new OpAnd(...args);
 }
 function Or(...args) {
-    return new op_or_js_1.OpOr(...args);
+    return new OpOr(...args);
 }
 function Eq(expression, value) {
-    return new op_eq_js_1.OpEq(expression, value);
+    return new OpEq(expression, value);
 }
 function Ne(expression, value) {
-    return new op_ne_js_1.OpNe(expression, value);
+    return new OpNe(expression, value);
 }
 function Gt(expression, value) {
-    return new op_gt_js_1.OpGt(expression, value);
+    return new OpGt(expression, value);
 }
 function Gte(expression, value) {
-    return new op_gte_js_1.OpGte(expression, value);
+    return new OpGte(expression, value);
 }
 function Lt(expression, value) {
-    return new op_lt_js_1.OpLt(expression, value);
+    return new OpLt(expression, value);
 }
 function Lte(expression, value) {
-    return new op_lte_js_1.OpLte(expression, value);
+    return new OpLte(expression, value);
 }
 function Between(expression, value1, value2) {
     const values = Array.isArray(value1) ? value1 : [value1, value2];
-    return new op_between_js_1.OpBetween(expression, values);
+    return new OpBetween(expression, values);
 }
 function NotBetween(expression, value1, value2) {
     const values = Array.isArray(value1) ? value1 : [value1, value2];
-    return new op_not_between_js_1.OpNotBetween(expression, values);
+    return new OpNotBetween(expression, values);
 }
 function In(expression, value) {
-    return new op_in_js_1.OpIn(expression, value);
+    return new OpIn(expression, value);
 }
 function NotIn(expression, value) {
-    return new op_not_in_js_1.OpNotIn(expression, value);
+    return new OpNotIn(expression, value);
 }
 function Like(expression, value) {
-    return new op_like_js_1.OpLike(expression, value);
+    return new OpLike(expression, value);
 }
 function NotLike(expression, value) {
-    return new op_not_like_js_1.OpNotLike(expression, value);
+    return new OpNotLike(expression, value);
 }
 function Ilike(expression, value) {
-    return new op_ilike_js_1.OpILike(expression, value);
+    return new OpILike(expression, value);
 }
 function NotILike(expression, value) {
-    return new op_not_ilike_js_1.OpNotILike(expression, value);
+    return new OpNotILike(expression, value);
 }
 function Is(expression, value) {
-    return new op_is_js_1.OpIs(expression, value);
+    return new OpIs(expression, value);
 }
 function IsNot(expression, value) {
-    return new op_is_not_js_1.OpIsNot(expression, value);
+    return new OpIsNot(expression, value);
 }
 function Exists(expression) {
-    return new op_exists_js_1.OpExists(expression);
+    return new OpExists(expression);
 }
 function NotExists(expression) {
-    return new op_not_exists_js_1.OpNotExists(expression);
+    return new OpNotExists(expression);
 }
 function Not(expression) {
-    return new op_not_js_1.OpNot(expression);
+    return new OpNot(expression);
 }
 const op = {
     and: And,
@@ -159,5 +126,6 @@ const op = {
     notExists: NotExists,
     '!exists': NotExists,
 };
-exports.op = op;
-Object.assign(logical_operator_js_1.WrapOps, op);
+Object.assign(WrapOps, op);
+export { op };
+export { And, Between, Eq, Eq as Equal, Exists, Gte as GreaterAnEqualTo, Gt as GreaterThan, Gt, Gte, Ilike, In, Is, IsNot, Like, Lte as LowerAndEqualTo, Lt as LowerThan, Lt, Lte, Ne, NotILike as Nilike, NotIn as Nin, NotLike as NLike, Not, NotBetween, Ne as NotEqual, NotExists, NotILike, NotIn, NotLike, Or, };

package/esm/query/delete-query.js

@@ -1,27 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeleteQuery = void 0;
-const enums_js_1 = require("../enums.js");
-const op_and_js_1 = require("../sql-objects/operators/op-and.js");
-const table_name_js_1 = require("../sql-objects/table-name.js");
-const typeguards_js_1 = require("../typeguards.js");
-const query_js_1 = require("./query.js");
-class DeleteQuery extends query_js_1.Query {
+import { SerializationType } from '../enums.js';
+import { OpAnd } from '../sql-objects/operators/op-and.js';
+import { TableName } from '../sql-objects/table-name.js';
+import { isRawStatement } from '../typeguards.js';
+import { Query } from './query.js';
+export class DeleteQuery extends Query {
     constructor(tableName) {
         super();
-        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_js_1.isRawStatement)(tableName))) {
+        if (!tableName || !(typeof tableName === 'string' || 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;
+        this._table = typeof tableName === 'string' ? new TableName(tableName) : tableName;
     }
     get _type() {
-        return enums_js_1.SerializationType.DELETE_QUERY;
+        return SerializationType.DELETE_QUERY;
     }
     /**
      * Defines "where" part of query
      */
     where(...operator) {
-        this._where = this._where || new op_and_js_1.OpAnd();
+        this._where = this._where || new OpAnd();
         this._where.add(...operator);
         return this;
     }
@@ -45,9 +42,8 @@ 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, () => 
+        return ctx.serialize(SerializationType.CONDITIONS_BLOCK, s, () => 
         /* istanbul ignore next */
         s ? 'where ' + s : '');
     }
 }
-exports.DeleteQuery = DeleteQuery;

package/esm/query/insert-query.js

@@ -1,25 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InsertQuery = void 0;
-const enums_js_1 = require("../enums.js");
-const helpers_js_1 = require("../helpers.js");
-const table_name_js_1 = require("../sql-objects/table-name.js");
-const typeguards_js_1 = require("../typeguards.js");
-const returning_query_js_1 = require("./returning-query.js");
-class InsertQuery extends returning_query_js_1.ReturningQuery {
+import { SerializationType } from '../enums.js';
+import { printArray } from '../helpers.js';
+import { TableName } from '../sql-objects/table-name.js';
+import { isRawStatement, isSelectQuery, isSerializable } from '../typeguards.js';
+import { ReturningQuery } from './returning-query.js';
+export class InsertQuery extends ReturningQuery {
     constructor(tableName, input) {
         super();
-        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_js_1.isRawStatement)(tableName))) {
+        if (!tableName || !(typeof tableName === 'string' || 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)) {
             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._table = typeof tableName === 'string' ? new TableName(tableName) : tableName;
         this._input = input;
     }
     get _type() {
-        return enums_js_1.SerializationType.INSERT_QUERY;
+        return SerializationType.INSERT_QUERY;
     }
     /**
      * Performs serialization
@@ -41,7 +38,7 @@ class InsertQuery extends returning_query_js_1.ReturningQuery {
      */
     __serializeColumns(ctx) {
         let arr;
-        if ((0, typeguards_js_1.isSelectQuery)(this._input)) {
+        if (isSelectQuery(this._input)) {
             arr = [];
             const cols = this._input._columns;
             if (cols) {
@@ -55,13 +52,13 @@ class InsertQuery extends returning_query_js_1.ReturningQuery {
         }
         else
             arr = Object.keys(this._input);
-        return ctx.serialize(enums_js_1.SerializationType.INSERT_QUERY_COLUMNS, arr, () => (0, helpers_js_1.printArray)(arr));
+        return ctx.serialize(SerializationType.INSERT_QUERY_COLUMNS, arr, () => printArray(arr));
     }
     /**
      *
      */
     __serializeValues(ctx) {
-        if ((0, typeguards_js_1.isSerializable)(this._input))
+        if (isSerializable(this._input))
             return this._input._serialize(ctx);
         const arr = [];
         const allValues = this._input;
@@ -69,7 +66,6 @@ class InsertQuery extends returning_query_js_1.ReturningQuery {
             const s = ctx.anyToSQL(allValues[n]) || 'null';
             arr.push(s);
         }
-        return ctx.serialize(enums_js_1.SerializationType.INSERT_QUERY_VALUES, arr, () => (0, helpers_js_1.printArray)(arr));
+        return ctx.serialize(SerializationType.INSERT_QUERY_VALUES, arr, () => printArray(arr));
     }
 }
-exports.InsertQuery = InsertQuery;

package/esm/query/query.js

@@ -1,29 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Query = void 0;
-const tslib_1 = require("tslib");
-const events_1 = require("events");
-const putil_flattentext_1 = tslib_1.__importDefault(require("putil-flattentext"));
-const putil_merge_1 = tslib_1.__importDefault(require("putil-merge"));
-const serializable_js_1 = require("../serializable.js");
-const serialize_context_js_1 = require("../serialize-context.js");
-class Query extends serializable_js_1.Serializable {
+import { EventEmitter } from 'events';
+import flattenText from 'putil-flattentext';
+import merge from 'putil-merge';
+import { Serializable } from '../serializable.js';
+import { SerializeContext } from '../serialize-context.js';
+export class Query extends Serializable {
     constructor() {
         super();
-        events_1.EventEmitter.call(this);
+        EventEmitter.call(this);
     }
     /**
      * Generates Sql script
      */
     generate(options) {
-        const ctx = new serialize_context_js_1.SerializeContext(options);
+        const ctx = new SerializeContext(options);
         if (this._params)
             ctx.params = { ...ctx.params, ...this._params };
         ctx.serializeHooks = this.listeners('serialize');
         /* generate output */
         const sql = this._serialize(ctx);
         return {
-            sql: (0, putil_flattentext_1.default)(sql, { noWrap: !ctx.prettyPrint }),
+            sql: flattenText(sql, { noWrap: !ctx.prettyPrint }),
             params: ctx.preparedParams,
             paramOptions: ctx.paramOptions,
             returningFields: ctx.returningFields,
@@ -36,5 +32,4 @@ class Query extends serializable_js_1.Serializable {
         return this;
     }
 }
-exports.Query = Query;
-(0, putil_merge_1.default)(Query.prototype, events_1.EventEmitter.prototype, { descriptor: true });
+merge(Query.prototype, EventEmitter.prototype, { descriptor: true });

package/esm/query/returning-query.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReturningQuery = void 0;
-const enums_js_1 = require("../enums.js");
-const helpers_js_1 = require("../helpers.js");
-const returning_column_js_1 = require("../sql-objects/returning-column.js");
-const query_js_1 = require("./query.js");
-class ReturningQuery extends query_js_1.Query {
+import { SerializationType } from '../enums.js';
+import { printArray } from '../helpers.js';
+import { ReturningColumn } from '../sql-objects/returning-column.js';
+import { Query } from './query.js';
+export class ReturningQuery extends Query {
     /**
      *
      */
@@ -16,7 +13,7 @@ class ReturningQuery extends query_js_1.Query {
         this._returningColumns = columns.length
             ? columns.reduce((a, v) => {
                 if (v)
-                    a.push(new returning_column_js_1.ReturningColumn(v));
+                    a.push(new ReturningColumn(v));
                 return a;
             }, [])
             : undefined;
@@ -36,10 +33,9 @@ class ReturningQuery extends query_js_1.Query {
             if (s)
                 arr.push(s);
         }
-        return ctx.serialize(enums_js_1.SerializationType.RETURNING_BLOCK, arr, () => {
-            const s = (0, helpers_js_1.printArray)(arr);
+        return ctx.serialize(SerializationType.RETURNING_BLOCK, arr, () => {
+            const s = printArray(arr);
             return s ? 'returning ' + s : '';
         });
     }
 }
-exports.ReturningQuery = ReturningQuery;