fix copy as copy and change prefix of exported functions

.vscode/settings.json

@@ -1,5 +1,89 @@
 {
   "editor.tabSize": 2,
   "editor.formatOnPaste": true,
-  "editor.formatOnSave": true
+  "editor.formatOnSave": true,
+  "files.associations": {
+    "__bit_reference": "cpp",
+    "__hash_table": "cpp",
+    "__locale": "cpp",
+    "__node_handle": "cpp",
+    "__split_buffer": "cpp",
+    "__threading_support": "cpp",
+    "__verbose_abort": "cpp",
+    "array": "cpp",
+    "bitset": "cpp",
+    "cctype": "cpp",
+    "charconv": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "condition_variable": "cpp",
+    "cstdarg": "cpp",
+    "cstddef": "cpp",
+    "cstdint": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cstring": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "cwctype": "cpp",
+    "deque": "cpp",
+    "execution": "cpp",
+    "memory": "cpp",
+    "forward_list": "cpp",
+    "initializer_list": "cpp",
+    "ios": "cpp",
+    "iosfwd": "cpp",
+    "istream": "cpp",
+    "limits": "cpp",
+    "locale": "cpp",
+    "mutex": "cpp",
+    "new": "cpp",
+    "numbers": "cpp",
+    "optional": "cpp",
+    "ostream": "cpp",
+    "print": "cpp",
+    "queue": "cpp",
+    "ratio": "cpp",
+    "semaphore": "cpp",
+    "sstream": "cpp",
+    "stack": "cpp",
+    "stdexcept": "cpp",
+    "streambuf": "cpp",
+    "string": "cpp",
+    "string_view": "cpp",
+    "tuple": "cpp",
+    "typeinfo": "cpp",
+    "unordered_map": "cpp",
+    "variant": "cpp",
+    "vector": "cpp",
+    "__tree": "cpp",
+    "cfenv": "cpp",
+    "complex": "cpp",
+    "iostream": "cpp",
+    "list": "cpp",
+    "map": "cpp",
+    "set": "cpp",
+    "unordered_set": "cpp",
+    "atomic": "cpp",
+    "bit": "cpp",
+    "*.tcc": "cpp",
+    "chrono": "cpp",
+    "compare": "cpp",
+    "concepts": "cpp",
+    "coroutine": "cpp",
+    "exception": "cpp",
+    "algorithm": "cpp",
+    "functional": "cpp",
+    "iterator": "cpp",
+    "memory_resource": "cpp",
+    "numeric": "cpp",
+    "random": "cpp",
+    "system_error": "cpp",
+    "type_traits": "cpp",
+    "utility": "cpp",
+    "iomanip": "cpp",
+    "stop_token": "cpp",
+    "thread": "cpp",
+    "cinttypes": "cpp"
+  }
 }

packages/engines/src/pdfium/engine.ts

@@ -175,7 +175,7 @@ export class PdfiumEngine implements PdfEngine {
       'Begin',
       'General',
     );
-    this.pdfiumModule.PDFium_Init();
+    this.pdfiumModule.PDFiumExt_Init();
     this.logger.perf(LOG_SOURCE, LOG_CATEGORY, `Initialize`, 'End', 'General');
     return TaskBase.resolve(true);
   }
