@sqb/builder 4.8.2 → 4.9.1

package/cjs/enums.js

@@ -11,7 +11,7 @@ var JoinType;
     JoinType["OUTER"] = "outer";
     JoinType["FULL_OUTER"] = "full outer";
     JoinType["CROSS"] = "cross";
-})(JoinType = exports.JoinType || (exports.JoinType = {}));
+})(JoinType || (exports.JoinType = JoinType = {}));
 var SerializationType;
 (function (SerializationType) {
     SerializationType["SELECT_QUERY"] = "select_query";
@@ -46,6 +46,7 @@ var SerializationType;
     SerializationType["CONDITIONS_BLOCK"] = "conditions_block";
     SerializationType["COMPARISON_EXPRESSION"] = "comparison_expression";
     SerializationType["LOGICAL_EXPRESSION"] = "logical_expression";
+    SerializationType["NEGATIVE_EXPRESSION"] = "negative_expression";
     SerializationType["RETURNING_BLOCK"] = "returning_block";
     SerializationType["DATE_VALUE"] = "date_value";
     SerializationType["STRING_VALUE"] = "string_value";
@@ -53,7 +54,7 @@ var SerializationType;
     SerializationType["NUMBER_VALUE"] = "number_value";
     SerializationType["EXTERNAL_PARAMETER"] = "external_parameter";
     SerializationType["ARRAY"] = "array";
-})(SerializationType = exports.SerializationType || (exports.SerializationType = {}));
+})(SerializationType || (exports.SerializationType = SerializationType = {}));
 var OperatorType;
 (function (OperatorType) {
     OperatorType["and"] = "and";
@@ -76,7 +77,8 @@ var OperatorType;
     OperatorType["isNot"] = "isNot";
     OperatorType["exists"] = "exists";
     OperatorType["notExists"] = "notExists";
-})(OperatorType = exports.OperatorType || (exports.OperatorType = {}));
+    OperatorType["not"] = "not";
+})(OperatorType || (exports.OperatorType = OperatorType = {}));
 var DataType;
 (function (DataType) {
     DataType["BOOL"] = "BOOL";
@@ -96,4 +98,4 @@ var DataType;
     DataType["TEXT"] = "TEXT";
     DataType["GUID"] = "GUID";
     DataType["JSON"] = "JSON";
-})(DataType = exports.DataType || (exports.DataType = {}));
+})(DataType || (exports.DataType = DataType = {}));

package/cjs/op.initializers.js

@@ -1,6 +1,6 @@
 "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;
+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;
 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");
