@node-projects/acad-ts 1.1.0 → 1.2.0

package/dist/IO/DWG/DwgStreamWriters/DwgObjectWriter.js

@@ -1,3 +1,4 @@
+import { CadObject } from '../../../CadObject.js';
 import { ACadVersion } from '../../../ACadVersion.js';
 import { DwgSectionIO } from '../DwgSectionIO.js';
 import { DwgSectionDefinition } from '../FileHeaders/DwgSectionDefinition.js';
@@ -28,7 +29,7 @@ import { Line } from '../../../Entities/Line.js';
 import { LwPolyline, LwPolylineFlags } from '../../../Entities/LwPolyline.js';
 import { Mesh } from '../../../Entities/Mesh.js';
 import { MLine, MLineFlags } from '../../../Entities/MLine.js';
-import { MText, BackgroundFillFlags } from '../../../Entities/MText.js';
+import { MText, BackgroundFillFlags, ColumnType } from '../../../Entities/MText.js';
 import { MultiLeader } from '../../../Entities/MultiLeader.js';
 import { Ole2Frame } from '../../../Entities/Ole2Frame.js';
 import { PdfUnderlay } from '../../../Entities/PdfUnderlay.js';
@@ -54,6 +55,7 @@ import { VertexFaceMesh } from '../../../Entities/VertexFaceMesh.js';
 import { PolygonMeshVertex } from '../../../Entities/PolygonMeshVertex.js';
 import { Viewport } from '../../../Entities/Viewport.js';
 import { XLine } from '../../../Entities/XLine.js';
+import { Seqend } from '../../../Entities/Seqend.js';
 import { BlockRecord, BlockTypeFlags } from '../../../Tables/BlockRecord.js';
 import { UnknownEntity } from '../../../Entities/UnknownEntity.js';
 import { Wall } from '../../../Entities/AecObjects/Wall.js';
@@ -126,6 +128,7 @@ import { PolylineFlags } from '../../../Entities/PolylineFlags.js';
 import { AttributeType } from '../../../Entities/AttributeBase.js';
 import { OrthographicType } from '../../../Types/OrthographicType.js';
 import { GroupCodeValueType } from '../../../GroupCodeValueType.js';
