@mlightcad/libredwg-web 0.7.7 → 0.7.9

package/lib/converter/converter.js

@@ -2,7 +2,7 @@ import { HEADER_VARIABLES } from '../database';
 import { Dwg_Object_Supertype, Dwg_Object_Type } from '../types';
 import { dwgColorToMLeaderRawColor } from './dwgColorToMLeaderRawColor';
 import { LibreEntityConverter } from './entityConverter';
-import { idToString, isModelSpace, isPaperSpace } from './utils';
+import { idToString, isModelSpace, isPaperSpace, uint8ArrayToHexString } from './utils';
 /**
  * Class used to convert Dwg_Data instance to DwgDatabase instance.
  */
@@ -42,9 +42,12 @@ export class LibreDwgConverter {
             objects: {
                 DICTIONARY: [],
                 IMAGEDEF: [],
+                LAYER_FILTER: [],
+                LAYER_INDEX: [],
                 LAYOUT: [],
                 MLEADERSTYLE: [],
-                SPATIAL_FILTER: []
+                SPATIAL_FILTER: [],
+                XRECORD: []
             },
             header: {},
             entities: [],
@@ -127,6 +130,12 @@ export class LibreDwgConverter {
                         case Dwg_Object_Type.DWG_TYPE_IMAGEDEF:
                             db.objects.IMAGEDEF.push(this.convertImageDef(tio, obj));
                             break;
+                        case Dwg_Object_Type.DWG_TYPE_LAYERFILTER:
+                            db.objects.LAYER_FILTER.push(this.convertLayerFilter(tio, obj));
+                            break;
+                        case Dwg_Object_Type.DWG_TYPE_LAYER_INDEX:
+                            db.objects.LAYER_INDEX.push(this.convertLayerIndex(tio, obj));
+                            break;
                         case Dwg_Object_Type.DWG_TYPE_LAYOUT:
                             db.objects.LAYOUT.push(this.convertLayout(tio, obj));
                             break;
@@ -136,6 +145,9 @@ export class LibreDwgConverter {
                         case Dwg_Object_Type.DWG_TYPE_SPATIAL_FILTER:
                             db.objects.SPATIAL_FILTER.push(this.convertSpatialFilter(tio, obj));
                             break;
+                        case Dwg_Object_Type.DWG_TYPE_XRECORD:
+                            db.objects.XRECORD.push(this.convertXRecord(tio, obj));
+                            break;
                         default:
                             break;
                     }
@@ -154,6 +166,10 @@ export class LibreDwgConverter {
         viewportEntities.forEach((viewport, index) => {
             viewport.viewportId = index + 1;
         });
+        const thumbnail = libredwg.dwg_bmp(data);
+        if (thumbnail?.data?.length) {
+            db.thumbnailImage = thumbnail.data;
+        }
         return db;
     }
     getConversionStats() {
@@ -246,14 +262,7 @@ export class LibreDwgConverter {
         const scalability = libredwg.dwg_dynapi_entity_data(item, 'block_scaling');
         const layout_ptr = libredwg.dwg_dynapi_entity_data(item, 'layout');
         const layout = (libredwg.dwg_ref_get_id(layout_ptr) ?? '');
-        let bmpPreview = '';
-        const uint8ArrayToHexString = (bytes) => {
-            const hexChars = new Array(bytes.length);
-            for (let i = 0; i < bytes.length; i++) {
-                hexChars[i] = bytes[i].toString(16).toUpperCase();
-            }
-            return hexChars.join('');
-        };
+        let bmpPreview;
         const bmpPreviewBinaryData = libredwg.dwg_entity_block_header_get_preview(item);
         if (bmpPreviewBinaryData && bmpPreviewBinaryData.length > 0) {
             bmpPreview = uint8ArrayToHexString(bmpPreviewBinaryData);
@@ -741,6 +750,50 @@ export class LibreDwgConverter {
             resolutionUnits: resolutionUnits
         };
     }
+    convertLayerFilter(item, obj) {
+        const libredwg = this.libredwg;
+        const commonAttrs = this.getCommonObjectAttrs(obj);
+        const numNames = libredwg.dwg_dynapi_entity_data(item, 'num_names') ?? 0;
+        const namesPtr = libredwg.dwg_dynapi_entity_data(item, 'names');
+        const layerNames = namesPtr && numNames > 0
+            ? libredwg
+                .dwg_ptr_to_wchar_string_array(namesPtr, numNames)
+                .filter((name) => name != null && name !== '')
+            : [];
+        return {
+            ...commonAttrs,
+            ...(layerNames.length ? { layerNames } : {})
+        };
+    }
+    convertLayerIndex(item, obj) {
+        const libredwg = this.libredwg;
+        const commonAttrs = this.getCommonObjectAttrs(obj);
+        const timeStamp = libredwg.dwg_dynapi_entity_data(item, 'last_updated');
+        const numEntries = libredwg.dwg_dynapi_entity_data(item, 'num_entries') ?? 0;
+        const entriesPtr = libredwg.dwg_dynapi_entity_data(item, 'entries');
+        const entrySize = libredwg.dwg_dynapi_subclass_size('LAYER_entry');
+        const layerNames = [];
+        const idBufferIds = [];
+        const idBufferEntryCounts = [];
+        if (entriesPtr && entrySize > 0) {
+            for (let i = 0; i < numEntries; i++) {
+                const entryPtr = entriesPtr + i * entrySize;
+                const name = libredwg.dwg_dynapi_subclass_data(entryPtr, 'LAYER_entry', 'name');
+                // Keep parallel arrays aligned with entries even when name is absent.
+                layerNames.push(name ?? '');
+                const handleRef = libredwg.dwg_dynapi_subclass_data(entryPtr, 'LAYER_entry', 'handle');
+                idBufferIds.push(handleRef ? (libredwg.dwg_ref_get_id(handleRef) ?? '') : '');
+                idBufferEntryCounts.push(libredwg.dwg_dynapi_subclass_data(entryPtr, 'LAYER_entry', 'numlayers') ?? 0);
+            }
+        }
+        return {
+            ...commonAttrs,
+            ...(timeStamp != null ? { timeStamp } : {}),
+            ...(layerNames.length ? { layerNames } : {}),
+            ...(idBufferIds.length ? { idBufferIds } : {}),
+            ...(idBufferEntryCounts.length ? { idBufferEntryCounts } : {})
+        };
+    }
     convertLayout(item, obj) {
         const libredwg = this.libredwg;
         const commonAttrs = this.getCommonObjectAttrs(obj);
@@ -879,6 +932,25 @@ export class LibreDwgConverter {
             invertBlockMatrix: invertBlockMatrix
         };
     }
+    convertXRecord(item, obj) {
+        const libredwg = this.libredwg;
+        const commonAttrs = this.getCommonObjectAttrs(obj);
+        const cloning = libredwg.dwg_dynapi_entity_data(item, 'cloning');
+        const data = libredwg.dwg_object_xrecord_get_xdata(item) ?? [];
+        const objectObj = libredwg.dwg_object_get_tio(obj);
+        const xdic = objectObj
+            ? libredwg.dwg_object_object_get_xdicobjhandle_object(objectObj)
+            : null;
+        const extensionDictionary = xdic && xdic.absolute_ref
+            ? idToString(xdic.absolute_ref)
+            : undefined;
+        return {
+            ...commonAttrs,
+            ...(cloning != null ? { cloning } : {}),
+            ...(extensionDictionary ? { extensionDictionary } : {}),
+            data
+        };
+    }
     getCommonObjectAttrs(obj) {
         const libredwg = this.libredwg;
         const object_tio = libredwg.dwg_object_get_tio(obj);

package/lib/converter/entityConverter.d.ts

@@ -13,6 +13,7 @@ export declare class LibreEntityConverter {
     clear(): void;
     convert(object_ptr: Dwg_Object_Ptr): DwgEntity | undefined;
     private convert3dFace;
+    private convert3dSolid;
     private convertArc;
     private convertEmbeddedMText;
     private convertAttdef;

package/lib/converter/entityConverter.js

@@ -1,7 +1,7 @@
 import { DwgBoundaryPathEdgeType, DwgHatchAssociativity, DwgHatchGradientColorFlag, DwgHatchGradientFlag, DwgHatchSolidFill } from '../database';
 import { Dwg_Hatch_Edge_Type, Dwg_Object_Type } from '../types';
 import { dwgColorToMLeaderRawColor } from './dwgColorToMLeaderRawColor';
-import { idToString, uint8ArrayToHexString } from './utils';
+import { decodeOle2FrameCornersFromData, idToString, uint8ArrayToHexString } from './utils';
 export class LibreEntityConverter {
     libredwg;
     layers = new Map();
@@ -49,6 +49,9 @@ export class LibreEntityConverter {
             if (fixedtype == Dwg_Object_Type.DWG_TYPE_3DFACE) {
                 return this.convert3dFace(entity_tio, commonAttrs);
             }
+            else if (fixedtype == Dwg_Object_Type.DWG_TYPE_3DSOLID) {
+                return this.convert3dSolid(entity_tio, commonAttrs);
+            }
             else if (fixedtype == Dwg_Object_Type.DWG_TYPE_ARC) {
                 return this.convertArc(entity_tio, commonAttrs);
             }
@@ -185,6 +188,40 @@ export class LibreEntityConverter {
             flag: flag
         };
     }
+    convert3dSolid(entity, commonAttrs) {
+        const libredwg = this.libredwg;
+        const version = libredwg.dwg_dynapi_entity_data(entity, 'version');
+        const satCache = libredwg.dwg_dynapi_entity_data(entity, 'acis_empty');
+        const data = libredwg.dwg_dynapi_entity_data(entity, 'acis_data');
+        const hasRevisionGuid = libredwg.dwg_dynapi_entity_data(entity, 'has_revision_guid');
+        const historyRef = libredwg.dwg_dynapi_entity_data(entity, 'history_id');
+        const historyObjectSoftId = libredwg.dwg_ref_get_id(historyRef);
+        const result = {
+            type: '3DSOLID',
+            subclassMarker: 'AcDb3dSolid',
+            ...commonAttrs
+        };
+        if (version) {
+            result.version = version;
+        }
+        result.satCache = satCache;
+        if (data) {
+            result.data = data;
+        }
+        if (hasRevisionGuid) {
+            const guidOffset = libredwg.dwg_dynapi_entity_field_offset(entity, 'revision_guid');
+            if (guidOffset >= 0) {
+                const guid = libredwg.UTF8ToString(entity + guidOffset, 38);
+                if (guid) {
+                    result.guid = guid;
+                }
+            }
+        }
+        if (historyObjectSoftId) {
+            result.historyObjectSoftId = historyObjectSoftId;
+        }
+        return result;
+    }
     convertArc(entity, commonAttrs) {
         const libredwg = this.libredwg;
         const center = libredwg.dwg_dynapi_entity_data(entity, 'center');
@@ -1150,12 +1187,22 @@ export class LibreEntityConverter {
         const oleVersion = libredwg.dwg_dynapi_entity_data(entity, 'oleversion');
         const oleClient = libredwg.dwg_dynapi_entity_data(entity, 'oleclient');
         const dataSize = libredwg.dwg_dynapi_entity_data(entity, 'data_size');
-        const leftUpPoint = libredwg.dwg_dynapi_entity_data(entity, 'pt1');
-        const rightDownPoint = libredwg.dwg_dynapi_entity_data(entity, 'pt2');
+        let leftUpPoint = libredwg.dwg_dynapi_entity_data(entity, 'pt1');
+        let rightDownPoint = libredwg.dwg_dynapi_entity_data(entity, 'pt2');
         const lockAspect = libredwg.dwg_dynapi_entity_data(entity, 'lock_aspect');
         const oleObjectType = libredwg.dwg_dynapi_entity_data(entity, 'type');
         const tileModeDescriptor = libredwg.dwg_dynapi_entity_data(entity, 'mode');
-        const binaryData = libredwg.dwg_dynapi_entity_data(entity, 'data');
+        // Prefer sized TF copy: dynapi TF truncates at the first embedded NUL.
+        const dataBytes = libredwg.dwg_entity_ole2frame_get_data(entity);
+        const binaryData = dataBytes ? uint8ArrayToHexString(dataBytes) : '';
+        // Prefer corners decoded from the OLE header (also fixed in dwg_decode_ole2).
+        if (dataBytes) {
+            const corners = decodeOle2FrameCornersFromData(dataBytes);
+            if (corners) {
+                leftUpPoint = corners.upperLeft;
+                rightDownPoint = corners.lowerRight;
+            }
+        }
         return {
             type: 'OLE2FRAME',
             ...commonAttrs,
@@ -1175,7 +1222,8 @@ export class LibreEntityConverter {
         const flag = libredwg.dwg_dynapi_entity_data(entity, 'flag');
         const mode = libredwg.dwg_dynapi_entity_data(entity, 'mode');
         const dataSize = libredwg.dwg_dynapi_entity_data(entity, 'data_size');
-        const binaryData = libredwg.dwg_dynapi_entity_data(entity, 'data');
+        const dataBytes = libredwg.dwg_entity_oleframe_get_data(entity);
+        const binaryData = dataBytes ? uint8ArrayToHexString(dataBytes) : '';
         return {
             type: 'OLEFRAME',
             ...commonAttrs,

package/lib/converter/utils.d.ts

@@ -2,4 +2,25 @@ export declare const isModelSpace: (name: string) => boolean | "";
 export declare const isPaperSpace: (name: string) => boolean | "";
 export declare const idToString: (id: number | bigint) => string;
 export declare const uint8ArrayToHexString: (bytes: Uint8Array) => string;
+/**
+ * OLE2FRAME binary payloads begin with a 0x80-byte Autodesk header, then an
+ * MS-CFB compound document. Corner points for DXF groups 10/11 are stored in
+ * that header (also decoded by `dwg_decode_ole2`).
+ *
+ * Layout after a 2-byte unknown prefix (`0x80 0x55` in common files):
+ * four WCS corners as little-endian 3D doubles (upper-left, upper-right,
+ * lower-right, lower-left). DXF group codes 10/11 store the first and third.
+ */
+export declare const decodeOle2FrameCornersFromData: (data: Uint8Array) => {
+    upperLeft: {
+        x: number;
+        y: number;
+        z: number;
+    };
+    lowerRight: {
+        x: number;
+        y: number;
+        z: number;
+    };
+} | null;
 //# sourceMappingURL=utils.d.ts.map

package/lib/converter/utils.js

@@ -16,4 +16,31 @@ export const uint8ArrayToHexString = (bytes) => {
     }
     return hexChars.join('');
 };
+/**
+ * OLE2FRAME binary payloads begin with a 0x80-byte Autodesk header, then an
+ * MS-CFB compound document. Corner points for DXF groups 10/11 are stored in
+ * that header (also decoded by `dwg_decode_ole2`).
+ *
+ * Layout after a 2-byte unknown prefix (`0x80 0x55` in common files):
+ * four WCS corners as little-endian 3D doubles (upper-left, upper-right,
+ * lower-right, lower-left). DXF group codes 10/11 store the first and third.
+ */
+export const decodeOle2FrameCornersFromData = (data) => {
+    // 2-byte prefix + 4 corners * 3 doubles * 8 bytes = 98 bytes
+    if (!data || data.length < 98) {
+        return null;
+    }
+    const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
+    const readPoint = (offset) => ({
+        x: view.getFloat64(offset, true),
+        y: view.getFloat64(offset + 8, true),
+        z: view.getFloat64(offset + 16, true)
+    });
+    const upperLeft = readPoint(2);
+    const lowerRight = readPoint(2 + 48);
+    if (![upperLeft.x, upperLeft.y, upperLeft.z, lowerRight.x, lowerRight.y, lowerRight.z].every(Number.isFinite)) {
+        return null;
+    }
+    return { upperLeft, lowerRight };
+};
 //# sourceMappingURL=utils.js.map

package/lib/database/database.d.ts

@@ -1,7 +1,7 @@
 import { DwgClass } from './classes';
 import { DwgEntity } from './entities';
 import { DwgHeader } from './header';
-import { DwgDictionaryObject, DwgImageDefObject, DwgLayoutObject, DwgMLeaderStyleObject, DwgSpatialFilterObject } from './objects';
+import { DwgDictionaryObject, DwgImageDefObject, DwgLayerFilterObject, DwgLayerIndexObject, DwgLayoutObject, DwgMLeaderStyleObject, DwgSpatialFilterObject, DwgXRecordObject } from './objects';
 import { DwgAppIdEntry, DwgBlockRecordTableEntry, DwgDimStyleTableEntry, DwgLayerTableEntry, DwgLTypeTableEntry, DwgStyleTableEntry, DwgTable, DwgVPortTableEntry } from './tables';
 export interface DwgDatabase {
     tables: {
@@ -16,10 +16,14 @@ export interface DwgDatabase {
     objects: {
         DICTIONARY: DwgDictionaryObject[];
         IMAGEDEF: DwgImageDefObject[];
+        LAYER_FILTER: DwgLayerFilterObject[];
+        LAYER_INDEX: DwgLayerIndexObject[];
         LAYOUT: DwgLayoutObject[];
         MLEADERSTYLE: DwgMLeaderStyleObject[];
         SPATIAL_FILTER: DwgSpatialFilterObject[];
+        XRECORD: DwgXRecordObject[];
     };
+    thumbnailImage?: Uint8Array;
     header: DwgHeader;
     /**
      * All of entities in the model space.

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

@@ -24,6 +24,7 @@ export * from './ray';
 export * from './section';
 export * from './shape';
 export * from './solid';
+export * from './solid3d';
 export * from './spline';
 export * from './table';
 export * from './text';

package/lib/database/entities/index.js

@@ -24,6 +24,7 @@ export * from './ray';
 export * from './section';
 export * from './shape';
 export * from './solid';
+export * from './solid3d';
 export * from './spline';
 export * from './table';
 export * from './text';

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

@@ -0,0 +1,32 @@
+import { DwgEntity } from './entity';
+export interface DwgSolid3dEntity extends DwgEntity {
+    /**
+     * Entity type
+     */
+    type: '3DSOLID';
+    /**
+     * DXF subclass marker
+     */
+    subclassMarker: 'AcDb3dSolid';
+    /**
+     * Modeler format version number (currently = 1)
+     */
+    version?: number;
+    /**
+     * SAT cache flag (group 290, R2013+)
+     */
+    satCache?: number;
+    /**
+     * GUID string (group 2, R2013+)
+     */
+    guid?: string;
+    /**
+     * Proprietary ACIS/SAT data
+     */
+    data?: string;
+    /**
+     * Soft-owner ID/handle to history object
+     */
+    historyObjectSoftId?: string;
+}
+//# sourceMappingURL=solid3d.d.ts.map

package/lib/database/entities/solid3d.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=solid3d.js.map

package/lib/database/objects/index.d.ts

@@ -1,8 +1,11 @@
 export * from './common';
 export * from './dictionary';
 export * from './imageDef';
+export * from './layerFilter';
+export * from './layerIndex';
 export * from './layout';
 export * from './mleaderStyle';
 export * from './plotSetting';
 export * from './spatialFilter';
+export * from './xrecord';
 //# sourceMappingURL=index.d.ts.map

package/lib/database/objects/index.js

@@ -1,8 +1,11 @@
 export * from './common';
 export * from './dictionary';
 export * from './imageDef';
+export * from './layerFilter';
+export * from './layerIndex';
 export * from './layout';
 export * from './mleaderStyle';
 export * from './plotSetting';
 export * from './spatialFilter';
+export * from './xrecord';
 //# sourceMappingURL=index.js.map

package/lib/database/objects/layerFilter.d.ts

@@ -0,0 +1,12 @@
+import { DwgCommonObject } from './common';
+/**
+ * DWG LAYER_FILTER / LAYERFILTER object fields.
+ *
+ * @remarks
+ * This shape mirrors the DXF LAYER_FILTER mapping used by ObjectARX / dxf-json.
+ */
+export interface DwgLayerFilterObject extends DwgCommonObject {
+    /** Layer names included in this filter. */
+    layerNames?: string[];
+}
+//# sourceMappingURL=layerFilter.d.ts.map

package/lib/database/objects/layerFilter.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=layerFilter.js.map

package/lib/database/objects/layerIndex.d.ts

@@ -0,0 +1,18 @@
+import { DwgCommonObject } from './common';
+/**
+ * DWG LAYER_INDEX object fields.
+ *
+ * @remarks
+ * This shape mirrors the DXF LAYER_INDEX mapping used by ObjectARX / dxf-json.
+ */
+export interface DwgLayerIndexObject extends DwgCommonObject {
+    /** Julian / last-updated timestamp. */
+    timeStamp?: number;
+    /** Layer names included in this layer index. */
+    layerNames?: string[];
+    /** Hard-owner handles to IDBUFFER objects. */
+    idBufferIds?: string[];
+    /** Number of entries in each referenced IDBUFFER. */
+    idBufferEntryCounts?: number[];
+}
+//# sourceMappingURL=layerIndex.d.ts.map

package/lib/database/objects/layerIndex.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=layerIndex.js.map

package/lib/database/objects/xrecord.d.ts

@@ -0,0 +1,30 @@
+import { DwgCommonObject } from './common';
+/**
+ * One DXF group-code / value pair stored in an XRECORD.
+ */
+export interface DwgXRecordGroup {
+    /** DXF group code. */
+    code: number;
+    /**
+     * Group value. Strings, numbers, booleans, handle hex strings, binary
+     * byte arrays, or `{ x, y, z }` for 3D points.
+     */
+    value: unknown;
+}
+/**
+ * DWG XRECORD object fields.
+ *
+ * @remarks
+ * Layer Manager filters (`ACAD_LAYERFILTERS` / `ACLYDICTIONARY`) store each
+ * filter node as an XRECORD under those dictionaries. The payload mirrors the
+ * DXF XRECORD `data` group list used by ObjectARX / dxf-json.
+ */
+export interface DwgXRecordObject extends DwgCommonObject {
+    /** Duplicate record cloning flag (DXF group 280). */
+    cloning?: number;
+    /** Extension dictionary handle, when the object has one. */
+    extensionDictionary?: string;
+    /** XRecord payload as DXF group pairs. */
+    data: DwgXRecordGroup[];
+}
+//# sourceMappingURL=xrecord.d.ts.map

package/lib/database/objects/xrecord.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=xrecord.js.map

package/lib/libredwg.d.ts

@@ -1,7 +1,7 @@
 import { MainModule } from '../wasm/libredwg-web';
 import createModule from '../wasm/libredwg-web.js';
 import { DwgCodePage, DwgDatabase, DwgGradientColor, DwgPoint2D, DwgPoint3D, DwgPoint4D, DwgVersion, DwgXData } from './database';
-import { Dwg_Array_Ptr, Dwg_Class, Dwg_Color, Dwg_Data_Ptr, Dwg_Entity_BLOCK, Dwg_Entity_IMAGE_Ptr, Dwg_Entity_LWPOLYLINE_Ptr, Dwg_Entity_MTEXT_Ptr, Dwg_Entity_POLYLINE_2D_Ptr, Dwg_Entity_POLYLINE_3D_Ptr, Dwg_Entity_PROXY_ENTITY_Ptr, Dwg_Entity_TEXT_Ptr, Dwg_Entity_VERTEX_2D, Dwg_Entity_VERTEX_3D, Dwg_Field_Value, Dwg_Handle, Dwg_HATCH_DefLine, Dwg_HATCH_Path, Dwg_LTYPE_Dash, Dwg_MLINE_Vertex, Dwg_Object_BLOCK_HEADER_Ptr, Dwg_Object_BLOCK_Ptr, Dwg_Object_DIMSTYLE_Ptr, Dwg_Object_Entity_Ptr, Dwg_Object_Entity_TIO_Ptr, Dwg_Object_Generic_Ptr, Dwg_Object_IMAGEDEF_Ptr, Dwg_Object_LAYER_Ptr, Dwg_Object_LTYPE_Ptr, Dwg_Object_Object_Ptr, Dwg_Object_Object_TIO_Ptr, Dwg_Object_Ptr, Dwg_Object_Ref, Dwg_Object_Ref_Ptr, Dwg_Object_STYLE_Ptr, Dwg_Object_Type, Dwg_Object_VERTEX_2D_Ptr, Dwg_Object_VERTEX_3D_Ptr, Dwg_Object_VPORT_Ptr, Dwg_TABLE_Cell } from './types';
+import { Dwg_Array_Ptr, Dwg_Class, Dwg_Color, Dwg_Data_Ptr, Dwg_Entity_BLOCK, Dwg_Entity_IMAGE_Ptr, Dwg_Entity_LWPOLYLINE_Ptr, Dwg_Entity_MTEXT_Ptr, Dwg_Entity_OLE2FRAME_Ptr, Dwg_Entity_OLEFRAME_Ptr, Dwg_Entity_POLYLINE_2D_Ptr, Dwg_Entity_POLYLINE_3D_Ptr, Dwg_Entity_PROXY_ENTITY_Ptr, Dwg_Entity_TEXT_Ptr, Dwg_Entity_VERTEX_2D, Dwg_Entity_VERTEX_3D, Dwg_Field_Value, Dwg_Handle, Dwg_HATCH_DefLine, Dwg_HATCH_Path, Dwg_LTYPE_Dash, Dwg_MLINE_Vertex, Dwg_Object_BLOCK_HEADER_Ptr, Dwg_Object_BLOCK_Ptr, Dwg_Object_DIMSTYLE_Ptr, Dwg_Object_Entity_Ptr, Dwg_Object_Entity_TIO_Ptr, Dwg_Object_Generic_Ptr, Dwg_Object_IMAGEDEF_Ptr, Dwg_Object_LAYER_Ptr, Dwg_Object_LTYPE_Ptr, Dwg_Object_Object_Ptr, Dwg_Object_Object_TIO_Ptr, Dwg_Object_Ptr, Dwg_Object_Ref, Dwg_Object_Ref_Ptr, Dwg_Object_STYLE_Ptr, Dwg_Object_Type, Dwg_Object_VERTEX_2D_Ptr, Dwg_Object_VERTEX_3D_Ptr, Dwg_Object_VPORT_Ptr, Dwg_TABLE_Cell } from './types';
 export { createModule };
 export type LibreDwgEx = LibreDwg & MainModule;
 export declare enum DwgThumbnailImageType {
@@ -661,6 +661,23 @@ export declare class LibreDwg {
      * @returns Returns xdata of one Dwg_Object_Entity instance.
      */
     dwg_object_entity_get_xdata(ptr: Dwg_Object_Entity_Ptr): DwgXData;
+    /**
+     * Returns the extension dictionary handle of a Dwg_Object_Object instance.
+     * @group Dwg_Object_Object Methods
+     * @param ptr Pointer to one Dwg_Object_Object instance.
+     * @returns Object ref for the extension dictionary, or null when absent.
+     */
+    dwg_object_object_get_xdicobjhandle_object(ptr: Dwg_Object_Object_Ptr): Dwg_Object_Ref | null;
+    /**
+     * Returns XRECORD payload as DXF group-code / value pairs.
+     * @group Dwg_Object_XRECORD Methods
+     * @param ptr Pointer to one Dwg_Object_XRECORD instance (object tio).
+     * @returns Array of `{ code, value }` groups.
+     */
+    dwg_object_xrecord_get_xdata(ptr: Dwg_Object_Object_TIO_Ptr): {
+        code: number;
+        value: unknown;
+    }[];
     /**
      * Returns pointer to BLOCK_HEADER owner for generic entity from ent->ownerhandle.
      * @group Dwg_Object_Entity Methods
@@ -700,7 +717,7 @@ export declare class LibreDwg {
      * @param ptr Pointer to one Dwg_Entity_BLOCK_HEADER instance.
      * @returns Returns preview image of the block pointed by the specified block header.
      */
-    dwg_entity_block_header_get_preview(ptr: Dwg_Object_BLOCK_HEADER_Ptr): Uint8Array;
+    dwg_entity_block_header_get_preview(ptr: Dwg_Object_BLOCK_HEADER_Ptr): Uint8Array | null;
     /**
      * Returns preview binary data of one entity (common entity preview field).
      * For PROXY_ENTITY this contains the proxy graphics data.
@@ -713,6 +730,18 @@ export declare class LibreDwg {
      * @returns Entity data bytes, or null when absent.
      */
     dwg_entity_proxy_entity_get_entity_data(ptr: Dwg_Entity_PROXY_ENTITY_Ptr): Uint8Array | null;
+    /**
+     * Returns binary OLE payload of one Dwg_Entity_OLE2FRAME instance.
+     * Uses data_size so embedded NUL bytes are preserved (unlike dynapi TF).
+     * @group Dwg_Entity_OLE2FRAME Methods
+     */
+    dwg_entity_ole2frame_get_data(ptr: Dwg_Entity_OLE2FRAME_Ptr): Uint8Array | null;
+    /**
+     * Returns binary OLE payload of one Dwg_Entity_OLEFRAME instance.
+     * Uses data_size so embedded NUL bytes are preserved (unlike dynapi TF).
+     * @group Dwg_Entity_OLEFRAME Methods
+     */
+    dwg_entity_oleframe_get_data(ptr: Dwg_Entity_OLEFRAME_Ptr): Uint8Array | null;
     /**
      * Returns the first entity owned by the block header or null
      * @group Dwg_Entity_BLOCK_HEADER Methods

package/lib/libredwg.js

@@ -969,6 +969,24 @@ export class LibreDwg {
     dwg_object_entity_get_xdata(ptr) {
         return this.wasmInstance.dwg_object_entity_get_xdata(ptr);
     }
+    /**
+     * Returns the extension dictionary handle of a Dwg_Object_Object instance.
+     * @group Dwg_Object_Object Methods
+     * @param ptr Pointer to one Dwg_Object_Object instance.
+     * @returns Object ref for the extension dictionary, or null when absent.
+     */
+    dwg_object_object_get_xdicobjhandle_object(ptr) {
+        return this.wasmInstance.dwg_object_object_get_xdicobjhandle_object(ptr);
+    }
+    /**
+     * Returns XRECORD payload as DXF group-code / value pairs.
+     * @group Dwg_Object_XRECORD Methods
+     * @param ptr Pointer to one Dwg_Object_XRECORD instance (object tio).
+     * @returns Array of `{ code, value }` groups.
+     */
+    dwg_object_xrecord_get_xdata(ptr) {
+        return this.wasmInstance.dwg_object_xrecord_get_xdata(ptr) ?? [];
+    }
     /**
      * Returns pointer to BLOCK_HEADER owner for generic entity from ent->ownerhandle.
      * @group Dwg_Object_Entity Methods
@@ -1037,9 +1055,12 @@ export class LibreDwg {
      * @returns Returns preview image of the block pointed by the specified block header.
      */
     dwg_entity_block_header_get_preview(ptr) {
-        const wasmInstance = this.wasmInstance;
-        return wasmInstance.dwg_entity_block_header_get_preview(ptr)
-            .data;
+        const wasm = this.wasmInstance;
+        if (typeof wasm.dwg_entity_block_header_get_preview !== 'function') {
+            return null;
+        }
+        const result = wasm.dwg_entity_block_header_get_preview(ptr);
+        return result?.data ?? null;
     }
     /**
      * Returns preview binary data of one entity (common entity preview field).
@@ -1067,6 +1088,32 @@ export class LibreDwg {
         const result = wasm.dwg_entity_proxy_entity_get_entity_data(ptr);
         return result?.data ?? null;
     }
+    /**
+     * Returns binary OLE payload of one Dwg_Entity_OLE2FRAME instance.
+     * Uses data_size so embedded NUL bytes are preserved (unlike dynapi TF).
+     * @group Dwg_Entity_OLE2FRAME Methods
+     */
+    dwg_entity_ole2frame_get_data(ptr) {
+        const wasm = this.wasmInstance;
+        if (typeof wasm.dwg_entity_ole2frame_get_data !== 'function') {
+            return null;
+        }
+        const result = wasm.dwg_entity_ole2frame_get_data(ptr);
+        return result?.data ?? null;
+    }
+    /**
+     * Returns binary OLE payload of one Dwg_Entity_OLEFRAME instance.
+     * Uses data_size so embedded NUL bytes are preserved (unlike dynapi TF).
+     * @group Dwg_Entity_OLEFRAME Methods
+     */
+    dwg_entity_oleframe_get_data(ptr) {
+        const wasm = this.wasmInstance;
+        if (typeof wasm.dwg_entity_oleframe_get_data !== 'function') {
+            return null;
+        }
+        const result = wasm.dwg_entity_oleframe_get_data(ptr);
+        return result?.data ?? null;
+    }
     /**
      * Returns the first entity owned by the block header or null
      * @group Dwg_Entity_BLOCK_HEADER Methods

package/lib/types/common.d.ts

@@ -26,6 +26,8 @@ export type Dwg_Entity_LWPOLYLINE_Ptr = number;
 export type Dwg_Entity_MTEXT_Ptr = number;
 export type Dwg_Entity_TEXT_Ptr = number;
 export type Dwg_Entity_PROXY_ENTITY_Ptr = number;
+export type Dwg_Entity_OLE2FRAME_Ptr = number;
+export type Dwg_Entity_OLEFRAME_Ptr = number;
 export interface Dwg_Handle {
     code: number;
     size: number;