@mlightcad/libredwg-web 0.4.6 → 0.6.0

package/dist/libredwg-web.umd.cjs

@@ -14,6 +14,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   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";
@@ -6684,14 +6694,26 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const gridSpacing = libredwg.dwg_dynapi_entity_value(entity, "GRIDUNIT").data;
       const viewDirection = libredwg.dwg_dynapi_entity_value(entity, "VIEWDIR").data;
       const targetPoint = libredwg.dwg_dynapi_entity_value(entity, "view_target").data;
-      const perspectiveLensLength = libredwg.dwg_dynapi_entity_value(entity, "lens_length").data;
+      const perspectiveLensLength = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "lens_length"
+      ).data;
       const frontClipZ = libredwg.dwg_dynapi_entity_value(entity, "front_clip_z").data;
       const backClipZ = libredwg.dwg_dynapi_entity_value(entity, "back_clip_z").data;
       const viewHeight = libredwg.dwg_dynapi_entity_value(entity, "VIEWSIZE").data;
       const snapAngle = libredwg.dwg_dynapi_entity_value(entity, "SNAPANG").data;
-      const viewTwistAngle = libredwg.dwg_dynapi_entity_value(entity, "twist_angle").data;
-      const circleZoomPercent = libredwg.dwg_dynapi_entity_value(entity, "circle_zoom").data;
-      const statusBitFlags = libredwg.dwg_dynapi_entity_value(entity, "status_flag").data;
+      const viewTwistAngle = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "twist_angle"
+      ).data;
+      const circleZoomPercent = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "circle_zoom"
+      ).data;
+      const statusBitFlags = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "status_flag"
+      ).data;
       const sheetName = libredwg.dwg_dynapi_entity_value(entity, "style_sheet").data;
       const renderMode = libredwg.dwg_dynapi_entity_value(entity, "render_mode").data;
       const ucsPerViewport = libredwg.dwg_dynapi_entity_value(entity, "UCSVP").data;
@@ -6702,19 +6724,40 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const ucsId = libredwg.dwg_ref_get_absref(named_ucs_ref);
       const base_ucs_ref = libredwg.dwg_dynapi_entity_value(entity, "base_ucs").data;
       const ucsBaseId = libredwg.dwg_ref_get_absref(base_ucs_ref);
-      const orthographicType = libredwg.dwg_dynapi_entity_value(entity, "UCSORTHOVIEW").data;
+      const orthographicType = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "UCSORTHOVIEW"
+      ).data;
       const elevation = libredwg.dwg_dynapi_entity_value(entity, "ucs_elevation").data;
-      const shadePlotMode = libredwg.dwg_dynapi_entity_value(entity, "shadeplot_mode").data;
-      const isDefaultLighting = libredwg.dwg_dynapi_entity_value(entity, "use_default_lights").data;
-      const defaultLightingType = libredwg.dwg_dynapi_entity_value(entity, "default_lighting_type").data;
+      const shadePlotMode = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "shadeplot_mode"
+      ).data;
+      const isDefaultLighting = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "use_default_lights"
+      ).data;
+      const defaultLightingType = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "default_lighting_type"
+      ).data;
       const brightness = libredwg.dwg_dynapi_entity_value(entity, "brightness").data;
       const contrast = libredwg.dwg_dynapi_entity_value(entity, "contrast").data;
-      const majorGridFrequency = libredwg.dwg_dynapi_entity_value(entity, "grid_major").data;
-      const background_ref = libredwg.dwg_dynapi_entity_value(entity, "background").data;
+      const majorGridFrequency = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "grid_major"
+      ).data;
+      const background_ref = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "background"
+      ).data;
       const backgroundId = libredwg.dwg_ref_get_absref(background_ref);
       const shadeplot_ref = libredwg.dwg_dynapi_entity_value(entity, "shadeplot").data;
       const shadePlotId = libredwg.dwg_ref_get_absref(shadeplot_ref);
