@mlightcad/libredwg-web 0.6.3 → 0.6.4

package/dist/libredwg-web.js

@@ -6928,7 +6928,7 @@ class LibreEntityConverter {
     const libredwg = this.libredwg;
     const color = libredwg.dwg_object_entity_get_color_object(entity);
     const method = color.method;
-    let colorIndex = color.index;
+    const colorIndex = color.index;
     let rgbColor = void 0;
     if (method == 194 || (color.rgb >>> 24 & 255) === 194) {
       rgbColor = color.rgb & 16777215;
@@ -7143,20 +7143,24 @@ class LibreDwgConverter {
       bmpPreview = uint8ArrayToHexString(bmpPreviewBinaryData);
     }
     let entities = this.convertEntities(obj, commonAttrs.handle);
-    if (entities.length == 0) {
-      const entities_ptr = libredwg.dwg_dynapi_entity_value(item, "entities").data;
-      const object_ref_ptr_array = libredwg.dwg_ptr_to_object_ref_ptr_array(
-        entities_ptr,
-        num_owned
-      );
-      const converter = this.entityConverter;
+    if (!entities || entities.length == 0) {
       entities = [];
-      for (let index = 0; index < num_owned; index++) {
-        const object = libredwg.dwg_ref_get_object(object_ref_ptr_array[index]);
-        const entity = converter.convert(object);
-        if (entity) {
-          entity.ownerBlockRecordSoftId = commonAttrs.handle;
-          entities.push(entity);
+      const entities_ptr = libredwg.dwg_dynapi_entity_value(item, "entities").data;
+      if (entities_ptr) {
+        const object_ref_ptr_array = libredwg.dwg_ptr_to_object_ref_ptr_array(
+          entities_ptr,
+          num_owned
+        );
+        const converter = this.entityConverter;
+        for (let index = 0; index < num_owned; index++) {
+          const object = libredwg.dwg_ref_get_object(
+            object_ref_ptr_array[index]
+          );
+          const entity = converter.convert(object);
+          if (entity) {
+            entity.ownerBlockRecordSoftId = commonAttrs.handle;
+            entities.push(entity);
+          }
         }
       }
     }

package/dist/libredwg-web.umd.cjs

@@ -6933,7 +6933,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const libredwg = this.libredwg;
       const color = libredwg.dwg_object_entity_get_color_object(entity);
       const method = color.method;
-      let colorIndex = color.index;
+      const colorIndex = color.index;
       let rgbColor = void 0;
       if (method == 194 || (color.rgb >>> 24 & 255) === 194) {
         rgbColor = color.rgb & 16777215;
@@ -7148,20 +7148,24 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         bmpPreview = uint8ArrayToHexString(bmpPreviewBinaryData);
       }
       let entities = this.convertEntities(obj, commonAttrs.handle);
-      if (entities.length == 0) {
-        const entities_ptr = libredwg.dwg_dynapi_entity_value(item, "entities").data;
-        const object_ref_ptr_array = libredwg.dwg_ptr_to_object_ref_ptr_array(
-          entities_ptr,
-          num_owned
-        );
-        const converter = this.entityConverter;
+      if (!entities || entities.length == 0) {
         entities = [];
-        for (let index = 0; index < num_owned; index++) {
-          const object = libredwg.dwg_ref_get_object(object_ref_ptr_array[index]);
-          const entity = converter.convert(object);
-          if (entity) {
-            entity.ownerBlockRecordSoftId = commonAttrs.handle;
-            entities.push(entity);
+        const entities_ptr = libredwg.dwg_dynapi_entity_value(item, "entities").data;
+        if (entities_ptr) {
+          const object_ref_ptr_array = libredwg.dwg_ptr_to_object_ref_ptr_array(
+            entities_ptr,
+            num_owned
+          );
+          const converter = this.entityConverter;
+          for (let index = 0; index < num_owned; index++) {
+            const object = libredwg.dwg_ref_get_object(
+              object_ref_ptr_array[index]
+            );
+            const entity = converter.convert(object);
+            if (entity) {
+              entity.ownerBlockRecordSoftId = commonAttrs.handle;
+              entities.push(entity);
+            }
           }
         }
       }

package/lib/converter/converter.js

@@ -203,18 +203,20 @@ export class LibreDwgConverter {
         // I guess it is one bug on libredwg. I logged [one bug](https://github.com/LibreDWG/libredwg/issues/1199)
         // on libredwg too. In this time, I try to use property 'entities' of block header to iterate entities.
         let entities = this.convertEntities(obj, commonAttrs.handle);
-        if (entities.length == 0) {
+        if (!entities || entities.length == 0) {
+            entities = [];
             const entities_ptr = libredwg.dwg_dynapi_entity_value(item, 'entities')
                 .data;
-            const object_ref_ptr_array = libredwg.dwg_ptr_to_object_ref_ptr_array(entities_ptr, num_owned);
-            const converter = this.entityConverter;
-            entities = [];
-            for (let index = 0; index < num_owned; index++) {
-                const object = libredwg.dwg_ref_get_object(object_ref_ptr_array[index]);
-                const entity = converter.convert(object);
-                if (entity) {
-                    entity.ownerBlockRecordSoftId = commonAttrs.handle;
-                    entities.push(entity);
+            if (entities_ptr) {
+                const object_ref_ptr_array = libredwg.dwg_ptr_to_object_ref_ptr_array(entities_ptr, num_owned);
+                const converter = this.entityConverter;
+                for (let index = 0; index < num_owned; index++) {
+                    const object = libredwg.dwg_ref_get_object(object_ref_ptr_array[index]);
+                    const entity = converter.convert(object);
+                    if (entity) {
+                        entity.ownerBlockRecordSoftId = commonAttrs.handle;
+                        entities.push(entity);
+                    }
                 }
             }
         }

package/lib/converter/entityConverter.js

@@ -1568,7 +1568,7 @@ export class LibreEntityConverter {
         // - 0xc5 for foreground color
         // - 0xc8 for none (also c3 and rgb of 0x101)
         const method = color.method;
-        let colorIndex = color.index;
+        const colorIndex = color.index;
         let rgbColor = undefined;
         if (method == 0xc2 || ((color.rgb >>> 24) & 0xff) === 0xc2) {
             rgbColor = color.rgb & 0x00ffffff;

package/lib/svg/svgConverter.js

@@ -1,5 +1,5 @@
-import { DwgAttachmentPoint, DwgTextHorizontalAlign } from '../database';
 import { isModelSpace } from '../converter/utils';
+import { DwgAttachmentPoint, DwgTextHorizontalAlign } from '../database';
 import { Box2D } from './box2d';
 import { evaluateBSpline } from './bspline';
 import { Color } from './color';

package/package.json

@@ -3,7 +3,7 @@
   "description": "A DWG/DXF JavaScript parser based on libredwg",
   "license": "GPL-2.0-only",
   "private": false,
-  "version": "0.6.3",
+  "version": "0.6.4",
   "author": "MLight Lee <mlight.lee@outlook.com>",
   "type": "module",
   "repository": {