@cloudbase/cli 2.5.1-alpha.2 → 2.5.1-alpha.4

package/lib/commands/common.js

@@ -134,7 +134,7 @@ class Command extends events_1.EventEmitter {
         }
     }
     createProgram(instance, deprecate, newCmd) {
-        const { cmd, desc, options, requiredEnvId = true, withoutAuth = false } = this.options;
+        const { cmd, desc, options, requiredEnvId = true, withoutAuth = false, autoRunLogin = false } = this.options;
         instance.storeOptionsAsProperties(false);
         options.forEach((option) => {
             const { hideHelp } = option;
@@ -161,7 +161,13 @@ class Command extends events_1.EventEmitter {
                 loginState = (yield utils_1.authSupevisor.getLoginState());
             }
             if (!withoutAuth && !loginState) {
-                throw new error_1.CloudBaseError('无有效身份信息，请使用 cloudbase login 登录');
+                if (autoRunLogin) {
+                    console.log(chalk_1.default.bold.yellowBright('无有效身份信息，将自动为您打开授权页面。授权成功后请再重新执行命令'));
+                    yield commander_1.program.parseAsync(['node', 'tcb', 'login']);
+                }
+                else {
+                    throw new error_1.CloudBaseError('无有效身份信息，请使用 cloudbase login 登录');
+                }
             }
             if (!envId && requiredEnvId) {
                 throw new error_1.CloudBaseError('未识别到有效的环境 Id，请使用 cloudbaserc 配置文件进行操作或通过 -e 参数指定环境 Id');

package/lib/commands/lowcode/app.js

@@ -58,7 +58,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelTypeSync = exports.LowCodeDeployApp = exports.LowCodeBuildAppConfig = exports.LowCodePreviewApp = exports.LowCodeBuildApp = exports.LowCodeWatch = void 0;
+exports.TemplateSync = exports.ModelTypeSync = exports.LowCodeDeployApp = exports.LowCodeBuildAppConfig = exports.LowCodePreviewApp = exports.LowCodeBuildApp = exports.LowCodeWatch = void 0;
 const lodash_1 = require("lodash");
 const common_1 = require("../common");
 const decorators_1 = require("../../decorators");
@@ -67,6 +67,8 @@ const utils_2 = require("../../utils");
 const cloud_api_1 = require("@cloudbase/cloud-api");
 const toolbox_1 = require("@cloudbase/toolbox");
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
 const dts_1 = require("../../utils/dts");
 let lowcodeCli;
 if (process.argv.includes('lowcode')) {
@@ -333,7 +335,8 @@ let ModelTypeSync = class ModelTypeSync extends common_1.Command {
                 }
             ],
             desc: '同步数据模型类型定义文件',
-            requiredEnvId: true
+            requiredEnvId: true,
+            autoRunLogin: true
         };
     }
     execute(ctx, log, options) {
@@ -362,7 +365,6 @@ let ModelTypeSync = class ModelTypeSync extends common_1.Command {
                 EnvId: ctx.envId,
                 PageIndex: 1,
                 PageSize: 1000,
-                DbInstanceType: 'FLEXDB',
                 QuerySystemModel: true,
                 QueryConnector: 0
             });
@@ -392,6 +394,107 @@ ModelTypeSync = __decorate([
     (0, common_1.ICommand)({ supportPrivate: true })
 ], ModelTypeSync);
 exports.ModelTypeSync = ModelTypeSync;
+let TemplateSync = class TemplateSync extends common_1.Command {
+    get options() {
+        return {
+            cmd: 'template',
+            childCmd: 'sync',
+            options: [
+                {
+                    flags: '--envId <envId>',
+                    desc: '环境 ID'
+                }
+            ],
+            desc: '同步官方模板应用内容',
+            requiredEnvId: true
+        };
+    }
+    execute(ctx, log, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            log.info('同步中...');
+            const envId = 'lowcode-5g5llxbq5bc9299e';
+            const fileDir = path_1.default.resolve(os_1.default.tmpdir(), 'templates');
+            yield fs_extra_1.default.ensureDir(fileDir);
+            yield fs_extra_1.default.rmdir(fileDir, { recursive: true });
+            yield fs_extra_1.default.ensureDir(fileDir);
+            const cloudService = yield getCloudServiceInstance(ctx);
+            let total = Infinity;
+            let currentTotal = 0;
+            const limit = 50;
+            const files = [];
+            let count = 1;
+            while (currentTotal < total) {
+                const solutionListResult = yield cloudService.lowcode.request('DescribeSolutionList', {
+                    Limit: limit,
+                    Offset: currentTotal,
+                    KeyWords: '',
+                    EnvId: envId,
+                    TypeList: ['SELFBUILD', 'TPLEXPORT']
+                });
+                const solutionList = solutionListResult.SolutionInfoList;
+                const handledSolutionList = yield Promise.all(solutionList.map((item) => __awaiter(this, void 0, void 0, function* () {
+                    const solution = yield cloudService.lowcode.request('DescribeSolution', {
+                        EnvId: envId,
+                        SolutionId: item.SolutionId
+                    });
+                    if (solution.SolutionAppInfos.length > 0) {
+                        const appIds = solution.SolutionAppInfos.map((item) => item.AppId);
+                        const apps = yield Promise.all(appIds.map((appId) => __awaiter(this, void 0, void 0, function* () {
+                            var _a, _b, _c, _d, _e;
+                            try {
+                                let result = yield cloudService.lowcode.request('DescribeHistoryListByAppId', {
+                                    WeAppId: appId,
+                                    PageNum: 1,
+                                    PageSize: 1
+                                });
+                                result = yield cloudService.lowcode.request('DescribeAppHistoryPreSignUrl', {
+                                    HisIds: [(_c = (_b = (_a = result === null || result === void 0 ? void 0 : result.Data) === null || _a === void 0 ? void 0 : _a.List) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.Id],
+                                    HttpMethod: 'get',
+                                    WeAppsId: appId
+                                });
+                                result = yield (0, toolbox_1.fetch)((_e = (_d = result === null || result === void 0 ? void 0 : result.Data) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.UploadUrl);
+                                return { appId, content: result };
+                            }
+                            catch (e) {
+                                return { appId, error: e.message };
+                            }
+                        })));
+                        return {
+                            name: item.Name,
+                            solutionId: item.SolutionId,
+                            version: item.Version,
+                            apps
+                        };
+                    }
+                    else {
+                        return null;
+                    }
+                })));
+                const filePath = path_1.default.resolve(fileDir, `templates_${count}.json`);
+                yield fs_extra_1.default.writeFile(filePath, JSON.stringify(handledSolutionList, null, 2), 'utf8');
+                files.push(filePath);
+                total = solutionListResult.TotalCount;
+                currentTotal += limit;
+                count += 1;
+            }
+            log.success(`同步官方模板应用内容已完成. 文件路径:`);
+            log.success(files.join('\n'));
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.CmdContext)()),
+    __param(1, (0, decorators_1.Log)()),
+    __param(2, (0, decorators_1.ArgsOptions)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, decorators_1.Logger, Object]),
+    __metadata("design:returntype", Promise)
+], TemplateSync.prototype, "execute", null);
+TemplateSync = __decorate([
+    (0, common_1.ICommand)({ supportPrivate: true })
+], TemplateSync);
+exports.TemplateSync = TemplateSync;
 function getCloudServiceInstance(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let credential;

package/lib/utils/dts.js

@@ -34,7 +34,7 @@ ${dtsList
     /**
     * 数据模型：${item.title}
     */ 
-    ${item.name}: DataModelMethods<${getModelInterfaceName(item.name)}>;`;
+    ${_toValidFieldName(item.name)}: DataModelMethods<${getModelInterfaceName(item.name)}>;`;
         })
             .join('\n')}    
 }
