@nocobase/plugin-multi-app-manager 0.7.7-alpha.1 → 0.8.0-alpha.5

package/lib/models/application.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ApplicationModel = void 0;
 
 function _database() {
-  const data = require("@nocobase/database");
+  const data = _interopRequireWildcard(require("@nocobase/database"));
 
   _database = function _database() {
     return data;
@@ -35,12 +35,12 @@ function path() {
   return data;
 }
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -53,14 +53,15 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 class ApplicationModel extends _database().Model {
   static getDatabaseConfig(app) {
-    return _lodash().default.cloneDeep(_lodash().default.isPlainObject(app.options.database) ? app.options.database : app.options.database.options);
+    const oldConfig = app.options.database instanceof _database().default ? app.options.database.options : app.options.database;
+    return _lodash().default.cloneDeep(_lodash().default.omit(oldConfig, ['migrator']));
   }
 
   static handleAppStart(app, options) {
     return _asyncToGenerator(function* () {
       yield app.load();
 
-      if (!_lodash().default.get(options, 'skipInstall', false)) {
+      if (!(options === null || options === void 0 ? void 0 : options.skipInstall)) {
         yield app.install();
       }
 
@@ -76,17 +77,16 @@ class ApplicationModel extends _database().Model {
 
       const appOptions = _this.get('options') || {};
       const AppModel = _this.constructor;
-      const app = mainApp.appManager.createApplication(appName, _objectSpread(_objectSpread({}, AppModel.initOptions(appName, mainApp)), appOptions)); // create database before installation if it not exists
-
-      app.on('beforeInstall', /*#__PURE__*/function () {
-        var _createDatabase = _asyncToGenerator(function* () {
-          const _AppModel$getDatabase = AppModel.getDatabaseConfig(app),
-                host = _AppModel$getDatabase.host,
-                port = _AppModel$getDatabase.port,
-                username = _AppModel$getDatabase.username,
-                password = _AppModel$getDatabase.password,
-                database = _AppModel$getDatabase.database,
-                dialect = _AppModel$getDatabase.dialect;
+
+      const createDatabase = /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator(function* () {
+          const database = appName;
+          const _mainApp$db$options = mainApp.db.options,
+                host = _mainApp$db$options.host,
+                port = _mainApp$db$options.port,
+                username = _mainApp$db$options.username,
+                password = _mainApp$db$options.password,
+                dialect = _mainApp$db$options.dialect;
 
           if (dialect === 'mysql') {
             const mysql = require('mysql2/promise');
@@ -122,12 +122,16 @@ class ApplicationModel extends _database().Model {
           }
         });
 
-        function createDatabase() {
-          return _createDatabase.apply(this, arguments);
-        }
+        return function createDatabase() {
+          return _ref.apply(this, arguments);
+        };
+      }();
+
+      if (!(options === null || options === void 0 ? void 0 : options.skipInstall)) {
+        yield createDatabase();
+      }
 
-        return createDatabase;
-      }());
+      const app = mainApp.appManager.createApplication(appName, _objectSpread(_objectSpread({}, AppModel.initOptions(appName, mainApp)), appOptions));
       yield AppModel.handleAppStart(app, options);
       yield AppModel.update({
         status: 'running'

package/lib/server.d.ts

@@ -1,6 +1,5 @@
 import { InstallOptions, Plugin } from '@nocobase/server';
 export declare class PluginMultiAppManager extends Plugin {
-    getName(): string;
     install(options?: InstallOptions): Promise<void>;
     load(): Promise<void>;
 }

package/lib/server.js

@@ -32,10 +32,6 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 class PluginMultiAppManager extends _server().Plugin {
-  getName() {
-    return this.getPackageName(__dirname);
-  }
-
   install(options) {
     var _this = this;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-multi-app-manager",
-  "version": "0.7.7-alpha.1",
+  "version": "0.8.0-alpha.5",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -10,7 +10,7 @@
     }
   ],
   "dependencies": {
-    "@nocobase/server": "0.7.7-alpha.1"
+    "@nocobase/server": "0.8.0-alpha.5"
   },
-  "gitHead": "f82374e6f9daaf71ba63eaf156468ea7ddc042da"
+  "gitHead": "335f62b0098089cc43a0488ea5c76136a655f97e"
 }