@design-core/core 0.0.1 → 0.0.3

package/core/lib/dxf/dxfWrite.js

@@ -1,24 +1,19 @@
-import {DXFFile} from './dxfFile.js';
-import {DesignCore} from '../../designCore.js';
+import { DXFFile } from './dxfFile.js';
+import { DesignCore } from '../../designCore.js';
 
+/** DXF Writer Class */
 export class DXFWriter {
-  constructor() {
-  }
+  /** Create DXF Writer */
+  constructor() { }
 
   /**
    * Write DXF header section
    * @param {DXFFile} file
    */
   writeHeaders(file) {
-    // write headers
     file.writeGroupCode('0', 'SECTION');
     file.writeGroupCode('2', 'HEADER');
-    file.writeGroupCode('9', '$ACADVER');
-    file.writeGroupCode('1', file.version);
-    file.writeGroupCode('9', '$CLAYER');
-    file.writeGroupCode('8', DesignCore.LayerManager.getCstyle());
-    file.writeGroupCode('9', '$HANDSEED', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.formatHandle(DesignCore.Scene.items.length + 200), DXFFile.Version.R2000); // TODO: This needs to reflect the actual handle values
+    DesignCore.Scene.headers.dxf(file);
     file.writeGroupCode('0', 'ENDSEC');
   }
 
@@ -39,59 +34,15 @@ export class DXFWriter {
     // dimstyle table
     DesignCore.DimStyleManager.dxf(file);
     // vport table
-    DesignCore.Scene.dxf(file);
-
-    // VIEW Table
-    file.writeGroupCode('0', 'TABLE', DXFFile.Version.R2000);
-    file.writeGroupCode('2', 'VIEW', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbSymbolTable', DXFFile.Version.R2000);
-    file.writeGroupCode('0', 'ENDTAB', DXFFile.Version.R2000);
-
-    // UCS TABLE
-    file.writeGroupCode('0', 'TABLE', DXFFile.Version.R2000);
-    file.writeGroupCode('2', 'UCS', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbSymbolTable', DXFFile.Version.R2000);
-    file.writeGroupCode('0', 'ENDTAB', DXFFile.Version.R2000);
-
-    // APPID Table
-    file.writeGroupCode('0', 'TABLE', DXFFile.Version.R2000);
-    file.writeGroupCode('2', 'APPID', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbSymbolTable', DXFFile.Version.R2000);
-    file.writeGroupCode('0', 'APPID', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbSymbolTableRecord', DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbRegAppTableRecord', DXFFile.Version.R2000);
-    file.writeGroupCode('2', 'ACAD', DXFFile.Version.R2000);
-    file.writeGroupCode('70', '0', DXFFile.Version.R2000);
-    file.writeGroupCode('0', 'ENDTAB', DXFFile.Version.R2000);
-
-    // BLOCK_RECORD Table
-    file.writeGroupCode('0', 'TABLE', DXFFile.Version.R2000);
-    file.writeGroupCode('2', 'BLOCK_RECORD', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbSymbolTable', DXFFile.Version.R2000);
-    file.writeGroupCode('70', '2', DXFFile.Version.R2000);
-
-    // Model Space
-    file.writeGroupCode('0', 'BLOCK_RECORD', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbSymbolTableRecord', DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbBlockTableRecord', DXFFile.Version.R2000);
-    file.writeGroupCode('2', '*Model_Space', DXFFile.Version.R2000);
-    file.writeGroupCode('340', '22', DXFFile.Version.R2000);
-
-    // Paper Space
-    file.writeGroupCode('0', 'BLOCK_RECORD', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbSymbolTableRecord', DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbBlockTableRecord', DXFFile.Version.R2000);
-    file.writeGroupCode('2', '*Paper_Space', DXFFile.Version.R2000);
-    file.writeGroupCode('340', '22', DXFFile.Version.R2000);
-
-    file.writeGroupCode('0', 'ENDTAB', DXFFile.Version.R2000);
+    DesignCore.VPortManager.dxf(file);
+    // view table
+    DesignCore.ViewManager.dxf(file);
+    // ucs table
+    DesignCore.UCSManager.dxf(file);
+    // appid table
+    DesignCore.AppIDManager.dxf(file);
+    // block record table
+    DesignCore.BlockRecordManager.dxf(file);
 
     // end tables section
     file.writeGroupCode('0', 'ENDSEC');
@@ -105,52 +56,10 @@ export class DXFWriter {
     file.writeGroupCode('0', 'SECTION');
     file.writeGroupCode('2', 'BLOCKS');
 
-    for (let i = 0; i <DesignCore.Scene.items.length; i++) {
-      if (DesignCore.Scene.items[i].type === 'Block') {
-        DesignCore.Scene.items[i].dxf(file);
-      }
+    for (let i = 0; i < DesignCore.Scene.blockManager.items.length; i++) {
+      DesignCore.Scene.blockManager.items[i].dxf(file);
     }
 
-
-    // Three empty definitions always appear in the BLOCKS section.
-    // They are titled *Model_Space, *Paper_Space and *Paper_Space0.
-    // Model Space
-    file.writeGroupCode('0', 'BLOCK', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbEntity', DXFFile.Version.R2000);
-    file.writeGroupCode('8', '0', DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbBlockBegin', DXFFile.Version.R2000);
-    file.writeGroupCode('2', '*Model_Space', DXFFile.Version.R2000);
-    file.writeGroupCode('10', '0.0', DXFFile.Version.R2000);
-    file.writeGroupCode('20', '0.0', DXFFile.Version.R2000);
-    file.writeGroupCode('30', '0.0', DXFFile.Version.R2000);
-    file.writeGroupCode('3', '*Model_Space', DXFFile.Version.R2000);
-    file.writeGroupCode('1', '', DXFFile.Version.R2000);
-    file.writeGroupCode('0', 'ENDBLK', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbEntity', DXFFile.Version.R2000);
-    file.writeGroupCode('8', '0', DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbBlockEnd', DXFFile.Version.R2000);
-
-    // Model Space
-    file.writeGroupCode('0', 'BLOCK', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbEntity', DXFFile.Version.R2000);
-    file.writeGroupCode('8', '0', DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbBlockBegin', DXFFile.Version.R2000);
-    file.writeGroupCode('2', '*Paper_Space', DXFFile.Version.R2000);
-    file.writeGroupCode('10', '0.0', DXFFile.Version.R2000);
-    file.writeGroupCode('20', '0.0', DXFFile.Version.R2000);
-    file.writeGroupCode('30', '0.0', DXFFile.Version.R2000);
-    file.writeGroupCode('3', '*Paper_Space', DXFFile.Version.R2000);
-    file.writeGroupCode('1', '', DXFFile.Version.R2000);
-    file.writeGroupCode('0', 'ENDBLK', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbEntity', DXFFile.Version.R2000);
-    file.writeGroupCode('8', '0', DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbBlockEnd', DXFFile.Version.R2000);
-
-
     file.writeGroupCode('0', 'ENDSEC');
   }
 
@@ -162,24 +71,39 @@ export class DXFWriter {
     file.writeGroupCode('0', 'SECTION');
     file.writeGroupCode('2', 'ENTITIES');
 
-    for (let i = 0; i <DesignCore.Scene.items.length; i++) {
-      if (DesignCore.Scene.items[i].type !== 'Block') {
-        DesignCore.Scene.items[i].dxf(file);
-      }
+    for (let i = 0; i < DesignCore.Scene.entities.count(); i++) {
+      DesignCore.Scene.entities.get(i).dxf(file);
     }
 
     file.writeGroupCode('0', 'ENDSEC');
   }
 
+  /**
+   * Write Dictionary section
+   * @param {DXFFile} file
+   */
+  writeObjects(file) {
+    // Dictionary
+    file.writeGroupCode('0', 'SECTION', DXFFile.Version.R2000);
+    file.writeGroupCode('2', 'OBJECTS', DXFFile.Version.R2000);
+
+    DesignCore.DictionaryManager.dxf(file);
+
+    file.writeGroupCode('0', 'ENDSEC', DXFFile.Version.R2000);
+  }
+
+
   /**
    * Write DXF file
-   * @returns dxf formatted string formatted
+   * @param {string} version
+   * @return {string} dxf formatted string formatted
    */
   write(version) {
     if (version === undefined) {
-      version = DesignCore.Core.dxfVersion;
+      version = DesignCore.Scene.headers.dxfVersion;
     }
     const file = new DXFFile(version);
+
     // write start of file
     file.writeGroupCode('999', 'DXF created from Design-Core');
 
@@ -188,21 +112,7 @@ export class DXFWriter {
     this.writeTables(file);
     this.writeBlocks(file);
     this.writeEntities(file);
-
-    // Dictionary
-    file.writeGroupCode('0', 'SECTION', DXFFile.Version.R2000);
-    file.writeGroupCode('2', 'OBJECTS', DXFFile.Version.R2000);
-    file.writeGroupCode('0', 'DICTIONARY', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbDictionary', DXFFile.Version.R2000);
-    file.writeGroupCode('281', '1', DXFFile.Version.R2000);
-    file.writeGroupCode('3', 'ACAD_GROUP', DXFFile.Version.R2000);
-    file.writeGroupCode('350', 'D', DXFFile.Version.R2000);
-    file.writeGroupCode('0', 'DICTIONARY', DXFFile.Version.R2000);
-    file.writeGroupCode('5', file.nextHandle(), DXFFile.Version.R2000);
-    file.writeGroupCode('100', 'AcDbDictionary', DXFFile.Version.R2000);
-    file.writeGroupCode('281', '1', DXFFile.Version.R2000);
-    file.writeGroupCode('0', 'ENDSEC', DXFFile.Version.R2000);
+    this.writeObjects(file);
 
     // write end of file
     file.writeGroupCode('0', 'EOF');

package/core/lib/dxf/handleManager.js

@@ -0,0 +1,97 @@
+import { Logging } from '../logging.js';
+
+/** HandleManager Class */
+export class HandleManager {
+  /** Create HandleManager */
+  constructor() {
+    this.counter = 10;
+    this.usedHandles = new Set();
+  }
+
+  /** Reset the handle counter */
+  reset() {
+    this.counter = 10;
+    this.usedHandles.clear();
+  }
+
+  /**
+   * Returns the next available handle value
+   * R12 handles are optional.
+   * R13+ handles are mandatory.
+   * The header variable $HANDSEED must be greater than the largest handle value
+   * @return {string} handle value
+   */
+  next() {
+    const handle = this.format(this.counter);
+    this.usedHandles.add(handle);
+    this.counter++;
+    return handle;
+  }
+
+  /**
+   * Get the handseed value
+   * The handseed must be greater than the largest handle value
+   * @return {string} handseed hex value
+   */
+  get handseed() {
+    return this.format(this.counter);
+  }
+
+  /**
+   * Set the handseed value
+   * @param {string} value - hex string
+   */
+  set handseed(value) {
+    this.counter = parseInt(value, 16);
+  }
+
+  /**
+   * Check the given handle value and ensure the counter is above it.
+   * Call this when a handle is loaded from a file to keep the counter valid.
+   * @param {string} handle - hex string
+   */
+  checkHandle(handle) {
+    if (handle === undefined || handle === null) {
+      return;
+    }
+
+    const normalised = String(handle).toUpperCase();
+
+    if (!normalised.length || !/^[0-9A-F]+$/.test(normalised)) {
+      Logging.instance.warn(`Invalid handle: ${handle}`);
+      return;
+    }
+
+    if (this.usedHandles.has(normalised)) {
+      Logging.instance.error(`Duplicate handle: ${normalised}`);
+    }
+
+    this.usedHandles.add(normalised);
+
+    const value = parseInt(normalised, 16);
+    if (value >= this.counter) {
+      this.counter = value + 1;
+    }
+  }
+
+  /**
+   * Release a handle back to the pool.
+   * Call this when an entity is removed so the handle is no longer
+   * considered in-use and can be safely re-registered on undo.
+   * @param {string} handle - hex string
+   */
+  releaseHandle(handle) {
+    if (handle === undefined || handle === null) return;
+    this.usedHandles.delete(String(handle).toUpperCase());
+  }
+
+  /**
+   * Format a handle value
+   * A handle is an arbitrary but unique hex value as string up to 16 hexadecimal digits (8 bytes).
+   * @param {number} value
+   * @return {string} handle hex value
+   */
+  format(value) {
+    return value.toString(16).toUpperCase();
+  }
+}

package/core/lib/dxf/sections/blocks.js

@@ -1,18 +1,32 @@
-import {Section} from './section.js';
+import { Section } from './section.js';
 
+/**
+ * Blocks Class
+ * @extends Section
+ */
 export class Blocks extends Section {
+  /** Create Blocks */
   constructor() {
     super();
 
     this.blocks = [];
   }
 
+  /**
+   * Add Block
+   * @param {Object} block
+   */
   addBlock(block) {
     if (Object.keys(block).length) {
       this.blocks.push(block);
     }
   }
 
+  /**
+   * Read
+   * @param {Object} iterator
+   * @return {Array}
+   */
   read(iterator) {
     let currentBlock = {};
     while (iterator.nextPair().value !== 'ENDSEC') {
@@ -22,7 +36,7 @@ export class Blocks extends Section {
 
           if (['BLOCK'].includes(currentPair.value)) {
             this.addBlock(currentBlock);
-            currentBlock = {children: []};
+            currentBlock = { children: [] };
             this.parseValue(iterator, currentBlock);
             break;
           } else {

package/core/lib/dxf/sections/entities.js

@@ -1,14 +1,23 @@
-import {Section} from './section.js';
-import {DxfIterator} from '../dxfIterator.js';
-import {Strings} from '../../strings.js';
+import { Section } from './section.js';
+import { DxfIterator } from '../dxfIterator.js';
+import { Strings } from '../../strings.js';
 
+/**
+ * Entities Class
+ * @extends Section
+ */
 export class Entities extends Section {
+  /** Create Entities */
   constructor() {
     super();
 
     this.entities = [];
   }
 
+  /**
+   * Add Entity
+   * @param {Object} entity
+   */
   addEntity(entity) {
     if (Object.keys(entity).length) {
       if (!entity.hasOwnProperty('points')) {
@@ -19,6 +28,11 @@ export class Entities extends Section {
     }
   }
 
+  /**
+   * Read
+   * @param {Object} iterator
+   * @return {Array}
+   */
   read(iterator) {
     let currentEntity = {};
     while (iterator.nextPair().value !== 'ENDSEC') {

package/core/lib/dxf/sections/header.js

@@ -1,6 +1,11 @@
-import {Section} from './section.js';
+import { Section } from './section.js';
 
+/**
+ * Header Class
+ * @extends Section
+ */
 export class Header extends Section {
+  /** Create Header */
   constructor() {
     super();
 
@@ -10,6 +15,10 @@ export class Header extends Section {
     this.$CLAYER = '0';
   }
 
+  /**
+   * Read
+   * @param {Object} iterator
+   */
   read(iterator) {
     let currentVariable;
     while (iterator.nextPair().value !== 'ENDSEC') {

package/core/lib/dxf/sections/objects.js

@@ -0,0 +1,36 @@
+import { Section } from './section.js';
+
+/**
+ * Objects Class
+ * @extends Section
+ */
+export class Objects extends Section {
+  /** Create Objects */
+  constructor() {
+    super();
+
+    this.objects = [];
+  }
+
+  /**
+   * Read
+   * @param {Object} iterator
+   * @return {Array}
+   */
+  read(iterator) {
+    while (iterator.nextPair().value !== 'ENDSEC') {
+      const currentPair = iterator.currentPair();
+      switch (true) {
+        case (currentPair.code === '0'):
+          const object = this.parseChild(iterator);
+          this.objects.push(object);
+          break;
+
+        default:
+          break;
+      }
+    }
+
+    return this.objects;
+  }
+}

package/core/lib/dxf/sections/section.js

@@ -1,11 +1,19 @@
 
-import {DxfIterator} from '../dxfIterator.js';
-import {Strings} from '../../strings.js';
-export class Section {
-  constructor() {
+import { DxfIterator } from '../dxfIterator.js';
+import { Strings } from '../../strings.js';
 
-  }
+/**
+ * Section Class
+ */
+export class Section {
+  /** Create Section */
+  constructor() { }
 
+  /**
+   * Parse value
+   * @param {Object} iterator
+   * @param {Object} object
+   */
   parseValue(iterator, object) {
     const currentPair = iterator.currentPair();
 
@@ -46,6 +54,11 @@ export class Section {
     object[currentPair.code] = value;
   }
 
+  /**
+   * Parse Child
+   * @param {Object} iterator
+   * @return {Object}
+   */
   parseChild(iterator) {
     const child = {};
 
@@ -71,6 +84,11 @@ export class Section {
     }
   }
 
+  /**
+   *
+   * @param {Object} iterator
+   * @return {Point}
+   */
   parsePoint(iterator) {
     const point = {};
 
@@ -113,6 +131,11 @@ export class Section {
     }
   }
 
+  /**
+   * Parse Float
+   * @param {string} value
+   * @return {number}
+   */
   parseFloat(value) {
     if (isNaN(value)) {
       DxfIterator.instance.dxfError(Strings.Error.INVALIDNUMBER);
@@ -122,6 +145,11 @@ export class Section {
   }
 
 
+  /**
+   * Parse Int
+   * @param {string} value
+   * @return {number}
+   */
   parseInt(value) {
     if (isNaN(value)) {
       DxfIterator.instance.dxfError(Strings.Error.INVALIDNUMBER);
@@ -130,10 +158,20 @@ export class Section {
     return parseInt(value);
   }
 
+  /**
+   * Parse Bool
+   * @param {string} value
+   * @return {boolean}
+   */
   parseBoolean(value) {
     return Boolean(parseInt(value.trim()));
   }
 
+  /**
+   *
+   * @param {Object} Pair
+   * @return {any}
+   */
   getGroupValue(Pair) {
     const code = parseInt(Pair.code);
     const value = Pair.value;

package/core/lib/dxf/sections/tables.js

@@ -1,27 +1,41 @@
-import {Section} from './section.js';
+import { Section } from './section.js';
 
+/**
+ * Tables Class
+ * @extends Section
+ */
 export class Tables extends Section {
+  /** Create Tables */
   constructor() {
     super();
 
     this.tables = [];
   }
 
+  /**
+   * Add Table
+   * @param {Object} table
+   */
   addTable(table) {
     if (Object.keys(table).length) {
       this.tables.push(table);
     }
   }
 
+  /**
+   * Read
+   * @param {Object} iterator
+   * @return {Object}
+   */
   read(iterator) {
     let currentTable;
     while (iterator.nextPair().value !== 'ENDSEC') {
       const currentPair = iterator.currentPair();
       switch (true) {
-        case (currentPair.code === '0' ):
+        case (currentPair.code === '0'):
 
           if (['TABLE'].includes(currentPair.value)) {
-            currentTable = {children: []};
+            currentTable = { children: [] };
             this.parseValue(iterator, currentTable);
             break;
           } else if (['ENDTAB'].includes(currentPair.value)) {