@sqb/builder 4.1.3 → 4.2.0

package/dist/SerializeContext.js

@@ -4,6 +4,7 @@ exports.SerializeContext = void 0;
 const enums_1 = require("./enums");
 const extensions_1 = require("./extensions");
 const Serializable_1 = require("./Serializable");
+const typeguards_1 = require("./typeguards");
 class SerializeContext {
     constructor(opts) {
         this.reservedWords = [
@@ -52,9 +53,9 @@ class SerializeContext {
             return this.serialize(enums_1.SerializationType.ARRAY, vv, () => '(' + v.join(',')) + ')';
         }
         if (typeof v === 'object') {
-            if (v.isSerializable) {
+            if ((0, typeguards_1.isSerializable)(v)) {
                 const s = v._serialize(this);
-                return s ? (v.isQuery ? '(' + s + ')' : s) :
+                return s ? ((0, typeguards_1.isQuery)(v) ? '(' + s + ')' : s) :
                     /* istanbul ignore next */
                     'null';
             }

package/dist/enums.d.ts

@@ -29,6 +29,7 @@ export declare enum SerializationType {
     JOIN_CONDITIONS = "join_conditions",
     RAW = "raw",
     CASE_STATEMENT = "case_expression",
+    COALESCE_STATEMENT = "coalesce_expression",
     COUNT_STATEMENT = "count_expression",
     CONDITIONS_BLOCK = "conditions_block",
     COMPARISON_EXPRESSION = "comparison_expression",

package/dist/enums.js

@@ -34,6 +34,7 @@ var SerializationType;
     SerializationType["JOIN_CONDITIONS"] = "join_conditions";
     SerializationType["RAW"] = "raw";
     SerializationType["CASE_STATEMENT"] = "case_expression";
+    SerializationType["COALESCE_STATEMENT"] = "coalesce_expression";
     SerializationType["COUNT_STATEMENT"] = "count_expression";
     SerializationType["CONDITIONS_BLOCK"] = "conditions_block";
     SerializationType["COMPARISON_EXPRESSION"] = "comparison_expression";

package/dist/sql-objects/CoalesceStatement.d.ts

@@ -0,0 +1,22 @@
+import { SerializationType } from '../enums';
+import { Serializable } from '../Serializable';
+import { SerializeContext } from '../SerializeContext';
+export declare class CoalesceStatement extends Serializable {
+    _expressions: any[];
+    _alias?: string;
+    constructor(...expressions: any[]);
+    get _type(): SerializationType;
+    /**
+     * Sets alias to case expression.
+     */
+    as(alias: string): this;
+    /**
+     * Performs serialization
+     *
+     * @param {Object} ctx
+     * @return {string}
+     * @override
+     */
+    _serialize(ctx: SerializeContext): string;
+    protected __defaultSerialize(ctx: SerializeContext, o: any): string;
+}

package/dist/sql-objects/CoalesceStatement.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoalesceStatement = void 0;
+const enums_1 = require("../enums");
+const Serializable_1 = require("../Serializable");
+class CoalesceStatement extends Serializable_1.Serializable {
+    constructor(...expressions) {
+        super();
+        this._expressions = expressions;
+    }
+    get _type() {
+        return enums_1.SerializationType.COALESCE_STATEMENT;
+    }
+    /**
+     * Sets alias to case expression.
+     */
+    as(alias) {
+        this._alias = alias;
+        return this;
+    }
+    /**
+     * Performs serialization
+     *
+     * @param {Object} ctx
+     * @return {string}
+     * @override
+     */
+    _serialize(ctx) {
+        if (!this._expressions.length)
+            return '';
+        const q = {
+            expressions: [],
+        };
+        for (const x of this._expressions) {
+            q.expressions.push(ctx.anyToSQL(x));
+        }
+        return ctx.serialize(this._type, q, () => this.__defaultSerialize(ctx, q));
+    }
+    __defaultSerialize(ctx, o) {
+        return 'coalesce(' + o.expressions.join(', ') + ')' +
+            (this._alias ? ' ' + this._alias : '');
+    }
+}
+exports.CoalesceStatement = CoalesceStatement;

package/dist/sqlobject.initializers.d.ts

@@ -5,6 +5,7 @@ import { SelectQuery } from './query/SelectQuery';
 import { UpdateQuery } from './query/UpdateQuery';
 import { Serializable } from './Serializable';
 import { CaseStatement } from './sql-objects/CaseStatement';
+import { CoalesceStatement } from './sql-objects/CoalesceStatement';
 import { CountStatement } from './sql-objects/CountStatement';
 import { FieldExpression } from './sql-objects/FieldExpression';
 import { JoinStatement } from './sql-objects/JoinStatement';
@@ -24,6 +25,7 @@ export declare function RightOuterJoin(table: string | SelectQuery | RawStatemen
 export declare function OuterJoin(table: string | SelectQuery | RawStatement): JoinStatement;
 export declare function FullOuterJoin(table: string | SelectQuery | RawStatement): JoinStatement;
 export declare function Case(): CaseStatement;
+export declare function Coalesce(...expressions: any[]): CoalesceStatement;
 export declare function Count(): CountStatement;
 export declare function Param(name: string, dataType?: DataType, isArray?: boolean): ParamExpression;
 export declare function Param(args: {

package/dist/sqlobject.initializers.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Field = exports.Param = exports.Count = exports.Case = exports.FullOuterJoin = exports.OuterJoin = exports.RightOuterJoin = exports.RightJoin = exports.LeftOuterJoin = exports.LeftJoin = exports.InnerJoin = exports.Join = exports.Delete = exports.Update = exports.Insert = exports.Select = exports.Raw = void 0;
+exports.Field = exports.Param = exports.Count = exports.Coalesce = exports.Case = exports.FullOuterJoin = exports.OuterJoin = exports.RightOuterJoin = exports.RightJoin = exports.LeftOuterJoin = exports.LeftJoin = exports.InnerJoin = exports.Join = exports.Delete = exports.Update = exports.Insert = exports.Select = exports.Raw = void 0;
 const enums_1 = require("./enums");
 const DeleteQuery_1 = require("./query/DeleteQuery");
 const InsertQuery_1 = require("./query/InsertQuery");
 const SelectQuery_1 = require("./query/SelectQuery");
 const UpdateQuery_1 = require("./query/UpdateQuery");
 const CaseStatement_1 = require("./sql-objects/CaseStatement");
+const CoalesceStatement_1 = require("./sql-objects/CoalesceStatement");
 const CountStatement_1 = require("./sql-objects/CountStatement");
 const FieldExpression_1 = require("./sql-objects/FieldExpression");
 const JoinStatement_1 = require("./sql-objects/JoinStatement");
@@ -68,6 +69,10 @@ function Case() {
     return new CaseStatement_1.CaseStatement();
 }
 exports.Case = Case;
+function Coalesce(...expressions) {
+    return new CoalesceStatement_1.CoalesceStatement(...expressions);
+}
+exports.Coalesce = Coalesce;
 function Count() {
     return new CountStatement_1.CountStatement();
 }

package/dist/typeguards.d.ts

@@ -16,6 +16,7 @@ import type { RawStatement } from './sql-objects/RawStatement';
 import type { ReturningColumn } from './sql-objects/ReturningColumn';
 import type { TableName } from './sql-objects/TableName';
 export declare function isSerializable(value: any): value is Serializable;
+export declare function isQuery(value: any): value is Serializable;
 export declare function isRawStatement(value: any): value is RawStatement;
 export declare function isSelectQuery(value: any): value is SelectQuery;
 export declare function isInsertQuery(value: any): value is InsertQuery;

package/dist/typeguards.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTableName = exports.isReturningColumn = exports.isGroupColumn = exports.isOrderColumn = exports.isSelectColumn = exports.isCompOperator = exports.isLogicalOperator = exports.isParamExpression = exports.isCountStatement = exports.isCaseStatement = exports.isJoinStatement = exports.isDeleteQuery = exports.isIUpdateQuery = exports.isInsertQuery = exports.isSelectQuery = exports.isRawStatement = exports.isSerializable = void 0;
+exports.isTableName = exports.isReturningColumn = exports.isGroupColumn = exports.isOrderColumn = exports.isSelectColumn = exports.isCompOperator = exports.isLogicalOperator = exports.isParamExpression = exports.isCountStatement = exports.isCaseStatement = exports.isJoinStatement = exports.isDeleteQuery = exports.isIUpdateQuery = exports.isInsertQuery = exports.isSelectQuery = exports.isRawStatement = exports.isQuery = exports.isSerializable = void 0;
 const enums_1 = require("./enums");
+const Query_1 = require("./query/Query");
 const Serializable_1 = require("./Serializable");
 function isSerializable(value) {
     return value instanceof Serializable_1.Serializable;
 }
 exports.isSerializable = isSerializable;
+function isQuery(value) {
+    return value instanceof Query_1.Query;
+}
+exports.isQuery = isQuery;
 function isRawStatement(value) {
     return isSerializable(value) && value._type === enums_1.SerializationType.RAW;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/builder",
   "description": "Extensible multi-dialect SQL query builder written with TypeScript",
-  "version": "4.1.3",
+  "version": "4.2.0",
   "author": "Panates",
   "private": false,
   "contributors": [
@@ -10,7 +10,8 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/sqbjs/sqb.git"
+    "url": "https://github.com/sqbjs/sqb.git",
+    "directory": "packages/builder"
   },
   "keywords": [
     "javascript",