@seayoo-web/finder 2.0.14 → 2.1.0

package/dist/index.js

@@ -41,13 +41,21 @@ function getAllFiles(dir, ignores = []) {
 function isIgnoreFile(filePath, ignores) {
   const filename = basename(filePath);
   const dirs = normalize(filePath).split(sep);
-  return ignores.some((name) => {
-    if (name.endsWith("/") && name !== "/") {
-      return dirs.includes(name.slice(0, -1));
+  return ignores.some((pattern) => {
+    if (pattern.endsWith("/")) {
+      return pattern.includes("*") ? dirs.some((dir) => getRegexp(pattern.slice(0, -1)).test(dir)) : dirs.includes(pattern.slice(0, -1));
     }
-    return filename === name;
+    return pattern.includes("*") ? getRegexp(pattern).test(filename) : filename === pattern;
   });
 }
+const pathRegCache = {};
+const getRegexp = function(path2) {
+  if (path2 && pathRegCache[path2]) {
+    return pathRegCache[path2];
+  }
+  const fixRegStr = path2.replace(/([\\(){}\[\]\^\$\+\-\?\.|])/g, "\\$1").replace(/\*{1,}/g, ".*");
+  return pathRegCache[path2] = new RegExp("^" + fixRegStr + "$");
+};
 function pure(url) {
   return url.replace(/(?:^https?:\/\/|\/*$)/gi, "");
 }
@@ -286,16 +294,30 @@ async function finderDeploy(option) {
       })
     );
     const lastDeployResult = results[results.length - 1];
-    if (preview && lastDeployResult && lastDeployResult.previewUrl) {
-      open(lastDeployResult.previewUrl);
+    if (lastDeployResult && lastDeployResult.previewUrl) {
+      doPreview(lastDeployResult.previewUrl, preview);
     }
-    return lastDeployResult.previewUrl || "";
+    return deployTo.join(",");
   }
   const deployResult = await deploy({ debug, target: deployTo, buffer, user, key, payload });
-  if (preview && deployResult && deployResult.previewUrl) {
-    open(deployResult.previewUrl);
+  if (deployResult && deployResult.previewUrl) {
+    doPreview(deployResult.previewUrl, preview);
+  }
+  return deployTo;
+}
+function doPreview(defaultPreviewUrl, option) {
+  if (!option) {
+    return;
+  }
+  if (option === true) {
+    open(defaultPreviewUrl);
+    return;
   }
-  return deployResult.previewUrl || "";
+  const base = defaultPreviewUrl.replace(/index\.html.*$/i, "");
+  const files = Array.isArray(option) ? option : [option];
+  files.forEach((file) => {
+    open(base + file);
+  });
 }
 async function finderUpload(option) {
   const { filePath, deployTo, user, key, preview, debug } = option;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/finder",
-  "version": "2.0.14",
+  "version": "2.1.0",
   "description": "agent for web finder",
   "type": "module",
   "source": "index.ts",

package/types/src/core.d.ts

@@ -3,7 +3,11 @@ import "colors";
 export declare function finderDeploy(option: {
     /** 需要推送的代码目录 */
     dist: string;
-    /** 忽略部署的文件，如果是目录则需要以 / 结尾。暂不支持模糊匹配 */
+    /**
+     * 忽略部署的文件，如果是目录则需要以 / 结尾，支持 * 占位符模糊匹配。
+     *
+     * 匹配时仅针对单一目录和文件名进行检查，不跨目录检查
+     */
     ignoreFiles?: string[];
     /** 部署的目标地址 */
     deployTo: string | string[];
@@ -13,8 +17,12 @@ export declare function finderDeploy(option: {
     key: string;
     /** 是否输出更多调试信息 */
     debug?: boolean;
-    /** 是否部署完毕后打开目标文件（index.html） */
-    preview?: boolean;
+    /**
+     * 是否部署完毕后打开目标文件（index.html）
+     *
+     * 也可以指定不同的目标文件
+     */
+    preview?: boolean | string | string[];
     /** 代码的 commit log 信息，换行用 \n */
     commitLogs?: string;
 }): Promise<string>;