@nocobase/server 0.7.0-alpha.7 → 0.7.0-alpha.72

package/lib/commands/index.js

@@ -1,30 +1,30 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCli = void 0;
-const commander_1 = require("commander");
-function createCli(app) {
-    const program = new commander_1.Command();
-    const runSubCommand = (name) => (...cliArgs) => {
-        const command = require(`./${name}`).default;
-        Promise.resolve()
-            .then(() => {
-            return command({ app, cliArgs });
-        })
-            .catch((error) => {
-            console.error(error);
-            process.exit(1);
-        });
-    };
-    program.command('start').description('start NocoBase application').action(runSubCommand('start'));
-    program.command('install').option('-f, --force').option('-c, --clean').action(runSubCommand('install'));
-    program.command('db:sync').option('-f, --force').action(runSubCommand('db-sync'));
-    program.command('console').action(runSubCommand('console'));
-    program
-        .command('create-plugin')
-        .argument('<name>', 'name of plugin')
-        .description('create NocoBase plugin')
-        .action(runSubCommand('create-plugin'));
-    return program;
-}
-exports.createCli = createCli;
-//# sourceMappingURL=index.js.map
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.registerCli = registerCli;
+
+function registerCli(app) {
+  require('./console').default(app);
+
+  require('./db-auth').default(app);
+
+  require('./db-clean').default(app);
+
+  require('./db-sync').default(app);
+
+  require('./install').default(app);
+
+  require('./start').default(app);
+
+  require('./upgrade').default(app); // development only with @nocobase/cli
+
+
+  app.command('build').argument('[packages...]');
+  app.command('clean');
+  app.command('dev').usage('[options]').option('-p, --port [port]').option('--client').option('--server');
+  app.command('doc').argument('[cmd]', '', 'dev');
+  app.command('test').option('-c, --db-clean');
+  app.command('umi');
+}

package/lib/commands/install.d.ts

@@ -1,5 +1,3 @@
-declare const _default: ({ app, cliArgs }: {
-    app: any;
-    cliArgs: any;
-}) => Promise<void>;
+import Application from '../application';
+declare const _default: (app: Application) => void;
 export default _default;

package/lib/commands/install.js

@@ -1,25 +1,73 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = ({ app, cliArgs }) => __awaiter(void 0, void 0, void 0, function* () {
-    const [opts] = cliArgs;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function _chalk() {
+  const data = _interopRequireDefault(require("chalk"));
+
+  _chalk = function _chalk() {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+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); }); }; }
+
+var _default = app => {
+  app.command('install').option('-f, --force').option('-c, --clean').option('-s, --silent').option('-r, --repeat [repeat]').action( /*#__PURE__*/_asyncToGenerator(function* (...cliArgs) {
+    let installed = false;
+    const opts = cliArgs[0];
+
+    try {
+      yield app.db.auth({
+        repeat: opts.repeat || 1
+      });
+    } catch (error) {
+      console.log(_chalk().default.red('Unable to connect to the database. Please check the database environment variables in the .env file.'));
+      return;
+    }
+
+    if (!(opts === null || opts === void 0 ? void 0 : opts.clean) && !(opts === null || opts === void 0 ? void 0 : opts.force)) {
+      const tables = yield app.db.sequelize.getQueryInterface().showAllTables();
+
+      if (tables.includes('collections')) {
+        installed = true;
+
+        if (!opts.silent) {
+          console.log('NocoBase is already installed. To reinstall, please execute:');
+          console.log();
+          let command = '$ yarn nocobase install -f';
+          console.log(_chalk().default.yellow(command));
+          console.log();
+        }
+
+        return;
+      }
+    }
+
+    if (!opts.silent || !installed) {
+      console.log(`Start installing NocoBase`);
+    }
+
     yield app.install({
-        cliArgs,
-        clean: opts.clean,
-        sync: {
-            force: opts.force,
-        },
+      cliArgs,
+      clean: opts.clean,
+      sync: {
+        force: opts.force
+      }
     });
     yield app.stop({
-        cliArgs,
+      cliArgs
     });
-});
-//# sourceMappingURL=install.js.map
+  }));
+};
+
+exports.default = _default;

package/lib/commands/start.d.ts

@@ -1,5 +1,3 @@
-declare const _default: ({ app, cliArgs }: {
-    app: any;
-    cliArgs: any;
-}) => Promise<void>;
+import Application from '../application';
+declare const _default: (app: Application) => void;
 export default _default;

package/lib/commands/start.js

