@ts-awesome/orm 1.5.2 → 1.5.5

package/dist/operators.d.ts

@@ -17,3 +17,10 @@ export declare function of<X extends TableMetaProvider, R = InstanceType<X>, F e
 export declare function of<X extends TableMetaProvider, R = InstanceType<X>, F extends keyof R = keyof R>(_: ITableRef<X>, field: F): IOperandable<R[F]>;
 export declare function alias<T>(expr: T | IOperandable<T>, name: string): IOperandable<T>;
 export declare function cast<R = unknown, T = unknown>(expr: T | IOperandable<T>, type: string): IOperandable<R>;
+export type CaseOperand<T> = {
+    when: IOperandable<boolean> | boolean;
+    then: IOperandable<T> | T;
+} | {
+    else: IOperandable<T> | T;
+};
+export declare function case_<T = unknown>(...args: CaseOperand<T>[]): IOperandable<T>;

package/dist/operators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cast = exports.alias = exports.of = exports.desc = exports.asc = exports.min = exports.max = exports.count = exports.sum = exports.avg = exports.exists = exports.any = exports.all = exports.not = exports.or = exports.and = void 0;
+exports.case_ = exports.cast = exports.alias = exports.of = exports.desc = exports.asc = exports.min = exports.max = exports.count = exports.sum = exports.avg = exports.exists = exports.any = exports.all = exports.not = exports.or = exports.and = void 0;
 const wrappers_1 = require("./wrappers");
 const symbols_1 = require("./symbols");
 function and(...operands) {
@@ -76,4 +76,18 @@ function cast(expr, type) {
     return new wrappers_1.Operandable('CAST', [expr, type]);
 }
 exports.cast = cast;
+function case_(...args) {
+    let count = 0;
+    for (const block of args) {
+        count += ('else' in block) ? 1 : 0;
+    }
+    if (count > 1) {
+        throw new Error(`CASE can contain only one ELSE block`);
+    }
+    if (count == 1 && !('else' in args[args.length - 1])) {
+        throw new Error(`CASE should have ELSE as last block`);
+    }
+    return new wrappers_1.Operandable('CASE', args);
+}
+exports.case_ = case_;
 //# sourceMappingURL=operators.js.map

package/dist/operators.js.map

@@ -1 +1 @@
-{"version":3,"file":"operators.js","sourceRoot":"","sources":["../src/operators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"operators.js","sourceRoot":"","sources":["../src/operators.ts"],"names":[],"mappings":"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"}

package/dist/wrappers.d.ts

@@ -1,59 +1,167 @@
-export namespace SupportedOperations {
-    export function eq(value: any): Operandable;
-    export function neq(value: any): Operandable;
-    export function like(value: any): Operandable;
-    function _in(value: any): Operandable;
-    export { _in as in };
-    export function has(value: any): Operandable;
-    export function between(lo: any, hi: any): Operandable;
-    export function gt(value: any): Operandable;
-    export function gte(value: any): Operandable;
-    export function lt(value: any): Operandable;
-    export function lte(value: any): Operandable;
-    export function add(value: any): Operandable;
-    export function sub(value: any): Operandable;
-    export function mul(value: any): Operandable;
-    export function div(value: any): Operandable;
-    export function mod(value: any): Operandable;
-    export function and(value: any): Operandable;
-    export function or(value: any): Operandable;
-    export function xor(value: any): Operandable;
+import {ElementType, IOperandable} from './interfaces';
+import {IColumnRef} from "./intermediate";
+
+declare class ColumnWrapper<T> implements IOperandable<T> {
+  constructor(ref: IColumnRef);
+
+  eq(value: T | IOperandable<T>): boolean;
+  neq(value: T | IOperandable<T>): boolean;
+  gt(value: T | IOperandable<T>): boolean;
+  gte(value: T | IOperandable<T>): boolean;
+  lt(value: T | IOperandable<T>): boolean;
+  lte(value: T | IOperandable<T>): boolean;
+  between(min: T | IOperandable<T>, max: T | IOperandable<T>): boolean;
+  in(value: T[] | Iterable<T> | IOperandable<T[]>): boolean;
+  has(value: (T extends any[] ? T[number] : T) | IOperandable<T extends any[] ? T[number] : T>): boolean;
+  like(value: string): boolean;
+  add(value: T | IOperandable<T>): IOperandable<T>;
+  sub(value: T | IOperandable<T>): IOperandable<T>;
+  mul(value: T | IOperandable<T>): IOperandable<T>;
+  div(value: T | IOperandable<T>): IOperandable<T>;
+  mod(value: T | IOperandable<T>): IOperandable<T>;
+  and(value: T | IOperandable<T>): IOperandable<T>;
+  or(value: T | IOperandable<T>): IOperandable<T>;
+  xor(value: T | IOperandable<T>): IOperandable<T>;
 }
-export function ColumnWrapper(column: any): void;
-export class ColumnWrapper {
-    constructor(column: any);
-    _column: any;
+
+declare class AliasWrapper<T> implements IOperandable<T> {
+  constructor(expr: IOperandable<T>, alias: string);
+
+  eq(value: T | IOperandable<T>): boolean;
+  neq(value: T | IOperandable<T>): boolean;
+  gt(value: T | IOperandable<T>): boolean;
+  gte(value: T | IOperandable<T>): boolean;
+  lt(value: T | IOperandable<T>): boolean;
+  lte(value: T | IOperandable<T>): boolean;
+  between(min: T | IOperandable<T>, max: T | IOperandable<T>): boolean;
+  in(value: T[] | Iterable<T> | IOperandable<T[]>): boolean;
+  has(value: (T extends any[] ? T[number] : T) | IOperandable<T extends any[] ? T[number] : T>): boolean;
+  like(value: string): boolean;
+  add(value: T | IOperandable<T>): IOperandable<T>;
+  sub(value: T | IOperandable<T>): IOperandable<T>;
+  mul(value: T | IOperandable<T>): IOperandable<T>;
+  div(value: T | IOperandable<T>): IOperandable<T>;
+  mod(value: T | IOperandable<T>): IOperandable<T>;
+  and(value: T | IOperandable<T>): IOperandable<T>;
+  or(value: T | IOperandable<T>): IOperandable<T>;
+  xor(value: T | IOperandable<T>): IOperandable<T>;
 }
-export function FunctionCall(func: any, args: any): void;
-export class FunctionCall {
-    constructor(func: any, args: any);
-    _func: any;
-    _args: any;
+
+declare class FunctionCall<T> implements IOperandable<T> {
+  constructor(func: string, args: any[]);
+
+  add(value: IOperandable<T> | T): IOperandable<T>;
+  and(value: IOperandable<T> | T): IOperandable<T>;
+  between(min: IOperandable<T> | T, max: IOperandable<T> | T): boolean;
+  div(value: IOperandable<T> | T): IOperandable<T>;
+  eq(value: IOperandable<T> | T): boolean;
+  gt(value: IOperandable<T> | T): boolean;
+  gte(value: IOperandable<T> | T): boolean;
+  has(value: ElementType<T> | IOperandable<ElementType<T>>): boolean;
+  in(value: T[] | Iterable<T> | IOperandable<T[]>): boolean;
+  like(value: string): boolean;
+  lt(value: IOperandable<T> | T): boolean;
+  lte(value: IOperandable<T> | T): boolean;
+  mod(value: IOperandable<T> | T): IOperandable<T>;
+  mul(value: IOperandable<T> | T): IOperandable<T>;
+  neq(value: IOperandable<T> | T): boolean;
+  or(value: IOperandable<T> | T): IOperandable<T>;
+  sub(value: IOperandable<T> | T): IOperandable<T>;
+  xor(value: IOperandable<T> | T): IOperandable<T>;
 }
-export function NamedParameter(name: any): void;
-export class NamedParameter {
-    constructor(name: any);
-    _named: any;
+
+declare class Operandable<T> implements IOperandable<T> {
+  constructor(operator: string, operands: any[]);
+
+  add(value: IOperandable<T> | T): IOperandable<T>;
+  and(value: IOperandable<T> | T): IOperandable<T>;
+  between(min: IOperandable<T> | T, max: IOperandable<T> | T): boolean;
+  div(value: IOperandable<T> | T): IOperandable<T>;
+  eq(value: IOperandable<T> | T): boolean;
+  gt(value: IOperandable<T> | T): boolean;
+  gte(value: IOperandable<T> | T): boolean;
+  has(value: ElementType<T> | IOperandable<ElementType<T>>): boolean;
+  in(value: T[] | Iterable<T> | IOperandable<T[]>): boolean;
+  like(value: string): boolean;
+  lt(value: IOperandable<T> | T): boolean;
+  lte(value: IOperandable<T> | T): boolean;
+  mod(value: IOperandable<T> | T): IOperandable<T>;
+  mul(value: IOperandable<T> | T): IOperandable<T>;
+  neq(value: IOperandable<T> | T): boolean;
+  or(value: IOperandable<T> | T): IOperandable<T>;
+  sub(value: IOperandable<T> | T): IOperandable<T>;
+  xor(value: IOperandable<T> | T): IOperandable<T>;
 }
-export function UnnamedParameter(value: any): void;
-export class UnnamedParameter {
-    constructor(value: any);
-    _value: any;
+
+declare class NamedParameter<T> implements IOperandable<T> {
+  constructor(name: string);
+
+  add(value: IOperandable<T> | T): IOperandable<T>;
+  and(value: IOperandable<T> | T): IOperandable<T>;
+  between(min: IOperandable<T> | T, max: IOperandable<T> | T): boolean;
+  div(value: IOperandable<T> | T): IOperandable<T>;
+  eq(value: IOperandable<T> | T): boolean;
+  gt(value: IOperandable<T> | T): boolean;
+  gte(value: IOperandable<T> | T): boolean;
+  has(value: ElementType<T> | IOperandable<ElementType<T>>): boolean;
+  in(value: T[] | Iterable<T> | IOperandable<T[]>): boolean;
+  like(value: string): boolean;
+  lt(value: IOperandable<T> | T): boolean;
+  lte(value: IOperandable<T> | T): boolean;
+  mod(value: IOperandable<T> | T): IOperandable<T>;
+  mul(value: IOperandable<T> | T): IOperandable<T>;
+  neq(value: IOperandable<T> | T): boolean;
+  or(value: IOperandable<T> | T): IOperandable<T>;
+  sub(value: IOperandable<T> | T): IOperandable<T>;
+  xor(value: IOperandable<T> | T): IOperandable<T>;
 }
-export function Constant(value: any): void;
-export class Constant {
-    constructor(value: any);
-    _const: any;
+
+declare class UnnamedParameter<T> implements IOperandable<T> {
+  constructor(value: T);
+
+  add(value: IOperandable<T> | T): IOperandable<T>;
+  and(value: IOperandable<T> | T): IOperandable<T>;
+  between(min: IOperandable<T> | T, max: IOperandable<T> | T): boolean;
+  div(value: IOperandable<T> | T): IOperandable<T>;
+  eq(value: IOperandable<T> | T): boolean;
+  gt(value: IOperandable<T> | T): boolean;
+  gte(value: IOperandable<T> | T): boolean;
+  has(value: ElementType<T> | IOperandable<ElementType<T>>): boolean;
+  in(value: T[] | Iterable<T> | IOperandable<T[]>): boolean;
+  like(value: string): boolean;
+  lt(value: IOperandable<T> | T): boolean;
+  lte(value: IOperandable<T> | T): boolean;
+  mod(value: IOperandable<T> | T): IOperandable<T>;
+  mul(value: IOperandable<T> | T): IOperandable<T>;
+  neq(value: IOperandable<T> | T): boolean;
+  or(value: IOperandable<T> | T): IOperandable<T>;
+  sub(value: IOperandable<T> | T): IOperandable<T>;
+  xor(value: IOperandable<T> | T): IOperandable<T>;
 }
-export function AliasWrapper(expr: any, alias: any): void;
-export class AliasWrapper {
-    constructor(expr: any, alias: any);
-    _alias: any;
-    _operands: any[];
-}
-export function Operandable(operator: any, operands: any): void;
-export class Operandable {
-    constructor(operator: any, operands: any);
-    _operator: any;
-    _operands: any;
+
+declare class Constant<T> implements IOperandable<T> {
+  constructor(value: T);
+
+  add(value: IOperandable<T> | T): IOperandable<T>;
+  and(value: IOperandable<T> | T): IOperandable<T>;
+  between(min: IOperandable<T> | T, max: IOperandable<T> | T): boolean;
+  div(value: IOperandable<T> | T): IOperandable<T>;
+  eq(value: IOperandable<T> | T): boolean;
+  gt(value: IOperandable<T> | T): boolean;
+  gte(value: IOperandable<T> | T): boolean;
+  has(value: ElementType<T> | IOperandable<ElementType<T>>): boolean;
+  in(value: T[] | Iterable<T> | IOperandable<T[]>): boolean;
+  like(value: string): boolean;
+  lt(value: IOperandable<T> | T): boolean;
+  lte(value: IOperandable<T> | T): boolean;
+  mod(value: IOperandable<T> | T): IOperandable<T>;
+  mul(value: IOperandable<T> | T): IOperandable<T>;
+  neq(value: IOperandable<T> | T): boolean;
+  or(value: IOperandable<T> | T): IOperandable<T>;
+  sub(value: IOperandable<T> | T): IOperandable<T>;
+  xor(value: IOperandable<T> | T): IOperandable<T>;
 }
+
+declare const SupportedOperations: any;
+
+export {ColumnWrapper, FunctionCall, Operandable, NamedParameter, UnnamedParameter, Constant, SupportedOperations, AliasWrapper}

package/dist/wrappers.js

@@ -1,80 +1,99 @@
+
 function skipAliasInOperations(op) {
-    return typeof op._alias === 'string' && op._operands ? op._operands[0] : op;
+  return typeof op._alias === 'string' && op._operands ? op._operands[0] : op
 }
+
 const SupportedOperations = {
-    eq(value) { return new Operandable(value === null ? 'IS' : '=', [this, value === null ? 'NULL' : value]); },
-    neq(value) { return new Operandable(value === null ? 'IS NOT' : '<>', [this, value === null ? 'NULL' : value]); },
-    like(value) { return new Operandable('LIKE', [this, value]); },
-    in(value) { return new Operandable('IN', [this, value]); },
-    has(value) { return new Operandable('IN', [value, this]); },
-    between(lo, hi) { return new Operandable('BETWEEN', [this, lo, hi]); },
-    gt(value) { return new Operandable('>', [this, value]); },
-    gte(value) { return new Operandable('>=', [this, value]); },
-    lt(value) { return new Operandable('<', [this, value]); },
-    lte(value) { return new Operandable('<=', [this, value]); },
-    add(value) { return new Operandable('+', [this, value]); },
-    sub(value) { return new Operandable('-', [this, value]); },
-    mul(value) { return new Operandable('*', [this, value]); },
-    div(value) { return new Operandable('/', [this, value]); },
-    mod(value) { return new Operandable('%', [this, value]); },
-    and(value) { return new Operandable('&', [this, value]); },
-    or(value) { return new Operandable('|', [this, value]); },
-    xor(value) { return new Operandable('^', [this, value]); },
-};
-function Operandable(operator, operands) {
-    this._operator = operator;
-    this._operands = operands.map(op => skipAliasInOperations(op));
+  eq     (value) { return new Operandable(value === null ? 'IS'     : '=',  [this, value === null ? 'NULL' : value])},
+  neq    (value) { return new Operandable(value === null ? 'IS NOT' : '<>', [this, value === null ? 'NULL' : value])},
+  like   (value) { return new Operandable('LIKE',    [this, value])},
+
+  in     (value) { return new Operandable('IN',      [this, value])},
+  has    (value) { return new Operandable('IN',      [value, this])},
+
+  between(lo,hi) { return new Operandable('BETWEEN', [this, lo,hi])},
+  gt     (value) { return new Operandable('>',       [this, value])},
+  gte    (value) { return new Operandable('>=',      [this, value])},
+  lt     (value) { return new Operandable('<',       [this, value])},
+  lte    (value) { return new Operandable('<=',      [this, value])},
+
+  add    (value) { return new Operandable('+',       [this, value])},
+  sub    (value) { return new Operandable('-',       [this, value])},
+  mul    (value) { return new Operandable('*',       [this, value])},
+  div    (value) { return new Operandable('/',       [this, value])},
+  mod    (value) { return new Operandable('%',       [this, value])},
+
+  and    (value) { return new Operandable('&',       [this, value])},
+  or     (value) { return new Operandable('|',       [this, value])},
+  xor    (value) { return new Operandable('^',       [this, value])},
+}
+
+function Operandable(operator, operands){
+  this._operator = operator;
+  this._operands = operands.map(op => skipAliasInOperations(op));
 }
 Operandable.prototype = SupportedOperations;
+
 function FunctionCall(func, args) {
-    this._func = func;
-    this._args = args.map(op => skipAliasInOperations(op));
+  this._func = func;
+  this._args = args.map(op => skipAliasInOperations(op));
 }
 FunctionCall.prototype = SupportedOperations;
+
 function ColumnWrapper(column) {
-    this._column = column;
+  this._column = column;
 }
 ColumnWrapper.prototype = SupportedOperations;
+
 function AliasWrapper(expr, alias) {
-    this._alias = alias;
-    this._operands = [expr];
+  this._alias = alias;
+  this._operands = [expr];
 }
 AliasWrapper.prototype = SupportedOperations;
+
 function NamedParameter(name) {
-    if (/^p\d+$/.test(name)) {
-        throw new Error(`Named parameter ${name} is reserved`);
-    }
-    if (!/^[a-zA-Z0-9_]+$/.test(name)) {
-        throw new Error(`Named parameter should be valid identifier`);
-    }
-    this._named = name;
+  if (/^p\d+$/.test(name)) {
+    throw new Error(`Named parameter ${name} is reserved`);
+  }
+
+  if (!/^[a-zA-Z0-9_]+$/.test(name)) {
+    throw new Error(`Named parameter should be valid identifier`);
+  }
+
+  this._named = name;
 }
 NamedParameter.prototype = SupportedOperations;
+
 function UnnamedParameter(value) {
-    this._value = value;
+  this._value = value;
 }
 UnnamedParameter.prototype = SupportedOperations;
+
+
 function Constant(value) {
-    function check(value) {
-        if (Array.isArray(value)) {
-            return value.length > 0 && value.every(check);
-        }
-        return value == null || ['string', 'number', 'boolean'].indexOf(typeof value) >= 0;
+  function check(value) {
+    if (Array.isArray(value)) {
+      return value.length > 0 && value.every(check);
     }
-    if (!check(value)) {
-        throw new Error(`Constant expected to be null, number, string, boolean or array of such values. Got ${JSON.stringify(value)}`);
-    }
-    this._const = value;
+    return value == null || ['string', 'number', 'boolean'].indexOf(typeof value) >= 0;
+  }
+
+  if (!check(value)) {
+    throw new Error(`Constant expected to be null, number, string, boolean or array of such values. Got ${JSON.stringify(value)}`);
+  }
+
+  this._const = value;
 }
 Constant.prototype = SupportedOperations;
+
+
 module.exports = {
-    SupportedOperations,
-    ColumnWrapper,
-    FunctionCall,
-    NamedParameter,
-    UnnamedParameter,
-    Constant,
-    AliasWrapper,
-    Operandable,
-};
-//# sourceMappingURL=wrappers.js.map
+  SupportedOperations,
+  ColumnWrapper,
+  FunctionCall,
+  NamedParameter,
+  UnnamedParameter,
+  Constant,
+  AliasWrapper,
+  Operandable,
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-awesome/orm",
-  "version": "1.5.2",
+  "version": "1.5.5",
   "description": "TypeScript friendly minimalistic ORM",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,7 +10,7 @@
   },
   "scripts": {
     "build:dev": "tsc --project tsconfig.json",
-    "build": "npm run build:dev && cp src/wrappers* dist/",
+    "build": "npm run build:dev ; cp src/wrappers* dist/",
     "lint": "eslint \"src/**/*.ts\"",
     "test": "jest"
   },

package/tests/builder.spec.js

@@ -526,6 +526,29 @@ describe('Select', () => {
                 }
             }]);
     });
+    it('CASE operator', () => {
+        const query = (0, dist_1.Select)(models_1.Person)
+            .columns(x => [(0, dist_1.alias)((0, dist_2.case_)({ when: x.age.gte(2), then: 'yes' }, { else: 'no' }), 'dynamic')]);
+        expect(query._columns).toStrictEqual([{
+                "_alias": "dynamic",
+                "_operands": [{
+                        "_operator": "CASE",
+                        "_operands": [
+                            {
+                                "when": {
+                                    "_operator": ">=",
+                                    "_operands": [
+                                        { "_column": { "name": "age", "table": "Person" } },
+                                        2
+                                    ]
+                                },
+                                "then": "yes",
+                            },
+                            { "else": "no" }
+                        ]
+                    }]
+            }]);
+    });
     it('intersect operator', () => {
         const query = (0, dist_1.Select)(models_1.Person)
             .columns(['name'])

package/tests/builder.spec.ts

@@ -1,7 +1,7 @@
 import {alias, and, asc, Delete, desc, Insert, max, Select, sum, TableMetadataSymbol, Update, Upsert, of} from '../dist';
 import { Employee, Person, Tag } from './models';
 import { TableRef, readModelMeta } from '../dist/builder';
-import {count, dbField, dbTable, exists} from "../dist";
+import {count, dbField, dbTable, exists, case_} from "../dist";
 
 
 const tableInfo = readModelMeta(Person);
@@ -567,6 +567,31 @@ describe('Select', () => {
     }])
   })
 
+  it('CASE operator', () => {
+    const query = Select(Person)
+      .columns(x => [alias(case_({when: x.age.gte(2), then: 'yes'}, {else: 'no'}), 'dynamic')])
+
+    expect(query._columns).toStrictEqual([{
+      "_alias": "dynamic",
+      "_operands": [{
+        "_operator": "CASE",
+        "_operands": [
+          {
+            "when": {
+              "_operator": ">=",
+              "_operands": [
+                { "_column": {"name": "age", "table": "Person"}},
+                2
+              ]
+            },
+            "then": "yes",
+          },
+          {"else": "no"}
+        ]
+      }]
+    }])
+  })
+
   it ('intersect operator', () => {
     const query = Select(Person)
       .columns(['name'])