template-replacement 3.3.3 → 3.4.0

package/replace/image.ts

@@ -1,25 +1,23 @@
-// import { add_media } from "template-replacement-core-wasm"
-
 export function pxToEMU(px: number): number {
-    return px * (914400 / 96)
+  return px * (914400 / 96)
 }
 
 export function cmToEMU(cm: number): number {
-    return cm * 914400
+  return cm * 914400
 }
 
 export enum textWrapTypes {
-    embed = "Embed",//嵌入型
-    belowText = "BelowText",//嵌于文字下方
-    aboveText = "AboveText",//嵌于文字上方
+  embed = 'Embed', //嵌入型
+  belowText = 'BelowText', //嵌于文字下方
+  aboveText = 'AboveText', //嵌于文字上方
 }
 
 function getFileExtension(filename: string): string {
-    const ext = filename.split('.').pop()
-    if (ext === undefined) {
-        return ''
-    }
-    return '.' + ext
+  const ext = filename.split('.').pop()
+  if (ext === undefined) {
+    return ''
+  }
+  return '.' + ext
 }
 
 // async function generateId(file: Blob): Promise<string> {
@@ -28,101 +26,101 @@ function getFileExtension(filename: string): string {
 // }
 
 export type extent = {
-    cy: number,
-    cx: number,
+  cy: number
+  cx: number
 }
 
 //图片替换
 export default class image {
-    file: Blob
-    relationship = 'image'
-    id?: string
+  file: Blob
+  relationship = 'image'
+  id?: string
 
-    wpExtent?: extent //图片宽高
-    textWrap = textWrapTypes.embed //文字环绕
+  wpExtent?: extent //图片宽高
+  textWrap = textWrapTypes.embed //文字环绕
 
-    awaitInitQueue?: Function[] = []
+  private _awaitInitQueue?: ((value?: unknown) => void)[] = []
 
-    constructor(file: Blob) {
-        if (file instanceof Blob) {
-            this.file = file
-            this.init()
-        } else {
-            throw new Error("不支持的数据类型");
-        }
+  constructor(file: Blob) {
+    if (file instanceof Blob) {
+      this.file = file
+      this.init()
+    } else {
+      throw new Error('不支持的数据类型')
     }
+  }
 
-    async init(): Promise<void> {
-        this.awaitInitQueue = []
-        await this.getExtent()
-        for (const resolve of this.awaitInitQueue) {
-            resolve()
-        }
-        delete this.awaitInitQueue
+  async init(): Promise<void> {
+    this._awaitInitQueue = []
+    await this.getExtent()
+    for (const resolve of this._awaitInitQueue) {
+      resolve()
     }
-
-    // async generateId(): Promise<string> {
-    //     this.id = await generateId(this.file)
-    //     return this.id
-    // }
-
-    async awaitInit(): Promise<void> {
-        if (this.awaitInitQueue) {
-            await new Promise(resolve => {
-                this.awaitInitQueue?.push(resolve)
-            })
-        }
+    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) => {
+        this._awaitInitQueue?.push(resolve)
+      })
     }
-
-    async getExtent(): Promise<extent> {
-        if (!this.wpExtent) {
-            if (this.file.size) {
-                try {
-                    const bitmap = await createImageBitmap(this.file)
-                    if (this.wpExtent) {
-                        this.setPxExtent(bitmap.width, bitmap.height)
-                    }
-                    bitmap.close()
-                    return this.wpExtent!
-                } catch (error) {
-                    console.error(error)
-                }
-            }
-            if (!this.wpExtent) {
-                this.setPxExtent(0, 0)
-            }
+  }
+
+  async getExtent(): Promise<extent> {
+    if (!this.wpExtent) {
+      if (this.file.size) {
+        try {
+          const bitmap = await createImageBitmap(this.file)
+          if (this.wpExtent) {
+            this.setPxExtent(bitmap.width, bitmap.height)
+          }
+          bitmap.close()
+          return this.wpExtent!
+        } catch (error) {
+          console.error(error)
         }
-        return this.wpExtent!
+      }
+      if (!this.wpExtent) {
+        this.setPxExtent(0, 0)
+      }
     }
-
-    //设置图片范围（像素）
-    setPxExtent(width: number, height: number): void {
-        this.wpExtent = {
-            cy: pxToEMU(height),
-            cx: pxToEMU(width),
-        }
+    return this.wpExtent!
+  }
+
+  //设置图片范围（像素）
+  setPxExtent(width: number, height: number): void {
+    this.wpExtent = {
+      cy: pxToEMU(height),
+      cx: pxToEMU(width),
     }
+  }
 
-    //设置图片范围（厘米）
-    setCmExtent(width: number, height: number): void {
-        this.wpExtent = {
-            cy: cmToEMU(height),
-            cx: cmToEMU(width),
-        }
+  //设置图片范围（厘米）
+  setCmExtent(width: number, height: number): void {
+    this.wpExtent = {
+      cy: cmToEMU(height),
+      cx: cmToEMU(width),
     }
+  }
 
-    async outJson(): Promise<Record<string, any>> {
-        await this.awaitInit()
-        const data: Record<string, any> = {}
-        for (const key in this) {
-            data[key] = this[key]
-        }
-        return data
+  async outJson(): Promise<Record<string, unknown>> {
+    await this.awaitInit()
+    const data: Record<string, unknown> = {}
+    for (const key in this) {
+      data[key] = this[key]
     }
+    return data
+  }
 
-    setPropertys(data: Record<string, any>) {
-        for (const key in data) {
-            this[key as keyof image] = data[key]
-        }
+  setProperties(data: Record<string, unknown>) {
+    for (const key in data) {
+      this[key as keyof image] = data[key] as never;
     }
-}
+  }
+}

package/replace/interface.ts

@@ -1,37 +1,42 @@
-import paramsData from "./paramsData"
-import Temp from "../temp"
+import paramsData from './paramsData'
+import Temp from '../temp'
 
 export type media = {
-    id: string,
-    data: Uint8Array
+  id: string
+  data: Uint8Array
 }
 
 export default interface ReplaceInterface {
+  //添加模板文件
+  addTempFile(tempFile: Temp): void
 
-    //添加模板文件
-    addTempFile(tempFile: Temp): void
+  //清空文件和链接
+  clear(): void
 
-    //清空文件和链接
-    clear(): void
+  //提取变量
+  extractVariables(files: Temp[] | undefined): Promise<Record<string, string[]>>
 
-    //提取变量
-    extractVariables(files: Temp[] | undefined): Promise<Record<string, string[]>>
+  //提取媒体
+  extractMedias(files: Temp[] | undefined): Promise<Record<string, media[]>>
 
-    //提取媒体
-    extractMedias(files: Temp[] | undefined): Promise<Record<string, media[]>>
+  //签名方法
+  sign(data: unknown): Promise<string>
 
-    //签名方法
-    sign(data: any): Promise<string>
+  //执行替换任务
+  execute(
+    params: paramsData,
+    files: Temp[] | undefined,
+  ): Promise<Record<string, Uint8Array>>
 
-    //执行替换任务
-    execute(params: paramsData, files: Temp[] | undefined): Promise<Record<string, Uint8Array>>
+  //执行替换任务（多套参数）
+  executeMultipleParams(
+    params: paramsData[],
+    files: Temp[] | undefined,
+  ): Promise<Record<string, Uint8Array>[]>
 
-    //执行替换任务（多套参数）
-    executeMultipleParams(params: paramsData[], files: Temp[] | undefined): Promise<Record<string, Uint8Array>[]>
+  //文件加密
+  fileEncrypt(file: Uint8Array): Promise<Uint8Array>
 
-    //文件加密
-    fileEncrypt(file: Uint8Array): Promise<Uint8Array>
-
-    //文件批量加密
-    filesEncrypt(files: (Uint8Array)[]): Promise<(Uint8Array)[]>
-}
+  //文件批量加密
+  filesEncrypt(files: Uint8Array[]): Promise<Uint8Array[]>
+}

package/replace/paramsData.ts

@@ -1,116 +1,128 @@
 import image, { extent, textWrapTypes } from './image'
 
-export type textData = Record<string, string|image>
+export type textData = Record<string, string | image>
 export type mediaData = Record<string, image>
 
 type imageValue = {
-    id: String,
-    index: Number,
-    suffix: String,
-    wp_extent: extent,
-    text_wrap: textWrapTypes,
+  id: string
+  index: number
+  suffix: string
+  wp_extent: extent
+  text_wrap: textWrapTypes
 }
 
 type value = {
-    Image?: imageValue,
-    Text?: string
+  Image?: imageValue
+  Text?: string
 }
 
 export type replaceParams = {
-    text: Record<string, value>
-    media: Record<string, value>
+  text: Record<string, value>
+  media: Record<string, value>
 }
 
 export default class paramsData {
-    textData: textData = {}
-    mediaData: mediaData = {}
-    add_media?: (file: Uint8Array) => Promise<string>
+  textData: textData = {}
+  mediaData: mediaData = {}
+  add_media?: (file: Uint8Array) => string
 
-    constructor(text?: textData, media?: mediaData) {
-        if (text && text.constructor === Object) {
-            this.textData = text
-        }
-        if (media && media.constructor === Object) {
-            this.mediaData = media
-        }
+  constructor(text?: textData, media?: mediaData) {
+    if (text && text.constructor === Object) {
+      this.textData = text
     }
+    if (media && media.constructor === Object) {
+      this.mediaData = media
+    }
+  }
 
-    //转为替换参数
-    async toReplaceParams(mediaBuffers: Uint8Array[] = []): Promise<[replaceParams, Uint8Array[]]>  {
-        const text: Record<string, value> = {}
-        const media: Record<string, value> = {}
-        const tasks = []
-        for (const key in this.textData) {
-            tasks.push(new Promise<void>(async resolve => {
-                const value = this.textData[key]
-                if (value instanceof image) {
-                    let id = value.id ?? ''
-                    let index = 0
-                    if (!id) {
-                        const buffer = await value.file.arrayBuffer()
-                        const uint8Array = new Uint8Array(buffer)
-                        if(this.add_media) {
-                            id = await this.add_media(uint8Array)
-                        }else{
-                            index = mediaBuffers.push(uint8Array) - 1
-                        }
-                    }
-                    text[key] = {
-                        Image: {
-                            index,
-                            id,
-                            suffix: '',
-                            wp_extent: value.wpExtent ?? {cx: 0, cy: 0},
-                            text_wrap: value.textWrap
-                        }
-                    }
-                } else {
-                    text[key] = {
-                        Text: String(value)
-                    }
-                }
-                resolve()
-            }))
-        }
-
-        for (const key in this.mediaData) {
-            tasks.push(new Promise<void>(async resolve => {
-                const value = this.mediaData[key]
-                if (value instanceof image) {
-                    let id = value.id ?? ''
-                    let index = 0
-                    if (!id) {
-                        const buffer = await value.file.arrayBuffer()
-                        const uint8Array = new Uint8Array(buffer)
+  //转为替换参数
+  async toReplaceParams(
+    mediaBuffers: Uint8Array[] = [],
+  ): Promise<[replaceParams, Uint8Array[]]> {
+    const text: Record<string, value> = {}
+    const media: Record<string, value> = {}
+    const tasks = []
+    for (const key in this.textData) {
+      tasks.push(
+        new Promise<void>(async (resolve) => {
+          const value = this.textData[key]
+          if (value instanceof image) {
+            let id = value.id ?? ''
+            let index = 0
+            if (!id) {
+              const buffer = await value.file.arrayBuffer()
+              const uint8Array = new Uint8Array(buffer)
+              if (this.add_media) {
+                id = this.add_media(uint8Array)
+              } else {
+                index = mediaBuffers.push(uint8Array) - 1
+              }
+            }
+            text[key] = {
+              Image: {
+                index,
+                id,
+                suffix: '',
+                wp_extent: value.wpExtent ?? { cx: 0, cy: 0 },
+                text_wrap: value.textWrap,
+              },
+            }
+          } else {
+            text[key] = {
+              Text: String(value),
+            }
+          }
+          resolve()
+        }),
+      )
+    }
 
-                        if(this.add_media) {
-                            id = await this.add_media(uint8Array)
-                        }else{
-                            index = mediaBuffers.push(uint8Array) - 1
-                        }
-                    }
-                    media[key] = {
-                        Image: {
-                            index,
-                            id,
-                            suffix: '',
-                            wp_extent: value.wpExtent ?? {cx: 0, cy: 0},
-                            text_wrap: value.textWrap
-                        }
-                    }
-                }
-                resolve()
-            }))
-        }
+    for (const key in this.mediaData) {
+      tasks.push(
+        new Promise<void>(async (resolve) => {
+          const value = this.mediaData[key]
+          if (value instanceof image) {
+            let id = value.id ?? ''
+            let index = 0
+            if (!id) {
+              const buffer = await value.file.arrayBuffer()
+              const uint8Array = new Uint8Array(buffer)
 
-        await Promise.all(tasks)
-        return [{
-            text,
-            media
-        }, mediaBuffers]
+              if (this.add_media) {
+                id = this.add_media(uint8Array)
+              } else {
+                index = mediaBuffers.push(uint8Array) - 1
+              }
+            }
+            media[key] = {
+              Image: {
+                index,
+                id,
+                suffix: '',
+                wp_extent: value.wpExtent ?? { cx: 0, cy: 0 },
+                text_wrap: value.textWrap,
+              },
+            }
+          }
+          resolve()
+        }),
+      )
     }
 
-    isEmpty() {
-        return Object.keys(this.textData).length === 0 && Object.keys(this.mediaData).length === 0
-    }
-}
+    await Promise.all(tasks)
+    return [
+      {
+        text,
+        media,
+      },
+      mediaBuffers,
+    ]
+  }
+
+  isEmpty() {
+    return (
+      Object.keys(this.textData).length === 0 &&
+      Object.keys(this.mediaData).length === 0
+    )
+  }
+}

package/replace/sign.ts

@@ -1,61 +1,88 @@
-import Base from './base';
-import core, { add_template, add_media, replace_batch_verify, replace_params_encode, replace_batch_verify_multiple_params, replace_params_encode_multiple_params } from '../core/sign'
-import paramsData, { replaceParams } from './paramsData';
+import Base from './base'
+import core, {
+  add_media,
+  add_template,
+  replace_batch,
+  replace_params_encode,
+  replace_batch_multiple_params,
+  replace_params_encode_multiple_params,
+} from '../core/sign'
+import paramsData, { replaceParams } from './paramsData'
 
 export default class Sign extends Base {
-    constructor() {
-        super(core())
-    }
-
-    async handle(paramsData: paramsData, files: Uint8Array[], isDecode: boolean = false): Promise<Uint8Array[]> {
-        paramsData.add_media = add_media
-
-        const addFileTasks: Promise<number>[] = []
-        for (const file of files) {
-            addFileTasks.push(add_template(file, isDecode))
-        }
-        const [tempFiles, [variables]] = await Promise.all([
-            Promise.all(addFileTasks),
-            paramsData.toReplaceParams(),
-        ])
-        const encodeData = {
-            files: tempFiles,
-            variables
-        }
+  constructor() {
+    super(core())
+  }
 
-        const paramsEncode = await replace_params_encode(encodeData)
-        const verifyCode = await this.sign(paramsEncode)
-        return replace_batch_verify(String(verifyCode), paramsEncode.data)
+  async handle(
+    paramsData: paramsData,
+    files: Uint8Array[],
+    encode_files: Uint8Array[],
+  ): Promise<Uint8Array[]> {
+    paramsData.add_media = add_media
+    const addFileTasks: Promise<number>[] = []
+    for (const file of files) {
+      addFileTasks.push(add_template(file, false))
     }
+    for (const file of encode_files) {
+      addFileTasks.push(add_template(file, true))
+    }
+    const [tempFiles, [variables]] = await Promise.all([
+      Promise.all(addFileTasks),
+      paramsData.toReplaceParams(),
+    ])
+    const encodeData = {
+      files: tempFiles,
+      variables,
+    }
+    const paramsEncode = await replace_params_encode(encodeData)
+    const verifyCode = await this.sign(paramsEncode)
+    return replace_batch(verifyCode, paramsEncode.data)
+  }
 
-    async handleMultipleParams(paramsList: paramsData[], files: Uint8Array[], isDecode: boolean = false): Promise<Uint8Array[]> {
-        let variablesTasks: Promise<replaceParams>[] = []
-        for (const paramsData of paramsList) {
-            paramsData.add_media = add_media
-            variablesTasks.push(new Promise((resolve, reject) => {
-                paramsData.toReplaceParams().then(([params]) => {
-                    resolve(params)
-                }).catch(reject)
-            }))
-        }
-
-        const addFileTasks: Promise<number>[] = []
-        for (const file of files) {
-            addFileTasks.push(add_template(file, isDecode))
-        }
+  async handleMultipleParams(
+    paramsList: paramsData[],
+    files: Uint8Array[],
+    encode_files: Uint8Array[],
+  ): Promise<Uint8Array[]> {
+    let variablesTasks: Promise<replaceParams>[] = []
+    for (const paramsData of paramsList) {
+      paramsData.add_media = add_media
+      variablesTasks.push(
+        new Promise((resolve, reject) => {
+          paramsData
+            .toReplaceParams()
+            .then(([params]) => {
+              resolve(params)
+            })
+            .catch(reject)
+        }),
+      )
+    }
 
-        const [tempFiles, variables] = await Promise.all([
-            Promise.all(addFileTasks),
-            Promise.all(variablesTasks),
-        ])
+    const addFileTasks: Promise<number>[] = []
+    for (const file of files) {
+      addFileTasks.push(add_template(file, false))
+    }
+    for (const file of encode_files) {
+      addFileTasks.push(add_template(file, true))
+    }
 
-        const encodeData = {
-            files: tempFiles,
-            variables
-        }
+    const [tempFiles, variables] = await Promise.all([
+      Promise.all(addFileTasks),
+      Promise.all(variablesTasks),
+    ])
 
-        const paramsEncode = await replace_params_encode_multiple_params(encodeData)
-        const verifyCode = await this.sign(paramsEncode)
-        return replace_batch_verify_multiple_params(String(verifyCode), paramsEncode.data)
+    const encodeData = {
+      files: tempFiles,
+      variables,
     }
-}
+
+    const paramsEncode = await replace_params_encode_multiple_params(encodeData)
+    const verifyCode = await this.sign(paramsEncode)
+    return replace_batch_multiple_params(
+      verifyCode,
+      paramsEncode.data,
+    )
+  }
+}