@nocobase/server 0.7.2-alpha.7 → 0.7.4-alpha.4

package/lib/application.d.ts

@@ -4,7 +4,7 @@ import { ACL } from '@nocobase/acl';
 import Database, { Collection, CollectionOptions, IDatabaseOptions } from '@nocobase/database';
 import Resourcer, { ResourceOptions } from '@nocobase/resourcer';
 import { AsyncEmitter } from '@nocobase/utils';
-import { Command, CommandOptions } from 'commander';
+import { Command, CommandOptions, ParseOptions } from 'commander';
 import { Server } from 'http';
 import { i18n, InitOptions } from 'i18next';
 import Koa from 'koa';
@@ -98,6 +98,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     load(): Promise<void>;
     getPlugin<P extends Plugin>(name: string): P;
     parse(argv?: string[]): Promise<Command>;
+    runAsCLI(argv?: readonly string[], options?: ParseOptions): Promise<Command>;
     start(options?: StartOptions): Promise<void>;
     listen(...args: any[]): Server;
     stop(options?: any): Promise<void>;

package/lib/application.js

@@ -297,27 +297,35 @@ class Application extends _koa().default {
     var _this5 = this;
 
     return _asyncToGenerator(function* () {
-      yield _this5.load();
-      return _this5.cli.parseAsync(argv);
+      return _this5.runAsCLI(argv);
     })();
   }
 
