@design-core/core 0.0.6 → 50.1.0

package/test/tools/chamferFilletBase.test.js

@@ -11,8 +11,8 @@ const core = new Core();
 
 test('ChamferFilletBase.resolveCornerGeometry returns false and notifies when first segment is not a Line', () => {
   core.scene.clear();
-  core.scene.addItem('Circle', { points: [new Point(0, 0), new Point(5, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(0, 10)] });
+  core.scene.addEntity('Circle', { points: [new Point(0, 0), new Point(5, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(0, 10)] });
 
   const notifySpy = jest.spyOn(core, 'notify');
   const chamfer = new Chamfer();
@@ -28,8 +28,8 @@ test('ChamferFilletBase.resolveCornerGeometry returns false and notifies when fi
 
 test('ChamferFilletBase.resolveCornerGeometry returns false and notifies when second segment is not a Line', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(10, 0)] });
-  core.scene.addItem('Circle', { points: [new Point(0, 0), new Point(5, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Circle', { points: [new Point(0, 0), new Point(5, 0)] });
 
   const notifySpy = jest.spyOn(core, 'notify');
   const chamfer = new Chamfer();
@@ -45,8 +45,8 @@ test('ChamferFilletBase.resolveCornerGeometry returns false and notifies when se
 
 test('ChamferFilletBase.resolveCornerGeometry returns false and notifies for parallel lines', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(10, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, 2), new Point(10, 2)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 2), new Point(10, 2)] });
 
   const notifySpy = jest.spyOn(core, 'notify');
   const chamfer = new Chamfer();
@@ -63,8 +63,8 @@ test('ChamferFilletBase.resolveCornerGeometry returns false and notifies for par
 test('ChamferFilletBase.resolveCornerGeometry returns false for collinear overlapping lines', () => {
   core.scene.clear();
   // Two segments on the same line that overlap
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(10, 0)] });
-  core.scene.addItem('Line', { points: [new Point(5, 0), new Point(15, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(5, 0), new Point(15, 0)] });
 
   const notifySpy = jest.spyOn(core, 'notify');
   const chamfer = new Chamfer();
@@ -81,8 +81,8 @@ test('ChamferFilletBase.resolveCornerGeometry returns false for collinear overla
 test('ChamferFilletBase.resolveCornerGeometry returns false for collinear endpoint-sharing lines', () => {
   core.scene.clear();
   // Two collinear segments sharing an endpoint (180° angle)
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(5, 0)] });
-  core.scene.addItem('Line', { points: [new Point(5, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(5, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(5, 0), new Point(10, 0)] });
 
   const notifySpy = jest.spyOn(core, 'notify');
   const chamfer = new Chamfer();
@@ -99,8 +99,8 @@ test('ChamferFilletBase.resolveCornerGeometry returns false for collinear endpoi
 test('ChamferFilletBase.resolveCornerGeometry returns true and computes intersection for L-corner', () => {
   // Horizontal (-10,0)→(0,0) and vertical (0,0)→(0,10); infinite lines meet at (0,0)
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(-10, 0), new Point(0, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(0, 10)] });
+  core.scene.addEntity('Line', { points: [new Point(-10, 0), new Point(0, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(0, 10)] });
 
   const chamfer = new Chamfer();
   chamfer.firstPick.entity = core.scene.entities.get(0);
@@ -125,8 +125,8 @@ test('ChamferFilletBase.resolveCornerGeometry uses polyline activeSeg for first
   // Polyline [(-10,0),(0,0),(0,10)], click near segment 1 (y=0).
   // Paired with vertical line x=5; lines meet at (5,0).
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(-10, 0), new Point(0, 0), new Point(0, 10)] });
-  core.scene.addItem('Line', { points: [new Point(5, -5), new Point(5, 5)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(-10, 0), new Point(0, 0), new Point(0, 10)] });
+  core.scene.addEntity('Line', { points: [new Point(5, -5), new Point(5, 5)] });
 
   const polyEntity = core.scene.entities.get(0);
   const lineEntity = core.scene.entities.get(1);
@@ -151,8 +151,8 @@ test('ChamferFilletBase.applySharpTrim trims two Lines to the intersection point
   // Line1: (0,0)→(8,0); Line2: (10,-10)→(10,-2). Infinite lines meet at (10,0).
   // keepEnd for Line1 = (0,0); keepEnd for Line2 = (10,-10).
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(8, 0)] });
-  core.scene.addItem('Line', { points: [new Point(10, -10), new Point(10, -2)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(8, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(10, -10), new Point(10, -2)] });
   const lineA = core.scene.entities.get(0);
   const lineB = core.scene.entities.get(1);
 
@@ -167,7 +167,7 @@ test('ChamferFilletBase.applySharpTrim trims two Lines to the intersection point
   chamfer.secondPick.clickPoint = new Point(8, -7); // projects to (10,-7) → lineKeptEnd = (10,-10)
   chamfer.intersectionPoint = new Point(10, 0);
 
-  const stateChanges = chamfer.applySharpTrim();
+  const stateChanges = chamfer.applyCornerTrim(chamfer.intersectionPoint, chamfer.intersectionPoint, null);
   DesignCore.Scene.commit(stateChanges);
 
   const updatedA = core.scene.entities.get(0);
@@ -188,7 +188,7 @@ test('ChamferFilletBase.applySharpTrim poly+poly consecutive segments: replaces
   // L-shaped polyline [(-10,0),(0,0),(0,10)]; segments 1 and 2 share vertex (0,0).
   // Intersection of infinite lines is also (0,0), so splice replaces vertex with itself.
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(-10, 0), new Point(0, 0), new Point(0, 10)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(-10, 0), new Point(0, 0), new Point(0, 10)] });
   const polyEntity = core.scene.entities.get(0);
 
   const chamfer = new Chamfer();
@@ -198,7 +198,7 @@ test('ChamferFilletBase.applySharpTrim poly+poly consecutive segments: replaces
   chamfer.secondPick.segmentIndex = 2;
   chamfer.intersectionPoint = new Point(0, 0);
 
-  const stateChanges = chamfer.applySharpTrim();
+  const stateChanges = chamfer.applyCornerTrim(chamfer.intersectionPoint, chamfer.intersectionPoint, null);
   DesignCore.Scene.commit(stateChanges);
 
   const poly = core.scene.entities.get(0);
@@ -212,7 +212,7 @@ test('ChamferFilletBase.applySharpTrim poly+poly open ends: moves both endpoints
   // Seg 1 is on y=2, seg 3 (lastIdx=3) is on x=3 → infinite lines meet at (3,2).
   // Both open endpoints (index 0 and 3) are moved to (3,2).
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(-5, 2), new Point(0, 2), new Point(3, 4), new Point(3, 8)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(-5, 2), new Point(0, 2), new Point(3, 4), new Point(3, 8)] });
   const polyEntity = core.scene.entities.get(0);
 
   const chamfer = new Chamfer();
@@ -222,7 +222,7 @@ test('ChamferFilletBase.applySharpTrim poly+poly open ends: moves both endpoints
   chamfer.secondPick.segmentIndex = 3; // open end (lastIdx = 3)
   chamfer.intersectionPoint = new Point(3, 2);
 
-  const stateChanges = chamfer.applySharpTrim();
+  const stateChanges = chamfer.applyCornerTrim(chamfer.intersectionPoint, chamfer.intersectionPoint, null);
   DesignCore.Scene.commit(stateChanges);
 
   const poly = core.scene.entities.get(0);
@@ -247,7 +247,7 @@ test('ChamferFilletBase.applySharpTrim poly+poly closed polyline seg1+lastIdx: c
   // The shared corner is at index min(1,3)=1, so corner vertex (0,0) is replaced with
   // the intersection point (0,0) — a no-op on coordinates but proves the splice path ran.
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(-10, 0), new Point(0, 0), new Point(0, 10)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(-10, 0), new Point(0, 0), new Point(0, 10)] });
   const polyEntity = core.scene.entities.get(0);
   polyEntity.flags.setFlagValue(1); // mark as closed
 
@@ -258,7 +258,7 @@ test('ChamferFilletBase.applySharpTrim poly+poly closed polyline seg1+lastIdx: c
   chamfer.secondPick.segmentIndex = polyEntity.points.length - 1; // lastIdx
   chamfer.intersectionPoint = new Point(0, 0);
 
-  const stateChanges = chamfer.applySharpTrim();
+  const stateChanges = chamfer.applyCornerTrim(chamfer.intersectionPoint, chamfer.intersectionPoint, null);
   DesignCore.Scene.commit(stateChanges);
 
   // Corner-splice: replaces vertex at cornerIdx=1 with intersectionPoint — point count unchanged
@@ -275,7 +275,7 @@ test('ChamferFilletBase.applySharpTrim closed poly last-regular-seg + closing-se
   // Corner at (0,10) shared by seg 3 and seg 4. segDiff=1 → corner-splice path.
   // cornerIdx = min(3,4) = 3 → replaces points[3]=(0,10) with intersectionPoint (0,10).
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10), new Point(0, 10)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10), new Point(0, 10)] });
   const polyEntity = core.scene.entities.get(0);
   polyEntity.flags.setFlagValue(1);
 
@@ -286,7 +286,7 @@ test('ChamferFilletBase.applySharpTrim closed poly last-regular-seg + closing-se
   chamfer.secondPick.segmentIndex = 4; // closing segment (points.length)
   chamfer.intersectionPoint = new Point(0, 10);
 
-  const stateChanges = chamfer.applySharpTrim();
+  const stateChanges = chamfer.applyCornerTrim(chamfer.intersectionPoint, chamfer.intersectionPoint, null);
   DesignCore.Scene.commit(stateChanges);
 
   const poly = core.scene.entities.get(0);
@@ -303,7 +303,7 @@ test('ChamferFilletBase.applySharpTrim closed poly closing-seg + seg-1: replaces
   // segDiff = |4-1| = 3 (not 1), closing-wrap detected → cornerIdx = 0.
   // Replaces points[0]=(0,0) with intersectionPoint (0,0).
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10), new Point(0, 10)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10), new Point(0, 10)] });
   const polyEntity = core.scene.entities.get(0);
   polyEntity.flags.setFlagValue(1);
 
