@mlightcad/libredwg-web 0.7.5 → 0.7.7

package/dist/libredwg-web.js

@@ -1277,6 +1277,8 @@ class LibreEntityConverter {
         return this.convertAlignedDimension(entity_tio, commonAttrs);
       } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_DIMENSION_ANG3PT) {
         return this.convert3PointAngularDimension(entity_tio, commonAttrs);
+      } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_DIMENSION_ANG2LN) {
+        return this.convert2LineAngularDimension(entity_tio, commonAttrs);
       } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_DIMENSION_DIAMETER) {
         return this.convertDiameterDimension(entity_tio, commonAttrs);
       } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_DIMENSION_ORDINATE) {
@@ -1524,6 +1526,27 @@ class LibreEntityConverter {
       arcPoint
     };
   }
+  convert2LineAngularDimension(entity, commonAttrs) {
+    const libredwg = this.libredwg;
+    const dimensionCommonAttrs = this.getDimensionCommonAttrs(entity);
+    const xline1Start = libredwg.dwg_dynapi_entity_data(entity, "xline1start_pt");
+    const xline1End = libredwg.dwg_dynapi_entity_data(entity, "xline1end_pt");
+    const xline2Start = libredwg.dwg_dynapi_entity_data(entity, "xline2start_pt");
+    const xline2End = libredwg.dwg_dynapi_entity_data(entity, "xline2end_pt");
+    const vertexPoint = libredwg.dwg_dynapi_entity_data(entity, "def_pt");
+    if (xline2End) {
+      dimensionCommonAttrs.definitionPoint = xline2End;
+    }
+    return {
+      subclassMarker: "AcDb2LineAngularDimension",
+      ...commonAttrs,
+      ...dimensionCommonAttrs,
+      subDefinitionPoint1: xline1Start ?? xline1End ?? vertexPoint ?? xline2End,
+      subDefinitionPoint2: xline2Start ?? xline2End ?? vertexPoint ?? xline1End,
+      centerPoint: vertexPoint ?? xline2Start ?? xline1End ?? xline2End,
+      arcPoint: xline2End ?? dimensionCommonAttrs.definitionPoint
+    };
+  }
   convertDiameterDimension(entity, commonAttrs) {
     const libredwg = this.libredwg;
     const dimensionCommonAttrs = this.getDimensionCommonAttrs(entity);
@@ -2934,37 +2957,36 @@ class LibreEntityConverter {
     };
   }
   convertTableCells(cells) {
-    const converted = [];
-    cells.forEach((cell) => {
+    return cells.map((cell) => {
+      var _a, _b;
       return {
         text: cell.text_value,
         attachmentPoint: cell.cell_alignment,
-        textStyle: cell.text_style,
-        // TODO: Set the text style name instead of handle
+        textStyle: cell.text_style ? String(cell.text_style) : void 0,
         rotation: cell.rotation,
         cellType: cell.type,
         flagValue: cell.flags,
         mergedValue: cell.is_merged_value,
         autoFit: cell.is_autofit_flag,
-        // borderWidth?: number
-        // borderHeight?: number
-        topBorderVisibility: cell.top_visibility,
-        bottomBorderVisibility: cell.bottom_visibility,
-        leftBorderVisibility: cell.left_visibility,
-        rightBorderVisibility: cell.right_visibility,
+        topBorderVisibility: !!cell.top_visibility,
+        bottomBorderVisibility: !!cell.bottom_visibility,
+        leftBorderVisibility: !!cell.left_visibility,
+        rightBorderVisibility: !!cell.right_visibility,
         overrideFlag: cell.cell_flag_override,
         virtualEdgeFlag: cell.virtual_edge_flag,
-        // fieldObjetId?: string
-        blockTableRecordI: cell.block_handle.absolute_ref,
+        blockTableRecordId: cell.block_handle ? String(cell.block_handle.absolute_ref ?? "") : void 0,
         blockScale: cell.block_scale,
-        blockAttrNum: cell.attr_defs.length,
-        attrDefineId: cell.attr_defs.map((value) => value.attdef.absolute_ref),
-        // attrText?: string
-        // textHeight: number
+        blockAttrNum: ((_a = cell.attr_defs) == null ? void 0 : _a.length) ?? 0,
+        attrDefineId: (_b = cell.attr_defs) == null ? void 0 : _b.map(
+          (value) => {
+            var _a2;
+            return String(((_a2 = value.attdef) == null ? void 0 : _a2.absolute_ref) ?? "");
+          }
+        ),
+        textHeight: cell.text_height ?? 0,
         extendedCellFlags: cell.additional_data_flag
       };
     });
-    return converted;
   }
   convertTextBase(entity) {
     const libredwg = this.libredwg;
@@ -5389,6 +5411,7 @@ class SvgConverter {
         result = this.ray(entity);
         break;
       case "TABLE":
+      case "ACAD_TABLE":
         result = this.table(entity);
         break;
       case "TEXT":

package/dist/libredwg-web.umd.cjs

@@ -1279,6 +1279,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           return this.convertAlignedDimension(entity_tio, commonAttrs);
         } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_DIMENSION_ANG3PT) {
           return this.convert3PointAngularDimension(entity_tio, commonAttrs);
+        } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_DIMENSION_ANG2LN) {
+          return this.convert2LineAngularDimension(entity_tio, commonAttrs);
         } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_DIMENSION_DIAMETER) {
           return this.convertDiameterDimension(entity_tio, commonAttrs);
         } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_DIMENSION_ORDINATE) {
@@ -1526,6 +1528,27 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         arcPoint
       };
     }
