template-replacement 3.5.2 → 3.5.3

package/dist/main/general.js

@@ -1761,22 +1761,22 @@ x.getAdapter = fg.getAdapter;
 x.HttpStatusCode = hB;
 x.default = x;
 const {
-  Axios: AE,
-  AxiosError: BE,
-  CanceledError: gE,
-  isCancel: QE,
-  CancelToken: IE,
-  VERSION: CE,
-  all: EE,
-  Cancel: DE,
-  isAxiosError: wE,
-  spread: iE,
-  toFormData: oE,
-  AxiosHeaders: GE,
-  HttpStatusCode: NE,
-  formToJSON: ME,
-  getAdapter: FE,
-  mergeConfig: cE
+  Axios: BE,
+  AxiosError: gE,
+  CanceledError: QE,
+  isCancel: IE,
+  CancelToken: CE,
+  VERSION: EE,
+  all: DE,
+  Cancel: wE,
+  isAxiosError: iE,
+  spread: oE,
+  toFormData: GE,
+  AxiosHeaders: NE,
+  HttpStatusCode: ME,
+  formToJSON: FE,
+  getAdapter: cE,
+  mergeConfig: kE
 } = x;
 let DB;
 async function Ag() {
@@ -5015,16 +5015,23 @@ function Mg(B) {
 function Fg(B) {
   return B * 914400;
 }
+function jC(B) {
+  const A = B.split(".").pop();
+  return A === void 0 ? "" : "." + A;
+}
 const cg = /* @__PURE__ */ new Set([
   "file",
   "id",
+  "suffix",
   "wpExtent",
   "textWrap",
   "relationship"
 ]);
 class RA {
   constructor(A) {
-    if (this.relationship = "image", this.textWrap = "Embed", this._awaitInitQueue = [], A instanceof Blob)
+    if (this.relationship = "image", this.textWrap = "Embed", this._awaitInitQueue = [], A instanceof File)
+      this.file = A, this.suffix = jC(A.name), this.init();
+    else if (A instanceof Blob)
       this.file = A, this.init();
     else
       throw new Error("不支持的数据类型");
@@ -5100,7 +5107,7 @@ class kg {
               Image: {
                 index: o,
                 id: i,
-                suffix: "",
+                suffix: D.suffix ?? "",
                 wp_extent: D.wpExtent ?? { cx: 0, cy: 0 },
                 text_wrap: D.textWrap
               }
@@ -5126,7 +5133,7 @@ class kg {
               Image: {
                 index: o,
                 id: i,
-                suffix: "",
+                suffix: D.suffix ?? "",
                 wp_extent: D.wpExtent ?? { cx: 0, cy: 0 },
                 text_wrap: D.textWrap
               }
@@ -5150,10 +5157,10 @@ class kg {
 function JA(B) {
   if (!B.uint8Array || !B.name)
     throw new Error("模板文件信息错误");
-  const A = new jC(void 0, void 0, B.uint8Array, B.name);
+  const A = new VC(void 0, void 0, B.uint8Array, B.name);
   return A.isDecode = B.isDecode, A;
 }
-class jC {
+class VC {
   constructor(A, g, Q, I) {
     if (this.name = "", this.status = 0, this.isDecode = !1, this.tempImages = {}, this._output = void 0, this._type = void 0, Q ? (this.uint8Array = Q, this.setStatus(
       1
@@ -5220,7 +5227,7 @@ class jC {
       };
   }
 }
-class VC {
+class uC {
   #A;
   constructor(A) {
     this.#A = A;
@@ -5305,7 +5312,7 @@ class VC {
   }
 }
 var XA = /* @__PURE__ */ ((B) => (B[B.replace = 0] = "replace", B[B.replaceProgress = 1] = "replaceProgress", B[B.sign = 2] = "sign", B[B.signReply = 3] = "signReply", B[B.methodCall = 4] = "methodCall", B[B.methodCallReply = 5] = "methodCallReply", B))(XA || {});
-const uC = /* @__PURE__ */ new Set(["addTempFile", "extractVariables", "extractMedias", "execute", "filesEncrypt", "fileEncrypt", "executeMultipleParams"]), zC = /* @__PURE__ */ new Map([
+const zC = /* @__PURE__ */ new Set(["addTempFile", "extractVariables", "extractMedias", "execute", "filesEncrypt", "fileEncrypt", "executeMultipleParams"]), vC = /* @__PURE__ */ new Map([
   ["execute", (B, A = []) => {
     for (const g in B) {
       const Q = B[g];
@@ -5337,8 +5344,8 @@ const uC = /* @__PURE__ */ new Set(["addTempFile", "extractVariables", "extractM
   }]
 ]), Rg = /* @__PURE__ */ new Map();
 let UB;
-function vC(B) {
-  UB = new VC(B);
+function _C(B) {
+  UB = new uC(B);
 }
 addEventListener("message", async (B) => {
   const A = B.data;
@@ -5346,7 +5353,7 @@ addEventListener("message", async (B) => {
     switch (A.type) {
       case XA.methodCall:
         const g = A.data, Q = g.method;
-        if (!uC.has(Q))
+        if (!zC.has(Q))
           return;
         const I = UB[Q];
         if (!I)
@@ -5361,7 +5368,7 @@ addEventListener("message", async (B) => {
           return;
         const D = [];
         if (C) {
-          const w = zC.get(Q);
+          const w = vC.get(Q);
           w && w(C, D);
         }
         postMessage(
@@ -5386,7 +5393,7 @@ addEventListener("message", async (B) => {
         o(A.data.result), Rg.delete(i);
     }
 });
-vC(new XC());
+_C(new XC());
 `, Q = typeof self < "u" && self.Blob && new Blob(["URL.revokeObjectURL(import.meta.url);", I], { type: "text/javascript;charset=utf-8" });
 function E(B) {
   let A;

package/dist/main/sign.js

@@ -1761,22 +1761,22 @@ x.getAdapter = PI.getAdapter;
 x.HttpStatusCode = YB;
 x.default = x;
 const {
-  Axios: CE,
-  AxiosError: EE,
-  CanceledError: DE,
-  isCancel: wE,
-  CancelToken: iE,
-  VERSION: oE,
-  all: GE,
-  Cancel: NE,
-  isAxiosError: ME,
-  spread: FE,
-  toFormData: kE,
-  AxiosHeaders: cE,
-  HttpStatusCode: RE,
-  formToJSON: sE,
-  getAdapter: hE,
-  mergeConfig: YE
+  Axios: EE,
+  AxiosError: DE,
+  CanceledError: wE,
+  isCancel: iE,
+  CancelToken: oE,
+  VERSION: GE,
+  all: NE,
+  Cancel: ME,
+  isAxiosError: FE,
+  spread: kE,
+  toFormData: cE,
+  AxiosHeaders: RE,
+  HttpStatusCode: sE,
+  formToJSON: hE,
+  getAdapter: YE,
+  mergeConfig: yE
 } = x;
 let iB;
 async function gI() {
@@ -5039,16 +5039,23 @@ function cI(B) {
 function RI(B) {
   return B * 914400;
 }
+function vC(B) {
+  const A = B.split(".").pop();
+  return A === void 0 ? "" : "." + A;
+}
 const sI = /* @__PURE__ */ new Set([
   "file",
   "id",
+  "suffix",
   "wpExtent",
   "textWrap",
   "relationship"
 ]);
 class RA {
   constructor(A) {
-    if (this.relationship = "image", this.textWrap = "Embed", this._awaitInitQueue = [], A instanceof Blob)
+    if (this.relationship = "image", this.textWrap = "Embed", this._awaitInitQueue = [], A instanceof File)
+      this.file = A, this.suffix = vC(A.name), this.init();
+    else if (A instanceof Blob)
       this.file = A, this.init();
     else
       throw new Error("不支持的数据类型");
@@ -5124,7 +5131,7 @@ class hI {
               Image: {
                 index: o,
                 id: i,
-                suffix: "",
+                suffix: D.suffix ?? "",
                 wp_extent: D.wpExtent ?? { cx: 0, cy: 0 },
                 text_wrap: D.textWrap
               }
@@ -5150,7 +5157,7 @@ class hI {
               Image: {
                 index: o,
                 id: i,
-                suffix: "",
+                suffix: D.suffix ?? "",
                 wp_extent: D.wpExtent ?? { cx: 0, cy: 0 },
                 text_wrap: D.textWrap
               }
@@ -5174,10 +5181,10 @@ class hI {
 function KA(B) {
   if (!B.uint8Array || !B.name)
     throw new Error("模板文件信息错误");
-  const A = new vC(void 0, void 0, B.uint8Array, B.name);
+  const A = new _C(void 0, void 0, B.uint8Array, B.name);
   return A.isDecode = B.isDecode, A;
 }
-class vC {
+class _C {
   constructor(A, I, g, Q) {
     if (this.name = "", this.status = 0, this.isDecode = !1, this.tempImages = {}, this._output = void 0, this._type = void 0, g ? (this.uint8Array = g, this.setStatus(
       1
@@ -5244,7 +5251,7 @@ class vC {
       };
   }
 }
-class _C {
+class $C {
   #A;
   constructor(A) {
     this.#A = A;
@@ -5329,7 +5336,7 @@ class _C {
   }
 }
 var eA = /* @__PURE__ */ ((B) => (B[B.replace = 0] = "replace", B[B.replaceProgress = 1] = "replaceProgress", B[B.sign = 2] = "sign", B[B.signReply = 3] = "signReply", B[B.methodCall = 4] = "methodCall", B[B.methodCallReply = 5] = "methodCallReply", B))(eA || {});
-const $C = /* @__PURE__ */ new Set(["addTempFile", "extractVariables", "extractMedias", "execute", "filesEncrypt", "fileEncrypt", "executeMultipleParams"]), AE = /* @__PURE__ */ new Map([
+const AE = /* @__PURE__ */ new Set(["addTempFile", "extractVariables", "extractMedias", "execute", "filesEncrypt", "fileEncrypt", "executeMultipleParams"]), BE = /* @__PURE__ */ new Map([
   ["execute", (B, A = []) => {
     for (const I in B) {
       const g = B[I];
@@ -5361,10 +5368,10 @@ const $C = /* @__PURE__ */ new Set(["addTempFile", "extractVariables", "extractM
   }]
 ]), LB = /* @__PURE__ */ new Map();
 let tB;
-function BE(B) {
-  tB = new _C(B);
+function IE(B) {
+  tB = new $C(B);
 }
-function IE(B, ...A) {
+function gE(B, ...A) {
   const I = NC();
   return postMessage({
     type: eA.methodCall,
@@ -5383,7 +5390,7 @@ addEventListener("message", async (B) => {
     switch (A.type) {
       case eA.methodCall:
         const I = A.data, g = I.method;
-        if (!$C.has(g))
+        if (!AE.has(g))
           return;
         const Q = tB[g];
         if (!Q)
@@ -5398,7 +5405,7 @@ addEventListener("message", async (B) => {
           return;
         const D = [];
         if (C) {
-          const w = AE.get(g);
+          const w = BE.get(g);
           w && w(C, D);
         }
         postMessage(
@@ -5424,8 +5431,8 @@ addEventListener("message", async (B) => {
     }
 });
 const Ag = new zC();
-BE(Ag);
-Ag.sign = (B) => IE("sign", B);
+IE(Ag);
+Ag.sign = (B) => gE("sign", B);
 `, g = typeof self < "u" && self.Blob && new Blob(["URL.revokeObjectURL(import.meta.url);", Q], { type: "text/javascript;charset=utf-8" });
 function E(B) {
   let A;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "template-replacement",
   "description": "模板文件替换",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "author": "fushiliang <994301536@qq.com>",
   "type": "module",
   "main": "index.ts",
@@ -24,7 +24,7 @@
     "@typescript-eslint/eslint-plugin": "^8.50.0",
     "@typescript-eslint/parser": "^8.50.0",
     "eslint": "^9.39.2",
-    "eslint-plugin-oxlint": "^1.33.0",
+    "eslint-plugin-oxlint": "^1.34.0",
     "oxfmt": "^0.16.0",
     "oxlint": "^1.34.0",
     "terser": "^5.44.1",

package/replace/image.ts

@@ -12,6 +12,7 @@ export enum textWrapTypes {
   aboveText = 'AboveText', //嵌于文字上方
 }
 
+//获取文件扩展名
 function getFileExtension(filename: string): string {
   const ext = filename.split('.').pop()
   if (ext === undefined) {
@@ -30,10 +31,11 @@ export type extent = {
   cx: number
 }
 
-//允许设置的属性
+//允许导出和设置的属性
 const allowSetPropertyKeys = new Set([
   'file',
   'id',
+  'suffix',
   'wpExtent',
   'textWrap',
   'relationship',
@@ -44,6 +46,7 @@ export default class image {
   file: Blob
   relationship = 'image'
   id?: string
+  suffix?: string
 
   wpExtent?: extent //图片宽高
   textWrap = textWrapTypes.embed //文字环绕
@@ -51,7 +54,11 @@ export default class image {
   private _awaitInitQueue?: ((value?: unknown) => void)[] = []
 
   constructor(file: Blob) {
-    if (file instanceof Blob) {
+    if (file instanceof File) {
+      this.file = file
+      this.suffix = getFileExtension(file.name)
+      this.init()
+    } else if (file instanceof Blob) {
       this.file = file
       this.init()
     } else {

package/replace/paramsData.ts

@@ -62,7 +62,7 @@ export default class paramsData {
               Image: {
                 index,
                 id,
-                suffix: '',
+                suffix: value.suffix ?? '',
                 wp_extent: value.wpExtent ?? { cx: 0, cy: 0 },
                 text_wrap: value.textWrap,
               },
@@ -98,7 +98,7 @@ export default class paramsData {
               Image: {
                 index,
                 id,
-                suffix: '',
+                suffix: value.suffix ?? '',
                 wp_extent: value.wpExtent ?? { cx: 0, cy: 0 },
                 text_wrap: value.textWrap,
               },