@axiosleo/orm-mysql 0.9.9 → 0.9.11-alpha.1

package/.eslintrc

@@ -7,22 +7,10 @@
         "SwitchCase": 1
       }
     ],
-    "quotes": [
-      2,
-      "single"
-    ],
-    "linebreak-style": [
-      0,
-      "unix"
-    ],
-    "semi": [
-      2,
-      "always"
-    ],
-    "strict": [
-      2,
-      "global"
-    ],
+    "quotes": [2, "single"],
+    "linebreak-style": [0, "unix"],
+    "semi": [2, "always"],
+    "strict": [2, "global"],
     "curly": 2,
     "eqeqeq": 2,
     "no-eval": 2,
@@ -65,16 +53,9 @@
         "afterColon": true
       }
     ],
-    "eol-last": [
-      2,
-      "always"
-    ],
-    "no-inner-declarations": [
-      1
-    ],
-    "no-case-declarations": [
-      1
-    ],
+    "eol-last": [2, "always"],
+    "no-inner-declarations": [1],
+    "no-case-declarations": [1],
     "no-multiple-empty-lines": [
       2,
       {
@@ -82,10 +63,7 @@
         "maxBOF": 1
       }
     ],
-    "space-in-parens": [
-      2,
-      "never"
-    ],
+    "space-in-parens": [2, "never"],
     "no-multi-spaces": [
       2,
       {
@@ -107,9 +85,9 @@
     "afterEach": true
   },
   "parserOptions": {
-    "ecmaVersion": 2018,
+    "ecmaVersion": 2020,
     "sourceType": "script",
     "ecmaFeatures": {}
   },
   "extends": "eslint:recommended"
-}
+}

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.9.9',
+  version: '0.9.11-alpha.1',
   commands_dir: path.join(__dirname, '../commands'),
 });
 

package/index.d.ts

@@ -49,8 +49,8 @@ export interface JoinOption {
   on?: string;
 }
 
