steedos-cli 2.6.1-beta.6 → 2.6.2-beta.2

package/default.steedos.config.js

@@ -20,7 +20,7 @@ process.env.STEEDOS_UNPKG_URL =  process.env.STEEDOS_UNPKG_URL.replace(/\/+$/, "
 
 
 if(_.isEmpty(process.env.STEEDOS_AMIS_VERSION)) {
-	process.env.STEEDOS_AMIS_VERSION = '2.9.0';
+	process.env.STEEDOS_AMIS_VERSION = '3.2.0';
 }
 
 if(_.isEmpty(process.env.STEEDOS_AMIS_URL)) {
@@ -29,10 +29,20 @@ if(_.isEmpty(process.env.STEEDOS_AMIS_URL)) {
 process.env.STEEDOS_AMIS_URL =  process.env.STEEDOS_AMIS_URL.replace(/\/+$/, "");
 
 if(_.isEmpty(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)) {
-	process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = "https://unpkg.steedos.cn/@steedos-widgets/amis-object@1.2.26/dist/assets.json";
+	process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = process.env.STEEDOS_UNPKG_URL + "/@steedos-widgets/amis-object@1.3.19/dist/assets.json";
 }
 
-process.env.ROOT_URL =  process.env.ROOT_URL.replace(/\/+$/, "");
+if(_.isEmpty(process.env.SERIALIZER)){
+	process.env.SERIALIZER = 'JSON'
+}
+
+if (_.isEmpty(process.env.ROOT_URL)) {
+	console.error("ERROR: Environment variable ROOT_URL is not defined.")
+	process.env.ROOT_URL = "http://localhost"
+}
+
+process.env.ROOT_URL = process.env.ROOT_URL.replace(/\/+$/, "");
+
 /**
  * Steedos ServiceBroker configuration file
  *
@@ -107,7 +117,7 @@ module.exports = {
 
 	// Default log level for built-in console logger. It can be overwritten in logger options above.
 	// Available values: trace, debug, info, warn, error, fatal
-	logLevel: "warn",
+	logLevel: process.env.STEEDOS_LOG_LEVEL || "warn",
 
 	// Define transporter.
 	// More info: https://moleculer.services/docs/0.14/networking.html
@@ -134,7 +144,7 @@ module.exports = {
 	// Define a serializer.
 	// Available values: "JSON", "Avro", "ProtoBuf", "MsgPack", "Notepack", "Thrift".
 	// More info: https://moleculer.services/docs/0.14/networking.html#Serialization
-	serializer: "JSON",
+	serializer: process.env.SERIALIZER || "JSON",
 
 	// Number of milliseconds to wait before reject a request with a RequestTimeout error. Disabled: 0
 	requestTimeout: 0,
@@ -282,29 +292,24 @@ module.exports = {
 	// Called after broker created.
 	created(broker) {
 		// Clear all cache entries
-		if(broker.nodeID === 'steedos-primary'){
-			broker.logger.warn('Clear all cache entries on startup.')
-			broker.cacher.clean();
-		}
+		broker.logger.warn('Clear all cache entries on startup.')
+		broker.cacher.clean();
 
 		const objectql = require(require.resolve('@steedos/objectql', {paths: [process.cwd()]}));
 		objectql.broker.init(broker);
-		global.broker = broker;
-
-		if(broker.nodeID === 'steedos-primary'){
-			//TODO 此处不考虑多个node服务模式.
-			process.on('SIGTERM', close.bind(broker, 'SIGTERM'));
-			process.on('SIGINT', close.bind(broker, 'SIGINT'));
-			async function close(signal) {
-				try {
-					await this.cacher.clean(); //TODO 此clean 有问题，如果在启动过程中就停止服务，则会清理不干净。尝试试用redis client 原生clean（flushdb）。
-					await this.cacher.close();
-				} catch (error) {
-					// console.log(`error`, error)
-				}
-				console.log(`[${signal}]服务已停止: namespace: ${this.namespace}, nodeID: ${this.nodeID}`);
-				process.exit(0);
+
+		//TODO 此处不考虑多个node服务模式.
+		process.on('SIGTERM', close.bind(broker, 'SIGTERM'));
+		process.on('SIGINT', close.bind(broker, 'SIGINT'));
+		async function close(signal) {
+			try {
+				await this.cacher.clean(); //TODO 此clean 有问题，如果在启动过程中就停止服务，则会清理不干净。尝试试用reids client 原生clean（flushdb）。
+				await this.cacher.close();
+			} catch (error) {
+				// console.log(`error`, error)
 			}
+			console.log(`[${signal}]服务已停止: namespace: ${this.namespace}, nodeID: ${this.nodeID}`);
+			process.exit(0);
 		}
 	},
 

package/default.steedos.settings.yml

@@ -5,6 +5,10 @@ datasources:
     objectFiles:
       - "./steedos-app/**"
 public:
+  NODE_ENV: ${NODE_ENV}
+  amis:
+    map_ak: ${STEEDOS_AMIS_MAP_KEY}
+    map_vendor: ${STEEDOS_AMIS_MAP_VENDER}
   cfs:
     store: ${STEEDOS_CFS_STORE}
   templateSpaceId: 'template'
@@ -22,6 +26,16 @@ public:
     posthog:
       id: ${STEEDOS_PUBLIC_ANALYTICS_POSTHOG_ID}
       api_host: ${STEEDOS_PUBLIC_ANALYTICS_POSTHOG_API_HOST}
+  workflow:
+    traceShowSignImage: ${STEEDOS_WORKFLOW_TRACE_SHOW_SIGN_IMAGE}
+  sentry:
+    enabled: ${STEEDOS_SENTRY_ENABLED}
+    dsn: ${STEEDOS_SENTRY_DSN}
+  vconsole:
+    url: ${STEEDOS_PUBLIC_SCRIPT_VCONSOLE}
+  accounts:
+    username_min_length: ${STEEDOS_ACCOUNT_USERNAME_MIN_LENGTH}
+    UTF8_Names_Validation: ${STEEDOS_ACCOUNT_NAME_VALIDATION}
 cfs:
   store: ${STEEDOS_CFS_STORE}
   local:
@@ -47,7 +61,7 @@ cfs:
     accessKeyId: ${STEEDOS_CFS_CLOUD_ACCESSKEYID}
     secretAccessKey: ${STEEDOS_CFS_CLOUD_SECRETACCESSKEY}
 tenant:
-  _id: ${STEEDOS_CLOUD_SPACE_ID}
+  _id: ${STEEDOS_TENANT_ID}
   name: 华炎魔方
   logo_url: ${STEEDOS_TENANT_LOGO_URL}
   logo_square_url: ${STEEDOS_TENANT_LOGO_SQUARE_URL}
@@ -80,12 +94,14 @@ email:
   secure: ${STEEDOS_EMAIL_PASSWORD}
   signname: ${STEEDOS_EMAIL_SIGNNAME}
 cron:
+  enabled: ${STEEDOS_CRON_ENABLED}
   instancerecordqueue_interval: ${STEEDOS_CRON_INSTANCERECORDQUEUE_INTERVAL}
   mailqueue_interval: ${STEEDOS_CRON_MAILQUEUE_INTERVAL}
   push_interval: ${STEEDOS_CRON_PUSH_INTERVAL}
   webhookqueue_interval: ${STEEDOS_CRON_WEBHOOKQUEUE_INTERVAL}
   build_index: ${STEEDOS_CRON_BUILD_INDEX}
   objectwebhooksqueue_interval: ${STEEDOS_CRON_OBJECTWEBHOOKSQUEUE_INTERVAL}
+  workflow_rule_interval: ${STEEDOS_CRON_WORKFLOW_RULE}
 instances_stat:
   schedule: ${STEEDOS_INSTANCES_STAT_SCHEDULE}
 dingtalk:
@@ -108,6 +124,7 @@ push:
     appId: ${STEEDOS_PUSH_HUAWEI_APPID}
     appSecret: ${STEEDOS_PUSH_HUAWEI_APPSECRET}
     appPkgName: ${STEEDOS_PUSH_HUAWEI_APPPKGNAME}
+    debug: ${STEEDOS_PUSH_HUAWEI_DEBUG}
   mi:
     appSecret: ${STEEDOS_PUSH_MI_APPSECRET}
     production: ${STEEDOS_PUSH_MI_PRODUCTION}

package/dist/commands/package/start.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/commands/package/start.js

@@ -0,0 +1,400 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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;
+});
+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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const { Command, flags } = require('@oclif/command');
+const path = require("path");
+const moleculer_1 = require("moleculer");
+const fs_1 = __importDefault(require("fs"));
+const glob_1 = __importDefault(require("glob"));
+const lodash_1 = __importDefault(require("lodash"));
+const os_1 = __importDefault(require("os"));
+const cluster_1 = __importDefault(require("cluster"));
+const kleur_1 = __importDefault(require("kleur"));
+const stopSignals = [
+    "SIGHUP",
+    "SIGINT",
+    "SIGQUIT",
+    "SIGILL",
+    "SIGTRAP",
+    "SIGABRT",
+    "SIGBUS",
+    "SIGFPE",
+    "SIGUSR1",
+    "SIGSEGV",
+    "SIGUSR2",
+    "SIGTERM"
+];
+const logger = {
+    info(message) {
+        console.log(kleur_1.default.grey("[Runner]"), kleur_1.default.green().bold(message));
+    },
+    error(err) {
+        if (err instanceof Error)
+            console.error(kleur_1.default.grey("[Runner]"), kleur_1.default.red().bold(err.message), err);
+        else
+            console.error(kleur_1.default.grey("[Runner]"), kleur_1.default.red().bold(err));
+    }
+};
+class StartCommand extends Command {
+    async loadEnvFile() {
+        if (this.flags.env || this.flags.envfile) {
+            try {
+                const dotenv = await Promise.resolve().then(() => __importStar(require("dotenv")));
+                if (this.flags.envfile)
+                    dotenv.config({ path: this.flags.envfile });
+                else
+                    dotenv.config();
+            }
+            catch (err) {
+                throw new Error("The 'dotenv' package is missing! Please install it with 'npm install dotenv --save' command.");
+            }
+        }
+    }
+    fixDriveLetterCase(s) {
+        if (s && process.platform === "win32" && s.match(/^[A-Z]:/g)) {
+            return s.charAt(0).toLowerCase() + s.slice(1);
+        }
+        return s;
+    }
+    async loadConfigFile() {
+        let filePath;
+        if (process.env["MOLECULER_CONFIG"]) {
+            filePath = path.isAbsolute(process.env["MOLECULER_CONFIG"])
+                ? process.env["MOLECULER_CONFIG"]
+                : path.resolve(process.cwd(), process.env["MOLECULER_CONFIG"]);
+        }
+        else if (this.flags.config) {
+            filePath = path.isAbsolute(this.flags.config)
+                ? this.flags.config
+                : path.resolve(process.cwd(), this.flags.config);
+            if (!fs_1.default.existsSync(filePath)) {
+                filePath = null;
+            }
+        }
+        if (!filePath && fs_1.default.existsSync(path.resolve(process.cwd(), "moleculer.config.mjs"))) {
+            filePath = path.resolve(process.cwd(), "moleculer.config.mjs");
+        }
+        if (!filePath && fs_1.default.existsSync(path.resolve(process.cwd(), "moleculer.config.js"))) {
+            filePath = path.resolve(process.cwd(), "moleculer.config.js");
+        }
+        if (!filePath && fs_1.default.existsSync(path.resolve(process.cwd(), "moleculer.config.json"))) {
+            filePath = path.resolve(process.cwd(), "moleculer.config.json");
+        }
+        if (filePath) {
+            if (!fs_1.default.existsSync(filePath))
+                return Promise.reject(new Error(`Config file not found: ${filePath}`));
+            const ext = path.extname(filePath);
+            switch (ext) {
+                case ".json":
+                case ".js":
+                case ".mjs":
+                case ".ts": {
+                    let content = require(filePath);
+                    if (moleculer_1.Utils.isFunction(content))
+                        content = await content.call(this);
+                    break;
+                }
+                default:
+                    return Promise.reject(new Error(`Not supported file extension: ${ext}`));
+            }
+        }
+        return;
+    }
+    normalizeEnvValue(value) {
+        if (value.toLowerCase() === "true" || value.toLowerCase() === "false") {
+            value = value === "true";
+        }
+        else if (!isNaN(value)) {
+            value = Number(value);
+        }
+        return value;
+    }
+    overwriteFromEnv(obj, prefix) {
+        Object.keys(obj).forEach(key => {
+            const envName = ((prefix ? prefix + "_" : "") + key).toUpperCase();
+            if (process.env[envName]) {
+                obj[key] = this.normalizeEnvValue(process.env[envName]);
+            }
+            if (moleculer_1.Utils.isPlainObject(obj[key]))
+                obj[key] = this.overwriteFromEnv(obj[key], (prefix ? prefix + "_" : "") + key);
+        });
+        if (prefix == null) {
+            const moleculerPrefix = "MOL_";
+            Object.keys(process.env)
+                .filter(key => key.startsWith(moleculerPrefix))
+                .map(key => ({
+                key,
+                withoutPrefix: key.substring(moleculerPrefix.length)
+            }))
+                .forEach(variable => {
+                const dotted = variable.withoutPrefix
+                    .split("__")
+                    .map(level => level.toLocaleLowerCase())
+                    .map(level => level
+                    .split("_")
+                    .map((value, index) => {
+                    if (index == 0) {
+                        return value;
+                    }
+                    else {
+                        return value[0].toUpperCase() + value.substring(1);
+                    }
+                })
+                    .join(""))
+                    .join(".");
+                obj = moleculer_1.Utils.dotSet(obj, dotted, this.normalizeEnvValue(process.env[variable.key]));
+            });
+        }
+        return obj;
+    }
+    mergeOptions() {
+        this.config = lodash_1.default.defaultsDeep(this.configFile, moleculer_1.ServiceBroker.defaultOptions);
+        this.config = this.overwriteFromEnv(this.config);
+        if (this.flags.silent)
+            this.config.logger = false;
+        if (this.flags.hot)
+            this.config.steedosHotReload = true;
+    }
+    isDirectory(p) {
+        try {
+            return fs_1.default.lstatSync(p).isDirectory();
+        }
+        catch (_) {
+        }
+        return false;
+    }
+    isServiceFile(p) {
+        try {
+            return !fs_1.default.lstatSync(p).isDirectory();
+        }
+        catch (_) {
+        }
+        return false;
+    }
+    async loadServices() {
+        this.watchFolders.length = 0;
+        const fileMask = this.flags.mask || "**/*.service.js";
+        const serviceDir = process.env.SERVICEDIR || "";
+        const svcDir = path.isAbsolute(serviceDir)
+            ? serviceDir
+            : path.resolve(process.cwd(), serviceDir);
+        let patterns = this.servicePaths;
+        if (process.env.SERVICES || process.env.SERVICEDIR) {
+            if (this.isDirectory(svcDir) && !process.env.SERVICES) {
+                this.broker.loadServices(svcDir, fileMask);
+                if (this.config.hotReload) {
+                    this.watchFolders.push(svcDir);
+                }
+            }
+            else if (process.env.SERVICES) {
+                patterns = Array.isArray(process.env.SERVICES)
+                    ? process.env.SERVICES
+                    : process.env.SERVICES.split(",");
+            }
+        }
+        if (patterns.length > 0) {
+            let serviceFiles = [];
+            patterns
+                .map(s => s.trim())
+                .forEach(p => {
+                const skipping = p[0] == "!";
+                if (skipping)
+                    p = p.slice(1);
+                if (p.startsWith("npm:")) {
+                    this.loadNpmModule(p.slice(4));
+                }
+                else {
+                    let files;
+                    const svcPath = path.isAbsolute(p) ? p : path.resolve(svcDir, p);
+                    if (this.isDirectory(svcPath)) {
+                        if (this.config.hotReload) {
+                            this.watchFolders.push(svcPath);
+                        }
+                        files = glob_1.default.sync(svcPath + "/" + fileMask, { absolute: true });
+                        if (files.length == 0)
+                            return this.broker.logger.warn(kleur_1.default
+                                .yellow()
+                                .bold(`There is no service files in directory: '${svcPath}'`));
+                    }
+                    else if (this.isServiceFile(svcPath)) {
+                        files = [svcPath.replace(/\\/g, "/")];
+                    }
+                    else if (this.isServiceFile(svcPath + ".service.js")) {
+                        files = [svcPath.replace(/\\/g, "/") + ".service.js"];
+                    }
+                    else {
+                        files = glob_1.default.sync(p, { cwd: svcDir, absolute: true });
+                        if (files.length == 0)
+                            this.broker.logger.warn(kleur_1.default
+                                .yellow()
+                                .bold(`There is no matched file for pattern: '${p}'`));
+                    }
+                    if (files && files.length > 0) {
+                        if (skipping)
+                            serviceFiles = serviceFiles.filter(f => files.indexOf(f) === -1);
+                        else
+                            serviceFiles.push(...files);
+                    }
+                }
+            });
+            await Promise.all(lodash_1.default.uniq(serviceFiles).map(async (f) => {
+                try {
+                    const content = require(f);
+                    const svc = this.broker.createService(content);
+                    svc.__filename = f;
+                }
+                catch (error) {
+                    this.broker.logger.error(kleur_1.default.red().bold(`Failed to create service. The file is ${f} and the error: ${error.message}`));
+                }
+            }));
+        }
+    }
+    startWorkers(instances) {
+        let stopping = false;
+        cluster_1.default.on("exit", function (worker, code) {
+            if (!stopping) {
+                if (process.env.NODE_ENV === "production" && code !== 0) {
+                    logger.info(`The worker #${worker.id} has disconnected`);
+                    logger.info(`Worker #${worker.id} restarting...`);
+                    cluster_1.default.fork();
+                    logger.info(`Worker #${worker.id} restarted`);
+                }
+                else {
+                    process.exit(code);
+                }
+            }
+        });
+        const workerCount = Number.isInteger(instances) && instances > 0 ? instances : os_1.default.cpus().length;
+        logger.info(`Starting ${workerCount} workers...`);
+        for (let i = 0; i < workerCount; i++) {
+            cluster_1.default.fork();
+        }
+        stopSignals.forEach(function (signal) {
+            process.on(signal, () => {
+                logger.info(`Got ${signal}, stopping workers...`);
+                stopping = true;
+                cluster_1.default.disconnect(function () {
+                    logger.info("All workers stopped, exiting.");
+                    process.exit(0);
+                });
+            });
+        });
+    }
+    async loadHotReloadService() {
+        if (this.config.steedosHotReload) {
+            const content = require('../start/hotReload');
+            this.broker.createService(content);
+        }
+    }
+    loadNpmModule(name) {
+        let svc = require(name);
+        return this.broker.createService(svc);
+    }
+    async startBroker() {
+        this.worker = cluster_1.default.worker;
+        if (this.worker) {
+            Object.assign(this.config, {
+                nodeID: (this.config.nodeID || moleculer_1.Utils.getNodeID()) + "-" + this.worker.id
+            });
+        }
+        this.broker = new moleculer_1.ServiceBroker(Object.assign({}, this.config));
+        this.broker.runner = this;
+        global.broker = this.broker;
+        await this.loadServices();
+        await this.loadHotReloadService();
+        if (this.watchFolders.length > 0)
+            this.broker.runner.folders = this.watchFolders;
+        return this.broker.start().then(() => {
+            if (this.flags.repl && (!this.worker || this.worker.id === 1))
+                this.broker.repl();
+            return this.broker;
+        });
+    }
+    _runMoleculer() {
+        return Promise.resolve()
+            .then(() => this.loadConfigFile())
+            .then(() => this.mergeOptions())
+            .then(() => this.startBroker())
+            .catch(err => {
+            logger.error(err);
+            process.exit(1);
+        });
+    }
+    restartBroker() {
+        if (this.broker && this.broker.started) {
+            return this.broker
+                .stop()
+                .catch(err => {
+                logger.error("Error while stopping ServiceBroker.");
+                logger.error(err);
+            })
+                .then(() => this._runMoleculer());
+        }
+        else {
+            return this._runMoleculer();
+        }
+    }
+    async run() {
+        const { args, flags, argv } = this.parse(StartCommand);
+        this.watchFolders = [];
+        this.flags = null;
+        this.configFile = null;
+        this.config = null;
+        this.servicePaths = null;
+        this.broker = null;
+        this.worker = null;
+        this.flags = flags;
+        this.servicePaths = lodash_1.default.compact(Object.values(argv));
+        if (this.flags.instances !== undefined && cluster_1.default.isMaster) {
+            this.instances = Number.parseInt(this.flags.instances) ? Number.parseInt(this.flags.instances) : 'max';
+            return this.startWorkers(this.instances);
+        }
+        return this._runMoleculer();
+    }
+}
+StartCommand.strict = false;
+StartCommand.args = [
+    {
+        name: 'servicePaths',
+        required: false,
+        default: '',
+        description: 'service files or directories or glob masks',
+    }
+];
+StartCommand.description = `run steedos packages`;
+StartCommand.flags = {
+    repl: flags.boolean({ char: 'r', default: false, description: 'If true, it switches to REPL mode after broker started.' }),
+    silent: flags.boolean({ char: 's', default: false, description: 'Disable the broker logger. It prints nothing to the console.' }),
+    hot: flags.boolean({ char: 'h', default: false, description: 'Hot reload services when they change.' }),
+    config: flags.string({ char: 'c', default: 'steedos.config.js', description: 'Load configuration file from a different path or a different filename.' }),
+    env: flags.boolean({ char: 'e', default: false, description: 'Load environment variables from the ‘.env’ file from the current folder.' }),
+    envfile: flags.string({ char: 'E', description: 'Load environment variables from the specified file.' }),
+    instances: flags.string({ char: 'i', description: 'Launch [number] node instances or max for all cpu cores (with cluster module)' })
+};
+module.exports = StartCommand;
+//# sourceMappingURL=start.js.map

package/dist/commands/package/start.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/package/start.ts"],"names":[],"mappings":"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"}

package/dist/commands/start.js

@@ -227,36 +227,41 @@ class StartCommand extends Command {
                 const skipping = p[0] == "!";
                 if (skipping)
                     p = p.slice(1);
-                let files;
-                const svcPath = path.isAbsolute(p) ? p : path.resolve(svcDir, p);
-                if (this.isDirectory(svcPath)) {
-                    if (this.config.hotReload) {
-                        this.watchFolders.push(svcPath);
-                    }
-                    files = glob_1.default.sync(svcPath + "/" + fileMask, { absolute: true });
-                    if (files.length == 0)
-                        return this.broker.logger.warn(kleur_1.default
-                            .yellow()
-                            .bold(`There is no service files in directory: '${svcPath}'`));
-                }
-                else if (this.isServiceFile(svcPath)) {
-                    files = [svcPath.replace(/\\/g, "/")];
-                }
-                else if (this.isServiceFile(svcPath + ".service.js")) {
-                    files = [svcPath.replace(/\\/g, "/") + ".service.js"];
+                if (p.startsWith("npm:")) {
+                    this.loadNpmModule(p.slice(4));
                 }
                 else {
-                    files = glob_1.default.sync(p, { cwd: svcDir, absolute: true });
-                    if (files.length == 0)
-                        this.broker.logger.warn(kleur_1.default
-                            .yellow()
-                            .bold(`There is no matched file for pattern: '${p}'`));
-                }
-                if (files && files.length > 0) {
-                    if (skipping)
-                        serviceFiles = serviceFiles.filter(f => files.indexOf(f) === -1);
-                    else
-                        serviceFiles.push(...files);
+                    let files;
+                    const svcPath = path.isAbsolute(p) ? p : path.resolve(svcDir, p);
+                    if (this.isDirectory(svcPath)) {
+                        if (this.config.hotReload) {
+                            this.watchFolders.push(svcPath);
+                        }
+                        files = glob_1.default.sync(svcPath + "/" + fileMask, { absolute: true });
+                        if (files.length == 0)
+                            return this.broker.logger.warn(kleur_1.default
+                                .yellow()
+                                .bold(`There is no service files in directory: '${svcPath}'`));
+                    }
+                    else if (this.isServiceFile(svcPath)) {
+                        files = [svcPath.replace(/\\/g, "/")];
+                    }
+                    else if (this.isServiceFile(svcPath + ".service.js")) {
+                        files = [svcPath.replace(/\\/g, "/") + ".service.js"];
+                    }
+                    else {
+                        files = glob_1.default.sync(p, { cwd: svcDir, absolute: true });
+                        if (files.length == 0)
+                            this.broker.logger.warn(kleur_1.default
+                                .yellow()
+                                .bold(`There is no matched file for pattern: '${p}'`));
+                    }
+                    if (files && files.length > 0) {
+                        if (skipping)
+                            serviceFiles = serviceFiles.filter(f => files.indexOf(f) === -1);
+                        else
+                            serviceFiles.push(...files);
+                    }
                 }
             });
             await Promise.all(lodash_1.default.uniq(serviceFiles).map(async (f) => {
@@ -303,6 +308,10 @@ class StartCommand extends Command {
             this.broker.createService(content);
         }
     }
+    loadNpmModule(name) {
+        let svc = require(name);
+        return this.broker.createService(svc);
+    }
     async startBroker() {
         this.worker = cluster_1.default.worker;
         if (this.worker) {

package/dist/commands/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAClD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,yCAAwD;AACxD,4CAAoB;AACpB,gDAAwB;AACxB,oDAAuB;AACvB,4CAAoB;AACpB,sDAA8B;AAC9B,kDAA0B;AAC1B,oCAAiC;AAEjC,MAAM,WAAW,GAAG;IACnB,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,SAAS;IACT,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;CACT,CAAC;AAQF,MAAM,MAAM,GAAG;IACd,IAAI,CAAC,OAAO;QACX,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,eAAK,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAClE,CAAC;IACD,KAAK,CAAC,GAAG;QACR,IAAI,GAAG,YAAY,KAAK;YACvB,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,eAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;;YACtE,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,eAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC;CACD,CAAC;AAEF,MAAM,YAAa,SAAQ,OAAO;IAK/B,KAAK,CAAC,WAAW;QAClB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YACzC,IAAI;gBACH,MAAM,MAAM,GAAG,wDAAa,QAAQ,GAAC,CAAC;gBAEtC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO;oBAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;;oBAC/D,MAAM,CAAC,MAAM,EAAE,CAAC;aACrB;YAAC,OAAO,GAAG,EAAE;gBACb,MAAM,IAAI,KAAK,CACd,8FAA8F,CAC9F,CAAC;aACF;SACD;IACF,CAAC;IAUD,kBAAkB,CAAC,CAAC;QACnB,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;YAC7D,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC9C;QACD,OAAO,CAAC,CAAC;IACV,CAAC;IAYD,KAAK,CAAC,cAAc;QACnB,IAAI,QAAQ,CAAC;QAEb,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAE;YACpC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAC1D,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;gBACjC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC;SAChE;aAAM,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YAC7B,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC5C,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;gBACnB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAClD,IAAG,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC;gBAC3B,QAAQ,GAAG,IAAI,CAAC;aAChB;SACD;QACD,IAAI,CAAC,QAAQ,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,sBAAsB,CAAC,CAAC,EAAE;YACpF,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,sBAAsB,CAAC,CAAC;SAC/D;QACD,IAAI,CAAC,QAAQ,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,qBAAqB,CAAC,CAAC,EAAE;YACnF,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,qBAAqB,CAAC,CAAC;SAC9D;QACD,IAAI,CAAC,QAAQ,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,uBAAuB,CAAC,CAAC,EAAE;YACrF,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,uBAAuB,CAAC,CAAC;SAChE;QACD,IAAI,QAAQ,EAAE;YACb,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAC3B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,QAAQ,EAAE,CAAC,CAAC,CAAC;YAExE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACnC,QAAQ,GAAG,EAAE;gBACZ,KAAK,OAAO,CAAC;gBACb,KAAK,KAAK,CAAC;gBACX,KAAK,MAAM,CAAC;gBACZ,KAAK,KAAK,CAAC,CAAC;oBAEX,IAAI,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAGhC,IAAI,iBAAK,CAAC,UAAU,CAAC,OAAO,CAAC;wBAAE,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAElE,IAAI,CAAC,UAAU,GAAG,MAAM,aAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAE;oBACpD,MAAM;iBACN;gBACD;oBACC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAC,CAAC;aAC1E;SACD;QAEC,OAAO;IACV,CAAC;IAED,iBAAiB,CAAC,KAAK;QACtB,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,MAAM,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE;YAEtE,KAAK,GAAG,KAAK,KAAK,MAAM,CAAC;SACzB;aAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAEzB,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;SACtB;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,gBAAgB,CAAC,GAAG,EAAE,MAAO;QAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC9B,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;YAEnE,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBACzB,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;aACxD;YAED,IAAI,iBAAK,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAChC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC;QACjF,CAAC,CAAC,CAAC;QAGH,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,MAAM,eAAe,GAAG,MAAM,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;iBACtB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;iBAC9C,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACZ,GAAG;gBACH,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC;aACpD,CAAC,CAAC;iBACF,OAAO,CAAC,QAAQ,CAAC,EAAE;gBACnB,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa;qBACnC,KAAK,CAAC,IAAI,CAAC;qBACX,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC;qBACvC,GAAG,CAAC,KAAK,CAAC,EAAE,CACZ,KAAK;qBACH,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBACrB,IAAI,KAAK,IAAI,CAAC,EAAE;wBACf,OAAO,KAAK,CAAC;qBACb;yBAAM;wBACN,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;qBACnD;gBACF,CAAC,CAAC;qBACD,IAAI,CAAC,EAAE,CAAC,CACV;qBACA,IAAI,CAAC,GAAG,CAAC,CAAC;gBACZ,GAAG,GAAG,iBAAK,CAAC,MAAM,CACjB,GAAG,EACH,MAAM,EACN,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACjD,CAAC;YACH,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,GAAG,CAAC;IACZ,CAAC;IAoBD,YAAY;QACX,IAAI,CAAC,MAAM,GAAG,gBAAC,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,yBAAa,CAAC,cAAc,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEjD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;QAIlD,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG;YAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAGzD,CAAC;IAQD,WAAW,CAAC,CAAC;QACZ,IAAI;YACH,OAAO,YAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;SACrC;QAAC,OAAO,CAAC,EAAE;SAEX;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAQD,aAAa,CAAC,CAAC;QACd,IAAI;YACH,OAAO,CAAC,YAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;SACtC;QAAC,OAAO,CAAC,EAAE;SAEX;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAmBD,KAAK,CAAC,YAAY;QACjB,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,iBAAiB,CAAC;QAEtD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;YACzC,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;QAE3C,IAAI,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC;QAEjC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;YACnD,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;gBAEtD,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAE3C,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;oBAC1B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAC/B;aACD;iBAAM,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;gBAEhC,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAC7C,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;oBACtB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACnC;SACD;QAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,IAAI,YAAY,GAAS,EAAE,CAAC;YAE5B,QAAQ;iBACN,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;iBAClB,OAAO,CAAC,CAAC,CAAC,EAAE;gBACZ,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;gBAC7B,IAAI,QAAQ;oBAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC7B,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;oBAEzB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC/B;qBAAM;oBACN,IAAI,KAAK,CAAC;oBACV,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;oBAEjE,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;wBAC9B,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;4BAC1B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;yBAChC;wBACD,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,GAAG,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;wBAChE,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;4BACpB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAC7B,eAAK;iCACH,MAAM,EAAE;iCACR,IAAI,CACJ,4CAA4C,OAAO,GAAG,CACtD,CACF,CAAC;qBACH;yBAAM,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE;wBACvC,KAAK,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;qBACtC;yBAAM,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG,aAAa,CAAC,EAAE;wBACvD,KAAK,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC;qBACtD;yBAAM;wBAEN,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;wBACtD,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;4BACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CACtB,eAAK;iCACH,MAAM,EAAE;iCACR,IAAI,CAAC,0CAA0C,CAAC,GAAG,CAAC,CACtD,CAAC;qBACH;oBAED,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;wBAC9B,IAAI,QAAQ;4BACX,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;;4BAC7D,YAAY,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;qBACjC;iBACD;YACF,CAAC,CAAC,CAAC;YAEJ,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;gBAGpD,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;gBAE1B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBAC/C,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC,CAAC;SACJ;IACF,CAAC;IAKD,YAAY,CAAC,SAAS;QACrB,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,iBAAO,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,MAAM,EAAE,IAAI;YACxC,IAAI,CAAC,QAAQ,EAAE;gBAEd,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,IAAI,KAAK,CAAC,EAAE;oBACxD,MAAM,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,EAAE,mBAAmB,CAAC,CAAC;oBACzD,MAAM,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC;oBAClD,iBAAO,CAAC,IAAI,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;iBAC9C;qBAAM;oBACN,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACnB;aACD;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAChB,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;QAE7E,MAAM,CAAC,IAAI,CAAC,YAAY,WAAW,aAAa,CAAC,CAAC;QAElD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;YACrC,iBAAO,CAAC,IAAI,EAAE,CAAC;SACf;QAED,WAAW,CAAC,OAAO,CAAC,UAAU,MAAM;YACnC,OAAO,CAAC,EAAE,CAAC,MAAa,EAAE,GAAG,EAAE;gBAC9B,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,uBAAuB,CAAC,CAAC;gBAClD,QAAQ,GAAG,IAAI,CAAC;gBAChB,iBAAO,CAAC,UAAU,CAAC;oBAClB,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;oBAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAKD,KAAK,CAAC,oBAAoB;QACzB,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;YACjC,MAAM,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;SACnC;IACF,CAAC;IAQD,aAAa,CAAC,IAAI;QACjB,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAKD,KAAK,CAAC,WAAW;QAChB,IAAI,CAAC,MAAM,GAAG,iBAAO,CAAC,MAAM,CAAC;QAE7B,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC1B,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,iBAAK,CAAC,SAAS,EAAE,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE;aACxE,CAAC,CAAC;SACH;QAGD,IAAI,CAAC,MAAM,GAAG,IAAI,yBAAa,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;QAC1B,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAE5B,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAE1B,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAElC,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;YAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC;QAEjF,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACpC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;gBAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAElF,OAAO,IAAI,CAAC,MAAM,CAAC;QACpB,CAAC,CAAC,CAAC;IACJ,CAAC;IAKD,aAAa;QACZ,OAAO,OAAO,CAAC,OAAO,EAAE;aAEtB,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;aACjC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;aAC/B,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;aAC9B,KAAK,CAAC,GAAG,CAAC,EAAE;YACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa;QACZ,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACvC,OAAO,IAAI,CAAC,MAAM;iBAChB,IAAI,EAAE;iBACN,KAAK,CAAC,GAAG,CAAC,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBACpD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SACnC;aAAM;YACN,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;SAC5B;IACF,CAAC;IAEA,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAEnD,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QAEhB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QAElD,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,iBAAO,CAAC,QAAQ,EAAE;YAC1D,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA,CAAC,CAAA,KAAK,CAAA;YACpG,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC1C;QAED,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;IAC9B,CAAC;CACF;AAED,YAAY,CAAC,IAAI,GAAG;IACnB;QACC,IAAI,EAAS,cAAc;QAC3B,QAAQ,EAAK,KAAK;QAClB,OAAO,EAAM,EAAE;QACf,WAAW,EAAE,4CAA4C;KACzD;CACD,CAAC;AAEF,YAAY,CAAC,WAAW,GAAG,sBAAsB,CAAA;AAEjD,YAAY,CAAC,KAAK,GAAG;IACjB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,yDAAyD,EAAC,CAAC;IACxH,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,8DAA8D,EAAC,CAAC;IAC/H,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,EAAC,IAAI,EAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,uCAAuC,EAAC,CAAC;IACpG,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAC,GAAG,EAAE,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAC,wEAAwE,EAAC,CAAC;IACpJ,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,0EAA0E,EAAC,CAAC;IACxI,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,qDAAqD,EAAC,CAAC;IACtG,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,+EAA+E,EAAC,CAAC;CACrI,CAAA;AAED,MAAM,CAAC,OAAO,GAAG,YAAY,CAAA"}

package/dist/start/hotReload.js

@@ -24,7 +24,7 @@ const reloadPackage = (broker, packagePath) => {
                 if (serviceJson) {
                     delete require.cache[require.resolve(servicePath)];
                 }
-                broker.call(`~packages-project-server.reloadPackage`, { module: packageJson.name });
+                broker.call(`@steedos/service-project.reloadPackage`, { module: packageJson.name });
             }
         });
     }, 3000);

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.6.1-beta.6","commands":{"i18n":{"id":"i18n","description":"sync i18n resources","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"serverDir":{"name":"serverDir","type":"option","char":"s","description":"Steedos Server Dir"},"packageDir":{"name":"packageDir","type":"option","char":"p","description":"Steedos Package Dir"}},"args":[{"name":"name","description":"language","required":true}]},"start":{"id":"start","description":"run steedos projects","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"repl":{"name":"repl","type":"boolean","char":"r","description":"If true, it switches to REPL mode after broker started.","allowNo":false},"silent":{"name":"silent","type":"boolean","char":"s","description":"Disable the broker logger. It prints nothing to the console.","allowNo":false},"hot":{"name":"hot","type":"boolean","char":"h","description":"Hot reload services when they change.","allowNo":false},"config":{"name":"config","type":"option","char":"c","description":"Load configuration file from a different path or a different filename.","default":"steedos.config.js"},"env":{"name":"env","type":"boolean","char":"e","description":"Load environment variables from the ‘.env’ file from the current folder.","allowNo":false},"envfile":{"name":"envfile","type":"option","char":"E","description":"Load environment variables from the specified file."},"instances":{"name":"instances","type":"option","char":"i","description":"Launch [number] node instances or max for all cpu cores (with cluster module)"}},"args":[{"name":"servicePaths","description":"service files or directories or glob masks","required":false,"default":""}]},"auth:login":{"id":"auth:login","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"username":{"name":"username","type":"option","char":"u","description":"user"},"password":{"name":"password","type":"option","char":"p","description":"password"}},"args":[]},"data:export":{"id":"data:export","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"objectName":{"name":"objectName","type":"option","char":"o","description":"objectName","required":true},"ids":{"name":"ids","type":"option","char":"i","description":"ids"},"fields":{"name":"fields","type":"option","char":"f","description":"fields"},"outputdir":{"name":"outputdir","type":"option","char":"d","description":"Directory to store generated files."},"prefix":{"name":"prefix","type":"option","char":"x","description":"Prefix of generated files."},"plan":{"name":"plan","type":"boolean","char":"p","description":"Generates multiple sObject tree files and a plan definition file for aggregated import.","allowNo":false}},"args":[]},"data:import":{"id":"data:import","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"sobjectfiles":{"name":"sobjectfiles","type":"option","char":"f","description":"Paths of JSON files containing a collection of record to insert. Either --sobjecttreefiles or --plan is required."},"plan":{"name":"plan","type":"option","char":"p","description":"Path to plan to insert multiple data files that have master-detail relationships. Either --sobjecttreefiles or --plan is required."}},"args":[]},"package:build":{"id":"package:build","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"appPath":{"name":"appPath","type":"option","char":"p","description":"appPath","required":true},"packageName":{"name":"packageName","type":"option","char":"n","description":"package name"},"loglevel":{"name":"loglevel","type":"option","char":"l","description":"(debug|info|warn)  [default: warn] logging level for this command invocation"}},"args":[]},"source:config":{"id":"source:config","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"source:convert":{"id":"source:convert","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"oldFilesPath":{"name":"oldFilesPath","type":"option","char":"o","description":"oldFilesPath","required":true},"targetPath":{"name":"targetPath","type":"option","char":"t","description":"targetPath","required":true}},"args":[]},"source:delete":{"id":"source:delete","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"source:deploy":{"id":"source:deploy","description":" Use this command to deploy source (metadata that’s in source format)\nTo deploy metadata that’s in metadata format, use \"steedos source:deploy\".\n\nThe source you deploy overwrites the corresponding metadata on the server. This command does not attempt to merge your source with the versions on the server.\n\nExamples:\n\nTo deploy the source files in a directory:\n    $ steedos source:deploy -p path/to/source\nTo deploy a specific custom object and the objects whose source is in a directory:\n    $ steedos source:deploy -p \"path/to/custom/objects/myObject.object.yml\"\nor\"\n    $ steedos source:deploy -p \"path/to/source/objects/my_object\"\n\n","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"sourcePath":{"name":"sourcePath","type":"option","char":"p","description":"Submit the local file under the path to the server"}},"args":[]},"source:retrieve":{"id":"source:retrieve","description":"Use this command to retrieve source (metadata that’s in source format)\nTo retrieve metadata that’s in metadata format, use \"steedos source:retrieve\".\n\nThe source you retrieve overwrites the corresponding source files in your local project. This command does not attempt to merge the source from your org with your local source files.\n\nExamples:\n\nTo retrieve the source files in a directory:\n    $ steedos source:retrieve -p path/to/source\nTo retrieve a specific Custom object and the objects whose source is in a directory:\n    $ steedos source:retrieve -p \"path/to/custom/objects/myObject.object.yml\"\nor\n    $ steedos source:retrieve -p \"path/to/source/objects/my_object\"\nTo retrieve all Custom objects:\n    $ steedos source:retrieve -m CustomObject\nTo retrieve a specific Custom object:\n    $ steedos source:retrieve -m CustomObject:myObject\n\nTo retrieve all metadata components listed in a manifest:\n    $ steedos source:retrieve -y path/to/package.yml\n\n\nMetaDataList:\n[\"ApprovalProcess\",\"Chart\",\"CustomAction\",\"CustomApplication\",\"CustomField\",\"CustomListview\",\"CustomObject\",\"CustomPermission\",\"CustomPermissionset\",\"CustomProfile\",\"CustomReport\",\"CustomValidationRule\",\"Flow\",\"FlowRole\",\"Layout\",\"Page\",\"Process\",\"Query\",\"RestrictionRule\",\"Role\",\"ShareRule\",\"Tab\",\"Trigger\",\"Workflow\"]\n","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"serverDir":{"name":"serverDir","type":"option","char":"p","description":"generate request according to the path and update it"},"manifest":{"name":"manifest","type":"option","char":"y","description":"file path for manifest (package.yml) of components to deploy"},"metadata":{"name":"metadata","type":"option","char":"m","description":"metadata"}},"args":[]}}}
+{"version":"2.6.2-beta.2","commands":{"i18n":{"id":"i18n","description":"sync i18n resources","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"serverDir":{"name":"serverDir","type":"option","char":"s","description":"Steedos Server Dir"},"packageDir":{"name":"packageDir","type":"option","char":"p","description":"Steedos Package Dir"}},"args":[{"name":"name","description":"language","required":true}]},"start":{"id":"start","description":"run steedos projects","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"repl":{"name":"repl","type":"boolean","char":"r","description":"If true, it switches to REPL mode after broker started.","allowNo":false},"silent":{"name":"silent","type":"boolean","char":"s","description":"Disable the broker logger. It prints nothing to the console.","allowNo":false},"hot":{"name":"hot","type":"boolean","char":"h","description":"Hot reload services when they change.","allowNo":false},"config":{"name":"config","type":"option","char":"c","description":"Load configuration file from a different path or a different filename.","default":"steedos.config.js"},"env":{"name":"env","type":"boolean","char":"e","description":"Load environment variables from the ‘.env’ file from the current folder.","allowNo":false},"envfile":{"name":"envfile","type":"option","char":"E","description":"Load environment variables from the specified file."},"instances":{"name":"instances","type":"option","char":"i","description":"Launch [number] node instances or max for all cpu cores (with cluster module)"}},"args":[{"name":"servicePaths","description":"service files or directories or glob masks","required":false,"default":""}]},"auth:login":{"id":"auth:login","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"username":{"name":"username","type":"option","char":"u","description":"user"},"password":{"name":"password","type":"option","char":"p","description":"password"}},"args":[]},"data:export":{"id":"data:export","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"objectName":{"name":"objectName","type":"option","char":"o","description":"objectName","required":true},"ids":{"name":"ids","type":"option","char":"i","description":"ids"},"fields":{"name":"fields","type":"option","char":"f","description":"fields"},"outputdir":{"name":"outputdir","type":"option","char":"d","description":"Directory to store generated files."},"prefix":{"name":"prefix","type":"option","char":"x","description":"Prefix of generated files."},"plan":{"name":"plan","type":"boolean","char":"p","description":"Generates multiple sObject tree files and a plan definition file for aggregated import.","allowNo":false}},"args":[]},"data:import":{"id":"data:import","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"sobjectfiles":{"name":"sobjectfiles","type":"option","char":"f","description":"Paths of JSON files containing a collection of record to insert. Either --sobjecttreefiles or --plan is required."},"plan":{"name":"plan","type":"option","char":"p","description":"Path to plan to insert multiple data files that have master-detail relationships. Either --sobjecttreefiles or --plan is required."}},"args":[]},"package:build":{"id":"package:build","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"appPath":{"name":"appPath","type":"option","char":"p","description":"appPath","required":true},"packageName":{"name":"packageName","type":"option","char":"n","description":"package name"},"loglevel":{"name":"loglevel","type":"option","char":"l","description":"(debug|info|warn)  [default: warn] logging level for this command invocation"}},"args":[]},"package:start":{"id":"package:start","description":"run steedos packages","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"repl":{"name":"repl","type":"boolean","char":"r","description":"If true, it switches to REPL mode after broker started.","allowNo":false},"silent":{"name":"silent","type":"boolean","char":"s","description":"Disable the broker logger. It prints nothing to the console.","allowNo":false},"hot":{"name":"hot","type":"boolean","char":"h","description":"Hot reload services when they change.","allowNo":false},"config":{"name":"config","type":"option","char":"c","description":"Load configuration file from a different path or a different filename.","default":"steedos.config.js"},"env":{"name":"env","type":"boolean","char":"e","description":"Load environment variables from the ‘.env’ file from the current folder.","allowNo":false},"envfile":{"name":"envfile","type":"option","char":"E","description":"Load environment variables from the specified file."},"instances":{"name":"instances","type":"option","char":"i","description":"Launch [number] node instances or max for all cpu cores (with cluster module)"}},"args":[{"name":"servicePaths","description":"service files or directories or glob masks","required":false,"default":""}]},"source:config":{"id":"source:config","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"source:convert":{"id":"source:convert","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"oldFilesPath":{"name":"oldFilesPath","type":"option","char":"o","description":"oldFilesPath","required":true},"targetPath":{"name":"targetPath","type":"option","char":"t","description":"targetPath","required":true}},"args":[]},"source:delete":{"id":"source:delete","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"source:deploy":{"id":"source:deploy","description":" Use this command to deploy source (metadata that’s in source format)\nTo deploy metadata that’s in metadata format, use \"steedos source:deploy\".\n\nThe source you deploy overwrites the corresponding metadata on the server. This command does not attempt to merge your source with the versions on the server.\n\nExamples:\n\nTo deploy the source files in a directory:\n    $ steedos source:deploy -p path/to/source\nTo deploy a specific custom object and the objects whose source is in a directory:\n    $ steedos source:deploy -p \"path/to/custom/objects/myObject.object.yml\"\nor\"\n    $ steedos source:deploy -p \"path/to/source/objects/my_object\"\n\n","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"sourcePath":{"name":"sourcePath","type":"option","char":"p","description":"Submit the local file under the path to the server"}},"args":[]},"source:retrieve":{"id":"source:retrieve","description":"Use this command to retrieve source (metadata that’s in source format)\nTo retrieve metadata that’s in metadata format, use \"steedos source:retrieve\".\n\nThe source you retrieve overwrites the corresponding source files in your local project. This command does not attempt to merge the source from your org with your local source files.\n\nExamples:\n\nTo retrieve the source files in a directory:\n    $ steedos source:retrieve -p path/to/source\nTo retrieve a specific Custom object and the objects whose source is in a directory:\n    $ steedos source:retrieve -p \"path/to/custom/objects/myObject.object.yml\"\nor\n    $ steedos source:retrieve -p \"path/to/source/objects/my_object\"\nTo retrieve all Custom objects:\n    $ steedos source:retrieve -m CustomObject\nTo retrieve a specific Custom object:\n    $ steedos source:retrieve -m CustomObject:myObject\n\nTo retrieve all metadata components listed in a manifest:\n    $ steedos source:retrieve -y path/to/package.yml\n\n\nMetaDataList:\n[\"ApprovalProcess\",\"Chart\",\"CustomAction\",\"CustomApplication\",\"CustomField\",\"CustomListview\",\"CustomObject\",\"CustomPermission\",\"CustomPermissionset\",\"CustomProfile\",\"CustomReport\",\"CustomValidationRule\",\"Dashboard\",\"Flow\",\"FlowRole\",\"Import\",\"Layout\",\"Page\",\"Process\",\"Query\",\"Question\",\"RestrictionRule\",\"Role\",\"ShareRule\",\"Tab\",\"Trigger\",\"Workflow\"]\n","pluginName":"steedos-cli","pluginType":"core","aliases":[],"flags":{"serverDir":{"name":"serverDir","type":"option","char":"p","description":"generate request according to the path and update it"},"manifest":{"name":"manifest","type":"option","char":"y","description":"file path for manifest (package.yml) of components to deploy"},"metadata":{"name":"metadata","type":"option","char":"m","description":"metadata"}},"args":[]}}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steedos-cli",
-  "version": "2.6.1-beta.6",
+  "version": "2.6.2-beta.2",
   "description": "Develop and run your enterprise apps in miniutes",
   "main": "dist/index.js",
   "scripts": {
@@ -38,8 +38,8 @@
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.8.3",
     "@oclif/plugin-help": "^5.1.12",
-    "@steedos/metadata-core": "2.6.1-beta.6",
-    "@steedos/metadata-registrar": "2.6.1-beta.6",
+    "@steedos/metadata-core": "2.6.2-beta.2",
+    "@steedos/metadata-registrar": "2.6.2-beta.2",
     "archiver": "^5.0.2",
     "chalk": "2.4.2",
     "change-case": "^3.1.0",
@@ -82,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d77961251196c5352622d977e554660796ed6208"
+  "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31"
 }