@mlightcad/libredwg-converter 3.5.21 → 3.5.23

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2025 mlight-lee
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2025 mlight-lee
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,53 +1,53 @@
-# @mlightcad/libredwg-converter
-
-The `libredwg-converter` package provides a DWG file converter for the RealDWG-Web ecosystem, enabling reading and conversion of DWG files into the AutoCAD-like drawing database structure. It is based on the [LibreDWG](https://www.gnu.org/software/libredwg/) library compiled to WebAssembly.
-
-## Overview
-
-This package implements a DWG file converter compatible with the RealDWG-Web data model. It allows you to register DWG file support in your application and convert DWG files into the in-memory drawing database.
-
-## Key Features
-
-- **DWG File Support**: Read and convert DWG files to the drawing database
-- **Integration**: Designed to work with the RealDWG-Web data model and converter manager
-- **WebAssembly Powered**: Uses LibreDWG compiled to WASM for fast, browser-compatible parsing
-
-## Installation
-
-```bash
-npm install @mlightcad/libredwg-converter
-```
-
-> **Peer dependencies:**
-> - `@mlightcad/data-model`
-> - `@mlightcad/libredwg-web`
-
-## Usage Example
-
-```typescript
-import { AcDbDatabaseConverterManager, AcDbFileType } from '@mlightcad/data-model';
-import { AcDbLibreDwgConverter } from '@mlightcad/libredwg-converter';
-
-// WASM module loading (async)
-import('@mlightcad/libredwg-web/wasm/libredwg-web').then(libredwgModule => {
-  const dwgConverter = new AcDbLibreDwgConverter(libredwgModule);
-  AcDbDatabaseConverterManager.instance.register(AcDbFileType.DWG, dwgConverter);
-});
-```
-
-## API
-
-- **AcDbLibreDwgConverter**: Main converter class for DWG files (extends `AcDbDatabaseConverter`)
-
-## Dependencies
-
-- **@mlightcad/data-model**: Drawing database and entity definitions
-- **@mlightcad/libredwg-web**: WASM wrapper for LibreDWG
-
-## API Documentation
-
-For detailed API documentation, visit the [RealDWG-Web documentation](https://mlight-lee.github.io/realdwg-web/).
-
-## Contributing
-
+# @mlightcad/libredwg-converter
+
+The `libredwg-converter` package provides a DWG file converter for the RealDWG-Web ecosystem, enabling reading and conversion of DWG files into the AutoCAD-like drawing database structure. It is based on the [LibreDWG](https://www.gnu.org/software/libredwg/) library compiled to WebAssembly.
+
+## Overview
+
+This package implements a DWG file converter compatible with the RealDWG-Web data model. It allows you to register DWG file support in your application and convert DWG files into the in-memory drawing database.
+
+## Key Features
+
+- **DWG File Support**: Read and convert DWG files to the drawing database
+- **Integration**: Designed to work with the RealDWG-Web data model and converter manager
+- **WebAssembly Powered**: Uses LibreDWG compiled to WASM for fast, browser-compatible parsing
+
+## Installation
+
+```bash
+npm install @mlightcad/libredwg-converter
+```
+
+> **Peer dependencies:**
+> - `@mlightcad/data-model`
+> - `@mlightcad/libredwg-web`
+
+## Usage Example
+
+```typescript
+import { AcDbDatabaseConverterManager, AcDbFileType } from '@mlightcad/data-model';
+import { AcDbLibreDwgConverter } from '@mlightcad/libredwg-converter';
+
+// WASM module loading (async)
+import('@mlightcad/libredwg-web/wasm/libredwg-web').then(libredwgModule => {
+  const dwgConverter = new AcDbLibreDwgConverter(libredwgModule);
+  AcDbDatabaseConverterManager.instance.register(AcDbFileType.DWG, dwgConverter);
+});
+```
+
+## API
+
+- **AcDbLibreDwgConverter**: Main converter class for DWG files (extends `AcDbDatabaseConverter`)
+
+## Dependencies
+
+- **@mlightcad/data-model**: Drawing database and entity definitions
+- **@mlightcad/libredwg-web**: WASM wrapper for LibreDWG
+
+## API Documentation
+
+For detailed API documentation, visit the [RealDWG-Web documentation](https://mlight-lee.github.io/realdwg-web/).
+
+## Contributing
+
 This package is part of the RealDWG-Web monorepo. Please refer to the main project README for contribution guidelines. 

package/dist/libredwg-converter.js

@@ -28,22 +28,22 @@ class C {
     );
   }
   convertEllipse(e) {
-    const n = new D(e.majorAxisEndPoint), t = n.length();
+    const n = new D(e.majorAxisEndPoint), s = n.length();
     return new k(
       e.center,
       e.extrusionDirection ?? D.Z_AXIS,
       n,
-      t,
-      t * e.axisRatio,
+      s,
+      s * e.axisRatio,
       e.startAngle,
       e.endAngle
     );
   }
   convertLine(e) {
-    const n = e.startPoint, t = e.endPoint;
+    const n = e.startPoint, s = e.endPoint;
     return new F(
       new w(n.x, n.y, n.z),
-      new w(t.x, t.y, t.z)
+      new w(s.x, s.y, s.z)
     );
   }
   convertSpline(e) {
@@ -80,18 +80,20 @@ class C {
   }
   convertLWPolyline(e) {
     const n = new N();
-    return n.closed = !!(e.flag & 512), e.vertices.forEach((t, o) => {
+    n.closed = !!(e.flag & 512);
+    const s = e.constantWidth ?? -1;
+    return e.vertices.forEach((o, t) => {
       n.addVertexAt(
-        o,
-        new b(t.x, t.y),
-        t.bulge,
-        t.startWidth,
-        t.endWidth
+        t,
+        new b(o.x, o.y),
+        o.bulge,
+        o.startWidth ?? s,
+        o.endWidth ?? s
       );
     }), n;
   }
   convertPolyline2d(e) {
-    const n = !!(e.flag & 1), t = !!(e.flag & 16), o = !!(e.flag & 64), s = !!(e.flag & 32), r = [], a = [], c = [];
+    const n = !!(e.flag & 1), s = !!(e.flag & 16), o = !!(e.flag & 64), t = !!(e.flag & 32), r = [], a = [], c = [];
     if (e.vertices.map((i) => {
       if (!(i.flag & 16))
         if (o && i.flag & 128)
@@ -111,9 +113,9 @@ class C {
             y: i.y,
             z: i.z
           }), a.push(i.bulge ?? 0);
-    }), t) {
+    }), s) {
       const i = e.meshMVertexCount ?? 2, d = e.meshNVertexCount ?? 2;
-      return new B(i, d, r, n, s);
+      return new B(i, d, r, n, t);
     } else {
       if (o)
         return new z(r, c);
@@ -132,30 +134,30 @@ class C {
     }
   }
   convertPolyline3d(e) {
-    const n = !!(e.flag & 1), t = [];
-    e.vertices.map((s) => {
-      s.flag & 16 || t.push({
-        x: s.x,
-        y: s.y,
-        z: s.z
+    const n = !!(e.flag & 1), s = [];
+    e.vertices.map((t) => {
+      t.flag & 16 || s.push({
+        x: t.x,
+        y: t.y,
+        z: t.z
       });
     });
     let o = y.SimplePoly;
-    return e.flag & 4 && (e.smoothType == 6 ? o = y.CubicSplinePoly : e.smoothType == 5 && (o = y.QuadSplinePoly)), new W(o, t, n);
+    return e.flag & 4 && (e.smoothType == 6 ? o = y.CubicSplinePoly : e.smoothType == 5 && (o = y.QuadSplinePoly)), new W(o, s, n);
   }
   convertHatch(e) {
     var o;
     const n = new H();
-    return (o = e.definitionLines) == null || o.forEach((s) => {
+    return (o = e.definitionLines) == null || o.forEach((t) => {
       n.definitionLines.push({
-        angle: s.angle,
-        base: s.base,
-        offset: s.offset,
-        dashLengths: s.numberOfDashLengths > 0 ? s.dashLengths : []
+        angle: t.angle,
+        base: t.base,
+        offset: t.offset,
+        dashLengths: t.numberOfDashLengths > 0 ? t.dashLengths : []
       });
-    }), n.isSolidFill = e.solidFill == 1, n.hatchStyle = e.hatchStyle, n.patternName = e.patternName, n.patternType = e.patternType, n.patternAngle = e.patternAngle == null ? 0 : e.patternAngle, n.patternScale = e.patternScale == null ? 0 : e.patternScale, e.boundaryPaths.forEach((s) => {
-      if (s.boundaryPathTypeFlag & 2) {
-        const a = s, c = new X();
+    }), n.isSolidFill = e.solidFill == 1, n.hatchStyle = e.hatchStyle, n.patternName = e.patternName, n.patternType = e.patternType, n.patternAngle = e.patternAngle == null ? 0 : e.patternAngle, n.patternScale = e.patternScale == null ? 0 : e.patternScale, e.boundaryPaths.forEach((t) => {
+      if (t.boundaryPathTypeFlag & 2) {
+        const a = t, c = new X();
         c.closed = a.isClosed, a.vertices.forEach((i, d) => {
           c.addVertexAt(d, {
             x: i.x,
@@ -164,7 +166,7 @@ class C {
           });
         }), n.add(c);
       } else {
-        const a = s, c = [];
+        const a = t, c = [];
         a.edges.forEach((d) => {
           if (d != null) {
             if (d.type == 1) {
@@ -242,11 +244,11 @@ class C {
       e.columnCount
     );
     return n.tableStyleId = e.tableStyleId, n.owningBlockRecordId = e.blockRecordHandle, e.directionVector && (n.horizontalDirection = new D(e.directionVector)), n.attachmentPoint = e.attachmentPoint, n.position.copy(e.startPoint), n.tableValueFlag = e.tableValue, n.tableOverrideFlag = e.overrideFlag, n.borderColorOverrideFlag = e.borderColorOverrideFlag, n.borderLineweightOverrideFlag = e.borderLineWeightOverrideFlag, n.borderVisibilityOverrideFlag = e.borderVisibilityOverrideFlag, e.columnWidthArr.forEach(
-      (t, o) => n.setColumnWidth(o, t)
+      (s, o) => n.setColumnWidth(o, s)
     ), e.rowHeightArr.forEach(
-      (t, o) => n.setRowHeight(o, t)
-    ), e.cells.forEach((t, o) => {
-      n.setCell(o, t);
+      (s, o) => n.setRowHeight(o, s)
+    ), e.cells.forEach((s, o) => {
+      n.setCell(o, s);
     }), n;
   }
   convertText(e) {
@@ -259,56 +261,56 @@ class C {
   }
   convertLeader(e) {
     const n = new J();
-    return e.vertices.forEach((t) => {
-      n.appendVertex(t);
+    return e.vertices.forEach((s) => {
+      n.appendVertex(s);
     }), n.hasArrowHead = e.isArrowheadEnabled, n.hasHookLine = e.isHooklineExists, n.isSplined = e.isSpline, n.dimensionStyle = e.styleName, n.annoType = e.leaderCreationFlag, n;
   }
   convertDimension(e) {
     if (e.subclassMarker == "AcDbAlignedDimension" || e.subclassMarker == "AcDbRotatedDimension") {
-      const n = e, t = new Q(
+      const n = e, s = new Q(
         n.subDefinitionPoint1,
         n.subDefinitionPoint2,
         n.definitionPoint
       );
-      return n.insertionPoint && (t.dimBlockPosition = {
+      return n.insertionPoint && (s.dimBlockPosition = {
         x: n.insertionPoint.x,
         y: n.insertionPoint.y,
         z: 0
-      }), t.rotation = n.rotationAngle, this.processDimensionCommonAttrs(e, t), t;
+      }), s.rotation = n.rotationAngle, this.processDimensionCommonAttrs(e, s), s;
     } else if (e.subclassMarker == "AcDb3PointAngularDimension") {
-      const n = e, t = new $(
+      const n = e, s = new $(
         n.centerPoint,
         n.subDefinitionPoint1,
         n.subDefinitionPoint2,
         n.definitionPoint
       );
-      return this.processDimensionCommonAttrs(e, t), t;
+      return this.processDimensionCommonAttrs(e, s), s;
     } else if (e.subclassMarker == "AcDbOrdinateDimension") {
-      const n = e, t = new ee(
+      const n = e, s = new ee(
         n.subDefinitionPoint1,
         n.subDefinitionPoint2
       );
-      return this.processDimensionCommonAttrs(e, t), t;
+      return this.processDimensionCommonAttrs(e, s), s;
     } else if (e.subclassMarker == "AcDbRadialDimension") {
-      const n = e, t = new ne(
+      const n = e, s = new ne(
         n.definitionPoint,
         n.centerPoint,
         n.leaderLength
       );
-      return this.processDimensionCommonAttrs(e, t), t;
+      return this.processDimensionCommonAttrs(e, s), s;
     } else if (e.subclassMarker == "AcDbDiametricDimension") {
-      const n = e, t = new oe(
+      const n = e, s = new oe(
         n.definitionPoint,
         n.centerPoint,
         n.leaderLength
       );
-      return this.processDimensionCommonAttrs(e, t), t;
+      return this.processDimensionCommonAttrs(e, s), s;
     }
     return null;
   }
   processImage(e, n) {
-    n.position.copy(e.position), n.brightness = e.brightness, n.contrast = e.contrast, n.fade = e.fade, n.imageSize.copy(e.imageSize), n.imageDefId = e.imageDefHandle, n.isClipped = e.clipping > 0, n.isShownClipped = (e.flags | 4) > 0, n.isImageShown = (e.flags | 3) > 0, n.isImageTransparent = (e.flags | 8) > 0, e.clippingBoundaryPath.forEach((t) => {
-      n.clipBoundary.push(new b(t));
+    n.position.copy(e.position), n.brightness = e.brightness, n.contrast = e.contrast, n.fade = e.fade, n.imageSize.copy(e.imageSize), n.imageDefId = e.imageDefHandle, n.isClipped = e.clipping > 0, n.isShownClipped = (e.flags | 4) > 0, n.isImageShown = (e.flags | 3) > 0, n.isImageTransparent = (e.flags | 8) > 0, e.clippingBoundaryPath.forEach((s) => {
+      n.clipBoundary.push(new b(s));
     }), n.clipBoundaryType = e.clippingBoundaryType, n.width = Math.sqrt(
       e.uPixel.x ** 2 + e.uPixel.y ** 2 + e.uPixel.z ** 2
     ) * e.imageSize.x, n.height = Math.sqrt(
@@ -336,8 +338,8 @@ class C {
     return n.basePoint.copy(e.firstPoint), n.unitDir.copy(e.unitDirection), n;
   }
   convertAttributeCommon(e, n) {
-    const t = e.text;
-    n.textString = t.text, n.styleName = t.styleName, n.height = t.textHeight, n.position.copy(t.startPoint), n.rotation = t.rotation, n.oblique = t.obliqueAngle ?? 0, n.thickness = t.thickness, n.horizontalMode = t.halign, n.verticalMode = t.valign, n.widthFactor = t.xScale ?? 1, n.tag = e.tag, n.fieldLength = e.fieldLength, n.isInvisible = (e.flags & I.Invisible) !== 0, n.isConst = (e.flags & I.Const) !== 0, n.isVerifiable = (e.flags & I.Verifiable) !== 0, n.isPreset = (e.flags & I.Preset) !== 0, n.lockPositionInBlock = e.lockPositionFlag, n.isReallyLocked = e.isReallyLocked, n.isMTextAttribute = (e.mtextFlag & M.MultiLine) !== 0, n.isConstMTextAttribute = (e.mtextFlag & M.ConstMultiLine) !== 0;
+    const s = e.text;
+    n.textString = s.text, n.styleName = s.styleName, n.height = s.textHeight, n.position.copy(s.startPoint), n.rotation = s.rotation, n.oblique = s.obliqueAngle ?? 0, n.thickness = s.thickness, n.horizontalMode = s.halign, n.verticalMode = s.valign, n.widthFactor = s.xScale ?? 1, n.tag = e.tag, n.fieldLength = e.fieldLength, n.isInvisible = (e.flags & I.Invisible) !== 0, n.isConst = (e.flags & I.Const) !== 0, n.isVerifiable = (e.flags & I.Verifiable) !== 0, n.isPreset = (e.flags & I.Preset) !== 0, n.lockPositionInBlock = e.lockPositionFlag, n.isReallyLocked = e.isReallyLocked, n.isMTextAttribute = (e.mtextFlag & M.MultiLine) !== 0, n.isConstMTextAttribute = (e.mtextFlag & M.ConstMultiLine) !== 0;
   }
   convertAttribute(e) {
     const n = new le();
@@ -349,8 +351,8 @@ class C {
   }
   convertBlockReference(e) {
     const n = new de(e.name);
-    return e.insertionPoint && n.position.copy(e.insertionPoint), n.scaleFactors.x = e.xScale, n.scaleFactors.y = e.yScale, n.scaleFactors.z = e.zScale, n.rotation = e.rotation, n.normal.copy(e.extrusionDirection), e.attribs && e.attribs.forEach((t) => {
-      const o = this.convertAttribute(t);
+    return e.insertionPoint && n.position.copy(e.insertionPoint), n.scaleFactors.x = e.xScale, n.scaleFactors.y = e.yScale, n.scaleFactors.z = e.zScale, n.rotation = e.rotation, n.normal.copy(e.extrusionDirection), e.attribs && e.attribs.forEach((s) => {
+      const o = this.convertAttribute(s);
       n.appendAttributes(o);
     }), n;
   }
@@ -358,9 +360,9 @@ class C {
     n.dimBlockId = e.name, n.textPosition.copy(e.textPoint), n.textRotation = e.textRotation || 0, e.textLineSpacingFactor && (n.textLineSpacingFactor = e.textLineSpacingFactor), e.textLineSpacingStyle && (n.textLineSpacingStyle = e.textLineSpacingStyle), n.dimensionStyleName = e.styleName, n.dimensionText = e.text || "", n.measurement = e.measurement;
   }
   processCommonAttrs(e, n) {
-    if (n.layer = e.layer || "0", n.objectId = e.handle, n.ownerId = e.ownerBlockRecordSoftId, e.lineType != null && (n.lineType = e.lineType), e.lineweight != null && (n.lineWeight = e.lineweight), e.lineTypeScale != null && (n.linetypeScale = e.lineTypeScale), e.color != null && n.color.setRGBValue(e.color), e.colorIndex != null && (n.color.colorIndex = e.colorIndex), e.colorName && (n.color.colorName = e.colorName), e.isVisible != null && (n.visibility = e.isVisible), e.transparency != null) {
-      const t = new pe();
-      t.method = e.transparencyType, (t.isByBlock || t.isByBlock) && (t.alpha = e.transparency), n.transparency = t;
+    if (n.layer = e.layer || "0", n.objectId = e.handle, n.ownerId = e.ownerBlockRecordSoftId, e.lineType != null && (n.lineType = e.lineType), e.lineweight != null && (n.lineWeight = e.lineweight), e.lineTypeScale != null && (n.linetypeScale = e.lineTypeScale), e.color != null && n.color.setRGBValue(e.color), e.colorIndex != null && (e.color == null || e.colorIndex === 7) && (n.color.colorIndex = e.colorIndex), e.colorName && (n.color.colorName = e.colorName), e.isVisible != null && (n.visibility = e.isVisible), e.transparency != null) {
+      const s = new pe();
+      s.method = e.transparencyType, (s.isByBlock || s.isByBlock) && (s.alpha = e.transparency), n.transparency = s;
     }
   }
 }
@@ -370,14 +372,14 @@ class Ce extends ue {
     super(e), e.useWorker = !0, e.parserWorkerUrl || (e.parserWorkerUrl = "/assets/libredwg-parser-worker.js");
   }
   async parse(e, n) {
-    const t = this.config, o = this.getParserWorkerTimeout(e, n);
-    if (t.useWorker && t.parserWorkerUrl) {
-      const s = fe({
-        workerUrl: t.parserWorkerUrl,
+    const s = this.config, o = this.getParserWorkerTimeout(e, n);
+    if (s.useWorker && s.parserWorkerUrl) {
+      const t = fe({
+        workerUrl: s.parserWorkerUrl,
         timeout: o,
         maxConcurrentWorkers: 1
-      }), r = await s.execute(e);
-      if (s.destroy(), r.success)
+      }), r = await t.execute(e);
+      if (t.destroy(), r.success)
         return r.data;
       throw new Error(
         `Failed to parse drawing due to error: '${r.error}'`
@@ -390,7 +392,7 @@ class Ce extends ue {
     e.tables.BLOCK_RECORD.entries.forEach((r) => {
       n.set(r.name, r);
     });
-    const t = /* @__PURE__ */ new Map(), o = (r) => {
+    const s = /* @__PURE__ */ new Map(), o = (r) => {
       if (r) {
         const a = r.lastIndexOf(".");
         return a >= 0 ? r.substring(0, a).toLowerCase() : r.toLowerCase();
@@ -399,51 +401,51 @@ class Ce extends ue {
     e.tables.STYLE.entries.forEach((r) => {
       const a = [];
       let c = o(r.font);
-      c && a.push(c), c = o(r.bigFont), c && a.push(c), t.set(r.name, a);
+      c && a.push(c), c = o(r.bigFont), c && a.push(c), s.set(r.name, a);
     });
-    const s = /* @__PURE__ */ new Set();
-    return this.getFontsInBlock(e.entities, n, t, s), Array.from(s);
+    const t = /* @__PURE__ */ new Set();
+    return this.getFontsInBlock(e.entities, n, s, t), Array.from(t);
   }
-  getFontsInBlock(e, n, t, o) {
-    const s = /\\f(.*?)\|/g;
+  getFontsInBlock(e, n, s, o) {
+    const t = /\\f(.*?)\|/g;
     e.forEach((r) => {
       if (r.type == "MTEXT") {
         const a = r;
-        [...a.text.matchAll(s)].forEach((i) => {
+        [...a.text.matchAll(t)].forEach((i) => {
           o.add(i[1].toLowerCase());
         });
-        const c = t.get(a.styleName);
+        const c = s.get(a.styleName);
         c == null || c.forEach((i) => o.add(i));
       } else if (r.type == "TEXT") {
-        const a = r, c = t.get(a.styleName);
+        const a = r, c = s.get(a.styleName);
         c == null || c.forEach((i) => o.add(i));
       } else if (r.type == "INSERT") {
         const a = r, c = n.get(a.name);
-        c && this.getFontsInBlock(c.entities, n, t, o);
+        c && this.getFontsInBlock(c.entities, n, s, o);
       }
     });
   }
   processLineTypes(e, n) {
     e.tables.LTYPE.entries.forEach((o) => {
-      const s = {
+      const t = {
         name: o.name,
         description: o.description,
         standardFlag: o.standardFlag,
         totalPatternLength: o.totalPatternLength,
         pattern: o.pattern
-      }, r = new he(s);
+      }, r = new he(t);
       this.processCommonTableEntryAttrs(o, r), r.name = o.name, n.tables.linetypeTable.add(r);
     });
   }
   processTextStyles(e, n) {
     e.tables.STYLE.entries.forEach((o) => {
-      const s = new ge(o);
-      this.processCommonTableEntryAttrs(o, s), n.tables.textStyleTable.add(s);
+      const t = new ge(o);
+      this.processCommonTableEntryAttrs(o, t), n.tables.textStyleTable.add(t);
     });
   }
   processDimStyles(e, n) {
     e.tables.DIMSTYLE.entries.forEach((o) => {
-      const s = {
+      const t = {
         name: o.name,
         ownerId: o.ownerHandle,
         dimpost: o.DIMPOST || "",
@@ -512,21 +514,21 @@ class Ce extends ue {
         dimblk2: o.DIMBLK2 || "",
         dimlwd: o.DIMLWD,
         dimlwe: o.DIMLWE
-      }, r = new De(s);
+      }, r = new De(t);
       this.processCommonTableEntryAttrs(o, r), n.tables.dimStyleTable.add(r);
     });
   }
   processLayers(e, n) {
     e.tables.LAYER.entries.forEach((o) => {
-      const s = new Ae();
-      s.colorIndex = o.colorIndex;
+      const t = new Ae();
+      t.colorIndex = o.colorIndex;
       const r = new Ie({
         name: o.name,
         standardFlags: o.standardFlag,
         linetype: o.lineType,
         lineWeight: o.lineweight,
         isOff: o.off,
-        color: s,
+        color: t,
         isPlottable: o.plotFlag != 0
       });
       this.processCommonTableEntryAttrs(o, r), n.tables.layerTable.add(r);
@@ -534,27 +536,27 @@ class Ce extends ue {
   }
   processViewports(e, n) {
     e.tables.VPORT.entries.forEach((o) => {
-      const s = new ye();
-      this.processCommonTableEntryAttrs(o, s), o.circleSides && (s.circleSides = o.circleSides), s.standardFlag = o.standardFlag, s.center.copy(o.center), s.lowerLeftCorner.copy(o.lowerLeftCorner), s.upperRightCorner.copy(o.upperRightCorner), o.snapBasePoint && s.snapBase.copy(o.snapBasePoint), o.snapRotationAngle && (s.snapAngle = o.snapRotationAngle), o.snapSpacing && s.snapIncrements.copy(o.snapSpacing), o.majorGridLines && (s.gridMajor = o.majorGridLines), o.gridSpacing && s.gridIncrements.copy(o.gridSpacing), o.backgroundObjectId && (s.backgroundObjectId = o.backgroundObjectId), s.gsView.center.copy(o.center), s.gsView.viewDirectionFromTarget.copy(o.viewDirectionFromTarget), s.gsView.viewTarget.copy(o.viewTarget), o.lensLength && (s.gsView.lensLength = o.lensLength), o.frontClippingPlane && (s.gsView.frontClippingPlane = o.frontClippingPlane), o.backClippingPlane && (s.gsView.backClippingPlane = o.backClippingPlane), o.viewHeight && (s.gsView.viewHeight = o.viewHeight), o.viewTwistAngle && (s.gsView.viewTwistAngle = o.viewTwistAngle), o.frozenLayers && (s.gsView.frozenLayers = o.frozenLayers), o.styleSheet && (s.gsView.styleSheet = o.styleSheet), o.renderMode && (s.gsView.renderMode = o.renderMode), o.viewMode && (s.gsView.viewMode = o.viewMode), o.ucsIconSetting && (s.gsView.ucsIconSetting = o.ucsIconSetting), o.ucsOrigin && s.gsView.ucsOrigin.copy(o.ucsOrigin), o.ucsXAxis && s.gsView.ucsXAxis.copy(o.ucsXAxis), o.ucsYAxis && s.gsView.ucsYAxis.copy(o.ucsYAxis), o.orthographicType && (s.gsView.orthographicType = o.orthographicType), o.shadePlotSetting && (s.gsView.shadePlotSetting = o.shadePlotSetting), o.shadePlotObjectId && (s.gsView.shadePlotObjectId = o.shadePlotObjectId), o.visualStyleObjectId && (s.gsView.visualStyleObjectId = o.visualStyleObjectId), o.isDefaultLightingOn && (s.gsView.isDefaultLightingOn = o.isDefaultLightingOn), o.defaultLightingType && (s.gsView.defaultLightingType = o.defaultLightingType), o.brightness && (s.gsView.brightness = o.brightness), o.contrast && (s.gsView.contrast = o.contrast), o.ambientColor && (s.gsView.ambientColor = o.ambientColor), n.tables.viewportTable.add(s);
+      const t = new ye();
+      this.processCommonTableEntryAttrs(o, t), o.circleSides && (t.circleSides = o.circleSides), t.standardFlag = o.standardFlag, t.center.copy(o.center), t.lowerLeftCorner.copy(o.lowerLeftCorner), t.upperRightCorner.copy(o.upperRightCorner), o.snapBasePoint && t.snapBase.copy(o.snapBasePoint), o.snapRotationAngle && (t.snapAngle = o.snapRotationAngle), o.snapSpacing && t.snapIncrements.copy(o.snapSpacing), o.majorGridLines && (t.gridMajor = o.majorGridLines), o.gridSpacing && t.gridIncrements.copy(o.gridSpacing), o.backgroundObjectId && (t.backgroundObjectId = o.backgroundObjectId), t.gsView.center.copy(o.center), t.gsView.viewDirectionFromTarget.copy(o.viewDirectionFromTarget), t.gsView.viewTarget.copy(o.viewTarget), o.lensLength && (t.gsView.lensLength = o.lensLength), o.frontClippingPlane && (t.gsView.frontClippingPlane = o.frontClippingPlane), o.backClippingPlane && (t.gsView.backClippingPlane = o.backClippingPlane), o.viewHeight && (t.gsView.viewHeight = o.viewHeight), o.viewTwistAngle && (t.gsView.viewTwistAngle = o.viewTwistAngle), o.frozenLayers && (t.gsView.frozenLayers = o.frozenLayers), o.styleSheet && (t.gsView.styleSheet = o.styleSheet), o.renderMode && (t.gsView.renderMode = o.renderMode), o.viewMode && (t.gsView.viewMode = o.viewMode), o.ucsIconSetting && (t.gsView.ucsIconSetting = o.ucsIconSetting), o.ucsOrigin && t.gsView.ucsOrigin.copy(o.ucsOrigin), o.ucsXAxis && t.gsView.ucsXAxis.copy(o.ucsXAxis), o.ucsYAxis && t.gsView.ucsYAxis.copy(o.ucsYAxis), o.orthographicType && (t.gsView.orthographicType = o.orthographicType), o.shadePlotSetting && (t.gsView.shadePlotSetting = o.shadePlotSetting), o.shadePlotObjectId && (t.gsView.shadePlotObjectId = o.shadePlotObjectId), o.visualStyleObjectId && (t.gsView.visualStyleObjectId = o.visualStyleObjectId), o.isDefaultLightingOn && (t.gsView.isDefaultLightingOn = o.isDefaultLightingOn), o.defaultLightingType && (t.gsView.defaultLightingType = o.defaultLightingType), o.brightness && (t.gsView.brightness = o.brightness), o.contrast && (t.gsView.contrast = o.contrast), o.ambientColor && (t.gsView.ambientColor = o.ambientColor), n.tables.viewportTable.add(t);
     });
   }
   processBlockTables(e, n) {
     e.tables.BLOCK_RECORD.entries.forEach((o) => {
-      let s = n.tables.blockTable.getAt(o.name);
-      s || (s = new we(), s.objectId = o.handle, s.name = o.name, s.ownerId = o.ownerHandle, s.origin.copy(o.basePoint), s.layoutId = o.layout, s.blockInsertUnits = o.insertionUnits, s.explodability = o.explodability, s.blockScaling = o.scalability, o.bmpPreview && (s.bmpPreview = o.bmpPreview), n.tables.blockTable.add(s)), !s.isModelSapce && o.entities && o.entities.length > 0 && this.processEntitiesInBlock(o.entities, s);
+      let t = n.tables.blockTable.getAt(o.name);
+      t || (t = new we(), t.objectId = o.handle, t.name = o.name, t.ownerId = o.ownerHandle, t.origin.copy(o.basePoint), t.layoutId = o.layout, t.blockInsertUnits = o.insertionUnits, t.explodability = o.explodability, t.blockScaling = o.scalability, o.bmpPreview && (t.bmpPreview = o.bmpPreview), n.tables.blockTable.add(t)), !t.isModelSapce && o.entities && o.entities.length > 0 && this.processEntitiesInBlock(o.entities, t);
     });
   }
   processBlocks(e, n) {
   }
   async processEntitiesInBlock(e, n) {
-    const t = new C(), o = e.length, s = [];
+    const s = new C(), o = e.length, t = [];
     for (let r = 0; r < o; r++) {
-      const a = e[r], c = t.convert(a);
-      c && s.push(c);
+      const a = e[r], c = s.convert(a);
+      c && t.push(c);
     }
-    n.appendEntity(s);
+    n.appendEntity(t);
   }
-  async processEntities(e, n, t, o, s) {
+  async processEntities(e, n, s, o, t) {
     const r = new C();
     let a = [];
     e.tables.BLOCK_RECORD.entries.forEach((l) => {
@@ -563,7 +565,7 @@ class Ce extends ue {
     const c = a.length, i = new Te(
       c,
       100 - o.value,
-      t
+      s
     );
     this.config.convertByEntityType && (a = this.groupAndFlattenByType(a));
     const d = n.tables.blockTable.modelSpace;
@@ -573,15 +575,15 @@ class Ce extends ue {
         const f = a[u], g = r.convert(f);
         g && p.push(g);
       }
-      if (d.appendEntity(p), s) {
+      if (d.appendEntity(p), t) {
         let u = o.value + h / c * (100 - o.value);
-        u > 100 && (u = 100), await s(u, "ENTITY", "IN-PROGRESS");
+        u > 100 && (u = 100), await t(u, "ENTITY", "IN-PROGRESS");
       }
     });
   }
   processHeader(e, n) {
-    const t = e.header;
-    t.CECOLOR && (t.CECOLOR.index >= 0 && t.CECOLOR.index <= 256 ? n.cecolor.colorIndex = t.CECOLOR.index : n.cecolor.setRGBValue(t.CECOLOR.rgb)), n.angBase = t.ANGBASE ?? 0, n.angDir = t.ANGDIR ?? 0, n.aunits = t.AUNITS ?? 0, n.celtype = t.CELTYPE ?? be, n.celtscale = t.CELTSCALE ?? 1, n.ltscale = t.LTSCALE ?? 1, t.EXTMAX && (n.extmax = t.EXTMAX), t.EXTMIN && (n.extmin = t.EXTMIN), n.insunits = t.INSUNITS ?? 1, n.pdmode = t.PDMODE ?? 0, n.pdsize = t.PDSIZE ?? 0, n.textstyle = t.TEXTSTYLE ?? L;
+    const s = e.header;
+    s.CECOLOR && (s.CECOLOR.index >= 0 && s.CECOLOR.index <= 256 ? n.cecolor.colorIndex = s.CECOLOR.index : n.cecolor.setRGBValue(s.CECOLOR.rgb)), n.angBase = s.ANGBASE ?? 0, n.angDir = s.ANGDIR ?? 0, n.aunits = s.AUNITS ?? 0, n.celtype = s.CELTYPE ?? be, n.celtscale = s.CELTSCALE ?? 1, n.ltscale = s.LTSCALE ?? 1, s.EXTMAX && (n.extmax = s.EXTMAX), s.EXTMIN && (n.extmin = s.EXTMIN), n.insunits = s.INSUNITS ?? 1, n.pdmode = s.PDMODE ?? 0, n.pdsize = s.PDSIZE ?? 0, n.textstyle = s.TEXTSTYLE ?? L;
   }
   processCommonTableEntryAttrs(e, n) {
     n.name = e.name, n.objectId = e.handle, n.ownerId = e.ownerHandle;
@@ -590,35 +592,35 @@ class Ce extends ue {
     this.processLayouts(e, n), this.processImageDefs(e, n);
   }
   processLayouts(e, n) {
-    const t = n.objects.layout;
-    e.objects.LAYOUT.forEach((s) => {
+    const s = n.objects.layout;
+    e.objects.LAYOUT.forEach((t) => {
       const r = new Pe();
-      r.layoutName = s.layoutName, r.tabOrder = s.tabOrder;
+      r.layoutName = t.layoutName, r.tabOrder = t.tabOrder;
       const a = n.tables.blockTable.newIterator();
-      r.objectId = s.handle;
+      r.objectId = t.handle;
       for (const c of a)
         if (c.layoutId === r.objectId) {
           r.blockTableRecordId = c.objectId;
           break;
         }
-      r.blockTableRecordId || s.layoutName === "Model" && (r.blockTableRecordId = n.tables.blockTable.modelSpace.objectId), r.limits.min.copy(s.minLimit), r.limits.max.copy(s.maxLimit), r.extents.min.copy(s.minExtent), r.extents.max.copy(s.maxExtent), s.viewportId && r.viewportArray.push(s.viewportId), this.processCommonObjectAttrs(s, r), t.setAt(r.layoutName, r);
+      r.blockTableRecordId || t.layoutName === "Model" && (r.blockTableRecordId = n.tables.blockTable.modelSpace.objectId), r.limits.min.copy(t.minLimit), r.limits.max.copy(t.maxLimit), r.extents.min.copy(t.minExtent), r.extents.max.copy(t.maxExtent), t.viewportId && r.viewportArray.push(t.viewportId), this.processCommonObjectAttrs(t, r), s.setAt(r.layoutName, r);
     });
   }
   processImageDefs(e, n) {
-    const t = n.objects.imageDefinition;
-    e.objects.IMAGEDEF.forEach((s) => {
+    const s = n.objects.imageDefinition;
+    e.objects.IMAGEDEF.forEach((t) => {
       const r = new Ee();
-      r.sourceFileName = s.fileName, this.processCommonObjectAttrs(s, r), t.setAt(r.objectId, r);
+      r.sourceFileName = t.fileName, this.processCommonObjectAttrs(t, r), s.setAt(r.objectId, r);
     });
   }
   processCommonObjectAttrs(e, n) {
     n.objectId = e.handle, n.ownerId = e.ownerHandle;
   }
   groupAndFlattenByType(e) {
-    const n = {}, t = [];
+    const n = {}, s = [];
     for (const o of e)
-      n[o.type] || (n[o.type] = [], t.push(o.type)), n[o.type].push(o);
-    return t.flatMap((o) => n[o]);
+      n[o.type] || (n[o.type] = [], s.push(o.type)), n[o.type].push(o);
+    return s.flatMap((o) => n[o]);
   }
   isModelSpace(e) {
     return e && e.toUpperCase() == Me;