@cloudbase/cli 2.7.0-alpha.3 → 2.7.0-alpha.5

package/lib/commands/iac/index.js

@@ -29,13 +29,12 @@ const cals_1 = require("@cloudbase/cals");
 const iac_core_1 = require("@cloudbase/iac-core");
 const type_1 = require("@cloudbase/iac-core/lib/src/type");
 const inquirer_1 = __importDefault(require("inquirer"));
-const lodash_1 = require("lodash");
 const inquirer_autocomplete_prompt_1 = __importDefault(require("inquirer-autocomplete-prompt"));
+const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
 const decorators_1 = require("../../decorators");
 const utils_1 = require("../../utils");
 const common_1 = require("../common");
-const fs_extra_1 = require("fs-extra");
 inquirer_1.default.registerPrompt('autocomplete', inquirer_autocomplete_prompt_1.default);
 let IaCInitRepo = class IaCInitRepo extends common_1.Command {
     get options() {
@@ -181,7 +180,6 @@ let IaCInit = class IaCInit extends common_1.Command {
                 resource,
                 action: type_1.ResourceAction.Init,
                 log,
-                needEnvId: false,
                 specResourceLogic: function (resource, config) {
                     return __awaiter(this, void 0, void 0, function* () {
                         switch (resource) {
@@ -263,6 +261,13 @@ let IaCInit = class IaCInit extends common_1.Command {
                                     choices: iac_core_1.IAC.WebApp.getAvailableTemplates()
                                 });
                                 Object.assign(config, templateRes);
+                                const nameRes = yield inquirer_1.default.prompt({
+                                    type: 'input',
+                                    name: 'name',
+                                    message: '应用名称',
+                                    default: config.name
+                                });
+                                Object.assign(config, nameRes);
                             }
                         }
                     });
@@ -311,8 +316,7 @@ let IaCPull = class IaCPull extends common_1.Command {
                 resource,
                 action: type_1.ResourceAction.Pull,
                 envId,
-                log,
-                needEnvId: true
+                log
             }));
         });
     }
@@ -350,8 +354,7 @@ let IaCBuild = class IaCBuild extends common_1.Command {
                 name,
                 action: type_1.ResourceAction.Build,
                 resource,
-                log,
-                needEnvId: false
+                log
             }));
         });
     }
