@seayoo-web/finder 2.0.15 → 2.1.1

package/dist/index.js

@@ -1,5 +1,5 @@
 import fs, { readdirSync, lstatSync, existsSync, readFileSync, writeFileSync } from "fs";
-import path, { relative, join, basename, normalize, sep, dirname, resolve, extname } from "path";
+import path, { relative, join, basename, normalize, sep, dirname, resolve } from "path";
 import open from "open";
 import "colors";
 import { zip } from "compressing";
@@ -294,21 +294,35 @@ 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 deployResult.previewUrl || "";
+  return deployTo;
+}
+function doPreview(defaultPreviewUrl, option) {
+  if (!option) {
+    return;
+  }
+  if (option === true) {
+    open(defaultPreviewUrl);
+    return;
+  }
+  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;
-  if (!filePath) {
-    throw `部署缺少参数 filePath(文件全路径)`.bgRed;
+  const { filePath, fileContent, deployTo, user, key, preview, debug } = option;
+  if (!filePath && !fileContent) {
+    throw `部署缺少参数 filePath(文件全路径) 或 fileContent(文件内容)`.bgRed;
   }
   if (filePath && !existsSync(filePath)) {
     throw `部署文件不存在(请确保传入完整文件路径)`.bgRed + " " + filePath;
@@ -316,10 +330,8 @@ async function finderUpload(option) {
   if (!deployTo) {
     throw `部署缺少参数 deployTo(部署目标)`.bgRed;
   }
-  const fileExtension = extname(filePath);
-  const filename = basename(filePath);
-  const target = !deployTo.endsWith(fileExtension) ? `${pure(deployTo)}/${filename}` : pure(deployTo);
-  const resp = await upload({ debug, target, buffer: Buffer.from(readFileSync(filePath)), user, key });
+  const content = filePath ? Buffer.from(readFileSync(filePath)) : Buffer.isBuffer(fileContent) ? fileContent : Buffer.from(fileContent || "");
+  const resp = await upload({ debug, target: pure(deployTo), buffer: content, user, key });
   if (preview && resp.previewUrl) {
     open(resp.previewUrl);
   }

package/package.json

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

package/types/src/core.d.ts

@@ -17,15 +17,21 @@ 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>;
 /** 上传一个文件到 finder */
 export declare function finderUpload(option: {
-    /** 需要上传的文件全局路 */
-    filePath: string;
+    /** 需要上传的文件路径 */
+    filePath?: string;
+    /** 需要上传的文件内容 */
+    fileContent?: string | Buffer;
     /** 部署目标全路径，需要包含文件名 */
     deployTo: string;
     user: string;