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

package/src/init/init.ts

@@ -1,121 +1,121 @@
-import path from 'node:path'
-import process from 'node:process'
-import fs from 'node:fs'
-import { fileURLToPath } from 'node:url'
-import consola from 'consola'
-import chalk from 'chalk'
-import ora from 'ora'
-import { scanWidgetPackage } from '@widget-js/utils'
-import { Utils } from '../utils'
-import promptChecker from '../promts/promptChecker'
-import { EJSUtils } from '../utils/EJSUtils'
-import { PrettierUtils } from '../utils/PrettierUtils'
-import { WidgetPackageUtils } from '../utils/WidgetPackageUtils'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-const spinner = ora('Loading')
-
-export async function init() {
-  await addDependencies()
-  await addWidgetTs()
-}
-
-async function addWidgetTs() {
-  const name = await promptChecker(
-    {
-      type: 'input',
-      name: 'name',
-      message: chalk.blue('组件包 包名 （示例 cn.widget.countdown）：'),
-    },
-    (answer) => {
-      const name = answer.name
-      if (name == null || name === '') {
-        consola.log(chalk.red(`包名不能为空`))
-        return false
-      }
-      return true
-    },
-  )
-
-  const widgetPackageTs = path.join(process.cwd(), 'widget.package.ts')
-  if (fs.existsSync(widgetPackageTs)) {
-    spinner.info('widget.package.ts已存在，跳过')
-  }
-  else {
-    spinner.info('创建 widget.package.ts')
-    await EJSUtils.renderToFile('WidgetPackage.ejs', widgetPackageTs, 'typescript', { name })
-  }
-
-  await addVitePlugin()
-  await createRouter()
-
-  spinner.succeed('初始化完成，请运行 npm install')
-}
-
-/**
- * 增加widget-js依赖
- */
-async function addDependencies() {
-  const packageJson = Utils.getPackageJson()
-  let dependencies = packageJson.dependencies
-  const devDependencies = packageJson.devDependencies
-  if (!dependencies) {
-    dependencies = {}
-  }
-  if (!devDependencies) {
-    packageJson.devDependencies = {}
-  }
-
-  await addDependency('@widget-js/core', dependencies)
-  await addDependency('@widget-js/vue3', dependencies)
-  await addDependency('@widget-js/vite-plugin-widget', devDependencies)
-
-  packageJson.dependencies = dependencies
-  packageJson.devDependencies = devDependencies
-
-  fs.writeFileSync(Utils.getPackagePath(), JSON.stringify(packageJson, null, 2))
-}
-
-async function addVitePlugin() {
-  spinner.info('添加 vite-plugin-widget 到 vite plugin')
-  const viteConfigPath = path.join(process.cwd(), 'vite.config.ts')
-  if (!fs.existsSync(viteConfigPath)) {
-    spinner.warn('vite.config.ts not exists')
-    return
-  }
-  let viteConfig = fs.readFileSync(viteConfigPath).toString()
-  viteConfig = `import widget from '@widget-js/vite-plugin-widget'\n${viteConfig}`
-  viteConfig = viteConfig.replace('vue()', `vue(),widget()`)
-  fs.writeFileSync(viteConfigPath, await PrettierUtils.format(viteConfig, 'typescript'))
-}
-
-async function createRouter() {
-  const widgetPackage = await scanWidgetPackage()
-  if (widgetPackage) {
-    spinner.info('创建 widget-router.ts')
-    const rootDir = WidgetPackageUtils.getRootDir(widgetPackage)
-    const widgetRouterPath = path.join(rootDir, 'widget-router.ts')
-    const routerContent = fs.readFileSync(path.join(__dirname, '../template/widget-router.ts'), 'utf8')
-    fs.writeFileSync(widgetRouterPath, routerContent)
-
-    const vueRouterPath = path.join(process.cwd(), './src/router/index.ts')
-    spinner.info('修改VueRouter配置')
-    if (fs.existsSync(vueRouterPath)) {
-      let vueRouterContent = fs.readFileSync(vueRouterPath, 'utf8')
-      const importStr = `import WidgetRouter from "../widgets/widget-router";`
-      vueRouterContent = `${importStr}\n${vueRouterContent}`
-      vueRouterContent = vueRouterContent.replace('routes: [', `routes: [\n...WidgetRouter,`)
-      fs.writeFileSync(vueRouterPath, await PrettierUtils.format(vueRouterContent, 'typescript'))
-    }
-  }
-}
-
-async function addDependency(packageName: string, dependencies: any) {
-  spinner.info(`Adding dependencies ${packageName}`)
-  if (dependencies[packageName]) {
-    return
-  }
-  const remoteVersion = await Utils.getRemoteVersion(packageName)
-  dependencies[packageName] = `^${remoteVersion}`
-}
+import path from 'node:path'
+import process from 'node:process'
+import fs from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import consola from 'consola'
+import chalk from 'chalk'
+import ora from 'ora'
+import { scanWidgetPackage } from '@widget-js/utils'
+import { Utils } from '../utils'
+import promptChecker from '../promts/promptChecker'
+import { EJSUtils } from '../utils/EJSUtils'
+import { PrettierUtils } from '../utils/PrettierUtils'
+import { WidgetPackageUtils } from '../utils/WidgetPackageUtils'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+const spinner = ora('Loading')
+
+export async function init() {
+  await addDependencies()
+  await addWidgetTs()
+}
+
+async function addWidgetTs() {
+  const name = await promptChecker(
+    {
+      type: 'input',
+      name: 'name',
+      message: chalk.blue('组件包 包名 （示例 cn.widget.countdown）：'),
+    },
+    (answer) => {
+      const name = answer.name
+      if (name == null || name === '') {
+        consola.log(chalk.red(`包名不能为空`))
+        return false
+      }
+      return true
+    },
+  )
+
+  const widgetPackageTs = path.join(process.cwd(), 'widget.package.ts')
+  if (fs.existsSync(widgetPackageTs)) {
+    spinner.info('widget.package.ts已存在，跳过')
+  }
+  else {
+    spinner.info('创建 widget.package.ts')
+    await EJSUtils.renderToFile('WidgetPackage.ejs', widgetPackageTs, 'typescript', { name })
+  }
+
+  await addVitePlugin()
+  await createRouter()
+
+  spinner.succeed('初始化完成，请运行 npm install')
+}
+
+/**
+ * 增加widget-js依赖
+ */
+async function addDependencies() {
+  const packageJson = Utils.getPackageJson()
+  let dependencies = packageJson.dependencies
+  const devDependencies = packageJson.devDependencies
+  if (!dependencies) {
+    dependencies = {}
+  }
+  if (!devDependencies) {
+    packageJson.devDependencies = {}
+  }
+
+  await addDependency('@widget-js/core', dependencies)
+  await addDependency('@widget-js/vue3', dependencies)
+  await addDependency('@widget-js/vite-plugin-widget', devDependencies)
+
+  packageJson.dependencies = dependencies
+  packageJson.devDependencies = devDependencies
+
+  fs.writeFileSync(Utils.getPackagePath(), JSON.stringify(packageJson, null, 2))
+}
+
+async function addVitePlugin() {
+  spinner.info('添加 vite-plugin-widget 到 vite plugin')
+  const viteConfigPath = path.join(process.cwd(), 'vite.config.ts')
+  if (!fs.existsSync(viteConfigPath)) {
+    spinner.warn('vite.config.ts not exists')
+    return
+  }
+  let viteConfig = fs.readFileSync(viteConfigPath).toString()
+  viteConfig = `import widget from '@widget-js/vite-plugin-widget'\n${viteConfig}`
+  viteConfig = viteConfig.replace('vue()', `vue(),widget()`)
+  fs.writeFileSync(viteConfigPath, await PrettierUtils.format(viteConfig, 'typescript'))
+}
+
+async function createRouter() {
+  const widgetPackage = await scanWidgetPackage()
+  if (widgetPackage) {
+    spinner.info('创建 widget-router.ts')
+    const rootDir = WidgetPackageUtils.getRootDir(widgetPackage)
+    const widgetRouterPath = path.join(rootDir, 'widget-router.ts')
+    const routerContent = fs.readFileSync(path.join(__dirname, '../template/widget-router.ts'), 'utf8')
+    fs.writeFileSync(widgetRouterPath, routerContent)
+
+    const vueRouterPath = path.join(process.cwd(), './src/router/index.ts')
+    spinner.info('修改VueRouter配置')
+    if (fs.existsSync(vueRouterPath)) {
+      let vueRouterContent = fs.readFileSync(vueRouterPath, 'utf8')
+      const importStr = `import WidgetRouter from "../widgets/widget-router";`
+      vueRouterContent = `${importStr}\n${vueRouterContent}`
+      vueRouterContent = vueRouterContent.replace('routes: [', `routes: [\n...WidgetRouter,`)
+      fs.writeFileSync(vueRouterPath, await PrettierUtils.format(vueRouterContent, 'typescript'))
+    }
+  }
+}
+
+async function addDependency(packageName: string, dependencies: any) {
+  spinner.info(`Adding dependencies ${packageName}`)
+  if (dependencies[packageName]) {
+    return
+  }
+  const remoteVersion = await Utils.getRemoteVersion(packageName)
+  dependencies[packageName] = `^${remoteVersion}`
+}

