@sqb/builder 4.1.5 → 4.5.0

package/README.md

@@ -1,5 +1,5 @@
 
-<p align="center">
+<p style="text-align:center">
   <img src="https://user-images.githubusercontent.com/3836517/32965280-1a2b63ce-cbe7-11e7-8ee1-ba47313503c5.png" width="500px" alt="SQB Logo"/>
 </p>
 
@@ -43,7 +43,7 @@ $ npm install @sqb/builder --save
 
 ## Node Compatibility
 
-  - node >= 10.x
+  - node >= 16.x
   
    
 ### License

package/cjs/classes.ns.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+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/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-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-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-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-or.js"), exports);
+tslib_1.__exportStar(require("./sql-objects/operators/comp-operator.js"), exports);

package/{dist → cjs}/enums.js

@@ -34,6 +34,13 @@ var SerializationType;
     SerializationType["JOIN_CONDITIONS"] = "join_conditions";
     SerializationType["RAW"] = "raw";
     SerializationType["CASE_STATEMENT"] = "case_expression";
+    SerializationType["COALESCE_STATEMENT"] = "coalesce_expression";
+    SerializationType["LOWER_STATEMENT"] = "lower_expression";
+    SerializationType["UPPER_STATEMENT"] = "upper_expression";
+    SerializationType["MAX_STATEMENT"] = "max_expression";
+    SerializationType["MIN_STATEMENT"] = "min_expression";
+    SerializationType["SEQUENCE_GETTER_STATEMENT"] = "sequence_getter_statement";
+    SerializationType["STRINGAGG_STATEMENT"] = "StringAGG_expression";
     SerializationType["COUNT_STATEMENT"] = "count_expression";
     SerializationType["CONDITIONS_BLOCK"] = "conditions_block";
     SerializationType["COMPARISON_EXPRESSION"] = "comparison_expression";

package/cjs/index.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.classes = exports.op = exports.unRegisterSerializer = exports.registerSerializer = 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; } });
+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("./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("./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("./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"));

package/{dist → cjs}/op.initializers.js

