@mlightcad/data-model 1.11.2 → 1.12.0

package/lib/dxf/AcDbNativeDxfConverter.js

@@ -0,0 +1,266 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { AcDbDxfFiler } from '../base/AcDbDxfFiler';
+import { AcDbDatabaseConverter } from '../database/AcDbDatabaseConverter';
+import { AcDbDxfDocumentReader } from './AcDbDxfDocumentReader';
+/**
+ * Progress weights mirror typical open cost: a small PARSE slice, a short FONT
+ * download, then most of the bar for ENTITY add/render (same idea as the old
+ * converter where ENTITY carried the largest step).
+ */
+var PARSE_START_PCT = 1;
+var PARSE_END_PCT = 12;
+var FONT_START_PCT = 13;
+var FONT_END_PCT = 18;
+var ENTITY_START_PCT = 20;
+var ENTITY_END_PCT = 98;
+/**
+ * Yields so the browser can paint loading UI before main-thread parse work.
+ */
+function yieldForPaint() {
+    return new Promise(function (resolve) {
+        if (typeof globalThis !== 'undefined' &&
+            typeof globalThis
+                .requestAnimationFrame === 'function') {
+            var raf_1 = globalThis.requestAnimationFrame;
+            raf_1(function () { return raf_1(function () { return resolve(); }); });
+        }
+        else {
+            setTimeout(resolve, 0);
+        }
+    });
+}
+/**
+ * Native DXF → database converter.
+ *
+ * Streams DXF pairs through {@link AcDbDxfFiler} / {@link AcDbDxfDocumentReader}
+ * directly into {@link AcDbDatabase}, avoiding the ParsedDxf JSON intermediate
+ * used by `@mlightcad/dxf-json-converter`.
+ *
+ * Conversion stages mirror {@link AcDbDatabaseConverter}:
+ * `START → PARSE → FONT → ENTITY → END`. The reader fills the database quietly
+ * (entity-appended events batched); fonts load on FONT; then the batch flushes
+ * so the first draw happens with fonts already available — no mid-parse FONT
+ * or post-open regen.
+ *
+ * Mid-PARSE byte progress, chunked ENTITY flush, and paint yields keep the
+ * status bar / spinner responsive while main-thread work runs.
+ */
+var AcDbNativeDxfConverter = /** @class */ (function (_super) {
+    __extends(AcDbNativeDxfConverter, _super);
+    function AcDbNativeDxfConverter(config) {
+        if (config === void 0) { config = {}; }
+        return _super.call(this, __assign({ useWorker: false }, config)) || this;
+    }
+    AcDbNativeDxfConverter.prototype.read = function (data, db, minimumChunkSize, progress, _timeout, _sysVars) {
+        return __awaiter(this, void 0, void 0, function () {
+            var emit, batchOpen, filer, totalBytes, lastParsePct_1, reader, result, chunkSize, lastEntityPct_1, error_1;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.progress = progress;
+                        emit = function (percentage, stage, status, stageData) { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (!progress)
+                                            return [2 /*return*/];
+                                        return [4 /*yield*/, progress(percentage, stage, status, stageData)];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); };
+                        return [4 /*yield*/, emit(0, 'START', 'START')];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, emit(PARSE_START_PCT, 'PARSE', 'START')
+                            // Let the open-file overlay paint before sync-heavy parse work.
+                        ];
+                    case 2:
+                        _a.sent();
+                        // Let the open-file overlay paint before sync-heavy parse work.
+                        return [4 /*yield*/, yieldForPaint()
+                            // Suppress entityAppended (and related) until FONT finishes so the viewer
+                            // does not worldDraw text before fontLoader.load has run.
+                        ];
+                    case 3:
+                        // Let the open-file overlay paint before sync-heavy parse work.
+                        _a.sent();
+                        // Suppress entityAppended (and related) until FONT finishes so the viewer
+                        // does not worldDraw text before fontLoader.load has run.
+                        db.beginEventBatch();
+                        batchOpen = true;
+                        _a.label = 4;
+                    case 4:
+                        _a.trys.push([4, 13, , 14]);
+                        filer = AcDbDxfFiler.fromBuffer(data, { database: db });
+                        totalBytes = data.byteLength;
+                        lastParsePct_1 = PARSE_START_PCT;
+                        reader = new AcDbDxfDocumentReader(db, {
+                            entityBatchSize: Math.max(1, minimumChunkSize || 200),
+                            totalBytes: totalBytes,
+                            onProgress: function (ratio) { return __awaiter(_this, void 0, void 0, function () {
+                                var pct;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            pct = Math.min(PARSE_END_PCT - 1, PARSE_START_PCT +
+                                                Math.floor(ratio * (PARSE_END_PCT - PARSE_START_PCT)));
+                                            if (pct <= lastParsePct_1)
+                                                return [2 /*return*/];
+                                            lastParsePct_1 = pct;
+                                            return [4 /*yield*/, emit(pct, 'PARSE', 'IN-PROGRESS')];
+                                        case 1:
+                                            _a.sent();
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); }
+                        });
+                        return [4 /*yield*/, reader.read(filer)];
+                    case 5:
+                        result = _a.sent();
+                        return [4 /*yield*/, emit(PARSE_END_PCT, 'PARSE', 'END', {
+                                unknownEntityCount: result.unknownEntityCount
+                            })
+                            // Same FONT contract as AcDbDxfConverter / AcDbDatabaseConverter.
+                        ];
+                    case 6:
+                        _a.sent();
+                        // Same FONT contract as AcDbDxfConverter / AcDbDatabaseConverter.
+                        return [4 /*yield*/, emit(FONT_START_PCT, 'FONT', 'START')];
+                    case 7:
+                        // Same FONT contract as AcDbDxfConverter / AcDbDatabaseConverter.
+                        _a.sent();
+                        return [4 /*yield*/, emit(FONT_END_PCT, 'FONT', 'END', result.fonts)];
+                    case 8:
+                        _a.sent();
+                        return [4 /*yield*/, emit(ENTITY_START_PCT, 'ENTITY', 'START')];
+                    case 9:
+                        _a.sent();
+                        chunkSize = Math.max(1, minimumChunkSize || 200);
+                        lastEntityPct_1 = ENTITY_START_PCT;
+                        // Flush queued entityAppended in chunks → first draw with fonts loaded,
+                        // while advancing most of the open-file progress bar.
+                        return [4 /*yield*/, db.endEventBatchChunked(chunkSize, function (flushed, total) { return __awaiter(_this, void 0, void 0, function () {
+                                var pct;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            pct = total <= 0
+                                                ? ENTITY_END_PCT
+                                                : Math.min(ENTITY_END_PCT, ENTITY_START_PCT +
+                                                    Math.floor((flushed / total) * (ENTITY_END_PCT - ENTITY_START_PCT)));
+                                            if (pct <= lastEntityPct_1)
+                                                return [2 /*return*/];
+                                            lastEntityPct_1 = pct;
+                                            return [4 /*yield*/, emit(pct, 'ENTITY', 'IN-PROGRESS')];
+                                        case 1:
+                                            _a.sent();
+                                            return [4 /*yield*/, yieldForPaint()];
+                                        case 2:
+                                            _a.sent();
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); })];
+                    case 10:
+                        // Flush queued entityAppended in chunks → first draw with fonts loaded,
+                        // while advancing most of the open-file progress bar.
+                        _a.sent();
+                        batchOpen = false;
+                        return [4 /*yield*/, emit(ENTITY_END_PCT, 'ENTITY', 'END')];
+                    case 11:
+                        _a.sent();
+                        return [4 /*yield*/, emit(100, 'END', 'END')];
+                    case 12:
+                        _a.sent();
+                        return [3 /*break*/, 14];
+                    case 13:
+                        error_1 = _a.sent();
+                        if (batchOpen) {
+                            db.endEventBatch();
+                        }
+                        throw error_1;
+                    case 14: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    AcDbNativeDxfConverter.prototype.parse = function (_data) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, { model: null, data: { unknownEntityCount: 0 } }];
+            });
+        });
+    };
+    AcDbNativeDxfConverter.prototype.getFonts = function (_model) {
+        return [];
+    };
+    return AcDbNativeDxfConverter;
+}(AcDbDatabaseConverter));
+export { AcDbNativeDxfConverter };
+//# sourceMappingURL=AcDbNativeDxfConverter.js.map