package/src/promts/promptChecker.ts

@@ -1,4 +1,4 @@
-import type { Answers, Question } from 'inquirer'
+import type { Answers, Question } from 'inquirer'
 import inquirer from 'inquirer'
 
 async function promptChecker<T extends Question>(prompt: T, checker?: (answer: any) => boolean): Promise<any> {
@@ -6,7 +6,7 @@ async function promptChecker<T extends Question>(prompt: T, checker?: (answer: a
   if (checker) {
     if (checker(answer)) {
       return answer[prompt.name!]
-    }
+    }
     else {
       return promptChecker(prompt, checker)
     }

package/src/publish/index.ts

@@ -0,0 +1,60 @@
+import fs from 'node:fs'
+import fastGlob from 'fast-glob'
+import axios from 'axios'
+import consola from 'consola'
+import ora from 'ora'
+/**
+ * 用fast-glob扫描运行目录下第一个 widget.json 文件
+ * 然后用axios发送post请求到 https://widgetjs.cn/api/widget/package，把key加到请求头中，把 widget.json 文件内容作为请求体
+ */
+export async function publish(options: { key: string }): Promise<void> {
+  if (!options.key) {
+    consola.error('Please provide a developer key with -k or --key option.')
+    return
+  }
+  const spinner = ora('Search widget.json').start()
+  try {
+    // Scan the current directory for the first widget.json file, ignore node_modules
+    const files = await fastGlob('**/widget.json', { onlyFiles: true, ignore: ['node_modules/**'], absolute: true })
+    if (files.length === 0) {
+      spinner.fail('No widget.json file found.')
+      return
+    }
+
+    spinner.succeed(`Widget.json found: ${files[0]}`)
+
+    const widgetPath = files[0]
+    const widgetContent = fs.readFileSync(widgetPath, 'utf-8')
+
+    const json = JSON.parse(widgetContent)
+    consola.info(`Package name:${json.name}`)
+    const widgets = json.widgets
+    consola.info(`Widget size:${widgets?.length ?? 0}`)
+
+    spinner.start('Publishing widget package...')
+    // Send a POST request to the specified URL with the widget content
+    const response = await axios.post('https://widgetjs.cn/api/v1/widget/package', json, {
+      headers: {
+        'Content-Type': 'application/json',
+        'Key': options.key,
+      },
+    })
+
+    if (response.data) {
+      if (response.data.code == 200) {
+        spinner.succeed('Widget published successfully.')
+      }
+      else {
+        spinner.fail('Failed to publish widget.')
+        consola.error(response.data.msg)
+      }
+    }
+    else {
+      spinner.fail('Empty Response')
+    }
+  }
+  catch (error) {
+    spinner.fail('Failed to publish widget.')
+    consola.error(error)
+  }
+}

package/src/release/ftp.ts

@@ -57,7 +57,7 @@ async function runSSH(sshConfig: Record<string, string | string[]>, releaseConfi
           }
           spinner.info(`Copying File: ${item.src} -> ${item.dest}`)
           await ftpClient.rcopy(item.src, item.dest)
-        }
+        }
         else {
           const localFile = path.resolve(process.cwd(), item.src as string)
           if (!item.remoteCopy && !fs.existsSync(localFile)) {
@@ -78,7 +78,7 @@ async function runSSH(sshConfig: Record<string, string | string[]>, releaseConfi
                 return true
               },
             })
-          }
+          }
           else {
             await checkParentDir(ftpClient, item.dest, (dir) => {
               spinner.succeed(`Create Dir: ${dir}`)
@@ -88,14 +88,14 @@ async function runSSH(sshConfig: Record<string, string | string[]>, releaseConfi
             await ftpClient.put(localFile, item.dest)
           }
         }
-      }
+      }
       else {
         await ftpClient.put(Buffer.from(JSON.stringify(item.src), 'utf-8'), item.dest)
       }
     }
     spinner.succeed('Files uploaded!')
     await ftpClient.end()