-export interface TableOption {
-  tableName: string;
+interface TableOption {
+  table: string;
   alias: string | null;
 }
 
@@ -78,12 +78,25 @@ export type QueryOperatorOptions = QueryOperatorBaseOptions & {
   transaction: boolean;
 }
 
+type GroupWhereOptionsArr = [string | null, OptType, ConditionValueType | WhereOptions[] | null]
+  | [string | null, ConditionValueType | WhereOptions[]];
+
+type GroupWhereOptions = {
+  key?: string | null;
+  opt?: OptType;
+  value?: ConditionValueType | WhereOptions[] | null;
+}
+
+type GroupWhereItem = GroupWhereOptions | string | GroupWhereOptionsArr;
+
 export declare class Query {
   options: QueryOperatorOptions;
 
   constructor(operator?: OperatorType, alias?: string | null);
 
-  table(tableName: string, alias: string | null): this;
+  table(table: string, alias: string | null): this;
+
+  tables(...tables: TableOption[]): this;
 
   limit(limit: number): this;
 
@@ -95,13 +108,13 @@ export declare class Query {
 
   whereConditions(...condition: WhereOptions[]): this;
 
-  groupWhere(...condition: WhereOptions[]): this;
+  groupWhere(...condition: GroupWhereItem[]): this;
 
   orWhere(key: string | null, opt: OptType, value: ConditionValueType | WhereOptions[]): this;
 
   andWhere(key: string | null, opt: OptType, value: ConditionValueType | WhereOptions[]): this;
 
-  attr(...attr: Attr[] | Attr[][]): this;
+  attr(...attr: Attr[]): this;
 
   orderBy(sortField: string, sortOrder: 'asc' | 'desc'): this;
 
@@ -134,14 +147,18 @@ export declare class QueryOperator extends Query {
 
   exec(): Promise<QueryResult>;
 
-  select<T>(): Promise<T[]>;
+  select<T>(...attrs: string[]): Promise<T[]>;
 
   find<T>(): Promise<T>;
 
   update(data?: any): Promise<MySQLQueryResult>;
 
+  update<T extends Object>(data?: T): Promise<MySQLQueryResult>;
+
   insert(data?: any): Promise<MySQLQueryResult>;
 
+  insert<T extends Object>(data?: T): Promise<MySQLQueryResult>;
+
   count(): Promise<number>;
 
   /**
@@ -150,6 +167,8 @@ export declare class QueryOperator extends Query {
    * @param index_field_name default is 'id'
    */
   delete(id?: number, index_field_name?: string): Promise<MySQLQueryResult>;
+
+  upsertRow<T extends Object>(data: T, ...conditions: WhereOptions[]): Promise<MySQLQueryResult>;
 }
 
 export declare class QueryHandler {
@@ -165,6 +184,12 @@ export declare class QueryHandler {
    */
   table(table: string, alias?: string | null): QueryOperator;
 
+  /**
+   * select tables
+   * @param tables 
+   */
+  tables(...tables: TableOption[]): QueryOperator;
+
   /**
    * execute sql
    * @param options 
@@ -240,7 +265,7 @@ export declare class Hook {
    */
   static pre: (
     callback: (options: QueryOperatorOptions) => void,
-    option: { table?: string, opt?: OperatorType }
+    option?: { table?: string, opt?: OperatorType }
   ) => string;
 
   /**
@@ -248,7 +273,7 @@ export declare class Hook {
    */
   static post: (
     callback: (options: QueryOperatorOptions, result: QueryResult | Error) => void,
-    option: { table?: string, opt?: OperatorType }
+    option?: { table?: string, opt?: OperatorType }
   ) => string;
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiosleo/orm-mysql",
-  "version": "0.9.9",
+  "version": "0.9.11-alpha.1",
   "description": "MySQL ORM tool",
   "keywords": [
     "mysql",

package/src/builder.js

@@ -186,7 +186,7 @@ class Builder {
       throw new Error('At least one table is required');
     }
     return tables.map((t) => {
-      let name = t.tableName.split('.').map((n) => {
+      let name = t.table.split('.').map((n) => {
         if (n[0] === '`' && n[n.length - 1] === '`') {
           return n;
         }

package/src/operator.js

@@ -62,7 +62,10 @@ class QueryOperator extends Query {
     return res;
   }
 
-  async select() {
+  async select(...attrs) {
+    if (attrs.length > 0) {
+      this.options.attrs = attrs;
+    }
     this.options.operator = 'select';
     return await this.exec();
   }
@@ -82,7 +85,7 @@ class QueryOperator extends Query {
 
   async insert(data) {
     this.options.operator = 'insert';
-    if (data) {
+    if (typeof data !== 'undefined') {
       this.set(data);
     }
     return await this.exec();
@@ -100,6 +103,15 @@ class QueryOperator extends Query {
     this.options.operator = 'delete';
     return await this.exec();
   }
+
+  async upsertRow(data, condition = []) {
+    const query = new QueryOperator(this.conn, this.options);
+    const count = await query.whereConditions(...condition).count();
+    if (count) {
+      return await query.whereConditions(...condition).update(data);
+    }
+    return await query.insert(data);
+  }
 }
 
 class QueryHandler {
@@ -124,6 +136,11 @@ class QueryHandler {
     return (new QueryOperator(this.conn, this.options)).table(table, alias);
   }
 
+  tables(...tables) {
+    const operator = new QueryOperator(this.conn, this.options);
+    return operator.tables(...tables);
+  }
+
   async upsert(tableName, data, condition = {}) {
     const count = await this.table(tableName).whereObject(condition).count();
     if (count) {

package/src/query.js

@@ -2,6 +2,7 @@
 
 const { _assign } = require('@axiosleo/cli-tool/src/helper/obj');
 const { _validate } = require('./utils');
+const is = require('@axiosleo/cli-tool/src/helper/is');
 
 function joinOn(table, on, options = {}) {
   let o = _assign({ alias: null, join_type: 'INNER', table, on }, options);
@@ -35,8 +36,13 @@ class Query {
     this.alias = alias || null;
   }
 
-  table(tableName, alias) {
-    this.options.tables.push({ tableName, alias });
+  table(table, alias) {
+    this.options.tables.push({ table, alias });
+    return this;
+  }
+
+  tables(...tables) {
+    this.options.tables = tables;
     return this;
   }
 
@@ -94,7 +100,27 @@ class Query {
     }
     const condition = { key: null, opt: 'group', value: [] };
     conditions.forEach((c) => {
-      condition.value.push(c);
+      if (is.string(c)) {
+        condition.value.push({ key: null, opt: c, value: null });
+      } else if (is.object(c)) {
+        condition.value.push({
+          key: null,
+          opt: '=',
+          value: null,
+          ...c
+        });
+      } else if (is.array(c)) {
+        const [k, o, v] = c;
+        if (c.length === 2) {
+          condition.value.push({ key: k, opt: '=', value: o });
+        } else if (c.length === 3) {
+          condition.value.push({ key: k, opt: o, value: v });
+        } else {
+          throw new Error('Invalid condition: ' + c);
+        }
+      } else {
+        condition.value.push(c);
+      }
     });
     this.options.conditions.push(condition);
     return this;
@@ -139,7 +165,7 @@ class Query {
   }
 
   groupBy(...groupField) {
-    this.options.groupField.push(...groupField);
+    this.options.groupField = groupField;
     return this;
   }