@widget-js/cli 24.1.1-beta.1 → 24.1.1-beta.15

package/src/createWidget.ts

@@ -1,232 +1,232 @@
-import path from 'node:path'
-import fs from 'node:fs'
-import { fileURLToPath } from 'node:url'
-import consola from 'consola'
-import { paramCase, snakeCase } from 'change-case'
-import inquirer from 'inquirer'
-import shell from 'shelljs'
-import chalk from 'chalk'
-import { scanWidgetPackage } from '@widget-js/utils'
-import exit from './utils.js'
-import promptChecker from './promts/promptChecker'
-import { EJSUtils } from './utils/EJSUtils'
-import { WidgetPackageUtils } from './utils/WidgetPackageUtils'
-
-// import vm from "vm";
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-interface RenderOptions {
-  name: string
-  snakeCaseName: string
-  paramCaseName: string
-  packageName: string
-  widgetName: string
-  title: string
-  configurable: string
-  width: number
-  height: number
-  maxWidth: number
-  minHeight: number
-  maxHeight: number
-  minWidth: number
-}
-
-export default async function createWidget() {
-  const widgetPackage = await scanWidgetPackage()
-  if (!widgetPackage) {
-    consola.error('widget.ts or widget.json not found')
-    return
-  }
-  const widgetRootDir = WidgetPackageUtils.getRootDir(widgetPackage)
-  if (widgetPackage.devOptions && widgetPackage.devOptions.folder) {
-    consola.info(`组件路径：${widgetRootDir}`)
-  }
-  else {
-    consola.info(`没有配置devOptions.folder，使用默认路径${widgetRootDir}`)
-  }
-
-  const getMiddleValue = (arr: number[]) => {
-    if (arr.length === 1) {
-      return arr[0]
-    }
-    else if (arr.length === 2) {
-      return Math.max(...arr)
-    }
-    else {
-      const max = Math.max(...arr)
-      const min = Math.min(...arr)
-      const sum = arr[0] + arr[1] + arr[2]
-      return sum - max - min
-    }
-  }
-
-  const name = await promptChecker(
-    {
-      type: 'input',
-      name: 'name',
-      message: chalk.blue('请输入组件名(大驼峰式)，如：CountdownClock'),
-    },
-    (answer) => {
-      const name = answer.name
-      if (name == null || name === '') {
-        consola.log(chalk.red('组件名不能为空'))
-        return false
-      }
-      return true
-    },
-  )
-
-  consola.log(chalk.green(name))
-
-  const title = await promptChecker({
-    type: 'input',
-    name: 'title',
-    message: chalk.blue('请输入组件标题，如：倒计时'),
-  })
-  consola.log(chalk.green(title))
-  const answerW = await promptChecker(
-    {
-      type: 'checkbox',
-      name: 'w',
-      message: chalk.blue(
-        '请选择组件宽度，最多选3个，例如选中2,4,6，代表组件最小宽为2，默认宽为4，最大宽为6，单选代表不可拉伸',
-      ),
-      choices: [1, 2, 3, 4, 5, 6],
-    },
-    (answer) => {
-      if (answer.w.length === 0) {
-        consola.log(chalk.red('宽度必须选择'))
-        return false
-      }
-
-      if (answer.w.length > 3) {
-        consola.log(chalk.red('宽度最多选择3个'))
-        return false
-      }
-      return true
-    },
-  )
-  consola.log(chalk.green(answerW))
-
-  const answerH = await promptChecker(
-    {
-      type: 'checkbox',
-      name: 'h',
-      message: chalk.blue(
-        '请选择组件高度，最多选3个，例如选中1,2，代表组件最小高为1，默认高为2，最大高为2，单选代表不可拉伸',
-      ),
-      choices: [1, 2, 3, 4, 5, 6],
-    },
-    (answer) => {
-      if (answer.h.length === 0) {
-        consola.log(chalk.red('高度必须选择'))
-        return false
-      }
-
-      if (answer.h.length > 3) {
-        consola.log(chalk.red('高度最多选择3个'))
-        return false
-      }
-      return true
-    },
-  )
-
-  consola.log(chalk.green(answerH))
-
-  const configurable = await promptChecker({
-    type: 'confirm',
-    name: 'configurable',
-    message: chalk.blue('组件是否可配置，例如修改背景颜色，字体大小等'),
-  })
-
-  consola.log(chalk.green(configurable))
-
-  const width = getMiddleValue(answerW)
-  const height = getMiddleValue(answerH)
-  const minWidth = Math.min(...answerW)
-  const maxWidth = Math.max(...answerW)
-  const minHeight = Math.min(...answerH)
-  const maxHeight = Math.max(...answerH)
-  const snakeCaseName = snakeCase(name)
-  const paramCaseName = paramCase(name)
-
-  const widgetName = `${widgetPackage.name}.${snakeCaseName}`
-
-  const widgetDir = path.join(widgetRootDir, paramCaseName)
-  if (!fs.existsSync(widgetDir)) {
-    fs.mkdirSync(widgetDir)
-  }
-  else {
-    const answer = await inquirer.prompt([
-      {
-        type: 'confirm',
-        name: 'override',
-        message: chalk.red('组件名已存在，是否继续?'),
-      },
-    ])
-    if (!answer.override) {
-      exit()
-    }
-  }
-
-  const renderOptions: RenderOptions = {
-    name,
-    snakeCaseName,
-    paramCaseName,
-    packageName: widgetPackage.name,
-    widgetName,
-    title,
-    configurable,
-    width,
-    height,
-    maxWidth,
-    minHeight,
-    maxHeight,
-    minWidth,
-  }
-
-  const widgetDefineFile = path.resolve(widgetDir, `${name}.widget.ts`)
-  const widgetFile = path.resolve(widgetDir, `${name}Widget.vue`)
-  const widgetViewFile = path.resolve(widgetDir, `${name}WidgetView.vue`)
-  const widgetRoutesFile = path.resolve(widgetDir, `${name}WidgetRoutes.ts`)
-
-  await EJSUtils.renderToFile('WidgetDefine.ejs', widgetDefineFile, 'typescript', renderOptions)
-  // EJSUtils.renderToFile('Widget.ejs', widgetFile, 'vue', renderOptions)
-  await EJSUtils.renderToFile('WidgetView.ejs', widgetViewFile, 'vue', renderOptions)
-  await EJSUtils.renderToFile('WidgetRoutes.ejs', widgetRoutesFile, 'typescript', renderOptions)
-  if (configurable) {
-    const configFile = path.resolve(widgetDir, `${name}ConfigView.vue`)
-    await EJSUtils.renderToFile('WidgetConfig.ejs', configFile, 'vue', renderOptions)
-  }
-  // 注册路由
-  const routeFile = path.join(widgetRootDir, 'widget-router.ts')
-  let routeContent
-  if (fs.existsSync(routeFile)) {
-    routeContent = fs.readFileSync(routeFile, 'utf8')
-  }
-  else {
-    routeContent = fs.readFileSync(path.join(__dirname, '../template/widget-router.ts'), 'utf8')
-  }
-  const importRouteStr = `import ${name}WidgetRoutes from "./${paramCaseName}/${name}WidgetRoutes";`
-  const routeStr = `...${name}WidgetRoutes,`
-  if (!routeContent.includes(importRouteStr)) {
-    routeContent = routeContent.replaceAll(
-      '//FBI WANING! IMPORT PLACE',
-      `${importRouteStr}\n//FBI WANING! IMPORT PLACE`,
-    )
-  }
-  if (!routeContent.includes(routeStr)) {
-    routeContent = routeContent.replaceAll('//FBI WANING! ROUTE PLACE', `${routeStr}\n    //FBI WANING! ROUTE PLACE`)
-  }
-
-  fs.writeFileSync(routeFile, routeContent)
-
-  // 添加到版本控制
-  const gitAdd = `git add ${widgetDir}`
-  consola.info(chalk.grey(gitAdd))
-  shell.exec(gitAdd)
-  consola.log('=================')
-  consola.info(`已创建组件：${widgetDir}`)
-  consola.success('Happy coding!')
-}
+import path from 'node:path'
+import fs from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import consola from 'consola'
+import { paramCase, snakeCase } from 'change-case'
+import inquirer from 'inquirer'
+import shell from 'shelljs'
+import chalk from 'chalk'
+import { scanWidgetPackage } from '@widget-js/utils'
+import exit from './utils.js'
+import promptChecker from './promts/promptChecker'
+import { EJSUtils } from './utils/EJSUtils'
+import { WidgetPackageUtils } from './utils/WidgetPackageUtils'
+
+// import vm from "vm";
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+interface RenderOptions {
+  name: string
+  snakeCaseName: string
+  paramCaseName: string
+  packageName: string
+  widgetName: string
+  title: string
+  configurable: string
+  width: number
+  height: number
+  maxWidth: number
+  minHeight: number
+  maxHeight: number
+  minWidth: number
+}
+
+export default async function createWidget() {
+  const widgetPackage = await scanWidgetPackage()
+  if (!widgetPackage) {
+    consola.error('widget.ts or widget.json not found')
+    return
+  }
+  const widgetRootDir = WidgetPackageUtils.getRootDir(widgetPackage)
+  if (widgetPackage.devOptions && widgetPackage.devOptions.folder) {
+    consola.info(`组件路径：${widgetRootDir}`)
+  }
+  else {
+    consola.info(`没有配置devOptions.folder，使用默认路径${widgetRootDir}`)
+  }
+
+  const getMiddleValue = (arr: number[]) => {
+    if (arr.length === 1) {
+      return arr[0]
+    }
+    else if (arr.length === 2) {
+      return Math.max(...arr)
+    }
+    else {
+      const max = Math.max(...arr)
+      const min = Math.min(...arr)
+      const sum = arr[0] + arr[1] + arr[2]
+      return sum - max - min
+    }
+  }
+
+  const name = await promptChecker(
+    {
+      type: 'input',
+      name: 'name',
+      message: chalk.blue('请输入组件名(大驼峰式)，如：CountdownClock'),
+    },
+    (answer) => {
+      const name = answer.name
+      if (name == null || name === '') {
+        consola.log(chalk.red('组件名不能为空'))
+        return false
+      }
+      return true
+    },
+  )
+
+  consola.log(chalk.green(name))
+
+  const title = await promptChecker({
+    type: 'input',
+    name: 'title',
+    message: chalk.blue('请输入组件标题，如：倒计时'),
+  })
+  consola.log(chalk.green(title))
+  const answerW = await promptChecker(
+    {
+      type: 'checkbox',
+      name: 'w',
+      message: chalk.blue(
+        '请选择组件宽度，最多选3个，例如选中2,4,6，代表组件最小宽为2，默认宽为4，最大宽为6，单选代表不可拉伸',
+      ),
+      choices: [1, 2, 3, 4, 5, 6],
+    },
+    (answer) => {
+      if (answer.w.length === 0) {
+        consola.log(chalk.red('宽度必须选择'))
+        return false
+      }
+
+      if (answer.w.length > 3) {
+        consola.log(chalk.red('宽度最多选择3个'))
+        return false
+      }
+      return true
+    },
+  )
+  consola.log(chalk.green(answerW))
+
+  const answerH = await promptChecker(
+    {
+      type: 'checkbox',
+      name: 'h',
+      message: chalk.blue(
+        '请选择组件高度，最多选3个，例如选中1,2，代表组件最小高为1，默认高为2，最大高为2，单选代表不可拉伸',
+      ),
+      choices: [1, 2, 3, 4, 5, 6],
+    },
+    (answer) => {
+      if (answer.h.length === 0) {
+        consola.log(chalk.red('高度必须选择'))
+        return false
+      }
+
+      if (answer.h.length > 3) {
+        consola.log(chalk.red('高度最多选择3个'))
+        return false
+      }
+      return true
+    },
+  )
+
+  consola.log(chalk.green(answerH))
+
+  const configurable = await promptChecker({
+    type: 'confirm',
+    name: 'configurable',
+    message: chalk.blue('组件是否可配置，例如修改背景颜色，字体大小等'),
+  })
+
+  consola.log(chalk.green(configurable))
+
+  const width = getMiddleValue(answerW)
+  const height = getMiddleValue(answerH)
+  const minWidth = Math.min(...answerW)
+  const maxWidth = Math.max(...answerW)
+  const minHeight = Math.min(...answerH)
+  const maxHeight = Math.max(...answerH)
+  const snakeCaseName = snakeCase(name)
+  const paramCaseName = paramCase(name)
+
+  const widgetName = `${widgetPackage.name}.${snakeCaseName}`
+
+  const widgetDir = path.join(widgetRootDir, paramCaseName)
+  if (!fs.existsSync(widgetDir)) {
+    fs.mkdirSync(widgetDir)
+  }
+  else {
+    const answer = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'override',
+        message: chalk.red('组件名已存在，是否继续?'),
+      },
+    ])
+    if (!answer.override) {
+      exit()
+    }
+  }
+
+  const renderOptions: RenderOptions = {
+    name,
+    snakeCaseName,
+    paramCaseName,
+    packageName: widgetPackage.name,
+    widgetName,
+    title,
+    configurable,
+    width,
+    height,
+    maxWidth,
+    minHeight,
+    maxHeight,
+    minWidth,
+  }
+
+  const widgetDefineFile = path.resolve(widgetDir, `${name}.widget.ts`)
+  const widgetFile = path.resolve(widgetDir, `${name}Widget.vue`)
+  const widgetViewFile = path.resolve(widgetDir, `${name}WidgetView.vue`)
+  const widgetRoutesFile = path.resolve(widgetDir, `${name}WidgetRoutes.ts`)
+
+  await EJSUtils.renderToFile('WidgetDefine.ejs', widgetDefineFile, 'typescript', renderOptions)
+  // EJSUtils.renderToFile('Widget.ejs', widgetFile, 'vue', renderOptions)
+  await EJSUtils.renderToFile('WidgetView.ejs', widgetViewFile, 'vue', renderOptions)
+  await EJSUtils.renderToFile('WidgetRoutes.ejs', widgetRoutesFile, 'typescript', renderOptions)
+  if (configurable) {
+    const configFile = path.resolve(widgetDir, `${name}ConfigView.vue`)
+    await EJSUtils.renderToFile('WidgetConfig.ejs', configFile, 'vue', renderOptions)
+  }
+  // 注册路由
+  const routeFile = path.join(widgetRootDir, 'widget-router.ts')
+  let routeContent
+  if (fs.existsSync(routeFile)) {
+    routeContent = fs.readFileSync(routeFile, 'utf8')
+  }
+  else {
+    routeContent = fs.readFileSync(path.join(__dirname, '../template/widget-router.ts'), 'utf8')
+  }
+  const importRouteStr = `import ${name}WidgetRoutes from "./${paramCaseName}/${name}WidgetRoutes";`
+  const routeStr = `...${name}WidgetRoutes,`
+  if (!routeContent.includes(importRouteStr)) {
+    routeContent = routeContent.replaceAll(
+      '//FBI WANING! IMPORT PLACE',
+      `${importRouteStr}\n//FBI WANING! IMPORT PLACE`,
+    )
+  }
+  if (!routeContent.includes(routeStr)) {
+    routeContent = routeContent.replaceAll('//FBI WANING! ROUTE PLACE', `${routeStr}\n    //FBI WANING! ROUTE PLACE`)
+  }
+
+  fs.writeFileSync(routeFile, routeContent)
+
+  // 添加到版本控制
+  const gitAdd = `git add ${widgetDir}`
+  consola.info(chalk.grey(gitAdd))
+  shell.exec(gitAdd)
+  consola.log('=================')
+  consola.info(`已创建组件：${widgetDir}`)
+  consola.success('Happy coding!')
+}