@@ -314,7 +314,7 @@ test('ChamferFilletBase.applySharpTrim closed poly closing-seg + seg-1: replaces
   chamfer.secondPick.segmentIndex = 1;
   chamfer.intersectionPoint = new Point(0, 0);
 
-  const stateChanges = chamfer.applySharpTrim();
+  const stateChanges = chamfer.applyCornerTrim(chamfer.intersectionPoint, chamfer.intersectionPoint, null);
   DesignCore.Scene.commit(stateChanges);
 
   const poly = core.scene.entities.get(0);
@@ -336,8 +336,8 @@ test('ChamferFilletBase.applySharpTrim first=Line second=Poly keepStart: line co
   // second=Poly, segmentIndex=2 (segment (-10,0)→(0,0)), click left of intersection → keepStart.
   // Result: Poly becomes [(-20,0),(-10,0),(0,0),(0,10)]; Line removed.
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(0, 10)] });
-  core.scene.addItem('Lwpolyline', { points: [new Point(-20, 0), new Point(-10, 0), new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(0, 10)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(-20, 0), new Point(-10, 0), new Point(0, 0), new Point(10, 0)] });
   const lineEntity = core.scene.entities.get(0);
   const polyEntity = core.scene.entities.get(1);
 
@@ -354,7 +354,7 @@ test('ChamferFilletBase.applySharpTrim first=Line second=Poly keepStart: line co
   chamfer.intersectionPoint = new Point(0, 0);
 
 
-  const stateChanges = chamfer.applySharpTrim();
+  const stateChanges = chamfer.applyCornerTrim(chamfer.intersectionPoint, chamfer.intersectionPoint, null);
   DesignCore.Scene.commit(stateChanges);
 
   expect(core.scene.entities.count()).toBe(1);
@@ -374,8 +374,8 @@ test('ChamferFilletBase.applySharpTrim first=Line second=Poly keepEnd: line cons
   // Same setup, but segmentIndex=3. click right of intersection → keepEnd.
   // Result: Poly becomes [(0,10),(0,0),(10,0)]; Line removed.
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(0, 10)] });
-  core.scene.addItem('Lwpolyline', { points: [new Point(-20, 0), new Point(-10, 0), new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(0, 10)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(-20, 0), new Point(-10, 0), new Point(0, 0), new Point(10, 0)] });
   const lineEntity = core.scene.entities.get(0);
   const polyEntity = core.scene.entities.get(1);
 
