@mlightcad/libredwg-web 0.6.9 → 0.7.0

package/lib/converter/converter.js

@@ -556,6 +556,17 @@ export class LibreDwgConverter {
             .data;
         const color = libredwg.dwg_dynapi_entity_value(item, 'color')
             .data;
+        const ltypeRef = libredwg.dwg_dynapi_entity_value(item, 'ltype')
+            .data;
+        let ltypeName = 'Continuous';
+        if (ltypeRef) {
+            try {
+                ltypeName = libredwg.dwg_ref_get_object_name(ltypeRef);
+            }
+            catch {
+                // ref may be invalid in some DWG files
+            }
+        }
         // - 0xc0 for ByLayer (also c3 and rgb of 0x100)
         // - 0xc1 for ByBlock (also c3 and rgb of 0)
         // - 0xc2 for entities (default), with names with an additional name flag RC
@@ -583,7 +594,7 @@ export class LibreDwgConverter {
             color: rgbColor,
             colorName: color.name,
             transparency: color.alpha,
-            lineType: '',
+            lineType: ltypeName,
             frozen: frozen != 0,
             off: off != 0,
             frozenInNew: frozenInNew != 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

@@ -1,9 +1,9 @@
 {
   "name": "@mlightcad/libredwg-web",
   "description": "A DWG/DXF JavaScript parser based on libredwg",
-  "license": "GPL-2.0-only",
+  "license": "GPL-3.0",
   "private": false,
-  "version": "0.6.9",
+  "version": "0.7.0",
   "author": "MLight Lee <mlight.lee@outlook.com>",
   "type": "module",
   "repository": {
@@ -70,9 +70,9 @@
     "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++11 -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",
+    "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",
     "copy": "cp -f ../../build-wasm/libredwg-web.d.ts ../../build-wasm/libredwg-web.js ../../build-wasm/libredwg-web.wasm wasm/ && cp -f ../../build-wasm/libredwg-web.js src/",
     "format": "prettier --config ./.prettierrc.js --write src/**/*.{ts,js}",

package/wasm/libredwg-web.d.ts

@@ -439,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;