@mlightcad/libredwg-web 0.6.9 → 0.6.10

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/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.6.10",
   "author": "MLight Lee <mlight.lee@outlook.com>",
   "type": "module",
   "repository": {
@@ -72,7 +72,7 @@
     "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: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

@@ -10,10 +10,9 @@ 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 let readFiles: {};
+        export { ErrnoError };
         export { FSStream };
         export { FSNode };
         export function lookupPath(path: any, opts?: {}): {
@@ -114,11 +113,10 @@ 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?: {}): any;
+        export function readFile(path: any, opts?: {}): Uint8Array<any>;
         export function writeFile(path: any, data: any, opts?: {}): void;
         export function cwd(): any;
         export function chdir(path: any): void;
@@ -152,10 +150,10 @@ declare namespace RuntimeExports {
     /**
      * @param {string|null=} returnType
      * @param {Array=} argTypes
-     * @param {Arguments|Array=} args
+     * @param {Array=} args
      * @param {Object=} opts
      */
-    function ccall(ident: any, returnType?: (string | null) | undefined, argTypes?: any[] | undefined, args?: (Arguments | any[]) | undefined, opts?: any | undefined): any;
+    function ccall(ident: any, returnType?: (string | null) | undefined, argTypes?: any[] | undefined, args?: any[] | undefined, opts?: any | undefined): any;
     /**
      * @param {string=} returnType
      * @param {Array=} argTypes
@@ -171,13 +169,11 @@ 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 (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
+     *   string will cut short at that byte index.
+     * @param {boolean=} ignoreNul - If true, the function will not stop on a NUL character.
      * @return {string}
      */
-    function UTF8ToString(ptr: number, maxBytesToRead?: number | undefined): string;
+    function UTF8ToString(ptr: number, maxBytesToRead?: number | undefined, ignoreNul?: boolean | undefined): string;
     function stringToNewUTF8(str: any): any;
     /**
      * @param {number} ptr
@@ -185,17 +181,6 @@ 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);
@@ -247,6 +232,8 @@ 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> {