@mlightcad/libredwg-web 0.6.2 → 0.6.4

package/dist/libredwg-web.js

@@ -1,24 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-const MODEL_SPACE = "*MODEL_SPACE";
-const MODEL_SPACE_PREFIX = "*PAPER_SPACE";
-const isModelSpace = (name) => {
-  return name && name.toUpperCase() == MODEL_SPACE;
-};
-const isPaperSpace = (name) => {
-  return name && name.toUpperCase().startsWith(MODEL_SPACE_PREFIX);
-};
-const idToString = (id) => {
-  return id.toString(16).toUpperCase();
-};
-const isValidPointer = (ptr) => {
-  if (typeof ptr === "bigint") {
-    return ptr !== 0n;
-  } else {
-    return ptr !== 0;
-  }
-};
 var DwgCodePage = /* @__PURE__ */ ((DwgCodePage2) => {
   DwgCodePage2[DwgCodePage2["CP_UTF8"] = 0] = "CP_UTF8";
   DwgCodePage2[DwgCodePage2["CP_US_ASCII"] = 1] = "CP_US_ASCII";
@@ -5256,6 +5238,17 @@ var Dwg_Hatch_Edge_Type = /* @__PURE__ */ ((Dwg_Hatch_Edge_Type2) => {
   Dwg_Hatch_Edge_Type2[Dwg_Hatch_Edge_Type2["Spline"] = 4] = "Spline";
   return Dwg_Hatch_Edge_Type2;
 })(Dwg_Hatch_Edge_Type || {});
+const MODEL_SPACE = "*MODEL_SPACE";
+const MODEL_SPACE_PREFIX = "*PAPER_SPACE";
+const isModelSpace = (name) => {
+  return name && name.toUpperCase() == MODEL_SPACE;
+};
+const isPaperSpace = (name) => {
+  return name && name.toUpperCase().startsWith(MODEL_SPACE_PREFIX);
+};
+const idToString = (id) => {
+  return id.toString(16).toUpperCase();
+};
 class LibreEntityConverter {
   constructor(instance) {
     __publicField(this, "libredwg");
@@ -5839,7 +5832,9 @@ class LibreEntityConverter {
       entity,
       "imagedefreactor"
     ).data;
-    const imageDefReactorHandle = idToString(libredwg.dwg_ref_get_absref(imagedefreactor_ref));
+    const imageDefReactorHandle = idToString(
+      libredwg.dwg_ref_get_absref(imagedefreactor_ref)
+    );
     return {
       type: "IMAGE",
       ...commonAttrs,
@@ -6933,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;
@@ -7017,57 +7012,61 @@ class LibreDwgConverter {
     const num_objects = libredwg.dwg_get_num_objects(data);
     for (let i = 0; i < num_objects; i++) {
       const obj = libredwg.dwg_get_object(data, i);
-      const tio = libredwg.dwg_object_to_object_tio(obj);
-      if (tio) {
-        const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
-        switch (fixedtype) {
-          case Dwg_Object_Type.DWG_TYPE_LAYER:
-            {
-              const layer = this.convertLayer(tio, obj);
-              db.tables.LAYER.entries.push(layer);
-              this.entityConverter.layers.set(layer.handle, layer.name);
-            }
-            break;
-          case Dwg_Object_Type.DWG_TYPE_LTYPE:
-            {
-              const ltype = this.convertLineType(tio, obj);
-              db.tables.LTYPE.entries.push(ltype);
-              this.entityConverter.ltypes.set(ltype.handle, ltype.name);
-            }
-            break;
+      if (obj) {
+        const tio = libredwg.dwg_object_to_object_tio(obj);
+        if (tio) {
+          const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
+          switch (fixedtype) {
+            case Dwg_Object_Type.DWG_TYPE_LAYER:
+              {
+                const layer = this.convertLayer(tio, obj);
+                db.tables.LAYER.entries.push(layer);
+                this.entityConverter.layers.set(layer.handle, layer.name);
+              }
+              break;
+            case Dwg_Object_Type.DWG_TYPE_LTYPE:
+              {
+                const ltype = this.convertLineType(tio, obj);
+                db.tables.LTYPE.entries.push(ltype);
+                this.entityConverter.ltypes.set(ltype.handle, ltype.name);
+              }
+              break;
+          }
         }
       }
     }
     for (let i = 0; i < num_objects; i++) {
       const obj = libredwg.dwg_get_object(data, i);
-      const tio = libredwg.dwg_object_to_object_tio(obj);
-      if (tio) {
-        const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
-        switch (fixedtype) {
-          case Dwg_Object_Type.DWG_TYPE_BLOCK_HEADER:
-            {
-              const btr = this.convertBlockRecord(tio, obj);
-              db.tables.BLOCK_RECORD.entries.push(btr);
-              if (isModelSpace(btr.name) || isPaperSpace(btr.name)) {
-                btr.entities.forEach((entity) => db.entities.push(entity));
+      if (obj) {
+        const tio = libredwg.dwg_object_to_object_tio(obj);
+        if (tio) {
+          const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
+          switch (fixedtype) {
+            case Dwg_Object_Type.DWG_TYPE_BLOCK_HEADER:
+              {
+                const btr = this.convertBlockRecord(tio, obj);
+                db.tables.BLOCK_RECORD.entries.push(btr);
+                if (isModelSpace(btr.name) || isPaperSpace(btr.name)) {
+                  btr.entities.forEach((entity) => db.entities.push(entity));
+                }
               }
-            }
-            break;
-          case Dwg_Object_Type.DWG_TYPE_DIMSTYLE:
-            db.tables.DIMSTYLE.entries.push(this.convertDimStyle(tio, obj));
-            break;
-          case Dwg_Object_Type.DWG_TYPE_STYLE:
-            db.tables.STYLE.entries.push(this.convertStyle(tio, obj));
-            break;
-          case Dwg_Object_Type.DWG_TYPE_VPORT:
-            db.tables.VPORT.entries.push(this.convertViewport(tio, obj));
-            break;
-          case Dwg_Object_Type.DWG_TYPE_IMAGEDEF:
-            db.objects.IMAGEDEF.push(this.convertImageDef(tio, obj));
-            break;
-          case Dwg_Object_Type.DWG_TYPE_LAYOUT:
-            db.objects.LAYOUT.push(this.convertLayout(tio, obj));
-            break;
+              break;
+            case Dwg_Object_Type.DWG_TYPE_DIMSTYLE:
+              db.tables.DIMSTYLE.entries.push(this.convertDimStyle(tio, obj));
+              break;
+            case Dwg_Object_Type.DWG_TYPE_STYLE:
+              db.tables.STYLE.entries.push(this.convertStyle(tio, obj));
+              break;
+            case Dwg_Object_Type.DWG_TYPE_VPORT:
+              db.tables.VPORT.entries.push(this.convertViewport(tio, obj));
+              break;
+            case Dwg_Object_Type.DWG_TYPE_IMAGEDEF:
+              db.objects.IMAGEDEF.push(this.convertImageDef(tio, obj));
+              break;
+            case Dwg_Object_Type.DWG_TYPE_LAYOUT:
+              db.objects.LAYOUT.push(this.convertLayout(tio, obj));
+              break;
+          }
         }
       }
     }
@@ -7087,9 +7086,9 @@ class LibreDwgConverter {
       }
       let value = libredwg.dwg_dynapi_header_value(data, var_name).data;
       if (name == "CELTYPE" || name == "CLAYER" || name == "CLAYER" || name == "DIMSTYLE" || name == "DIMTXSTY" || name == "TEXTSTYLE") {
-        value = libredwg.dwg_ref_get_object_name(value);
+        value = !!value ? libredwg.dwg_ref_get_object_name(value) : "";
       } else if (name == "DRAGVS") {
-        value = libredwg.dwg_ref_get_absref(value);
+        value = !!value ? libredwg.dwg_ref_get_absref(value) : 2;
       }
       header[name] = value;
     });
@@ -7144,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);
+          }
         }
       }
     }
@@ -7621,7 +7624,7 @@ class LibreDwgConverter {
       libredwg.dwg_ref_get_absref(active_viewport_ref)
     );
     const named_ucs_ref = libredwg.dwg_dynapi_entity_value(item, "named_ucs").data;
-    const namedUcsId = isValidPointer(named_ucs_ref) ? idToString(libredwg.dwg_ref_get_absref(named_ucs_ref)) : void 0;
+    const namedUcsId = !!named_ucs_ref ? idToString(libredwg.dwg_ref_get_absref(named_ucs_ref)) : void 0;
     return {
       ...commonAttrs,
       layoutName,
@@ -10056,9 +10059,5 @@ export {
   LibreDwg,
   createModule,
   dwgCodePageToEncoding,
-  dwgVersions,
-  idToString,
-  isModelSpace,
-  isPaperSpace,
-  isValidPointer
+  dwgVersions
 };

package/dist/libredwg-web.umd.cjs

@@ -6,24 +6,6 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
   var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
-  const MODEL_SPACE = "*MODEL_SPACE";
-  const MODEL_SPACE_PREFIX = "*PAPER_SPACE";
-  const isModelSpace = (name) => {
-    return name && name.toUpperCase() == MODEL_SPACE;
-  };
-  const isPaperSpace = (name) => {
-    return name && name.toUpperCase().startsWith(MODEL_SPACE_PREFIX);
-  };
-  const idToString = (id) => {
-    return id.toString(16).toUpperCase();
-  };
-  const isValidPointer = (ptr) => {
-    if (typeof ptr === "bigint") {
-      return ptr !== 0n;
-    } else {
-      return ptr !== 0;
-    }
-  };
   var DwgCodePage = /* @__PURE__ */ ((DwgCodePage2) => {
     DwgCodePage2[DwgCodePage2["CP_UTF8"] = 0] = "CP_UTF8";
     DwgCodePage2[DwgCodePage2["CP_US_ASCII"] = 1] = "CP_US_ASCII";
@@ -5261,6 +5243,17 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     Dwg_Hatch_Edge_Type2[Dwg_Hatch_Edge_Type2["Spline"] = 4] = "Spline";
     return Dwg_Hatch_Edge_Type2;
   })(Dwg_Hatch_Edge_Type || {});
+  const MODEL_SPACE = "*MODEL_SPACE";
+  const MODEL_SPACE_PREFIX = "*PAPER_SPACE";
+  const isModelSpace = (name) => {
+    return name && name.toUpperCase() == MODEL_SPACE;
+  };
+  const isPaperSpace = (name) => {
+    return name && name.toUpperCase().startsWith(MODEL_SPACE_PREFIX);
+  };
+  const idToString = (id) => {
+    return id.toString(16).toUpperCase();
+  };
   class LibreEntityConverter {
     constructor(instance) {
       __publicField(this, "libredwg");
@@ -5844,7 +5837,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         entity,
         "imagedefreactor"
       ).data;
-      const imageDefReactorHandle = idToString(libredwg.dwg_ref_get_absref(imagedefreactor_ref));
+      const imageDefReactorHandle = idToString(
+        libredwg.dwg_ref_get_absref(imagedefreactor_ref)
+      );
       return {
         type: "IMAGE",
         ...commonAttrs,
@@ -6938,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;
@@ -7022,57 +7017,61 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const num_objects = libredwg.dwg_get_num_objects(data);
       for (let i = 0; i < num_objects; i++) {
         const obj = libredwg.dwg_get_object(data, i);
-        const tio = libredwg.dwg_object_to_object_tio(obj);
-        if (tio) {
-          const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
-          switch (fixedtype) {
-            case Dwg_Object_Type.DWG_TYPE_LAYER:
-              {
-                const layer = this.convertLayer(tio, obj);
-                db.tables.LAYER.entries.push(layer);
-                this.entityConverter.layers.set(layer.handle, layer.name);
-              }
-              break;
-            case Dwg_Object_Type.DWG_TYPE_LTYPE:
-              {
-                const ltype = this.convertLineType(tio, obj);
-                db.tables.LTYPE.entries.push(ltype);
-                this.entityConverter.ltypes.set(ltype.handle, ltype.name);
-              }
-              break;
+        if (obj) {
+          const tio = libredwg.dwg_object_to_object_tio(obj);
+          if (tio) {
+            const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
+            switch (fixedtype) {
+              case Dwg_Object_Type.DWG_TYPE_LAYER:
+                {
+                  const layer = this.convertLayer(tio, obj);
+                  db.tables.LAYER.entries.push(layer);
+                  this.entityConverter.layers.set(layer.handle, layer.name);
+                }
+                break;
+              case Dwg_Object_Type.DWG_TYPE_LTYPE:
+                {
+                  const ltype = this.convertLineType(tio, obj);
+                  db.tables.LTYPE.entries.push(ltype);
+                  this.entityConverter.ltypes.set(ltype.handle, ltype.name);
+                }
+                break;
+            }
           }
         }
       }
       for (let i = 0; i < num_objects; i++) {
         const obj = libredwg.dwg_get_object(data, i);
-        const tio = libredwg.dwg_object_to_object_tio(obj);
-        if (tio) {
-          const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
-          switch (fixedtype) {
-            case Dwg_Object_Type.DWG_TYPE_BLOCK_HEADER:
-              {
-                const btr = this.convertBlockRecord(tio, obj);
-                db.tables.BLOCK_RECORD.entries.push(btr);
-                if (isModelSpace(btr.name) || isPaperSpace(btr.name)) {
-                  btr.entities.forEach((entity) => db.entities.push(entity));
+        if (obj) {
+          const tio = libredwg.dwg_object_to_object_tio(obj);
+          if (tio) {
+            const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
+            switch (fixedtype) {
+              case Dwg_Object_Type.DWG_TYPE_BLOCK_HEADER:
+                {
+                  const btr = this.convertBlockRecord(tio, obj);
+                  db.tables.BLOCK_RECORD.entries.push(btr);
+                  if (isModelSpace(btr.name) || isPaperSpace(btr.name)) {
+                    btr.entities.forEach((entity) => db.entities.push(entity));
+                  }
                 }
-              }
-              break;
-            case Dwg_Object_Type.DWG_TYPE_DIMSTYLE:
-              db.tables.DIMSTYLE.entries.push(this.convertDimStyle(tio, obj));
-              break;
-            case Dwg_Object_Type.DWG_TYPE_STYLE:
-              db.tables.STYLE.entries.push(this.convertStyle(tio, obj));
-              break;
-            case Dwg_Object_Type.DWG_TYPE_VPORT:
-              db.tables.VPORT.entries.push(this.convertViewport(tio, obj));
-              break;
-            case Dwg_Object_Type.DWG_TYPE_IMAGEDEF:
-              db.objects.IMAGEDEF.push(this.convertImageDef(tio, obj));
-              break;
-            case Dwg_Object_Type.DWG_TYPE_LAYOUT:
-              db.objects.LAYOUT.push(this.convertLayout(tio, obj));
-              break;
+                break;
+              case Dwg_Object_Type.DWG_TYPE_DIMSTYLE:
+                db.tables.DIMSTYLE.entries.push(this.convertDimStyle(tio, obj));
+                break;
+              case Dwg_Object_Type.DWG_TYPE_STYLE:
+                db.tables.STYLE.entries.push(this.convertStyle(tio, obj));
+                break;
+              case Dwg_Object_Type.DWG_TYPE_VPORT:
+                db.tables.VPORT.entries.push(this.convertViewport(tio, obj));
+                break;
+              case Dwg_Object_Type.DWG_TYPE_IMAGEDEF:
+                db.objects.IMAGEDEF.push(this.convertImageDef(tio, obj));
+                break;
+              case Dwg_Object_Type.DWG_TYPE_LAYOUT:
+                db.objects.LAYOUT.push(this.convertLayout(tio, obj));
+                break;
+            }
           }
         }
       }
@@ -7092,9 +7091,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         }
         let value = libredwg.dwg_dynapi_header_value(data, var_name).data;
         if (name == "CELTYPE" || name == "CLAYER" || name == "CLAYER" || name == "DIMSTYLE" || name == "DIMTXSTY" || name == "TEXTSTYLE") {
-          value = libredwg.dwg_ref_get_object_name(value);
+          value = !!value ? libredwg.dwg_ref_get_object_name(value) : "";
         } else if (name == "DRAGVS") {
-          value = libredwg.dwg_ref_get_absref(value);
+          value = !!value ? libredwg.dwg_ref_get_absref(value) : 2;
         }
         header[name] = value;
       });
@@ -7149,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);
+            }
           }
         }
       }
@@ -7626,7 +7629,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         libredwg.dwg_ref_get_absref(active_viewport_ref)
       );
       const named_ucs_ref = libredwg.dwg_dynapi_entity_value(item, "named_ucs").data;
-      const namedUcsId = isValidPointer(named_ucs_ref) ? idToString(libredwg.dwg_ref_get_absref(named_ucs_ref)) : void 0;
+      const namedUcsId = !!named_ucs_ref ? idToString(libredwg.dwg_ref_get_absref(named_ucs_ref)) : void 0;
       return {
         ...commonAttrs,
         layoutName,
@@ -10061,9 +10064,5 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   exports2.createModule = createModule;
   exports2.dwgCodePageToEncoding = dwgCodePageToEncoding;
   exports2.dwgVersions = dwgVersions;
-  exports2.idToString = idToString;
-  exports2.isModelSpace = isModelSpace;
-  exports2.isPaperSpace = isPaperSpace;
-  exports2.isValidPointer = isValidPointer;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });

package/lib/converter/converter.js

@@ -1,6 +1,7 @@
-import { HEADER_VARIABLES, idToString, isModelSpace, isPaperSpace, isValidPointer } from '../database';
+import { HEADER_VARIABLES } from '../database';
 import { Dwg_Object_Type } from '../types';
 import { LibreEntityConverter } from './entityConverter';
+import { idToString, isModelSpace, isPaperSpace } from './utils';
 /**
  * Class used to convert Dwg_Data instance to DwgDatabase instance.
  */
@@ -48,62 +49,66 @@ export class LibreDwgConverter {
         const num_objects = libredwg.dwg_get_num_objects(data);
         for (let i = 0; i < num_objects; i++) {
             const obj = libredwg.dwg_get_object(data, i);
-            const tio = libredwg.dwg_object_to_object_tio(obj);
-            if (tio) {
-                const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
-                switch (fixedtype) {
-                    case Dwg_Object_Type.DWG_TYPE_LAYER:
-                        {
-                            const layer = this.convertLayer(tio, obj);
-                            db.tables.LAYER.entries.push(layer);
-                            this.entityConverter.layers.set(layer.handle, layer.name);
-                        }
-                        break;
-                    case Dwg_Object_Type.DWG_TYPE_LTYPE:
-                        {
-                            const ltype = this.convertLineType(tio, obj);
-                            db.tables.LTYPE.entries.push(ltype);
-                            this.entityConverter.ltypes.set(ltype.handle, ltype.name);
-                        }
-                        break;
-                    default:
-                        break;
+            if (obj) {
+                const tio = libredwg.dwg_object_to_object_tio(obj);
+                if (tio) {
+                    const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
+                    switch (fixedtype) {
+                        case Dwg_Object_Type.DWG_TYPE_LAYER:
+                            {
+                                const layer = this.convertLayer(tio, obj);
+                                db.tables.LAYER.entries.push(layer);
+                                this.entityConverter.layers.set(layer.handle, layer.name);
+                            }
+                            break;
+                        case Dwg_Object_Type.DWG_TYPE_LTYPE:
+                            {
+                                const ltype = this.convertLineType(tio, obj);
+                                db.tables.LTYPE.entries.push(ltype);
+                                this.entityConverter.ltypes.set(ltype.handle, ltype.name);
+                            }
+                            break;
+                        default:
+                            break;
+                    }
                 }
             }
         }
         for (let i = 0; i < num_objects; i++) {
             const obj = libredwg.dwg_get_object(data, i);
-            const tio = libredwg.dwg_object_to_object_tio(obj);
-            if (tio) {
-                const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
-                switch (fixedtype) {
-                    case Dwg_Object_Type.DWG_TYPE_BLOCK_HEADER:
-                        {
-                            const btr = this.convertBlockRecord(tio, obj);
-                            db.tables.BLOCK_RECORD.entries.push(btr);
-                            // db.entities should contains entities in model space and paper space only
-                            if (isModelSpace(btr.name) || isPaperSpace(btr.name)) {
-                                btr.entities.forEach(entity => db.entities.push(entity));
+            if (obj) {
+                const tio = libredwg.dwg_object_to_object_tio(obj);
+                if (tio) {
+                    const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
+                    switch (fixedtype) {
+                        case Dwg_Object_Type.DWG_TYPE_BLOCK_HEADER:
+                            {
+                                const btr = this.convertBlockRecord(tio, obj);
+                                db.tables.BLOCK_RECORD.entries.push(btr);
+                                // db.entities should contains entities in model space and paper space only
+                                if (isModelSpace(btr.name) || isPaperSpace(btr.name)) {
+                                    btr.entities.forEach(entity => db.entities.push(entity));
+                                }
                             }
-                        }
-                        break;
-                    case Dwg_Object_Type.DWG_TYPE_DIMSTYLE:
-                        db.tables.DIMSTYLE.entries.push(this.convertDimStyle(tio, obj));
-                        break;
-                    case Dwg_Object_Type.DWG_TYPE_STYLE:
-                        db.tables.STYLE.entries.push(this.convertStyle(tio, obj));
-                        break;
-                    case Dwg_Object_Type.DWG_TYPE_VPORT:
-                        db.tables.VPORT.entries.push(this.convertViewport(tio, obj));
-                        break;
-                    case Dwg_Object_Type.DWG_TYPE_IMAGEDEF:
-                        db.objects.IMAGEDEF.push(this.convertImageDef(tio, obj));
-                        break;
-                    case Dwg_Object_Type.DWG_TYPE_LAYOUT:
-                        db.objects.LAYOUT.push(this.convertLayout(tio, obj));
-                        break;
-                    default:
-                        break;
+                            break;
+                        case Dwg_Object_Type.DWG_TYPE_DIMSTYLE:
+                            db.tables.DIMSTYLE.entries.push(this.convertDimStyle(tio, obj));
+                            break;
+                        case Dwg_Object_Type.DWG_TYPE_STYLE:
+                            db.tables.STYLE.entries.push(this.convertStyle(tio, obj));
+                            break;
+                        case Dwg_Object_Type.DWG_TYPE_VPORT:
+                            db.tables.VPORT.entries.push(this.convertViewport(tio, obj));
+                            break;
+                        case Dwg_Object_Type.DWG_TYPE_IMAGEDEF:
+                            db.objects.IMAGEDEF.push(this.convertImageDef(tio, obj));
+                            break;
+                        case Dwg_Object_Type.DWG_TYPE_LAYOUT:
+                            db.objects.LAYOUT.push(this.convertLayout(tio, obj));
+                            break;
+                        default:
+                            break;
+                    }
                 }
             }
         }
@@ -130,10 +135,10 @@ export class LibreDwgConverter {
                 name == 'DIMSTYLE' ||
                 name == 'DIMTXSTY' ||
                 name == 'TEXTSTYLE') {
-                value = libredwg.dwg_ref_get_object_name(value);
+                value = !!value ? libredwg.dwg_ref_get_object_name(value) : '';
             }
             else if (name == 'DRAGVS') {
-                value = libredwg.dwg_ref_get_absref(value);
+                value = !!value ? libredwg.dwg_ref_get_absref(value) : 2;
             }
             // @ts-expect-error header variable name
             header[name] = value;
@@ -198,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);
+                    }
                 }
             }
         }
@@ -802,7 +809,7 @@ export class LibreDwgConverter {
         const viewportId = idToString(libredwg.dwg_ref_get_absref(active_viewport_ref));
         const named_ucs_ref = libredwg.dwg_dynapi_entity_value(item, 'named_ucs')
             .data;
-        const namedUcsId = isValidPointer(named_ucs_ref)
+        const namedUcsId = !!named_ucs_ref
             ? idToString(libredwg.dwg_ref_get_absref(named_ucs_ref))
             : undefined;
         // BITCODE_H base_ucs;

package/lib/converter/entityConverter.js

@@ -1,5 +1,6 @@
-import { DwgBoundaryPathEdgeType, DwgHatchAssociativity, DwgHatchSolidFill, idToString } from '../database';
+import { DwgBoundaryPathEdgeType, DwgHatchAssociativity, DwgHatchSolidFill } from '../database';
 import { Dwg_Hatch_Edge_Type, Dwg_Object_Type } from '../types';
+import { idToString } from './utils';
 export class LibreEntityConverter {
     libredwg;
     layers = new Map();
@@ -1567,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/converter/utils.d.ts

@@ -0,0 +1,4 @@
+export declare const isModelSpace: (name: string) => boolean | "";
+export declare const isPaperSpace: (name: string) => boolean | "";
+export declare const idToString: (id: number | bigint) => string;
+//# sourceMappingURL=utils.d.ts.map

package/lib/converter/utils.js

@@ -0,0 +1,12 @@
+const MODEL_SPACE = '*MODEL_SPACE';
+const MODEL_SPACE_PREFIX = '*PAPER_SPACE';
+export const isModelSpace = (name) => {
+    return name && name.toUpperCase() == MODEL_SPACE;
+};
+export const isPaperSpace = (name) => {
+    return name && name.toUpperCase().startsWith(MODEL_SPACE_PREFIX);
+};
+export const idToString = (id) => {
+    return id.toString(16).toUpperCase();
+};
+//# sourceMappingURL=utils.js.map

package/lib/database/common.d.ts

@@ -1,7 +1,3 @@
-export declare const isModelSpace: (name: string) => boolean | "";
-export declare const isPaperSpace: (name: string) => boolean | "";
-export declare const idToString: (id: number | bigint) => string;
-export declare const isValidPointer: (ptr: number | bigint) => boolean;
 export interface DwgPoint2D {
     x: number;
     y: number;

package/lib/database/common.js

@@ -1,20 +1,2 @@
-const MODEL_SPACE = '*MODEL_SPACE';
-const MODEL_SPACE_PREFIX = '*PAPER_SPACE';
-export const isModelSpace = (name) => {
-    return name && name.toUpperCase() == MODEL_SPACE;
-};
-export const isPaperSpace = (name) => {
-    return name && name.toUpperCase().startsWith(MODEL_SPACE_PREFIX);
-};
-export const idToString = (id) => {
-    return id.toString(16).toUpperCase();
-};
-export const isValidPointer = (ptr) => {
-    if (typeof ptr === 'bigint') {
-        return ptr !== 0n;
-    }
-    else {
-        return ptr !== 0;
-    }
-};
+export {};
 //# sourceMappingURL=common.js.map

package/lib/libredwg-web.js

@@ -199,38 +199,6 @@ var createModule = (() => {
         } }
         var stackRestore = val => __emscripten_stack_restore(val);
         var stackSave = () => _emscripten_stack_get_current();
-        var UTF8Decoder = typeof TextDecoder != "undefined" ? new TextDecoder : undefined;
-        var UTF8ArrayToString = (heapOrArray, idx = 0, maxBytesToRead = NaN) => { var endIdx = idx + maxBytesToRead; var endPtr = idx; while (heapOrArray[endPtr] && !(endPtr >= endIdx))
-            ++endPtr; if (endPtr - idx > 16 && heapOrArray.buffer && UTF8Decoder) {
-            return UTF8Decoder.decode(heapOrArray.subarray(idx, endPtr));
-        } var str = ""; while (idx < endPtr) {
-            var u0 = heapOrArray[idx++];
-            if (!(u0 & 128)) {
-                str += String.fromCharCode(u0);
-                continue;
-            }
-            var u1 = heapOrArray[idx++] & 63;
-            if ((u0 & 224) == 192) {
-                str += String.fromCharCode((u0 & 31) << 6 | u1);
-                continue;
-            }
-            var u2 = heapOrArray[idx++] & 63;
-            if ((u0 & 240) == 224) {
-                u0 = (u0 & 15) << 12 | u1 << 6 | u2;
-            }
-            else {
-                u0 = (u0 & 7) << 18 | u1 << 12 | u2 << 6 | heapOrArray[idx++] & 63;
-            }
-            if (u0 < 65536) {
-                str += String.fromCharCode(u0);
-            }
-            else {
-                var ch = u0 - 65536;
-                str += String.fromCharCode(55296 | ch >> 10, 56320 | ch & 1023);
-            }
-        } return str; };
-        var UTF8ToString = (ptr, maxBytesToRead) => ptr ? UTF8ArrayToString(HEAPU8, ptr, maxBytesToRead) : "";
-        var ___assert_fail = (condition, filename, line, func) => abort(`Assertion failed: ${UTF8ToString(condition)}, at: ` + [filename ? UTF8ToString(filename) : "unknown filename", line, func ? UTF8ToString(func) : "unknown function"]);
         class ExceptionInfo {
             constructor(excPtr) { this.excPtr = excPtr; this.ptr = excPtr - 24; }
             set_type(type) { HEAPU32[this.ptr + 4 >> 2] = type; }
@@ -306,6 +274,36 @@ var createModule = (() => {
             } var outputParts = []; for (var i = samePartsLength; i < fromParts.length; i++) {
                 outputParts.push("..");
             } outputParts = outputParts.concat(toParts.slice(samePartsLength)); return outputParts.join("/"); } };
+        var UTF8Decoder = typeof TextDecoder != "undefined" ? new TextDecoder : undefined;
+        var UTF8ArrayToString = (heapOrArray, idx = 0, maxBytesToRead = NaN) => { var endIdx = idx + maxBytesToRead; var endPtr = idx; while (heapOrArray[endPtr] && !(endPtr >= endIdx))
+            ++endPtr; if (endPtr - idx > 16 && heapOrArray.buffer && UTF8Decoder) {
+            return UTF8Decoder.decode(heapOrArray.subarray(idx, endPtr));
+        } var str = ""; while (idx < endPtr) {
+            var u0 = heapOrArray[idx++];
+            if (!(u0 & 128)) {
+                str += String.fromCharCode(u0);
+                continue;
+            }
+            var u1 = heapOrArray[idx++] & 63;
+            if ((u0 & 224) == 192) {
+                str += String.fromCharCode((u0 & 31) << 6 | u1);
+                continue;
+            }
+            var u2 = heapOrArray[idx++] & 63;
+            if ((u0 & 240) == 224) {
+                u0 = (u0 & 15) << 12 | u1 << 6 | u2;
+            }
+            else {
+                u0 = (u0 & 7) << 18 | u1 << 12 | u2 << 6 | heapOrArray[idx++] & 63;
+            }
+            if (u0 < 65536) {
+                str += String.fromCharCode(u0);
+            }
+            else {
+                var ch = u0 - 65536;
+                str += String.fromCharCode(55296 | ch >> 10, 56320 | ch & 1023);
+            }
+        } return str; };
         var FS_stdin_getChar_buffer = [];
         var lengthBytesUTF8 = str => { var len = 0; for (var i = 0; i < str.length; ++i) {
             var c = str.charCodeAt(i);
@@ -1248,6 +1246,7 @@ var createModule = (() => {
             } return size; } stream_ops.read = (stream, buffer, offset, length, position) => { FS.forceLoadFile(node); return writeChunks(stream, buffer, offset, length, position); }; stream_ops.mmap = (stream, length, position, prot, flags) => { FS.forceLoadFile(node); var ptr = mmapAlloc(length); if (!ptr) {
                 throw new FS.ErrnoError(48);
             } writeChunks(stream, HEAP8, ptr, length, position); return { ptr, allocated: true }; }; node.stream_ops = stream_ops; return node; } };
+        var UTF8ToString = (ptr, maxBytesToRead) => ptr ? UTF8ArrayToString(HEAPU8, ptr, maxBytesToRead) : "";
         var SYSCALLS = { DEFAULT_POLLMASK: 5, calculateAt(dirfd, path, allowEmpty) { if (PATH.isAbs(path)) {
                 return path;
             } var dir; if (dirfd === -100) {
@@ -2314,7 +2313,7 @@ var createModule = (() => {
         init_RegisteredPointer();
         UnboundTypeError = Module["UnboundTypeError"] = extendError(Error, "UnboundTypeError");
         init_emval();
-        var wasmImports = { __assert_fail: ___assert_fail, __cxa_throw: ___cxa_throw, __syscall_fcntl64: ___syscall_fcntl64, __syscall_fstat64: ___syscall_fstat64, __syscall_ioctl: ___syscall_ioctl, __syscall_lstat64: ___syscall_lstat64, __syscall_newfstatat: ___syscall_newfstatat, __syscall_openat: ___syscall_openat, __syscall_stat64: ___syscall_stat64, _abort_js: __abort_js, _embind_register_bigint: __embind_register_bigint, _embind_register_bool: __embind_register_bool, _embind_register_class: __embind_register_class, _embind_register_class_property: __embind_register_class_property, _embind_register_emval: __embind_register_emval, _embind_register_enum: __embind_register_enum, _embind_register_enum_value: __embind_register_enum_value, _embind_register_float: __embind_register_float, _embind_register_function: __embind_register_function, _embind_register_integer: __embind_register_integer, _embind_register_memory_view: __embind_register_memory_view, _embind_register_std_string: __embind_register_std_string, _embind_register_std_wstring: __embind_register_std_wstring, _embind_register_void: __embind_register_void, _emval_call: __emval_call, _emval_call_method: __emval_call_method, _emval_decref: __emval_decref, _emval_get_global: __emval_get_global, _emval_get_method_caller: __emval_get_method_caller, _emval_incref: __emval_incref, _emval_new_array: __emval_new_array, _emval_new_cstring: __emval_new_cstring, _emval_new_object: __emval_new_object, _emval_run_destructors: __emval_run_destructors, _emval_set_property: __emval_set_property, _emval_take_value: __emval_take_value, _gmtime_js: __gmtime_js, _mktime_js: __mktime_js, _tzset_js: __tzset_js, emscripten_date_now: _emscripten_date_now, emscripten_resize_heap: _emscripten_resize_heap, environ_get: _environ_get, environ_sizes_get: _environ_sizes_get, fd_close: _fd_close, fd_read: _fd_read, fd_seek: _fd_seek, fd_write: _fd_write };
+        var wasmImports = { __cxa_throw: ___cxa_throw, __syscall_fcntl64: ___syscall_fcntl64, __syscall_fstat64: ___syscall_fstat64, __syscall_ioctl: ___syscall_ioctl, __syscall_lstat64: ___syscall_lstat64, __syscall_newfstatat: ___syscall_newfstatat, __syscall_openat: ___syscall_openat, __syscall_stat64: ___syscall_stat64, _abort_js: __abort_js, _embind_register_bigint: __embind_register_bigint, _embind_register_bool: __embind_register_bool, _embind_register_class: __embind_register_class, _embind_register_class_property: __embind_register_class_property, _embind_register_emval: __embind_register_emval, _embind_register_enum: __embind_register_enum, _embind_register_enum_value: __embind_register_enum_value, _embind_register_float: __embind_register_float, _embind_register_function: __embind_register_function, _embind_register_integer: __embind_register_integer, _embind_register_memory_view: __embind_register_memory_view, _embind_register_std_string: __embind_register_std_string, _embind_register_std_wstring: __embind_register_std_wstring, _embind_register_void: __embind_register_void, _emval_call: __emval_call, _emval_call_method: __emval_call_method, _emval_decref: __emval_decref, _emval_get_global: __emval_get_global, _emval_get_method_caller: __emval_get_method_caller, _emval_incref: __emval_incref, _emval_new_array: __emval_new_array, _emval_new_cstring: __emval_new_cstring, _emval_new_object: __emval_new_object, _emval_run_destructors: __emval_run_destructors, _emval_set_property: __emval_set_property, _emval_take_value: __emval_take_value, _gmtime_js: __gmtime_js, _mktime_js: __mktime_js, _tzset_js: __tzset_js, emscripten_date_now: _emscripten_date_now, emscripten_resize_heap: _emscripten_resize_heap, environ_get: _environ_get, environ_sizes_get: _environ_sizes_get, fd_close: _fd_close, fd_read: _fd_read, fd_seek: _fd_seek, fd_write: _fd_write };
         var wasmExports = await createWasm();
         var ___wasm_call_ctors = wasmExports["__wasm_call_ctors"];
         var _malloc = wasmExports["malloc"];

package/lib/svg/svgConverter.js

@@ -1,4 +1,5 @@
-import { DwgAttachmentPoint, DwgTextHorizontalAlign, isModelSpace } 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/lib/utils/common.d.ts

@@ -0,0 +1,4 @@
+export declare const isModelSpace: (name: string) => boolean | "";
+export declare const isPaperSpace: (name: string) => boolean | "";
+export declare const idToString: (id: number | bigint) => string;
+//# sourceMappingURL=common.d.ts.map

package/lib/utils/common.js

@@ -0,0 +1,12 @@
+const MODEL_SPACE = '*MODEL_SPACE';
+const MODEL_SPACE_PREFIX = '*PAPER_SPACE';
+export const isModelSpace = (name) => {
+    return name && name.toUpperCase() == MODEL_SPACE;
+};
+export const isPaperSpace = (name) => {
+    return name && name.toUpperCase().startsWith(MODEL_SPACE_PREFIX);
+};
+export const idToString = (id) => {
+    return id.toString(16).toUpperCase();
+};
+//# sourceMappingURL=common.js.map

package/lib/utils/index.d.ts

@@ -0,0 +1,2 @@
+export * from './common';
+//# sourceMappingURL=index.d.ts.map

package/lib/utils/index.js

@@ -0,0 +1,2 @@
+export * from './common';
+//# sourceMappingURL=index.js.map

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