@@ -392,7 +392,7 @@ test('ChamferFilletBase.applySharpTrim first=Line second=Poly keepEnd: line cons
   chamfer.intersectionPoint = new Point(0, 0);
 
 
-  const stateChanges = chamfer.applySharpTrim();
+  const stateChanges = chamfer.applyCornerTrim(chamfer.intersectionPoint, chamfer.intersectionPoint, null);
   DesignCore.Scene.commit(stateChanges);
 
   expect(core.scene.entities.count()).toBe(1);
@@ -413,8 +413,8 @@ test('ChamferFilletBase.applySharpTrim first=Poly second=Line: poly/line orderin
   // firstIsPolyline=true → [poly, line] = [this.firstPick, this.secondPick].
   // Result should be the same: Poly becomes [(-20,0),(-10,0),(0,0),(0,10)]; Line removed.
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(-20, 0), new Point(-10, 0), new Point(0, 0), new Point(10, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(0, 10)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(-20, 0), new Point(-10, 0), new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(0, 10)] });
   const polyEntity = core.scene.entities.get(0);
   const lineEntity = core.scene.entities.get(1);
 
@@ -431,7 +431,7 @@ test('ChamferFilletBase.applySharpTrim first=Poly second=Line: poly/line orderin
   chamfer.intersectionPoint = new Point(0, 0);
 
 
-  const stateChanges = chamfer.applySharpTrim();
+  const stateChanges = chamfer.applyCornerTrim(chamfer.intersectionPoint, chamfer.intersectionPoint, null);
   DesignCore.Scene.commit(stateChanges);
 
   expect(core.scene.entities.count()).toBe(1);
@@ -444,3 +444,92 @@ test('ChamferFilletBase.applySharpTrim first=Poly second=Line: poly/line orderin
   expect(poly.points[3].x).toBeCloseTo(0);
   expect(poly.points[3].y).toBeCloseTo(10);
 });