+import { encodeCadString, encodeUtf16Le } from '../../TextEncoding.js';
 export class DwgObjectWriter extends DwgSectionIO {
     get SectionName() { return DwgSectionDefinition.AcDbObjects; }
     /** Key: handle, Value: Offset */
@@ -195,7 +198,7 @@ export class DwgObjectWriter extends DwgSectionIO {
         this.writeCommonNonEntityData(this._document.lineTypes);
         //Common:
         //Numentries BL 70
-        this._writer.writeBitLong(this._document.lineTypes.length - 2);
+        this._writer.writeBitLong(this._document.lineTypes.count - 2);
         for (const item of this._document.lineTypes) {
             if (item.name.toLowerCase() === LineType.ByBlockName.toLowerCase()
                 || item.name.toLowerCase() === LineType.ByLayerName.toLowerCase()) {
@@ -203,8 +206,8 @@ export class DwgObjectWriter extends DwgSectionIO {
             }
             this._writer.handleReferenceTyped(DwgReferenceType.SoftOwnership, item);
         }
-        this._writer.handleReferenceTyped(DwgReferenceType.HardOwnership, this._document.lineTypes.ByBlock);
-        this._writer.handleReferenceTyped(DwgReferenceType.HardOwnership, this._document.lineTypes.ByLayer);
+        this._writer.handleReferenceTyped(DwgReferenceType.HardOwnership, this._document.lineTypes.byBlock);
+        this._writer.handleReferenceTyped(DwgReferenceType.HardOwnership, this._document.lineTypes.byLayer);
         this.registerObject(this._document.lineTypes);
         this.writeEntries(this._document.lineTypes);
     }
@@ -212,7 +215,7 @@ export class DwgObjectWriter extends DwgSectionIO {
         this.writeCommonNonEntityData(this._document.blockRecords);
         //Common:
         //Numentries BL 70
-        this._writer.writeBitLong(this._document.blockRecords.length - 2);
+        this._writer.writeBitLong(this._document.blockRecords.count - 2);
         for (const item of this._document.blockRecords) {
             if (item.name.toLowerCase() === BlockRecord.ModelSpaceName.toLowerCase()
                 || item.name.toLowerCase() === BlockRecord.PaperSpaceName.toLowerCase()) {
@@ -294,6 +297,8 @@ export class DwgObjectWriter extends DwgSectionIO {
         return Array.from(entities).filter(e => this.isEntitySupported(e));
     }
     isEntitySupported(entity) {
+        if (entity instanceof Seqend)
+            return false;
         if (entity instanceof UnknownEntity)
             return false;
         if (entity instanceof Shape)
@@ -323,10 +328,36 @@ export class DwgObjectWriter extends DwgSectionIO {
     }
     writeBlockHeader(record) {
         const entities = this.getCompatibleEntities(record.entities);
+        const ownedEntityHandles = entities.map((entity) => entity.handle);
+        const ownedObjectHandles = record.layout == null && record.ownedObjectHandles.length > 0
+            ? [...record.ownedObjectHandles]
+            : [...ownedEntityHandles];
+        for (const handle of ownedEntityHandles) {
+            if (!ownedObjectHandles.includes(handle)) {
+                ownedObjectHandles.push(handle);
+            }
+        }
+        const flags = record.combinedFlags;
+        const inserts = Array.from(this._document.entities)
+            .filter((item) => item instanceof Insert && item.block?.name === record.name);
+        const insertHandles = inserts.map((insert) => insert.handle);
+        if (record.name.toUpperCase().startsWith('*T')) {
+            for (const handle of record.insertHandles) {
+                if (!insertHandles.includes(handle)) {
+                    insertHandles.push(handle);
+                }
+            }
+        }
+        for (const insert of inserts) {
+            if (!insertHandles.includes(insert.handle)) {
+                insertHandles.push(insert.handle);
+            }
+        }
+        const insertsByHandle = new Map(inserts.map((insert) => [insert.handle, insert]));
         this.writeCommonNonEntityData(record);
         //Common:
         //Entry name TV 2
-        if ((record.flags & BlockTypeFlags.Anonymous) !== 0) {
+        if ((flags & BlockTypeFlags.Anonymous) !== 0) {
             this._writer.writeVariableText(record.name.substring(0, 2));
         }
         else if (record.layout != null) {
@@ -336,29 +367,27 @@ export class DwgObjectWriter extends DwgSectionIO {
         else {
             this._writer.writeVariableText(record.name);
         }
-        this.writeXrefDependantBit(record);
-        this._writer.writeBit((record.flags & BlockTypeFlags.Anonymous) !== 0);
+        this.writeXrefDependantBit({ flags });
+        this._writer.writeBit((flags & BlockTypeFlags.Anonymous) !== 0);
         this._writer.writeBit(record.hasAttributes);
-        this._writer.writeBit((record.flags & BlockTypeFlags.XRef) !== 0);
-        this._writer.writeBit((record.flags & BlockTypeFlags.XRefOverlay) !== 0);
+        this._writer.writeBit((flags & BlockTypeFlags.XRef) !== 0);
+        this._writer.writeBit((flags & BlockTypeFlags.XRefOverlay) !== 0);
         //R2000+:
         if (this.R2000Plus) {
             this._writer.writeBit(record.isUnloaded);
         }
         //R2004+:
         if (this.R2004Plus
-            && (record.flags & BlockTypeFlags.XRef) === 0
-            && (record.flags & BlockTypeFlags.XRefOverlay) === 0) {
-            this._writer.writeBitLong(entities.length);
+            && (flags & BlockTypeFlags.XRef) === 0
+            && (flags & BlockTypeFlags.XRefOverlay) === 0) {
+            this._writer.writeBitLong(ownedObjectHandles.length);
         }
         //Common:
         this._writer.write3BitDouble(record.blockEntity.basePoint);
         this._writer.writeVariableText(record.blockEntity.xRefPath);
         //R2000+:
         if (this.R2000Plus) {
-            const inserts = Array.from(this._document.entities)
-                .filter((i) => i instanceof Insert && i.block?.name === record.name);
-            for (const _item of inserts) {
+            for (const _handle of insertHandles) {
                 this._writer.writeByte(1);
             }
             this._writer.writeByte(0);
@@ -375,8 +404,8 @@ export class DwgObjectWriter extends DwgSectionIO {
         this._writer.handleReferenceTyped(DwgReferenceType.HardOwnership, record.blockEntity);
         //R13-R2000:
         if (this._version >= ACadVersion.AC1012 && this._version <= ACadVersion.AC1015
-            && (record.flags & BlockTypeFlags.XRef) === 0
-            && (record.flags & BlockTypeFlags.XRefOverlay) === 0) {
+            && (flags & BlockTypeFlags.XRef) === 0
+            && (flags & BlockTypeFlags.XRefOverlay) === 0) {
             if (entities.length > 0) {
                 this._writer.handleReferenceTyped(DwgReferenceType.SoftPointer, entities[0]);
                 this._writer.handleReferenceTyped(DwgReferenceType.SoftPointer, entities[entities.length - 1]);
@@ -388,18 +417,28 @@ export class DwgObjectWriter extends DwgSectionIO {
         }
         //R2004+:
         if (this.R2004Plus) {
-            for (const item of entities) {
-                this._writer.handleReferenceTyped(DwgReferenceType.HardOwnership, item);
+            for (const handle of ownedObjectHandles) {
+                const entity = entities.find((item) => item.handle === handle);
+                if (entity) {
+                    this._writer.handleReferenceTyped(DwgReferenceType.HardOwnership, entity);
+                }
+                else {
+                    this._writer.handleReferenceTypedHandle(DwgReferenceType.HardOwnership, handle);
+                }
             }
         }
         //Common:
         this._writer.handleReferenceTyped(DwgReferenceType.HardOwnership, record.blockEnd);
         //R2000+:
         if (this.R2000Plus) {
-            const inserts = Array.from(this._document.entities)
-                .filter((i) => i instanceof Insert && i.block?.name === record.name);
-            for (const item of inserts) {
-                this._writer.handleReferenceTyped(DwgReferenceType.SoftPointer, item);
+            for (const handle of insertHandles) {
+                const insert = insertsByHandle.get(handle);
+                if (insert) {
+                    this._writer.handleReferenceTyped(DwgReferenceType.SoftPointer, insert);
+                }
+                else {
+                    this._writer.handleReferenceTypedHandle(DwgReferenceType.SoftPointer, handle);
+                }
             }
             this._writer.handleReferenceTyped(DwgReferenceType.HardPointer, record.layout);
         }
@@ -934,7 +973,7 @@ export class DwgObjectWriter extends DwgSectionIO {
                 if (this.R2004Pre) {
                     if (this._document.classes.tryGetByName(cadObject.objectName)) {
                         const dxfClass = this._document.classes.getByName(cadObject.objectName);
-                        this._writer.writeObjectType(dxfClass.ClassNumber);
+                        this._writer.writeObjectType(dxfClass.classNumber);
                     }
                     else {
                         this.notify(`Dxf Class not found for ${cadObject.objectType} fullname: ${cadObject.constructor.name}`, NotificationType.Warning);
@@ -947,7 +986,7 @@ export class DwgObjectWriter extends DwgSectionIO {
             case ObjectType.UNLISTED:
                 if (this._document.classes.tryGetByName(cadObject.objectName)) {
                     const dxfClass = this._document.classes.getByName(cadObject.objectName);
-                    this._writer.writeObjectType(dxfClass.ClassNumber);
+                    this._writer.writeObjectType(dxfClass.classNumber);
                 }
                 else {
                     this.notify(`Dxf Class not found for ${cadObject.objectType} fullname: ${cadObject.constructor.name}`, NotificationType.Warning);
@@ -995,7 +1034,7 @@ export class DwgObjectWriter extends DwgSectionIO {
             this._writer.handleReferenceTyped(DwgReferenceType.HardPointer, entity.layer);
             const isbylayerlt = entity.lineType.name === LineType.ByLayerName;
             this._writer.writeBit(isbylayerlt);
-            if (isbylayerlt) {
+            if (isbylayerlt && entity.lineType.handle !== 0) {
                 this._writer.handleReferenceTyped(DwgReferenceType.HardPointer, entity.lineType);
             }
         }
@@ -1010,7 +1049,7 @@ export class DwgObjectWriter extends DwgSectionIO {
                 this._writer.handleReferenceTyped(DwgReferenceType.SoftPointer, this._next);
             }
         }
-        this._writer.writeEnColor(entity.color, entity.transparency);
+        this._writer.writeEnColorBook(entity.color, entity.transparency, entity.bookColor != null);
         if (this._version >= ACadVersion.AC1018 && entity.bookColor != null) {
             this._writer.handleReferenceTyped(DwgReferenceType.HardPointer, entity.bookColor);
         }
@@ -1102,15 +1141,24 @@ export class DwgObjectWriter extends DwgSectionIO {
                 for (let i = 0; i < 24; i++)
                     chunks.push(bytes[i]);
             }
-            else if ('ResolveReference' in record && 'Value' in record) {
-                // IExtendedDataHandleReference
+            else if ('resolveReference' in record && 'value' in record) {
                 const href = record;
-                let h = href.Value;
-                if (href.ResolveReference(this._document) == null) {
+                let h = href.value;
+                try {
+                    if (href.resolveReference(this._document) == null) {
+                        h = 0;
+                    }
+                }
+                catch {
                     h = 0;
                 }
                 const buf = new ArrayBuffer(8);
-                new DataView(buf).setFloat64(0, h, false); // big endian
+                let value = BigInt(Math.trunc(h));
+                const view = new DataView(buf);
+                for (let i = 7; i >= 0; i--) {
+                    view.setUint8(i, Number(value & 0xffn));
+                    value >>= 8n;
+                }
                 const bytes = new Uint8Array(buf);
                 for (let i = 0; i < 8; i++)
                     chunks.push(bytes[i]);
@@ -1131,7 +1179,7 @@ export class DwgObjectWriter extends DwgSectionIO {
                     const encodingIndex = CadUtils.getCodeIndex(CadUtils.getCodePage(this._writer.encoding));
                     const textBytes = this.encodeText(record.value || '');
                     const buf = new ArrayBuffer(2);
-                    new DataView(buf).setUint16(0, record.value.length, true);
+                    new DataView(buf).setUint16(0, textBytes.length, true);
                     const lenBytes = new Uint8Array(buf);
                     chunks.push(lenBytes[0], lenBytes[1]);
                     chunks.push(encodingIndex);
@@ -1182,6 +1230,10 @@ export class DwgObjectWriter extends DwgSectionIO {
     }
     // ==================== Entity Writers ====================
     writeEntity(entity) {
+        if (entity instanceof Seqend) {
+            this.writeSeqend(entity);
+            return;
+        }
         const children = [];
         let seqend = null;
         this.writeCommonEntityData(entity);
@@ -2378,6 +2430,23 @@ export class DwgObjectWriter extends DwgSectionIO {
         this._writer.writeBitDouble(mtext.rectangleHeight);
         this._writer.writeBitDouble(mtext.horizontalWidth);
         this._writer.writeBitDouble(mtext.verticalHeight);
+        const columnData = mtext.columnData;
+        const columnType = columnData?.columnType ?? ColumnType.NoColumns;
+        this._writer.writeBitShort(columnType);
+        if (columnType === ColumnType.NoColumns || columnData == null) {
+            return;
+        }
+        const columnCount = columnData.columnCount;
+        this._writer.writeBitLong(columnCount);
+        this._writer.writeBitDouble(columnData.width);
+        this._writer.writeBitDouble(columnData.gutter);
+        this._writer.writeBit(columnData.autoHeight);
+        this._writer.writeBit(columnData.flowReversed);
+        if (!columnData.autoHeight && columnType === ColumnType.DynamicColumns) {
+            for (const height of columnData.heights) {
+                this._writer.writeBitDouble(height);
+            }
+        }
     }
     writeFaceRecord(face) {
         this._writer.writeBitShort(face.index1);
@@ -3166,6 +3235,18 @@ export class DwgObjectWriter extends DwgSectionIO {
     }
     writeXRecord(xrecord) {
         const chunks = [];
+        const getHandleValue = (value) => {
+            if (typeof value === 'number') {
+                return value;
+            }
+            if (typeof value === 'bigint') {
+                return Number(value);
+            }
+            if (value instanceof CadObject) {
+                return value.handle;
+            }
+            return 0;
+        };
         const pushInt16LE = (v) => {
             chunks.push(v & 0xFF, (v >> 8) & 0xFF);
         };
@@ -3173,13 +3254,11 @@ export class DwgObjectWriter extends DwgSectionIO {
             chunks.push(v & 0xFF, (v >> 8) & 0xFF, (v >> 16) & 0xFF, (v >> 24) & 0xFF);
         };
         const pushInt64LE = (v) => {
-            // For handles, write as 8 bytes LE
-            const buf = new ArrayBuffer(8);
-            const dv = new DataView(buf);
-            dv.setFloat64(0, v, true);
-            const bytes = new Uint8Array(buf);
-            for (let i = 0; i < 8; i++)
-                chunks.push(bytes[i]);
+            let value = typeof v === 'bigint' ? v : BigInt(Math.trunc(v));
+            value = BigInt.asUintN(64, value);
+            for (let i = 0; i < 8; i++) {
+                chunks.push(Number((value >> BigInt(i * 8)) & 0xffn));
+            }
         };
         const pushFloat64LE = (v) => {
             const buf = new ArrayBuffer(8);
@@ -3191,8 +3270,13 @@ export class DwgObjectWriter extends DwgSectionIO {
         for (const entry of xrecord.entries) {
             if (entry.value == null)
                 continue;
-            pushInt16LE(entry.code);
             const groupValueType = GroupCodeValue.transformValue(entry.code);
+            if ((groupValueType === GroupCodeValueType.ObjectId
+                || groupValueType === GroupCodeValueType.ExtendedDataHandle)
+                && getHandleValue(entry.value) === 0) {
+                continue;
+            }
+            pushInt16LE(entry.code);
             switch (groupValueType) {
                 case GroupCodeValueType.Byte:
                 case GroupCodeValueType.Bool:
@@ -3229,8 +3313,8 @@ export class DwgObjectWriter extends DwgSectionIO {
                     break;
                 }
                 case GroupCodeValueType.Handle: {
-                    const ref = entry.getReference();
-                    const text = ref == null ? '' : ref.handle.toString(16).toUpperCase();
+                    const handle = getHandleValue(entry.value);
+                    const text = handle === 0 ? '' : handle.toString(16).toUpperCase();
                     this.writeStringInChunks(chunks, text);
                     break;
                 }
@@ -3240,8 +3324,7 @@ export class DwgObjectWriter extends DwgSectionIO {
                     break;
                 case GroupCodeValueType.ObjectId:
                 case GroupCodeValueType.ExtendedDataHandle: {
-                    const ref2 = entry.getReference();
-                    const handle = ref2 == null ? 0 : ref2.handle;
+                    const handle = getHandleValue(entry.value);
                     pushInt64LE(handle);
                     break;
                 }
@@ -3274,31 +3357,20 @@ export class DwgObjectWriter extends DwgSectionIO {
             chunks.push(codeIndex);
         }
         else {
-            const len = text.length;
+            const bytes = this.encodeText(text);
+            const len = bytes.length;
             chunks.push(len & 0xFF, (len >> 8) & 0xFF);
             const codeIndex = CadUtils.getCodeIndex(CadUtils.getCodePage(this._writer.encoding));
             chunks.push(codeIndex);
-            const bytes = this.encodeText(text);
             for (let i = 0; i < bytes.length; i++)
                 chunks.push(bytes[i]);
         }
     }
     encodeUtf16LE(text) {
-        const buf = new Uint8Array(text.length * 2);
-        for (let i = 0; i < text.length; i++) {
-            const code = text.charCodeAt(i);
-            buf[i * 2] = code & 0xFF;
-            buf[i * 2 + 1] = (code >> 8) & 0xFF;
-        }
-        return buf;
+        return encodeUtf16Le(text);
     }
     encodeText(text) {
-        // Simple ASCII encoding; for full codepage support, extend as needed
-        const buf = new Uint8Array(text.length);
-        for (let i = 0; i < text.length; i++) {
-            buf[i] = text.charCodeAt(i) & 0xFF;
-        }
-        return buf;
+        return encodeCadString(text, this._writer.encoding);
     }
 }
 //# sourceMappingURL=DwgObjectWriter.js.map