@vdhewei/xlsx-template-lib 1.6.6 → 1.6.10

package/README.md

@@ -678,6 +678,8 @@ xlsx-cli render <xlsx-file> [options]
 - `-n, --sheet-name <string>` - Sheet name to render (default: first sheet)
 - `-s, --save <string>` - Save rendered file to specified directory (default: current directory)
 - `-d, --data <string>` - Render data source (JSON string, file path, or URL)
+- `--header <string>` - HTTP headers for remote data fetch (can be specified multiple times, format: `Key:Value`)
+- `--body <string>` - HTTP request body for POST requests
 
 **Examples:**
 
@@ -700,6 +702,15 @@ xlsx-cli render template.xlsx -c -d './data.json'
 # Render specific sheet
 xlsx-cli render template.xlsx -n Sheet1 -d './data.json'
 
+# Render with custom HTTP headers
+xlsx-cli render template.xlsx -d 'https://api.example.com/data.json' --header 'Authorization:Bearer token123' --header 'Content-Type:application/json'
+
+# Render with POST request body
+xlsx-cli render template.xlsx -d 'https://api.example.com/api/query' --body '{"query":"SELECT * FROM users"}' --header 'Content-Type:application/json'
+
+# Render with POST method via header
+xlsx-cli render template.xlsx -d 'https://api.example.com/api/create' --body '{"name":"Test"}' --header 'Content-Type:application/json' --header 'method:POST'
+
 # Full example
 xlsx-cli render template.xlsx -c -n Sheet1 -s ./output/ -d './data.json'
 ```
@@ -709,6 +720,70 @@ xlsx-cli render template.xlsx -c -n Sheet1 -s ./output/ -d './data.json'
 - **Local File**: Path to `.json` file (relative or absolute)
 - **Remote URL**: HTTP/HTTPS URL returning JSON
 
+**HTTP Request Options (for Remote URL):**
+- **Headers**: Use `--header` to add custom HTTP headers (can be specified multiple times)
+  - Format: `--header 'Key:Value'`
+  - Example: `--header 'Authorization:Bearer token123' --header 'Content-Type:application/json'`
+  - Special header: `method:POST` can set the HTTP method to POST
+- **Body**: Use `--body` to send request body (typically for POST requests)
+  - Format: `--body '{"key":"value"}'`
+  - Automatically uses POST method when body is provided
+- **Default Behavior**: GET request with no headers
+
+**HTTP Request Examples:**
+
+```bash
+# GET request with custom headers
+xlsx-cli render template.xlsx \
+  -d 'https://api.example.com/data.json' \
+  --header 'Authorization:Bearer your-token' \
+  --header 'X-API-Key:api-key-123'
+
+# POST request with JSON body
+xlsx-cli render template.xlsx \
+  -d 'https://api.example.com/api/query' \
+  --body '{"query":"SELECT * FROM users LIMIT 10"}' \
+  --header 'Content-Type:application/json'
+
+# POST request with method specified in header
+xlsx-cli render template.xlsx \
+  -d 'https://api.example.com/api/create' \
+  --body '{"name":"New Record","value":100}' \
+  --header 'Content-Type:application/json' \
+  --header 'method:POST'
+
+# Complex example with authentication and query body
+xlsx-cli render template.xlsx \
+  -d 'https://api.example.com/v1/export' \
+  --header 'Authorization:Bearer eyJhbGc...' \
+  --header 'Content-Type:application/json' \
+  --body '{"format":"xlsx","filter":{"status":"active"}}' \
+  -c -n Sheet1 -s ./output/
+```
+
+**HTTP Request Details:**
+
+1. **Method Determination**:
+   - Default: `GET`
+   - With `--body`: Automatically becomes `POST`
+   - With `method:POST` header: Explicitly set to `POST`
+   - With `method:GET` header: Explicitly set to `GET`
+
+2. **Header Format**:
+   - Headers are parsed as `Key:Value` pairs
+   - Multiple `--header` options can be used
+   - Example: `--header 'Accept:application/json' --header 'User-Agent:MyApp/1.0'`
+
+3. **Error Handling**:
+   - Non-200 status codes return `undefined` and display error message
+   - Network errors are caught and displayed in red
+   - Missing `node-fetch` (Node.js < 18) displays error message
+
+4. **Supported Data Formats**:
+   - JSON objects: `{"key":"value"}`
+   - JSON arrays: `[{"id":1},{"id":2}]`
+   - Nested structures: `{"user":{"name":"John","age":30}}`
+
 **Output:**
 - Rendered Excel file saved as `<filename>_<timestamp>.xlsx`
 - Validation checks for sheet existence

package/README.zh-CN.md

@@ -676,6 +676,8 @@ xlsx-cli render <xlsx-文件> [选项]
 - `-n, --sheet-name <string>` - 要渲染的工作表名称（默认：第一个工作表）
 - `-s, --save <string>` - 将渲染后的文件保存到指定目录（默认：当前目录）
 - `-d, --data <string>` - 渲染数据源（JSON 字符串、文件路径或 URL）
+- `--header <string>` - 远程数据获取的 HTTP 请求头（可指定多次，格式：`Key:Value`）
+- `--body <string>` - POST 请求的 HTTP 请求体
 
 **示例:**
 
@@ -698,6 +700,15 @@ xlsx-cli render template.xlsx -c -d './data.json'
 # 渲染指定工作表
 xlsx-cli render template.xlsx -n Sheet1 -d './data.json'
 
+# 使用自定义 HTTP 请求头渲染
+xlsx-cli render template.xlsx -d 'https://api.example.com/data.json' --header 'Authorization:Bearer token123' --header 'Content-Type:application/json'
+
+# 使用 POST 请求体渲染
+xlsx-cli render template.xlsx -d 'https://api.example.com/api/query' --body '{"query":"SELECT * FROM users"}' --header 'Content-Type:application/json'
+
+# 通过 header 指定 POST 方法
+xlsx-cli render template.xlsx -d 'https://api.example.com/api/create' --body '{"name":"测试"}' --header 'Content-Type:application/json' --header 'method:POST'
+
 # 完整示例
 xlsx-cli render template.xlsx -c -n Sheet1 -s ./output/ -d './data.json'
 ```
