@mlightcad/libredwg-web 0.6.1 → 0.6.2

package/dist/libredwg-web.js

@@ -5834,12 +5834,12 @@ class LibreEntityConverter {
       countBoundaryPoints
     );
     const imagedef_ref = libredwg.dwg_dynapi_entity_value(entity, "imagedef").data;
-    const imageDefHandle = libredwg.dwg_ref_get_absref(imagedef_ref);
+    const imageDefHandle = idToString(libredwg.dwg_ref_get_absref(imagedef_ref));
     const imagedefreactor_ref = libredwg.dwg_dynapi_entity_value(
       entity,
       "imagedefreactor"
     ).data;
-    const imageDefReactorHandle = libredwg.dwg_ref_get_absref(imagedefreactor_ref);
+    const imageDefReactorHandle = idToString(libredwg.dwg_ref_get_absref(imagedefreactor_ref));
     return {
       type: "IMAGE",
       ...commonAttrs,
@@ -6530,6 +6530,20 @@ class LibreEntityConverter {
       col_widths_ptr,
       columnCount
     );
+    const table_style_ref = libredwg.dwg_dynapi_entity_value(
+      entity,
+      "tablestyle"
+    ).data;
+    const tableStyleId = idToString(
+      libredwg.dwg_ref_get_absref(table_style_ref)
+    );
+    const block_header_ref = libredwg.dwg_dynapi_entity_value(
+      entity,
+      "block_header"
+    ).data;
+    const blockRecordHandle = idToString(
+      libredwg.dwg_ref_get_absref(block_header_ref)
+    );
     const overrideFlag = libredwg.dwg_dynapi_entity_value(
       entity,
       "table_flag_override"
@@ -6565,10 +6579,8 @@ class LibreEntityConverter {
       borderVisibilityOverrideFlag,
       rowHeightArr,
       columnWidthArr,
-      tableStyleId: "",
-      // TODO: Set the correct value
-      blockRecordHandle: 0,
-      // TODO: Set the correct value
+      tableStyleId,
+      blockRecordHandle,
       cells: this.convertTableCells(cells),
       bmpPreview: ""
     };
@@ -7118,7 +7130,7 @@ class LibreDwgConverter {
     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 = libredwg.dwg_ref_get_absref(layout_ptr);
+    const layout = idToString(libredwg.dwg_ref_get_absref(layout_ptr));
     let bmpPreview = "";
     const uint8ArrayToHexString = (bytes) => {
       const hexChars = new Array(bytes.length);

package/dist/libredwg-web.umd.cjs

@@ -5839,12 +5839,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         countBoundaryPoints
       );
       const imagedef_ref = libredwg.dwg_dynapi_entity_value(entity, "imagedef").data;
-      const imageDefHandle = libredwg.dwg_ref_get_absref(imagedef_ref);
+      const imageDefHandle = idToString(libredwg.dwg_ref_get_absref(imagedef_ref));
       const imagedefreactor_ref = libredwg.dwg_dynapi_entity_value(
         entity,
         "imagedefreactor"
       ).data;
-      const imageDefReactorHandle = libredwg.dwg_ref_get_absref(imagedefreactor_ref);
+      const imageDefReactorHandle = idToString(libredwg.dwg_ref_get_absref(imagedefreactor_ref));
       return {
         type: "IMAGE",
         ...commonAttrs,
@@ -6535,6 +6535,20 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         col_widths_ptr,
         columnCount
       );
+      const table_style_ref = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "tablestyle"
+      ).data;
+      const tableStyleId = idToString(
+        libredwg.dwg_ref_get_absref(table_style_ref)
+      );
+      const block_header_ref = libredwg.dwg_dynapi_entity_value(
+        entity,
+        "block_header"
+      ).data;
+      const blockRecordHandle = idToString(
+        libredwg.dwg_ref_get_absref(block_header_ref)
+      );
       const overrideFlag = libredwg.dwg_dynapi_entity_value(
         entity,
         "table_flag_override"
@@ -6570,10 +6584,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         borderVisibilityOverrideFlag,
         rowHeightArr,
         columnWidthArr,
-        tableStyleId: "",
-        // TODO: Set the correct value
-        blockRecordHandle: 0,
-        // TODO: Set the correct value
+        tableStyleId,
+        blockRecordHandle,
         cells: this.convertTableCells(cells),
         bmpPreview: ""
       };
@@ -7123,7 +7135,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       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 = libredwg.dwg_ref_get_absref(layout_ptr);
+      const layout = idToString(libredwg.dwg_ref_get_absref(layout_ptr));
       let bmpPreview = "";
       const uint8ArrayToHexString = (bytes) => {
         const hexChars = new Array(bytes.length);

package/lib/converter/converter.js

@@ -181,7 +181,7 @@ export class LibreDwgConverter {
             .data;
         const layout_ptr = libredwg.dwg_dynapi_entity_value(item, 'layout')
             .data;
-        const layout = libredwg.dwg_ref_get_absref(layout_ptr);
+        const layout = idToString(libredwg.dwg_ref_get_absref(layout_ptr));
         let bmpPreview = '';
         const uint8ArrayToHexString = (bytes) => {
             const hexChars = new Array(bytes.length);

package/lib/converter/entityConverter.js

@@ -589,9 +589,9 @@ export class LibreEntityConverter {
         const clippingBoundaryPath = libredwg.dwg_ptr_to_point3d_array(clip_verts, countBoundaryPoints);
         const imagedef_ref = libredwg.dwg_dynapi_entity_value(entity, 'imagedef')
             .data;
-        const imageDefHandle = libredwg.dwg_ref_get_absref(imagedef_ref);
+        const imageDefHandle = idToString(libredwg.dwg_ref_get_absref(imagedef_ref));
         const imagedefreactor_ref = libredwg.dwg_dynapi_entity_value(entity, 'imagedefreactor').data;
-        const imageDefReactorHandle = libredwg.dwg_ref_get_absref(imagedefreactor_ref);
+        const imageDefReactorHandle = idToString(libredwg.dwg_ref_get_absref(imagedefreactor_ref));
         return {
             type: 'IMAGE',
             ...commonAttrs,
@@ -1192,6 +1192,10 @@ export class LibreEntityConverter {
         const rowHeightArr = libredwg.dwg_ptr_to_double_array(row_heights_ptr, rowCount);
         const col_widths_ptr = libredwg.dwg_dynapi_entity_value(entity, 'col_widths').data;
         const columnWidthArr = libredwg.dwg_ptr_to_double_array(col_widths_ptr, columnCount);
+        const table_style_ref = libredwg.dwg_dynapi_entity_value(entity, 'tablestyle').data;
+        const tableStyleId = idToString(libredwg.dwg_ref_get_absref(table_style_ref));
+        const block_header_ref = libredwg.dwg_dynapi_entity_value(entity, 'block_header').data;
+        const blockRecordHandle = idToString(libredwg.dwg_ref_get_absref(block_header_ref));
         const overrideFlag = libredwg.dwg_dynapi_entity_value(entity, 'table_flag_override').data;
         const borderColorOverrideFlag = libredwg.dwg_dynapi_entity_value(entity, 'border_color_overrides_flag').data;
         const borderLineWeightOverrideFlag = libredwg.dwg_dynapi_entity_value(entity, 'border_lineweight_overrides_flag').data;
@@ -1217,8 +1221,8 @@ export class LibreEntityConverter {
             borderVisibilityOverrideFlag: borderVisibilityOverrideFlag,
             rowHeightArr: rowHeightArr,
             columnWidthArr: columnWidthArr,
-            tableStyleId: '', // TODO: Set the correct value
-            blockRecordHandle: 0, // TODO: Set the correct value
+            tableStyleId: tableStyleId,
+            blockRecordHandle: blockRecordHandle,
             cells: this.convertTableCells(cells),
             bmpPreview: ''
         };

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

@@ -21,13 +21,13 @@ export interface DwgImageEntity extends DwgEntity {
     uPixel: DwgPoint3D;
     vPixel: DwgPoint3D;
     imageSize: DwgPoint2D;
-    imageDefHandle: number;
+    imageDefHandle: string;
     flags: DwgImageFlags;
     clipping: number;
     brightness: number;
     contrast: number;
     fade: number;
-    imageDefReactorHandle: number;
+    imageDefReactorHandle: string;
     clippingBoundaryType: DwgImageClippingBoundaryType;
     countBoundaryPoints: number;
     clippingBoundaryPath: DwgPoint3D[];

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

@@ -44,7 +44,7 @@ export interface DwgTableEntity extends DwgEntity {
     rowHeightArr: number[];
     columnWidthArr: number[];
     tableStyleId?: string;
-    blockRecordHandle?: number;
+    blockRecordHandle?: string;
     cells: DwgTableCell[];
     bmpPreview: string;
 }

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

@@ -29,7 +29,7 @@ export interface DwgBlockRecordTableEntry extends DwgCommonTableEntry {
     /**
      * Hard-pointer ID/handle to associated LAYOUT object
      */
-    layout: number;
+    layout: string;
     /**
      * Block insertion units.
      */

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