@atomm-developer/generator-sdk 1.0.4 → 1.0.5

package/dist/{index-wW-kUlHs.js → index-Ba3cYeMp.js}

@@ -1,7 +1,7 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { t as toUtf8, f as fromUtf8 } from "./index-qYdFih-w.js";
+import { t as toUtf8, f as fromUtf8 } from "./index-BtfWZLb7.js";
 class EventStreamSerde {
   constructor({ marshaller, serializer, deserializer, serdeContext, defaultContentType }) {
     __publicField(this, "marshaller");

package/dist/{index-qYdFih-w.js → index-BtfWZLb7.js}

@@ -12265,7 +12265,7 @@ class HttpProtocol extends SerdeContext {
     });
   }
   async loadEventStreamCapability() {
-    const { EventStreamSerde } = await import("./index-wW-kUlHs.js");
+    const { EventStreamSerde } = await import("./index-Ba3cYeMp.js");
     return new EventStreamSerde({
       marshaller: this.getEventStreamMarshaller(),
       serializer: this.serializer,
@@ -80710,20 +80710,20 @@ class ExportModule {
   }
   /**
    * 下载图片到本地
-   * 内部流程：getExportCanvas('download') → toBlob → 触发浏览器下载
+   * 支持 png / jpeg / webp / svg 格式
+   *
+   * 内部流程：
+   * 1. 优先调用 getExportData(purpose, format) 获取导出数据
+   * 2. 若未实现则回退到 getExportCanvas(purpose) → canvas.toBlob
+   * 3. 生成 Blob → 触发浏览器下载
    */
   async download(options) {
     var _a2, _b;
-    const canvas = await this._getCanvas("download");
     const format2 = (options == null ? void 0 : options.format) ?? "png";
-    const mimeType = format2 === "svg" ? "image/svg+xml" : "image/png";
-    const fileName = (options == null ? void 0 : options.fileName) ?? ((_b = (_a2 = this.provider) == null ? void 0 : _a2.getFileName) == null ? void 0 : _b.call(_a2, "download")) ?? `export-${Date.now()}.${format2}`;
-    const blob = await new Promise(
-      (resolve) => canvas.toBlob(resolve, mimeType)
-    );
-    if (!blob) {
-      throw new SdkError(-1, "Failed to create blob from canvas");
-    }
+    const quality = options == null ? void 0 : options.quality;
+    const blob = await this._getBlob("download", format2, quality);
+    const extension = format2 === "jpeg" ? "jpg" : format2;
+    const fileName = (options == null ? void 0 : options.fileName) ?? ((_b = (_a2 = this.provider) == null ? void 0 : _a2.getFileName) == null ? void 0 : _b.call(_a2, "download")) ?? `export-${Date.now()}.${extension}`;
     const url2 = URL.createObjectURL(blob);
     const link = document.createElement("a");
     link.download = fileName;
@@ -80739,48 +80739,153 @@ class ExportModule {
   }
   /**
    * 打开到 xTool Studio
-   * 内部流程：
-   * - 传入图片 URL：直接拉起 Studio
-   * - 传入图片数据：上传 OSS → 调用 xtool:// 协议
-   * - 未传参数：getExportCanvas('studio') → toDataURL → 上传 OSS → 调用 xtool:// 协议
+   *
+   * 支持两种调用方式（向后兼容）：
+   * - openInStudio(source)             — 直接传图片源（URL / data URL / Blob / File）
+   * - openInStudio({ source, format }) — 传 options 对象，可指定导入格式
+   * - openInStudio()                   — 无参数，通过 provider 获取数据
+   *
+   * 当未传 source 时，根据 format 参数通过 provider 获取对应格式的数据上传到 OSS
    */
-  async openInStudio(source) {
-    const studioAsset = await this._resolveStudioAsset(source);
+  async openInStudio(sourceOrOptions) {
+    var _a2;
+    const { source, format: format2 } = this._normalizeStudioArgs(sourceOrOptions);
+    const studioAsset = await this._resolveStudioAsset(source, format2);
     const ossUrl = studioAsset.type === "url" ? studioAsset.url : await this._uploadFile(studioAsset.file);
-    this._openStudioProtocol(ossUrl);
+    const isSvg = format2 === "svg" || ((_a2 = studioAsset.file) == null ? void 0 : _a2.type) === "image/svg+xml";
+    this._openStudioProtocol(ossUrl, isSvg ? "SVG" : "2D");
     return { success: true };
   }
+  /**
+   * 兼容解析 openInStudio 参数：
+   * - 无参数 → { source: undefined, format: 'png' }
+   * - string / Blob / File → { source, format: 'png' }
+   * - { source?, format? } → 直接使用
+   */
+  _normalizeStudioArgs(input) {
+    if (input == null) {
+      return { source: void 0, format: "png" };
+    }
+    if (typeof input === "string" || input instanceof Blob || input instanceof File) {
+      return { source: input, format: "png" };
+    }
+    return {
+      source: input.source,
+      format: input.format ?? "png"
+    };
+  }
   // ─────────────────────────────────────────────
-  // 内部方法
+  // 内部方法 - 数据获取
   // ─────────────────────────────────────────────
   /**
-   * 获取导出 Canvas 并校验
+   * 获取导出 Blob，统一处理 getExportData / getExportCanvas 两种路径
    */
-  async _getCanvas(purpose) {
+  async _getBlob(purpose, format2, quality) {
+    this._ensureProvider();
+    const exportData = await this._tryGetExportData(purpose, format2);
+    if (exportData) {
+      return this._exportDataToBlob(exportData, format2, quality);
+    }
+    const canvas = await this._tryGetCanvas(purpose);
+    if (canvas) {
+      return this._canvasToBlob(canvas, format2, quality);
+    }
+    throw new SdkError(
+      -1,
+      `No export data available for purpose: ${purpose}. Implement getExportData or getExportCanvas in your ExportProvider.`
+    );
+  }
+  /** 尝试通过 getExportData 获取导出数据 */
+  async _tryGetExportData(purpose, format2) {
+    var _a2;
+    if (!((_a2 = this.provider) == null ? void 0 : _a2.getExportData)) return null;
+    return await Promise.resolve(this.provider.getExportData(purpose, format2));
+  }
+  /** 尝试通过 getExportCanvas 获取画布 */
+  async _tryGetCanvas(purpose) {
+    var _a2;
+    if (!((_a2 = this.provider) == null ? void 0 : _a2.getExportCanvas)) return null;
+    return await Promise.resolve(this.provider.getExportCanvas(purpose));
+  }
+  /** 确保 provider 已注册 */
+  _ensureProvider() {
     if (!this.provider) {
       throw new SdkError(
         -1,
         "Export provider not registered. Call sdk.export.register() first."
       );
     }
-    const canvas = await Promise.resolve(this.provider.getExportCanvas(purpose));
-    if (!canvas) {
-      throw new SdkError(-1, `No canvas available for purpose: ${purpose}`);
+    if (!this.provider.getExportData && !this.provider.getExportCanvas) {
+      throw new SdkError(
+        -1,
+        "ExportProvider must implement at least one of getExportData or getExportCanvas."
+      );
+    }
+  }
+  // ─────────────────────────────────────────────
+  // 内部方法 - ExportData → Blob 转换
+  // ─────────────────────────────────────────────
+  /** 将 ExportData 转换为 Blob */
+  async _exportDataToBlob(data, format2, quality) {
+    switch (data.type) {
+      case "canvas":
+        return this._canvasToBlob(data.canvas, format2, quality);
+      case "blob":
+        return data.blob;
+      case "dataUrl":
+        return this._dataUrlToBlob(data.dataUrl);
+      case "url": {
+        const response = await fetch(data.url);
+        if (!response.ok) {
+          throw new SdkError(-1, `Failed to fetch export URL: ${response.status}`);
+        }
+        return await response.blob();
+      }
+      case "svg":
+        return new Blob([data.svgString], { type: "image/svg+xml" });
+      default:
+        throw new SdkError(-1, `Unknown ExportData type: ${data.type}`);
+    }
+  }
+  /** Canvas → Blob，正确处理各格式 */
+  _canvasToBlob(canvas, format2, quality) {
+    if (format2 === "svg") {
+      throw new SdkError(
+        -1,
+        'Cannot export SVG from HTMLCanvasElement. Implement getExportData in your ExportProvider to return { type: "svg", svgString }.'
+      );
     }
-    return canvas;
+    const mimeType = this._formatToMimeType(format2);
+    return new Promise((resolve, reject) => {
+      canvas.toBlob(
+        (blob) => {
+          if (!blob) {
+            reject(new SdkError(-1, "Failed to create blob from canvas"));
+            return;
+          }
+          resolve(blob);
+        },
+        mimeType,
+        quality
+      );
+    });
   }
+  // ─────────────────────────────────────────────
+  // 内部方法 - openInStudio 相关
+  // ─────────────────────────────────────────────
   /**
    * 解析 openInStudio 的输入来源：
    * - URL 直传给 Studio
    * - data URL / Blob / File 先上传 OSS
-   * - 未传时回退到 provider canvas
+   * - 未传时通过 provider 按 format 获取数据
    */
-  async _resolveStudioAsset(source) {
+  async _resolveStudioAsset(source, format2 = "png") {
     if (typeof source === "string") {
       if (this._isDataUrl(source)) {
+        const ext2 = this._detectDataUrlExtension(source);
         return {
           type: "file",
-          file: this._dataUrlToFile(source, `${v4$2()}.png`)
+          file: this._dataUrlToFile(source, `${v4$2()}.${ext2}`)
         };
       }
       if (this._isHttpUrl(source)) {
@@ -80795,21 +80900,14 @@ class ExportModule {
       return { type: "file", file: source };
     }
     if (source instanceof Blob) {
-      return {
-        type: "file",
-        file: this._blobToFile(source)
-      };
-    }
-    const canvas = await this._getCanvas("studio");
-    let dataUrl;
-    try {
-      dataUrl = canvas.toDataURL("image/png");
-    } catch {
-      throw new SdkError(-1, "Failed to export canvas (cross-origin taint?)");
+      return { type: "file", file: this._blobToFile(source) };
     }
+    const blob = await this._getBlob("studio", format2);
+    const ext = format2 === "jpeg" ? "jpg" : format2;
+    const mimeType = this._formatToMimeType(format2);
     return {
       type: "file",
-      file: this._dataUrlToFile(dataUrl, `${v4$2()}.png`)
+      file: new File([blob], `${v4$2()}.${ext}`, { type: mimeType })
     };
   }
   /** 获取或懒初始化 Uploader 实例 */
@@ -80835,7 +80933,7 @@ class ExportModule {
     });
   }
   /** 通过 xtool:// 协议打开 Studio */
-  _openStudioProtocol(ossUrl) {
+  _openStudioProtocol(ossUrl, assetType = "2D") {
     const payload = {
       event: {
         name: "OpenOSSImage",
@@ -80862,7 +80960,7 @@ class ExportModule {
             payload: {
               urls: [
                 {
-                  type: "2D",
+                  type: assetType,
                   url: ossUrl,
                   aimakeInfo: { generator: this.appKey }
                 }
@@ -80878,6 +80976,31 @@ class ExportModule {
       window.open(ossUrl, "_blank");
     }
   }
+  // ─────────────────────────────────────────────
+  // 工具方法
+  // ─────────────────────────────────────────────
+  /** 导出格式 → MIME 类型（仅位图格式） */
+  _formatToMimeType(format2) {
+    const map = {
+      png: "image/png",
+      jpeg: "image/jpeg",
+      webp: "image/webp",
+      svg: "image/svg+xml"
+    };
+    return map[format2] ?? "image/png";
+  }
+  /** data URL → Blob */
+  _dataUrlToBlob(dataUrl) {
+    var _a2;
+    const [header, base64] = dataUrl.split(",");
+    const mimeType = ((_a2 = header.match(/:(.*?);/)) == null ? void 0 : _a2[1]) ?? "image/png";
+    const binary = atob(base64);
+    const bytes = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i++) {
+      bytes[i] = binary.charCodeAt(i);
+    }
+    return new Blob([bytes], { type: mimeType });
+  }
   /** data URL → File 对象 */
   _dataUrlToFile(dataUrl, filename) {
     var _a2;
@@ -80896,6 +81019,13 @@ class ExportModule {
     const extension = this._mimeTypeToExtension(mimeType);
     return new File([blob], `${v4$2()}.${extension}`, { type: mimeType });
   }
+  /** 从 data URL 推断文件扩展名 */
+  _detectDataUrlExtension(dataUrl) {
+    var _a2;
+    const mimeType = (_a2 = dataUrl.match(/^data:(image\/[a-zA-Z0-9.+-]+);/)) == null ? void 0 : _a2[1];
+    if (!mimeType) return "png";
+    return this._mimeTypeToExtension(mimeType);
+  }
   /** 判断是否为 data URL */
   _isDataUrl(value) {
     return /^data:image\/[a-zA-Z0-9.+-]+;base64,/.test(value);
@@ -80912,9 +81042,8 @@ class ExportModule {
   /** MIME 类型 → 文件扩展名 */
   _mimeTypeToExtension(mimeType) {
     var _a2;
-    if (mimeType === "image/svg+xml") {
-      return "svg";
-    }
+    if (mimeType === "image/svg+xml") return "svg";
+    if (mimeType === "image/jpeg") return "jpg";
     return ((_a2 = mimeType.split("/")[1]) == null ? void 0 : _a2.split("+")[0]) ?? "png";
   }
 }

package/dist/index.d.ts

@@ -298,12 +298,35 @@ declare class CreditsModule {
     getCachedBalance(): number;
 }
 
+/**
+ * 通用导出数据
+ * 当画布不是 HTMLCanvasElement 时，开发者通过 getExportData 返回此类型
+ */
+export declare type ExportData = {
+    type: 'canvas';
+    canvas: HTMLCanvasElement;
+} | {
+    type: 'blob';
+    blob: Blob;
+} | {
+    type: 'dataUrl';
+    dataUrl: string;
+} | {
+    type: 'url';
+    url: string;
+} | {
+    type: 'svg';
+    svgString: string;
+};
+
 /** export.download() 参数 */
 export declare interface ExportDownloadOptions {
-    /** 文件名（可选，默认 'export-{timestamp}.png'） */
+    /** 文件名（可选，默认 'export-{timestamp}.{format}'） */
     fileName?: string;
     /** 导出格式（可选，默认 'png'） */
-    format?: 'png' | 'svg';
+    format?: ExportFormat;
+    /** JPEG/WebP 质量 0-1（可选，默认 0.92） */
+    quality?: number;
 }
 
 /** export.download() 返回值 */
@@ -312,6 +335,9 @@ export declare interface ExportDownloadResult {
     fileName: string;
 }
 
+/** 支持的导出格式 */
+export declare type ExportFormat = 'png' | 'jpeg' | 'webp' | 'svg';
+
 /**
  * Export 模块
  * 对外暴露：register / download / openInStudio
@@ -330,26 +356,51 @@ declare class ExportModule {
     register(provider: ExportProvider): void;
     /**
      * 下载图片到本地
-     * 内部流程：getExportCanvas('download') → toBlob → 触发浏览器下载
+     * 支持 png / jpeg / webp / svg 格式
+     *
+     * 内部流程：
+     * 1. 优先调用 getExportData(purpose, format) 获取导出数据
+     * 2. 若未实现则回退到 getExportCanvas(purpose) → canvas.toBlob
+     * 3. 生成 Blob → 触发浏览器下载
      */
     download(options?: ExportDownloadOptions): Promise<ExportDownloadResult>;
     /**
      * 打开到 xTool Studio
-     * 内部流程：
-     * - 传入图片 URL：直接拉起 Studio
-     * - 传入图片数据：上传 OSS → 调用 xtool:// 协议
-     * - 未传参数：getExportCanvas('studio') → toDataURL → 上传 OSS → 调用 xtool:// 协议
+     *
+     * 支持两种调用方式（向后兼容）：
+     * - openInStudio(source)             — 直接传图片源（URL / data URL / Blob / File）
+     * - openInStudio({ source, format }) — 传 options 对象，可指定导入格式
+     * - openInStudio()                   — 无参数，通过 provider 获取数据
+     *
+     * 当未传 source 时，根据 format 参数通过 provider 获取对应格式的数据上传到 OSS
      */
-    openInStudio(source?: ExportOpenInStudioSource): Promise<ExportOpenInStudioResult>;
+    openInStudio(sourceOrOptions?: ExportOpenInStudioSource | ExportOpenInStudioOptions): Promise<ExportOpenInStudioResult>;
     /**
-     * 获取导出 Canvas 并校验
+     * 兼容解析 openInStudio 参数：
+     * - 无参数 → { source: undefined, format: 'png' }
+     * - string / Blob / File → { source, format: 'png' }
+     * - { source?, format? } → 直接使用
      */
-    private _getCanvas;
+    private _normalizeStudioArgs;
+    /**
+     * 获取导出 Blob，统一处理 getExportData / getExportCanvas 两种路径
+     */
+    private _getBlob;
+    /** 尝试通过 getExportData 获取导出数据 */
+    private _tryGetExportData;
+    /** 尝试通过 getExportCanvas 获取画布 */
+    private _tryGetCanvas;
+    /** 确保 provider 已注册 */
+    private _ensureProvider;
+    /** 将 ExportData 转换为 Blob */
+    private _exportDataToBlob;
+    /** Canvas → Blob，正确处理各格式 */
+    private _canvasToBlob;
     /**
      * 解析 openInStudio 的输入来源：
      * - URL 直传给 Studio
      * - data URL / Blob / File 先上传 OSS
-     * - 未传时回退到 provider canvas
+     * - 未传时通过 provider 按 format 获取数据
      */
     private _resolveStudioAsset;
     /** 获取或懒初始化 Uploader 实例 */
@@ -358,10 +409,16 @@ declare class ExportModule {
     private _uploadFile;
     /** 通过 xtool:// 协议打开 Studio */
     private _openStudioProtocol;
+    /** 导出格式 → MIME 类型（仅位图格式） */
+    private _formatToMimeType;
+    /** data URL → Blob */
+    private _dataUrlToBlob;
     /** data URL → File 对象 */
     private _dataUrlToFile;
     /** Blob → File 对象 */
     private _blobToFile;
+    /** 从 data URL 推断文件扩展名 */
+    private _detectDataUrlExtension;
     /** 判断是否为 data URL */
     private _isDataUrl;
     /** 判断是否为可直接交给 Studio 的远程 URL */
@@ -370,24 +427,48 @@ declare class ExportModule {
     private _mimeTypeToExtension;
 }
 
+/**
+ * export.openInStudio() 参数
+ * 支持两种调用方式（向后兼容）：
+ * - openInStudio(source)            — 直接传图片源
+ * - openInStudio({ source, format }) — 传 options 对象
+ */
+export declare interface ExportOpenInStudioOptions {
+    /** 图片来源：URL / data URL / Blob / File，不传时从 provider 获取 */
+    source?: ExportOpenInStudioSource;
+    /** 导入 Studio 的格式（不传 source 时生效），默认 'png' */
+    format?: ExportFormat;
+}
+
 /** export.openInStudio() 返回值 */
 export declare interface ExportOpenInStudioResult {
     success: boolean;
 }
 
-/** export.openInStudio() 输入源 */
+/** export.openInStudio() 直接传入的图片源（向后兼容） */
 export declare type ExportOpenInStudioSource = string | Blob | File;
 
 /**
  * 导出能力提供者
  * 开发者实现此接口并通过 sdk.export.register() 注册
+ *
+ * 提供两种方式（优先级：getExportData > getExportCanvas）：
+ * - getExportData：灵活方式，适合非 canvas 场景（SVG/DOM/纯数据）
+ * - getExportCanvas：传统方式，直接返回 HTMLCanvasElement
+ *
+ * 至少实现其中一个，否则调用 download/openInStudio 时会抛出错误
  */
 export declare interface ExportProvider {
     /**
-     * 获取导出用的 Canvas
-     * @param purpose 用途：download=下载 studio=打开到Studio cover=封面
+     * 获取导出数据（灵活方式，优先级高于 getExportCanvas）
+     * 适用于非 canvas 场景：SVG 编辑器、DOM 截图、纯数据生成等
+     */
+    getExportData?: (purpose: ExportPurpose, format: ExportFormat) => ExportData | Promise<ExportData | null> | null;
+    /**
+     * 获取导出用的 Canvas（传统方式）
+     * 当 getExportData 未实现或返回 null 时回退到此方法
      */
-    getExportCanvas: (purpose: ExportPurpose) => HTMLCanvasElement | Promise<HTMLCanvasElement | null> | null;
+    getExportCanvas?: (purpose: ExportPurpose) => HTMLCanvasElement | Promise<HTMLCanvasElement | null> | null;
     /** 自定义文件名生成器（可选） */
     getFileName?: (purpose: ExportPurpose) => string;
 }

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import { G, S, T, w } from "./index-qYdFih-w.js";
+import { G, S, T, w } from "./index-BtfWZLb7.js";
 export {
   G as GeneratorSDK,
   S as SdkError,