+    convert2LineAngularDimension(entity, commonAttrs) {
+      const libredwg = this.libredwg;
+      const dimensionCommonAttrs = this.getDimensionCommonAttrs(entity);
+      const xline1Start = libredwg.dwg_dynapi_entity_data(entity, "xline1start_pt");
+      const xline1End = libredwg.dwg_dynapi_entity_data(entity, "xline1end_pt");
+      const xline2Start = libredwg.dwg_dynapi_entity_data(entity, "xline2start_pt");
+      const xline2End = libredwg.dwg_dynapi_entity_data(entity, "xline2end_pt");
+      const vertexPoint = libredwg.dwg_dynapi_entity_data(entity, "def_pt");
+      if (xline2End) {
+        dimensionCommonAttrs.definitionPoint = xline2End;
+      }
+      return {
+        subclassMarker: "AcDb2LineAngularDimension",
+        ...commonAttrs,
+        ...dimensionCommonAttrs,
+        subDefinitionPoint1: xline1Start ?? xline1End ?? vertexPoint ?? xline2End,
+        subDefinitionPoint2: xline2Start ?? xline2End ?? vertexPoint ?? xline1End,
+        centerPoint: vertexPoint ?? xline2Start ?? xline1End ?? xline2End,
+        arcPoint: xline2End ?? dimensionCommonAttrs.definitionPoint
+      };
+    }
     convertDiameterDimension(entity, commonAttrs) {
       const libredwg = this.libredwg;
       const dimensionCommonAttrs = this.getDimensionCommonAttrs(entity);
@@ -2936,37 +2959,36 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       };
     }
     convertTableCells(cells) {
-      const converted = [];
-      cells.forEach((cell) => {
+      return cells.map((cell) => {
+        var _a, _b;
         return {
           text: cell.text_value,
           attachmentPoint: cell.cell_alignment,
-          textStyle: cell.text_style,
-          // TODO: Set the text style name instead of handle
+          textStyle: cell.text_style ? String(cell.text_style) : void 0,
           rotation: cell.rotation,
           cellType: cell.type,
           flagValue: cell.flags,
           mergedValue: cell.is_merged_value,
           autoFit: cell.is_autofit_flag,
-          // borderWidth?: number
-          // borderHeight?: number
-          topBorderVisibility: cell.top_visibility,
-          bottomBorderVisibility: cell.bottom_visibility,
-          leftBorderVisibility: cell.left_visibility,
-          rightBorderVisibility: cell.right_visibility,
+          topBorderVisibility: !!cell.top_visibility,
+          bottomBorderVisibility: !!cell.bottom_visibility,
+          leftBorderVisibility: !!cell.left_visibility,
+          rightBorderVisibility: !!cell.right_visibility,
           overrideFlag: cell.cell_flag_override,
           virtualEdgeFlag: cell.virtual_edge_flag,
-          // fieldObjetId?: string
-          blockTableRecordI: cell.block_handle.absolute_ref,
+          blockTableRecordId: cell.block_handle ? String(cell.block_handle.absolute_ref ?? "") : void 0,
           blockScale: cell.block_scale,
-          blockAttrNum: cell.attr_defs.length,
-          attrDefineId: cell.attr_defs.map((value) => value.attdef.absolute_ref),
-          // attrText?: string
-          // textHeight: number
+          blockAttrNum: ((_a = cell.attr_defs) == null ? void 0 : _a.length) ?? 0,
+          attrDefineId: (_b = cell.attr_defs) == null ? void 0 : _b.map(
+            (value) => {
+              var _a2;
+              return String(((_a2 = value.attdef) == null ? void 0 : _a2.absolute_ref) ?? "");
+            }
+          ),
+          textHeight: cell.text_height ?? 0,
           extendedCellFlags: cell.additional_data_flag
         };
       });
-      return converted;
     }
     convertTextBase(entity) {
       const libredwg = this.libredwg;
@@ -5391,6 +5413,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           result = this.ray(entity);
           break;
         case "TABLE":
+        case "ACAD_TABLE":
           result = this.table(entity);
           break;
         case "TEXT":

package/lib/converter/entityConverter.d.ts

@@ -20,6 +20,7 @@ export declare class LibreEntityConverter {
     private convertCircle;
     private convertAlignedDimension;
     private convert3PointAngularDimension;
+    private convert2LineAngularDimension;
     private convertDiameterDimension;
     private convertOrdinateDimension;
     private convertRadiusDimension;

package/lib/converter/entityConverter.js

@@ -69,6 +69,9 @@ export class LibreEntityConverter {
             else if (fixedtype == Dwg_Object_Type.DWG_TYPE_DIMENSION_ANG3PT) {
                 return this.convert3PointAngularDimension(entity_tio, commonAttrs);
             }
+            else if (fixedtype == Dwg_Object_Type.DWG_TYPE_DIMENSION_ANG2LN) {
+                return this.convert2LineAngularDimension(entity_tio, commonAttrs);
+            }
             else if (fixedtype == Dwg_Object_Type.DWG_TYPE_DIMENSION_DIAMETER) {
                 return this.convertDiameterDimension(entity_tio, commonAttrs);
             }
@@ -376,6 +379,29 @@ export class LibreEntityConverter {
             arcPoint: arcPoint
         };
     }
+    convert2LineAngularDimension(entity, commonAttrs) {
+        const libredwg = this.libredwg;
+        const dimensionCommonAttrs = this.getDimensionCommonAttrs(entity);
+        const xline1Start = libredwg.dwg_dynapi_entity_data(entity, 'xline1start_pt');
+        const xline1End = libredwg.dwg_dynapi_entity_data(entity, 'xline1end_pt');
+        const xline2Start = libredwg.dwg_dynapi_entity_data(entity, 'xline2start_pt');
+        const xline2End = libredwg.dwg_dynapi_entity_data(entity, 'xline2end_pt');
+        const vertexPoint = libredwg.dwg_dynapi_entity_data(entity, 'def_pt');
+        // For 2-line angular dimensions DXF group 10 is the arc location (xline2end_pt),
+        // not def_pt which stores the dimension line location (DXF group 16).
+        if (xline2End) {
+            dimensionCommonAttrs.definitionPoint = xline2End;
+        }
+        return {
+            subclassMarker: 'AcDb2LineAngularDimension',
+            ...commonAttrs,
+            ...dimensionCommonAttrs,
+            subDefinitionPoint1: xline1Start ?? xline1End ?? vertexPoint ?? xline2End,
+            subDefinitionPoint2: xline2Start ?? xline2End ?? vertexPoint ?? xline1End,
+            centerPoint: vertexPoint ?? xline2Start ?? xline1End ?? xline2End,
+            arcPoint: xline2End ?? dimensionCommonAttrs.definitionPoint
+        };
+    }
     convertDiameterDimension(entity, commonAttrs) {
         const libredwg = this.libredwg;
         const dimensionCommonAttrs = this.getDimensionCommonAttrs(entity);
@@ -1561,36 +1587,32 @@ export class LibreEntityConverter {
         };
     }
     convertTableCells(cells) {
-        const converted = [];
-        cells.forEach(cell => {
-            return {
-                text: cell.text_value,
-                attachmentPoint: cell.cell_alignment,
-                textStyle: cell.text_style, // TODO: Set the text style name instead of handle
-                rotation: cell.rotation,
-                cellType: cell.type,
-                flagValue: cell.flags,
-                mergedValue: cell.is_merged_value,
-                autoFit: cell.is_autofit_flag,
-                // borderWidth?: number
-                // borderHeight?: number
-                topBorderVisibility: cell.top_visibility,
-                bottomBorderVisibility: cell.bottom_visibility,
-                leftBorderVisibility: cell.left_visibility,
-                rightBorderVisibility: cell.right_visibility,
-                overrideFlag: cell.cell_flag_override,
-                virtualEdgeFlag: cell.virtual_edge_flag,
-                // fieldObjetId?: string
-                blockTableRecordI: cell.block_handle.absolute_ref,
-                blockScale: cell.block_scale,
-                blockAttrNum: cell.attr_defs.length,
-                attrDefineId: cell.attr_defs.map(value => value.attdef.absolute_ref),
-                // attrText?: string
-                // textHeight: number
-                extendedCellFlags: cell.additional_data_flag
-            };
-        });
-        return converted;
+        return cells.map(cell => ({
+            text: cell.text_value,
+            attachmentPoint: cell.cell_alignment,
+            textStyle: cell.text_style
+                ? String(cell.text_style)
+                : undefined,
+            rotation: cell.rotation,
+            cellType: cell.type,
+            flagValue: cell.flags,
+            mergedValue: cell.is_merged_value,
+            autoFit: cell.is_autofit_flag,
+            topBorderVisibility: !!cell.top_visibility,
+            bottomBorderVisibility: !!cell.bottom_visibility,
+            leftBorderVisibility: !!cell.left_visibility,
+            rightBorderVisibility: !!cell.right_visibility,
+            overrideFlag: cell.cell_flag_override,
+            virtualEdgeFlag: cell.virtual_edge_flag,
+            blockTableRecordId: cell.block_handle
+                ? String(cell.block_handle.absolute_ref ?? '')
+                : undefined,
+            blockScale: cell.block_scale,
+            blockAttrNum: cell.attr_defs?.length ?? 0,
+            attrDefineId: cell.attr_defs?.map(value => String(value.attdef?.absolute_ref ?? '')),
+            textHeight: cell.text_height ?? 0,
+            extendedCellFlags: cell.additional_data_flag
+        }));
     }
     convertTextBase(entity) {
         const libredwg = this.libredwg;

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

@@ -166,7 +166,7 @@ export interface DwgAngularDimensionEntity extends DwgDimensionEntityCommon {
     /**
      * 	Subclass marker (AcDb3PointAngularDimension)
      */
-    subclassMarker: 'AcDb3PointAngularDimension';
+    subclassMarker: 'AcDb3PointAngularDimension' | 'AcDb2LineAngularDimension';
     /**
      * Definition point for linear and angular dimensions (in WCS)
      */

package/lib/svg/svgConverter.js

@@ -446,6 +446,7 @@ export class SvgConverter {
                 result = this.ray(entity);
                 break;
             case 'TABLE':
+            case 'ACAD_TABLE':
                 result = this.table(entity);
                 break;
             case 'TEXT':

package/package.json

@@ -3,7 +3,7 @@
   "description": "A DWG/DXF JavaScript parser based on libredwg",
   "license": "GPL-3.0",
   "private": false,
-  "version": "0.7.5",
+  "version": "0.7.7",
   "author": "MLight Lee <mlight.lee@outlook.com>",
   "type": "module",
   "engines": {
@@ -74,7 +74,7 @@
     "demo": "live-server examples --entry-file=index.html",
     "doc": "typedoc",
     "build": "tsc && vite build && cp -rf wasm examples/ && cp -rf dist examples/",
-    "build:prepare": "mkdir -p ../../build-wasm && cd ../../build-wasm && emconfigure ../configure CFLAGS=\"-O2 -sUSE_ZLIB=1 -DNDEBUG\" CC=emcc --enable-release --disable-docs --disable-write --disable-python --disable-bindings --disable-shared --disable-json --enable-partial --enable-experimental",
+    "build:prepare": "mkdir -p ../../build-wasm && cd ../../build-wasm && emconfigure ../configure CFLAGS=\"-O2 -sUSE_ZLIB=1 -DNDEBUG\" CC=emcc --enable-release --enable-debug --disable-docs --disable-write --disable-python --disable-bindings --disable-shared --disable-json",
     "build:obj": "cd ../../build-wasm && emmake make",
     "build:wasm": "cd ../../build-wasm && emcc ../bindings/javascript/embind/*.cpp src/*.o -O2 -lembind -std=c++17 -Isrc -I../src -I../include -o libredwg-web.js -s ALLOW_MEMORY_GROWTH=1 -s INITIAL_MEMORY=1GB -s MAXIMUM_MEMORY=4GB -s MALLOC=mimalloc -s EXPORT_ES6=1 -s MODULARIZE=1 -s EXPORT_NAME=\"createModule\" -sEXPORTED_RUNTIME_METHODS=FS,ENV,ccall,cwrap,UTF8ToString,stringToNewUTF8,setValue --emit-tsd libredwg-web.d.ts",
     "clean": "rm -rf ../../build-wasm ./docs ./dist ./lib",