@widget-js/cli 1.1.10 → 1.2.1

package/.idea/misc.xml

@@ -3,7 +3,4 @@
   <component name="ProjectRootManager">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
-  <component name="ProjectType">
-    <option name="id" value="jpab" />
-  </component>
 </project>

package/lib/index.js

@@ -26,7 +26,7 @@ program.command("init").description("Initialize widget-js project").action(async
 var typeOption = new Option("-t, --type <type>").choices(["ftp", "oss"]);
 var fileOption = new Option("-f, --file <file>");
 program.command("release").description("\u901A\u8FC7FTP/OSS\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").addOption(typeOption).addOption(fileOption).action(async (options, command) => {
-  let release = await import("./release-HXCPKDIN.js");
+  let release = await import("./release-VEU3T5KK.js");
   await release.default(options);
 });
 program.parse(process.argv);

package/lib/{release-HXCPKDIN.js → release-VEU3T5KK.js}

@@ -76,6 +76,7 @@ import consola from "consola";
 import inquirer from "inquirer";
 import ora from "ora";
 import * as process from "process";
+import { minimatch } from "minimatch";
 async function checkParentDir(ftpClient, file, onMkdir) {
   let dir = path.dirname(file);
   const dirExists = await ftpClient.exists(dir);
@@ -86,7 +87,9 @@ async function checkParentDir(ftpClient, file, onMkdir) {
 }
 async function runSSH(sshConfig, releaseConfig) {
   consola.info("run ssh:", sshConfig);
-  const answer = await inquirer.prompt([{ type: "password", name: "password", mask: "*", message: "Enter key pair password" }]);
+  const answer = await inquirer.prompt([
+    { type: "password", name: "password", mask: "*", message: "Enter key pair password" }
+  ]);
   let ftpClient = new Client();
   const port = sshConfig["Port"];
   const key = fs3.readFileSync(path.resolve(os.homedir(), ".ssh/id_rsa"));
@@ -122,10 +125,21 @@ async function runSSH(sshConfig, releaseConfig) {
           }
           if (fs3.lstatSync(localFile).isDirectory()) {
             spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`);
-            await ftpClient.uploadDir(localFile, item.dest);
+            await ftpClient.uploadDir(localFile, item.dest, {
+              filter: (filePath, isDirectory) => {
+                if (item.ignorePattern && !isDirectory) {
+                  let fileName = path.basename(filePath);
+                  if (minimatch(fileName, item.ignorePattern)) {
+                    spinner.warn(`Skip file:${filePath}`);
+                    return false;
+                  }
+                }
+                return true;
+              }
+            });
           } else {
             await checkParentDir(ftpClient, item.dest, (dir) => {
-              spinner.warn(`Create Dir: ${dir}`);
+              spinner.succeed(`Create Dir: ${dir}`);
             });
             spinner.info(`Uploading File: ${localFile} -> ${item.dest}`);
             await ftpClient.put(localFile, item.dest);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.1.10",
+  "version": "1.2.1",
   "main": "lib/index.js",
   "author": "Neo Fu",
   "license": "MIT",
@@ -31,11 +31,12 @@
     "figlet": "^1.5.2",
     "gradient-string": "^2.0.2",
     "inquirer": "^8.0.0",
+    "minimatch": "^9.0.3",
     "ora": "^6.2.0",
     "package-json": "^8.1.0",
     "semver": "^7.3.8",
     "shelljs": "^0.8.5",
-    "ssh2-sftp-client": "^9.0.4",
+    "ssh2-sftp-client": "^9.1.0",
     "ws": "^8.11.0",
     "@widget-js/utils": "0.7.19"
   },
@@ -48,7 +49,7 @@
     "@types/node": "^18.11.13",
     "@types/semver": "^7.5.0",
     "@types/shelljs": "latest",
-    "@types/ssh2-sftp-client": "^9.0.0",
+    "@types/ssh2-sftp-client": "^9.0.1",
     "jest": "^29.5.0",
     "pinst": "^3.0.0",
     "prettier": "^2.8.8",
@@ -57,16 +58,16 @@
     "ts-loader": "^9.4.1",
     "ts-node": "^10.9.1",
     "tsup": "^6.5.0",
-    "typescript": "^4.9.4",
+    "typescript": "^5.2.2",
+    "vitest": "^0.34.6",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.0",
-    "@widget-js/core": "0.7.2"
+    "@widget-js/core": "0.10.14"
   },
   "scripts": {
     "build": "rimraf ./lib/ && tsup-node src/index.ts --format esm",
     "watch": "tsup src/index.ts --format esm --watch",
     "build:run": "npm run build && npm run widget",
-    "prebuild": "",
     "widget": "node ./lib/index.js",
     "widget:ftp": "node ./lib/index.js release -t ftp",
     "widget:init": "node ./lib/index.js init",

package/src/release/ftp.ts

@@ -1,123 +1,140 @@
-import path from "path";
-import fs from "fs";
-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";
-
-
-interface PasswordAnswer {
-  password: string
-}
-
-async function checkParentDir(ftpClient: Client, file: string, onMkdir: (dir: string) => void) {
-  let dir = path.dirname(file)
-  const dirExists = await ftpClient.exists(dir)
-  if (!dirExists) {
-    onMkdir(dir)
-    await ftpClient.mkdir(dir, true)
-  }
-}
-
-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'}])
-
-  let 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,
-      passphrase: answer.password,
-      privateKey: key,
-    })
-    releaseConfig.fileMap.sort((it1, it2) => (it1.order ?? 0) - (it2.order ?? 0))
-    // upload files
-    for (let item of releaseConfig.fileMap) {
-      if (typeof item.src == 'string') {
-        if (item.remoteCopy) {
-          await checkParentDir(ftpClient, item.dest, dir => {
-            spinner.warn(`Create Dir: ${dir}`)
-          })
-          let 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 {
-          const localFile = path.resolve(process.cwd(), item.src as string)
-          if (!item.remoteCopy && !fs.existsSync(localFile)) {
-            spinner.warn(`Skip not exists file:${localFile}`)
-            continue
-          }
-          if (fs.lstatSync(localFile).isDirectory()) {
-            spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`)
-            await ftpClient.uploadDir(localFile, item.dest)
-          } else {
-            await checkParentDir(ftpClient, item.dest, dir => {
-              spinner.warn(`Create Dir: ${dir}`)
-            })
-            spinner.info(`Uploading File: ${localFile} -> ${item.dest}`)
-            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()
-  }
-}
-
-export async function ftpUpload(releaseFile: string = 'release.json') {
-  // 读取
-  const releaseJsonFilePath = path.join(process.cwd(), releaseFile)
-  const packageVersion = Utils.getPackageVersion()
-  consola.info('Package Version:', packageVersion)
-
-  let 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)
-    if (!sshConfig) {
-      consola.error(`SSH config ${releaseConfig.ftpConfig.host} not found`)
-      return
-    }
-    await runSSH(sshConfig, releaseConfig)
-  }
-
-}
-
-
-export interface ReleaseConfig {
-  fileMap: {
-    src: string | object
-    dest: string
-    remoteCopy: boolean
-    order: number
-  }[]
-  ftpConfig: FTPConfig
-}
-
-export interface FTPConfig {
-  host: string[]
-}
+import path from 'path'
+import fs from 'fs'
+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'
+
+interface PasswordAnswer {
+  password: string
+}
+
+async function checkParentDir(ftpClient: Client, file: string, onMkdir: (dir: string) => void) {
+  let dir = path.dirname(file)
+  const dirExists = await ftpClient.exists(dir)
+  if (!dirExists) {
+    onMkdir(dir)
+    await ftpClient.mkdir(dir, true)
+  }
+}
+
+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'},
+  ])
+
+  let 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,
+      passphrase: answer.password,
+      privateKey: key,
+    })
+    releaseConfig.fileMap.sort((it1, it2) => (it1.order ?? 0) - (it2.order ?? 0))
+    // upload files
+    for (let item of releaseConfig.fileMap) {
+      if (typeof item.src == 'string') {
+        if (item.remoteCopy) {
+          await checkParentDir(ftpClient, item.dest, dir => {
+            spinner.warn(`Create Dir: ${dir}`)
+          })
+          let 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 {
+          const localFile = path.resolve(process.cwd(), item.src as string)
+          if (!item.remoteCopy && !fs.existsSync(localFile)) {
+            spinner.warn(`Skip not exists file:${localFile}`)
+            continue
+          }
+          if (fs.lstatSync(localFile).isDirectory()) {
+            spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`)
+            await ftpClient.uploadDir(localFile, item.dest, {
+              filter: (filePath: string, isDirectory: boolean):boolean => {
+                if (item.ignorePattern && !isDirectory) {
+                  let fileName = path.basename(filePath)
+                  if (minimatch(fileName, item.ignorePattern)) {
+                    spinner.warn(`Skip file:${filePath}`)
+                    return false
+                  }
+                }
+                return true;
+              },
+            })
+          } else {
+            await checkParentDir(ftpClient, item.dest, dir => {
+              spinner.succeed(`Create Dir: ${dir}`)
+            })
+
+            spinner.info(`Uploading File: ${localFile} -> ${item.dest}`)
+            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()
+  }
+}
+
+export async function ftpUpload(releaseFile: string = 'release.json') {
+  // 读取
+  const releaseJsonFilePath = path.join(process.cwd(), releaseFile)
+  const packageVersion = Utils.getPackageVersion()
+  consola.info('Package Version:', packageVersion)
+
+  let 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)
+    if (!sshConfig) {
+      consola.error(`SSH config ${releaseConfig.ftpConfig.host} not found`)
+      return
+    }
+    await runSSH(sshConfig, releaseConfig)
+  }
+}
+
+export interface FileMapConfig {
+  src: string | object
+  dest: string
+  remoteCopy: boolean
+  order: number
+  /**
+   * 支持glob、正则表达式
+   */
+  ignorePattern?: string
+}
+
+export interface ReleaseConfig {
+  fileMap: FileMapConfig[]
+  ftpConfig: FTPConfig
+}
+
+export interface FTPConfig {
+  host: string[]
+}

package/template/WidgetDefine.ejs

@@ -8,9 +8,9 @@ const description = {"zh-CN": ""};
 //组件关键词
 const keywords = [WidgetKeyword.RECOMMEND];
 //组件路由地址
-const url = "/widget/<%= snakeCaseName %>";
+const path = "/widget/<%= snakeCaseName %>";
 //配置页路由地址
-const configUrl = <% if (configurable) { %>"/widget/config/<%= snakeCaseName %>"<% } else { %>undefined<% } %>;
+const configPagePath = <% if (configurable) { %>"/widget/config/<%= snakeCaseName %>"<% } else { %>undefined<% } %>;
 //组件关键词
 const <%= name %>WidgetDefine = new Widget({
 name: name,
@@ -24,17 +24,9 @@ minWidth: <%= minWidth %>,
 maxWidth: <%= maxWidth %>,
 minHeight: <%= minHeight %>,
 maxHeight: <%= maxHeight %>,
-routes: [
-{
-url: url,
-name: 'index'
-},
-<% if (configurable) { %> {
-url: configUrl,
-name: 'config'
-},
-<% } %>
-]
+previewImage: "修改为组件预览图地址",
+path,
+configPagePath
 })
 
 export default <%= name %>WidgetDefine;

package/template/WidgetRoutes.ejs

@@ -1,18 +1,18 @@
 import <%= name %>WidgetDefine from "./<%= name %>.widget";
 
-const url = <%= name %>WidgetDefine.getIndexRoute().url;
+const path = <%= name %>WidgetDefine.path;
 const name = <%= name %>WidgetDefine.name;
 <% if (configurable) { %>
-const configUrl = <%= name %>WidgetDefine.getConfigRoute()!.url;
+const configPagePath = <%= name %>WidgetDefine.configPagePath;
 
 const <%= name %>WidgetRoutes = [
     {
-        path: url,
+        path: path,
         name: `${name}`,
         component: () => import(/* webpackChunkName: "<%= widgetName %>" */ './<%= name %>WidgetView.vue')
     },
     {
-        path: configUrl,
+        path: configPagePath,
         name: `${name}.config`,
         component: () => import(/* webpackChunkName: "<%= widgetName %>.config" */ './<%= name %>ConfigView.vue')
     }
@@ -20,7 +20,7 @@ const <%= name %>WidgetRoutes = [
 <% } else { %>
 const <%= name %>WidgetRoutes = [
     {
-        path: url,
+        path: path,
         name: `${name}`,
         component: () => import(/* webpackChunkName: "<%= widgetName %>" */ './<%= name %>WidgetView.vue')
     }

package/test/index.test.ts

@@ -0,0 +1,9 @@
+import {expect, test} from "vitest";
+import {minimatch} from "minimatch";
+import path from "path";
+
+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()
+})

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>

package/src/widgets/test/Test.widget.ts

@@ -1,39 +0,0 @@
-import { Widget, WidgetKeyword } from '@widget-js/core';
-//TODO 修改组件信息，标题，描述，关键词
-const name = 'cn.widgetjs.widgets.hotspot.test';
-//组件标题
-const title = { 'zh-CN': '123' };
-//组件描述
-const description = { 'zh-CN': '' };
-//组件关键词
-const keywords = [WidgetKeyword.RECOMMEND];
-//组件路由地址
-const url = '/widget/test';
-//配置页路由地址
-const configUrl = '/widget/config/test';
-//组件关键词
-const TestWidgetDefine = new Widget({
-  name: name,
-  title: title,
-  description: description,
-  keywords: keywords,
-  lang: 'zh-CN',
-  width: 2,
-  height: 3,
-  minWidth: 1,
-  maxWidth: 3,
-  minHeight: 2,
-  maxHeight: 3,
-  routes: [
-    {
-      url: url,
-      name: 'index',
-    },
-    {
-      url: configUrl,
-      name: 'config',
-    },
-  ],
-});
-
-export default TestWidgetDefine;

package/src/widgets/test/TestConfigView.vue

@@ -1,41 +0,0 @@
-<template>
-  <widget-edit-dialog
-    :widget-params="widgetParams"
-    :option="widgetConfigOption"
-    :widget-data="widgetData"
-    @confirm="onSaveClick()"
-  >
-    <template v-slot:form>
-      <!--  TODO 这里写自定义表单内容          -->
-    </template>
-  </widget-edit-dialog>
-</template>
-
-<script lang="ts" setup>
-import {
-  useWidget,
-  WidgetConfigOption,
-  WidgetEditDialog,
-} from '@widget-js/vue3';
-import { WidgetData, WidgetDataApi } from '@widget-js/core';
-import { reactive } from 'vue';
-
-const { widgetData, widgetParams } = useWidget(WidgetData);
-
-//修改成需要设置组件参数配置
-const widgetConfigOption = reactive(
-  new WidgetConfigOption({
-    custom: true,
-    backgroundColor: true,
-    borderRadius: true,
-    preview: false,
-  })
-);
-
-const onSaveClick = async () => {
-  await WidgetDataApi.save(widgetData);
-  window.close();
-};
-</script>
-
-<style scoped></style>

package/src/widgets/test/TestWidget.vue

@@ -1,7 +0,0 @@
-<template>
-  <!-- TODO 这里只写组件内容，不做自定义数据、业务处理   -->
-</template>
-
-<script lang="ts" setup></script>
-
-<style scoped></style>

package/src/widgets/test/TestWidgetRoutes.ts

@@ -1,27 +0,0 @@
-import TestWidgetDefine from './Test.widget';
-
-const url = TestWidgetDefine.getIndexRoute().url;
-const name = TestWidgetDefine.name;
-
-const configUrl = TestWidgetDefine.getConfigRoute()!.url;
-
-const TestWidgetRoutes = [
-  {
-    path: url,
-    name: `${name}`,
-    component: () =>
-      import(
-        /* webpackChunkName: "cn.widgetjs.widgets.hotspot.test" */ './TestWidgetView.vue'
-      ),
-  },
-  {
-    path: configUrl,
-    name: `${name}.config`,
-    component: () =>
-      import(
-        /* webpackChunkName: "cn.widgetjs.widgets.hotspot.test.config" */ './TestConfigView.vue'
-      ),
-  },
-];
-
-export default TestWidgetRoutes;

package/src/widgets/test/TestWidgetView.vue

@@ -1,14 +0,0 @@
-<template>
-  <!-- TODO:组件页面，这里编写组件业务逻辑-->
-  <test-widget></test-widget>
-</template>
-
-<script lang="ts" setup>
-import { WidgetData } from '@widget-js/core';
-import TestWidget from './TestWidget.vue';
-import { useWidget } from '@widget-js/vue3';
-
-const { widgetData, widgetParams } = useWidget(WidgetData);
-</script>
-
-<style scoped></style>

package/src/widgets/widget-router.ts

@@ -1,8 +0,0 @@
-import TestWidgetRoutes from "./test/TestWidgetRoutes";
-//FBI WANING! IMPORT PLACE, DONT DELETE THIS LINE
-
-const WidgetRouter = [
-    ...TestWidgetRoutes,
-    //FBI WANING! ROUTE PLACE, DONT DELETE THIS LINE
-];
-export default WidgetRouter