template-replacement 3.4.0 → 3.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "template-replacement",
   "description": "模板文件替换",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "author": "fushiliang <994301536@qq.com>",
   "type": "module",
   "main": "index.ts",
@@ -15,8 +15,8 @@
     "fflate": "^0.8.2",
     "file-type": "^19.6.0",
     "streamsaver": "^2.0.6",
-    "template-replacement-core-wasm": "^1.7.2",
-    "template-replacement-sign-core-wasm": "^1.7.2"
+    "template-replacement-core-wasm": "^1.8.0",
+    "template-replacement-sign-core-wasm": "^1.8.0"
   },
   "devDependencies": {
     "@rollup/pluginutils": "^5.3.0",
@@ -26,7 +26,7 @@
     "eslint": "^9.39.2",
     "eslint-plugin-oxlint": "^1.33.0",
     "oxfmt": "^0.16.0",
-    "oxlint": "^1.33.0",
+    "oxlint": "^1.34.0",
     "terser": "^5.44.1",
     "typescript": "^5.9.3",
     "vite": "^7.3.0"

package/replace/image.ts

@@ -30,6 +30,15 @@ export type extent = {
   cx: number
 }
 
+//允许设置的属性
+const allowSetPropertyKeys = new Set([
+  'file',
+  'id',
+  'wpExtent',
+  'textWrap',
+  'relationship',
+])
+
 //图片替换
 export default class image {
   file: Blob
@@ -59,11 +68,6 @@ export default class image {
     this._awaitInitQueue = undefined
   }
 
-  // async generateId(): Promise<string> {
-  //     this.id = await generateId(this.file)
-  //     return this.id
-  // }
-
   async awaitInit(): Promise<void> {
     if (this._awaitInitQueue) {
       await new Promise((resolve) => {
@@ -77,7 +81,7 @@ export default class image {
       if (this.file.size) {
         try {
           const bitmap = await createImageBitmap(this.file)
-          if (this.wpExtent) {
+          if (!this.wpExtent) {
             this.setPxExtent(bitmap.width, bitmap.height)
           }
           bitmap.close()
@@ -113,6 +117,9 @@ export default class image {
     await this.awaitInit()
     const data: Record<string, unknown> = {}
     for (const key in this) {
+      if (!allowSetPropertyKeys.has(key)) {
+        continue
+      }
       data[key] = this[key]
     }
     return data
@@ -120,6 +127,9 @@ export default class image {
 
   setProperties(data: Record<string, unknown>) {
     for (const key in data) {
+      if (!allowSetPropertyKeys.has(key)) {
+        continue
+      }
       this[key as keyof image] = data[key] as never;
     }
   }

package/replace/sign.ts

@@ -20,17 +20,14 @@ export default class Sign extends Base {
     encode_files: Uint8Array[],
   ): Promise<Uint8Array[]> {
     paramsData.add_media = add_media
-    const addFileTasks: Promise<number>[] = []
+    const tempFiles = []
     for (const file of files) {
-      addFileTasks.push(add_template(file, false))
+      tempFiles.push(add_template(file, false))
     }
     for (const file of encode_files) {
-      addFileTasks.push(add_template(file, true))
+      tempFiles.push(add_template(file, true))
     }
-    const [tempFiles, [variables]] = await Promise.all([
-      Promise.all(addFileTasks),
-      paramsData.toReplaceParams(),
-    ])
+    const [variables] = await paramsData.toReplaceParams()
     const encodeData = {
       files: tempFiles,
       variables,
@@ -59,23 +56,17 @@ export default class Sign extends Base {
         }),
       )
     }
-
-    const addFileTasks: Promise<number>[] = []
+    const tempFiles = []
     for (const file of files) {
-      addFileTasks.push(add_template(file, false))
+      tempFiles.push(add_template(file, false))
     }
     for (const file of encode_files) {
-      addFileTasks.push(add_template(file, true))
+      tempFiles.push(add_template(file, true))
     }
 
-    const [tempFiles, variables] = await Promise.all([
-      Promise.all(addFileTasks),
-      Promise.all(variablesTasks),
-    ])
-
     const encodeData = {
       files: tempFiles,
-      variables,
+      variables: await Promise.all(variablesTasks),
     }
 
     const paramsEncode = await replace_params_encode_multiple_params(encodeData)

package/worker/main/index.ts

@@ -92,7 +92,7 @@ export default class WorkerReplace implements ReplaceInterface {
 
   #call<T>(method: allMethodNames, params: unknown[]): Promise<T> {
     const transfer: Transferable[] = []
-
+    //TODO 处理params中的Transferable对象,但要考虑拆分多个worker处理之后Transferable对象所有权只会被一个worker获取
     for (const param of params) {
       if (param instanceof Array) {
         for (const item of param) {