-      const visualstyle_ref = libredwg.dwg_dynapi_entity_value(entity, "visualstyle").data;
+      const visualstyle_ref = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "visualstyle"
+      ).data;
       const visualStyleId = libredwg.dwg_ref_get_absref(visualstyle_ref);
       const sun_ref = libredwg.dwg_dynapi_entity_value(entity, "sun").data;
       const sunId = libredwg.dwg_ref_get_absref(sun_ref);
@@ -6746,20 +6789,20 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         ucsOrigin,
         ucsXAxis,
         ucsYAxis,
-        ucsId: ucsId.toString(),
-        ucsBaseId: ucsBaseId.toString(),
+        ucsId: idToString(ucsId),
+        ucsBaseId: idToString(ucsBaseId),
         orthographicType,
         elevation,
         shadePlotMode,
         majorGridFrequency,
-        backgroundId: backgroundId.toString(),
-        shadePlotId: shadePlotId.toString(),
-        visualStyleId: visualStyleId.toString(),
+        backgroundId: idToString(backgroundId),
+        shadePlotId: idToString(shadePlotId),
+        visualStyleId: idToString(visualStyleId),
         isDefaultLighting: !!isDefaultLighting,
         defaultLightingType,
         brightness,
         contrast,
-        sunId: sunId.toString()
+        sunId: idToString(sunId)
       };
     }
     convertWipeout(entity, commonAttrs) {
@@ -6896,8 +6939,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const lineTypeScale = libredwg.dwg_object_entity_get_ltype_scale(entity);
       const isVisible = !libredwg.dwg_object_entity_get_invisible(entity);
       return {
-        handle: handle.value,
-        ownerBlockRecordSoftId: ownerhandle.absolute_ref,
+        handle: idToString(handle.value),
+        ownerBlockRecordSoftId: idToString(ownerhandle.absolute_ref),
         layer,
         color: rgbColor,
         colorIndex,
@@ -6913,13 +6956,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     getLayerName(entity) {
       const libredwg = this.libredwg;
       const layer = libredwg.dwg_object_entity_get_layer_object_ref(entity);
-      const name = this.layers.get(layer.handleref.value);
+      const name = this.layers.get(idToString(layer.handleref.value));
       return name ?? "0";
     }
     getLtypeName(entity) {
       const libredwg = this.libredwg;
       const ltype = libredwg.dwg_object_entity_get_ltype_object_ref(entity);
-      const name = this.ltypes.get(ltype.handleref.value);
+      const name = this.ltypes.get(idToString(ltype.handleref.value));
       return name ?? "";
     }
   }
@@ -6998,7 +7041,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
               {
                 const btr = this.convertBlockRecord(tio, obj);
                 db.tables.BLOCK_RECORD.entries.push(btr);
-                btr.entities.forEach((entity) => db.entities.push(entity));
+                if (isModelSpace(btr.name) || isPaperSpace(btr.name)) {
+                  btr.entities.forEach((entity) => db.entities.push(entity));
+                }
               }
               break;
             case Dwg_Object_Type.DWG_TYPE_DIMSTYLE:
@@ -7094,7 +7139,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       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 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++) {
@@ -7456,9 +7504,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const elevation = libredwg.dwg_dynapi_entity_value(item, "ucs_elevation").data;
       const majorGridLines = libredwg.dwg_dynapi_entity_value(item, "grid_major").data;
       const background = libredwg.dwg_dynapi_entity_value(item, "background").data;
-      const backgroundObjectId = background ? libredwg.dwg_ref_get_absref(background).toString() : void 0;
+      const backgroundObjectId = background ? idToString(libredwg.dwg_ref_get_absref(background)) : void 0;
       const visualstyle = libredwg.dwg_dynapi_entity_value(item, "visualstyle").data;
-      const visualStyleObjectId = visualstyle ? libredwg.dwg_ref_get_absref(visualstyle).toString() : void 0;
+      const visualStyleObjectId = visualstyle ? idToString(libredwg.dwg_ref_get_absref(visualstyle)) : void 0;
       return {
         ...commonAttrs,
         standardFlag,
@@ -7510,8 +7558,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const ownerhandle = libredwg.dwg_object_object_get_ownerhandle_object(object_tio);
       const handle = libredwg.dwg_object_get_handle_object(obj);
       return {
-        handle: handle.value,
-        ownerHandle: ownerhandle.absolute_ref,
+        handle: idToString(handle.value),
+        ownerHandle: idToString(ownerhandle.absolute_ref),
         name: libredwg.dwg_dynapi_entity_value(tio, "name").data
       };
     }
@@ -7551,6 +7599,22 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const minExtent = libredwg.dwg_dynapi_entity_value(item, "EXTMIN").data;
       const maxExtent = libredwg.dwg_dynapi_entity_value(item, "EXTMAX").data;
       const elevation = libredwg.dwg_dynapi_entity_value(item, "ucs_elevation").data;
+      const block_header_ref = libredwg.dwg_dynapi_entity_value(
+        item,
+        "block_header"
+      ).data;
+      const paperSpaceTableId = idToString(
+        libredwg.dwg_ref_get_absref(block_header_ref)
+      );
+      const active_viewport_ref = libredwg.dwg_dynapi_entity_value(
+        item,
+        "active_viewport"
+      ).data;
+      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) ? idToString(libredwg.dwg_ref_get_absref(named_ucs_ref)) : void 0;
       return {
         ...commonAttrs,
         layoutName,
@@ -7566,11 +7630,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         ucsXAxis,
         ucsYAxis,
         orthographicType,
-        paperSpaceTableId: "",
-        // TODO: Set the correct value
-        viewportId: "",
-        // TODO: Set the correct value
-        // namedUcsId?: string;
+        paperSpaceTableId,
+        viewportId,
+        namedUcsId,
         // orthographicUcsId?: string;
         shadePlotId: ""
         // TODO: Set the correct value
@@ -9063,8 +9125,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return converter.convert(data);
     }
     /**
-     * Converts Dwg_Data instance to DwgDatabase instance and returns conversion statistics. 
-     * DwgDatabase instance doesn't depend on Dwg_Data instance any more after conversion. 
+     * Converts Dwg_Data instance to DwgDatabase instance and returns conversion statistics.
+     * DwgDatabase instance doesn't depend on Dwg_Data instance any more after conversion.
      * So you can call function dwg_free to free memory occupied by Dwg_Data.
      * @param data Pointer to Dwg_Data instance.
      * @returns Returns the converted DwgDatabase and conversion statistics.
@@ -9987,7 +10049,9 @@ 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,4 +1,4 @@
-import { HEADER_VARIABLES } from '../database';
+import { HEADER_VARIABLES, idToString, isModelSpace, isPaperSpace, isValidPointer } from '../database';
 import { Dwg_Object_Type } from '../types';
 import { LibreEntityConverter } from './entityConverter';
 /**
@@ -81,7 +81,10 @@ export class LibreDwgConverter {
                         {
                             const btr = this.convertBlockRecord(tio, obj);
                             db.tables.BLOCK_RECORD.entries.push(btr);
-                            btr.entities.forEach(entity => db.entities.push(entity));
+                            // 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:
@@ -150,7 +153,7 @@ export class LibreDwgConverter {
                 wasAProxyFlag: cls.s_zombie,
                 // DWG_TYPE_PROXY_ENTITY = 0x1F2 /* 498 */,
                 // DWG_TYPE_PROXY_OBJECT = 0x1F3 /* 499 */,
