@mlightcad/libredwg-web 0.6.10 → 0.7.0

package/lib/libredwg.d.ts

@@ -19,6 +19,12 @@ export declare class LibreDwg {
     private decoder?;
     private constructor();
     dwg_read_data(fileContent: string | ArrayBuffer, fileType: number): number | undefined;
+    /**
+     * Converts DWG file content to DXF file content.
+     * @param fileContent DWG file content.
+     * @returns Returns DXF file content if conversion succeeds. Otherwise returns null.
+     */
+    dwg_write_dxf(fileContent: string | ArrayBuffer): Uint8Array | null;
     /**
      * Gets the version of the dwg.
      * @param data Pointer to Dwg_Data instance.

package/lib/libredwg.js

@@ -29,13 +29,19 @@ export class LibreDwg {
     dwg_read_data(fileContent, fileType) {
         if (fileType == Dwg_File_Type.DWG) {
             const fileName = 'tmp.dwg';
-            this.wasmInstance.FS.writeFile(fileName, new Uint8Array(fileContent));
-            const result = this.wasmInstance.dwg_read_file(fileName);
-            if (result.error != 0) {
-                console.log('Open dwg file with error code: ', result.error);
+            try {
+                this.wasmInstance.FS.writeFile(fileName, new Uint8Array(fileContent));
+                const result = this.wasmInstance.dwg_read_file(fileName);
+                if (result.error != 0) {
+                    console.log('Open dwg file with error code: ', result.error);
+                }
+                return result.data;
+            }
+            finally {
+                if (this.wasmInstance.FS.analyzePath(fileName, false).exists) {
+                    this.wasmInstance.FS.unlink(fileName);
+                }
             }
-            this.wasmInstance.FS.unlink(fileName);
-            return result.data;
         }
         // else if (fileType == Dwg_File_Type.DXF) {
         //   const fileName = "tmp.dxf";
@@ -48,6 +54,32 @@ export class LibreDwg {
         //   return result.data as Dwg_Data_Ptr;
         // }
     }
+    /**
+     * Converts DWG file content to DXF file content.
+     * @param fileContent DWG file content.
+     * @returns Returns DXF file content if conversion succeeds. Otherwise returns null.
+     */
+    dwg_write_dxf(fileContent) {
+        const inputFileName = 'tmp.dwg';
+        const outputFileName = 'tmp.dxf';
+        try {
+            this.wasmInstance.FS.writeFile(inputFileName, new Uint8Array(fileContent));
+            const error = this.wasmInstance.dwg_write_dxf(inputFileName, outputFileName);
+            if (error != 0) {
+                console.log('Convert dwg to dxf with error code: ', error);
+                return null;
+            }
+            return this.wasmInstance.FS.readFile(outputFileName);
+        }
+        finally {
+            if (this.wasmInstance.FS.analyzePath(inputFileName, false).exists) {
+                this.wasmInstance.FS.unlink(inputFileName);
+            }
+            if (this.wasmInstance.FS.analyzePath(outputFileName, false).exists) {
+                this.wasmInstance.FS.unlink(outputFileName);
+            }
+        }
+    }
     /**
      * Gets the version of the dwg.
      * @param data Pointer to Dwg_Data instance.

package/package.json

@@ -3,7 +3,7 @@
   "description": "A DWG/DXF JavaScript parser based on libredwg",
   "license": "GPL-3.0",
   "private": false,
-  "version": "0.6.10",
+  "version": "0.7.0",
   "author": "MLight Lee <mlight.lee@outlook.com>",
   "type": "module",
   "repository": {
@@ -70,7 +70,7 @@
     "demo": "live-server examples --entry-file=index.html",
     "doc": "typedoc",
     "build": "tsc && vite build && cp -rf wasm examples/ && cp -rf dist examples/",
-    "build:prepare": "mkdir -p ../../build-wasm && cd ../../build-wasm && emconfigure ../configure CFLAGS=\"-O2 -sUSE_ZLIB=1\" CC=emcc --enable-release --disable-docs --disable-write --disable-python --disable-bindings --disable-shared --disable-json --disable-dxf --enable-partial --enable-experimental",
+    "build:prepare": "mkdir -p ../../build-wasm && cd ../../build-wasm && emconfigure ../configure CFLAGS=\"-O2 -sUSE_ZLIB=1\" CC=emcc --enable-release --disable-docs --disable-write --disable-python --disable-bindings --disable-shared --disable-json --enable-partial --enable-experimental",
     "build:obj": "cd ../../build-wasm && emmake make",
     "build:wasm": "cd ../../build-wasm && emcc ../bindings/javascript/embind/*.cpp src/*.o -O2 -lembind -std=c++17 -Isrc -I../src -I../include -o libredwg-web.js -s ALLOW_MEMORY_GROWTH=1 -s EXPORT_ES6=1 -s MODULARIZE=1 -s EXPORT_NAME=\"createModule\" -sEXPORTED_RUNTIME_METHODS=FS,ENV,ccall,cwrap,UTF8ToString,stringToNewUTF8,setValue --emit-tsd libredwg-web.d.ts",
     "clean": "rm -rf ../../build-wasm ./docs ./dist ./lib",

package/wasm/libredwg-web.d.ts

@@ -10,9 +10,10 @@ declare namespace RuntimeExports {
         export let currentPath: string;
         export let initialized: boolean;
         export let ignorePermissions: boolean;
+        export { ErrnoError };
         export let filesystems: any;
         export let syncFSRequests: number;
-        export { ErrnoError };
+        export let readFiles: {};
         export { FSStream };
         export { FSNode };
         export function lookupPath(path: any, opts?: {}): {
@@ -113,10 +114,11 @@ declare namespace RuntimeExports {
         export function llseek(stream: any, offset: any, whence: any): any;
         export function read(stream: any, buffer: any, offset: any, length: any, position: any): any;
         export function write(stream: any, buffer: any, offset: any, length: any, position: any, canOwn: any): any;
+        export function allocate(stream: any, offset: any, length: any): void;
         export function mmap(stream: any, length: any, position: any, prot: any, flags: any): any;
         export function msync(stream: any, buffer: any, offset: any, length: any, mmapFlags: any): any;
         export function ioctl(stream: any, cmd: any, arg: any): any;
-        export function readFile(path: any, opts?: {}): Uint8Array<any>;
+        export function readFile(path: any, opts?: {}): any;
         export function writeFile(path: any, data: any, opts?: {}): void;
         export function cwd(): any;
         export function chdir(path: any): void;
@@ -150,10 +152,10 @@ declare namespace RuntimeExports {
     /**
      * @param {string|null=} returnType
      * @param {Array=} argTypes
-     * @param {Array=} args
+     * @param {Arguments|Array=} args
      * @param {Object=} opts
      */
-    function ccall(ident: any, returnType?: (string | null) | undefined, argTypes?: any[] | undefined, args?: any[] | undefined, opts?: any | undefined): any;
+    function ccall(ident: any, returnType?: (string | null) | undefined, argTypes?: any[] | undefined, args?: (Arguments | any[]) | undefined, opts?: any | undefined): any;
     /**
      * @param {string=} returnType
      * @param {Array=} argTypes
@@ -169,11 +171,13 @@ declare namespace RuntimeExports {
      *   maximum number of bytes to read. You can omit this parameter to scan the
      *   string until the first 0 byte. If maxBytesToRead is passed, and the string
      *   at [ptr, ptr+maxBytesToReadr[ contains a null byte in the middle, then the
-     *   string will cut short at that byte index.
-     * @param {boolean=} ignoreNul - If true, the function will not stop on a NUL character.
+     *   string will cut short at that byte index (i.e. maxBytesToRead will not
+     *   produce a string of exact length [ptr, ptr+maxBytesToRead[) N.B. mixing
+     *   frequent uses of UTF8ToString() with and without maxBytesToRead may throw
+     *   JS JIT optimizations off, so it is worth to consider consistently using one
      * @return {string}
      */
-    function UTF8ToString(ptr: number, maxBytesToRead?: number | undefined, ignoreNul?: boolean | undefined): string;
+    function UTF8ToString(ptr: number, maxBytesToRead?: number | undefined): string;
     function stringToNewUTF8(str: any): any;
     /**
      * @param {number} ptr
@@ -181,6 +185,17 @@ declare namespace RuntimeExports {
      * @param {string} type
      */
     function setValue(ptr: number, value: number, type?: string): void;
+    let HEAPF32: any;
+    let HEAPF64: any;
+    let HEAP_DATA_VIEW: any;
+    let HEAP8: any;
+    let HEAPU8: any;
+    let HEAP16: any;
+    let HEAPU16: any;
+    let HEAP32: any;
+    let HEAPU32: any;
+    let HEAP64: any;
+    let HEAPU64: any;
 }
 declare class ErrnoError {
     constructor(errno: any);
@@ -232,8 +247,6 @@ export interface ClassHandle {
   delete(): void;
   deleteLater(): this;
   isDeleted(): boolean;
-  // @ts-ignore - If targeting lower than ESNext, this symbol might not exist.
-  [Symbol.dispose](): void;
   clone(): this;
 }
 export interface Dwg_Version_TypeValue<T extends number> {
@@ -426,6 +439,7 @@ interface EmbindModule {
   dwg_dynapi_entity_set_value(_0: number, _1: EmbindString, _2: EmbindString, _3: number, _4: boolean): boolean;
   dwg_dynapi_common_set_value(_0: number, _1: EmbindString, _2: number, _3: boolean): boolean;
   dwg_dynapi_handle_name(_0: number, _1: number, _2: number): string;
+  dwg_write_dxf(_0: EmbindString, _1: EmbindString): number;
   dwg_find_tablehandle(_0: number, _1: EmbindString, _2: EmbindString): number;
   dwg_find_tablehandle_index(_0: number, _1: number, _2: EmbindString): number;
   dwg_handle_name(_0: number, _1: EmbindString, _2: number): string;