@@ -376,22 +379,6 @@ let IaCDev = class IaCDev extends common_1.Command {
         return getOptions({
             childCmd: 'dev',
             options: [
-                {
-                    flags: '--data <data>',
-                    desc: '要传递给调用函数的序列化 Event 数据（仅当 resource=SCF 时有效）'
-                },
-                {
-                    flags: '--dataPath <dataPath>',
-                    desc: '要传递给调用函数 Event 的 json 文件所在路径（仅当 resource=SCF 时有效）'
-                },
-                {
-                    flags: '--context <context>',
-                    desc: '要传递给调用函数的序列化 Context 数据（仅当 resource=SCF 时有效）'
-                },
-                {
-                    flags: '--contextPath <contextPath>',
-                    desc: '要传递给调用函数 Context 的 json 文件所在路径（仅当 resource=SCF 时有效）'
-                },
                 {
                     flags: '--platform <platform>',
                     desc: '运行平台，可选为 web | mp。默认为 web（仅当 resource=App 时有效）'
@@ -412,13 +399,12 @@ let IaCDev = class IaCDev extends common_1.Command {
                     return getCredential(ctx, options);
                 }
             });
-            yield iac_core_1.IAC.resource.dev(getAPIParams({
+            const devInst = yield iac_core_1.IAC.resource.dev(getAPIParams({
                 cwd,
                 name,
                 resource,
                 action: type_1.ResourceAction.Dev,
                 log,
-                needEnvId: false,
                 extraData: { data, dataPath, context, contextPath, platform },
                 specResourceLogic(resource, config) {
                     return __awaiter(this, void 0, void 0, function* () {
@@ -436,6 +422,17 @@ let IaCDev = class IaCDev extends common_1.Command {
                     });
                 }
             }));
+            try {
+                if (Array.isArray(devInst)) {
+                    yield Promise.all(devInst.map((item) => item === null || item === void 0 ? void 0 : item.run));
+                }
+                else {
+                    yield (devInst === null || devInst === void 0 ? void 0 : devInst.run);
+                }
+            }
+            catch (e) {
+                trackCallback({ type: 'error', details: e.message }, log);
+            }
         });
     }
 };
@@ -486,7 +483,6 @@ let IaCApply = class IaCApply extends common_1.Command {
                 action: type_1.ResourceAction.Apply,
                 envId,
                 log,
-                needEnvId: true,
                 extraData: { comment },
                 specResourceLogic: function (resource, config) {
                     return __awaiter(this, void 0, void 0, function* () {
@@ -547,8 +543,7 @@ let IaCDestory = class IaCDestory extends common_1.Command {
                 resource,
                 action: type_1.ResourceAction.Destory,
                 envId,
-                log,
-                needEnvId: true
+                log
             }));
         });
     }
@@ -593,8 +588,7 @@ let IaCState = class IaCState extends common_1.Command {
                 resource,
                 action: type_1.ResourceAction.State,
                 envId,
-                log,
-                needEnvId: true
+                log
             }));
             if (data) {
                 log.info(JSON.stringify(data, null, 2));
@@ -647,22 +641,18 @@ function getOptions({ childCmd, options, desc, resourceSupportList, needEnvIdOpt
         autoRunLogin: true
     };
 }
-function getResource(resource, action) {
+function getResource(action) {
     return __awaiter(this, void 0, void 0, function* () {
-        let selectedResource = resource;
-        if (!selectedResource) {
-            const res = yield inquirer_1.default.prompt({
-                type: 'list',
-                name: 'resource',
-                message: '请选择资源类型',
-                choices: iac_core_1.IAC.tools.getResourceList(action).map((item) => ({
-                    name: `${item.value} - ${item.name}`,
-                    value: item.value
-                }))
-            });
-            selectedResource = res.resource;
-        }
-        return selectedResource;
+        const res = yield inquirer_1.default.prompt({
+            type: 'list',
+            name: 'resource',
+            message: '请选择资源类型',
+            choices: iac_core_1.IAC.tools.getResourceList(action).map((item) => ({
+                name: `${item.value} - ${item.name}`,
+                value: item.value
+            }))
+        });
+        return res.resource;
     });
 }
 function trackCallback(message, log) {
@@ -688,28 +678,26 @@ function getCredential(ctx, options) {
     });
 }
 function getAPIParams(config) {
-    const { cwd, resource, action, name, envId, log, needEnvId = true, extraData = {}, specResourceLogic } = config;
+    const { cwd, resource, action, name, envId, log, extraData = {}, specResourceLogic } = config;
     return {
         cwd,
-        getResource: () => {
-            return getResource(resource, action);
+        envId,
+        getEnvId: () => {
+            return showEnvIdUI();
+        },
+        name,
+        getName: (nameOptions) => {
+            return showNameUI(nameOptions);
+        },
+        resourceType: resource,
+        getResourceType: () => {
+            return getResource(action);
         },
-        getConfig: function (resource, envObj, otherInfo) {
+        getConfig: function (resource, envObj) {
             return __awaiter(this, void 0, void 0, function* () {
-                const config = (0, lodash_1.assignWith)({ envId }, envObj, { name }, extraData, function customizer(objValue, srcValue) {
+                const config = (0, lodash_1.assignWith)(envObj, extraData, function customizer(objValue, srcValue) {
                     return (0, lodash_1.isUndefined)(objValue) ? srcValue : objValue;
                 });
-                const { resourceGroupDir } = otherInfo;
-                if (!config.name) {
-                    const nameRes = yield showNameUI(resourceGroupDir);
-                    Object.assign(config, { name: nameRes });
-                }
-                if (needEnvId) {
-                    if (!config.envId) {
-                        const envIdRes = yield showEnvIdUI();
-                        Object.assign(config, { envId: envIdRes });
-                    }
-                }
                 yield (specResourceLogic === null || specResourceLogic === void 0 ? void 0 : specResourceLogic(resource, config));
                 return config;
             });
@@ -719,10 +707,10 @@ function getAPIParams(config) {
         }
     };
 }
-function showNameUI(resourceGroupDir) {
+function showNameUI(nameOptions) {
     return __awaiter(this, void 0, void 0, function* () {
         let res;
-        if (!(yield (0, fs_extra_1.pathExists)(resourceGroupDir))) {
+        if (nameOptions.length === 0) {
             res = yield inquirer_1.default.prompt({
                 type: 'input',
                 name: 'name',
@@ -739,11 +727,10 @@ function showNameUI(resourceGroupDir) {
             res = yield inquirer_1.default.prompt({
                 type: 'autocomplete',
                 name: 'name',
-                message: '请选择或直接输入资源标识',
+                message: '请选择资源标识或直接输入资源目录名',
                 source: function (answersSoFar, input = '') {
                     return __awaiter(this, void 0, void 0, function* () {
-                        const choices = yield (0, fs_extra_1.readdir)(resourceGroupDir).then((files) => files.filter((file) => (0, fs_extra_1.statSync)(path_1.default.join(resourceGroupDir, file)).isDirectory()));
-                        const filtered = choices.filter((choice) => choice.toLowerCase().includes(input.toLowerCase()));
+                        const filtered = nameOptions.filter((choice) => choice.toLowerCase().includes(input.toLowerCase()));
                         return input ? [input, ...filtered] : filtered;
                     });
                 },
@@ -768,8 +755,14 @@ function showEnvIdUI(options) {
             message,
             source: function (answersSoFar, input = '') {
                 return __awaiter(this, void 0, void 0, function* () {
-                    const filtered = envList.filter((envId) => envId.toLowerCase().includes((input === null || input === void 0 ? void 0 : input.toLowerCase()) || ''));
-                    return required ? filtered : (0, lodash_1.compact)([input ? undefined : '不提供', ...filtered]);
+                    const filtered = envList.filter((env) => env.name.toLowerCase().includes((input === null || input === void 0 ? void 0 : input.toLowerCase()) || ''));
+                    const choices = filtered.map((env) => ({
+                        name: env.name,
+                        value: env.value
+                    }));
+                    return required
+                        ? choices
+                        : (0, lodash_1.compact)([input ? undefined : { name: '不提供', value: null }, ...choices]);
                 });
             },
             validate: required

package/lib/commands/lowcode/app.js

@@ -186,6 +186,10 @@ let LowCodePreviewApp = class LowCodePreviewApp extends common_1.Command {
                 {
                     flags: '--platform <mp|web>',
                     desc: '构建平台'
+                },
+                {
+                    flags: '--only-watch',
+                    desc: '仅监听代码变化'
                 }
             ],
             desc: '预览应用',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.7.0-alpha.3",
+    "version": "2.7.0-alpha.5",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -33,8 +33,8 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.7",
-        "@cloudbase/iac-core": "alpha",
-        "@cloudbase/lowcode-cli": "^0.21.1",
+        "@cloudbase/iac-core": "^0.0.2-alpha.7",
+        "@cloudbase/lowcode-cli": "^0.22.1-alpha.0",
         "@cloudbase/manager-node": "4.2.8",
         "@cloudbase/toolbox": "^0.7.5",
         "@sentry/node": "^5.10.2",