@@ -707,6 +718,70 @@ xlsx-cli render template.xlsx -c -n Sheet1 -s ./output/ -d './data.json'
 - **本地文件**: `.json` 文件的路径（相对或绝对）
 - **远程 URL**: 返回 JSON 的 HTTP/HTTPS URL
 
+**HTTP 请求选项（用于远程 URL）:**
+- **请求头**: 使用 `--header` 添加自定义 HTTP 请求头（可指定多次）
+  - 格式：`--header 'Key:Value'`
+  - 示例：`--header 'Authorization:Bearer token123' --header 'Content-Type:application/json'`
+  - 特殊请求头：`method:POST` 可设置 HTTP 方法为 POST
+- **请求体**: 使用 `--body` 发送请求体（通常用于 POST 请求）
+  - 格式：`--body '{"key":"value"}'`
+  - 提供请求体时自动使用 POST 方法
+- **默认行为**: 无请求头的 GET 请求
+
+**HTTP 请求示例:**
+
+```bash
+# 带自定义请求头的 GET 请求
+xlsx-cli render template.xlsx \
+  -d 'https://api.example.com/data.json' \
+  --header 'Authorization:Bearer your-token' \
+  --header 'X-API-Key:api-key-123'
+
+# 带 JSON 请求体的 POST 请求
+xlsx-cli render template.xlsx \
+  -d 'https://api.example.com/api/query' \
+  --body '{"query":"SELECT * FROM users LIMIT 10"}' \
+  --header 'Content-Type:application/json'
+
+# 通过 header 指定 POST 方法
+xlsx-cli render template.xlsx \
+  -d 'https://api.example.com/api/create' \
+  --body '{"name":"新记录","value":100}' \
+  --header 'Content-Type:application/json' \
+  --header 'method:POST'
+
+# 复杂示例：带认证和查询请求体
+xlsx-cli render template.xlsx \
+  -d 'https://api.example.com/v1/export' \
+  --header 'Authorization:Bearer eyJhbGc...' \
+  --header 'Content-Type:application/json' \
+  --body '{"format":"xlsx","filter":{"status":"active"}}' \
+  -c -n Sheet1 -s ./output/
+```
+
+**HTTP 请求详细说明:**
+
+1. **HTTP 方法确定**:
+   - 默认：`GET`
+   - 使用 `--body`：自动变为 `POST`
+   - 使用 `method:POST` 请求头：显式设置为 `POST`
+   - 使用 `method:GET` 请求头：显式设置为 `GET`
+
+2. **请求头格式**:
+   - 请求头按 `Key:Value` 格式解析
+   - 可以使用多个 `--header` 选项
+   - 示例：`--header 'Accept:application/json' --header 'User-Agent:MyApp/1.0'`
+
+3. **错误处理**:
+   - 非 200 状态码返回 `undefined` 并显示错误消息
+   - 网络错误会被捕获并以红色显示
+   - 缺少 `node-fetch`（Node.js < 18）会显示错误消息
+
+4. **支持的数据格式**:
+   - JSON 对象：`{"key":"value"}`
+   - JSON 数组：`[{"id":1},{"id":2}]`
+   - 嵌套结构：`{"user":{"name":"张三","age":30}}`
+
 **输出:**
 - 渲染后的 Excel 文件保存为 `<文件名>_<时间戳>.xlsx`
 - 检查工作表是否存在