-                isAnEntityFlag: cls.item_class_id === 0x1F2
+                isAnEntityFlag: cls.item_class_id === 0x1f2
             });
         }
     }
@@ -164,7 +167,8 @@ export class LibreDwgConverter {
             commonAttrs.name = block.name;
         }
         // The number of entities
-        const num_owned = libredwg.dwg_dynapi_entity_value(item, 'num_owned').data;
+        const num_owned = libredwg.dwg_dynapi_entity_value(item, 'num_owned')
+            .data;
         const flags = libredwg.dwg_dynapi_entity_value(item, 'flag').data;
         const description = libredwg.dwg_dynapi_entity_value(item, 'description')
             .data;
@@ -195,7 +199,8 @@ export class LibreDwgConverter {
         // 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) {
-            const entities_ptr = libredwg.dwg_dynapi_entity_value(item, 'entities').data;
+            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 = [];
@@ -507,13 +512,13 @@ export class LibreDwgConverter {
         // - 0xc8 for none (also c3 and rgb of 0x101)
         const method = color.method;
         let colorIndex = 256;
-        let rgbColor = 0xFFFFFF;
+        let rgbColor = 0xffffff;
         // It looks like that libredwg always returns 256 for property 'index' in Dwg_Color
-        if (method === 0xC3 || ((color.rgb >>> 24) & 0xFF) === 0xC3) {
-            colorIndex = color.rgb & 0x000000FF;
+        if (method === 0xc3 || ((color.rgb >>> 24) & 0xff) === 0xc3) {
+            colorIndex = color.rgb & 0x000000ff;
         }
-        else if (method == 0xC2 || ((color.rgb >>> 24) & 0xFF) === 0xC2) {
-            rgbColor = color.rgb & 0x00FFFFFF;
+        else if (method == 0xc2 || ((color.rgb >>> 24) & 0xff) === 0xc2) {
+            rgbColor = color.rgb & 0x00ffffff;
         }
         return {
             ...commonAttrs,
@@ -543,8 +548,11 @@ export class LibreDwgConverter {
             .data;
         const patternLen = libredwg.dwg_dynapi_entity_value(item, 'pattern_len')
             .data;
-        const dashes = libredwg.dwg_dynapi_entity_value(item, 'dashes').data;
-        const dashArray = dashes ? libredwg.dwg_ptr_to_ltype_dash_array(dashes, numDashes) : [];
+        const dashes = libredwg.dwg_dynapi_entity_value(item, 'dashes')
+            .data;
+        const dashArray = dashes
+            ? libredwg.dwg_ptr_to_ltype_dash_array(dashes, numDashes)
+            : [];
         return {
             ...commonAttrs,
             description: description,
@@ -664,12 +672,12 @@ export class LibreDwgConverter {
         const background = libredwg.dwg_dynapi_entity_value(item, 'background')
             .data;
         const backgroundObjectId = background
-            ? libredwg.dwg_ref_get_absref(background).toString()
+            ? idToString(libredwg.dwg_ref_get_absref(background))
             : undefined;
         const visualstyle = libredwg.dwg_dynapi_entity_value(item, 'visualstyle')
             .data;
         const visualStyleObjectId = visualstyle
-            ? libredwg.dwg_ref_get_absref(visualstyle).toString()
+            ? idToString(libredwg.dwg_ref_get_absref(visualstyle))
             : undefined;
         // BITCODE_B UCSFOLLOW;
         // BITCODE_B FASTZOOM;
@@ -731,8 +739,8 @@ export class LibreDwgConverter {
         const ownerhandle = libredwg.dwg_object_object_get_ownerhandle_object(object_tio);
         const handle = libredwg.dwg_object_get_handle_object(obj);
         return {
-            handle: handle.value,
-            ownerHandle: ownerhandle.absolute_ref,
+            handle: idToString(handle.value),
+            ownerHandle: idToString(ownerhandle.absolute_ref),
             name: libredwg.dwg_dynapi_entity_value(tio, 'name').data
         };
     }
@@ -788,10 +796,16 @@ export class LibreDwgConverter {
             .data;
         const elevation = libredwg.dwg_dynapi_entity_value(item, 'ucs_elevation')
             .data;
-        // BITCODE_H block_header;
-        // BITCODE_H active_viewport;
+        const block_header_ref = libredwg.dwg_dynapi_entity_value(item, 'block_header').data;
+        const paperSpaceTableId = idToString(libredwg.dwg_ref_get_absref(block_header_ref));
+        const active_viewport_ref = libredwg.dwg_dynapi_entity_value(item, 'active_viewport').data;
+        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)
+            ? idToString(libredwg.dwg_ref_get_absref(named_ucs_ref))
+            : undefined;
         // BITCODE_H base_ucs;
-        // BITCODE_H named_ucs;
         // BITCODE_BL num_viewports; // r2004+
         // BITCODE_H *viewports;     // r2004+
         return {
@@ -809,9 +823,9 @@ export class LibreDwgConverter {
             ucsXAxis: ucsXAxis,
             ucsYAxis: ucsYAxis,
             orthographicType: orthographicType,
-            paperSpaceTableId: '', // TODO: Set the correct value
-            viewportId: '', // TODO: Set the correct value
-            // namedUcsId?: string;
+            paperSpaceTableId: paperSpaceTableId,
+            viewportId: viewportId,
+            namedUcsId: namedUcsId,
             // orthographicUcsId?: string;
             shadePlotId: '' // TODO: Set the correct value
         };

package/lib/converter/entityConverter.d.ts

@@ -3,8 +3,8 @@ import { LibreDwgEx } from '../libredwg';
 import { Dwg_Object_Ptr } from '../types';
 export declare class LibreEntityConverter {
     libredwg: LibreDwgEx;
-    layers: Map<number, string>;
-    ltypes: Map<number, string>;
+    layers: Map<string, string>;
+    ltypes: Map<string, string>;
     unknownEntityCount: number;
     constructor(instance: LibreDwgEx);
     prepare(db: DwgDatabase, force?: boolean): void;

package/lib/converter/entityConverter.js

@@ -1,4 +1,4 @@
-import { DwgBoundaryPathEdgeType, DwgHatchAssociativity, DwgHatchSolidFill } from '../database';
+import { DwgBoundaryPathEdgeType, DwgHatchAssociativity, DwgHatchSolidFill, idToString } from '../database';
 import { Dwg_Hatch_Edge_Type, Dwg_Object_Type } from '../types';
 export class LibreEntityConverter {
     libredwg;
@@ -957,7 +957,8 @@ export class LibreEntityConverter {
     convertPolyline2d(entity, commonAttrs, object) {
         const libredwg = this.libredwg;
         const flag = libredwg.dwg_dynapi_entity_value(entity, 'flag').data;
-        const smoothType = libredwg.dwg_dynapi_entity_value(entity, 'curve_type').data;
+        const smoothType = libredwg.dwg_dynapi_entity_value(entity, 'curve_type')
+            .data;
         const startWidth = libredwg.dwg_dynapi_entity_value(entity, 'start_width')
             .data;
         const endWidth = libredwg.dwg_dynapi_entity_value(entity, 'end_width')
@@ -993,13 +994,14 @@ export class LibreEntityConverter {
             meshMVertexCount: 0,
             meshNVertexCount: 0,
             surfaceMDensity: 0,
-            surfaceNDensity: 0,
+            surfaceNDensity: 0
         };
     }
     convertPolyline3d(entity, commonAttrs, object) {
         const libredwg = this.libredwg;
         const flag = libredwg.dwg_dynapi_entity_value(entity, 'flag').data;
-        const smoothType = libredwg.dwg_dynapi_entity_value(entity, 'curve_type').data;
+        const smoothType = libredwg.dwg_dynapi_entity_value(entity, 'curve_type')
+            .data;
         const startWidth = libredwg.dwg_dynapi_entity_value(entity, 'start_width')
             .data;
         const endWidth = libredwg.dwg_dynapi_entity_value(entity, 'end_width')
@@ -1343,24 +1345,20 @@ export class LibreEntityConverter {
             .data;
         const targetPoint = libredwg.dwg_dynapi_entity_value(entity, 'view_target')
             .data;
-        const perspectiveLensLength = libredwg.dwg_dynapi_entity_value(entity, 'lens_length')
-            .data;
+        const perspectiveLensLength = libredwg.dwg_dynapi_entity_value(entity, 'lens_length').data;
         const frontClipZ = libredwg.dwg_dynapi_entity_value(entity, 'front_clip_z')
             .data;
         const backClipZ = libredwg.dwg_dynapi_entity_value(entity, 'back_clip_z')
             .data;
-        // TODO: I am not sure whether view size in libredwg represents view height 
+        // TODO: I am not sure whether view size in libredwg represents view height
         const viewHeight = libredwg.dwg_dynapi_entity_value(entity, 'VIEWSIZE')
             .data;
         const snapAngle = libredwg.dwg_dynapi_entity_value(entity, 'SNAPANG')
             .data;
-        const viewTwistAngle = libredwg.dwg_dynapi_entity_value(entity, 'twist_angle')
-            .data;
-        const circleZoomPercent = libredwg.dwg_dynapi_entity_value(entity, 'circle_zoom')
-            .data;
+        const viewTwistAngle = libredwg.dwg_dynapi_entity_value(entity, 'twist_angle').data;
+        const circleZoomPercent = libredwg.dwg_dynapi_entity_value(entity, 'circle_zoom').data;
         // TODO: convert frozenLayerIds and clippingBoundaryId
-        const statusBitFlags = libredwg.dwg_dynapi_entity_value(entity, 'status_flag')
-            .data;
+        const statusBitFlags = libredwg.dwg_dynapi_entity_value(entity, 'status_flag').data;
         const sheetName = libredwg.dwg_dynapi_entity_value(entity, 'style_sheet')
             .data;
         const renderMode = libredwg.dwg_dynapi_entity_value(entity, 'render_mode')
@@ -1381,30 +1379,23 @@ export class LibreEntityConverter {
             .data;
         const ucsBaseId = libredwg.dwg_ref_get_absref(base_ucs_ref);
         // TODO: Not sure whether UCSORTHOVIEW represents orthographicType
-        const orthographicType = libredwg.dwg_dynapi_entity_value(entity, 'UCSORTHOVIEW')
-            .data;
+        const orthographicType = libredwg.dwg_dynapi_entity_value(entity, 'UCSORTHOVIEW').data;
         const elevation = libredwg.dwg_dynapi_entity_value(entity, 'ucs_elevation')
             .data;
-        const shadePlotMode = libredwg.dwg_dynapi_entity_value(entity, 'shadeplot_mode')
-            .data;
-        const isDefaultLighting = libredwg.dwg_dynapi_entity_value(entity, 'use_default_lights')
-            .data;
-        const defaultLightingType = libredwg.dwg_dynapi_entity_value(entity, 'default_lighting_type')
-            .data;
+        const shadePlotMode = libredwg.dwg_dynapi_entity_value(entity, 'shadeplot_mode').data;
+        const isDefaultLighting = libredwg.dwg_dynapi_entity_value(entity, 'use_default_lights').data;
+        const defaultLightingType = libredwg.dwg_dynapi_entity_value(entity, 'default_lighting_type').data;
         const brightness = libredwg.dwg_dynapi_entity_value(entity, 'brightness')
             .data;
         const contrast = libredwg.dwg_dynapi_entity_value(entity, 'contrast')
             .data;
-        const majorGridFrequency = libredwg.dwg_dynapi_entity_value(entity, 'grid_major')
-            .data;
-        const background_ref = libredwg.dwg_dynapi_entity_value(entity, 'background')
-            .data;
+        const majorGridFrequency = libredwg.dwg_dynapi_entity_value(entity, 'grid_major').data;
+        const background_ref = libredwg.dwg_dynapi_entity_value(entity, 'background').data;
         const backgroundId = libredwg.dwg_ref_get_absref(background_ref);
         const shadeplot_ref = libredwg.dwg_dynapi_entity_value(entity, 'shadeplot')
             .data;
         const shadePlotId = libredwg.dwg_ref_get_absref(shadeplot_ref);
-        const visualstyle_ref = libredwg.dwg_dynapi_entity_value(entity, 'visualstyle')
-            .data;
+        const visualstyle_ref = libredwg.dwg_dynapi_entity_value(entity, 'visualstyle').data;
         const visualStyleId = libredwg.dwg_ref_get_absref(visualstyle_ref);
         // TODO: convert ambientLightColor
         const sun_ref = libredwg.dwg_dynapi_entity_value(entity, 'sun')
@@ -1438,20 +1429,20 @@ export class LibreEntityConverter {
             ucsOrigin: ucsOrigin,
             ucsXAxis: ucsXAxis,
             ucsYAxis: ucsYAxis,
-            ucsId: ucsId.toString(),
-            ucsBaseId: ucsBaseId.toString(),
+            ucsId: idToString(ucsId),
+            ucsBaseId: idToString(ucsBaseId),
             orthographicType: orthographicType,
             elevation: elevation,
             shadePlotMode: shadePlotMode,
             majorGridFrequency: majorGridFrequency,
-            backgroundId: backgroundId.toString(),
-            shadePlotId: shadePlotId.toString(),
-            visualStyleId: visualStyleId.toString(),
+            backgroundId: idToString(backgroundId),
+            shadePlotId: idToString(shadePlotId),
+            visualStyleId: idToString(visualStyleId),
             isDefaultLighting: !!isDefaultLighting,
             defaultLightingType: defaultLightingType,
             brightness: brightness,
             contrast: contrast,
-            sunId: sunId.toString()
+            sunId: idToString(sunId)
         };
     }
     convertWipeout(entity, commonAttrs) {
@@ -1574,8 +1565,8 @@ export class LibreEntityConverter {
         const method = color.method;
         let colorIndex = color.index;
         let rgbColor = undefined;
-        if (method == 0xC2 || ((color.rgb >>> 24) & 0xFF) === 0xC2) {
-            rgbColor = color.rgb & 0x00FFFFFF;
+        if (method == 0xc2 || ((color.rgb >>> 24) & 0xff) === 0xc2) {
+            rgbColor = color.rgb & 0x00ffffff;
         }
         const layer = this.getLayerName(entity);
         const handle = libredwg.dwg_object_entity_get_handle_object(entity);
@@ -1585,8 +1576,8 @@ export class LibreEntityConverter {
         const lineTypeScale = libredwg.dwg_object_entity_get_ltype_scale(entity);
         const isVisible = !libredwg.dwg_object_entity_get_invisible(entity);
         return {
-            handle: handle.value,
-            ownerBlockRecordSoftId: ownerhandle.absolute_ref,
+            handle: idToString(handle.value),
+            ownerBlockRecordSoftId: idToString(ownerhandle.absolute_ref),
             layer: layer,
             color: rgbColor,
             colorIndex: colorIndex,
@@ -1602,13 +1593,13 @@ export class LibreEntityConverter {
     getLayerName(entity) {
         const libredwg = this.libredwg;
         const layer = libredwg.dwg_object_entity_get_layer_object_ref(entity);
-        const name = this.layers.get(layer.handleref.value);
+        const name = this.layers.get(idToString(layer.handleref.value));
         return name ?? '0';
     }
     getLtypeName(entity) {
         const libredwg = this.libredwg;
         const ltype = libredwg.dwg_object_entity_get_ltype_object_ref(entity);
-        const name = this.ltypes.get(ltype.handleref.value);
+        const name = this.ltypes.get(idToString(ltype.handleref.value));
         return name ?? '';
     }
 }

package/lib/database/common.d.ts

@@ -1,5 +1,7 @@
 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

@@ -6,4 +6,15 @@ export const isModelSpace = (name) => {
 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;
+    }
+};
 //# sourceMappingURL=common.js.map

package/lib/database/entities/entity.d.ts

@@ -7,11 +7,11 @@ export interface DwgEntity {
     /**
      * Handle
      */
-    handle: number;
+    handle: string;
     /**
      * Soft-pointer ID/handle to owner BLOCK_RECORD object
      */
-    ownerBlockRecordSoftId: number;
+    ownerBlockRecordSoftId: string;
     /**
      * Absent or zero indicates entity is in model space. 1 indicates entity is in paper space (optional).
      */

package/lib/database/tables/table.d.ts

@@ -1,7 +1,7 @@
 export interface DwgCommonTableEntry {
     name: string;
-    handle: number;
-    ownerHandle: number;
+    handle: string;
+    ownerHandle: string;
 }
 export interface DwgTable<T extends DwgCommonTableEntry> {
     entries: T[];

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