package/lib/dxf/AcDbNativeDxfConverter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcDbNativeDxfConverter.js","sourceRoot":"","sources":["../../src/dxf/AcDbNativeDxfConverter.ts"],"names":[],"mappings":"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"}

package/lib/dxf/index.d.ts

@@ -0,0 +1,12 @@
+export { acdbCreateEntityForDxfIn, acdbDxfInEntity } from './AcDbDxfEntityFactory';
+export { AcDbDxfDocumentReader } from './AcDbDxfDocumentReader';
+export type { AcDbDxfDocumentReaderOptions, AcDbDxfDocumentReaderResult } from './AcDbDxfDocumentReader';
+export { acdbDxfInAcdsData, acdbGetAcdsDataByOwnerHandle, acdbNormalizeDxfHandle } from './AcDbDxfAcdsDataReader';
+export type { AcDbAcdsDataSection } from './AcDbDxfAcdsDataReader';
+export { acdbDxfInHeader } from './AcDbDxfHeaderReader';
+export { AcDbNativeDxfConverter } from './AcDbNativeDxfConverter';
+export { AcDbDxfObjectsReader } from './AcDbDxfObjectsReader';
+export { acdbDxfInPolyline } from './AcDbDxfPolylineAssembler';
+export { acdbDxfVersionCaps } from './AcDbDxfVersionCaps';
+export type { AcDbDxfVersionCapabilities } from './AcDbDxfVersionCaps';
+//# sourceMappingURL=index.d.ts.map

