@widget-js/cli 1.2.11 → 24.1.1-beta.2

package/src/promts/promptChecker.ts

@@ -1,15 +1,17 @@
-import inquirer, {Answers, Question} from "inquirer";
+import type { Answers, Question } from 'inquirer'
+import inquirer from 'inquirer'
 
-const promptChecker = async <T extends Question>(prompt:T, checker?:(answer:any)=>boolean):Promise<any> => {
-  const answer:Answers = await inquirer.prompt([prompt]);
+async function promptChecker<T extends Question>(prompt: T, checker?: (answer: any) => boolean): Promise<any> {
+  const answer: Answers = await inquirer.prompt([prompt])
   if (checker) {
     if (checker(answer)) {
-      return answer[prompt.name!];
-    } else {
-      return promptChecker(prompt, checker);
+      return answer[prompt.name!]
+    }
+    else {
+      return promptChecker(prompt, checker)
     }
   }
-  return answer[prompt.name!];
+  return answer[prompt.name!]
 }
 
-export default promptChecker;
+export default promptChecker

package/src/release/ftp.ts

@@ -1,21 +1,21 @@
-import path from 'path'
-import fs from 'fs'
+import path from 'node:path'
+import fs from 'node:fs'
+import os from 'node:os'
+import * as process from 'node:process'
 import SSHConfig from '@widget-js/ssh-config'
-import os from 'os'
 import Client from 'ssh2-sftp-client'
 import consola from 'consola'
 import inquirer from 'inquirer'
 import ora from 'ora'
-import * as process from 'process'
-import {Utils} from '../utils'
-import {minimatch} from 'minimatch'
+import { minimatch } from 'minimatch'
+import { Utils } from '../utils'
 
 interface PasswordAnswer {
   password: string
 }
 
 async function checkParentDir(ftpClient: Client, file: string, onMkdir: (dir: string) => void) {
-  let dir = path.dirname(file)
+  const dir = path.dirname(file)
   const dirExists = await ftpClient.exists(dir)
   if (!dirExists) {
     onMkdir(dir)
@@ -26,38 +26,39 @@ async function checkParentDir(ftpClient: Client, file: string, onMkdir: (dir: st
 async function runSSH(sshConfig: Record<string, string | string[]>, releaseConfig: ReleaseConfig) {
   consola.info('run ssh:', sshConfig)
   const answer = await inquirer.prompt<PasswordAnswer>([
-    {type: 'password', name: 'password', mask: '*', message: 'Enter key pair password'},
+    { type: 'password', name: 'password', mask: '*', message: 'Enter key pair password' },
   ])
 
-  let ftpClient = new Client()
-  const port = sshConfig['Port']
+  const ftpClient = new Client()
+  const port = sshConfig.Port
   const key = fs.readFileSync(path.resolve(os.homedir(), '.ssh/id_rsa'))
   const spinner = ora('Connecting')
   try {
     spinner.start()
     await ftpClient.connect({
-      host: sshConfig['HostName'] as string,
-      port: port ? parseInt(port as string) : 22,
-      username: sshConfig['User'] as string,
+      host: sshConfig.HostName as string,
+      port: port ? Number.parseInt(port as string) : 22,
+      username: sshConfig.User as string,
       passphrase: answer.password,
       privateKey: key,
     })
     releaseConfig.fileMap.sort((it1, it2) => (it1.order ?? 0) - (it2.order ?? 0))
     // upload files
-    for (let item of releaseConfig.fileMap) {
+    for (const item of releaseConfig.fileMap) {
       if (typeof item.src == 'string') {
         if (item.remoteCopy) {
-          await checkParentDir(ftpClient, item.dest, dir => {
+          await checkParentDir(ftpClient, item.dest, (dir) => {
             spinner.warn(`Create Dir: ${dir}`)
           })
-          let destExists = await ftpClient.exists(item.dest)
+          const destExists = await ftpClient.exists(item.dest)
           if (destExists) {
             spinner.warn(`Delete exists file:${item.dest}`)
             await ftpClient.delete(item.dest)
           }
           spinner.info(`Copying File: ${item.src} -> ${item.dest}`)
           await ftpClient.rcopy(item.src, item.dest)
-        } else {
+        }
+        else {
           const localFile = path.resolve(process.cwd(), item.src as string)
           if (!item.remoteCopy && !fs.existsSync(localFile)) {
             spinner.warn(`Skip not exists file:${localFile}`)
@@ -66,19 +67,20 @@ async function runSSH(sshConfig: Record<string, string | string[]>, releaseConfi
           if (fs.lstatSync(localFile).isDirectory()) {
             spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`)
             await ftpClient.uploadDir(localFile, item.dest, {
-              filter: (filePath: string, isDirectory: boolean):boolean => {
+              filter: (filePath: string, isDirectory: boolean): boolean => {
                 if (item.ignorePattern && !isDirectory) {
-                  let fileName = path.basename(filePath)
+                  const fileName = path.basename(filePath)
                   if (minimatch(fileName, item.ignorePattern)) {
                     spinner.warn(`Skip file:${filePath}`)
                     return false
                   }
                 }
-                return true;
+                return true
               },
             })
-          } else {
-            await checkParentDir(ftpClient, item.dest, dir => {
+          }
+          else {
+            await checkParentDir(ftpClient, item.dest, (dir) => {
               spinner.succeed(`Create Dir: ${dir}`)
             })
 
@@ -86,13 +88,15 @@ async function runSSH(sshConfig: Record<string, string | string[]>, releaseConfi
             await ftpClient.put(localFile, item.dest)
           }
         }
-      } else {
+      }
+      else {
         await ftpClient.put(Buffer.from(JSON.stringify(item.src), 'utf-8'), item.dest)
       }
     }
     spinner.succeed('Files uploaded!')
     await ftpClient.end()
-  } catch (e) {
+  }
+  catch (e) {
     spinner.fail(`Connection error:${e}`)
     await ftpClient.end()
   }
@@ -104,13 +108,13 @@ export async function ftpUpload(releaseFile: string = 'release.json') {
   const packageVersion = Utils.getPackageVersion()
   consola.info('Package Version:', packageVersion)
 
-  let releaseJson = fs.readFileSync(releaseJsonFilePath).toString().replaceAll('${version}', packageVersion)
+  const releaseJson = fs.readFileSync(releaseJsonFilePath).toString().replaceAll('${version}', packageVersion)
   const releaseConfig = JSON.parse(releaseJson) as ReleaseConfig
   const sshConfigFile = path.resolve(os.homedir(), '.ssh/config')
   consola.info('SSH Config File Path:', sshConfigFile)
   const sshConfigs = SSHConfig.parse(fs.readFileSync(sshConfigFile).toString())
-  for (let host of releaseConfig.ftpConfig.host) {
-    let sshConfig = sshConfigs.compute(host)
+  for (const host of releaseConfig.ftpConfig.host) {
+    const sshConfig = sshConfigs.compute(host)
     if (!sshConfig) {
       consola.error(`SSH config ${releaseConfig.ftpConfig.host} not found`)
       return

package/src/release/oss.ts

@@ -1,47 +1,50 @@
-import OSS from "ali-oss";
-import fs from "fs";
-import chalk from "chalk";
+import fs from 'node:fs'
+import OSS from 'ali-oss'
+import chalk from 'chalk'
+import consola from 'consola'
 
-let packageData = JSON.parse(fs.readFileSync("./package.json").toString());
-export const AccessKeyID = packageData.oss?.id ?? "default";
-export const AccessKeySecret = packageData.oss?.secret ?? "default";
+const packageData = JSON.parse(fs.readFileSync('./package.json').toString())
+export const AccessKeyID = packageData.oss?.id ?? 'default'
+export const AccessKeySecret = packageData.oss?.secret ?? 'default'
 
 const headers = {
-    // 指定Object的存储类型。
-    'x-oss-storage-class': 'Standard',
-    // 指定Object的访问权限。
-    'x-oss-object-acl': 'public-read',
-    'x-oss-forbid-overwrite': 'false',
-    'Cache-Control': 'no-cache'
-};
+  // 指定Object的存储类型。
+  'x-oss-storage-class': 'Standard',
+  // 指定Object的访问权限。
+  'x-oss-object-acl': 'public-read',
+  'x-oss-forbid-overwrite': 'false',
+  'Cache-Control': 'no-cache',
+}
 
 const clinet = new OSS({
-    // yourRegion填写Bucket所在地域。以华东1（杭州）为例，Region填写为oss-cn-hangzhou。
-    region: 'oss-cn-hangzhou',
-    // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
-    accessKeyId: AccessKeyID,
-    accessKeySecret: AccessKeySecret,
-    bucket: 'widget-fun',
-});
+  // yourRegion填写Bucket所在地域。以华东1（杭州）为例，Region填写为oss-cn-hangzhou。
+  region: 'oss-cn-hangzhou',
+  // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
+  accessKeyId: AccessKeyID,
+  accessKeySecret: AccessKeySecret,
+  bucket: 'widget-fun',
+})
 
-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}`));
-    } catch (e) {
-        console.log(e);
-    }
+export async function put(ossPath: string, file: any) {
+  try {
+    // 填写OSS文件完整路径和本地文件的完整路径。OSS文件完整路径中不能包含Bucket名称。
+    // 如果本地文件的完整路径中未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件。
+    await clinet.put(ossPath, file, { headers })
+    consola.log(chalk.green(`上传成功：${file}->${ossPath}`))
+  }
+  catch (e) {
+    consola.log(e)
+  }
 }
 
-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}`));
-    } catch (e) {
-        console.error(e);
-    }
+export async function copy(dist: string, src: string) {
+  try {
+    // 填写OSS文件完整路径和本地文件的完整路径。OSS文件完整路径中不能包含Bucket名称。
+    // 如果本地文件的完整路径中未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件。
+    await clinet.copy(dist, src, { headers })
+    consola.log(chalk.green(`复制成功：${src}->${dist}`))
+  }
+  catch (e) {
+    console.error(e)
+  }
 }

package/src/release/release.ts

@@ -1,30 +1,24 @@
-import fs from 'fs'
-import path from 'path'
+import fs from 'node:fs'
+import path from 'node:path'
+import { Buffer } from 'node:buffer'
+import chalk from 'chalk'
+import consola from 'consola'
 import promptChecker from '../promts/promptChecker.js'
 import zipDirectory from './update-zip.js'
-import {copy, put} from './oss.js'
-import chalk from 'chalk'
-import {ftpUpload} from './ftp'
-
-async function delay(time: number) {
-  return new Promise<void>((resolve, reject) => {
-    setTimeout(() => {
-      resolve()
-    }, time)
-  })
-}
+import { copy, put } from './oss.js'
+import { ftpUpload } from './ftp'
 
-const release = async (options: any) => {
+async function release(options: any) {
   if (options.type == 'ftp') {
     await ftpUpload(options.file)
     return
   }
   const packageJSON = JSON.parse(fs.readFileSync('package.json', 'utf-8'))
   const changelogJSON = JSON.parse(fs.readFileSync('changelog.json', 'utf-8'))
-  const version = packageJSON['version']
+  const version = packageJSON.version
   const changelog = changelogJSON[version]
 
-  let needUpdateElectron = await promptChecker({
+  const needUpdateElectron = await promptChecker({
     type: 'confirm',
     name: 'electron',
     message: chalk.blue('用户是否需要更新Electron?'),
@@ -37,7 +31,7 @@ const release = async (options: any) => {
   // });
 
   const versionInfo = {
-    version: version,
+    version,
     releaseNote: changelog,
     updateElectron: needUpdateElectron,
     updateNodeModule: false,
@@ -54,24 +48,23 @@ const release = async (options: any) => {
   }
   const updateZipPath = path.join(`./dist/update.zip`)
 
-  console.log(chalk.blue('压缩更新文件中'))
+  consola.log(chalk.blue('压缩更新文件中'))
   await zipDirectory('./release', updateZipPath)
 
-  console.log(chalk.blue('上传installer.exe到OSS'))
+  consola.log(chalk.blue('上传installer.exe到OSS'))
   await put('version/installer.exe', installerPath)
 
-  console.log(chalk.blue('上传update.zip到OSS'))
+  consola.log(chalk.blue('上传update.zip到OSS'))
   await put('version/update.zip', updateZipPath)
 
-  console.log(chalk.blue('更新版本信息'))
+  consola.log(chalk.blue('更新版本信息'))
   versionInfo.downloadLink = 'https://widget-fun.oss-cn-hangzhou.aliyuncs.com/version/update.zip'
   const versionJSON = JSON.stringify(versionInfo, null, 2)
   await put('version/version.json', Buffer.from(versionJSON))
 
-  copy(`version/history/${version}.exe`, 'version/installer.exe')
-  copy(`version/history/update-${version}.zip`, 'version/update.zip')
+  await Promise.all([copy(`version/history/${version}.exe`, 'version/installer.exe'), copy(`version/history/update-${version}.zip`, 'version/update.zip')])
 
-  console.log(chalk.yellow(versionJSON))
+  consola.log(chalk.yellow(versionJSON))
 }
 
 export default release

package/src/release/update-zip.ts

@@ -1,19 +1,19 @@
-import fs from "fs";
-import archiver from "archiver";
+import fs from 'node:fs'
+import archiver from 'archiver'
 
-function zipDirectory(sourceDir:string, outPath:string, ignoreDir?:string[]) {
-    const archive = archiver('zip', {zlib: {level: 9}});
-    const stream = fs.createWriteStream(outPath);
+function zipDirectory(sourceDir: string, outPath: string, ignoreDir?: string[]) {
+  const archive = archiver('zip', { zlib: { level: 9 } })
+  const stream = fs.createWriteStream(outPath)
 
-    return new Promise<void>((resolve, reject) => {
-        archive
-            .glob("**/*", {cwd: sourceDir, ignore: ['node_modules/**']})
-            .on('error', err => reject(err))
-            .pipe(stream);
+  return new Promise<void>((resolve, reject) => {
+    archive
+      .glob('**/*', { cwd: sourceDir, ignore: ['node_modules/**'] })
+      .on('error', err => reject(err))
+      .pipe(stream)
 
-        stream.on('close', () => resolve());
-        archive.finalize();
-    });
+    stream.on('close', () => resolve())
+    archive.finalize()
+  })
 }
 
-export default zipDirectory;
+export default zipDirectory

package/src/utils/EJSUtils.ts

@@ -1,17 +1,18 @@
-import path from 'path'
-import fs from 'fs'
-import ejs, {Data} from 'ejs'
-import {BuiltInParserName} from 'prettier'
-import {dirname} from 'dirname-filename-esm'
-import {PrettierUtils} from './PrettierUtils'
+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)
-    let defineTemplate = fs.readFileSync(defineTemplatePath, 'utf8')
+    const defineTemplate = fs.readFileSync(defineTemplatePath, 'utf8')
     // Format the EJS code using Prettier
-    let code = ejs.render(defineTemplate, renderOptions)
-    const formattedEJSCode =await PrettierUtils.format(code,parser)
+    const code = ejs.render(defineTemplate, renderOptions)
+    const formattedEJSCode = await PrettierUtils.format(code, parser)
     fs.writeFileSync(outputFile, formattedEJSCode)
   }
 }

package/src/utils/PrettierUtils.ts

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

package/src/utils/WidgetPackageUtils.ts

@@ -1,13 +1,13 @@
-import path from 'path'
-import {WidgetPackage} from '@widget-js/core'
-import fs from "fs";
+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})
+      fs.mkdirSync(widgetRootDir, { recursive: true })
     }
-    return widgetRootDir;
+    return widgetRootDir
   }
 }

package/src/utils.ts

@@ -1,41 +1,45 @@
-import path from "path";
-import process from "process";
-import fs from "fs";
-import packageJson from "package-json";
+import path from 'node:path'
+import process from 'node:process'
+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/vite-plugin-widget": ""
-};
+  '@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}`);
+    process.exit(code)
+  }
+  else if (code > 0) {
+    throw new Error(`Process exited with code ${code}`)
   }
 }
 
 export function getPackagePath() {
-  return path.join(process.cwd(), "package.json");
+  return path.join(process.cwd(), 'package.json')
 }
 
-
 export class Utils {
   static async getRemoteVersion(packageName: string): Promise<string> {
-    const metadata = await packageJson(packageName);
-    let version = metadata["version"];
-    return version as string;
+    const metadata = await packageJson(packageName)
+    const version = metadata.version
+    return version as string
   }
 
   static getPackagePath() {
-    return path.join(process.cwd(), "package.json");
+    return path.join(process.cwd(), 'package.json')
   }
 
   static getPackageJson() {
-    return JSON.parse(fs.readFileSync(this.getPackagePath()).toString());
+    return JSON.parse(fs.readFileSync(this.getPackagePath()).toString())
   }
 
- static getPackageVersion() {
-    return this.getPackageJson()["version"];
+  static getPackageVersion() {
+    return this.getPackageJson().version
   }
 
   /**
@@ -45,36 +49,36 @@ export class Utils {
    * 3.不能包含连续的小数点
    * @param name
    */
-  static checkPackageName(name: string):boolean {
+  static checkPackageName(name: string): boolean {
     // 检查包名是否以小数点结尾
     if (name.endsWith('.')) {
-      return false;
+      return false
     }
 
     // 检查包名是否包含无效字符
-    const invalidCharacters = /[\\/:*?\"<>| ]/g;
+    const invalidCharacters = /[\\/:*?\"<>| ]/g
     if (name.match(invalidCharacters)) {
-      return false;
+      return false
     }
 
     // 检查包名是否至少包含一个子段
-    const segments = name.split('.');
+    const segments = name.split('.')
     if (segments.length < 2) {
-      return false;
+      return false
     }
 
     // 检查每个子段是否以字母开头
     for (const segment of segments) {
       if (!segment.match(/^[a-z]/)) {
-        return false;
+        return false
       }
 
       // 检查子段是否包含连续的小数点
       if (segment.includes('.' + '.')) {
-        return false;
+        return false
       }
     }
 
-    return true;
+    return true
   }
 }

package/template/WidgetConfig.ejs

@@ -1,23 +1,24 @@
 <template>
     <widget-edit-dialog :widget-params="widgetParams" :option="widgetConfigOption"
-                        :widget-data="widgetData"
+                        v-model="widgetData"
                         @apply="save()"
                         @confirm="save({ closeWindow: true })">
     </widget-edit-dialog>
 </template>
 
 <script lang="ts" setup>
-import {useWidget, WidgetConfigOption, WidgetEditDialog} from "@widget-js/vue3";
+import {useWidget, WidgetConfigOption} from "@widget-js/vue3";
 import {WidgetData} from "@widget-js/core";
 
 const {widgetData, widgetParams, save} = useWidget(WidgetData)
 
 //修改成需要设置组件参数配置
 const widgetConfigOption = new WidgetConfigOption({
-  custom: true,
-  backgroundColor: true,
-  borderRadius: true,
-  preview: false
+  theme:{
+    backgroundColor: true,
+    borderRadius: true,
+    color:true
+  }
 });
 
 </script>

package/template/widget-router.ts

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

package/test/index.test.ts

@@ -1,9 +1,9 @@
-import {expect, test} from "vitest";
-import {minimatch} from "minimatch";
-import path from "path";
+import path from 'node:path'
+import { expect } from 'vitest'
+import { minimatch } from 'minimatch'
 
-test('minimatch',()=>{
-  let fileName = path.basename('C:\\Users\\rtuge\\Desktop\\github\\widgetjs\\packages\\@widget-js\\cli\\template\\Widget.ejs');
-  expect(minimatch(fileName,'*.ejs')).toBeTruthy()
-  expect(minimatch(fileName,'*.ts')).toBeFalsy()
+it('minimatch', () => {
+  const fileName = path.basename('C:\\Users\\rtuge\\Desktop\\github\\widgetjs\\packages\\@widget-js\\cli\\template\\Widget.ejs')
+  expect(minimatch(fileName, '*.ejs')).toBeTruthy()
+  expect(minimatch(fileName, '*.ts')).toBeFalsy()
 })