@taole/deploy-helper 1.1.7 → 1.1.8-beta.2

package/lib/archive.mjs

@@ -20,23 +20,112 @@ export function archiveToBuffer(setupArchive) {
   });
 }
 
-function appendDirToArchive(archive, dir, zipPrefix) {
-  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-    const fullPath = path.join(dir, entry.name);
-    const entryZipPath = zipPrefix
-      ? path.posix.join(zipPrefix, entry.name)
-      : entry.name;
-    if (entry.isDirectory()) {
-      appendDirToArchive(archive, fullPath, entryZipPath);
-    } else {
-      archive.file(fullPath, { name: entryZipPath });
+function toPosixRelativePath(distPath, filePath) {
+  return path.relative(distPath, filePath).split(path.sep).join("/");
+}
+
+function matchDistFileFilter(relativePath, filterItem) {
+  if (typeof filterItem === "string") {
+    return relativePath === filterItem;
+  }
+  if (filterItem && typeof filterItem.regex === "string") {
+    return new RegExp(filterItem.regex).test(relativePath);
+  }
+  throw new Error(`无效的 distFileFilters 规则: ${JSON.stringify(filterItem)}`);
+}
+
+function shouldIncludeDistFile(relativePath, distFileFilters) {
+  if (!distFileFilters) {
+    return true;
+  }
+
+  const includeList = distFileFilters.include || [];
+  const excludeList = distFileFilters.exclude || [];
+
+  if (includeList.length > 0) {
+    const included = includeList.some((item) =>
+      matchDistFileFilter(relativePath, item)
+    );
+    if (!included) {
+      return false;
     }
   }
+
+  if (excludeList.length > 0) {
+    const excluded = excludeList.some((item) =>
+      matchDistFileFilter(relativePath, item)
+    );
+    if (excluded) {
+      return false;
+    }
+  }
+
+  return true;
 }
 
-export function genProjectArchiveBuffer(distPath) {
+function collectDistFiles(distPath, distFileFilters) {
+  const files = [];
+
+  function walk(dir) {
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+      const fullPath = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        walk(fullPath);
+        continue;
+      }
+
+      const relativePath = toPosixRelativePath(distPath, fullPath);
+      if (shouldIncludeDistFile(relativePath, distFileFilters)) {
+        files.push({ fullPath, relativePath });
+      }
+    }
+  }
+
+  walk(distPath);
+  return files;
+}
+
+function appendFilesToArchive(archive, files, zipPrefix) {
+  for (const { fullPath, relativePath } of files) {
+    const zipPath = zipPrefix
+      ? path.posix.join(zipPrefix, relativePath)
+      : relativePath;
+    archive.file(fullPath, { name: zipPath });
+  }
+}
+
+export function validateDistFileFilters(distFileFilters) {
+  if (distFileFilters == null) {
+    return;
+  }
+  if (typeof distFileFilters !== "object" || Array.isArray(distFileFilters)) {
+    throw new Error("distFileFilters 必须是包含 include/exclude 的对象");
+  }
+
+  for (const key of ["include", "exclude"]) {
+    const list = distFileFilters[key];
+    if (list == null) {
+      continue;
+    }
+    if (!Array.isArray(list)) {
+      throw new Error(`distFileFilters.${key} 必须是数组`);
+    }
+    for (const item of list) {
+      if (typeof item === "string") {
+        continue;
+      }
+      if (item && typeof item.regex === "string") {
+        continue;
+      }
+      throw new Error(`无效的 distFileFilters.${key} 规则: ${JSON.stringify(item)}`);
+    }
+  }
+}
+
+export function genProjectArchiveBuffer(distPath, distFileFilters) {
   return archiveToBuffer((archive) => {
-    archive.directory(distPath, false);
+    const files = collectDistFiles(distPath, distFileFilters);
+    appendFilesToArchive(archive, files);
   });
 }
 
@@ -44,16 +133,15 @@ export function genProjectArchiveBuffer(distPath) {
  * lib 类型 CDN 打包：若 dist 内仅有名为 version 的子目录则原样打包；
  * 否则为 zip 内所有文件加上 version 前缀。
  */
-export function genLibArchiveBuffer(distPath, version) {
+export function genLibArchiveBuffer(distPath, version, distFileFilters) {
   const subdirs = fs
     .readdirSync(distPath, { withFileTypes: true })
     .filter((entry) => entry.isDirectory());
 
   return archiveToBuffer((archive) => {
-    if (subdirs.length === 1 && subdirs[0].name === version) {
-      archive.directory(distPath, false);
-    } else {
-      appendDirToArchive(archive, distPath, version);
-    }
+    const files = collectDistFiles(distPath, distFileFilters);
+    const zipPrefix =
+      subdirs.length === 1 && subdirs[0].name === version ? "" : version;
+    appendFilesToArchive(archive, files, zipPrefix);
   });
 }

package/lib/lightDeploy.mjs

@@ -5,6 +5,7 @@ import { getCache as getLoginCache } from "./login.mjs";
 import {
   genLibArchiveBuffer,
   genProjectArchiveBuffer,
+  validateDistFileFilters,
 } from "./archive.mjs";
 
 const isDev = false;
@@ -102,6 +103,8 @@ export async function lightDeploy(config, mode) {
   const workDir = process.cwd();
   const distDir = config.distDir || "dist";
   const distPath = path.join(workDir, distDir);
+  const distFileFilters = config.distFileFilters;
+  validateDistFileFilters(distFileFilters);
   if (!fs.existsSync(distPath)) {
     throw new Error(`${distPath} 不存在，请先执行构建`);
   }
@@ -109,8 +112,8 @@ export async function lightDeploy(config, mode) {
   log(`开始打包 ${distPath}`);
   const distZipBuffer =
     cdnType === "lib"
-      ? await genLibArchiveBuffer(distPath, version)
-      : await genProjectArchiveBuffer(distPath);
+      ? await genLibArchiveBuffer(distPath, version, distFileFilters)
+      : await genProjectArchiveBuffer(distPath, distFileFilters);
   log(`打包完成，大小 ${distZipBuffer.length} 字节`);
 
   const includeHtml = config.includeHtml === true;

package/lib/project.mjs

@@ -2,6 +2,7 @@
 import { simpleGit } from "simple-git";
 import path from "path";
 import fs from "fs";
+import inquirer from "inquirer";
 import { log, getJsonConfig, runCmdAsync } from "./util.mjs";
 import { getCache as getLoginCache } from "./login.mjs";
 import { genProjectArchiveBuffer } from "./archive.mjs";
@@ -55,13 +56,36 @@ async function apiDeployProject(name, version, env, userCache) {
   }
 }
 
-async function apiCreateProject(name, userCache) {
+async function apiGetTemplateProjects(userCache) {
   try {
+    const res = await fetch(`${apiHost}/h5projects/template`, {
+      headers: {
+        Cookie: `Tuwan_Passport=${userCache.Tuwan_Passport}`,
+      },
+    });
+    const resJson = await res.json();
+    if (!res.ok) {
+      const error = (resJson && resJson.message) || "获取模板列表失败";
+      throw new Error(error);
+    }
+    if (!Array.isArray(resJson)) {
+      throw new Error("获取模板列表失败: 响应格式不正确");
+    }
+    return resJson;
+  } catch (error) {
+    throw new Error(`获取模板列表失败: ${error.message}`);
+  }
+}
+
+async function apiCreateProject(name, userCache, templateId) {
+  try {
+    const body = { name };
+    if (templateId) {
+      body.templateId = templateId;
+    }
     const res = await fetch(`${apiHost}/h5projects`, {
       method: "POST",
-      body: JSON.stringify({
-        name: name,
-      }),
+      body: JSON.stringify(body),
       headers: {
         "Content-Type": "application/json",
         Cookie: `Tuwan_Passport=${userCache.Tuwan_Passport}`,
@@ -144,7 +168,6 @@ async function apiGetProjectVersion(name, userCache) {
  */
 export const cmdProjectCreate = async () => {
   const name = process.argv[3];
-  const projectDir = path.join(process.cwd(), name);
   if (!name) {
     log("请输入项目名称");
     process.exit(1);
@@ -158,6 +181,7 @@ export const cmdProjectCreate = async () => {
     log("项目名称不能是纯数字");
     process.exit(1);
   }
+  const projectDir = path.join(process.cwd(), name);
   if (fs.existsSync(projectDir)) {
     log(`项目目录${projectDir}已存在`);
     process.exit(1);
@@ -167,7 +191,33 @@ export const cmdProjectCreate = async () => {
     log("请先登录");
     process.exit(1);
   }
-  const createResult = await apiCreateProject(name, userCache);
+
+  const templates = await apiGetTemplateProjects(userCache);
+  if (!templates.length) {
+    log("没有可用的项目模板");
+    process.exit(1);
+  }
+  const templateChoices = templates.map((item) => ({
+    name: item.description ? `${item.name} - ${item.description}` : item.name,
+    value: item.id,
+  }));
+  const { templateId } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "templateId",
+      message: "请选择项目模板",
+      choices: templateChoices,
+    },
+  ]);
+
+  const selectedTemplate = templates.find((item) => item.id === templateId);
+  if (!selectedTemplate) {
+    log("选择的项目模板不存在");
+    process.exit(1);
+  }
+  log(`将以模板: ${selectedTemplate.name} 创建项目`);
+  // process.exit(0);
+  const createResult = await apiCreateProject(name, userCache, templateId);
   const repoUrl = createResult.repoUrl;
   log(`获得项目仓库地址: ${repoUrl}`);
   const httpRepoUrl = repoUrl + ".git";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "1.1.7",
+  "version": "1.1.8-beta.2",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",
@@ -27,6 +27,7 @@
   "dependencies": {
     "archiver": "^7.0.1",
     "form-data": "^4.0.5",
+    "inquirer": "^12.11.1",
     "node-scp": "^0.0.25",
     "simple-git": "^3.28.0"
   }