-  }
+  }
   catch (e) {
     spinner.fail(`Connection error:${e}`)
     await ftpClient.end()

package/src/release/oss.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs'
 import OSS from 'ali-oss'
 import chalk from 'chalk'
+import consola from 'consola'
 
 const packageData = JSON.parse(fs.readFileSync('./package.json').toString())
 export const AccessKeyID = packageData.oss?.id ?? 'default'
@@ -28,11 +29,11 @@ export async function put(ossPath: string, file: any) {
   try {
     // 填写OSS文件完整路径和本地文件的完整路径。OSS文件完整路径中不能包含Bucket名称。
     // 如果本地文件的完整路径中未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件。
-    const result = await clinet.put(ossPath, file, { headers })
-    console.log(chalk.green(`上传成功：${file}->${ossPath}`))
-  }
+    await clinet.put(ossPath, file, { headers })
+    consola.log(chalk.green(`上传成功：${file}->${ossPath}`))
+  }
   catch (e) {
-    console.log(e)
+    consola.log(e)
   }
 }
 
@@ -40,9 +41,9 @@ export async function copy(dist: string, src: string) {
   try {
     // 填写OSS文件完整路径和本地文件的完整路径。OSS文件完整路径中不能包含Bucket名称。
     // 如果本地文件的完整路径中未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件。
-    const result = await clinet.copy(dist, src, { headers })
-    console.log(chalk.green(`复制成功：${src}->${dist}`))
-  }
+    await clinet.copy(dist, src, { headers })
+    consola.log(chalk.green(`复制成功：${src}->${dist}`))
+  }
   catch (e) {
     console.error(e)
   }

