@cloudbase/cli 2.0.3 → 2.0.5

package/src/commands/lowcode/comps.ts

@@ -1,322 +1,322 @@
-import _ from 'lodash'
-import path from 'path'
-import { Command, ICommand } from '../common'
-import { InjectParams, Log, Logger, ArgsParams, ArgsOptions, CmdContext } from '../../decorators'
-import { CloudApiService, execWithLoading, fetchStream } from '../../utils'
-import { CloudBaseError } from '../../error'
-import chalk from 'chalk'
-import { 
-    build as buildComps, 
-    debug as debugComps, 
-    publishComps,  
-    graceBuildComps,
-    graceDebugComps,
-    gracePublishComps,
-    IPublishCompsInfo,
-    publishVersion,
-    bootstrap,
-} from '@cloudbase/lowcode-cli'
-import { prompt } from 'enquirer'
-import fse from 'fs-extra'
-import * as semver from 'semver'
-
-const cloudService = CloudApiService.getInstance('lowcode')
-const DEFAULE_TEMPLATE_PATH = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcc/template.zip'
-
-@ICommand()
-export class LowCodeCreateComps extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'create [name]',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                }
-            ],
-            desc: '创建组件库',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@ArgsParams() params, @Log() log?: Logger) {
-        const res = await cloudService.request('ListUserCompositeGroups')
-        const comps = res?.data
-        if (!comps?.count) {
-            throw new CloudBaseError('没有可关联的云端组件库，请到低码控制台新建组件库！')
-        }
-
-        let compsName = params?.[0]
-        if (!compsName) {
-            const { selectCompsName } = await prompt<any>({
-                type: 'select',
-                name: 'selectCompsName',
-                message: '关联云端组件库:',
-                choices: comps.rows.map((row) => row.groupName)
-            })
-            compsName = selectCompsName
-        } else {
-            // 自己输入的组件库名称，校验是否在云端也有
-            const comp = comps.rows.find((row) => row.groupName === compsName)
-            if (!comp) {
-                throw new CloudBaseError(`云端不存在组件库 ${compsName}，请到低码控制台新建该组件库！`)
-            }
-        }
-
-        // TODO: 逻辑迁移到 lowcode-cli
-        await bootstrap(compsName, log);
-
-    }
-}
-
-@ICommand()
-export class LowCodeBuildComps extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'build',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                }
-            ],
-            desc: '构建组件库',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @Log() log) {
-        // 有RC配置, 使用新接口
-        const config = ctx.config.lowcodeCustomComponents
-        if (config) {
-            await graceBuildComps({
-                ...config,
-                context: config.context || process.cwd(),
-                logger: log
-            })
-            return
-        }
-        // 没有RC配置, 使用旧接口
-        const compsPath = path.resolve(process.cwd())
-        await _build(compsPath)
-    }
-}
-
-@ICommand()
-export class LowCodeDebugComps extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'debug',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                },
-                {
-                    flags: '--debug-port <debugPort>',
-                    desc: '调试端口，默认是8388'
-                },
-                {
-                    flags: '--wx-devtool-path <wxDevtoolPath>',
-                    desc: '微信开发者工具的安装路径'
-                }
-            ],
-            desc: '调试组件库',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options, @Log() log) {
-        // 有RC配置, 使用新接口
-        const config = ctx.config.lowcodeCustomComponents
-        if (config) {
-            await graceDebugComps({
-                ...config,
-                context: config.context || process.cwd(),
-                debugPort: options?.debugPort || 8388,
-                logger: log,
-                wxDevtoolPath: options?.wxDevtoolPath
-            })
-            return
-        }
-        // 没有RC配置, 使用旧接口
-        const compsPath = path.resolve(process.cwd())
-        await debugComps(compsPath, options?.debugPort || 8388)
-    }
-}
-
-@ICommand()
-export class LowCodePublishComps extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'publish',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                },
-                {
-                    flags: '--admin',
-                    desc: '是否使用admin接口',
-                    hideHelp: true
-                }
-            ],
-            desc: '发布组件库',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @Log() log: Logger, @ArgsOptions() options: any) {
-        // 有RC配置, 使用新接口
-
-        const config = ctx.config.lowcodeCustomComponents
-        if (config) {
-            await gracePublishComps({
-                ...config,
-                context: config.context || process.cwd(),
-                logger: log,
-                isAdmin: Boolean(options.admin)
-            })
-            log.success('组件库 - 已同步到云端，请到低码控制台发布该组件库！')
-            return
-        }
-        // 没有RC配置, 使用旧接口
-        // 读取本地组件库信息
-        const compsPath = path.resolve(process.cwd())
-        const compsName = fse.readJSONSync(path.resolve(compsPath, 'package.json')).name
-        // 读取云端组件库列表
-        const res = await cloudService.request('ListUserCompositeGroups')
-        const comps = res?.data
-        if (!comps?.count) {
-            throw new CloudBaseError(`云端不存在组件库 ${compsName}，请到低码控制台新建该组件库！`)
-        }
-        // 校验组件库信息
-        const comp = comps.rows.find((row) => row.groupName === compsName)
-        if (!comp) {
-            throw new CloudBaseError(`云端不存在组件库 ${compsName}，请到低码控制台新建该组件库！`)
-        }
-        // 上传组件库
-        await _build(compsPath)
-        await _publish({
-            id: comp.id,
-            name: compsName,
-            path: compsPath,
-            log,
-        })
-
-        log.info('\n👉 组件库已经同步到云端，请到低码控制台发布该组件库！')
-    }
-}
-
-@ICommand()
-export class LowCodePublishVersionComps extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'publishVersion',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                },
-                {
-                    flags: '--comment <comment>',
-                    desc: '版本备注',
-                },
-                {
-                    flags: '--tag <version>',
-                    desc: '版本号'
-                },
-                {
-                    flags: '--admin',
-                    desc: '是否使用admin接口',
-                    hideHelp: true
-                }
-            ],
-            desc: '发布组件库版本',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options, @Log() log?: Logger) {
-        // 有RC配置, 使用新接口
-        const {tag, comment, admin} = options
-        if(!comment) {
-            log.error('请使用 --comment 填写版本注释')
-            return
-        }
-        if(!tag) {
-            log.error('请使用 --tag 填写符合semver的版本号')
-            return
-        }
-        if(!semver.valid(tag)) {
-            log.error('组件库版本不符合semver标准')
-            return
-        }
-        const config = ctx.config.lowcodeCustomComponents
-
-        if(!config) {
-            log.error('组件库 - 请添加组件库配置到cloudbaserc.json 以使用该命令')
-        }
-        
-        const res = await publishVersion({
-            ...config,
-            context: config.context || process.cwd(),
-            logger: log,
-            isAdmin: options.admin
-        }, comment, tag)
-        if(res.data.code === 200) {
-            log.success('组件库 - 已发布新版本！')
-            return
-        }
-        if (res.data.code === 100) {
-            log.error('组件库 - 无待发布版本')
-            return
-        }
-        if (res.data.code === 201) {
-            log.error('组件库 - comment 重复， 请使用有意义的comment')
-            return
-        } else {
-            if(res.data.msg) {
-                log.error(`组件库 - ${res.data.msg} RequestId: ${res.requestId}`)
-            } else {
-                log.error('组件库 - 未知错误')
-            }
-            return
-        }
-    }
-}
-
-
-async function _build(compsPath) {
-    await execWithLoading(
-        async () => { 
-            await buildComps(compsPath)
-        },
-        {
-            startTip: '组件库 - 构建中',
-            successTip: '组件库 - 构建成功'
-        }
-    )
-}
-
-async function _publish(info: IPublishCompsInfo) {
-    await execWithLoading(
-        async () => {
-            await publishComps(info)
-        },
-        {
-            startTip: '组件库 - 发布中',
-            successTip: '组件库 - 发布成功'
-        }
-    )
-}
+import _ from 'lodash'
+import path from 'path'
+import { Command, ICommand } from '../common'
+import { InjectParams, Log, Logger, ArgsParams, ArgsOptions, CmdContext } from '../../decorators'
+import { CloudApiService, execWithLoading, fetchStream } from '../../utils'
+import { CloudBaseError } from '../../error'
+import chalk from 'chalk'
+import { 
+    build as buildComps, 
+    debug as debugComps, 
+    publishComps,  
+    graceBuildComps,
+    graceDebugComps,
+    gracePublishComps,
+    IPublishCompsInfo,
+    publishVersion,
+    bootstrap,
+} from '@cloudbase/lowcode-cli'
+import { prompt } from 'enquirer'
+import fse from 'fs-extra'
+import * as semver from 'semver'
+
+const cloudService = CloudApiService.getInstance('lowcode')
+const DEFAULE_TEMPLATE_PATH = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcc/template.zip'
+
+@ICommand()
+export class LowCodeCreateComps extends Command {
+    get options() {
+        return {
+            cmd: 'lowcode',
+            childCmd: 'create [name]',
+            options: [
+                {
+                    flags: '--verbose',
+                    desc: '是否打印详细日志'
+                }
+            ],
+            desc: '创建组件库',
+            requiredEnvId: false
+        }
+    }
+
+    @InjectParams()
+    async execute(@ArgsParams() params, @Log() log?: Logger) {
+        const res = await cloudService.request('ListUserCompositeGroups')
+        const comps = res?.data
+        if (!comps?.count) {
+            throw new CloudBaseError('没有可关联的云端组件库，请到低码控制台新建组件库！')
+        }
+
+        let compsName = params?.[0]
+        if (!compsName) {
+            const { selectCompsName } = await prompt<any>({
+                type: 'select',
+                name: 'selectCompsName',
+                message: '关联云端组件库:',
+                choices: comps.rows.map((row) => row.groupName)
+            })
+            compsName = selectCompsName
+        } else {
+            // 自己输入的组件库名称，校验是否在云端也有
+            const comp = comps.rows.find((row) => row.groupName === compsName)
+            if (!comp) {
+                throw new CloudBaseError(`云端不存在组件库 ${compsName}，请到低码控制台新建该组件库！`)
+            }
+        }
+
+        // TODO: 逻辑迁移到 lowcode-cli
+        await bootstrap(compsName, log);
+
+    }
+}
+
+@ICommand()
+export class LowCodeBuildComps extends Command {
+    get options() {
+        return {
+            cmd: 'lowcode',
+            childCmd: 'build',
+            options: [
+                {
+                    flags: '--verbose',
+                    desc: '是否打印详细日志'
+                }
+            ],
+            desc: '构建组件库',
+            requiredEnvId: false
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx, @Log() log) {
+        // 有RC配置, 使用新接口
+        const config = ctx.config.lowcodeCustomComponents
+        if (config) {
+            await graceBuildComps({
+                ...config,
+                context: config.context || process.cwd(),
+                logger: log
+            })
+            return
+        }
+        // 没有RC配置, 使用旧接口
+        const compsPath = path.resolve(process.cwd())
+        await _build(compsPath)
+    }
+}
+
+@ICommand()
+export class LowCodeDebugComps extends Command {
+    get options() {
+        return {
+            cmd: 'lowcode',
+            childCmd: 'debug',
+            options: [
+                {
+                    flags: '--verbose',
+                    desc: '是否打印详细日志'
+                },
+                {
+                    flags: '--debug-port <debugPort>',
+                    desc: '调试端口，默认是8388'
+                },
+                {
+                    flags: '--wx-devtool-path <wxDevtoolPath>',
+                    desc: '微信开发者工具的安装路径'
+                }
+            ],
+            desc: '调试组件库',
+            requiredEnvId: false
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx, @ArgsOptions() options, @Log() log) {
+        // 有RC配置, 使用新接口
+        const config = ctx.config.lowcodeCustomComponents
+        if (config) {
+            await graceDebugComps({
+                ...config,
+                context: config.context || process.cwd(),
+                debugPort: options?.debugPort || 8388,
+                logger: log,
+                wxDevtoolPath: options?.wxDevtoolPath
+            })
+            return
+        }
+        // 没有RC配置, 使用旧接口
+        const compsPath = path.resolve(process.cwd())
+        await debugComps(compsPath, options?.debugPort || 8388)
+    }
+}
+
+@ICommand()
+export class LowCodePublishComps extends Command {
+    get options() {
+        return {
+            cmd: 'lowcode',
+            childCmd: 'publish',
+            options: [
+                {
+                    flags: '--verbose',
+                    desc: '是否打印详细日志'
+                },
+                {
+                    flags: '--admin',
+                    desc: '是否使用admin接口',
+                    hideHelp: true
+                }
+            ],
+            desc: '发布组件库',
+            requiredEnvId: false
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx, @Log() log: Logger, @ArgsOptions() options: any) {
+        // 有RC配置, 使用新接口
+
+        const config = ctx.config.lowcodeCustomComponents
+        if (config) {
+            await gracePublishComps({
+                ...config,
+                context: config.context || process.cwd(),
+                logger: log,
+                isAdmin: Boolean(options.admin)
+            })
+            log.success('组件库 - 已同步到云端，请到低码控制台发布该组件库！')
+            return
+        }
+        // 没有RC配置, 使用旧接口
+        // 读取本地组件库信息
+        const compsPath = path.resolve(process.cwd())
+        const compsName = fse.readJSONSync(path.resolve(compsPath, 'package.json')).name
+        // 读取云端组件库列表
+        const res = await cloudService.request('ListUserCompositeGroups')
+        const comps = res?.data
+        if (!comps?.count) {
+            throw new CloudBaseError(`云端不存在组件库 ${compsName}，请到低码控制台新建该组件库！`)
+        }
+        // 校验组件库信息
+        const comp = comps.rows.find((row) => row.groupName === compsName)
+        if (!comp) {
+            throw new CloudBaseError(`云端不存在组件库 ${compsName}，请到低码控制台新建该组件库！`)
+        }
+        // 上传组件库
+        await _build(compsPath)
+        await _publish({
+            id: comp.id,
+            name: compsName,
+            path: compsPath,
+            log,
+        })
+
+        log.info('\n👉 组件库已经同步到云端，请到低码控制台发布该组件库！')
+    }
+}
+
+@ICommand()
+export class LowCodePublishVersionComps extends Command {
+    get options() {
+        return {
+            cmd: 'lowcode',
+            childCmd: 'publishVersion',
+            options: [
+                {
+                    flags: '--verbose',
+                    desc: '是否打印详细日志'
+                },
+                {
+                    flags: '--comment <comment>',
+                    desc: '版本备注',
+                },
+                {
+                    flags: '--tag <version>',
+                    desc: '版本号'
+                },
+                {
+                    flags: '--admin',
+                    desc: '是否使用admin接口',
+                    hideHelp: true
+                }
+            ],
+            desc: '发布组件库版本',
+            requiredEnvId: false
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx, @ArgsOptions() options, @Log() log?: Logger) {
+        // 有RC配置, 使用新接口
+        const {tag, comment, admin} = options
+        if(!comment) {
+            log.error('请使用 --comment 填写版本注释')
+            return
+        }
+        if(!tag) {
+            log.error('请使用 --tag 填写符合semver的版本号')
+            return
+        }
+        if(!semver.valid(tag)) {
+            log.error('组件库版本不符合semver标准')
+            return
+        }
+        const config = ctx.config.lowcodeCustomComponents
+
+        if(!config) {
+            log.error('组件库 - 请添加组件库配置到cloudbaserc.json 以使用该命令')
+        }
+        
+        const res = await publishVersion({
+            ...config,
+            context: config.context || process.cwd(),
+            logger: log,
+            isAdmin: options.admin
+        }, comment, tag)
+        if(res.data.code === 200) {
+            log.success('组件库 - 已发布新版本！')
+            return
+        }
+        if (res.data.code === 100) {
+            log.error('组件库 - 无待发布版本')
+            return
+        }
+        if (res.data.code === 201) {
+            log.error('组件库 - comment 重复， 请使用有意义的comment')
+            return
+        } else {
+            if(res.data.msg) {
+                log.error(`组件库 - ${res.data.msg} RequestId: ${res.requestId}`)
+            } else {
+                log.error('组件库 - 未知错误')
+            }
+            return
+        }
+    }
+}
+
+
+async function _build(compsPath) {
+    await execWithLoading(
+        async () => { 
+            await buildComps(compsPath)
+        },
+        {
+            startTip: '组件库 - 构建中',
+            successTip: '组件库 - 构建成功'
+        }
+    )
+}
+
+async function _publish(info: IPublishCompsInfo) {
+    await execWithLoading(
+        async () => {
+            await publishComps(info)
+        },
+        {
+            startTip: '组件库 - 发布中',
+            successTip: '组件库 - 发布成功'
+        }
+    )
+}

package/src/commands/lowcode/index.ts

@@ -1,2 +1,2 @@
-export * from './app'
+export * from './app'
 export * from './comps'