@axiosleo/orm-mysql 0.9.10 → 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.10',
+  version: '0.9.11-alpha.1',
   commands_dir: path.join(__dirname, '../commands'),
 });
 

package/index.d.ts

@@ -114,7 +114,7 @@ export declare class Query {
 
   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;
 
@@ -147,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>;
 
   /**
@@ -163,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 {

package/package.json

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

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 {

package/src/query.js

@@ -165,7 +165,7 @@ class Query {
   }
 
   groupBy(...groupField) {
-    this.options.groupField.push(...groupField);
+    this.options.groupField = groupField;
     return this;
   }