package/dist/bin.js

@@ -4289,11 +4289,9 @@ var XlsxRender = class _XlsxRender extends Workbook {
 
 // src/bin-helpers.ts
 var path2 = __toESM(require("path"));
-var url = __toESM(require("url"));
 var import_node_fs = require("fs");
 var fs3 = __toESM(require("fs/promises"));
 var import_chalk = __toESM(require("chalk"));
-var import_meta = {};
 function generateOutputFilename(inputFile) {
   const basename3 = path2.basename(inputFile, path2.extname(inputFile));
   const timestamp = Date.now();
@@ -4304,42 +4302,84 @@ async function resolveFilePath(filePath) {
   if ((0, import_node_fs.existsSync)(resolvedPath)) {
     return resolvedPath;
   }
-  const scriptDir = path2.dirname(url.fileURLToPath(import_meta.url));
+  const scriptDir = path2.dirname(process.cwd());
   const relativePath = path2.resolve(scriptDir, filePath);
   if ((0, import_node_fs.existsSync)(relativePath)) {
     return relativePath;
   }
   throw new Error(`File not found: ${filePath}`);
 }
-async function parseRenderData(dataOption) {
+function isValidJSON(str) {
+  const trimmed = str.trim();
+  if (!trimmed) return false;
+  const firstChar = trimmed[0];
+  const lastChar = trimmed.charAt(trimmed.length - 1);
+  const validStartEndPairs = [
+    ["{", "}"],
+    ["[", "]"],
+    ['"', '"']
+  ];
+  const hasValidFormat = validStartEndPairs.some(
+    ([start, end]) => firstChar === start && lastChar === end
+  );
+  if (!hasValidFormat && !["true", "false", "null"].includes(trimmed) && !/^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(trimmed)) {
+    return false;
+  }
+  try {
+    JSON.parse(str);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function parseRenderData(dataOption, httpHeaders, body) {
   if (!dataOption) {
     return {};
   }
   try {
-    return JSON.parse(dataOption);
-  } catch (e) {
-    try {
-      const filePath = await resolveFilePath(dataOption);
-      const fileContent = await fs3.readFile(filePath, "utf-8");
-      return JSON.parse(fileContent);
-    } catch (e2) {
-      if (dataOption.startsWith("http://") || dataOption.startsWith("https://")) {
-        let fetch;
+    if (isValidJSON(dataOption)) {
+      return JSON.parse(dataOption);
+    }
+    if (dataOption.startsWith("http://") || dataOption.startsWith("https://")) {
+      let fetch;
+      try {
+        fetch = globalThis.fetch;
+      } catch (e3) {
         try {
-          fetch = globalThis.fetch;
-        } catch (e3) {
-          try {
-            const nodeFetch = await import("node-fetch");
-            fetch = nodeFetch.default;
-          } catch (e4) {
-            throw new Error("Remote URLs require Node.js 18+ or node-fetch package");
-          }
+          const nodeFetch = await import("node-fetch");
+          fetch = nodeFetch.default;
+        } catch (e4) {
+          console.error(import_chalk.default.red("Remote URLs require Node.js 18+ or node-fetch package"));
+          return void 0;
         }
-        const response = await fetch(dataOption);
-        return response.json();
       }
-      throw new Error(`Failed to parse render data from: ${dataOption}`);
+      const headers = new Headers();
+      httpHeaders?.forEach((header) => {
+        const [key, value] = header.split(":");
+        headers.append(key, value);
+      });
+      const reqOpts = {
+        headers,
+        method: headers.get(`method`) ? headers.get(`method`).toUpperCase() : "GET"
+      };
+      if (body !== void 0 && body !== "") {
+        reqOpts.body = body;
+      }
+      console.log(import_chalk.default.gray(`Fetching data from: ${dataOption}`));
+      console.log(import_chalk.default.gray(`request.init: ${JSON.stringify(reqOpts)}`));
+      const response = await fetch(dataOption, reqOpts);
+      if (response.status !== 200) {
+        console.error(import_chalk.default.red(`Failed to fetch data from: ${dataOption}, status: ${response.status},${response.text()}`));
+        return void 0;
+      }
+      return response.json();
     }
+    const filePath = await resolveFilePath(dataOption);
+    const fileContent = await fs3.readFile(filePath, "utf-8");
+    return JSON.parse(fileContent);
+  } catch (e) {
+    console.error(import_chalk.default.red(`Failed to parse render data from: ${dataOption}`));
+    return void 0;
   }
 }
 function checkSheetAndPlaceholders(xlsx, sheetName) {
@@ -4349,43 +4389,70 @@ function checkSheetAndPlaceholders(xlsx, sheetName) {
     throw new Error(`Sheet "${sheetName}" not found in Excel file`);
   }
 }
-async function addRuleToSheet(xlsxBuffer, ruleType, ruleExpr, sheetName = "export_metadata.config") {
-  const workbook = await loadWorkbook(xlsxBuffer);
+async function addRuleToSheet(workbook, ruleType, ruleExpr, sheetName = "export_metadata.config") {
   let worksheet = workbook.getWorksheet(sheetName);
   if (!worksheet) {
     worksheet = workbook.addWorksheet(sheetName);
     console.log(import_chalk.default.gray(`Created new sheet: ${sheetName}`));
   }
   let startRow = 1;
-  let currentRow = 1;
-  let columnCount = 0;
-  worksheet.eachRow((row, rowNumber) => {
-    const cell = row.getCell(1);
-    const cellValue = cell.value?.toString().trim();
-    if (!cellValue) {
-      return;
-    }
-    if (cellValue.toLowerCase() === ruleType.toLowerCase()) {
-      let col = 2;
-      while (col <= 4) {
-        const ruleCell = row.getCell(col);
-        if (ruleCell.value) {
-          columnCount++;
-        }
-        col++;
+  let currentRow = NaN;
+  if (worksheet.rowCount > 0) {
+    let stop = false;
+    worksheet.eachRow((row, rowNumber) => {
+      let columnCount = 0;
+      const cell = row.getCell(1);
+      const cellValue = cell.value;
+      if (!cellValue || stop) {
+        return;
       }
-      if (columnCount < 4) {
-        currentRow = rowNumber;
-        startRow = rowNumber;
-      } else {
-        currentRow = rowNumber + 1;
+      const value = toCellValue(cellValue).trim();
+      if (value.toLowerCase() === ruleType.toLowerCase()) {
+        for (let col = 2; col < 5; col++) {
+          const ruleCell2 = row.getCell(col);
+          if (ruleCell2.value) {
+            columnCount++;
+          } else {
+            break;
+          }
+        }
+        if (columnCount < 3) {
+          currentRow = rowNumber;
+          startRow = rowNumber;
+        } else {
+          currentRow = rowNumber + 1;
+        }
+        const cell2 = worksheet.getRow(currentRow).getCell(1);
+        if (cell2 === void 0 || cell2.value === null || cell2.value === void 0) {
+          stop = true;
+          return;
+        }
+        if (toCellValue(cell2.value).toLowerCase() !== ruleType.toLowerCase()) {
+          worksheet.insertRow(currentRow, []);
+          currentRow = currentRow + 1;
+          stop = true;
+          return;
+        }
+        if (toCellValue(cell2.value).toLowerCase() === ruleType.toLowerCase() && columnCount < 3) {
+          stop = true;
+          return;
+        }
       }
-    }
-  });
+    });
+  }
+  if (isNaN(currentRow)) {
+    currentRow = worksheet.rowCount + 1;
+    worksheet.insertRow(currentRow, []);
+  }
   if (startRow === 1 && currentRow === 1 && worksheet.rowCount === 0) {
     currentRow = 1;
   }
   let targetRow = worksheet.getRow(currentRow);
+  let lastCell = targetRow.getCell(4);
+  if (lastCell !== void 0 && lastCell.value !== void 0 && lastCell.value !== null && lastCell.value !== "") {
+    currentRow = worksheet.rowCount + 1;
+    targetRow = worksheet.insertRow(currentRow, []);
+  }
   if (!targetRow.getCell(1).value) {
     const typeCell = targetRow.getCell(1);
     typeCell.value = ruleType;
@@ -4395,23 +4462,21 @@ async function addRuleToSheet(xlsxBuffer, ruleType, ruleExpr, sheetName = "expor
   let ruleCol = 2;
   while (ruleCol <= 4) {
     const existingCell = targetRow.getCell(ruleCol);
-    if (!existingCell.value) {
+    if (existingCell === void 0 || (existingCell.value === void 0 || existingCell.value === null || existingCell.value === "")) {
       break;
     }
     ruleCol++;
   }
-  if (ruleCol <= 4) {
-    const ruleCell = targetRow.getCell(ruleCol);
-    ruleCell.value = ruleExpr;
-    ruleCell.alignment = { vertical: "middle" };
-    const column = worksheet.getColumn(ruleCol);
-    column.width = Math.max(column.width || 10, ruleExpr.length + 2);
-    console.log(import_chalk.default.gray(`Added rule ${ruleType} at row ${currentRow}, column ${ruleCol}`));
-  } else {
-    throw new Error(`Cannot add more than 4 rules for type: ${ruleType}`);
+  const ruleCell = targetRow.getCell(ruleCol);
+  ruleCell.value = ruleExpr;
+  ruleCell.alignment = { vertical: "middle", horizontal: "center" };
+  const column = worksheet.getColumn(ruleCol);
+  column.width = Math.max(column.width || 10, ruleExpr.length + 2);
+  if (currentRow === 1 && ruleCol === 2) {
+    const column2 = worksheet.getColumn(1);
+    column2.width = Math.max(column2.width || 10, ruleExpr.length + 2);
   }
-  const buffer = await workbook.xlsx.writeBuffer();
-  return Buffer.from(buffer);
+  return workbook;
 }
 async function parseRulesFromFile(filePath) {
   const resolvedPath = await resolveFilePath(filePath);
@@ -4430,8 +4495,17 @@ async function parseRulesFromFile(filePath) {
       console.log(import_chalk.default.yellow(`\u26A0 Line ${i + 1}: Invalid format. Expected "<type> ruleExpr"`));
       continue;
     }
+    let items = [];
     const type = line.substring(0, spaceIndex).trim();
-    const items = line.substring(spaceIndex + 1).trim().split(" ");
+    const values = line.substring(spaceIndex + 1).trim();
+    if (values.indexOf(" ") >= 0) {
+      items = values.split(" ");
+    } else if (values.indexOf("	") >= 0) {
+      items = values.split("	");
+    } else {
+      items = [values];
+    }
+    items = items.filter((item) => item.trim() !== "" && item.indexOf("=") > 0);
     if (!type) {
       console.log(import_chalk.default.yellow(`\u26A0 Line ${i + 1}: Invalid format. Expected "<type> ruleExpr"`));
       continue;
@@ -4445,6 +4519,9 @@ async function parseRulesFromFile(filePath) {
     }
     for (const rule of items) {
       let str = rule.trim();
+      if (str === void 0 || str === null || str === "" || str === "	") {
+        continue;
+      }
       let key = `${type}:${str}`;
       if (validRulesSet.has(key)) {
         console.log(import_chalk.default.yellow(`\u26A0 Line ${i + 1}: Duplicate rule "${str}"`));
@@ -4460,30 +4537,38 @@ async function parseRulesFromFile(filePath) {
   return rules;
 }
 async function addMultipleRulesToSheet(xlsxBuffer, rules) {
-  let buffer = xlsxBuffer;
+  let workbook = await loadWorkbook(xlsxBuffer);
   for (const { type, rule } of rules) {
-    console.log(import_chalk.default.gray(`Adding ${type} rule: ${rule}`));
-    buffer = await addRuleToSheet(buffer, type, rule);
+    workbook = await addRuleToSheet(workbook, type, rule);
   }
-  return buffer;
+  const buffer = await workbook.xlsx.writeBuffer();
+  return Buffer.from(buffer);
 }
 
 // src/bin.ts
 async function main() {
-  let version = "1.0.0";
+  let version;
   try {
-    const possiblePaths = [
-      path3.join(process.cwd(), "package.json"),
-      path3.join(process.cwd(), "..", "package.json")
-    ];
-    for (const packagePath of possiblePaths) {
-      if ((0, import_node_fs2.existsSync)(packagePath)) {
-        const packageJson = JSON.parse(await fs4.readFile(packagePath, "utf-8"));
-        version = packageJson.version;
-        break;
-      }
+    version = __VERSION__;
+    if (version.startsWith('"') && version.endsWith('"')) {
+      version = version.slice(1, -1);
     }
   } catch (e) {
+    version = "1.0.0";
+    try {
+      const possiblePaths = [
+        path3.join(process.cwd(), "package.json"),
+        path3.join(process.cwd(), "..", "package.json")
+      ];
+      for (const packagePath of possiblePaths) {
+        if ((0, import_node_fs2.existsSync)(packagePath)) {
+          const packageJson = JSON.parse(await fs4.readFile(packagePath, "utf-8"));
+          version = packageJson.version;
+          break;
+        }
+      }
+    } catch (e2) {
+    }
   }
   const envPath = path3.join(process.cwd(), ".env");
   if ((0, import_node_fs2.existsSync)(envPath)) {
@@ -4523,7 +4608,7 @@ async function main() {
       process.exit(1);
     }
   });
-  program.command("render").argument("<string>", "xlsx file path").option("-c,--compile", "auto compile flag", false).option("-n,--sheet-name <string>", "render xlsx sheet name when xlsx has multiple sheets").option("-s,--save <string>", "save render xlsx file to user dir").option("-d,--data <string>", "render xlsx file data from").action(async (xlsxFile, options) => {
+  program.command("render").argument("<string>", "xlsx file path").option("-c,--compile", "auto compile flag", false).option("-n,--sheet-name <string>", "render xlsx sheet name when xlsx has multiple sheets").option("-s,--save <string>", "save render xlsx file to user dir").option("-d,--data <string>", "render xlsx file data from").option("--header <string>", "call remote http json data with header", []).option("--body <string>", "call remote http json request with body").action(async (xlsxFile, options) => {
     try {
       console.log(import_chalk2.default.green("\u{1F4C4} Rendering Excel template..."));
       const filePath = await resolveFilePath(xlsxFile);
@@ -4535,7 +4620,10 @@ async function main() {
       console.log(import_chalk2.default.gray(`Target sheet: ${sheetName}`));
       checkSheetAndPlaceholders(xlsx, sheetName);
       console.log(import_chalk2.default.gray("Sheet validation passed"));
-      const renderData = await parseRenderData(options.data);
+      const renderData = await parseRenderData(options.data, options.header, options.body);
+      if (renderData === void 0) {
+        process.exit(1);
+      }
       if (Object.keys(renderData).length > 0) {
         console.log(import_chalk2.default.gray(`Render data loaded with ${Object.keys(renderData).length} keys`));
       }