+
+// ─── validateSelection ────────────────────────────────────────────────────────
+
+test('ChamferFilletBase.validateSelection returns null when firstPick has no entity', () => {
+  const chamfer = new Chamfer();
+  expect(chamfer.validateSelection()).toBeNull();
+});
+
+test('ChamferFilletBase.validateSelection returns null when firstPick entity is not a Line', () => {
+  core.scene.clear();
+  core.scene.addEntity('Circle', { points: [new Point(0, 0), new Point(5, 0)] });
+
+  const chamfer = new Chamfer();
+  chamfer.firstPick.entity = core.scene.entities.get(0); // Circle — resolveEndpoints fails
+
+  DesignCore.Mouse.pointOnScene = () => new Point(5, 5);
+  expect(chamfer.validateSelection()).toBeNull();
+});
+
+test('ChamferFilletBase.validateSelection returns null when findClosestItem returns undefined', () => {
+  core.scene.clear();
+  core.scene.addEntity('Line', { points: [new Point(-10, 0), new Point(0, 0)] });
+
+  const chamfer = new Chamfer();
+  chamfer.firstPick.entity = core.scene.entities.get(0);
+  chamfer.firstPick.clickPoint = new Point(-5, 0);
+
+  const findSpy = jest.spyOn(core.scene.selectionManager, 'findClosestItem').mockReturnValue(undefined);
+  DesignCore.Mouse.pointOnScene = () => new Point(5, 5);
+  const result = chamfer.validateSelection();
+  findSpy.mockRestore();
+
+  expect(result).toBeNull();
+});
+
+test('ChamferFilletBase.validateSelection returns null when hovered entity is not a Line or PolylineBase', () => {
+  core.scene.clear();
+  core.scene.addEntity('Line', { points: [new Point(-10, 0), new Point(0, 0)] });
+  core.scene.addEntity('Circle', { points: [new Point(5, 5), new Point(10, 5)] });
+
+  const chamfer = new Chamfer();
+  chamfer.firstPick.entity = core.scene.entities.get(0);
+  chamfer.firstPick.clickPoint = new Point(-5, 0);
+
+  const findSpy = jest.spyOn(core.scene.selectionManager, 'findClosestItem').mockReturnValue(1);
+  DesignCore.Mouse.pointOnScene = () => new Point(5, 5);
+  const result = chamfer.validateSelection();
+  findSpy.mockRestore();
+
+  expect(result).toBeNull();
+});
+
+test('ChamferFilletBase.validateSelection returns null when first and second segments are parallel', () => {
+  core.scene.clear();
+  core.scene.addEntity('Line', { points: [new Point(-10, 0), new Point(0, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 2), new Point(10, 2)] }); // parallel horizontal
+
+  const chamfer = new Chamfer();
+  chamfer.firstPick.entity = core.scene.entities.get(0);
+  chamfer.firstPick.clickPoint = new Point(-5, 0);
+
+  const findSpy = jest.spyOn(core.scene.selectionManager, 'findClosestItem').mockReturnValue(1);
+  DesignCore.Mouse.pointOnScene = () => new Point(5, 2);
+  const result = chamfer.validateSelection();
+  findSpy.mockRestore();
+
+  expect(result).toBeNull();
+});
+
+test('ChamferFilletBase.validateSelection returns selection object for valid perpendicular lines', () => {
+  core.scene.clear();
+  core.scene.addEntity('Line', { points: [new Point(-10, 0), new Point(0, 0)] }); // horizontal
+  core.scene.addEntity('Line', { points: [new Point(5, -5), new Point(5, 5)] }); // vertical at x=5
+
+  const chamfer = new Chamfer();
+  chamfer.firstPick.entity = core.scene.entities.get(0);
+  chamfer.firstPick.clickPoint = new Point(-5, 0);
+
+  const findSpy = jest.spyOn(core.scene.selectionManager, 'findClosestItem').mockReturnValue(1);
+  DesignCore.Mouse.pointOnScene = () => new Point(5, 2);
+  const result = chamfer.validateSelection();
+  findSpy.mockRestore();
+
+  expect(result).not.toBeNull();
+  expect(result.candidate).toBe(core.scene.entities.get(1));
+  expect(result.intersectionPoint.x).toBeCloseTo(5);
+  expect(result.intersectionPoint.y).toBeCloseTo(0);
+  expect(result.tempSecond).toBeDefined();
+});