package/src/release/update-zip.ts

@@ -6,8 +6,12 @@ function zipDirectory(sourceDir: string, outPath: string, ignoreDir?: string[])
   const stream = fs.createWriteStream(outPath)
 
   return new Promise<void>((resolve, reject) => {
+    const ignore: string[] = ['node_modules/**']
+    if (ignoreDir) {
+      ignore.push(...ignoreDir)
+    }
     archive
-      .glob('**/*', { cwd: sourceDir, ignore: ['node_modules/**'] })
+      .glob('**/*', { cwd: sourceDir, ignore })
       .on('error', err => reject(err))
       .pipe(stream)
 

package/src/utils/EJSUtils.ts

@@ -1,18 +1,18 @@
-import path from 'node:path'
-import fs from 'node:fs'
-import type { Data } from 'ejs'
-import ejs from 'ejs'
-import type { BuiltInParserName } from 'prettier'
-import { dirname } from 'dirname-filename-esm'
-import { PrettierUtils } from './PrettierUtils'
-
-export class EJSUtils {
-  static async renderToFile(templateFile: string, outputFile: string, parser: BuiltInParserName, renderOptions: Data) {
-    const defineTemplatePath = path.join(dirname(import.meta), '../template', templateFile)
-    const defineTemplate = fs.readFileSync(defineTemplatePath, 'utf8')
-    // Format the EJS code using Prettier
-    const code = ejs.render(defineTemplate, renderOptions)
-    const formattedEJSCode = await PrettierUtils.format(code, parser)
-    fs.writeFileSync(outputFile, formattedEJSCode)
-  }
-}
+import path from 'node:path'
+import fs from 'node:fs'
+import type { Data } from 'ejs'
+import ejs from 'ejs'
+import type { BuiltInParserName } from 'prettier'
+import { dirname } from 'dirname-filename-esm'
+import { PrettierUtils } from './PrettierUtils'
+
+export class EJSUtils {
+  static async renderToFile(templateFile: string, outputFile: string, parser: BuiltInParserName, renderOptions: Data) {
+    const defineTemplatePath = path.join(dirname(import.meta), '../template', templateFile)
+    const defineTemplate = fs.readFileSync(defineTemplatePath, 'utf8')
+    // Format the EJS code using Prettier
+    const code = ejs.render(defineTemplate, renderOptions)
+    const formattedEJSCode = await PrettierUtils.format(code, parser)
+    fs.writeFileSync(outputFile, formattedEJSCode)
+  }
+}

package/src/utils/PrettierUtils.ts

@@ -1,12 +1,12 @@
-import type { BuiltInParserName } from 'prettier'
-import { format } from 'prettier'
-
-export class PrettierUtils {
-  static async format(code: string, parser: BuiltInParserName) {
-    return format(code, {
-      parser,
-      tabWidth: 2,
-      singleQuote: true,
-    })
-  }
-}
+import type { BuiltInParserName } from 'prettier'
+import { format } from 'prettier'
+
+export class PrettierUtils {
+  static async format(code: string, parser: BuiltInParserName) {
+    return format(code, {
+      parser,
+      tabWidth: 2,
+      singleQuote: true,
+    })
+  }
+}

package/src/utils/WidgetPackageUtils.ts

@@ -1,13 +1,13 @@
-import path from 'node:path'
-import fs from 'node:fs'
-import type { WidgetPackage } from '@widget-js/core'
-
-export class WidgetPackageUtils {
-  static getRootDir(widgetPackage: WidgetPackage) {
-    const widgetRootDir = path.join(process.cwd(), widgetPackage.devOptions?.folder ?? './src/widgets')
-    if (!fs.existsSync(widgetRootDir)) {
-      fs.mkdirSync(widgetRootDir, { recursive: true })
-    }
-    return widgetRootDir
-  }
-}
+import path from 'node:path'
+import fs from 'node:fs'
+import type { WidgetPackage } from '@widget-js/core'
+
+export class WidgetPackageUtils {
+  static getRootDir(widgetPackage: WidgetPackage) {
+    const widgetRootDir = path.join(process.cwd(), widgetPackage.devOptions?.folder ?? './src/widgets')
+    if (!fs.existsSync(widgetRootDir)) {
+      fs.mkdirSync(widgetRootDir, { recursive: true })
+    }
+    return widgetRootDir
+  }
+}

package/src/utils.ts

@@ -4,16 +4,16 @@ import fs from 'node:fs'
 import packageJson from 'package-json'
 
 export const widgetPackages: { [key: string]: string } = {
-  '@widget-js/core': '',
-  '@widget-js/vue3': '',
-  '@widget-js/cli': '',
-  '@widget-js/utils': '',
+  '@widget-js/core': '',
+  '@widget-js/vue3': '',
+  '@widget-js/cli': '',
+  '@widget-js/utils': '',
   '@widget-js/vite-plugin-widget': '',
 }
 export default function exit(code: number = 0) {
   if (exports.exitProcess) {
     process.exit(code)
-  }
+  }
   else if (code > 0) {
     throw new Error(`Process exited with code ${code}`)
   }

package/template/WidgetDefine.ejs

@@ -1,22 +1,10 @@
 import {Widget, WidgetKeyword} from "@widget-js/core";
 //TODO 修改组件信息，标题，描述，关键词
-const name = "<%= widgetName %>";
-//组件标题
-const title = {"zh-CN": "<%= title %>"};
-//组件描述
-const description = {"zh-CN": ""};
-//组件关键词
-const keywords = [WidgetKeyword.RECOMMEND];
-//组件路由地址
-const path = "/widget/<%= snakeCaseName %>";
-//配置页路由地址
-const configPagePath = <% if (configurable) { %>"/widget/config/<%= snakeCaseName %>"<% } else { %>undefined<% } %>;
-//组件关键词
 const <%= name %>Widget = new Widget({
-name: name,
-title: title,
-description: description,
-keywords: keywords,
+name: "<%= widgetName %>",
+title: {"zh-CN": "<%= title %>"},
+description: {"zh-CN": ""},
+keywords: [WidgetKeyword.RECOMMEND],
 lang: "zh-CN",
 width: <%= width %>,
 height: <%= height %>,
@@ -25,8 +13,8 @@ maxWidth: <%= maxWidth %>,
 minHeight: <%= minHeight %>,
 maxHeight: <%= maxHeight %>,
 previewImage: "修改为组件预览图地址",
-path,
-configPagePath
+path: "/widget/<%= snakeCaseName %>",
+configPagePath: <% if (configurable) { %>"/widget/config/<%= snakeCaseName %>"<% } else { %>undefined<% } %>
 })
 
 export default <%= name %>Widget;

package/template/widget-router.ts

@@ -1,4 +1,4 @@
-import type { RouteRecordRaw } from 'vue-router'
+import type { RouteRecordRaw } from 'vue-router'
 
 // FBI WANING! IMPORT PLACE, DONT DELETE THIS LINE
 const WidgetRouter: RouteRecordRaw[] = [

package/vite.config.ts

@@ -1,15 +1,15 @@
-import { URL, fileURLToPath } from 'node:url'
-import widget from '@widget-js/vite-plugin-widget'
-
-import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [vue(), widget()],
-  resolve: {
-    alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url)),
-    },
-  },
-})
+import { URL, fileURLToPath } from 'node:url'
+import widget from '@widget-js/vite-plugin-widget'
+
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [vue(), widget()],
+  resolve: {
+    alias: {
+      '@': fileURLToPath(new URL('./src', import.meta.url)),
+    },
+  },
+})

package/.editorconfig

@@ -1,16 +0,0 @@
-[*]
-charset = utf-8
-end_of_line = crlf
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-max_line_length = 120
-tab_width = 2
-trim_trailing_whitespace = true
-ij_continuation_indent_size = 2
-ij_formatter_off_tag = @formatter:off
-ij_formatter_on_tag = @formatter:on
-ij_formatter_tags_enabled = false
-ij_smart_tabs = false
-ij_visual_guides = none
-ij_wrap_on_typing = false

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/jpa-buddy.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JpaBuddyIdeaProjectConfig">
-    <option name="renamerInitialized" value="true" />
-  </component>
-</project>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>