@@ -1,116 +1,116 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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;
-const LogicalOperator_1 = require("./sql-objects/operators/LogicalOperator");
-const OpAnd_1 = require("./sql-objects/operators/OpAnd");
-const OpBetween_1 = require("./sql-objects/operators/OpBetween");
-const OpEq_1 = require("./sql-objects/operators/OpEq");
-const OpExists_1 = require("./sql-objects/operators/OpExists");
-const OpGt_1 = require("./sql-objects/operators/OpGt");
-const OpGte_1 = require("./sql-objects/operators/OpGte");
-const OpILike_1 = require("./sql-objects/operators/OpILike");
-const OpIn_1 = require("./sql-objects/operators/OpIn");
-const OpIs_1 = require("./sql-objects/operators/OpIs");
-const OpIsNot_1 = require("./sql-objects/operators/OpIsNot");
-const OpLike_1 = require("./sql-objects/operators/OpLike");
-const OpLt_1 = require("./sql-objects/operators/OpLt");
-const OpLte_1 = require("./sql-objects/operators/OpLte");
-const OpNe_1 = require("./sql-objects/operators/OpNe");
-const OpNotBetween_1 = require("./sql-objects/operators/OpNotBetween");
-const OpNotExists_1 = require("./sql-objects/operators/OpNotExists");
-const OpNotILike_1 = require("./sql-objects/operators/OpNotILike");
-const OpNotIn_1 = require("./sql-objects/operators/OpNotIn");
-const OpNotLike_1 = require("./sql-objects/operators/OpNotLike");
-const OpOr_1 = require("./sql-objects/operators/OpOr");
+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_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");
 function And(...args) {
-    return new OpAnd_1.OpAnd(...args);
+    return new op_and_js_1.OpAnd(...args);
 }
 exports.And = And;
 function Or(...args) {
-    return new OpOr_1.OpOr(...args);
+    return new op_or_js_1.OpOr(...args);
 }
 exports.Or = Or;
 function Eq(expression, value) {
-    return new OpEq_1.OpEq(expression, value);
+    return new op_eq_js_1.OpEq(expression, value);
 }
 exports.Eq = Eq;
 exports.Equal = Eq;
 function Ne(expression, value) {
-    return new OpNe_1.OpNe(expression, value);
+    return new op_ne_js_1.OpNe(expression, value);
 }
 exports.Ne = Ne;
 exports.NotEqual = Ne;
 function Gt(expression, value) {
-    return new OpGt_1.OpGt(expression, value);
+    return new op_gt_js_1.OpGt(expression, value);
 }
 exports.Gt = Gt;
 exports.GreaterThan = Gt;
 function Gte(expression, value) {
-    return new OpGte_1.OpGte(expression, value);
+    return new op_gte_js_1.OpGte(expression, value);
 }
 exports.Gte = Gte;
 exports.GreaterAnEqualTo = Gte;
 function Lt(expression, value) {
-    return new OpLt_1.OpLt(expression, value);
+    return new op_lt_js_1.OpLt(expression, value);
 }
 exports.Lt = Lt;
 exports.LowerThan = Lt;
 function Lte(expression, value) {
-    return new OpLte_1.OpLte(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 OpBetween_1.OpBetween(expression, values);
+    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 OpNotBetween_1.OpNotBetween(expression, values);
+    return new op_not_between_js_1.OpNotBetween(expression, values);
 }
 exports.NotBetween = NotBetween;
 function In(expression, value) {
-    return new OpIn_1.OpIn(expression, value);
+    return new op_in_js_1.OpIn(expression, value);
 }
 exports.In = In;
 function NotIn(expression, value) {
-    return new OpNotIn_1.OpNotIn(expression, value);
+    return new op_not_in_js_1.OpNotIn(expression, value);
 }
 exports.NotIn = NotIn;
 exports.Nin = NotIn;
 function Like(expression, value) {
-    return new OpLike_1.OpLike(expression, value);
+    return new op_like_js_1.OpLike(expression, value);
 }
 exports.Like = Like;
 function NotLike(expression, value) {
-    return new OpNotLike_1.OpNotLike(expression, value);
+    return new op_not_like_js_1.OpNotLike(expression, value);
 }
 exports.NotLike = NotLike;
 exports.NLike = NotLike;
 function Ilike(expression, value) {
-    return new OpILike_1.OpILike(expression, value);
+    return new op_ilike_js_1.OpILike(expression, value);
 }
 exports.Ilike = Ilike;
 function NotILike(expression, value) {
-    return new OpNotILike_1.OpNotILike(expression, value);
+    return new op_not_ilike_js_1.OpNotILike(expression, value);
 }
 exports.NotILike = NotILike;
 exports.Nilike = NotILike;
 function Is(expression, value) {
-    return new OpIs_1.OpIs(expression, value);
+    return new op_is_js_1.OpIs(expression, value);
 }
 exports.Is = Is;
 function IsNot(expression, value) {
-    return new OpIsNot_1.OpIsNot(expression, value);
+    return new op_is_not_js_1.OpIsNot(expression, value);
 }
 exports.IsNot = IsNot;
 function Exists(expression) {
-    return new OpExists_1.OpExists(expression);
+    return new op_exists_js_1.OpExists(expression);
 }
 exports.Exists = Exists;
 function NotExists(expression) {
-    return new OpNotExists_1.OpNotExists(expression);
+    return new op_not_exists_js_1.OpNotExists(expression);
 }
 exports.NotExists = NotExists;
 const op = {
@@ -154,4 +154,4 @@ const op = {
     '!exists': NotExists
 };
 exports.op = op;
-Object.assign(LogicalOperator_1.WrapOps, op);
+Object.assign(logical_operator_js_1.WrapOps, op);

package/cjs/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

package/{dist/query/DeleteQuery.js → cjs/query/delete-query.js}

@@ -1,26 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteQuery = void 0;
-const enums_1 = require("../enums");
-const OpAnd_1 = require("../sql-objects/operators/OpAnd");
-const TableName_1 = require("../sql-objects/TableName");
-const typeguards_1 = require("../typeguards");
-const Query_1 = require("./Query");
-class DeleteQuery extends Query_1.Query {
+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 {
+    _table;
+    _where;
     constructor(tableName) {
         super();
-        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_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 TableName_1.TableName(tableName) : tableName;
+        this._table = typeof tableName === 'string' ? new table_name_js_1.TableName(tableName) : tableName;
     }
     get _type() {
-        return enums_1.SerializationType.DELETE_QUERY;
+        return enums_js_1.SerializationType.DELETE_QUERY;
     }
     /**
      * Defines "where" part of query
      */
     where(...operator) {
-        this._where = this._where || new OpAnd_1.OpAnd();
+        this._where = this._where || new op_and_js_1.OpAnd();
         this._where.add(...operator);
         return this;
     }
@@ -44,7 +46,7 @@ class DeleteQuery extends Query_1.Query {
         if (!this._where)
             return '';
         const s = this._where._serialize(ctx);
-        return ctx.serialize(enums_1.SerializationType.CONDITIONS_BLOCK, s, () => {
+        return ctx.serialize(enums_js_1.SerializationType.CONDITIONS_BLOCK, s, () => {
             /* istanbul ignore next */
             return s ? 'where ' + s : '';
         });

package/{dist/query/InsertQuery.js → cjs/query/insert-query.js}

@@ -1,24 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InsertQuery = void 0;
-const enums_1 = require("../enums");
-const helpers_1 = require("../helpers");
-const TableName_1 = require("../sql-objects/TableName");
-const typeguards_1 = require("../typeguards");
-const ReturningQuery_1 = require("./ReturningQuery");
-class InsertQuery extends ReturningQuery_1.ReturningQuery {
+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 {
+    _table;
+    _input;
     constructor(tableName, input) {
         super();
-        if (!tableName || !(typeof tableName === 'string' || (0, typeguards_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))
             throw new TypeError('Object or SelectQuery instance required as second argument (input) for InsertQuery');
-        this._table = typeof tableName === 'string' ? new TableName_1.TableName(tableName) : tableName;
+        this._table = typeof tableName === 'string' ? new table_name_js_1.TableName(tableName) : tableName;
         this._input = input;
     }
     get _type() {
-        return enums_1.SerializationType.INSERT_QUERY;
+        return enums_js_1.SerializationType.INSERT_QUERY;
     }
     /**
      * Performs serialization
@@ -41,7 +43,7 @@ class InsertQuery extends ReturningQuery_1.ReturningQuery {
      */
     __serializeColumns(ctx) {
         let arr;
-        if ((0, typeguards_1.isSelectQuery)(this._input)) {
+        if ((0, typeguards_js_1.isSelectQuery)(this._input)) {
             arr = [];
             const cols = this._input._columns;
             if (cols) {
@@ -55,22 +57,21 @@ class InsertQuery extends ReturningQuery_1.ReturningQuery {
         }
         else
             arr = Object.keys(this._input);
-        return ctx.serialize(enums_1.SerializationType.INSERT_QUERY_COLUMNS, arr, () => (0, helpers_1.printArray)(arr));
+        return ctx.serialize(enums_js_1.SerializationType.INSERT_QUERY_COLUMNS, arr, () => (0, helpers_js_1.printArray)(arr));
     }
     /**
      *
      */
     __serializeValues(ctx) {
-        if ((0, typeguards_1.isSerializable)(this._input))
+        if ((0, typeguards_js_1.isSerializable)(this._input))
             return this._input._serialize(ctx);
         const arr = [];
         const allValues = this._input;
         for (const n of Object.keys(allValues)) {
-            const s = ctx.anyToSQL(allValues[n]);
-            if (s)
-                arr.push((0, typeguards_1.isSelectQuery)(allValues[n]) ? '(' + s + ')' : s);
+            const s = ctx.anyToSQL(allValues[n]) || 'null';
+            arr.push(s);
         }
-        return ctx.serialize(enums_1.SerializationType.INSERT_QUERY_VALUES, arr, () => (0, helpers_1.printArray)(arr));
+        return ctx.serialize(enums_js_1.SerializationType.INSERT_QUERY_VALUES, arr, () => (0, helpers_js_1.printArray)(arr));
     }
 }
 exports.InsertQuery = InsertQuery;

package/{dist/query/Query.js → cjs/query/query.js}

@@ -5,9 +5,10 @@ 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_1 = require("../Serializable");
-const SerializeContext_1 = require("../SerializeContext");
-class Query extends Serializable_1.Serializable {
+const serializable_js_1 = require("../serializable.js");
+const serialize_context_js_1 = require("../serialize-context.js");
+class Query extends serializable_js_1.Serializable {
+    _params;
     constructor() {
         super();
         events_1.EventEmitter.call(this);
@@ -16,7 +17,7 @@ class Query extends Serializable_1.Serializable {
      * Generates Sql script
      */
     generate(options) {
-        const ctx = new SerializeContext_1.SerializeContext(options);
+        const ctx = new serialize_context_js_1.SerializeContext(options);
         if (this._params)
             ctx.params = { ...ctx.params, ...this._params };
         ctx.serializeHooks = this.listeners('serialize');

package/{dist/query/ReturningQuery.js → cjs/query/returning-query.js}

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReturningQuery = void 0;
-const enums_1 = require("../enums");
-const helpers_1 = require("../helpers");
-const ReturningColumn_1 = require("../sql-objects/ReturningColumn");
-const Query_1 = require("./Query");
-class ReturningQuery extends Query_1.Query {
+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 {
+    _returningColumns;
     /**
      *
      */
@@ -16,7 +17,7 @@ class ReturningQuery extends Query_1.Query {
         this._returningColumns = columns.length ?
             columns.reduce((a, v) => {
                 if (v)
-                    a.push(new ReturningColumn_1.ReturningColumn(v));
+                    a.push(new returning_column_js_1.ReturningColumn(v));
                 return a;
             }, []) : undefined;
         return this;
@@ -35,8 +36,8 @@ class ReturningQuery extends Query_1.Query {
             if (s)
                 arr.push(s);
         }
-        return ctx.serialize(enums_1.SerializationType.RETURNING_BLOCK, arr, () => {
-            const s = (0, helpers_1.printArray)(arr);
+        return ctx.serialize(enums_js_1.SerializationType.RETURNING_BLOCK, arr, () => {
+            const s = (0, helpers_js_1.printArray)(arr);
             return s ? 'returning ' + s : '';
         });
     }