fix: paper spaces and bump version (#110)

examples/example.js

@@ -8,5 +8,14 @@ const layerTest = dxf.addLayer('test', Colors.Blue)
 const line = paperSpace.addLine(point3d(), point3d(100, 100));
 line.layerName = layerTest.name;
 
+const paperSpace0 = dxf.addPaperSpace();
+const l = paperSpace0.addLine(point3d(), point3d(100, 100));
+l.layerName = layerTest.name;
+
+dxf.addPaperSpace().addLine(point3d(), point3d(100, 100)); // paperSpace1
+dxf.addPaperSpace().addLine(point3d(), point3d(100, 100)); // paperSpace2
+dxf.addPaperSpace(); // paperSpace3 (empty)
+
+
 const _str = dxf.stringify();
 writeFileSync('examples/example.dxf', _str);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarikjabiri/dxf",
-  "version": "2.8.5",
+  "version": "2.8.6",
   "description": "A JavaScript interface to Dxf written in TypeScript.",
   "main": "./lib/index.cjs.js",
   "module": "./lib/index.esm.js",

specs/__snapshots__/DxfWriter.spec.ts.snap

@@ -864,7 +864,7 @@ CIRCLE
 5
 23
 330
-21
+20
 100
 AcDbEntity
 8
@@ -884,7 +884,7 @@ LWPOLYLINE
 5
 24
 330
-21
+20
 100
 AcDbEntity
 8
@@ -938,7 +938,7 @@ POINT
 5
 1A
 330
-D
+C
 100
 AcDbEntity
 8
@@ -956,7 +956,7 @@ LWPOLYLINE
 5
 1B
 330
-D
+C
 100
 AcDbEntity
 8
@@ -996,7 +996,7 @@ LINE
 5
 1C
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1020,7 +1020,7 @@ LWPOLYLINE
 5
 1E
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1064,7 +1064,7 @@ LWPOLYLINE
 5
 1F
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1128,7 +1128,7 @@ INSERT
 5
 25
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1166,7 +1166,7 @@ SPLINE
 5
 26
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1258,7 +1258,7 @@ ARC
 5
 27
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1284,7 +1284,7 @@ ELLIPSE
 5
 28
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1314,7 +1314,7 @@ AcDbEllipse
 5
 29
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1352,7 +1352,7 @@ CIRCLE
 5
 2A
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1372,7 +1372,7 @@ POLYLINE
 5
 2B
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1478,7 +1478,7 @@ IMAGE
 5
 31
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1542,7 +1542,7 @@ TEXT
 5
 37
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1568,7 +1568,7 @@ DIMENSION
 5
 3B
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1598,7 +1598,7 @@ DIMENSION
 5
 3C
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1644,7 +1644,7 @@ DIMENSION
 5
 3D
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1674,7 +1674,7 @@ DIMENSION
 5
 3E
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1706,7 +1706,7 @@ DIMENSION
 5
 3F
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1738,7 +1738,7 @@ DIMENSION
 5
 40
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1772,7 +1772,7 @@ DIMENSION
 5
 41
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1828,7 +1828,7 @@ DIMENSION
 5
 42
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1878,7 +1878,7 @@ DIMENSION
 5
 43
 330
-D
+C
 100
 AcDbEntity
 8
@@ -1914,7 +1914,7 @@ DIMENSION
 5
 44
 330
-D
+C
 100
 AcDbEntity
 8

src/DxfWriter.ts

@@ -76,6 +76,15 @@ export class DxfWriter {
     return this.blocks.addBlock(name, this.document.objects)
   }
 
+  /**
+   * Add new paper space block to the blocks tables.
+   * @returns The added block.
+   */
+  addPaperSpace() {
+    return this.blocks.addPaperSpace()
+  }
+
+
   /**
    * Add a header variable to the dxf if not exist.
    * If exist it will update values.

src/Sections/BlocksSection/DxfBlock.ts

@@ -1,4 +1,5 @@
 import { point3d, vec3_t } from 'Internals/Helpers'
+import { DxfBlockRecord } from 'TablesSection/Tables/Records/DxfBlockRecord'
 import { DxfEndBlk } from './DxfEndBlk'
 import { DxfObjectsSection } from 'ObjectsSection/DxfObjectsSection'
 import { Dxfier } from 'Internals/Dxfier'
@@ -35,11 +36,12 @@ export class DxfBlock extends EntitiesManager {
     return this.isModelSpace || this.isPaperSpace
   }
 
-  constructor(name: string, objects: DxfObjectsSection) {
-    super(objects, '0')
+  constructor(name: string, blockRecord: DxfBlockRecord, objects: DxfObjectsSection) {
+    super(objects, blockRecord, '0')
     this.name = name
     this.flags = BlockFlags.None
     this.endBlk = new DxfEndBlk()
+    this.ownerObjectHandle = blockRecord.handle
     this.basePoint = point3d(0, 0, 0)
     this.xrefPathName = ''
   }
@@ -60,7 +62,7 @@ export class DxfBlock extends EntitiesManager {
     dx.point3d(this.basePoint)
     dx.name(this.name, 3)
     dx.push(1, this.xrefPathName)
-    if (!this.isModelOrPaperSpace) super.dxfy(dx)
+    if (!this.isModelSpace && this.name !== '*Paper_Space') super.dxfy(dx)
     this.endBlk.dxfy(dx)
   }
 }

src/Sections/BlocksSection/DxfBlocksSection.ts

@@ -26,8 +26,7 @@ export class DxfBlocksSection implements DxfInterface {
   ): DxfBlock {
     if (removeSpecialChars) name = name.replace(specialCharsRegex, '')
     const blockRecord = this.tables.addBlockRecord(name)
-    const block = new DxfBlock(name, objects)
-    block.ownerObjectHandle = blockRecord.handle
+    const block = new DxfBlock(name, blockRecord, objects)
     this.blocks.push(block)
     return block
   }

src/Sections/EntitiesSection/DxfEntitiesSection.ts

@@ -5,10 +5,12 @@ import { Dxfier } from 'Internals/Dxfier'
 export class DxfEntitiesSection implements DxfInterface {
   readonly blocks: DxfBlocksSection
   readonly modelSpace: DxfBlock
+  readonly paperSpace: DxfBlock
 
   constructor(blocks: DxfBlocksSection) {
     this.blocks = blocks
     this.modelSpace = blocks.modelSpace
+    this.paperSpace = blocks.paperSpace
   }
 
   setLayerName(layerName: string) {
@@ -17,15 +19,8 @@ export class DxfEntitiesSection implements DxfInterface {
 
   dxfy(dx: Dxfier) {
     dx.start('ENTITIES')
+    this.paperSpace.entities.forEach((e) => e.dxfy(dx))
     this.modelSpace.entities.forEach((e) => e.dxfy(dx))
-    this.blocks.blocks.forEach((b) => {
-      if (b.isPaperSpace) {
-        b.entities.forEach((e) => {
-          e.inPaperSpace = true
-          e.dxfy(dx)
-        })
-      }
-    })
     dx.end()
   }
 }

src/Sections/EntitiesSection/EntitiesManager.ts

@@ -1,21 +1,24 @@
 import { BoundingBox, boundingBox_t } from 'Internals/BoundingBox'
 import Entity, { CommonEntityOptions } from './Entity'
 import { RectangleOptions, bulge, point2d, vec2_t, vec3_t } from 'Internals/Helpers'
+import { DxfBlockRecord } from 'TablesSection/Tables/Records/DxfBlockRecord'
 import { DxfInterface } from 'Internals/Interfaces'
 import { DxfObjectsSection } from 'ObjectsSection/DxfObjectsSection'
 import { Dxfier } from 'Internals/Dxfier'
 import Handle from 'Internals/Handle'
 import * as Entities from './Entities'
 
 export abstract class EntitiesManager implements DxfInterface {
+  readonly blockRecord: DxfBlockRecord
   readonly entities: Entity[] = []
   readonly handle: string
   private readonly objects: DxfObjectsSection
   layerName: string
 
-  constructor(objects: DxfObjectsSection, layerName: string) {
+  constructor(objects: DxfObjectsSection, blockRecord: DxfBlockRecord, layerName: string) {
     this.handle = Handle.next()
     this.objects = objects
+    this.blockRecord = blockRecord
     this.layerName = layerName
   }
 
@@ -35,7 +38,8 @@ export abstract class EntitiesManager implements DxfInterface {
   }
 
   addEntity<T extends Entity>(entity: T): T {
-    entity.ownerBlockRecord = this.handle
+    entity.ownerBlockRecord = this.blockRecord.handle
+    if(this.blockRecord.isPaperSpace) entity.inPaperSpace = true
     if (entity.layerName == null) entity.layerName = this.layerName
     this.entities.push(entity)
     return entity

src/Sections/TablesSection/Tables/Records/DxfBlockRecord.ts

@@ -8,6 +8,10 @@ export class DxfBlockRecord extends DxfRecord {
   scalability: number
   layoutObject?: string
 
+  get isPaperSpace() {
+    return this.name.startsWith('*Paper_Space')
+  }
+
   constructor(name: string) {
     super('BLOCK_RECORD')
     this.name = name