-  start(options = {}) {
+  runAsCLI(argv, options) {
     var _this6 = this;
 
+    return _asyncToGenerator(function* () {
+      yield _this6.load();
+      return _this6.cli.parseAsync(argv, options);
+    })();
+  }
+
+  start(options = {}) {
+    var _this7 = this;
+
     return _asyncToGenerator(function* () {
       var _options$listen;
 
       // reconnect database
-      if (_this6.db.closed()) {
-        yield _this6.db.reconnect();
+      if (_this7.db.closed()) {
+        yield _this7.db.reconnect();
       }
 
-      yield _this6.emitAsync('beforeStart', _this6, options);
+      yield _this7.emitAsync('beforeStart', _this7, options);
 
       if (options === null || options === void 0 ? void 0 : (_options$listen = options.listen) === null || _options$listen === void 0 ? void 0 : _options$listen.port) {
         const listen = () => new Promise((resolve, reject) => {
-          const Server = _this6.listen(options === null || options === void 0 ? void 0 : options.listen, () => {
+          const Server = _this7.listen(options === null || options === void 0 ? void 0 : options.listen, () => {
             resolve(Server);
           });
 
@@ -328,14 +336,14 @@ class Application extends _koa().default {
 
         try {
           //@ts-ignore
-          _this6.listenServer = yield listen();
+          _this7.listenServer = yield listen();
         } catch (e) {
           console.error(e);
           process.exit(1);
         }
       }
 
-      yield _this6.emitAsync('afterStart', _this6, options);
+      yield _this7.emitAsync('afterStart', _this7, options);
     })();
   }
 
@@ -344,28 +352,28 @@ class Application extends _koa().default {
   }
 
   stop(options = {}) {
-    var _this7 = this;
+    var _this8 = this;
 
     return _asyncToGenerator(function* () {
-      yield _this7.emitAsync('beforeStop', _this7, options);
+      yield _this8.emitAsync('beforeStop', _this8, options);
 
       try {
         // close database connection
         // silent if database already closed
-        yield _this7.db.close();
+        yield _this8.db.close();
       } catch (e) {
         console.log(e);
       } // close http server
 
 
-      if (_this7.listenServer) {
+      if (_this8.listenServer) {
         const closeServer = () => new Promise((resolve, reject) => {
-          _this7.listenServer.close(err => {
+          _this8.listenServer.close(err => {
             if (err) {
               return reject(err);
             }
 
-            _this7.listenServer = null;
+            _this8.listenServer = null;
             resolve(true);
           });
         });
@@ -373,64 +381,64 @@ class Application extends _koa().default {
         yield closeServer();
       }
 
-      yield _this7.emitAsync('afterStop', _this7, options);
+      yield _this8.emitAsync('afterStop', _this8, options);
     })();
   }
 
   destroy(options = {}) {
-    var _this8 = this;
+    var _this9 = this;
 
     return _asyncToGenerator(function* () {
-      yield _this8.emitAsync('beforeDestroy', _this8, options);
-      yield _this8.stop(options);
-      yield _this8.emitAsync('afterDestroy', _this8, options);
+      yield _this9.emitAsync('beforeDestroy', _this9, options);
+      yield _this9.stop(options);
+      yield _this9.emitAsync('afterDestroy', _this9, options);
     })();
   }
 
   install(options = {}) {
-    var _this9 = this;
+    var _this10 = this;
 
     return _asyncToGenerator(function* () {
-      yield _this9.emitAsync('beforeInstall', _this9, options);
-      const r = yield _this9.db.version.satisfies({
-        mysql: '8.x',
+      yield _this10.emitAsync('beforeInstall', _this10, options);
+      const r = yield _this10.db.version.satisfies({
+        mysql: '>=8.0.17',
         sqlite: '3.x',
         postgres: '>=10'
       });
 
       if (!r) {
-        console.log('The database only supports MySQL 8.x, SQLite 3.x and PostgreSQL 10+');
+        console.log('The database only supports MySQL 8.0.17 and above, SQLite 3.x and PostgreSQL 10+');
         return;
       }
 
       if (options === null || options === void 0 ? void 0 : options.clean) {
-        yield _this9.db.clean((0, _lodash().isBoolean)(options.clean) ? {
+        yield _this10.db.clean((0, _lodash().isBoolean)(options.clean) ? {
           drop: options.clean
         } : options.clean);
       }
 
-      yield _this9.db.sync(options === null || options === void 0 ? void 0 : options.sync);
-      yield _this9.pm.install(options);
-      yield _this9.version.update();
-      yield _this9.emitAsync('afterInstall', _this9, options);
+      yield _this10.db.sync(options === null || options === void 0 ? void 0 : options.sync);
+      yield _this10.pm.install(options);
+      yield _this10.version.update();
+      yield _this10.emitAsync('afterInstall', _this10, options);
     })();
   }
 
   upgrade(options = {}) {
-    var _this10 = this;
+    var _this11 = this;
 
     return _asyncToGenerator(function* () {
-      yield _this10.emitAsync('beforeUpgrade', _this10, options);
+      yield _this11.emitAsync('beforeUpgrade', _this11, options);
       const force = false;
-      yield _this10.db.migrator.up();
-      yield _this10.db.sync({
+      yield _this11.db.migrator.up();
+      yield _this11.db.sync({
         force,
         alter: {
           drop: force
         }
       });
-      yield _this10.version.update();
-      yield _this10.emitAsync('afterUpgrade', _this10, options);
+      yield _this11.version.update();
+      yield _this11.emitAsync('afterUpgrade', _this11, options);
     })();
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.7.2-alpha.7",
+  "version": "0.7.4-alpha.4",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -13,10 +13,10 @@
   "dependencies": {
     "@koa/cors": "^3.1.0",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.7.2-alpha.7",
-    "@nocobase/actions": "0.7.2-alpha.7",
-    "@nocobase/database": "0.7.2-alpha.7",
-    "@nocobase/resourcer": "0.7.2-alpha.7",
+    "@nocobase/acl": "0.7.4-alpha.4",
+    "@nocobase/actions": "0.7.4-alpha.4",
+    "@nocobase/database": "0.7.4-alpha.4",
+    "@nocobase/resourcer": "0.7.4-alpha.4",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "find-package-json": "^1.2.0",
@@ -30,5 +30,5 @@
   "devDependencies": {
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "c34194ae51395346b7cf1d1b6b5e127597d956ab"
+  "gitHead": "726c06b721b217a6aa5c1421b899d1315e552b57"
 }