xlkit 1.2.1 → 1.3.0

package/dist/index.d.cts

@@ -139,6 +139,14 @@ declare class SheetBuilder {
      * 新しいシートを追加（WorkbookBuilderに委譲）
      */
     sheet(name?: string): SheetBuilder;
+    /**
+     * 複数のワークブックをマージする（WorkbookBuilderに委譲）
+     */
+    merge(workbooks: (WorkbookBuilder | SheetBuilder)[]): WorkbookBuilder;
+    /**
+     * ワークブックの状態を取得（WorkbookBuilderに委譲）
+     */
+    getState(): WorkbookState;
     /**
      * ブラウザ向け出力オブジェクトを取得（WorkbookBuilderに委譲）
      */
@@ -157,6 +165,12 @@ declare class WorkbookBuilder {
      * @param name シート名（省略時は "Sheet1", "Sheet2", ...）
      */
     sheet(name?: string): SheetBuilder;
+    /**
+     * 複数のワークブックをマージする
+     * @param workbooks マージするワークブックの配列
+     * @returns this（メソッドチェーン用）
+     */
+    merge(workbooks: (WorkbookBuilder | SheetBuilder)[]): this;
     /**
      * ワークブックの状態を取得（内部用）
      */

package/dist/index.d.ts

@@ -139,6 +139,14 @@ declare class SheetBuilder {
      * 新しいシートを追加（WorkbookBuilderに委譲）
      */
     sheet(name?: string): SheetBuilder;
+    /**
+     * 複数のワークブックをマージする（WorkbookBuilderに委譲）
+     */
+    merge(workbooks: (WorkbookBuilder | SheetBuilder)[]): WorkbookBuilder;
+    /**
+     * ワークブックの状態を取得（WorkbookBuilderに委譲）
+     */
+    getState(): WorkbookState;
     /**
      * ブラウザ向け出力オブジェクトを取得（WorkbookBuilderに委譲）
      */
@@ -157,6 +165,12 @@ declare class WorkbookBuilder {
      * @param name シート名（省略時は "Sheet1", "Sheet2", ...）
      */
     sheet(name?: string): SheetBuilder;
+    /**
+     * 複数のワークブックをマージする
+     * @param workbooks マージするワークブックの配列
+     * @returns this（メソッドチェーン用）
+     */
+    merge(workbooks: (WorkbookBuilder | SheetBuilder)[]): this;
     /**
      * ワークブックの状態を取得（内部用）
      */

package/dist/index.js

@@ -1,9 +1,13 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // src/engine/writer.ts
 import ExcelJS from "exceljs";
 
-// src/engine/sheet-writer.ts
-import { readFileSync } from "fs";
-
 // src/styles/converter.ts
 function convertToExcelJSStyle(style) {
   if (!style) return {};
@@ -201,7 +205,7 @@ var TABLE_PRESETS = {
 function getPreset(presetName) {
   const preset = TABLE_PRESETS[presetName];
   if (!preset) {
-    throw new Error(`\u4E0D\u660E\u306A\u30D7\u30EA\u30BB\u30C3\u30C8\u540D: ${presetName}`);
+    throw new Error(`Unknown preset name: ${presetName}`);
   }
   return preset;
 }
@@ -225,6 +229,14 @@ function isSpaceBlock(block) {
   return block.type === "space";
 }
 
+// src/utils/buffer.ts
+function isBuffer(value) {
+  return typeof Buffer !== "undefined" && Buffer.isBuffer(value);
+}
+function isUrl(value) {
+  return value.startsWith("http://") || value.startsWith("https://");
+}
+
 // src/types/column.ts
 function isLeafColumn(column) {
   return "key" in column;
@@ -355,21 +367,21 @@ var SheetWriter = class {
   /**
    * SheetStateを書き込む
    */
-  writeSheet(sheetState) {
+  async writeSheet(sheetState) {
     for (const block of sheetState.blocks) {
-      this.writeBlock(block);
+      await this.writeBlock(block);
     }
   }
   /**
    * ブロックを書き込む
    */
-  writeBlock(block) {
+  async writeBlock(block) {
     if (isTableBlock(block)) {
       this.writeTable(block.options);
     } else if (isTextBlock(block)) {
       this.writeText(block.input);
     } else if (isImageBlock(block)) {
-      this.writeImage(block.options);
+      await this.writeImage(block.options);
     } else if (isSpaceBlock(block)) {
       this.writeSpace(block.lines);
     }
@@ -602,13 +614,20 @@ var SheetWriter = class {
   /**
    * 画像を書き込む
    */
-  writeImage(options) {
+  async writeImage(options) {
     const { source, width = 100, height = 100, row, col = 0 } = options;
     let imageBuffer;
-    if (Buffer.isBuffer(source)) {
+    if (isBuffer(source)) {
       imageBuffer = source;
+    } else if (isUrl(source)) {
+      const response = await fetch(source);
+      imageBuffer = await response.arrayBuffer();
     } else {
-      imageBuffer = readFileSync(source);
+      if (typeof window !== "undefined") {
+        throw new Error("File path is not supported in browser. Use URL or Buffer.");
+      }
+      const fs = __require("fs");
+      imageBuffer = fs.readFileSync(source);
     }
     const imageId = this.workbook.addImage({
       buffer: imageBuffer,
@@ -637,7 +656,7 @@ async function writeWorkbook(state) {
   for (const sheetState of state.sheets) {
     const worksheet = workbook.addWorksheet(sheetState.name);
     const writer = new SheetWriter(workbook, worksheet);
-    writer.writeSheet(sheetState);
+    await writer.writeSheet(sheetState);
   }
   return workbook;
 }
@@ -693,30 +712,32 @@ var EXCEL_LIMITS = {
 };
 function validateSheetName(name) {
   if (name.length > EXCEL_LIMITS.SHEET_NAME_MAX_LENGTH) {
-    throw new Error("\u30B7\u30FC\u30C8\u540D\u306F31\u6587\u5B57\u4EE5\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059");
+    throw new Error("Sheet name must be 31 characters or less");
   }
   for (const char of EXCEL_LIMITS.SHEET_NAME_INVALID_CHARS) {
     if (name.includes(char)) {
-      throw new Error(`\u30B7\u30FC\u30C8\u540D\u306B\u4F7F\u7528\u3067\u304D\u306A\u3044\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059: ${char}`);
+      throw new Error(`Sheet name contains invalid character: ${char}`);
     }
   }
   if (name.trim().length === 0) {
-    throw new Error("\u30B7\u30FC\u30C8\u540D\u3092\u7A7A\u767D\u306E\u307F\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093");
+    throw new Error("Sheet name cannot be only whitespace");
   }
 }
 function validateDataSize(rowCount, columnCount) {
   if (rowCount > EXCEL_LIMITS.MAX_ROWS) {
-    throw new Error("\u30C7\u30FC\u30BF\u884C\u6570\u304CExcel\u306E\u4E0A\u9650(1,048,576\u884C)\u3092\u8D85\u3048\u3066\u3044\u307E\u3059");
+    throw new Error("Row count exceeds Excel limit (1,048,576 rows)");
   }
   if (columnCount > EXCEL_LIMITS.MAX_COLUMNS) {
-    throw new Error("\u5217\u6570\u304CExcel\u306E\u4E0A\u9650(16,384\u5217)\u3092\u8D85\u3048\u3066\u3044\u307E\u3059");
+    throw new Error("Column count exceeds Excel limit (16,384 columns)");
   }
 }
 
 // src/schemas/image.ts
 import { z } from "zod";
 var imageSourceSchema = z.union([
-  z.instanceof(Buffer),
+  z.custom((val) => isBuffer(val), {
+    message: "Expected Buffer"
+  }),
   z.string().url(),
   // URL形式
   z.string().min(1)
@@ -856,7 +877,7 @@ var SheetBuilder = class {
    */
   space(lines = 1) {
     if (lines <= 0) {
-      throw new Error("space() \u306E\u5F15\u6570\u306F\u6B63\u306E\u6574\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059");
+      throw new Error("space() argument must be a positive integer");
     }
     const block = { type: "space", lines };
     this.sheetState.blocks.push(block);
@@ -868,6 +889,18 @@ var SheetBuilder = class {
   sheet(name) {
     return this.workbook.sheet(name);
   }
+  /**
+   * 複数のワークブックをマージする（WorkbookBuilderに委譲）
+   */
+  merge(workbooks) {
+    return this.workbook.merge(workbooks);
+  }
+  /**
+   * ワークブックの状態を取得（WorkbookBuilderに委譲）
+   */
+  getState() {
+    return this.workbook.getState();
+  }
   /**
    * ブラウザ向け出力オブジェクトを取得（WorkbookBuilderに委譲）
    */
@@ -897,12 +930,33 @@ var WorkbookBuilder = class {
     const sheetName = name ?? `Sheet${this.state.sheets.length + 1}`;
     validateSheetName(sheetName);
     if (this.state.sheets.some((s) => s.name === sheetName)) {
-      throw new Error(`\u30B7\u30FC\u30C8\u540D "${sheetName}" \u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059`);
+      throw new Error(`Sheet name "${sheetName}" already exists`);
     }
     const sheetState = { name: sheetName, blocks: [] };
     this.state.sheets.push(sheetState);
     return new SheetBuilder(this, sheetState);
   }
+  /**
+   * 複数のワークブックをマージする
+   * @param workbooks マージするワークブックの配列
+   * @returns this（メソッドチェーン用）
+   */
+  merge(workbooks) {
+    for (const workbook of workbooks) {
+      const sourceState = workbook.getState();
+      if (sourceState.sheets.length === 0) {
+        continue;
+      }
+      for (const sheet of sourceState.sheets) {
+        if (this.state.sheets.some((s) => s.name === sheet.name)) {
+          throw new Error(`Sheet name "${sheet.name}" already exists`);
+        }
+        validateSheetName(sheet.name);
+        this.state.sheets.push(sheet);
+      }
+    }
+    return this;
+  }
   /**
    * ワークブックの状態を取得（内部用）
    */
@@ -1108,7 +1162,7 @@ var WorkbookReader = class {
   sheet(name) {
     const worksheet = this.workbook.getWorksheet(name);
     if (!worksheet) {
-      throw new Error(`\u30B7\u30FC\u30C8 "${name}" \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093`);
+      throw new Error(`Sheet "${name}" not found`);
     }
     return new SheetReader(worksheet);
   }
@@ -1118,7 +1172,7 @@ var WorkbookReader = class {
   sheetAt(index) {
     const worksheet = this.workbook.worksheets[index];
     if (!worksheet) {
-      throw new Error(`\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9 ${index} \u306E\u30B7\u30FC\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093`);
+      throw new Error(`Sheet at index ${index} not found`);
     }
     return new SheetReader(worksheet);
   }
@@ -1131,7 +1185,7 @@ var WorkbookReader = class {
 };
 async function read(source) {
   const workbook = new ExcelJS2.Workbook();
-  if (Buffer.isBuffer(source)) {
+  if (isBuffer(source)) {
     await workbook.xlsx.load(source);
   } else {
     await workbook.xlsx.readFile(source);