package/lib/dxf/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dxf/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,YAAY,EACV,4BAA4B,EAC5B,2BAA2B,EAC5B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACL,iBAAiB,EACjB,4BAA4B,EAC5B,sBAAsB,EACvB,MAAM,yBAAyB,CAAA;AAChC,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,YAAY,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAA"}

package/lib/dxf/index.js

@@ -0,0 +1,9 @@
+export { acdbCreateEntityForDxfIn, acdbDxfInEntity } from './AcDbDxfEntityFactory';
+export { AcDbDxfDocumentReader } from './AcDbDxfDocumentReader';
+export { acdbDxfInAcdsData, acdbGetAcdsDataByOwnerHandle, acdbNormalizeDxfHandle } from './AcDbDxfAcdsDataReader';
+export { acdbDxfInHeader } from './AcDbDxfHeaderReader';
+export { AcDbNativeDxfConverter } from './AcDbNativeDxfConverter';
+export { AcDbDxfObjectsReader } from './AcDbDxfObjectsReader';
+export { acdbDxfInPolyline } from './AcDbDxfPolylineAssembler';
+export { acdbDxfVersionCaps } from './AcDbDxfVersionCaps';
+//# sourceMappingURL=index.js.map

package/lib/dxf/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dxf/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAK/D,OAAO,EACL,iBAAiB,EACjB,4BAA4B,EAC5B,sBAAsB,EACvB,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA"}

package/lib/dxf/registerNativeDxfConverter.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=registerNativeDxfConverter.d.ts.map

package/lib/dxf/registerNativeDxfConverter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registerNativeDxfConverter.d.ts","sourceRoot":"","sources":["../../src/dxf/registerNativeDxfConverter.ts"],"names":[],"mappings":""}

package/lib/dxf/registerNativeDxfConverter.js

@@ -0,0 +1,12 @@
+import { AcDbDatabaseConverterManager, AcDbFileType } from '../database/AcDbDatabaseConverterManager';
+import { AcDbNativeDxfConverter } from './AcDbNativeDxfConverter';
+/**
+ * Registers {@link AcDbNativeDxfConverter} as the default DXF converter.
+ *
+ * Importing `@mlightcad/data-model` runs this once so DXF files work without
+ * an explicit `register` call. Apps that prefer `@mlightcad/dxf-json-converter`
+ * (or another DXF converter) can call `register(AcDbFileType.DXF, …)` afterward;
+ * that replaces this default.
+ */
+AcDbDatabaseConverterManager.instance.register(AcDbFileType.DXF, new AcDbNativeDxfConverter());
+//# sourceMappingURL=registerNativeDxfConverter.js.map