@@ -1,25 +1,31 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = ({ app, cliArgs }) => __awaiter(void 0, void 0, void 0, function* () {
-    const [opts] = cliArgs;
-    const port = opts.port || process.env.SERVER_PORT || 3000;
-    const host = opts.host || process.env.SERVER_HOST || '0.0.0.0';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+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); }); }; }
+
+var _default = app => {
+  app.command('start').option('-s, --silent').option('-p, --port [post]').option('-h, --host [host]').action( /*#__PURE__*/_asyncToGenerator(function* (...cliArgs) {
+    const opts = cliArgs[0];
+    const port = opts.port || process.env.APP_PORT || 13000;
+    const host = opts.host || process.env.APP_HOST || '0.0.0.0';
     yield app.start({
-        cliArgs,
-        listen: {
-            port,
-            host,
-        },
+      cliArgs,
+      listen: {
+        port,
+        host
+      }
     });
-    console.log(`🚀 nocobase server had started at http://${host}:${port}`);
-});
-//# sourceMappingURL=start.js.map
+
+    if (!opts.silent) {
+      console.log(`🚀 NocoBase server running at: http://${host === '0.0.0.0' ? 'localhost' : host}:${port}/`);
+    }
+  }));
+};
+
+exports.default = _default;

package/lib/commands/upgrade.d.ts

@@ -0,0 +1,6 @@
+import Application from '../application';
+declare const _default: (app: Application) => void;
+/**
+ * TODO
+ */
+export default _default;

package/lib/commands/upgrade.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function _chalk() {
+  const data = _interopRequireDefault(require("chalk"));
+
+  _chalk = function _chalk() {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+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); }); }; }
+
+/**
+ * TODO
+ */
+var _default = app => {
+  app.command('upgrade').action( /*#__PURE__*/_asyncToGenerator(function* (...cliArgs) {
+    const opts = cliArgs[0];
+    console.log('upgrading...');
+    const force = false;
+    yield app.db.sync({
+      force,
+      alter: {
+        drop: force
+      }
+    });
+    yield app.stop({
+      cliArgs
+    });
+    console.log(_chalk().default.green(`✨  NocoBase has been upgraded to v${app.getVersion()}`));
+  }));
+};
+
+exports.default = _default;

package/lib/helper.js

@@ -1,69 +1,140 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerMiddlewares = exports.createResourcer = exports.createDatabase = exports.createI18n = void 0;
-const cors_1 = __importDefault(require("@koa/cors"));
-const database_1 = __importDefault(require("@nocobase/database"));
-const resourcer_1 = __importDefault(require("@nocobase/resourcer"));
-const i18next_1 = __importDefault(require("i18next"));
-const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
-const data_wrapping_1 = require("./middlewares/data-wrapping");
-const table2resource_1 = require("./middlewares/table2resource");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createDatabase = createDatabase;
+exports.createI18n = createI18n;
+exports.createResourcer = createResourcer;
+exports.registerMiddlewares = registerMiddlewares;
+
+function _cors() {
+  const data = _interopRequireDefault(require("@koa/cors"));
+
+  _cors = function _cors() {
+    return data;
+  };
+
+  return data;
+}
+
+function _database() {
+  const data = _interopRequireDefault(require("@nocobase/database"));
+
+  _database = function _database() {
+    return data;
+  };
+
+  return data;
+}
+
+function _resourcer() {
+  const data = _interopRequireDefault(require("@nocobase/resourcer"));
+
+  _resourcer = function _resourcer() {
+    return data;
+  };
+
+  return data;
+}
+
+function _i18next() {
+  const data = _interopRequireDefault(require("i18next"));
+
+  _i18next = function _i18next() {
+    return data;
+  };
+
+  return data;
+}
+
+function _koaBodyparser() {
+  const data = _interopRequireDefault(require("koa-bodyparser"));
+
+  _koaBodyparser = function _koaBodyparser() {
+    return data;
+  };
+
+  return data;
+}
+
+var _dataWrapping = require("./middlewares/data-wrapping");
+
+var _table2resource = require("./middlewares/table2resource");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+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); }); }; }
+
+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; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function createI18n(options) {
-    const instance = i18next_1.default.createInstance();
-    instance.init(Object.assign({ lng: 'en-US', resources: {} }, options.i18n));
-    return instance;
+  const instance = _i18next().default.createInstance();
+
+  instance.init(_objectSpread({
+    lng: 'en-US',
+    resources: {}
+  }, options.i18n));
+  return instance;
 }
-exports.createI18n = createI18n;
+
 function createDatabase(options) {
-    if (options.database instanceof database_1.default) {
-        return options.database;
-    }
-    else {
-        return new database_1.default(options.database);
-    }
+  if (options.database instanceof _database().default) {
+    return options.database;
+  } else {
+    return new (_database().default)(options.database);
+  }
 }
