@mlightcad/data-model 1.11.2 → 1.12.0

package/lib/database/AcDbDatabase.js

@@ -103,6 +103,7 @@ import { AcDbObject, TEMP_OBJECT_ID_PREFIX } from '../base/AcDbObject';
 import { AcDbOpenMode } from '../base/AcDbOpenMode';
 import { AcDbRegenerator } from '../converter/AcDbRegenerator';
 import { AcDbDatabaseConverterManager, AcDbFileType } from './AcDbDatabaseConverterManager';
+import { AcDbPolyline } from '../entity/AcDbPolyline';
 import { ACAD_APPID, ACTIVE_VPORT_NAME, ByBlock, ByLayer, DEFAULT_MLEADER_STYLE, DEFAULT_MLINE_STYLE, DEFAULT_LINE_TYPE, DEFAULT_TEXT_STYLE, MLIGHTCAD_APPID } from '../misc/AcDbConstants';
 import { AcDbAngleUnits } from '../misc/AcDbAngleUnits';
 import { AcDbDataGenerator } from '../misc/AcDbDataGenerator';
@@ -115,6 +116,7 @@ import { AcDbMlineStyle } from '../object/AcDbMlineStyle';
 import { AcDbXrecord } from '../object/AcDbXrecord';
 import { AcLyLayerFilterTree } from '../ly/AcLyLayerFilterTree';
 import { ACAD_LAYERFILTERS_NAME, ACLY_DICTIONARY_NAME, acdbLayerGroupsToResultBuffer, acdbSerializeLayerFilterTree } from '../ly/AcLyLayerFilterIO';
+import { acdbBytesToHexString } from '../misc/proxyGraphic';
 import { AcDbBlockTable } from './AcDbBlockTable';
 import { AcDbBlockTableRecord } from './AcDbBlockTableRecord';
 import { AcDbOpenDatabaseError } from './AcDbOpenDatabaseError';
@@ -126,6 +128,7 @@ import { AcDbLinetypeTable } from './AcDbLinetypeTable';
 import { AcDbLinetypeTableRecord } from './AcDbLinetypeTableRecord';
 import { AcDbTextStyleTable } from './AcDbTextStyleTable';
 import { AcDbTextStyleTableRecord } from './AcDbTextStyleTableRecord';
+import { AcDbUcsTable } from './AcDbUcsTable';
 import { AcDbViewTable } from './AcDbViewTable';
 import { AcDbViewportTable } from './AcDbViewportTable';
 import { AcDbViewportTableRecord } from './AcDbViewportTableRecord';
@@ -228,6 +231,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
         _this._hplayer = '.';
         _this._hptransparency = new AcCmTransparency();
         _this._textstyle = DEFAULT_TEXT_STYLE;
+        _this._dimstyle = DEFAULT_TEXT_STYLE;
         _this._extents = new AcGeBox3d();
         // TODO: Default value is 1 (imperial) or 4 (metric)
         _this._insunits = AcDbUnitsValue.Millimeters;