package/test/tools/copy.test.js

@@ -6,12 +6,12 @@ const core = new Core();
 
 test('Test Copy.action', () => {
   // Add items to scene
-  core.scene.addItem('Line', { points: [new Point(), new Point(0, 10)] });
-  core.scene.addItem('Circle', { points: [new Point(), new Point(0, 10)] });
-  core.scene.addItem('Polyline', { points: [new Point(), new Point(0, 10)] });
-  core.scene.addItem('Arc', { points: [new Point(), new Point(0, 10), new Point(10, 0)] });
-  core.scene.addItem('Rectangle', { points: [new Point(), new Point(0, 10)] });
-  core.scene.addItem('Text', { points: [new Point(), new Point(0, 10)], height: 10, rotation: 0, string: 'text test' });
+  core.scene.addEntity('Line', { points: [new Point(), new Point(0, 10)] });
+  core.scene.addEntity('Circle', { points: [new Point(), new Point(0, 10)] });
+  core.scene.addEntity('Polyline', { points: [new Point(), new Point(0, 10)] });
+  core.scene.addEntity('Arc', { points: [new Point(), new Point(0, 10), new Point(10, 0)] });
+  core.scene.addEntity('Rectangle', { points: [new Point(), new Point(0, 10)] });
+  core.scene.addEntity('Text', { points: [new Point(), new Point(0, 10)], height: 10, rotation: 0, string: 'text test' });
 
   // Add items to selection set
   for (let i = 0; i < core.scene.entities.count(); i++) {
@@ -44,7 +44,7 @@ test('Test Copy.action', () => {
   for (let i = 0; i < 6; i++) {
     const original = core.scene.entities.get(i);
     const copy = core.scene.entities.get(i + 6);
-    expect(copy.handle).toBeDefined();
-    expect(copy.handle).not.toBe(original.handle);
+    expect(copy.getProperty('handle')).toBeDefined();
+    expect(copy.getProperty('handle')).not.toBe(original.getProperty('handle'));
   }
 });

package/test/tools/copybase.test.js

@@ -27,7 +27,7 @@ describe('Copybase Tool', () => {
     // Select both
     DesignCore.Scene.selectionManager.addToSelectionSet(0);
     DesignCore.Scene.selectionManager.addToSelectionSet(1);
-    expect(DesignCore.Scene.selectionManager.selectedItems).toHaveLength(2);
+    expect(DesignCore.Scene.selectionManager.selectedEntities).toHaveLength(2);
 
     const tool = new Copybase();
     tool.points.push(new Point(10, 11)); // set base point
@@ -44,7 +44,7 @@ describe('Copybase Tool', () => {
     const line = DesignCore.CommandManager.createNew('Line', { layer: '0', points: [new Point(0, 0), new Point(10, 0)] });
     DesignCore.Scene.entities.add(line);
     DesignCore.Scene.selectionManager.addToSelectionSet(0);
-    const originalClonePoints = DesignCore.Scene.selectionManager.selectedItems[0].points.map((p) => ({ x: p.x, y: p.y }));
+    const originalClonePoints = DesignCore.Scene.selectionManager.selectedEntities[0].points.map((p) => ({ x: p.x, y: p.y }));
 
     const tool = new Copybase();
     tool.action();

package/test/tools/copyclip.test.js

@@ -27,7 +27,7 @@ describe('Copyclip Tool', () => {
     // Select both
     DesignCore.Scene.selectionManager.addToSelectionSet(0);
     DesignCore.Scene.selectionManager.addToSelectionSet(1);
-    expect(DesignCore.Scene.selectionManager.selectedItems).toHaveLength(2);
+    expect(DesignCore.Scene.selectionManager.selectedEntities).toHaveLength(2);
 
     const tool = new Copyclip();
     tool.action();
@@ -43,7 +43,7 @@ describe('Copyclip Tool', () => {
     const line = DesignCore.CommandManager.createNew('Line', { layer: '0', points: [new Point(0, 0), new Point(10, 0)] });
     DesignCore.Scene.entities.add(line);
     DesignCore.Scene.selectionManager.addToSelectionSet(0);
-    const originalClonePoints = DesignCore.Scene.selectionManager.selectedItems[0].points.map((p) => ({ x: p.x, y: p.y }));
+    const originalClonePoints = DesignCore.Scene.selectionManager.selectedEntities[0].points.map((p) => ({ x: p.x, y: p.y }));
 
     const tool = new Copyclip();
     tool.action();

package/test/tools/cornerEntity.test.js

@@ -38,7 +38,7 @@ test('CornerEntity.direction returns lineEnd minus lineStart', () => {
 
 test('CornerEntity.resolveEndpoints returns true and sets lineStart/lineEnd for a Line', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(10, 0)] });
   const line = core.scene.entities.get(0);
 
   const corner = new CornerEntity();
@@ -51,7 +51,7 @@ test('CornerEntity.resolveEndpoints returns true and sets lineStart/lineEnd for
 
 test('CornerEntity.resolveEndpoints returns false and leaves endpoints null for a non-Line', () => {
   core.scene.clear();
-  core.scene.addItem('Circle', { points: [new Point(0, 0), new Point(5, 0)] });
+  core.scene.addEntity('Circle', { points: [new Point(0, 0), new Point(5, 0)] });
   const circle = core.scene.entities.get(0);
 
   const corner = new CornerEntity();
@@ -66,7 +66,7 @@ test('CornerEntity.resolveEndpoints returns false and leaves endpoints null for
 
 test('CornerEntity.setEntity returns true and clears segment for a plain Line entity', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(10, 0)] });
   const line = core.scene.entities.get(0);
 
   const corner = new CornerEntity();
@@ -77,7 +77,7 @@ test('CornerEntity.setEntity returns true and clears segment for a plain Line en
 
 test('CornerEntity.setEntity sets segment and segmentIndex for a polyline straight segment', () => {
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10)] });
   const poly = core.scene.entities.get(0);
 
   const corner = new CornerEntity();
@@ -93,7 +93,7 @@ test('CornerEntity.setEntity notifies and returns false for a polyline arc segme
   // bulge on the start point makes the segment an arc
   const arcStart = new Point(0, 0);
   arcStart.bulge = 1;
-  core.scene.addItem('Lwpolyline', { points: [arcStart, new Point(10, 0)] });
+  core.scene.addEntity('Lwpolyline', { points: [arcStart, new Point(10, 0)] });
   const poly = core.scene.entities.get(0);
 
   const errorMsg = 'arc segment error';
@@ -150,7 +150,7 @@ test('CornerEntity.keepStart returns true when segment start is on the click sid
   // Polyline: (0,0)→(10,0)→(10,10), click at (3,2), intersection=(10,0)
   // clickOnLine=(3,0), clickDir=(−7,0) → points toward start side
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10)] });
   const poly = core.scene.entities.get(0);
 
   const corner = new CornerEntity();
@@ -167,7 +167,7 @@ test('CornerEntity.keepStart returns false when segment end is on the click side
   // Same polyline, click at (8,2), intersection=(0,0)
   // clickOnLine=(8,0), clickDir=(8,0) → points toward end side
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10)] });
   const poly = core.scene.entities.get(0);
 
   const corner = new CornerEntity();
@@ -186,7 +186,7 @@ test('CornerEntity.keepStart handles closing segment of closed polyline (segment
   // lineStart=(10,10), lineEnd=(0,0), click at (9,9), intersection=(10,0)
   // clickOnLine=(10,9.something...) but we just need keepStart not to throw
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(10, 0), new Point(10, 10)] });
   const poly = core.scene.entities.get(0);
 
   const corner = new CornerEntity();

package/test/tools/cutclip.test.js

@@ -27,7 +27,7 @@ describe('Cutclip Tool', () => {
     // Select both
     DesignCore.Scene.selectionManager.addToSelectionSet(0);
     DesignCore.Scene.selectionManager.addToSelectionSet(1);
-    expect(DesignCore.Scene.selectionManager.selectedItems).toHaveLength(2);
+    expect(DesignCore.Scene.selectionManager.selectedEntities).toHaveLength(2);
 
     const tool = new Cutclip();
     tool.action();
@@ -45,7 +45,7 @@ describe('Cutclip Tool', () => {
     const line = DesignCore.CommandManager.createNew('Line', { layer: '0', points: [new Point(0, 0), new Point(10, 0)] });
     DesignCore.Scene.entities.add(line);
     DesignCore.Scene.selectionManager.addToSelectionSet(0);
-    const originalClonePoints = DesignCore.Scene.selectionManager.selectedItems[0].points.map((p) => ({ x: p.x, y: p.y }));
+    const originalClonePoints = DesignCore.Scene.selectionManager.selectedEntities[0].points.map((p) => ({ x: p.x, y: p.y }));
 
     const tool = new Cutclip();
     tool.action();

package/test/tools/erase.test.js

@@ -6,12 +6,12 @@ const core = new Core();
 
 test('Test Erase.action', () => {
   // Add items to scene
-  core.scene.addItem('Line', { points: [new Point(10, 0), new Point(20, 0)] });
-  core.scene.addItem('Circle', { points: [new Point(10, 0), new Point(20, 0)] });
-  core.scene.addItem('Polyline', { points: [new Point(10, 0), new Point(20, 0)] });
-  core.scene.addItem('Arc', { points: [new Point(10, 0), new Point(10, 10), new Point(0, 10)] });
-  core.scene.addItem('Rectangle', { points: [new Point(10, 0), new Point(0, 10)] });
-  core.scene.addItem('Text', { points: [new Point(10, 0), new Point(0, 10)], height: 10, rotation: 0, string: 'text test' });
+  core.scene.addEntity('Line', { points: [new Point(10, 0), new Point(20, 0)] });
+  core.scene.addEntity('Circle', { points: [new Point(10, 0), new Point(20, 0)] });
+  core.scene.addEntity('Polyline', { points: [new Point(10, 0), new Point(20, 0)] });
+  core.scene.addEntity('Arc', { points: [new Point(10, 0), new Point(10, 10), new Point(0, 10)] });
+  core.scene.addEntity('Rectangle', { points: [new Point(10, 0), new Point(0, 10)] });
+  core.scene.addEntity('Text', { points: [new Point(10, 0), new Point(0, 10)], height: 10, rotation: 0, string: 'text test' });
 
   // Add items to selection set
   for (let i = 0; i < core.scene.entities.count(); i++) {

package/test/tools/explode.test.js

@@ -7,12 +7,12 @@ const core = new Core();
 
 test('Test Explode.action', () => {
   const insertPoint = new Point(100, 100);
-  const insertIndex = core.scene.addItem('Insert', { points: [insertPoint] });
+  const insertIndex = core.scene.addEntity('Insert', { points: [insertPoint] });
   const insert = core.scene.entities.get(insertIndex);
 
   for (let i = 0; i < 5; i++) {
     const line = new Line({ points: [new Point(0, i * 10), new Point(100, i * 10)] });
-    insert.block.addItem(line);
+    insert.block.addEntity(line);
   }
 
   expect(core.scene.entities.count()).toBe(1);
@@ -38,8 +38,8 @@ test('Test Explode.action', () => {
     expect(item.points[0].y).toBe(i * 10 + insertPoint.y);
 
     // Verify each exploded entity has a unique handle
-    expect(item.handle).toBeDefined();
-    expect(handles.has(item.handle)).toBe(false);
-    handles.add(item.handle);
+    expect(item.getProperty('handle')).toBeDefined();
+    expect(handles.has(item.getProperty('handle'))).toBe(false);
+    handles.add(item.getProperty('handle'));
   }
 });