@nocobase/server 0.9.0-alpha.2 → 0.9.1-alpha.1

package/lib/app-manager.d.ts

@@ -4,7 +4,7 @@ import http, { IncomingMessage, ServerResponse } from 'http';
 import Application, { ApplicationOptions } from './application';
 declare type AppSelector = (req: IncomingMessage) => Application | string | undefined | null;
 export declare class AppManager extends EventEmitter {
-    private app;
+    app: Application;
     applications: Map<string, Application>;
     constructor(app: Application);
     appSelector: AppSelector;
@@ -12,7 +12,7 @@ export declare class AppManager extends EventEmitter {
     removeApplication(name: string): Promise<void>;
     setAppSelector(selector: AppSelector): void;
     listen(...args: any[]): http.Server;
-    getApplication(appName: string): Promise<null | Application>;
+    getApplication(appName: string, options?: {}): Promise<null | Application>;
     callback(): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
     emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
 }

package/lib/app-manager.js

@@ -107,13 +107,14 @@ class AppManager extends _events().default {
     return server.listen(...args);
   }
 
-  getApplication(appName) {
+  getApplication(appName, options = {}) {
     var _this3 = this;
 
     return _asyncToGenerator(function* () {
       yield _this3.emitAsync('beforeGetApplication', {
         appManager: _this3,
-        name: appName
+        name: appName,
+        options
       });
       return _this3.applications.get(appName);
     })();
@@ -124,17 +125,18 @@ class AppManager extends _events().default {
 
     return /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(function* (req, res) {
-        let handleApp = _this4.appSelector(req) || _this4.app;
+        const appManager = _this4.app.appManager;
+        let handleApp = appManager.appSelector(req) || appManager.app;
 
         if (typeof handleApp === 'string') {
-          handleApp = yield _this4.getApplication(handleApp);
+          handleApp = yield appManager.getApplication(handleApp);
 
           if (!handleApp) {
             res.statusCode = 404;
             return res.end(JSON.stringify({
               redirectTo: process.env.APP_NOT_FOUND_REDIRECT_TO,
               errors: [{
-                message: 'Not Found'
+                message: 'Application Not Found'
               }]
             }));
           }

package/lib/application.d.ts

@@ -30,6 +30,7 @@ export interface ApplicationOptions {
     acl?: boolean;
     logger?: AppLoggerOptions;
     pmSock?: string;
+    name?: string;
 }
 export interface DefaultState extends KoaDefaultState {
     currentUser?: any;
@@ -100,6 +101,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get appManager(): AppManager;
     get logger(): Logger;
     get log(): Logger;
+    get name(): string;
     protected init(): void;
     private createDatabase;
     getVersion(): any;
@@ -127,5 +129,8 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     install(options?: InstallOptions): Promise<void>;
     upgrade(options?: any): Promise<void>;
     emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
+    toJSON(): {
+        appName: string;
+    };
 }
 export default Application;

package/lib/application.js

@@ -148,6 +148,8 @@ class ApplicationVersion {
     if (!app.db.hasCollection('applicationVersion')) {
       app.db.collection({
         name: 'applicationVersion',
+        namespace: 'core',
+        duplicator: 'required',
         timestamps: false,
         fields: [{
           name: 'value',
@@ -280,6 +282,10 @@ class Application extends _koa().default {
     return this._logger;
   }
 
+  get name() {
+    return this.options.name || 'main';
+  }
+
   init() {
     const options = this.options;
     const logger = (0, _logger().createAppLogger)(options.logger);
@@ -453,6 +459,7 @@ class Application extends _koa().default {
       yield _this7.dbVersionCheck({
         exit: true
       });
+      yield _this7.db.prepare();
 
       if ((argv === null || argv === void 0 ? void 0 : argv[2]) !== 'upgrade') {
         yield _this7.load({
@@ -576,8 +583,8 @@ class Application extends _koa().default {
           plain: true
         });
 
-        if ((result === null || result === void 0 ? void 0 : result.Value) === '1') {
-          console.log(_chalk().default.red(`mysql variable 'lower_case_table_names' must be set to '0' or '2'`));
+        if ((result === null || result === void 0 ? void 0 : result.Value) === '1' && !_this11.db.options.underscored) {
+          console.log(`Your database lower_case_table_names=1, please add ${_chalk().default.yellow('DB_UNDERSCORED=true')} to the .env file`);
 
           if (options === null || options === void 0 ? void 0 : options.exit) {
             process.exit();
@@ -643,6 +650,12 @@ class Application extends _koa().default {
     })();
   }
 
+  toJSON() {
+    return {
+      appName: this.name
+    };
+  }
+
 }
 
 exports.Application = Application;

package/lib/helper.js

@@ -81,7 +81,9 @@ function createI18n(options) {
 
   instance.init(_objectSpread({
     lng: 'en-US',
-    resources: {}
+    resources: {},
+    keySeparator: false,
+    nsSeparator: false
   }, options.i18n));
   return instance;
 }

package/lib/plugin-manager/PluginManagerRepository.js

@@ -93,7 +93,10 @@ class PluginManagerRepository extends _database().Repository {
     var _this4 = this;
 
     return _asyncToGenerator(function* () {
-      const items = yield _this4.find();
+      // sort plugins by id
+      const items = yield _this4.find({
+        sort: 'id'
+      });
 
       var _iterator = _createForOfIteratorHelper(items),
           _step;

package/lib/plugin-manager/options/collection.d.ts

@@ -1,5 +1,7 @@
 declare const _default: {
     name: string;
+    namespace: string;
+    duplicator: string;
     repository: string;
     fields: ({
         type: string;

package/lib/plugin-manager/options/collection.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = {
   name: 'applicationPlugins',
+  namespace: 'core',
+  duplicator: 'required',
   repository: 'PluginManagerRepository',
   fields: [{
     type: 'string',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.9.0-alpha.2",
+  "version": "0.9.1-alpha.1",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -8,11 +8,11 @@
     "@hapi/topo": "^6.0.0",
     "@koa/cors": "^3.1.0",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.9.0-alpha.2",
-    "@nocobase/actions": "0.9.0-alpha.2",
-    "@nocobase/database": "0.9.0-alpha.2",
-    "@nocobase/logger": "0.9.0-alpha.2",
-    "@nocobase/resourcer": "0.9.0-alpha.2",
+    "@nocobase/acl": "0.9.1-alpha.1",
+    "@nocobase/actions": "0.9.1-alpha.1",
+    "@nocobase/database": "0.9.1-alpha.1",
+    "@nocobase/logger": "0.9.1-alpha.1",
+    "@nocobase/resourcer": "0.9.1-alpha.1",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "find-package-json": "^1.2.0",
@@ -27,5 +27,5 @@
   "devDependencies": {
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "b8f76ad38e60e677c5bb4aab0a4cdb28d98a0f49"
+  "gitHead": "56cb184b00dc383b853015d525bf6e79dea92169"
 }