@mlightcad/libredwg-web 0.7.3 → 0.7.5

package/lib/converter/converter.js

@@ -1,5 +1,6 @@
 import { HEADER_VARIABLES } from '../database';
-import { Dwg_Object_Type } from '../types';
+import { Dwg_Object_Supertype, Dwg_Object_Type } from '../types';
+import { dwgColorToMLeaderRawColor } from './dwgColorToMLeaderRawColor';
 import { LibreEntityConverter } from './entityConverter';
 import { idToString, isModelSpace, isPaperSpace } from './utils';
 /**
@@ -42,6 +43,7 @@ export class LibreDwgConverter {
                 DICTIONARY: [],
                 IMAGEDEF: [],
                 LAYOUT: [],
+                MLEADERSTYLE: [],
                 SPATIAL_FILTER: []
             },
             header: {},
@@ -56,7 +58,7 @@ export class LibreDwgConverter {
         for (let i = 0; i < num_objects; i++) {
             const obj = libredwg.dwg_get_object(data, i);
             if (obj) {
-                const tio = libredwg.dwg_object_to_object_tio(obj);
+                const tio = this.safeObjectTio(obj);
                 if (tio) {
                     const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
                     switch (fixedtype) {
@@ -83,7 +85,7 @@ export class LibreDwgConverter {
         for (let i = 0; i < num_objects; i++) {
             const obj = libredwg.dwg_get_object(data, i);
             if (obj) {
-                const tio = libredwg.dwg_object_to_object_tio(obj);
+                const tio = this.safeObjectTio(obj);
                 if (tio) {
                     const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
                     switch (fixedtype) {
@@ -128,6 +130,9 @@ export class LibreDwgConverter {
                         case Dwg_Object_Type.DWG_TYPE_LAYOUT:
                             db.objects.LAYOUT.push(this.convertLayout(tio, obj));
                             break;
+                        case Dwg_Object_Type.DWG_TYPE_MLEADERSTYLE:
+                            db.objects.MLEADERSTYLE.push(this.convertMLeaderStyle(tio, obj));
+                            break;
                         case Dwg_Object_Type.DWG_TYPE_SPATIAL_FILTER:
                             db.objects.SPATIAL_FILTER.push(this.convertSpatialFilter(tio, obj));
                             break;
@@ -156,6 +161,20 @@ export class LibreDwgConverter {
             unknownEntityCount: this.entityConverter.unknownEntityCount
         };
     }
+    safeObjectTio(obj) {
+        const libredwg = this.libredwg;
+        try {
+            if (libredwg.dwg_object_get_supertype(obj) !=
+                Dwg_Object_Supertype.DWG_SUPERTYPE_OBJECT) {
+                return null;
+            }
+            const tio = libredwg.dwg_object_to_object_tio(obj);
+            return tio ? tio : null;
+        }
+        catch {
+            return null;
+        }
+    }
     convertHeader(data, header) {
         const libredwg = this.libredwg;
         HEADER_VARIABLES.forEach(name => {
@@ -163,7 +182,7 @@ export class LibreDwgConverter {
             if (name == 'DIMBLK' || name == 'DIMBLK1' || name == 'DIMBLK2') {
                 var_name = var_name + '_T';
             }
-            let value = libredwg.dwg_dynapi_header_value(data, var_name).data;
+            let value = libredwg.dwg_dynapi_header_data(data, var_name);
             // Get object name if the 'value' is one Dwg_Object_Ref instance.
             // TODO: handle 'CMLSTYLE' correctly
             if (name == 'CELTYPE' ||
@@ -172,10 +191,10 @@ export class LibreDwgConverter {
                 name == 'DIMSTYLE' ||
                 name == 'DIMTXSTY' ||
                 name == 'TEXTSTYLE') {
-                value = !!value ? libredwg.dwg_ref_get_object_name(value) : '';
+                value = value ? libredwg.dwg_ref_get_object_name(value) : '';
             }
             else if (name == 'DRAGVS') {
-                value = !!value ? libredwg.dwg_ref_get_absref(value) : 2;
+                value = value ? (libredwg.dwg_ref_get_absref(value) ?? 2) : 2;
             }
             // @ts-expect-error header variable name
             header[name] = value;
@@ -201,8 +220,8 @@ export class LibreDwgConverter {
     }
     convertAppId(item) {
         const libredwg = this.libredwg;
-        const name = libredwg.dwg_dynapi_entity_value(item, 'name').data;
-        const flag = libredwg.dwg_dynapi_entity_value(item, 'flag').data;
+        const name = libredwg.dwg_dynapi_entity_data(item, 'name');
+        const flag = libredwg.dwg_dynapi_entity_data(item, 'flag');
         return {
             name: name,
             standardFlag: flag
@@ -218,21 +237,15 @@ export class LibreDwgConverter {
             commonAttrs.name = block.name;
         }
         // The number of entities
-        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;
-        const basePoint = libredwg.dwg_dynapi_entity_value(item, 'base_pt')
-            .data;
-        const insertionUnits = libredwg.dwg_dynapi_entity_value(item, 'insert_units').data;
-        const explodability = libredwg.dwg_dynapi_entity_value(item, 'explodable')
-            .data;
-        const scalability = libredwg.dwg_dynapi_entity_value(item, 'block_scaling')
-            .data;
-        const layout_ptr = libredwg.dwg_dynapi_entity_value(item, 'layout')
-            .data;
-        const layout = idToString(libredwg.dwg_ref_get_absref(layout_ptr));
+        const num_owned = libredwg.dwg_dynapi_entity_data(item, 'num_owned');
+        const flags = libredwg.dwg_dynapi_entity_data(item, 'flag');
+        const description = libredwg.dwg_dynapi_entity_data(item, 'description');
+        const basePoint = libredwg.dwg_dynapi_entity_data(item, 'base_pt');
+        const insertionUnits = libredwg.dwg_dynapi_entity_data(item, 'insert_units');
+        const explodability = libredwg.dwg_dynapi_entity_data(item, 'explodable');
+        const scalability = libredwg.dwg_dynapi_entity_data(item, 'block_scaling');
+        const layout_ptr = libredwg.dwg_dynapi_entity_data(item, 'layout');
+        const layout = (libredwg.dwg_ref_get_id(layout_ptr) ?? '');
         let bmpPreview = '';
         const uint8ArrayToHexString = (bytes) => {
             const hexChars = new Array(bytes.length);
@@ -251,8 +264,7 @@ export class LibreDwgConverter {
         let entities = this.convertEntities(obj, commonAttrs.handle);
         if (!entities || entities.length == 0) {
             entities = [];
-            const entities_ptr = libredwg.dwg_dynapi_entity_value(item, 'entities')
-                .data;
+            const entities_ptr = libredwg.dwg_dynapi_entity_data(item, 'entities');
             if (entities_ptr) {
                 const object_ref_ptr_array = libredwg.dwg_ptr_to_object_ref_ptr_array(entities_ptr, num_owned);
                 const converter = this.entityConverter;
@@ -297,165 +309,88 @@ export class LibreDwgConverter {
     convertDimStyle(item, obj) {
         const libredwg = this.libredwg;
         const commonAttrs = this.getCommonTableEntryAttrs(item, obj);
-        const DIMTOL = libredwg.dwg_dynapi_entity_value(item, 'DIMTOL')
-            .data;
-        const DIMLIM = libredwg.dwg_dynapi_entity_value(item, 'DIMLIM')
-            .data;
-        const DIMTIH = libredwg.dwg_dynapi_entity_value(item, 'DIMTIH')
-            .data;
-        const DIMTOH = libredwg.dwg_dynapi_entity_value(item, 'DIMTOH')
-            .data;
-        const DIMSE1 = libredwg.dwg_dynapi_entity_value(item, 'DIMSE1')
-            .data;
-        const DIMSE2 = libredwg.dwg_dynapi_entity_value(item, 'DIMSE2')
-            .data;
-        const DIMALT = libredwg.dwg_dynapi_entity_value(item, 'DIMALT')
-            .data;
-        const DIMTOFL = libredwg.dwg_dynapi_entity_value(item, 'DIMTOFL')
-            .data;
-        const DIMSAH = libredwg.dwg_dynapi_entity_value(item, 'DIMSAH')
-            .data;
-        const DIMTIX = libredwg.dwg_dynapi_entity_value(item, 'DIMTIX')
-            .data;
-        const DIMSOXD = libredwg.dwg_dynapi_entity_value(item, 'DIMSOXD')
-            .data;
-        const DIMALTD = libredwg.dwg_dynapi_entity_value(item, 'DIMALTD')
-            .data;
-        const DIMZIN = libredwg.dwg_dynapi_entity_value(item, 'DIMZIN')
-            .data;
-        const DIMSD1 = libredwg.dwg_dynapi_entity_value(item, 'DIMSD1')
-            .data;
-        const DIMSD2 = libredwg.dwg_dynapi_entity_value(item, 'DIMSD2')
-            .data;
-        const DIMTOLJ = libredwg.dwg_dynapi_entity_value(item, 'DIMTOLJ')
-            .data;
-        const DIMJUST = libredwg.dwg_dynapi_entity_value(item, 'DIMJUST')
-            .data;
-        const DIMFIT = libredwg.dwg_dynapi_entity_value(item, 'DIMFIT')
-            .data;
-        const DIMUPT = libredwg.dwg_dynapi_entity_value(item, 'DIMUPT')
-            .data;
-        const DIMTZIN = libredwg.dwg_dynapi_entity_value(item, 'DIMTZIN')
-            .data;
-        const DIMALTZ = libredwg.dwg_dynapi_entity_value(item, 'DIMALTZ')
-            .data;
-        const DIMALTTZ = libredwg.dwg_dynapi_entity_value(item, 'DIMALTTZ')
-            .data;
-        const DIMTAD = libredwg.dwg_dynapi_entity_value(item, 'DIMTAD')
-            .data;
-        const DIMUNIT = libredwg.dwg_dynapi_entity_value(item, 'DIMUNIT')
-            .data;
-        const DIMAUNIT = libredwg.dwg_dynapi_entity_value(item, 'DIMAUNIT')
-            .data;
-        const DIMDEC = libredwg.dwg_dynapi_entity_value(item, 'DIMDEC')
-            .data;
-        const DIMTDEC = libredwg.dwg_dynapi_entity_value(item, 'DIMTDEC')
-            .data;
-        const DIMALTU = libredwg.dwg_dynapi_entity_value(item, 'DIMALTU')
-            .data;
-        const DIMALTTD = libredwg.dwg_dynapi_entity_value(item, 'DIMALTTD')
-            .data;
-        const DIMSCALE = libredwg.dwg_dynapi_entity_value(item, 'DIMSCALE')
-            .data;
-        const DIMASZ = libredwg.dwg_dynapi_entity_value(item, 'DIMASZ')
-            .data;
-        const DIMEXO = libredwg.dwg_dynapi_entity_value(item, 'DIMEXO')
-            .data;
-        const DIMDLI = libredwg.dwg_dynapi_entity_value(item, 'DIMDLI')
-            .data;
-        const DIMEXE = libredwg.dwg_dynapi_entity_value(item, 'DIMEXE')
-            .data;
-        const DIMRND = libredwg.dwg_dynapi_entity_value(item, 'DIMRND')
-            .data;
-        const DIMDLE = libredwg.dwg_dynapi_entity_value(item, 'DIMDLE')
-            .data;
-        const DIMTP = libredwg.dwg_dynapi_entity_value(item, 'DIMTP').data;
-        const DIMTM = libredwg.dwg_dynapi_entity_value(item, 'DIMTM').data;
-        const DIMFXL = libredwg.dwg_dynapi_entity_value(item, 'DIMFXL')
-            .data;
-        const DIMJOGANG = libredwg.dwg_dynapi_entity_value(item, 'DIMJOGANG')
-            .data;
-        const DIMTFILL = libredwg.dwg_dynapi_entity_value(item, 'DIMTFILL')
-            .data;
-        const DIMTFILLCLR = libredwg.dwg_dynapi_entity_value(item, 'DIMTFILLCLR')
-            .data;
-        const DIMAZIN = libredwg.dwg_dynapi_entity_value(item, 'DIMAZIN')
-            .data;
-        const DIMARCSYM = libredwg.dwg_dynapi_entity_value(item, 'DIMARCSYM')
-            .data;
-        const DIMTXT = libredwg.dwg_dynapi_entity_value(item, 'DIMTXT')
-            .data;
-        const DIMCEN = libredwg.dwg_dynapi_entity_value(item, 'DIMCEN')
-            .data;
-        const DIMTSZ = libredwg.dwg_dynapi_entity_value(item, 'DIMTSZ')
-            .data;
-        const DIMALTF = libredwg.dwg_dynapi_entity_value(item, 'DIMALTF')
-            .data;
-        const DIMLFAC = libredwg.dwg_dynapi_entity_value(item, 'DIMLFAC')
-            .data;
-        const DIMTVP = libredwg.dwg_dynapi_entity_value(item, 'DIMTVP')
-            .data;
-        const DIMTFAC = libredwg.dwg_dynapi_entity_value(item, 'DIMTFAC')
-            .data;
-        const DIMGAP = libredwg.dwg_dynapi_entity_value(item, 'DIMGAP')
-            .data;
-        const DIMPOST = libredwg.dwg_dynapi_entity_value(item, 'DIMPOST')
-            .data;
-        const DIMAPOST = libredwg.dwg_dynapi_entity_value(item, 'DIMAPOST')
-            .data;
-        const DIMBLK_T = libredwg.dwg_dynapi_entity_value(item, 'DIMBLK_T')
-            .data;
-        const DIMBLK1_T = libredwg.dwg_dynapi_entity_value(item, 'DIMBLK1_T')
-            .data;
-        const DIMBLK2_T = libredwg.dwg_dynapi_entity_value(item, 'DIMBLK2_T')
-            .data;
-        const DIMALTRND = libredwg.dwg_dynapi_entity_value(item, 'DIMALTRND')
-            .data;
-        const DIMCLRD_N = libredwg.dwg_dynapi_entity_value(item, 'DIMCLRD_N')
-            .data;
-        const DIMCLRE_N = libredwg.dwg_dynapi_entity_value(item, 'DIMCLRE_N')
-            .data;
-        const DIMCLRT_N = libredwg.dwg_dynapi_entity_value(item, 'DIMCLRT_N')
-            .data;
-        const DIMCLRD = libredwg.dwg_dynapi_entity_value(item, 'DIMCLRD')
-            .data;
-        const DIMCLRE = libredwg.dwg_dynapi_entity_value(item, 'DIMCLRE')
-            .data;
-        const DIMCLRT = libredwg.dwg_dynapi_entity_value(item, 'DIMCLRT')
-            .data;
-        const DIMADEC = libredwg.dwg_dynapi_entity_value(item, 'DIMADEC')
-            .data;
-        const DIMFRAC = libredwg.dwg_dynapi_entity_value(item, 'DIMFRAC')
-            .data;
-        const DIMLUNIT = libredwg.dwg_dynapi_entity_value(item, 'DIMLUNIT')
-            .data;
-        const DIMDSEP = libredwg.dwg_dynapi_entity_value(item, 'DIMDSEP')
-            .data;
-        const DIMTMOVE = libredwg.dwg_dynapi_entity_value(item, 'DIMTMOVE')
-            .data;
-        const DIMATFIT = libredwg.dwg_dynapi_entity_value(item, 'DIMATFIT')
-            .data;
-        const DIMFXLON = libredwg.dwg_dynapi_entity_value(item, 'DIMFXLON')
-            .data;
-        const DIMTXTDIRECTION = libredwg.dwg_dynapi_entity_value(item, 'DIMTXTDIRECTION').data;
-        const DIMALTMZF = libredwg.dwg_dynapi_entity_value(item, 'DIMALTMZF')
-            .data;
-        const DIMALTMZS = libredwg.dwg_dynapi_entity_value(item, 'DIMALTMZS')
-            .data;
-        const DIMMZF = libredwg.dwg_dynapi_entity_value(item, 'DIMMZF')
-            .data;
-        const DIMMZS = libredwg.dwg_dynapi_entity_value(item, 'DIMMZS')
-            .data;
-        const DIMLWD = libredwg.dwg_dynapi_entity_value(item, 'DIMLWD')
-            .data;
-        const DIMLWE = libredwg.dwg_dynapi_entity_value(item, 'DIMLWE')
-            .data;
-        const DIMTXSTY_Ptr = libredwg.dwg_dynapi_entity_value(item, 'DIMTXSTY')
-            .data;
-        const DIMTXSTY = libredwg.dwg_ref_get_absref(DIMTXSTY_Ptr);
-        const DIMLDRBLK_Ptr = libredwg.dwg_dynapi_entity_value(item, 'DIMLDRBLK')
-            .data;
-        const DIMLDRBLK = libredwg.dwg_ref_get_absref(DIMLDRBLK_Ptr);
+        const DIMTOL = libredwg.dwg_dynapi_entity_data(item, 'DIMTOL');
+        const DIMLIM = libredwg.dwg_dynapi_entity_data(item, 'DIMLIM');
+        const DIMTIH = libredwg.dwg_dynapi_entity_data(item, 'DIMTIH');
+        const DIMTOH = libredwg.dwg_dynapi_entity_data(item, 'DIMTOH');
+        const DIMSE1 = libredwg.dwg_dynapi_entity_data(item, 'DIMSE1');
+        const DIMSE2 = libredwg.dwg_dynapi_entity_data(item, 'DIMSE2');
+        const DIMALT = libredwg.dwg_dynapi_entity_data(item, 'DIMALT');
+        const DIMTOFL = libredwg.dwg_dynapi_entity_data(item, 'DIMTOFL');
+        const DIMSAH = libredwg.dwg_dynapi_entity_data(item, 'DIMSAH');
+        const DIMTIX = libredwg.dwg_dynapi_entity_data(item, 'DIMTIX');
+        const DIMSOXD = libredwg.dwg_dynapi_entity_data(item, 'DIMSOXD');
+        const DIMALTD = libredwg.dwg_dynapi_entity_data(item, 'DIMALTD');
+        const DIMZIN = libredwg.dwg_dynapi_entity_data(item, 'DIMZIN');
+        const DIMSD1 = libredwg.dwg_dynapi_entity_data(item, 'DIMSD1');
+        const DIMSD2 = libredwg.dwg_dynapi_entity_data(item, 'DIMSD2');
+        const DIMTOLJ = libredwg.dwg_dynapi_entity_data(item, 'DIMTOLJ');
+        const DIMJUST = libredwg.dwg_dynapi_entity_data(item, 'DIMJUST');
+        const DIMFIT = libredwg.dwg_dynapi_entity_data(item, 'DIMFIT');
+        const DIMUPT = libredwg.dwg_dynapi_entity_data(item, 'DIMUPT');
+        const DIMTZIN = libredwg.dwg_dynapi_entity_data(item, 'DIMTZIN');
+        const DIMALTZ = libredwg.dwg_dynapi_entity_data(item, 'DIMALTZ');
+        const DIMALTTZ = libredwg.dwg_dynapi_entity_data(item, 'DIMALTTZ');
+        const DIMTAD = libredwg.dwg_dynapi_entity_data(item, 'DIMTAD');
+        const DIMUNIT = libredwg.dwg_dynapi_entity_data(item, 'DIMUNIT');
+        const DIMAUNIT = libredwg.dwg_dynapi_entity_data(item, 'DIMAUNIT');
+        const DIMDEC = libredwg.dwg_dynapi_entity_data(item, 'DIMDEC');
+        const DIMTDEC = libredwg.dwg_dynapi_entity_data(item, 'DIMTDEC');
+        const DIMALTU = libredwg.dwg_dynapi_entity_data(item, 'DIMALTU');
+        const DIMALTTD = libredwg.dwg_dynapi_entity_data(item, 'DIMALTTD');
+        const DIMSCALE = libredwg.dwg_dynapi_entity_data(item, 'DIMSCALE');
+        const DIMASZ = libredwg.dwg_dynapi_entity_data(item, 'DIMASZ');
+        const DIMEXO = libredwg.dwg_dynapi_entity_data(item, 'DIMEXO');
+        const DIMDLI = libredwg.dwg_dynapi_entity_data(item, 'DIMDLI');
+        const DIMEXE = libredwg.dwg_dynapi_entity_data(item, 'DIMEXE');
+        const DIMRND = libredwg.dwg_dynapi_entity_data(item, 'DIMRND');
+        const DIMDLE = libredwg.dwg_dynapi_entity_data(item, 'DIMDLE');
+        const DIMTP = libredwg.dwg_dynapi_entity_data(item, 'DIMTP');
+        const DIMTM = libredwg.dwg_dynapi_entity_data(item, 'DIMTM');
+        const DIMFXL = libredwg.dwg_dynapi_entity_data(item, 'DIMFXL');
+        const DIMJOGANG = libredwg.dwg_dynapi_entity_data(item, 'DIMJOGANG');
+        const DIMTFILL = libredwg.dwg_dynapi_entity_data(item, 'DIMTFILL');
+        const DIMTFILLCLR = libredwg.dwg_dynapi_entity_data(item, 'DIMTFILLCLR');
+        const DIMAZIN = libredwg.dwg_dynapi_entity_data(item, 'DIMAZIN');
+        const DIMARCSYM = libredwg.dwg_dynapi_entity_data(item, 'DIMARCSYM');
+        const DIMTXT = libredwg.dwg_dynapi_entity_data(item, 'DIMTXT');
+        const DIMCEN = libredwg.dwg_dynapi_entity_data(item, 'DIMCEN');
+        const DIMTSZ = libredwg.dwg_dynapi_entity_data(item, 'DIMTSZ');
+        const DIMALTF = libredwg.dwg_dynapi_entity_data(item, 'DIMALTF');
+        const DIMLFAC = libredwg.dwg_dynapi_entity_data(item, 'DIMLFAC');
+        const DIMTVP = libredwg.dwg_dynapi_entity_data(item, 'DIMTVP');
+        const DIMTFAC = libredwg.dwg_dynapi_entity_data(item, 'DIMTFAC');
+        const DIMGAP = libredwg.dwg_dynapi_entity_data(item, 'DIMGAP');
+        const DIMPOST = libredwg.dwg_dynapi_entity_data(item, 'DIMPOST');
+        const DIMAPOST = libredwg.dwg_dynapi_entity_data(item, 'DIMAPOST');
+        const DIMBLK_T = libredwg.dwg_dynapi_entity_data(item, 'DIMBLK_T');
+        const DIMBLK1_T = libredwg.dwg_dynapi_entity_data(item, 'DIMBLK1_T');
+        const DIMBLK2_T = libredwg.dwg_dynapi_entity_data(item, 'DIMBLK2_T');
+        const DIMALTRND = libredwg.dwg_dynapi_entity_data(item, 'DIMALTRND');
+        const DIMCLRD_N = libredwg.dwg_dynapi_entity_data(item, 'DIMCLRD_N');
+        const DIMCLRE_N = libredwg.dwg_dynapi_entity_data(item, 'DIMCLRE_N');
+        const DIMCLRT_N = libredwg.dwg_dynapi_entity_data(item, 'DIMCLRT_N');
+        const DIMCLRD = libredwg.dwg_dynapi_entity_data(item, 'DIMCLRD');
+        const DIMCLRE = libredwg.dwg_dynapi_entity_data(item, 'DIMCLRE');
+        const DIMCLRT = libredwg.dwg_dynapi_entity_data(item, 'DIMCLRT');
+        const DIMADEC = libredwg.dwg_dynapi_entity_data(item, 'DIMADEC');
+        const DIMFRAC = libredwg.dwg_dynapi_entity_data(item, 'DIMFRAC');
+        const DIMLUNIT = libredwg.dwg_dynapi_entity_data(item, 'DIMLUNIT');
+        const DIMDSEP = libredwg.dwg_dynapi_entity_data(item, 'DIMDSEP');
+        const DIMTMOVE = libredwg.dwg_dynapi_entity_data(item, 'DIMTMOVE');
+        const DIMATFIT = libredwg.dwg_dynapi_entity_data(item, 'DIMATFIT');
+        const DIMFXLON = libredwg.dwg_dynapi_entity_data(item, 'DIMFXLON');
+        const DIMTXTDIRECTION = libredwg.dwg_dynapi_entity_data(item, 'DIMTXTDIRECTION');
+        const DIMALTMZF = libredwg.dwg_dynapi_entity_data(item, 'DIMALTMZF');
+        const DIMALTMZS = libredwg.dwg_dynapi_entity_data(item, 'DIMALTMZS');
+        const DIMMZF = libredwg.dwg_dynapi_entity_data(item, 'DIMMZF');
+        const DIMMZS = libredwg.dwg_dynapi_entity_data(item, 'DIMMZS');
+        const DIMLWD = libredwg.dwg_dynapi_entity_data(item, 'DIMLWD');
+        const DIMLWE = libredwg.dwg_dynapi_entity_data(item, 'DIMLWE');
+        const DIMTXSTY_Ptr = libredwg.dwg_dynapi_entity_data(item, 'DIMTXSTY');
+        const DIMTXSTY = libredwg.dwg_ref_get_absref(DIMTXSTY_Ptr) ?? undefined;
+        const DIMLDRBLK_Ptr = libredwg.dwg_dynapi_entity_data(item, 'DIMLDRBLK');
+        const DIMLDRBLK = libredwg.dwg_ref_get_absref(DIMLDRBLK_Ptr) ?? undefined;
         return {
             ...commonAttrs,
             DIMPOST: DIMPOST,
@@ -543,22 +478,15 @@ export class LibreDwgConverter {
     convertLayer(item, obj) {
         const libredwg = this.libredwg;
         const commonAttrs = this.getCommonTableEntryAttrs(item, obj);
-        const flag = libredwg.dwg_dynapi_entity_value(item, 'flag').data;
-        const frozen = libredwg.dwg_dynapi_entity_value(item, 'frozen')
-            .data;
-        const off = libredwg.dwg_dynapi_entity_value(item, 'off').data;
-        const frozenInNew = libredwg.dwg_dynapi_entity_value(item, 'frozen_in_new')
-            .data;
-        const locked = libredwg.dwg_dynapi_entity_value(item, 'plotflockedlag')
-            .data;
-        const plotFlag = libredwg.dwg_dynapi_entity_value(item, 'plotflag')
-            .data;
-        const linewt = libredwg.dwg_dynapi_entity_value(item, 'linewt')
-            .data;
-        const color = libredwg.dwg_dynapi_entity_value(item, 'color')
-            .data;
-        const ltypeRef = libredwg.dwg_dynapi_entity_value(item, 'ltype')
-            .data;
+        const flag = libredwg.dwg_dynapi_entity_data(item, 'flag');
+        const frozen = libredwg.dwg_dynapi_entity_data(item, 'frozen');
+        const off = libredwg.dwg_dynapi_entity_data(item, 'off');
+        const frozenInNew = libredwg.dwg_dynapi_entity_data(item, 'frozen_in_new');
+        const locked = libredwg.dwg_dynapi_entity_data(item, 'plotflockedlag');
+        const plotFlag = libredwg.dwg_dynapi_entity_data(item, 'plotflag');
+        const linewt = libredwg.dwg_dynapi_entity_data(item, 'linewt');
+        const color = libredwg.dwg_dynapi_entity_data(item, 'color');
+        const ltypeRef = libredwg.dwg_dynapi_entity_data(item, 'ltype');
         let ltypeName = 'Continuous';
         if (ltypeRef) {
             try {
@@ -609,15 +537,11 @@ export class LibreDwgConverter {
     convertLineType(item, obj) {
         const libredwg = this.libredwg;
         const commonAttrs = this.getCommonTableEntryAttrs(item, obj);
-        const flag = libredwg.dwg_dynapi_entity_value(item, 'flag').data;
-        const description = libredwg.dwg_dynapi_entity_value(item, 'description')
-            .data;
-        const numDashes = libredwg.dwg_dynapi_entity_value(item, 'numdashes')
-            .data;
-        const patternLen = libredwg.dwg_dynapi_entity_value(item, 'pattern_len')
-            .data;
-        const dashes = libredwg.dwg_dynapi_entity_value(item, 'dashes')
-            .data;
+        const flag = libredwg.dwg_dynapi_entity_data(item, 'flag');
+        const description = libredwg.dwg_dynapi_entity_data(item, 'description');
+        const numDashes = libredwg.dwg_dynapi_entity_data(item, 'numdashes');
+        const patternLen = libredwg.dwg_dynapi_entity_data(item, 'pattern_len');
+        const dashes = libredwg.dwg_dynapi_entity_data(item, 'dashes');
         const dashArray = dashes
             ? libredwg.dwg_ptr_to_ltype_dash_array(dashes, numDashes)
             : [];
@@ -651,19 +575,13 @@ export class LibreDwgConverter {
     convertStyle(item, obj) {
         const libredwg = this.libredwg;
         const commonAttrs = this.getCommonTableEntryAttrs(item, obj);
-        const standardFlag = libredwg.dwg_dynapi_entity_value(item, 'flag')
-            .data;
-        const widthFactor = libredwg.dwg_dynapi_entity_value(item, 'width_factor')
-            .data;
-        const obliqueAngle = libredwg.dwg_dynapi_entity_value(item, 'oblique_angle')
-            .data;
-        const textGenerationFlag = libredwg.dwg_dynapi_entity_value(item, 'generation').data;
-        const lastHeight = libredwg.dwg_dynapi_entity_value(item, 'last_height')
-            .data;
-        const font = libredwg.dwg_dynapi_entity_value(item, 'font_file')
-            .data;
-        const bigFont = libredwg.dwg_dynapi_entity_value(item, 'bigfont_file')
-            .data;
+        const standardFlag = libredwg.dwg_dynapi_entity_data(item, 'flag');
+        const widthFactor = libredwg.dwg_dynapi_entity_data(item, 'width_factor');
+        const obliqueAngle = libredwg.dwg_dynapi_entity_data(item, 'oblique_angle');
+        const textGenerationFlag = libredwg.dwg_dynapi_entity_data(item, 'generation');
+        const lastHeight = libredwg.dwg_dynapi_entity_data(item, 'last_height');
+        const font = libredwg.dwg_dynapi_entity_data(item, 'font_file');
+        const bigFont = libredwg.dwg_dynapi_entity_data(item, 'bigfont_file');
         return {
             ...commonAttrs,
             standardFlag: standardFlag,
@@ -679,73 +597,47 @@ export class LibreDwgConverter {
     convertViewport(item, obj) {
         const libredwg = this.libredwg;
         const commonAttrs = this.getCommonTableEntryAttrs(item, obj);
-        const standardFlag = libredwg.dwg_dynapi_entity_value(item, 'flag')
-            .data;
-        const viewHeight = libredwg.dwg_dynapi_entity_value(item, 'VIEWSIZE')
-            .data;
-        const aspectRatio = libredwg.dwg_dynapi_entity_value(item, 'aspect_ratio')
-            .data;
-        const center = libredwg.dwg_dynapi_entity_value(item, 'VIEWCTR')
-            .data;
-        const viewTarget = libredwg.dwg_dynapi_entity_value(item, 'view_target')
-            .data;
-        const viewDirectionFromTarget = libredwg.dwg_dynapi_entity_value(item, 'VIEWDIR').data;
-        const viewTwistAngle = libredwg.dwg_dynapi_entity_value(item, 'view_twist')
-            .data;
-        const lensLength = libredwg.dwg_dynapi_entity_value(item, 'lens_length')
-            .data;
-        const frontClippingPlane = libredwg.dwg_dynapi_entity_value(item, 'front_clip_z').data;
-        const backClippingPlane = libredwg.dwg_dynapi_entity_value(item, 'back_clip_z').data;
-        const viewMode = libredwg.dwg_dynapi_entity_value(item, 'VIEWMODE')
-            .data;
-        const renderMode = libredwg.dwg_dynapi_entity_value(item, 'render_mode')
-            .data;
-        const isDefaultLightingOn = libredwg.dwg_dynapi_entity_value(item, 'use_default_lights')
-            .data != 0;
-        const defaultLightningType = libredwg.dwg_dynapi_entity_value(item, 'default_lightning_type').data;
-        const brightness = libredwg.dwg_dynapi_entity_value(item, 'brightness')
-            .data;
-        const contrast = libredwg.dwg_dynapi_entity_value(item, 'contrast')
-            .data;
-        const ambient_color = libredwg.dwg_dynapi_entity_value(item, 'ambient_color').data;
+        const standardFlag = libredwg.dwg_dynapi_entity_data(item, 'flag');
+        const viewHeight = libredwg.dwg_dynapi_entity_data(item, 'VIEWSIZE');
+        const aspectRatio = libredwg.dwg_dynapi_entity_data(item, 'aspect_ratio');
+        const center = libredwg.dwg_dynapi_entity_data(item, 'VIEWCTR');
+        const viewTarget = libredwg.dwg_dynapi_entity_data(item, 'view_target');
+        const viewDirectionFromTarget = libredwg.dwg_dynapi_entity_data(item, 'VIEWDIR');
+        const viewTwistAngle = libredwg.dwg_dynapi_entity_data(item, 'view_twist');
+        const lensLength = libredwg.dwg_dynapi_entity_data(item, 'lens_length');
+        const frontClippingPlane = libredwg.dwg_dynapi_entity_data(item, 'front_clip_z');
+        const backClippingPlane = libredwg.dwg_dynapi_entity_data(item, 'back_clip_z');
+        const viewMode = libredwg.dwg_dynapi_entity_data(item, 'VIEWMODE');
+        const renderMode = libredwg.dwg_dynapi_entity_data(item, 'render_mode');
+        const isDefaultLightingOn = libredwg.dwg_dynapi_entity_data(item, 'use_default_lights') != 0;
+        const defaultLightningType = libredwg.dwg_dynapi_entity_data(item, 'default_lightning_type');
+        const brightness = libredwg.dwg_dynapi_entity_data(item, 'brightness');
+        const contrast = libredwg.dwg_dynapi_entity_data(item, 'contrast');
+        const ambient_color = libredwg.dwg_dynapi_entity_data(item, 'ambient_color');
         // ViewportTableRecord
-        const lowerLeftCorner = libredwg.dwg_dynapi_entity_value(item, 'lower_left')
-            .data;
-        const upperRightCorner = libredwg.dwg_dynapi_entity_value(item, 'upper_right').data;
+        const lowerLeftCorner = libredwg.dwg_dynapi_entity_data(item, 'lower_left');
+        const upperRightCorner = libredwg.dwg_dynapi_entity_data(item, 'upper_right');
         // TODO: Not sure whether 'circleSides' is equal to 'circle_zoom'
-        const circleSides = libredwg.dwg_dynapi_entity_value(item, 'circle_zoom')
-            .data;
-        const ucsIconSetting = libredwg.dwg_dynapi_entity_value(item, 'UCSICON')
-            .data;
+        const circleSides = libredwg.dwg_dynapi_entity_data(item, 'circle_zoom');
+        const ucsIconSetting = libredwg.dwg_dynapi_entity_data(item, 'UCSICON');
         // TODO: Not sure whether 'gridSpacing' is equal to 'GRIDUNIT'
-        const gridSpacing = libredwg.dwg_dynapi_entity_value(item, 'GRIDUNIT')
-            .data;
-        const snapRotationAngle = libredwg.dwg_dynapi_entity_value(item, 'SNAPANG')
-            .data;
-        const snapBasePoint = libredwg.dwg_dynapi_entity_value(item, 'SNAPBASE')
-            .data;
+        const gridSpacing = libredwg.dwg_dynapi_entity_data(item, 'GRIDUNIT');
+        const snapRotationAngle = libredwg.dwg_dynapi_entity_data(item, 'SNAPANG');
+        const snapBasePoint = libredwg.dwg_dynapi_entity_data(item, 'SNAPBASE');
         // TODO: Not sure whether 'snapSpacing' is equal to 'SNAPUNIT'
-        const snapSpacing = libredwg.dwg_dynapi_entity_value(item, 'SNAPUNIT')
-            .data;
-        const ucsOrigin = libredwg.dwg_dynapi_entity_value(item, 'ucsorg')
-            .data;
-        const ucsXAxis = libredwg.dwg_dynapi_entity_value(item, 'ucsxdir')
-            .data;
-        const ucsYAxis = libredwg.dwg_dynapi_entity_value(item, 'ucsydir')
-            .data;
-        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 snapSpacing = libredwg.dwg_dynapi_entity_data(item, 'SNAPUNIT');
+        const ucsOrigin = libredwg.dwg_dynapi_entity_data(item, 'ucsorg');
+        const ucsXAxis = libredwg.dwg_dynapi_entity_data(item, 'ucsxdir');
+        const ucsYAxis = libredwg.dwg_dynapi_entity_data(item, 'ucsydir');
+        const elevation = libredwg.dwg_dynapi_entity_data(item, 'ucs_elevation');
+        const majorGridLines = libredwg.dwg_dynapi_entity_data(item, 'grid_major');
+        const background = libredwg.dwg_dynapi_entity_data(item, 'background');
         const backgroundObjectId = background
-            ? idToString(libredwg.dwg_ref_get_absref(background))
+            ? (libredwg.dwg_ref_get_id(background) ?? '')
             : undefined;
-        const visualstyle = libredwg.dwg_dynapi_entity_value(item, 'visualstyle')
-            .data;
+        const visualstyle = libredwg.dwg_dynapi_entity_data(item, 'visualstyle');
         const visualStyleObjectId = visualstyle
-            ? idToString(libredwg.dwg_ref_get_absref(visualstyle))
+            ? (libredwg.dwg_ref_get_id(visualstyle) ?? '')
             : undefined;
         // BITCODE_B UCSFOLLOW;
         // BITCODE_B FASTZOOM;
@@ -810,19 +702,16 @@ export class LibreDwgConverter {
         return {
             handle: idToString(handle.value),
             ownerHandle: idToString(ownerhandle.absolute_ref),
-            name: libredwg.dwg_dynapi_entity_value(tio, 'name').data
+            name: libredwg.dwg_dynapi_entity_data(tio, 'name')
         };
     }
     convertDictionary(item, obj) {
         const libredwg = this.libredwg;
         const commonAttrs = this.getCommonObjectAttrs(obj);
-        const isHardOwner = libredwg.dwg_dynapi_entity_value(item, 'is_hardowner')
-            .data;
-        const cloningFlag = libredwg.dwg_dynapi_entity_value(item, 'cloning')
-            .data;
-        const numitems = libredwg.dwg_dynapi_entity_value(item, 'numitems')
-            .data;
-        const itemhandles_ptr = libredwg.dwg_dynapi_entity_value(item, 'itemhandles').data;
+        const isHardOwner = libredwg.dwg_dynapi_entity_data(item, 'is_hardowner');
+        const cloningFlag = libredwg.dwg_dynapi_entity_data(item, 'cloning');
+        const numitems = libredwg.dwg_dynapi_entity_data(item, 'numitems');
+        const itemhandles_ptr = libredwg.dwg_dynapi_entity_data(item, 'itemhandles');
         const itemhandles = libredwg.dwg_ptr_to_object_ref_array(itemhandles_ptr, numitems);
         const texts = libredwg.dwg_object_dictionary_get_texts(obj);
         const entries = {};
@@ -837,17 +726,12 @@ export class LibreDwgConverter {
     convertImageDef(item, obj) {
         const libredwg = this.libredwg;
         const commonAttrs = this.getCommonObjectAttrs(obj);
-        // const classVersion = libredwg.dwg_dynapi_entity_value(item, 'class_version').data as number
-        const size = libredwg.dwg_dynapi_entity_value(item, 'image_size')
-            .data;
-        const fileName = libredwg.dwg_dynapi_entity_value(item, 'file_path')
-            .data;
-        const isLoaded = libredwg.dwg_dynapi_entity_value(item, 'is_loaded')
-            .data;
-        const sizeOfOnePixel = libredwg.dwg_dynapi_entity_value(item, 'pixel_size')
-            .data;
-        const resolutionUnits = libredwg.dwg_dynapi_entity_value(item, 'resunits')
-            .data;
+        // const classVersion = libredwg.dwg_dynapi_entity_data<number>(item, 'class_version')
+        const size = libredwg.dwg_dynapi_entity_data(item, 'image_size');
+        const fileName = libredwg.dwg_dynapi_entity_data(item, 'file_path');
+        const isLoaded = libredwg.dwg_dynapi_entity_data(item, 'is_loaded');
+        const sizeOfOnePixel = libredwg.dwg_dynapi_entity_data(item, 'pixel_size');
+        const resolutionUnits = libredwg.dwg_dynapi_entity_data(item, 'resunits');
         return {
             ...commonAttrs,
             fileName: fileName,
@@ -861,39 +745,26 @@ export class LibreDwgConverter {
         const libredwg = this.libredwg;
         const commonAttrs = this.getCommonObjectAttrs(obj);
         // AcDbLayout
-        const layoutName = libredwg.dwg_dynapi_entity_value(item, 'layout_name')
-            .data;
-        const tabOrder = libredwg.dwg_dynapi_entity_value(item, 'tab_order')
-            .data;
-        const controlFlag = libredwg.dwg_dynapi_entity_value(item, 'layout_flags')
-            .data;
-        const insertionPoint = libredwg.dwg_dynapi_entity_value(item, 'INSBASE')
-            .data;
-        const minLimit = libredwg.dwg_dynapi_entity_value(item, 'LIMMIN')
-            .data;
-        const maxLimit = libredwg.dwg_dynapi_entity_value(item, 'LIMMAX')
-            .data;
-        const ucsOrigin = libredwg.dwg_dynapi_entity_value(item, 'UCSORG')
-            .data;
-        const ucsXAxis = libredwg.dwg_dynapi_entity_value(item, 'UCSXDIR')
-            .data;
-        const ucsYAxis = libredwg.dwg_dynapi_entity_value(item, 'UCSYDIR')
-            .data;
-        const orthographicType = libredwg.dwg_dynapi_entity_value(item, 'UCSORTHOVIEW').data;
-        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 = !!named_ucs_ref
-            ? idToString(libredwg.dwg_ref_get_absref(named_ucs_ref))
+        const layoutName = libredwg.dwg_dynapi_entity_data(item, 'layout_name');
+        const tabOrder = libredwg.dwg_dynapi_entity_data(item, 'tab_order');
+        const controlFlag = libredwg.dwg_dynapi_entity_data(item, 'layout_flags');
+        const insertionPoint = libredwg.dwg_dynapi_entity_data(item, 'INSBASE');
+        const minLimit = libredwg.dwg_dynapi_entity_data(item, 'LIMMIN');
+        const maxLimit = libredwg.dwg_dynapi_entity_data(item, 'LIMMAX');
+        const ucsOrigin = libredwg.dwg_dynapi_entity_data(item, 'UCSORG');
+        const ucsXAxis = libredwg.dwg_dynapi_entity_data(item, 'UCSXDIR');
+        const ucsYAxis = libredwg.dwg_dynapi_entity_data(item, 'UCSYDIR');
+        const orthographicType = libredwg.dwg_dynapi_entity_data(item, 'UCSORTHOVIEW');
+        const minExtent = libredwg.dwg_dynapi_entity_data(item, 'EXTMIN');
+        const maxExtent = libredwg.dwg_dynapi_entity_data(item, 'EXTMAX');
+        const elevation = libredwg.dwg_dynapi_entity_data(item, 'ucs_elevation');
+        const block_header_ref = libredwg.dwg_dynapi_entity_data(item, 'block_header');
+        const paperSpaceTableId = (libredwg.dwg_ref_get_id(block_header_ref) ?? '');
+        const active_viewport_ref = libredwg.dwg_dynapi_entity_data(item, 'active_viewport');
+        const viewportId = (libredwg.dwg_ref_get_id(active_viewport_ref) ?? '');
+        const named_ucs_ref = libredwg.dwg_dynapi_entity_data(item, 'named_ucs');
+        const namedUcsId = named_ucs_ref
+            ? (libredwg.dwg_ref_get_id(named_ucs_ref) ?? '')
             : undefined;
         // BITCODE_H base_ucs;
         // BITCODE_BL num_viewports; // r2004+
@@ -920,25 +791,78 @@ export class LibreDwgConverter {
             shadePlotId: '' // TODO: Set the correct value
         };
     }
+    convertMLeaderStyle(item, obj) {
+        const libredwg = this.libredwg;
+        const commonAttrs = this.getCommonObjectAttrs(obj);
+        const objectVal = (field) => libredwg.dwg_dynapi_entity_data(item, field);
+        const refToId = (ref) => libredwg.dwg_ref_get_id(ref);
+        const asBool = (value) => value > 0;
+        const mleaderColor = (color) => color != null ? dwgColorToMLeaderRawColor(color) : undefined;
+        return {
+            ...commonAttrs,
+            subclassMarker: 'AcDbMLeaderStyle',
+            unknown1: objectVal('class_version'),
+            contentType: objectVal('content_type'),
+            drawMLeaderOrderType: objectVal('mleader_order'),
+            drawLeaderOrderType: objectVal('leader_order'),
+            maxLeaderSegmentPoints: objectVal('max_points'),
+            firstSegmentAngleConstraint: objectVal('first_seg_angle'),
+            secondSegmentAngleConstraint: objectVal('second_seg_angle'),
+            leaderLineType: objectVal('type'),
+            leaderLineColor: mleaderColor(objectVal('line_color')),
+            leaderLineTypeId: refToId(objectVal('line_type')),
+            leaderLineWeight: objectVal('linewt'),
+            landingEnabled: asBool(objectVal('has_landing')),
+            landingGap: objectVal('landing_gap'),
+            doglegEnabled: asBool(objectVal('has_dogleg')),
+            doglegLength: objectVal('landing_dist'),
+            description: objectVal('description'),
+            arrowheadId: refToId(objectVal('arrow_head')),
+            arrowheadSize: objectVal('arrow_head_size'),
+            defaultMTextContents: objectVal('text_default'),
+            textStyleId: refToId(objectVal('text_style')),
+            textLeftAttachmentType: objectVal('attach_left'),
+            textAngleType: objectVal('text_angle_type'),
+            textAlignmentType: objectVal('text_align_type'),
+            textRightAttachmentType: objectVal('attach_right'),
+            textColor: mleaderColor(objectVal('text_color')),
+            textHeight: objectVal('text_height'),
+            textFrameEnabled: asBool(objectVal('has_text_frame')),
+            textAlignAlwaysLeft: asBool(objectVal('text_always_left')),
+            alignSpace: objectVal('align_space'),
+            blockContentId: refToId(objectVal('block')),
+            blockContentColor: mleaderColor(objectVal('block_color')),
+            blockContentScale: objectVal('block_scale'),
+            blockContentScaleEnabled: asBool(objectVal('use_block_scale')),
+            blockContentRotation: objectVal('block_rotation'),
+            blockContentRotationEnabled: asBool(objectVal('use_block_rotation')),
+            blockContentConnectionType: objectVal('block_connection'),
+            scale: objectVal('scale'),
+            overwritePropertyValue: asBool(objectVal('is_changed')),
+            annotative: asBool(objectVal('is_annotative')),
+            breakGapSize: objectVal('break_size'),
+            textAttachmentDirection: objectVal('attach_dir'),
+            bottomTextAttachmentDirection: objectVal('attach_bottom'),
+            topTextAttachmentDirection: objectVal('attach_top'),
+            unknown2: asBool(objectVal('text_extended'))
+        };
+    }
     convertSpatialFilter(item, obj) {
         const libredwg = this.libredwg;
         const commonAttrs = this.getCommonObjectAttrs(obj);
-        const origin = libredwg.dwg_dynapi_entity_value(item, 'origin')
-            .data;
-        const numberOfPointsOnClipBoundary = libredwg.dwg_dynapi_entity_value(item, 'num_clip_verts').data;
-        const clip_verts_ptr = libredwg.dwg_dynapi_entity_value(item, 'clip_verts')
-            .data;
+        const origin = libredwg.dwg_dynapi_entity_data(item, 'origin');
+        const numberOfPointsOnClipBoundary = libredwg.dwg_dynapi_entity_data(item, 'num_clip_verts');
+        const clip_verts_ptr = libredwg.dwg_dynapi_entity_data(item, 'clip_verts');
         const vertices = libredwg.dwg_ptr_to_point2d_array(clip_verts_ptr, numberOfPointsOnClipBoundary);
-        const extrusionDirection = libredwg.dwg_dynapi_entity_value(item, 'extrusion').data;
-        const clipBoundaryVisible = libredwg.dwg_dynapi_entity_value(item, 'display_boundary_on').data;
-        const frontClippingPlaneFlag = libredwg.dwg_dynapi_entity_value(item, 'front_clip_on').data;
-        const frontClippingPlaneDistance = libredwg.dwg_dynapi_entity_value(item, 'front_clip_z').data;
-        const backClippingPlaneFlag = libredwg.dwg_dynapi_entity_value(item, 'back_clip_on').data;
-        const backClippingPlaneDistance = libredwg.dwg_dynapi_entity_value(item, 'back_clip_z').data;
-        const transform_ptr = libredwg.dwg_dynapi_entity_value(item, 'transform')
-            .data;
+        const extrusionDirection = libredwg.dwg_dynapi_entity_data(item, 'extrusion');
+        const clipBoundaryVisible = libredwg.dwg_dynapi_entity_data(item, 'display_boundary_on');
+        const frontClippingPlaneFlag = libredwg.dwg_dynapi_entity_data(item, 'front_clip_on');
+        const frontClippingPlaneDistance = libredwg.dwg_dynapi_entity_data(item, 'front_clip_z');
+        const backClippingPlaneFlag = libredwg.dwg_dynapi_entity_data(item, 'back_clip_on');
+        const backClippingPlaneDistance = libredwg.dwg_dynapi_entity_data(item, 'back_clip_z');
+        const transform_ptr = libredwg.dwg_dynapi_entity_data(item, 'transform');
         const matrix = libredwg.dwg_ptr_to_double_array(transform_ptr, 12);
-        const inverse_transform_ptr = libredwg.dwg_dynapi_entity_value(item, 'inverse_transform').data;
+        const inverse_transform_ptr = libredwg.dwg_dynapi_entity_data(item, 'inverse_transform');
         const invertBlockMatrix = libredwg.dwg_ptr_to_double_array(inverse_transform_ptr, 12);
         return {
             ...commonAttrs,