package/lib/dxf/registerNativeDxfConverter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"registerNativeDxfConverter.js","sourceRoot":"","sources":["../../src/dxf/registerNativeDxfConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,YAAY,EACb,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE;;;;;;;GAOG;AACH,4BAA4B,CAAC,QAAQ,CAAC,QAAQ,CAC5C,YAAY,CAAC,GAAG,EAChB,IAAI,sBAAsB,EAAE,CAC7B,CAAA"}

package/lib/entity/AcDb3dSolid.d.ts

@@ -31,8 +31,16 @@ export declare class AcDb3dSolid extends AcDbEntity {
     get dxfTypeName(): string;
     /** Raw ACIS SAT text preserved for DXF round-trip and future B-rep parsing. */
     private _acisData;
+    /** Binary SAB/ASM payload from ACDSDATA, when present. */
+    private _sabBytes?;
     /** DXF group 70 ACIS version number, when present. */
     private _version?;
+    /** Soft-pointer to ACSH history object (DXF group 350). */
+    private _historyObjectSoftId?;
+    /** Revision GUID for the modeler geometry, when present (DXF group 2). */
+    private _guid?;
+    /** Whether the ASM/ACIS payload uses SAT text caching (DXF group 290). */
+    private _satCache?;
     /** Vertex positions used for extents and fallback bounding-box rendering. */
     private _points;
     /** Line-segment endpoint pairs for wireframe rendering (`[x,y,z,...]`). */
@@ -56,6 +64,40 @@ export declare class AcDb3dSolid extends AcDbEntity {
     get acisData(): string;
     /** DXF group 70 ACIS version number, when present. */
     get version(): number | undefined;
+    /**
+     * Soft-pointer handle to `ACSH_HISTORY_CLASS` (DXF group 350), when present.
+     * Resolved later when OBJECTS-section data is available.
+     */
+    get historyObjectSoftId(): string | undefined;
+    set historyObjectSoftId(value: string | undefined);
+    /**
+     * Revision GUID for the modeler geometry, when present (DXF group 2).
+     */
+    get guid(): string | undefined;
+    set guid(value: string | undefined);
+    /**
+     * Whether the ASM/ACIS payload uses SAT text caching (DXF group 290).
+     */
+    get satCache(): boolean | undefined;
+    set satCache(value: boolean | undefined);
+    /**
+     * Replaces the SAT/ACIS payload and rebuilds wireframe / point caches.
+     * Used by DXF import after constructing an empty solid.
+     */
+    setAcisData(satText: string, version?: number): void;
+    /**
+     * Attaches binary SAB/ASM bytes (typically from ACDSDATA) and rebuilds
+     * wireframe / point caches. Preferred over SAT text when both are present.
+     *
+     * @param sabBytes - Raw ASM_Data payload for this solid.
+     */
+    setSabBytes(sabBytes: Uint8Array | undefined): void;
+    /** Binary SAB/ASM payload attached via ACDSDATA or construction options. */
+    get sabBytes(): Uint8Array | undefined;
+    /**
+     * Rebuilds `_wireframe` / `_points` from SAB bytes (preferred) or SAT text.
+     */
+    private rebuildGeometryCaches;
     /**
      * Whether wireframe segments or fallback point data could be extracted from
      * the supplied SAB/SAT payload.
@@ -88,5 +130,6 @@ export declare class AcDb3dSolid extends AcDbEntity {
      * @returns The instance (for chaining).
      */
     dxfOutFields(filer: AcDbDxfFiler): this;
+    dxfInFields(filer: AcDbDxfFiler): this;
 }
 //# sourceMappingURL=AcDb3dSolid.d.ts.map

package/lib/entity/AcDb3dSolid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcDb3dSolid.d.ts","sourceRoot":"","sources":["../../src/entity/AcDb3dSolid.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,YAAY,EAEb,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAM3D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,UAAU,CAAA;IACrB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAkHD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACzC,2BAA2B;IAC3B,OAAgB,QAAQ,EAAE,MAAM,CAAY;IAE5C,IAAa,WAAW,WAEvB;IAED,+EAA+E;IAC/E,OAAO,CAAC,SAAS,CAAQ;IACzB,sDAAsD;IACtD,OAAO,CAAC,QAAQ,CAAC,CAAQ;IACzB,6EAA6E;IAC7E,OAAO,CAAC,OAAO,CAAe;IAC9B,2EAA2E;IAC3E,OAAO,CAAC,UAAU,CAAc;IAEhC;;;;;OAKG;gBACS,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAC9C;;;;OAIG;gBACS,OAAO,EAAE,kBAAkB;IA0BvC;;OAEG;IACH,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,sDAAsD;IACtD,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAED;;;OAGG;IACH,IAAI,qBAAqB,IAAI,OAAO,CAEnC;IAED,kBAAkB;IAClB,IAAI,gBAAgB,IAAI,SAAS,CAKhC;IAED;;;;;;;OAOG;IACH,WAAW,CAAC,MAAM,EAAE,YAAY;IAoBhC;;;;;;;OAOG;IACH,YAAY,CAAC,QAAQ,EAAE,YAAY;IAyCnC;;;;;OAKG;IACM,YAAY,CAAC,KAAK,EAAE,YAAY;CAmB1C"}
+{"version":3,"file":"AcDb3dSolid.d.ts","sourceRoot":"","sources":["../../src/entity/AcDb3dSolid.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,YAAY,EAEb,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAQ3D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,UAAU,CAAA;IACrB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAkHD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACzC,2BAA2B;IAC3B,OAAgB,QAAQ,EAAE,MAAM,CAAY;IAE5C,IAAa,WAAW,WAEvB;IAED,+EAA+E;IAC/E,OAAO,CAAC,SAAS,CAAQ;IACzB,0DAA0D;IAC1D,OAAO,CAAC,SAAS,CAAC,CAAY;IAC9B,sDAAsD;IACtD,OAAO,CAAC,QAAQ,CAAC,CAAQ;IACzB,2DAA2D;IAC3D,OAAO,CAAC,oBAAoB,CAAC,CAAQ;IACrC,0EAA0E;IAC1E,OAAO,CAAC,KAAK,CAAC,CAAQ;IACtB,0EAA0E;IAC1E,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,6EAA6E;IAC7E,OAAO,CAAC,OAAO,CAAoB;IACnC,2EAA2E;IAC3E,OAAO,CAAC,UAAU,CAAoC;IAEtD;;;;;OAKG;gBACS,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAC9C;;;;OAIG;gBACS,OAAO,EAAE,kBAAkB;IAavC;;OAEG;IACH,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,sDAAsD;IACtD,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAED;;;OAGG;IACH,IAAI,mBAAmB,IAAI,MAAM,GAAG,SAAS,CAE5C;IAED,IAAI,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEhD;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEjC;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,OAAO,GAAG,SAAS,CAElC;IAED,IAAI,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,EAEtC;IAED;;;OAGG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAQ7C;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,UAAU,GAAG,SAAS;IAM5C,4EAA4E;IAC5E,IAAI,QAAQ,IAAI,UAAU,GAAG,SAAS,CAErC;IAED;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAgB7B;;;OAGG;IACH,IAAI,qBAAqB,IAAI,OAAO,CAEnC;IAED,kBAAkB;IAClB,IAAI,gBAAgB,IAAI,SAAS,CAKhC;IAED;;;;;;;OAOG;IACH,WAAW,CAAC,MAAM,EAAE,YAAY;IAoBhC;;;;;;;OAOG;IACH,YAAY,CAAC,QAAQ,EAAE,YAAY;IAyCnC;;;;;OAKG;IACM,YAAY,CAAC,KAAK,EAAE,YAAY;IA0BhC,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;CAyDhD"}

package/lib/entity/AcDb3dSolid.js

@@ -25,7 +25,7 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 import { AcGeBox3d, AcGePoint3d } from '@mlightcad/geometry-engine';
-import { acdbAcisWireframeSegmentsFromSab, acdbAcisWireframeSegmentsFromSatText } from '../acis';
+import { acdbAcisWireframeSegmentsFromSab, acdbAcisWireframeSegmentsFromSatText, acdbAppendAcisPayloadFragment, acdbJoinAcisPayloadLines } from '../acis';
 import { AcDbEntity } from './AcDbEntity';
 /**
  * Matches classic SAT `point` records (`point $-1 x y z`) and ASM-style records
@@ -158,25 +158,16 @@ function resolveSolidPayload(input, version) {
 var AcDb3dSolid = /** @class */ (function (_super) {
     __extends(AcDb3dSolid, _super);
     function AcDb3dSolid(acisDataOrOptions, version) {
-        var _a;
         var _this = _super.call(this) || this;
+        /** Vertex positions used for extents and fallback bounding-box rendering. */
+        _this._points = [];
+        /** Line-segment endpoint pairs for wireframe rendering (`[x,y,z,...]`). */
+        _this._wireframe = new Float32Array(0);
         var payload = resolveSolidPayload(acisDataOrOptions, version);
         _this._acisData = payload.satText;
+        _this._sabBytes = payload.sabBytes;
         _this._version = payload.version;
-        var wireframe = new Float32Array(0);
-        if (payload.sabBytes && payload.sabBytes.length > 0) {
-            wireframe = (_a = acdbAcisWireframeSegmentsFromSab(payload.sabBytes)) !== null && _a !== void 0 ? _a : new Float32Array(0);
-        }
-        if (wireframe.length === 0 && payload.satText) {
-            wireframe = acdbAcisWireframeSegmentsFromSatText(payload.satText);
-        }
-        _this._wireframe = wireframe;
-        if (wireframe.length > 0) {
-            _this._points = pointsFromWireframe(wireframe);
-        }
-        else {
-            _this._points = extractAcisPointCloud(payload.satText);
-        }
+        _this.rebuildGeometryCaches();
         return _this;
     }
     Object.defineProperty(AcDb3dSolid.prototype, "dxfTypeName", {
@@ -204,6 +195,95 @@ var AcDb3dSolid = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(AcDb3dSolid.prototype, "historyObjectSoftId", {
+        /**
+         * Soft-pointer handle to `ACSH_HISTORY_CLASS` (DXF group 350), when present.
+         * Resolved later when OBJECTS-section data is available.
+         */
+        get: function () {
+            return this._historyObjectSoftId;
+        },
+        set: function (value) {
+            this._historyObjectSoftId = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(AcDb3dSolid.prototype, "guid", {
+        /**
+         * Revision GUID for the modeler geometry, when present (DXF group 2).
+         */
+        get: function () {
+            return this._guid;
+        },
+        set: function (value) {
+            this._guid = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(AcDb3dSolid.prototype, "satCache", {
+        /**
+         * Whether the ASM/ACIS payload uses SAT text caching (DXF group 290).
+         */
+        get: function () {
+            return this._satCache;
+        },
+        set: function (value) {
+            this._satCache = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    /**
+     * Replaces the SAT/ACIS payload and rebuilds wireframe / point caches.
+     * Used by DXF import after constructing an empty solid.
+     */
+    AcDb3dSolid.prototype.setAcisData = function (satText, version) {
+        this._acisData = satText !== null && satText !== void 0 ? satText : '';
+        if (version != null) {
+            this._version = version;
+        }
+        this.rebuildGeometryCaches();
+    };
+    /**
+     * Attaches binary SAB/ASM bytes (typically from ACDSDATA) and rebuilds
+     * wireframe / point caches. Preferred over SAT text when both are present.
+     *
+     * @param sabBytes - Raw ASM_Data payload for this solid.
+     */
+    AcDb3dSolid.prototype.setSabBytes = function (sabBytes) {
+        this._sabBytes =
+            sabBytes && sabBytes.length > 0 ? sabBytes : undefined;
+        this.rebuildGeometryCaches();
+    };
+    Object.defineProperty(AcDb3dSolid.prototype, "sabBytes", {
+        /** Binary SAB/ASM payload attached via ACDSDATA or construction options. */
+        get: function () {
+            return this._sabBytes;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    /**
+     * Rebuilds `_wireframe` / `_points` from SAB bytes (preferred) or SAT text.
+     */
+    AcDb3dSolid.prototype.rebuildGeometryCaches = function () {
+        var _a;
+        var wireframe = new Float32Array(0);
+        if (this._sabBytes && this._sabBytes.length > 0) {
+            wireframe =
+                (_a = acdbAcisWireframeSegmentsFromSab(this._sabBytes)) !== null && _a !== void 0 ? _a : new Float32Array(0);
+        }
+        if (wireframe.length === 0 && this._acisData) {
+            wireframe = acdbAcisWireframeSegmentsFromSatText(this._acisData);
+        }
+        this._wireframe = wireframe;
+        this._points =
+            wireframe.length > 0
+                ? pointsFromWireframe(wireframe)
+                : extractAcisPointCloud(this._acisData);
+    };
     Object.defineProperty(AcDb3dSolid.prototype, "hasRenderableGeometry", {
         /**
          * Whether wireframe segments or fallback point data could be extracted from
@@ -307,6 +387,12 @@ var AcDb3dSolid = /** @class */ (function (_super) {
         if (this._version != null) {
             filer.writeInt16(70, this._version);
         }
+        if (this._guid != null) {
+            filer.writeString(2, this._guid);
+        }
+        if (this._satCache != null) {
+            filer.writeInt16(290, this._satCache ? 1 : 0);
+        }
         var maxChunkLength = 255;
         var lines = this._acisData.split('\n');
         for (var i = 0; i < lines.length; i++) {
@@ -320,6 +406,58 @@ var AcDb3dSolid = /** @class */ (function (_super) {
         }
         return this;
     };
+    AcDb3dSolid.prototype.dxfInFields = function (filer) {
+        _super.prototype.dxfInFields.call(this, filer);
+        // DXF order: AcDbModelerGeometry (version + SAT chunks) then AcDb3dSolid
+        // (history / guid / satCache). Consume both subclass markers when present.
+        filer.atSubclassData('AcDbModelerGeometry');
+        var lines = [];
+        var version = this._version;
+        while (!filer.atEndOfObject && !filer.atEof && !filer.atExtendedData) {
+            var item = filer.peekItem();
+            if (!item)
+                break;
+            var code = Number(item.code);
+            // Nested subclass marker for AcDb3dSolid — consume and continue.
+            if (code === 100) {
+                filer.readItem();
+                var marker = String(item.value);
+                if (marker === 'AcDb3dSolid') {
+                    continue;
+                }
+                // Unknown subclass — push back and stop so callers can handle it.
+                filer.pushBackItem(item);
+                break;
+            }
+            filer.readItem();
+            var n = Number(item.value);
+            switch (code) {
+                case 1:
+                    acdbAppendAcisPayloadFragment(lines, 1, String(item.value));
+                    break;
+                case 3:
+                    acdbAppendAcisPayloadFragment(lines, 3, String(item.value));
+                    break;
+                case 70:
+                    version = n;
+                    break;
+                case 350:
+                    this._historyObjectSoftId = String(item.value);
+                    break;
+                case 2:
+                    this._guid = String(item.value);
+                    break;
+                case 290:
+                    this._satCache = n !== 0;
+                    break;
+                default:
+                    break;
+            }
+        }
+        // Decrypt obfuscated SAT fragments (DXF groups 1/3) the same way dxf-json does.
+        this.setAcisData(acdbJoinAcisPayloadLines(lines), version);
+        return this;
+    };
     /** The entity type name */
     AcDb3dSolid.typeName = '3dSolid';
     return AcDb3dSolid;