pg-mvc-service 2.0.101 → 2.0.103

package/dist/models/TableModel.js

@@ -241,13 +241,25 @@ class TableModel {
     join(joinType, joinModel, conditions) {
         this.joinConditions.push({ type: joinType, model: joinModel, conditions: conditions });
     }
-    where(left, operator, right) {
-        if (typeof left === 'string') {
-            if (operator === undefined || right === undefined) {
-                this.whereExpressions.push(left);
+    where(param1, param2, right) {
+        if (typeof param1 === 'string') {
+            if (param2 === undefined || right === undefined || Array.isArray(param2)) {
+                if (Array.isArray(param2)) {
+                    let expression = param1;
+                    const startIndex = this.vars.length + 1;
+                    expression = expression.replace(/\$(\d+)/g, (match, num) => {
+                        const originalNum = parseInt(num, 10);
+                        return `$${startIndex + originalNum - 1}`;
+                    });
+                    this.vars = [...this.vars, ...param2];
+                    this.whereExpressions.push(expression);
+                }
+                else {
+                    this.whereExpressions.push(param1);
+                }
             }
             else {
-                const query = WhereExpression_1.WhereExpression.create({ model: this, name: left }, operator, right, this.vars.length + 1);
+                const query = WhereExpression_1.WhereExpression.create({ model: this, name: param1 }, param2, right, this.vars.length + 1);
                 this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
@@ -255,12 +267,12 @@ class TableModel {
             }
             return;
         }
-        if ('model' in left && 'name' in left) {
-            if (operator === undefined || right === undefined) {
-                throw new Error(`If left is TColumnInfo, please set operator and right.`);
+        if ('model' in param1 && 'name' in param1) {
+            if (param2 === undefined || right === undefined || Array.isArray(param2)) {
+                throw new Error(`If left is TColumnInfo, please set operator and right. Do not pass an array to operator.`);
             }
             else {
-                const query = WhereExpression_1.WhereExpression.create(left, operator, right, this.vars.length + 1);
+                const query = WhereExpression_1.WhereExpression.create(param1, param2, right, this.vars.length + 1);
                 this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
@@ -268,8 +280,8 @@ class TableModel {
             }
             return;
         }
-        if (Array.isArray(left)) {
-            const query = WhereExpression_1.WhereExpression.createCondition(left, this, this.vars.length + 1);
+        if (Array.isArray(param1)) {
+            const query = WhereExpression_1.WhereExpression.createCondition(param1, this, this.vars.length + 1);
             this.whereExpressions.push(query.expression);
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "2.0.101",
+  "version": "2.0.103",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {

package/src/models/TableModel.ts

@@ -286,15 +286,27 @@ export class TableModel {
     }
 
     public where(expression: string): void;
+    public where(expression: string, vars: Array<any>): void;
     public where(conditions: Array<TNestedCondition>): void;
     public where(left: string, operator: TOperator, right: TColumnInfo | any): void;
     public where(left: TColumnInfo, operator: TOperator, right: TColumnInfo | any): void;
-    public where(left: string | TColumnInfo | Array<TNestedCondition>, operator?: TOperator, right?: TColumnInfo | any): void {
-        if (typeof left === 'string') {
-            if (operator === undefined || right === undefined) {
-                this.whereExpressions.push(left);
+    public where(param1: string | TColumnInfo | Array<TNestedCondition>, param2?: Array<any> | TOperator, right?: TColumnInfo | any): void {
+        if (typeof param1 === 'string') {
+            if (param2 === undefined || right === undefined || Array.isArray(param2)) {
+                if (Array.isArray(param2)) {
+                    let expression = param1;
+                    const startIndex = this.vars.length + 1;
+                    expression = expression.replace(/\$(\d+)/g, (match, num) => {
+                        const originalNum = parseInt(num, 10);
+                        return `$${startIndex + originalNum - 1}`;
+                    });
+                    this.vars = [...this.vars, ...param2];
+                    this.whereExpressions.push(expression);
+                } else {
+                    this.whereExpressions.push(param1);
+                }
             } else {
-                const query = WhereExpression.create({model: this, name: left}, operator, right, this.vars.length + 1);
+                const query = WhereExpression.create({model: this, name: param1}, param2, right, this.vars.length + 1);
                 this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
@@ -303,11 +315,11 @@ export class TableModel {
             return;
         }
 
-        if ('model' in left && 'name' in left) {
-            if (operator === undefined || right === undefined) {
-                throw new Error(`If left is TColumnInfo, please set operator and right.`);
+        if ('model' in param1 && 'name' in param1) {
+            if (param2 === undefined || right === undefined || Array.isArray(param2)) {
+                throw new Error(`If left is TColumnInfo, please set operator and right. Do not pass an array to operator.`);
             } else {
-                const query = WhereExpression.create(left, operator, right, this.vars.length + 1);
+                const query = WhereExpression.create(param1, param2, right, this.vars.length + 1);
                 this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
@@ -316,8 +328,8 @@ export class TableModel {
             return;
         }
 
-        if (Array.isArray(left)) {
-            const query = WhereExpression.createCondition(left, this, this.vars.length + 1);
+        if (Array.isArray(param1)) {
+            const query = WhereExpression.createCondition(param1, this, this.vars.length + 1);
             this.whereExpressions.push(query.expression);
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars];