@axiosleo/orm-mysql 0.11.0 → 0.11.2

package/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "cSpell.words": [
+    "fulltext"
+  ]
+}

package/bin/orm-mysql.js

@@ -9,7 +9,7 @@ const app = new App({
   name: 'MySQL ORM CLI',
   desc: 'migrate, model, seed, etc.',
   bin: 'orm-mysql',
-  version: '0.11.0',
+  version: '0.11.2',
   commands_dir: path.join(__dirname, '../commands'),
 });
 

package/index.d.ts

@@ -223,42 +223,42 @@ export declare class QueryOperator extends Query {
   /**
    * @deprecated will deprecated on v1.0+ version
    */
-  buildSql(operator: OperatorType): { sql: string, values: any[] };
+  buildSql(operator: OperatorType): Builder;
 
   exec(): Promise<QueryResult>;
 
   explain(operator: OperatorType): Promise<ExplainResult[]>;
 
-  select<T>(...attrs: string[]): Promise<T[]>;
+  select<T>(...attrs: string[]): Promise<T[] | Builder>;
 
-  find<T>(): Promise<T>;
+  find<T>(): Promise<T | Builder>;
 
-  count(): Promise<number>;
+  count(): Promise<number | Builder>;
 
   /**
    * increment a column value
    * @param attr 
    * @param increment default is 1
    */
-  incrBy(attr: string, increment?: string | number | ((number: number) => number)): Promise<MySQLQueryResult>;
+  incrBy(attr: string, increment?: string | number | ((number: number) => number)): Promise<MySQLQueryResult | Builder>;
 
-  delete(id?: number, index_field_name?: string): Promise<MySQLQueryResult>;
+  delete(id?: number, index_field_name?: string): Promise<MySQLQueryResult | Builder>;
 
-  update(row?: any): Promise<MySQLQueryResult>;
+  update(row?: any): Promise<MySQLQueryResult | Builder>;
 
-  update<T extends Object>(row?: T): Promise<MySQLQueryResult>;
+  update<T extends Object>(row?: T): Promise<MySQLQueryResult | Builder>;
 
-  insert(row?: any): Promise<MySQLQueryResult>;
+  insert(row?: any): Promise<MySQLQueryResult | Builder>;
 
-  insert<T extends Object>(row?: T): Promise<MySQLQueryResult>;
+  insert<T extends Object>(row?: T): Promise<MySQLQueryResult | Builder>;
 
-  insertAll(rows: any[]): Promise<MySQLQueryResult[]>;
+  insertAll(rows: any[]): Promise<MySQLQueryResult[] | Builder>;
 
-  insertAll<T extends Object>(rows: T[]): Promise<MySQLQueryResult[]>;
+  insertAll<T extends Object>(rows: T[]): Promise<MySQLQueryResult[] | Builder>;
 
-  upsertRow(row: any, condition: QueryCondition): Promise<MySQLQueryResult>;
+  upsertRow(row: any, condition: QueryCondition): Promise<MySQLQueryResult | Builder>;
 
-  upsertRow<T extends Object>(row: T, ...conditions: WhereItem[]): Promise<MySQLQueryResult>;
+  upsertRow<T extends Object>(row: T, ...conditions: WhereItem[]): Promise<MySQLQueryResult | Builder>;
 
   notExec(): this;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiosleo/orm-mysql",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "MySQL ORM tool",
   "keywords": [
     "mysql",
@@ -35,7 +35,7 @@
     "url": "https://github.com/AxiosLeo/node-orm-mysql"
   },
   "devDependencies": {
-    "@types/node": "^20.11.16",
+    "@types/node": "^20.11.26",
     "chai": "^5.0.3",
     "eslint": "^8.56.0",
     "expect.js": "^0.3.1",

package/src/builder.js

@@ -298,6 +298,24 @@ class Builder {
     return null;
   }
 
+  _buildConditionBetween(condition, isNot = false) {
+    if (!Array.isArray(condition.value) || condition.value.length !== 2) {
+      throw new Error('Value must be an array with two elements for "BETWEEN" condition');
+    }
+    this.values.push(condition.value[0] || null);
+    this.values.push(condition.value[1] || null);
+    if (condition.key.indexOf('->') !== -1) {
+      let keys = condition.key.split('->');
+      let k = `${this._buildFieldKey(keys[0])}`;
+      let sql = `JSON_EXTRACT(${k}, '${keys[1]}') `;
+      sql += isNot ? 'NOT BETWEEN' : 'BETWEEN';
+      sql += ' ? AND ?';
+      return sql;
+    }
+    const opt = isNot ? 'NOT BETWEEN' : 'BETWEEN';
+    return `${this._buildFieldKey(condition.key)} ${opt} ? AND ?`;
+  }
+
   _buildConditionIn(condition, isNot = false) {
     if (Array.isArray(condition.value) && !condition.value.length) {
       throw new Error('Value must not be empty for "IN" condition');
@@ -369,6 +387,10 @@ class Builder {
           return this._buildConditionIn(c);
         } else if (opt === 'not in') {
           return this._buildConditionIn(c, true);
+        } else if (opt === 'between') {
+          return this._buildConditionBetween(c);
+        } else if (opt === 'not between') {
+          return this._buildConditionBetween(c, true);
         } else if (opt === 'contain') {
           return this._buildConditionContain(c);
         } else if (opt === 'not contain') {

package/src/operator.js

@@ -41,6 +41,7 @@ class QueryOperator extends Query {
   async explain(operator) {
     this.options.operator = operator;
     this.options.explain = true;
+    this.options.notExec = false;
     return await this.exec();
   }