package/src/dependencies/index.ts

@@ -6,7 +6,7 @@ export default async function (options: any) {
   const type = options.type as DependenciesOptions
   if (type == 'remote') {
     await RemoteDependencies.start()
-  }
+  }
   else {
     await LocalDependencies.start()
   }

package/src/index.ts

@@ -10,7 +10,7 @@ import { dirname } from 'dirname-filename-esm'
 //
 const packageJsonPath = path.join(dirname(import.meta), '../package.json')
 const cliPackage = JSON.parse(fs.readFileSync(packageJsonPath).toString())
-
+// eslint-disable-next-line no-console
 console.log(gradient.pastel.multiline(figlet.textSync('widget-cli', { horizontalLayout: 'full' })))
 program.version(`@widget-js/cli ${cliPackage.version}`).usage('<command> [options]')
 program
@@ -40,6 +40,16 @@ program
     await init.init()
   })
 
+const keyOption = new Option('-k, --key <key>')
+program
+  .command('publish')
+  .description('Publish widget package with developer key')
+  .addOption(keyOption)
+  .action(async (options) => {
+    const publishImport = await import('./publish/index')
+    await publishImport.publish(options)
+  })
+
 const typeOption = new Option('-t, --type <type>').choices(['ftp', 'oss'])
 const fileOption = new Option('-f, --file <file>')
 program
@@ -47,8 +57,7 @@ program
   .description('通过FTP/OSS发布文件，仅内部使用')
   .addOption(typeOption)
   .addOption(fileOption)
-  .action(async (options, command) => {
-    // @ts-expect-error
+  .action(async (options) => {
     const release = await import('./release/release')
     await release.default(options)
   })