@@ -16,6 +16,7 @@ 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");
@@ -113,6 +114,10 @@ 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,
@@ -139,6 +144,7 @@ const op = {
     nin: NotIn,
     '!in': NotIn,
     like: Like,
+    not: Not,
     notLike: NotLike,
     nlike: NotLike,
     '!like': NotLike,

package/cjs/sql-objects/field-expression.js

@@ -19,9 +19,9 @@ class FieldExpression extends base_field_js_1.BaseField {
             this._dataType = arg1;
             this._isArray = arg2;
         }
-        const m = expression.match(TABLE_COLUMN_PATTERN);
+        const m = expression?.match(TABLE_COLUMN_PATTERN);
         if (!m)
-            throw new TypeError(`${expression} does not match table column format`);
+            throw new TypeError(`"${expression}" does not match table column format`);
         this._field = m[2];
         if (m[1]) {
             const a = m[1].split(/\./g);

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

@@ -29,7 +29,7 @@ class LogicalOperator extends operator_js_1.Operator {
             if ((0, typeguards_js_1.isLogicalOperator)(item)) {
                 this._items.push(item);
             }
-            else if ((0, typeguards_js_1.isRawStatement)(item) || (0, typeguards_js_1.isCompOperator)(item)) {
+            else if ((0, typeguards_js_1.isRawStatement)(item) || (0, typeguards_js_1.isCompOperator)(item) || (0, typeguards_js_1.isNotOperator)(item)) {
                 this._items.push(item);
             }
             else if ((0, putil_isplainobject_1.default)(item)) {

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

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpNot = void 0;
+const enums_js_1 = require("../../enums.js");
+const operator_js_1 = require("../operator.js");
+class OpNot extends operator_js_1.Operator {
+    _operatorType = enums_js_1.OperatorType.not;
+    _expression;
+    constructor(expression) {
+        super();
+        this._expression = expression;
+    }
+    get _type() {
+        return enums_js_1.SerializationType.NEGATIVE_EXPRESSION;
+    }
+    _serialize(ctx) {
+        const expression = ctx.anyToSQL(this._expression);
+        return ctx.serialize(this._type, expression, () => {
+            return expression ? 'not ' + expression : '';
+        });
+    }
+}
+exports.OpNot = OpNot;

package/cjs/typeguards.js

@@ -1,6 +1,6 @@
 "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.isQuery = exports.isSerializable = void 0;
+exports.isTableName = exports.isReturningColumn = exports.isGroupColumn = exports.isOrderColumn = exports.isSelectColumn = exports.isNotOperator = 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_js_1 = require("./enums.js");
 const query_js_1 = require("./query/query.js");
 const serializable_js_1 = require("./serializable.js");
@@ -56,6 +56,10 @@ function isCompOperator(value) {
     return isSerializable(value) && value._type === enums_js_1.SerializationType.COMPARISON_EXPRESSION;
 }
 exports.isCompOperator = isCompOperator;
+function isNotOperator(value) {
+    return isSerializable(value) && value._type === enums_js_1.SerializationType.NEGATIVE_EXPRESSION;
+}
+exports.isNotOperator = isNotOperator;
 function isSelectColumn(value) {
     return isSerializable(value) && value._type === enums_js_1.SerializationType.FIELD_NAME;
 }

package/esm/enums.d.ts

@@ -41,6 +41,7 @@ export declare enum SerializationType {
     CONDITIONS_BLOCK = "conditions_block",
     COMPARISON_EXPRESSION = "comparison_expression",
     LOGICAL_EXPRESSION = "logical_expression",
+    NEGATIVE_EXPRESSION = "negative_expression",
     RETURNING_BLOCK = "returning_block",
     DATE_VALUE = "date_value",
     STRING_VALUE = "string_value",
@@ -69,7 +70,8 @@ export declare enum OperatorType {
     is = "is",
     isNot = "isNot",
     exists = "exists",
-    notExists = "notExists"
+    notExists = "notExists",
+    not = "not"
 }
 export declare enum DataType {
     BOOL = "BOOL",

package/esm/enums.js

@@ -43,6 +43,7 @@ export var SerializationType;
     SerializationType["CONDITIONS_BLOCK"] = "conditions_block";
     SerializationType["COMPARISON_EXPRESSION"] = "comparison_expression";
     SerializationType["LOGICAL_EXPRESSION"] = "logical_expression";
+    SerializationType["NEGATIVE_EXPRESSION"] = "negative_expression";
     SerializationType["RETURNING_BLOCK"] = "returning_block";
     SerializationType["DATE_VALUE"] = "date_value";
     SerializationType["STRING_VALUE"] = "string_value";
@@ -73,6 +74,7 @@ export var OperatorType;
     OperatorType["isNot"] = "isNot";
     OperatorType["exists"] = "exists";
     OperatorType["notExists"] = "notExists";
+    OperatorType["not"] = "not";
 })(OperatorType || (OperatorType = {}));
 export var DataType;
 (function (DataType) {

package/esm/op.initializers.d.ts

@@ -1,6 +1,5 @@
 import { SelectQuery } from './query/select-query.js';
 import { Serializable } from './serializable.js';
-import { Operator } from './sql-objects/operator.js';
 import { OpAnd } from './sql-objects/operators/op-and.js';
 import { OpEq } from './sql-objects/operators/op-eq.js';
 import { OpExists } from './sql-objects/operators/op-exists.js';
@@ -14,22 +13,24 @@ 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 { 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';
-import { RawStatement } from './sql-objects/raw-statement.js';
-declare function And(...args: (Operator | RawStatement)[]): OpAnd;
-declare function Or(...args: (Operator | RawStatement)[]): OpOr;
+declare function And(...args: (Serializable | Object)[]): OpAnd;
+declare function Or(...args: (Serializable | Object)[]): OpOr;
 declare function Eq(expression: string | Serializable, value: any): OpEq;
 declare function Ne(expression: string | Serializable, value: any): OpNe;
 declare function Gt(expression: string | Serializable, value: any): OpGt;
 declare function Gte(expression: string | Serializable, value: any): OpGte;
 declare function Lt(expression: string | Serializable, value: any): OpLt;
 declare function Lte(expression: string | Serializable, value: any): OpLte;
+declare function Between(expression: string | Serializable, values: Serializable): any;
 declare function Between(expression: string | Serializable, values: any[]): any;
 declare function Between(expression: string | Serializable, value1: any, value2: any): any;
+declare function NotBetween(expression: string | Serializable, values: Serializable): any;
 declare function NotBetween(expression: string | Serializable, values: any[]): any;
 declare function NotBetween(expression: string | Serializable, value1: any, value2: any): any;
 declare function In(expression: string | Serializable, value: any): OpIn;
@@ -42,6 +43,7 @@ declare function Is(expression: string | Serializable, value: any): OpIs;
 declare function IsNot(expression: string | Serializable, value: any): OpIsNot;
 declare function Exists(expression: SelectQuery): OpExists;
 declare function NotExists(expression: SelectQuery): OpNotExists;
+declare function Not(expression: Serializable): OpNot;
 declare const op: {
     and: typeof And;
     or: typeof Or;
@@ -68,6 +70,7 @@ declare const op: {
     nin: typeof NotIn;
     '!in': typeof NotIn;
     like: typeof Like;
+    not: typeof Not;
     notLike: typeof NotLike;
     nlike: typeof NotLike;
     '!like': typeof NotLike;
@@ -83,4 +86,4 @@ declare const op: {
     '!exists': typeof NotExists;
 };
 export { op };
-export { And, Or, Eq, Eq as Equal, Ne, Ne as NotEqual, Gt, Gt as GreaterThan, Gte, Gte as GreaterAnEqualTo, Lt, Lt as LowerThan, Lte, Lte as LowerAndEqualTo, Between, NotBetween, In, NotIn, NotIn as Nin, Like, NotLike, NotLike as NLike, Ilike, NotILike, NotILike as Nilike, Is, IsNot, Exists, NotExists };
+export { And, Or, Eq, Eq as Equal, Ne, Ne as NotEqual, Gt, Gt as GreaterThan, Gte, Gte as GreaterAnEqualTo, Lt, Lt as LowerThan, Lte, Lte as LowerAndEqualTo, Between, NotBetween, In, NotIn, NotIn as Nin, Like, NotLike, NotLike as NLike, Ilike, NotILike, NotILike as Nilike, Is, IsNot, Exists, NotExists, Not };

package/esm/op.initializers.js

@@ -13,6 +13,7 @@ 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';
@@ -81,6 +82,9 @@ function Exists(expression) {
 function NotExists(expression) {
     return new OpNotExists(expression);
 }
+function Not(expression) {
+    return new OpNot(expression);
+}
 const op = {
     and: And,
     or: Or,
@@ -107,6 +111,7 @@ const op = {
     nin: NotIn,
     '!in': NotIn,
     like: Like,
+    not: Not,
     notLike: NotLike,
     nlike: NotLike,
     '!like': NotLike,
@@ -123,4 +128,4 @@ const op = {
 };
 Object.assign(WrapOps, op);
 export { op };
-export { And, Or, Eq, Eq as Equal, Ne, Ne as NotEqual, Gt, Gt as GreaterThan, Gte, Gte as GreaterAnEqualTo, Lt, Lt as LowerThan, Lte, Lte as LowerAndEqualTo, Between, NotBetween, In, NotIn, NotIn as Nin, Like, NotLike, NotLike as NLike, Ilike, NotILike, NotILike as Nilike, Is, IsNot, Exists, NotExists };
+export { And, Or, Eq, Eq as Equal, Ne, Ne as NotEqual, Gt, Gt as GreaterThan, Gte, Gte as GreaterAnEqualTo, Lt, Lt as LowerThan, Lte, Lte as LowerAndEqualTo, Between, NotBetween, In, NotIn, NotIn as Nin, Like, NotLike, NotLike as NLike, Ilike, NotILike, NotILike as Nilike, Is, IsNot, Exists, NotExists, Not };

package/esm/sql-objects/field-expression.js

@@ -16,9 +16,9 @@ export class FieldExpression extends BaseField {
             this._dataType = arg1;
             this._isArray = arg2;
         }
-        const m = expression.match(TABLE_COLUMN_PATTERN);
+        const m = expression?.match(TABLE_COLUMN_PATTERN);
         if (!m)
-            throw new TypeError(`${expression} does not match table column format`);
+            throw new TypeError(`"${expression}" does not match table column format`);
         this._field = m[2];
         if (m[1]) {
             const a = m[1].split(/\./g);

package/esm/sql-objects/operators/logical-operator.js

@@ -1,7 +1,7 @@
 import isPlainObject from 'putil-isplainobject';
 import { SerializationType } from '../../enums.js';
 import { printArray } from '../../helpers.js';
-import { isCompOperator, isLogicalOperator, isRawStatement } from '../../typeguards.js';
+import { isCompOperator, isLogicalOperator, isNotOperator, isRawStatement } from '../../typeguards.js';
 import { Operator } from '../operator.js';
 export const WrapOps = {};
 // noinspection RegExpUnnecessaryNonCapturingGroup
@@ -25,7 +25,7 @@ export class LogicalOperator extends Operator {
             if (isLogicalOperator(item)) {
                 this._items.push(item);
             }
-            else if (isRawStatement(item) || isCompOperator(item)) {
+            else if (isRawStatement(item) || isCompOperator(item) || isNotOperator(item)) {
                 this._items.push(item);
             }
             else if (isPlainObject(item)) {

package/esm/sql-objects/operators/op-not.d.ts

@@ -0,0 +1,11 @@
+import { OperatorType, SerializationType } from '../../enums.js';
+import { Serializable } from '../../serializable.js';
+import { SerializeContext } from '../../serialize-context.js';
+import { Operator } from '../operator.js';
+export declare class OpNot extends Operator {
+    _operatorType: OperatorType;
+    _expression: Serializable;
+    constructor(expression: Serializable);
+    get _type(): SerializationType;
+    _serialize(ctx: SerializeContext): string;
+}

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

@@ -0,0 +1,19 @@
+import { OperatorType, SerializationType } from '../../enums.js';
+import { Operator } from '../operator.js';
+export class OpNot extends Operator {
+    _operatorType = OperatorType.not;
+    _expression;
+    constructor(expression) {
+        super();
+        this._expression = expression;
+    }
+    get _type() {
+        return SerializationType.NEGATIVE_EXPRESSION;
+    }
+    _serialize(ctx) {
+        const expression = ctx.anyToSQL(this._expression);
+        return ctx.serialize(this._type, expression, () => {
+            return expression ? 'not ' + expression : '';
+        });
+    }
+}

package/esm/typeguards.d.ts

@@ -28,6 +28,7 @@ export declare function isCountStatement(value: any): value is CountStatement;
 export declare function isParamExpression(value: any): value is ParamExpression;
 export declare function isLogicalOperator(value: any): value is LogicalOperator;
 export declare function isCompOperator(value: any): value is CompOperator;
+export declare function isNotOperator(value: any): value is CompOperator;
 export declare function isSelectColumn(value: any): value is FieldExpression;
 export declare function isOrderColumn(value: any): value is OrderColumn;
 export declare function isGroupColumn(value: any): value is GroupColumn;

package/esm/typeguards.js

@@ -40,6 +40,9 @@ export function isLogicalOperator(value) {
 export function isCompOperator(value) {
     return isSerializable(value) && value._type === SerializationType.COMPARISON_EXPRESSION;
 }
+export function isNotOperator(value) {
+    return isSerializable(value) && value._type === SerializationType.NEGATIVE_EXPRESSION;
+}
 export function isSelectColumn(value) {
     return isSerializable(value) && value._type === SerializationType.FIELD_NAME;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/builder",
   "description": "Extensible multi-dialect SQL query builder written with TypeScript",
-  "version": "4.8.2",
+  "version": "4.9.1",
   "author": "Panates",
   "private": false,
   "contributors": [
@@ -37,7 +37,7 @@
     "putil-varhelpers": "^1.6.5"
   },
   "devDependencies": {
-    "@types/debug": "^4.1.7"
+    "@types/debug": "^4.1.8"
   },
   "type": "module",
   "types": "esm/index.d.ts",