@@ -1963,18 +1963,18 @@ export class PdfiumEngine implements PdfEngine {
    * @private
    */
   saveDocument(docPtr: number) {
-    const writerPtr = this.pdfiumModule.PDFium_OpenFileWriter();
-    this.pdfiumModule.PDFium_SaveAsCopy(docPtr, writerPtr);
-    const size = this.pdfiumModule.PDFium_GetFileWriterSize(writerPtr);
+    const writerPtr = this.pdfiumModule.PDFiumExt_OpenFileWriter();
+    this.pdfiumModule.PDFiumExt_SaveAsCopy(docPtr, writerPtr);
+    const size = this.pdfiumModule.PDFiumExt_GetFileWriterSize(writerPtr);
     const dataPtr = this.malloc(size);
-    this.pdfiumModule.PDFium_GetFileWriterData(writerPtr, dataPtr, size);
+    this.pdfiumModule.PDFiumExt_GetFileWriterData(writerPtr, dataPtr, size);
     const buffer = new ArrayBuffer(size);
     const view = new DataView(buffer);
     for (let i = 0; i < size; i++) {
       view.setInt8(i, this.pdfiumModule.pdfium.getValue(dataPtr + i, 'i8'));
     }
     this.free(dataPtr);
-    this.pdfiumModule.PDFium_CloseFileWriter(writerPtr);
+    this.pdfiumModule.PDFiumExt_CloseFileWriter(writerPtr);
 
     return buffer;
   }
@@ -2343,8 +2343,8 @@ export class PdfiumEngine implements PdfEngine {
     scaleFactor: number,
     rotation: Rotation,
   ) {
-    const formFillInfoPtr = this.pdfiumModule.PDFium_OpenFormFillInfo();
-    const formHandle = this.pdfiumModule.PDFium_InitFormFillEnvironment(
+    const formFillInfoPtr = this.pdfiumModule.PDFiumExt_OpenFormFillInfo();
+    const formHandle = this.pdfiumModule.PDFiumExt_InitFormFillEnvironment(
       docPtr,
       formFillInfoPtr,
     );
@@ -2368,8 +2368,8 @@ export class PdfiumEngine implements PdfEngine {
       }
     }
 
-    this.pdfiumModule.PDFium_ExitFormFillEnvironment(formHandle);
-    this.pdfiumModule.PDFium_CloseFormFillInfo(formFillInfoPtr);
+    this.pdfiumModule.PDFiumExt_ExitFormFillEnvironment(formHandle);
+    this.pdfiumModule.PDFiumExt_CloseFormFillInfo(formFillInfoPtr);
 
     return annotations;
   }

packages/pdfium/build/code/cpp/filewriter.cpp

@@ -5,25 +5,23 @@
 #include "fpdf_save.h"
 #include "filewriter.h"
 
-PDFiumFileWriter::PDFiumFileWriter()
+PDFiumExtFileWriter::PDFiumExtFileWriter()
 {
   FPDF_FILEWRITE::version = 1;
   FPDF_FILEWRITE::WriteBlock = WriteBlockCallback;
 }
 
-PDFiumFileWriter::~PDFiumFileWriter()
+PDFiumExtFileWriter::~PDFiumExtFileWriter()
 {
 }
 
-int PDFiumFileWriter::WriteBlockCallback(FPDF_FILEWRITE *pFileWrite,
-                                         const void *data,
-                                         unsigned long size)
+int PDFiumExtFileWriter::WriteBlockCallback(FPDF_FILEWRITE *pFileWrite,
+                                            const void *data,
+                                            unsigned long size)
 {
-  PDFiumFileWriter *pThis = static_cast<PDFiumFileWriter *>(pFileWrite);
+  PDFiumExtFileWriter *pThis = static_cast<PDFiumExtFileWriter *>(pFileWrite);
 
   pThis->data.append(static_cast<const char *>(data), size);
 
-  debug_log(size);
-
-  return 1;
+  return size;
 }

packages/pdfium/build/code/cpp/filewriter.h

@@ -1,11 +1,11 @@
 #include <string>
 #include "fpdf_save.h"
 
-class PDFiumFileWriter : public FPDF_FILEWRITE
+class PDFiumExtFileWriter : public FPDF_FILEWRITE
 {
 public:
-  PDFiumFileWriter();
-  ~PDFiumFileWriter();
+  PDFiumExtFileWriter();
+  ~PDFiumExtFileWriter();
 
 private:
   static int WriteBlockCallback(FPDF_FILEWRITE *pFileWrite,

packages/pdfium/build/code/cpp/main.cpp

@@ -9,25 +9,25 @@ extern "C"
 {
 #endif
 
-    EMSCRIPTEN_KEEPALIVE void PDFium_Init();
+    EMSCRIPTEN_KEEPALIVE void PDFiumExt_Init();
 
-    EMSCRIPTEN_KEEPALIVE void *PDFium_OpenFileWriter();
-    EMSCRIPTEN_KEEPALIVE int PDFium_GetFileWriterSize(void *writer);
-    EMSCRIPTEN_KEEPALIVE int PDFium_GetFileWriterData(void *writer, void *buffer, int size);
-    EMSCRIPTEN_KEEPALIVE void PDFium_CloseFileWriter(void *writer);
+    EMSCRIPTEN_KEEPALIVE void *PDFiumExt_OpenFileWriter();
+    EMSCRIPTEN_KEEPALIVE int PDFiumExt_GetFileWriterSize(void *writer);
+    EMSCRIPTEN_KEEPALIVE int PDFiumExt_GetFileWriterData(void *writer, void *buffer, int size);
+    EMSCRIPTEN_KEEPALIVE void PDFiumExt_CloseFileWriter(void *writer);
 
-    EMSCRIPTEN_KEEPALIVE void *PDFium_OpenFormFillInfo();
-    EMSCRIPTEN_KEEPALIVE void PDFium_CloseFormFillInfo(void *form_fill_info);
-    EMSCRIPTEN_KEEPALIVE void *PDFium_InitFormFillEnvironment(void *document, void *form_fill_info);
-    EMSCRIPTEN_KEEPALIVE void PDFium_ExitFormFillEnvironment(void *form_handle);
+    EMSCRIPTEN_KEEPALIVE void *PDFiumExt_OpenFormFillInfo();
+    EMSCRIPTEN_KEEPALIVE void PDFiumExt_CloseFormFillInfo(void *form_fill_info);
+    EMSCRIPTEN_KEEPALIVE void *PDFiumExt_InitFormFillEnvironment(void *document, void *form_fill_info);
+    EMSCRIPTEN_KEEPALIVE void PDFiumExt_ExitFormFillEnvironment(void *form_handle);
 
-    EMSCRIPTEN_KEEPALIVE bool PDFium_SaveAsCopy(void *document, void *writer);
+    EMSCRIPTEN_KEEPALIVE int PDFiumExt_SaveAsCopy(void *document, void *writer);
 
 #ifdef __cplusplus
 }
 #endif
 
-void PDFium_Init()
+void PDFiumExt_Init()
 {
     FPDF_LIBRARY_CONFIG config;
     config.version = 3;
@@ -39,30 +39,34 @@ void PDFium_Init()
     FPDF_InitLibraryWithConfig(&config);
 }
 
-void *PDFium_OpenFileWriter()
+void *PDFiumExt_OpenFileWriter()
 {
-    return new PDFiumFileWriter();
+    return new PDFiumExtFileWriter();
 }
 
-int PDFium_GetFileWriterSize(void *writer)
+int PDFiumExt_GetFileWriterSize(void *writer)
 {
-    return static_cast<PDFiumFileWriter *>(writer)->data.length();
+    return static_cast<PDFiumExtFileWriter *>(writer)->data.length();
 }
 
-int PDFium_GetFileWriterData(void *writer, void *buffer, int size)
+int PDFiumExt_GetFileWriterData(void *writer, void *buffer, int size)
 {
-    std::string data = static_cast<PDFiumFileWriter *>(writer)->data;
-    strncpy(static_cast<char *>(buffer), data.c_str(), size);
-    debug_writer(static_cast<PDFiumFileWriter *>(writer)->data.length(), size);
+    memcpy(static_cast<char *>(buffer), static_cast<PDFiumExtFileWriter *>(writer)->data.c_str(), size);
     return size;
 }
 
-void PDFium_CloseFileWriter(void *writer)
+void PDFiumExt_CloseFileWriter(void *writer)
 {
-    delete static_cast<PDFiumFileWriter *>(writer);
+    delete static_cast<PDFiumExtFileWriter *>(writer);
 }
 
-void *PDFium_OpenFormFillInfo()
+int PDFiumExt_SaveAsCopy(void *document, void *writer)
+{
+    PDFiumExtFileWriter *fileWriter = static_cast<PDFiumExtFileWriter *>(writer);
+    return FPDF_SaveAsCopy(static_cast<FPDF_DOCUMENT>(document), static_cast<FPDF_FILEWRITE *>(fileWriter), FPDF_INCREMENTAL);
+}
+
+void *PDFiumExt_OpenFormFillInfo()
 {
     FPDF_FORMFILLINFO *form_fill_info = new FPDF_FORMFILLINFO();
     form_fill_info->version = 1;
@@ -72,22 +76,17 @@ void *PDFium_OpenFormFillInfo()
     return form_fill_info;
 }
 
-void PDFium_CloseFormFillInfo(void *form_fill_info)
+void PDFiumExt_CloseFormFillInfo(void *form_fill_info)
 {
     delete static_cast<FPDF_FORMFILLINFO *>(form_fill_info);
 }
 
-void *PDFium_InitFormFillEnvironment(void *document, void *form_fill_info)
+void *PDFiumExt_InitFormFillEnvironment(void *document, void *form_fill_info)
 {
     return FPDFDOC_InitFormFillEnvironment(static_cast<FPDF_DOCUMENT>(document), static_cast<FPDF_FORMFILLINFO *>(form_fill_info));
 }
 
-void PDFium_ExitFormFillEnvironment(void *form_handle)
+void PDFiumExt_ExitFormFillEnvironment(void *form_handle)
 {
     FPDFDOC_ExitFormFillEnvironment(static_cast<FPDF_FORMHANDLE>(form_handle));
 }
-
-bool PDFium_SaveAsCopy(void *document, void *writer)
-{
-    return FPDF_SaveAsCopy(static_cast<FPDF_DOCUMENT>(document), static_cast<PDFiumFileWriter *>(writer), FPDF_INCREMENTAL);
-}

packages/pdfium/package.json

@@ -16,8 +16,8 @@
       "require": "./dist/cjs/index.js"
     },
     "./pdfium.wasm": {
-      "import": "./dist/esm/pdfium.caa89ca9.wasm",
-      "require": "./dist/cjs/pdfium.caa89ca9.wasm"
+      "import": "./dist/esm/pdfium.c7905a40.wasm",
+      "require": "./dist/cjs/pdfium.c7905a40.wasm"
     }
   },
   "scripts": {

packages/pdfium/scripts/exported-functions.js

@@ -1,14 +1,14 @@
 exports.functions = {
-  PDFium_Init: [[], null],
-  PDFium_OpenFileWriter: [[], 'number'],
-  PDFium_CloseFileWriter: [['number'], null],
-  PDFium_GetFileWriterSize: [['number'], 'number'],
-  PDFium_GetFileWriterData: [['number', 'number', 'number'], null],
-  PDFium_OpenFormFillInfo: [[], 'number'],
-  PDFium_CloseFormFillInfo: [['number'], null],
-  PDFium_InitFormFillEnvironment: [['number', 'number'], 'number'],
-  PDFium_ExitFormFillEnvironment: [['number'], null],
-  PDFium_SaveAsCopy: [['number', 'number'], null],
+  PDFiumExt_Init: [[], null],
+  PDFiumExt_OpenFileWriter: [[], 'number'],
+  PDFiumExt_CloseFileWriter: [['number'], null],
+  PDFiumExt_GetFileWriterSize: [['number'], 'number'],
+  PDFiumExt_GetFileWriterData: [['number', 'number', 'number'], null],
+  PDFiumExt_OpenFormFillInfo: [[], 'number'],
+  PDFiumExt_CloseFormFillInfo: [['number'], null],
+  PDFiumExt_InitFormFillEnvironment: [['number', 'number'], 'number'],
+  PDFiumExt_ExitFormFillEnvironment: [['number'], null],
+  PDFiumExt_SaveAsCopy: [['number', 'number'], null],
   FPDF_LoadMemDocument: [['number', 'number', 'number'], 'number'],
   FPDF_GetPageSizeByIndexF: [['number', 'number', 'number'], 'number'],
   FPDF_GetLastError: [[], 'number'],

packages/pdfium/src/functions.ts

@@ -1,20 +1,20 @@
 export const functions = {
-  PDFium_Init: [[] as const, null] as const,
-  PDFium_OpenFileWriter: [[] as const, 'number'] as const,
-  PDFium_CloseFileWriter: [['number'] as const, null] as const,
-  PDFium_GetFileWriterSize: [['number'] as const, 'number'] as const,
-  PDFium_GetFileWriterData: [
+  PDFiumExt_Init: [[] as const, null] as const,
+  PDFiumExt_OpenFileWriter: [[] as const, 'number'] as const,
+  PDFiumExt_CloseFileWriter: [['number'] as const, null] as const,
+  PDFiumExt_GetFileWriterSize: [['number'] as const, 'number'] as const,
+  PDFiumExt_GetFileWriterData: [
     ['number', 'number', 'number'] as const,
     null,
   ] as const,
-  PDFium_OpenFormFillInfo: [[] as const, 'number'] as const,
-  PDFium_CloseFormFillInfo: [['number'] as const, null] as const,
-  PDFium_InitFormFillEnvironment: [
+  PDFiumExt_OpenFormFillInfo: [[] as const, 'number'] as const,
+  PDFiumExt_CloseFormFillInfo: [['number'] as const, null] as const,
+  PDFiumExt_InitFormFillEnvironment: [
     ['number', 'number'] as const,
     'number',
   ] as const,
-  PDFium_ExitFormFillEnvironment: [['number'] as const, null] as const,
-  PDFium_SaveAsCopy: [['number', 'number'] as const, null] as const,
+  PDFiumExt_ExitFormFillEnvironment: [['number'] as const, null] as const,
+  PDFiumExt_SaveAsCopy: [['number', 'number'] as const, null] as const,
   FPDF_LoadMemDocument: [
     ['number', 'number', 'number'] as const,
     'number',