@@ -235,6 +239,8 @@ var AcDbDatabase = /** @class */ (function (_super) {
         _this._measurement = 1;
         _this._ltscale = 1;
         _this._lwdisplay = false;
+        _this._tilemode = true;
+        _this._psltscale = true;
         _this._pdmode = 0;
         _this._pdsize = 0;
         _this._osmode = 0;
@@ -246,18 +252,21 @@ var AcDbDatabase = /** @class */ (function (_super) {
             dimStyleTable: new AcDbDimStyleTable(_this),
             linetypeTable: new AcDbLinetypeTable(_this),
             textStyleTable: new AcDbTextStyleTable(_this),
+            ucsTable: new AcDbUcsTable(_this),
             viewTable: new AcDbViewTable(_this),
             layerTable: new AcDbLayerTable(_this),
             viewportTable: new AcDbViewportTable(_this)
         };
         _this._objects = {
             dictionary: new AcDbDictionary(_this),
+            group: new AcDbDictionary(_this),
             imageDefinition: new AcDbDictionary(_this),
             layerFilter: new AcDbDictionary(_this),
             layerIndex: new AcDbDictionary(_this),
             layout: new AcDbLayoutDictionary(_this),
             mleaderStyle: new AcDbDictionary(_this),
             mlineStyle: new AcDbDictionary(_this),
+            sortentsTable: new AcDbDictionary(_this),
             xrecord: new AcDbDictionary(_this)
         };
         _this._layerFilters = new AcLyLayerFilterTree();
@@ -451,12 +460,14 @@ var AcDbDatabase = /** @class */ (function (_super) {
     AcDbDatabase.prototype.getRootDictionaries = function () {
         return [
             this.objects.dictionary,
+            this.objects.group,
             this.objects.imageDefinition,
             this.objects.layerFilter,
             this.objects.layerIndex,
             this.objects.layout,
             this.objects.mleaderStyle,
             this.objects.mlineStyle,
+            this.objects.sortentsTable,
             this.objects.xrecord
         ];
     };
@@ -480,6 +491,77 @@ var AcDbDatabase = /** @class */ (function (_super) {
             this.flushEventBatch();
         }
     };
+    /**
+     * Ends the outermost event batch, flushing `entityAppended` notifications in
+     * chunks so converters can report ENTITY progress while the viewer adds/renders.
+     *
+     * Nested batches still require matching {@link endEventBatch} /
+     * {@link endEventBatchChunked} calls; only the outermost close flushes.
+     *
+     * @param chunkSize - Max entities per `entityAppended` dispatch
+     * @param onChunk - Called after each chunk with `(flushed, total)`
+     */
+    AcDbDatabase.prototype.endEventBatchChunked = function (chunkSize, onChunk) {
+        return __awaiter(this, void 0, void 0, function () {
+            var appended, total, size, flushed, i, end, chunk;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this._eventBatchDepth <= 0) {
+                            return [2 /*return*/];
+                        }
+                        this._eventBatchDepth--;
+                        if (this._eventBatchDepth !== 0) {
+                            return [2 /*return*/];
+                        }
+                        this.transactionManager.flushPendingEntityModifiedEvents();
+                        this.transactionManager.flushPendingLayerModifiedEvents();
+                        appended = this._pendingEntityAppended;
+                        this._pendingEntityAppended = [];
+                        total = appended.length;
+                        size = Math.max(1, chunkSize);
+                        if (total === 0) {
+                            this.flushEventBatchRemainder();
+                            return [2 /*return*/];
+                        }
+                        flushed = 0;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 6, 7]);
+                        i = 0;
+                        _a.label = 2;
+                    case 2:
+                        if (!(i < total)) return [3 /*break*/, 5];
+                        end = Math.min(i + size, total);
+                        chunk = appended.slice(i, end);
+                        this.events.entityAppended.dispatch({
+                            database: this,
+                            entity: chunk
+                        });
+                        flushed = end;
+                        if (!onChunk) return [3 /*break*/, 4];
+                        return [4 /*yield*/, onChunk(end, total)];
+                    case 3:
+                        _a.sent();
+                        _a.label = 4;
+                    case 4:
+                        i += size;
+                        return [3 /*break*/, 2];
+                    case 5: return [3 /*break*/, 7];
+                    case 6:
+                        if (flushed < total) {
+                            this.events.entityAppended.dispatch({
+                                database: this,
+                                entity: appended.slice(flushed)
+                            });
+                        }
+                        this.flushEventBatchRemainder();
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * Returns true when database events are being batched.
      */
@@ -560,7 +642,6 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * Appended and erased entities are dispatched in batch arrays where applicable.
      */
     AcDbDatabase.prototype.flushEventBatch = function () {
-        var e_1, _a, e_2, _b;
         if (this._pendingEntityAppended.length > 0) {
             var appended = this._pendingEntityAppended;
             this._pendingEntityAppended = [];
@@ -569,6 +650,11 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 entity: appended
             });
         }
+        this.flushEventBatchRemainder();
+    };
+    /** Flushes non-append batch queues (erase / dictionary) after entity appends. */
+    AcDbDatabase.prototype.flushEventBatchRemainder = function () {
+        var e_1, _a, e_2, _b;
         if (this._pendingEntityErased.length > 0) {
             var erased = this._pendingEntityErased;
             this._pendingEntityErased = [];
@@ -757,6 +843,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 this._tables.linetypeTable,
                 this._tables.appIdTable,
                 this._tables.textStyleTable,
+                this._tables.ucsTable,
                 this._tables.viewTable,
                 this._tables.viewportTable
             ]), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -774,12 +861,14 @@ var AcDbDatabase = /** @class */ (function (_super) {
         try {
             for (var _e = __values([
                 this._objects.dictionary,
+                this._objects.group,
                 this._objects.imageDefinition,
                 this._objects.layerFilter,
                 this._objects.layerIndex,
                 this._objects.layout,
                 this._objects.mleaderStyle,
                 this._objects.mlineStyle,
+                this._objects.sortentsTable,
                 this._objects.xrecord
             ]), _f = _e.next(); !_f.done; _f = _e.next()) {
                 var dictionary = _f.value;
@@ -1257,6 +1346,29 @@ var AcDbDatabase = /** @class */ (function (_super) {
             _this._dwgname = nextValue;
         });
     };
+    Object.defineProperty(AcDbDatabase.prototype, "thumbnailImage", {
+        /**
+         * Gets or sets the drawing thumbnail preview image.
+         *
+         * Corresponds to AutoCAD .NET `Database.ThumbnailBitmap`, DXF
+         * `THUMBNAILIMAGE` section (group codes 90/310), and the DWG file preview.
+         * Stored as raw image bytes (typically BMP/DIB or PNG).
+         *
+         * @returns Thumbnail image bytes, or `undefined` when none exist.
+         */
+        get: function () {
+            return this._thumbnailImage;
+        },
+        set: function (value) {
+            if (!value || value.length === 0) {
+                this._thumbnailImage = undefined;
+                return;
+            }
+            this._thumbnailImage = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * Returns whether entities on the given layer should be drawn under the
      * current {@link drawNoPlotLayers} setting.
@@ -1271,6 +1383,28 @@ var AcDbDatabase = /** @class */ (function (_super) {
         var layer = this.tables.layerTable.getAt(layerName);
         return layer == null || layer.isPlottable;
     };
+    Object.defineProperty(AcDbDatabase.prototype, "tilemode", {
+        /** TILEMODE: true = model space (1), false = paper space (0). */
+        get: function () {
+            return this._tilemode;
+        },
+        set: function (value) {
+            this._tilemode = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(AcDbDatabase.prototype, "psltscale", {
+        /** PSLTSCALE: paper space linetype scaling. */
+        get: function () {
+            return this._psltscale;
+        },
+        set: function (value) {
+            this._psltscale = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(AcDbDatabase.prototype, "cecolor", {
         /**
          * Gets the color of new objects as they are created.
@@ -1517,6 +1651,22 @@ var AcDbDatabase = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(AcDbDatabase.prototype, "dimstyle", {
+        /**
+         * The dimension style name for new dimension objects (`$DIMSTYLE`).
+         */
+        get: function () {
+            return this._dimstyle;
+        },
+        set: function (value) {
+            var _this = this;
+            this.updateSysVar(AcDbSystemVariables.DIMSTYLE, this._dimstyle, value !== null && value !== void 0 ? value : DEFAULT_TEXT_STYLE, function (nextValue) {
+                _this._dimstyle = nextValue;
+            });
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(AcDbDatabase.prototype, "angbase", {
         /**
          * The zero (0) base angle with respect to the current UCS in radians.
@@ -1778,7 +1928,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, options.fontLoader.load(fonts_1)];
+                        return [4 /*yield*/, this.loadFontsWithProgress(options.fontLoader, fonts_1, percentage)];
                     case 2:
                         _b.sent();
                         return [3 /*break*/, 4];
@@ -1805,6 +1955,49 @@ var AcDbDatabase = /** @class */ (function (_super) {
             });
         }); };
     };
+    /**
+     * Loads fonts while emitting FONT IN-PROGRESS so the open-file bar keeps
+     * moving during multi-font downloads (native DXF parses on the main thread
+     * and previously appeared stuck at the FONT stage).
+     */
+    AcDbDatabase.prototype.loadFontsWithProgress = function (fontLoader, fonts, basePercentage) {
+        return __awaiter(this, void 0, void 0, function () {
+            var span, i, pct;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(fonts.length <= 1)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, fontLoader.load(fonts)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                    case 2:
+                        span = Math.max(1, Math.min(5, 19 - basePercentage));
+                        i = 0;
+                        _a.label = 3;
+                    case 3:
+                        if (!(i < fonts.length)) return [3 /*break*/, 6];
+                        return [4 /*yield*/, fontLoader.load([fonts[i]])];
+                    case 4:
+                        _a.sent();
+                        pct = Math.min(19, basePercentage + Math.round(((i + 1) / fonts.length) * span));
+                        this.events.openProgress.dispatch({
+                            database: this,
+                            percentage: pct,
+                            stage: 'CONVERSION',
+                            subStage: 'FONT',
+                            subStageStatus: 'IN-PROGRESS',
+                            data: fonts
+                        });
+                        _a.label = 5;
+                    case 5:
+                        i++;
+                        return [3 /*break*/, 3];
+                    case 6: return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * Read AutoCAD DXF or DWG drawing specified by the URL into the database object.
      * The method automatically detects the file type based on the URL extension:
@@ -1921,36 +2114,44 @@ var AcDbDatabase = /** @class */ (function (_super) {
         });
     };
     /**
-     * Exports the current database into an ASCII DXF string.
+     * Exports the current database into DXF (ASCII string or binary bytes).
      *
      * The `fileName` parameter is kept for ObjectARX API parity. In this web
      * implementation the method returns the DXF payload instead of writing the
      * filesystem directly.
      *
-     * This is the top-level DXF export entry point. It emits the sectioned
-     * structure in the canonical order: HEADER, TABLES, BLOCKS, ENTITIES,
-     * OBJECTS, and EOF.
-     *
      * @param _fileName - Kept for ObjectARX parity. Ignored in this implementation.
      * @param precision - Numeric precision used by the DXF filer.
      * @param version - Target DXF/DWG version name or value.
-     * @param _saveThumbnailImage - Kept for ObjectARX parity. Ignored here.
-     * @returns The serialized DXF contents.
+     * @param optionsOrThumbnail - Legacy boolean thumbnail flag, or options with
+     *   `saveThumbnailImage` and `format: 'ascii' | 'binary'`.
+     * @returns ASCII DXF string, or `Uint8Array` when format is `'binary'`.
      */
-    AcDbDatabase.prototype.dxfOut = function (_fileName, precision, version, _saveThumbnailImage) {
+    AcDbDatabase.prototype.dxfOut = function (_fileName, precision, version, optionsOrThumbnail) {
+        var _a, _b;
         if (precision === void 0) { precision = 16; }
         if (version === void 0) { version = this.version.name; }
-        if (_saveThumbnailImage === void 0) { _saveThumbnailImage = false; }
+        if (optionsOrThumbnail === void 0) { optionsOrThumbnail = false; }
         this.ensureDatabaseDefaults();
         if (this._layerFilters.root.getNestedFilters().length > 0 &&
             !this.tables.layerTable.extensionDictionary) {
             this.tables.layerTable.extensionDictionary = this.generateHandle();
         }
+        var options = typeof optionsOrThumbnail === 'boolean'
+            ? {
+                saveThumbnailImage: optionsOrThumbnail,
+                format: 'ascii'
+            }
+            : {
+                saveThumbnailImage: (_a = optionsOrThumbnail.saveThumbnailImage) !== null && _a !== void 0 ? _a : false,
+                format: (_b = optionsOrThumbnail.format) !== null && _b !== void 0 ? _b : 'ascii'
+            };
         var outVersion = version instanceof AcDbDwgVersion ? version : new AcDbDwgVersion(version);
         var filer = new AcDbDxfFiler({
             database: this,
             precision: precision,
-            version: outVersion
+            version: outVersion,
+            outputFormat: options.format
         });
         this.writeDxfHeaderSection(filer);
         this.writeDxfClassesSection(filer);
@@ -1958,8 +2159,9 @@ var AcDbDatabase = /** @class */ (function (_super) {
         this.writeDxfBlocksSection(filer);
         this.writeDxfEntitiesSection(filer);
         this.writeDxfObjectsSection(filer);
+        this.writeDxfThumbnailImageSection(filer, options.saveThumbnailImage);
         filer.writeStart('EOF');
-        return filer.toString();
+        return options.format === 'binary' ? filer.toBinary() : filer.toString();
     };
     /**
      * Triggers xxxAppended events with data in the database to redraw the associated viewer.
@@ -2274,7 +2476,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
         filer.writeString(1, (_b = (_a = filer.version) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : this.version.name);
         filer.writeString(9, '$HANDSEED');
         filer.writeString(5, filer.nextHandle.toString(16).toUpperCase());
-        if (filer.version != null && filer.version.value >= 27) {
+        if (filer.capabilities.supportsUtf8CodePage) {
             filer.writeString(9, '$DWGCODEPAGE');
             filer.writeString(3, 'UTF-8');
         }
@@ -2290,13 +2492,28 @@ var AcDbDatabase = /** @class */ (function (_super) {
         filer.writeInt16(70, this.measurement);
         filer.writeString(9, '$LTSCALE');
         filer.writeDouble(40, this.ltscale);
-        filer.writeString(9, '$LWDISPLAY');
-        filer.writeInt16(70, this.lwdisplay ? 1 : 0);
+        if (filer.capabilities.supportsLineWeight) {
+            filer.writeString(9, '$LWDISPLAY');
+            filer.writeInt16(70, this.lwdisplay ? 1 : 0);
+        }
+        filer.writeString(9, '$CELTSCALE');
+        filer.writeDouble(40, this.celtscale);
+        if (filer.capabilities.supportsLineWeight) {
+            filer.writeString(9, '$CELWEIGHT');
+            filer.writeLineWeight(370, this.celweight);
+        }
+        filer.writeString(9, '$CECOLOR');
+        filer.writeCmColor(this.cecolor);
+        filer.writeString(9, '$TILEMODE');
+        filer.writeInt16(70, this.tilemode ? 1 : 0);
+        filer.writeString(9, '$PSLTSCALE');
+        filer.writeInt16(70, this.psltscale ? 1 : 0);
         filer.writeString(9, '$CLAYER');
         filer.writeString(8, this.clayer);
         filer.writeString(9, '$CELTYPE');
         filer.writeString(6, this.celtype);
-        if (!this.cetransparency.isInvalid) {
+        if (filer.capabilities.supportsTransparency &&
+            !this.cetransparency.isInvalid) {
             filer.writeString(9, '$CETRANSPARENCY');
             filer.writeTransparency(this.cetransparency);
         }
@@ -2316,12 +2533,15 @@ var AcDbDatabase = /** @class */ (function (_super) {
         }
         filer.writeString(9, '$HPLAYER');
         filer.writeString(8, this.hplayer);
-        if (!this.hptransparency.isInvalid) {
+        if (filer.capabilities.supportsTransparency &&
+            !this.hptransparency.isInvalid) {
             filer.writeString(9, '$HPTRANSPARENCY');
             filer.writeTransparency(this.hptransparency);
         }
         filer.writeString(9, '$TEXTSTYLE');
         filer.writeString(7, this.textstyle);
+        filer.writeString(9, '$DIMSTYLE');
+        filer.writeString(2, this.dimstyle);
         filer.writeString(9, '$ANGBASE');
         filer.writeAngle(50, this.angbase);
         filer.writeString(9, '$ANGDIR');
@@ -2354,7 +2574,8 @@ var AcDbDatabase = /** @class */ (function (_super) {
      */
     AcDbDatabase.prototype.writeDxfClassesSection = function (filer) {
         var e_10, _a;
-        if (this._classes.length === 0) {
+        if (!filer.capabilities.supportsClassesSection ||
+            this._classes.length === 0) {
             return;
         }
         filer.startSection('CLASSES');
@@ -2390,12 +2611,13 @@ var AcDbDatabase = /** @class */ (function (_super) {
         filer.startSection('TABLES');
         this.writeDxfTable(filer, 'VPORT', this.tables.viewportTable, this.tables.viewportTable.newIterator(), 'VPORT');
         this.writeDxfTable(filer, 'VIEW', this.tables.viewTable, this.tables.viewTable.newIterator(), 'VIEW');
+        this.writeDxfTable(filer, 'UCS', this.tables.ucsTable, this.tables.ucsTable.newIterator(), 'UCS');
         this.writeDxfTable(filer, 'LTYPE', this.tables.linetypeTable, this.tables.linetypeTable.newIterator(), 'LTYPE');
         this.writeDxfTable(filer, 'LAYER', this.tables.layerTable, this.tables.layerTable.newIterator(), 'LAYER');
         this.writeDxfTable(filer, 'STYLE', this.tables.textStyleTable, this.tables.textStyleTable.newIterator(true), 'STYLE');
         this.writeDxfTable(filer, 'APPID', this.tables.appIdTable, this.tables.appIdTable.newIterator(), 'APPID');
         this.writeDxfTable(filer, 'DIMSTYLE', this.tables.dimStyleTable, this.tables.dimStyleTable.newIterator(), 'DIMSTYLE');
-        if (version.value >= 19) {
+        if (version.capabilities.supportsBlockRecordTable) {
             this.writeDxfTable(filer, 'BLOCK_RECORD', this.tables.blockTable, this.tables.blockTable.newIterator(), 'BLOCK_RECORD');
         }
         filer.endSection();
@@ -2482,14 +2704,17 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeDxfObjectsSection = function (filer) {
-        var e_15, _a, e_16, _b, e_17, _c, e_18, _d, e_19, _e, e_20, _f, e_21, _g;
+        var e_15, _a, e_16, _b, e_17, _c, e_18, _d, e_19, _e, e_20, _f, e_21, _g, e_22, _h, e_23, _j;
+        if (!filer.capabilities.supportsObjectsSection) {
+            return;
+        }
         filer.startSection('OBJECTS');
         var rootDict = this.objects.dictionary;
         rootDict.ownerId = '0';
         var writeDictionary = function (dict) {
             // Dictionary entries (3/350 pairs) are embedded in the DICTIONARY object.
             filer.writeStart('DICTIONARY');
-            dict.dxfOut(filer);
+            dict.dxfOut(filer, true);
         };
         var ensureRootEntry = function (key, dict) {
             if (rootDict.getAt(key) !== dict) {
@@ -2502,6 +2727,18 @@ var AcDbDatabase = /** @class */ (function (_super) {
             }
         };
         ensureRootEntry('ACAD_LAYOUT', this.objects.layout);
+        if (this.objects.group.numEntries > 0) {
+            ensureRootEntry('ACAD_GROUP', this.objects.group);
+        }
+        else {
+            dropRootEntry('ACAD_GROUP');
+        }
+        if (this.objects.sortentsTable.numEntries > 0) {
+            ensureRootEntry('ACAD_SORTENTS', this.objects.sortentsTable);
+        }
+        else {
+            dropRootEntry('ACAD_SORTENTS');
+        }
         if (this.objects.mleaderStyle.numEntries > 0) {
             ensureRootEntry('ACAD_MLEADERSTYLE', this.objects.mleaderStyle);
         }
@@ -2528,6 +2765,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
         }
         writeDictionary(rootDict);
         writeDictionary(this.objects.layout);
+        if (this.objects.group.numEntries > 0) {
+            writeDictionary(this.objects.group);
+        }
+        if (this.objects.sortentsTable.numEntries > 0) {
+            writeDictionary(this.objects.sortentsTable);
+        }
         if (this.objects.mleaderStyle.numEntries > 0) {
             writeDictionary(this.objects.mleaderStyle);
         }
@@ -2541,103 +2784,133 @@ var AcDbDatabase = /** @class */ (function (_super) {
             writeDictionary(this.objects.xrecord);
         }
         try {
-            for (var _h = __values(this.objects.layout.entries()), _j = _h.next(); !_j.done; _j = _h.next()) {
-                var _k = __read(_j.value, 2), _ = _k[0], layout = _k[1];
+            for (var _k = __values(this.objects.layout.entries()), _l = _k.next(); !_l.done; _l = _k.next()) {
+                var _m = __read(_l.value, 2), _ = _m[0], layout = _m[1];
                 filer.writeStart('LAYOUT');
-                layout.dxfOut(filer);
+                layout.dxfOut(filer, true);
             }
         }
         catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
-                if (_j && !_j.done && (_a = _h.return)) _a.call(_h);
+                if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
             }
             finally { if (e_15) throw e_15.error; }
         }
         try {
-            for (var _l = __values(this.objects.imageDefinition.entries()), _m = _l.next(); !_m.done; _m = _l.next()) {
-                var _o = __read(_m.value, 2), _ = _o[0], imageDef = _o[1];
-                filer.writeStart('IMAGEDEF');
-                imageDef.dxfOut(filer);
+            for (var _o = __values(this.objects.group.entries()), _p = _o.next(); !_p.done; _p = _o.next()) {
+                var _q = __read(_p.value, 2), key = _q[0], group = _q[1];
+                if (!group.name)
+                    group.name = key;
+                filer.writeStart('GROUP');
+                group.dxfOut(filer, true);
             }
         }
         catch (e_16_1) { e_16 = { error: e_16_1 }; }
         finally {
             try {
-                if (_m && !_m.done && (_b = _l.return)) _b.call(_l);
+                if (_p && !_p.done && (_b = _o.return)) _b.call(_o);
             }
             finally { if (e_16) throw e_16.error; }
         }
         try {
-            for (var _p = __values(this.objects.layerFilter.entries()), _q = _p.next(); !_q.done; _q = _p.next()) {
-                var _r = __read(_q.value, 2), _ = _r[0], layerFilter = _r[1];
-                filer.writeStart('LAYER_FILTER');
-                layerFilter.dxfOut(filer);
+            for (var _r = __values(this.objects.sortentsTable.entries()), _s = _r.next(); !_s.done; _s = _r.next()) {
+                var _t = __read(_s.value, 2), _ = _t[0], sortents = _t[1];
+                filer.writeStart('SORTENTSTABLE');
+                sortents.dxfOut(filer, true);
             }
         }
         catch (e_17_1) { e_17 = { error: e_17_1 }; }
         finally {
             try {
-                if (_q && !_q.done && (_c = _p.return)) _c.call(_p);
+                if (_s && !_s.done && (_c = _r.return)) _c.call(_r);
             }
             finally { if (e_17) throw e_17.error; }
         }
         try {
-            for (var _s = __values(this.objects.layerIndex.entries()), _t = _s.next(); !_t.done; _t = _s.next()) {
-                var _u = __read(_t.value, 2), _ = _u[0], layerIndex = _u[1];
-                filer.writeStart('LAYER_INDEX');
-                layerIndex.dxfOut(filer);
+            for (var _u = __values(this.objects.imageDefinition.entries()), _v = _u.next(); !_v.done; _v = _u.next()) {
+                var _w = __read(_v.value, 2), _ = _w[0], imageDef = _w[1];
+                filer.writeStart('IMAGEDEF');
+                imageDef.dxfOut(filer, true);
             }
         }
         catch (e_18_1) { e_18 = { error: e_18_1 }; }
         finally {
             try {
-                if (_t && !_t.done && (_d = _s.return)) _d.call(_s);
+                if (_v && !_v.done && (_d = _u.return)) _d.call(_u);
             }
             finally { if (e_18) throw e_18.error; }
         }
         try {
-            for (var _v = __values(this.objects.mleaderStyle.entries()), _w = _v.next(); !_w.done; _w = _v.next()) {
-                var _x = __read(_w.value, 2), _ = _x[0], mleaderStyle = _x[1];
-                filer.writeStart('MLEADERSTYLE');
-                mleaderStyle.dxfOut(filer);
+            for (var _x = __values(this.objects.layerFilter.entries()), _y = _x.next(); !_y.done; _y = _x.next()) {
+                var _z = __read(_y.value, 2), _ = _z[0], layerFilter = _z[1];
+                filer.writeStart('LAYER_FILTER');
+                layerFilter.dxfOut(filer, true);
             }
         }
         catch (e_19_1) { e_19 = { error: e_19_1 }; }
         finally {
             try {
-                if (_w && !_w.done && (_e = _v.return)) _e.call(_v);
+                if (_y && !_y.done && (_e = _x.return)) _e.call(_x);
             }
             finally { if (e_19) throw e_19.error; }
         }
         try {
-            for (var _y = __values(this.objects.mlineStyle.entries()), _z = _y.next(); !_z.done; _z = _y.next()) {
-                var _0 = __read(_z.value, 2), _ = _0[0], mlineStyle = _0[1];
-                filer.writeStart('MLINESTYLE');
-                mlineStyle.dxfOut(filer);
+            for (var _0 = __values(this.objects.layerIndex.entries()), _1 = _0.next(); !_1.done; _1 = _0.next()) {
+                var _2 = __read(_1.value, 2), _ = _2[0], layerIndex = _2[1];
+                filer.writeStart('LAYER_INDEX');
+                layerIndex.dxfOut(filer, true);
             }
         }
         catch (e_20_1) { e_20 = { error: e_20_1 }; }
         finally {
             try {
-                if (_z && !_z.done && (_f = _y.return)) _f.call(_y);
+                if (_1 && !_1.done && (_f = _0.return)) _f.call(_0);
             }
             finally { if (e_20) throw e_20.error; }
         }
         try {
-            for (var _1 = __values(this.objects.xrecord.entries()), _2 = _1.next(); !_2.done; _2 = _1.next()) {
-                var _3 = __read(_2.value, 2), _ = _3[0], xrecord = _3[1];
-                filer.writeStart('XRECORD');
-                xrecord.dxfOut(filer);
+            for (var _3 = __values(this.objects.mleaderStyle.entries()), _4 = _3.next(); !_4.done; _4 = _3.next()) {
+                var _5 = __read(_4.value, 2), _ = _5[0], mleaderStyle = _5[1];
+                filer.writeStart('MLEADERSTYLE');
+                mleaderStyle.dxfOut(filer, true);
             }
         }
         catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
-                if (_2 && !_2.done && (_g = _1.return)) _g.call(_1);
+                if (_4 && !_4.done && (_g = _3.return)) _g.call(_3);
             }
             finally { if (e_21) throw e_21.error; }
         }
+        try {
+            for (var _6 = __values(this.objects.mlineStyle.entries()), _7 = _6.next(); !_7.done; _7 = _6.next()) {
+                var _8 = __read(_7.value, 2), _ = _8[0], mlineStyle = _8[1];
+                filer.writeStart('MLINESTYLE');
+                mlineStyle.dxfOut(filer, true);
+            }
+        }
+        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+        finally {
+            try {
+                if (_7 && !_7.done && (_h = _6.return)) _h.call(_6);
+            }
+            finally { if (e_22) throw e_22.error; }
+        }
+        try {
+            for (var _9 = __values(this.objects.xrecord.entries()), _10 = _9.next(); !_10.done; _10 = _9.next()) {
+                var _11 = __read(_10.value, 2), _ = _11[0], xrecord = _11[1];
+                filer.writeStart('XRECORD');
+                xrecord.dxfOut(filer, true);
+            }
+        }
+        catch (e_23_1) { e_23 = { error: e_23_1 }; }
+        finally {
+            try {
+                if (_10 && !_10.done && (_j = _9.return)) _j.call(_9);
+            }
+            finally { if (e_23) throw e_23.error; }
+        }
         this.writeAcLyLayerFilterObjects(filer);
         filer.endSection();
     };
@@ -2649,7 +2922,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param filer - DXF output writer.
      */
     AcDbDatabase.prototype.writeAcLyLayerFilterObjects = function (filer) {
-        var e_22, _a, e_23, _b, e_24, _c, e_25, _d, e_26, _e;
+        var e_24, _a, e_25, _b, e_26, _c, e_27, _d, e_28, _e;
         var _this = this;
         var _f;
         var serialized = acdbSerializeLayerFilterTree(this._layerFilters);
@@ -2666,7 +2939,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
         var rootAclyEntries = [];
         var rootAcadEntries = [];
         var emit = function (node, parentAclyHandle, addToLegacy) {
-            var e_27, _a;
+            var e_29, _a;
             var xHandle = _this.generateHandle();
             var extensionDictionaryId;
             if (node.children.length > 0) {
@@ -2682,12 +2955,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                         });
                     }
                 }
-                catch (e_27_1) { e_27 = { error: e_27_1 }; }
+                catch (e_29_1) { e_29 = { error: e_29_1 }; }
                 finally {
                     try {
                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
-                    finally { if (e_27) throw e_27.error; }
+                    finally { if (e_29) throw e_29.error; }
                 }
                 dicts.push({
                     handle: extHandle,
@@ -2721,12 +2994,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 });
             }
         }
-        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+        catch (e_24_1) { e_24 = { error: e_24_1 }; }
         finally {
             try {
                 if (_h && !_h.done && (_a = _g.return)) _a.call(_g);
             }
-            finally { if (e_22) throw e_22.error; }
+            finally { if (e_24) throw e_24.error; }
         }
         var layerExtEntries = new Map();
         var existingLayerExt = this.getObjectById(layerExtHandle);
@@ -2737,12 +3010,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                     layerExtEntries.set(key, value.objectId);
                 }
             }
-            catch (e_23_1) { e_23 = { error: e_23_1 }; }
+            catch (e_25_1) { e_25 = { error: e_25_1 }; }
             finally {
                 try {
                     if (_k && !_k.done && (_b = _j.return)) _b.call(_j);
                 }
-                finally { if (e_23) throw e_23.error; }
+                finally { if (e_25) throw e_25.error; }
             }
         }
         layerExtEntries.set(ACLY_DICTIONARY_NAME, aclyHandle);
@@ -2773,27 +3046,27 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 filer.writeInt16(280, 1);
                 filer.writeInt16(281, 1);
                 try {
-                    for (var _m = (e_25 = void 0, __values(dict.entries)), _o = _m.next(); !_o.done; _o = _m.next()) {
+                    for (var _m = (e_27 = void 0, __values(dict.entries)), _o = _m.next(); !_o.done; _o = _m.next()) {
                         var entry = _o.value;
                         filer.writeString(3, entry.name);
                         filer.writeObjectId(350, entry.id);
                     }
                 }
-                catch (e_25_1) { e_25 = { error: e_25_1 }; }
+                catch (e_27_1) { e_27 = { error: e_27_1 }; }
                 finally {
                     try {
                         if (_o && !_o.done && (_d = _m.return)) _d.call(_m);
                     }
-                    finally { if (e_25) throw e_25.error; }
+                    finally { if (e_27) throw e_27.error; }
                 }
             }
         }
-        catch (e_24_1) { e_24 = { error: e_24_1 }; }
+        catch (e_26_1) { e_26 = { error: e_26_1 }; }
         finally {
             try {
                 if (dicts_1_1 && !dicts_1_1.done && (_c = dicts_1.return)) _c.call(dicts_1);
             }
-            finally { if (e_24) throw e_24.error; }
+            finally { if (e_26) throw e_26.error; }
         }
         try {
             for (var xrecs_1 = __values(xrecs), xrecs_1_1 = xrecs_1.next(); !xrecs_1_1.done; xrecs_1_1 = xrecs_1.next()) {
@@ -2809,12 +3082,12 @@ var AcDbDatabase = /** @class */ (function (_super) {
                 xrecord.dxfOut(filer);
             }
         }
-        catch (e_26_1) { e_26 = { error: e_26_1 }; }
+        catch (e_28_1) { e_28 = { error: e_28_1 }; }
         finally {
             try {
                 if (xrecs_1_1 && !xrecs_1_1.done && (_e = xrecs_1.return)) _e.call(xrecs_1);
             }
-            finally { if (e_26) throw e_26.error; }
+            finally { if (e_28) throw e_28.error; }
         }
     };
     /**
@@ -2827,7 +3100,7 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param recordType - DXF record type name for each table record.
      */
     AcDbDatabase.prototype.writeDxfTable = function (filer, tableName, table, records, recordType) {
-        var e_28, _a;
+        var e_30, _a;
         var items = __spreadArray([], __read(records), false);
         filer.startTable(tableName);
         table.dxfOut(filer);
@@ -2840,15 +3113,15 @@ var AcDbDatabase = /** @class */ (function (_super) {
                     continue;
                 }
                 filer.writeStart(recordType);
-                record.dxfOut(filer);
+                record.dxfOut(filer, true);
             }
         }
-        catch (e_28_1) { e_28 = { error: e_28_1 }; }
+        catch (e_30_1) { e_30 = { error: e_30_1 }; }
         finally {
             try {
                 if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
             }
-            finally { if (e_28) throw e_28.error; }
+            finally { if (e_30) throw e_30.error; }
         }
         filer.endTable();
     };
@@ -2863,8 +3136,36 @@ var AcDbDatabase = /** @class */ (function (_super) {
      * @param entity - Entity to serialize.
      */
     AcDbDatabase.prototype.writeDxfEntity = function (filer, entity) {
+        if (entity instanceof AcDbPolyline &&
+            !filer.capabilities.supportsLwPolyline) {
+            filer.writeStart('POLYLINE');
+            entity.dxfOutAs2dPolyline(filer, true);
+            return;
+        }
         filer.writeStart(entity.dxfTypeName);
-        entity.dxfOut(filer);
+        entity.dxfOut(filer, true);
+    };
+    /**
+     * Writes THUMBNAILIMAGE when preview bytes are present and export requested.
+     */
+    AcDbDatabase.prototype.writeDxfThumbnailImageSection = function (filer, saveThumbnailImage) {
+        if (saveThumbnailImage === void 0) { saveThumbnailImage = false; }
+        var bytes = this._thumbnailImage;
+        if (!saveThumbnailImage || !bytes || bytes.length === 0) {
+            return;
+        }
+        if (!filer.capabilities.supportsObjectsSection) {
+            // Thumbnail section is post-R12; skip for AC1009.
+            return;
+        }
+        var chunkSize = 127;
+        filer.startSection('THUMBNAILIMAGE');
+        filer.writeInt32(90, bytes.length);
+        for (var offset = 0; offset < bytes.length; offset += chunkSize) {
+            var chunk = bytes.subarray(offset, offset + chunkSize);
+            filer.writeString(310, acdbBytesToHexString(chunk));
+        }
+        filer.endSection();
     };
     /**
      * Clears all data from the database.
@@ -2885,15 +3186,19 @@ var AcDbDatabase = /** @class */ (function (_super) {
         this._tables.dimStyleTable.removeAll();
         this._tables.linetypeTable.removeAll();
         this._tables.textStyleTable.removeAll();
+        this._tables.ucsTable.removeAll();
         this._tables.viewTable.removeAll();
         this._tables.layerTable.removeAll();
         this._tables.viewportTable.removeAll();
+        this._tables.appIdTable.removeAll();
         this._objects.layout.removeAll();
+        this._objects.group.removeAll();
         this._objects.imageDefinition.removeAll();
         this._objects.layerFilter.removeAll();
         this._objects.layerIndex.removeAll();
         this._objects.mleaderStyle.removeAll();
         this._objects.mlineStyle.removeAll();
+        this._objects.sortentsTable.removeAll();
         this._objects.xrecord.removeAll();
         this._layerFilters = new AcLyLayerFilterTree();
         this._currentSpace = undefined;