@@ -130,6 +130,13 @@ declare global {
                 }
             });
         }
+        function _toValidFieldName(name) {
+            let result = name.replace(/[^a-zA-Z0-9_$]/g, '_');
+            if (/^[0-9]/.test(result)) {
+                result = '_' + result;
+            }
+            return result;
+        }
         function getModelInterfaceName(name) {
             if (!name)
                 return '';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.5.1-alpha.2",
+    "version": "2.5.1-alpha.4",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {

package/types/commands/common.d.ts

@@ -18,6 +18,7 @@ export interface ICommandOptions {
     desc: string;
     requiredEnvId?: boolean;
     withoutAuth?: boolean;
+    autoRunLogin?: boolean;
 }
 interface ICommandDecoratorOptions {
     supportPrivate: boolean | 'only';

package/types/commands/lowcode/app.d.ts

@@ -67,6 +67,20 @@ export declare class LowCodeDeployApp extends Command {
     execute(ctx: ICommandContext, log: Logger, options: any): Promise<void>;
 }
 export declare class ModelTypeSync extends Command {
+    get options(): {
+        cmd: string;
+        childCmd: string;
+        options: {
+            flags: string;
+            desc: string;
+        }[];
+        desc: string;
+        requiredEnvId: boolean;
+        autoRunLogin: boolean;
+    };
+    execute(ctx: ICommandContext, log: Logger, options: any): Promise<void>;
+}
+export declare class TemplateSync extends Command {
     get options(): {
         cmd: string;
         childCmd: string;