@axiosleo/orm-mysql 0.11.2 → 0.11.5

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

package/commands/generate.js

@@ -9,7 +9,7 @@ class GenerateCommand extends Command {
   constructor() {
     super({
       name: 'generate',
-      desc: '',
+      desc: 'Generate migration script file',
       alias: ['gen']
     });
     this.addArgument('name', 'Migration name', 'required', '');

package/index.d.ts

@@ -229,35 +229,48 @@ export declare class QueryOperator extends Query {
 
   explain(operator: OperatorType): Promise<ExplainResult[]>;
 
-  select<T>(...attrs: string[]): Promise<T[] | Builder>;
+  select<T extends Object>(...attrs: string[]): Promise<T[]>;
+  select<T extends Object>(...attrs: string[]): Promise<Builder>;
 
-  find<T>(): Promise<T | Builder>;
+  find<T extends Object>(): Promise<T>;
+  find<T extends Object>(): Promise<Builder>;
 
-  count(): Promise<number | Builder>;
+  count(): Promise<number>;
+  count(): Promise<Builder>;
 
   /**
    * increment a column value
    * @param attr 
    * @param increment default is 1
    */
-  incrBy(attr: string, increment?: string | number | ((number: number) => number)): Promise<MySQLQueryResult | Builder>;
+  incrBy(attr: string, increment?: string | number | ((number: number) => number)): Promise<MySQLQueryResult>;
+  incrBy(attr: string, increment?: string | number | ((number: number) => number)): Promise<Builder>;
 
-  delete(id?: number, index_field_name?: string): Promise<MySQLQueryResult | Builder>;
+  delete(id?: number, index_field_name?: string): Promise<MySQLQueryResult>;
+  delete(id?: number, index_field_name?: string): Promise<Builder>;
 
-  update(row?: any): Promise<MySQLQueryResult | Builder>;
+  update(row?: any): Promise<MySQLQueryResult>;
+  update(row?: any): Promise<Builder>;
 
-  update<T extends Object>(row?: T): Promise<MySQLQueryResult | Builder>;
+  update<T extends Object>(row?: T): Promise<MySQLQueryResult>;
+  update<T extends Object>(row?: T): Promise<Builder>;
 
-  insert(row?: any): Promise<MySQLQueryResult | Builder>;
+  insert(row?: any): Promise<MySQLQueryResult>;
+  insert(row?: any): Promise<Builder>;
 
-  insert<T extends Object>(row?: T): Promise<MySQLQueryResult | Builder>;
+  insert<T extends Object>(row?: T): Promise<MySQLQueryResult>;
+  insert<T extends Object>(row?: T): Promise<Builder>;
 
-  insertAll(rows: any[]): Promise<MySQLQueryResult[] | Builder>;
+  insertAll(rows: any[]): Promise<MySQLQueryResult[]>;
+  insertAll(rows: any[]): Promise<Builder>;
 
-  insertAll<T extends Object>(rows: T[]): Promise<MySQLQueryResult[] | Builder>;
+  insertAll<T extends Object>(rows: T[]): Promise<MySQLQueryResult[]>;
+  insertAll<T extends Object>(rows: T[]): Promise<Builder>;
 
-  upsertRow(row: any, condition: QueryCondition): Promise<MySQLQueryResult | Builder>;
+  upsertRow(row: any, condition: QueryCondition): Promise<MySQLQueryResult>;
+  upsertRow(row: any, condition: QueryCondition): Promise<Builder>;
 
+  upsertRow<T extends Object>(row: T, ...conditions: WhereItem[]): Promise<MySQLQueryResult>;
   upsertRow<T extends Object>(row: T, ...conditions: WhereItem[]): Promise<MySQLQueryResult | Builder>;
 
   notExec(): this;
@@ -437,7 +450,7 @@ interface ColumnItem {
   unsigned?: boolean,
   allowNull?: boolean,
   default?: string | number | boolean | null | 'timestamp',
-  onUpdate?: boolean,
+  onUpdate?: string,
   comment?: string,
   autoIncrement?: boolean,
   primaryKey?: boolean,
@@ -490,7 +503,7 @@ export declare class MigrationInterface {
     unsigned?: boolean,
     allowNull?: boolean,
     default?: string | number | boolean | null | 'timestamp',
-    onUpdate?: boolean,
+    onUpdate?: string,
     comment?: string,
     autoIncrement?: boolean,
     primaryKey?: boolean,

package/package.json

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

package/src/builder.js

@@ -680,7 +680,7 @@ class ManageSQLBuilder extends Builder {
     } else if (type === 'TINYINT') {
       str += '(4)';
     }
-    if (options.allowNull === false) {
+    if (options.allowNull === false || options.primaryKey === true) {
       str += ' NOT NULL';
     }
     if (options.unsigned === true) {
@@ -705,12 +705,12 @@ class ManageSQLBuilder extends Builder {
     if (options.onUpdate) {
       str += ` ON UPDATE ${options.onUpdate}`;
     }
-    if (is.string(options.comment) && is.empty(options.comment) === false) {
-      str += ` COMMENT '${options.comment}'`;
-    }
     if (options.autoIncrement === true) {
       str += ' AUTO_INCREMENT';
     }
+    if (is.string(options.comment) && is.empty(options.comment) === false) {
+      str += ` COMMENT '${options.comment}'`;
+    }
     if (options.after) {
       str += ' AFTER `' + options.after + '`';
     }

package/src/migration.js

@@ -52,7 +52,7 @@ async function init(context) {
     files = files.reverse();
   }
   context.files = files.filter(f => f !== '.connect.js');
-
+  context.config.dir = path.resolve(context.config.dir);
   const connectPath = path.join(context.config.dir, '.connect.js');
   if (await _exists(connectPath)) {
     const connect = require(connectPath);