-exports.createDatabase = createDatabase;
+
 function createResourcer(options) {
-    return new resourcer_1.default(Object.assign({}, options.resourcer));
+  return new (_resourcer().default)(_objectSpread({}, options.resourcer));
 }
-exports.createResourcer = createResourcer;
+
 function registerMiddlewares(app, options) {
-    if (options.bodyParser !== false) {
-        app.use((0, koa_bodyparser_1.default)(Object.assign({}, options.bodyParser)));
-    }
-    app.use((0, cors_1.default)(Object.assign({ exposeHeaders: ['content-disposition'] }, options.cors)));
-    app.use((ctx, next) => __awaiter(this, void 0, void 0, function* () {
-        ctx.getBearerToken = () => {
-            return ctx.get('Authorization').replace(/^Bearer\s+/gi, '');
-        };
-        ctx.db = app.db;
-        ctx.resourcer = app.resourcer;
-        const i18n = app.i18n.cloneInstance({ initImmediate: false });
-        ctx.i18n = i18n;
-        ctx.t = i18n.t.bind(i18n);
-        const lng = ctx.request.query.locale || ctx.acceptsLanguages().shift();
-        if (lng !== '*' && lng) {
-            i18n.changeLanguage(lng);
-        }
-        yield next();
-    }));
-    if (options.dataWrapping !== false) {
-        app.use((0, data_wrapping_1.dataWrapping)());
-    }
-    app.use((0, table2resource_1.table2resource)());
-    app.use(app.resourcer.restApiMiddleware());
-}
-exports.registerMiddlewares = registerMiddlewares;
-//# sourceMappingURL=helper.js.map
+  if (options.bodyParser !== false) {
+    app.use((0, _koaBodyparser().default)(_objectSpread({}, options.bodyParser)));
+  }
+
+  app.use((0, _cors().default)(_objectSpread({
+    exposeHeaders: ['content-disposition']
+  }, options.cors)));
+  app.use( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (ctx, next) {
+      ctx.getBearerToken = () => {
+        return ctx.get('Authorization').replace(/^Bearer\s+/gi, '');
+      };
+
+      ctx.db = app.db;
+      ctx.resourcer = app.resourcer;
+      const i18n = app.i18n.cloneInstance({
+        initImmediate: false
+      });
+      ctx.i18n = i18n;
+      ctx.t = i18n.t.bind(i18n);
+      const lng = ctx.get('X-Locale') || ctx.request.query.locale || ctx.acceptsLanguages().shift() || 'en-US';
+
+      if (lng !== '*' && lng) {
+        i18n.changeLanguage(lng);
+      }
+
+      yield next();
+    });
+
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+
+  if (options.dataWrapping !== false) {
+    app.use((0, _dataWrapping.dataWrapping)());
+  }
+
+  app.use((0, _table2resource.table2resource)());
+  app.use(app.resourcer.restApiMiddleware());
+}

package/lib/index.js

@@ -1,35 +1,88 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+var _exportNames = {
+  AppManager: true,
+  middlewares: true
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.middlewares = exports.default = exports.AppManager = void 0;
-var app_manager_1 = require("./app-manager");
-Object.defineProperty(exports, "AppManager", { enumerable: true, get: function () { return app_manager_1.AppManager; } });
-__exportStar(require("./application"), exports);
-var application_1 = require("./application");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return application_1.Application; } });
-exports.middlewares = __importStar(require("./middlewares"));
-__exportStar(require("./plugin"), exports);
-__exportStar(require("./plugin-manager"), exports);
-__exportStar(require("./read-config"), exports);
-//# sourceMappingURL=index.js.map
+Object.defineProperty(exports, "AppManager", {
+  enumerable: true,
+  get: function get() {
+    return _appManager.AppManager;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return _application.Application;
+  }
+});
+exports.middlewares = void 0;
+
+var _appManager = require("./app-manager");
+
+var _application = require("./application");
+
+Object.keys(_application).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _application[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _application[key];
+    }
+  });
+});
+
+var _middlewares = _interopRequireWildcard(require("./middlewares"));
+
+exports.middlewares = _middlewares;
+
+var _plugin = require("./plugin");
+
+Object.keys(_plugin).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _plugin[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _plugin[key];
+    }
+  });
+});
+
+var _pluginManager = require("./plugin-manager");
+
+Object.keys(_pluginManager).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _pluginManager[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _pluginManager[key];
+    }
+  });
+});
+
+var _readConfig = require("./read-config");
+
+Object.keys(_readConfig).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _readConfig[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _readConfig[key];
+    }
+  });
+});
+
+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; }