@design-core/core 0.0.7 → 51.1.0

package/test/tools/trim.test.js

@@ -24,9 +24,9 @@ test.each(inputScenarios)('Trim.execute handles $desc', async (scenario) => {
   // clear all scene entities
   core.scene.clear();
   // create line
-  core.scene.addItem('Line', { points: [new Point(), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(), new Point(10, 0)] });
   // create circle
-  core.scene.addItem('Circle', { points: [new Point(), new Point(10, 0)] });
+  core.scene.addEntity('Circle', { points: [new Point(), new Point(10, 0)] });
   // select line
   core.scene.selectionManager.selectionSet.selectionSet.push(0);
 
@@ -35,7 +35,7 @@ test.each(inputScenarios)('Trim.execute handles $desc', async (scenario) => {
     await trim.execute();
 
     expect(trim.selectedBoundaryItems[0]).toEqual(core.scene.entities.get(0));
-    expect(trim.selectedItem).toBe(core.scene.entities.get(1));
+    expect(trim.selectedEntity).toBe(core.scene.entities.get(1));
     expect(actionSpy).toHaveBeenCalled();
   }, { extraMethods: { actionCommand: () => actionSpy() } });
 });
@@ -60,12 +60,12 @@ test('Test Trim.action', () => {
   // clear all scene entities
   core.scene.clear();
   // Add items to scene
-  core.scene.addItem('Line', { points: [lineOneStart, lineOneEnd] });
-  core.scene.addItem('Line', { points: [lineTwoStart, lineTwoEnd] });
+  core.scene.addEntity('Line', { points: [lineOneStart, lineOneEnd] });
+  core.scene.addEntity('Line', { points: [lineTwoStart, lineTwoEnd] });
   // Select boundary item
   trim.selectedBoundaryItems = [core.scene.entities.get(0)];
   // select item to trim
-  trim.selectedItem = core.scene.entities.get(1);
+  trim.selectedEntity = core.scene.entities.get(1);
   // set mouse location - required for trim
   core.mouse.setPosFromScenePoint(new Point(10, 50));
   // Perform trim
@@ -91,12 +91,12 @@ test('Test Trim.action', () => {
   // clear scene items
   core.scene.clear();
   // Add items to scene
-  core.scene.addItem('Line', { points: [lineOneStart, lineOneEnd] });
-  core.scene.addItem('Line', { points: [lineTwoStart, lineTwoEnd] });
+  core.scene.addEntity('Line', { points: [lineOneStart, lineOneEnd] });
+  core.scene.addEntity('Line', { points: [lineTwoStart, lineTwoEnd] });
   // Select boundary item
   trim.selectedBoundaryItems = [core.scene.entities.get(0)];
   // select item to trim
-  trim.selectedItem = core.scene.entities.get(1);
+  trim.selectedEntity = core.scene.entities.get(1);
   // set mouse location - required for trim
   core.mouse.setPosFromScenePoint(new Point(-10, 50));
   // Perform trim
@@ -122,12 +122,12 @@ test('Test Trim.action', () => {
   // clear scene items
   core.scene.clear();
   // Add items to scene
-  core.scene.addItem('Line', { points: [lineOneStart, lineOneEnd] });
-  core.scene.addItem('Line', { points: [lineTwoStart, lineTwoEnd] });
+  core.scene.addEntity('Line', { points: [lineOneStart, lineOneEnd] });
+  core.scene.addEntity('Line', { points: [lineTwoStart, lineTwoEnd] });
   // Select boundary item
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
   // select item to trim
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   // set mouse location - required for trim
   core.mouse.setPosFromScenePoint(new Point(0, 60));
   // Perform trim
@@ -155,12 +155,12 @@ test('Test Trim.action', () => {
   // clear scene items
   core.scene.clear();
   // Add items to scene
-  core.scene.addItem('Line', { points: [lineOneStart, lineOneEnd] });
-  core.scene.addItem('Line', { points: [lineTwoStart, lineTwoEnd] });
+  core.scene.addEntity('Line', { points: [lineOneStart, lineOneEnd] });
+  core.scene.addEntity('Line', { points: [lineTwoStart, lineTwoEnd] });
   // Select boundary item
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
   // select item to trim
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   // set mouse location - required for trim
   core.mouse.setPosFromScenePoint(new Point(0, 30));
   // Perform trim
@@ -189,12 +189,12 @@ test('Test Trim.action', () => {
   // clear scene items
   core.scene.clear();
   // Add items to scene
-  core.scene.addItem('Line', { points: [lineOneStart, lineOneEnd] });
-  core.scene.addItem('Line', { points: [crossingLineStart, crossingLineEnd] });
+  core.scene.addEntity('Line', { points: [lineOneStart, lineOneEnd] });
+  core.scene.addEntity('Line', { points: [crossingLineStart, crossingLineEnd] });
   // Select boundary item
   trim.selectedBoundaryItems = [core.scene.entities.get(0)];
   // select item to trim
-  trim.selectedItem = core.scene.entities.get(1);
+  trim.selectedEntity = core.scene.entities.get(1);
   // set mouse location - required for trim
   core.mouse.setPosFromScenePoint(new Point(25, 75));
   // Perform trim
@@ -220,12 +220,12 @@ test('Test Trim.action', () => {
   // clear scene items
   core.scene.clear();
   // Add items to scene
-  core.scene.addItem('Line', { points: [lineOneStart, lineOneEnd] });
-  core.scene.addItem('Line', { points: [crossingLineStart, crossingLineEnd] });
+  core.scene.addEntity('Line', { points: [lineOneStart, lineOneEnd] });
+  core.scene.addEntity('Line', { points: [crossingLineStart, crossingLineEnd] });
   // Select boundary item
   trim.selectedBoundaryItems = [core.scene.entities.get(0)];
   // select item to trim
-  trim.selectedItem = core.scene.entities.get(1);
+  trim.selectedEntity = core.scene.entities.get(1);
   // set mouse location - required for trim
   core.mouse.setPosFromScenePoint(new Point(-25, 25));
   // Perform trim
@@ -253,11 +253,11 @@ test('Test Trim.action polyline - trim end segment', () => {
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0), new Point(100, 0)] });
-  core.scene.addItem('Line', { points: [new Point(75, -50), new Point(75, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0), new Point(100, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(75, -50), new Point(75, 50)] });
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(90, 0));
   trim.action();
 
@@ -296,11 +296,11 @@ test('Test Trim.action polyline - trim start segment', () => {
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0), new Point(100, 0)] });
-  core.scene.addItem('Line', { points: [new Point(25, -50), new Point(25, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0), new Point(100, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(25, -50), new Point(25, 50)] });
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(10, 0));
   trim.action();
 
@@ -334,12 +334,12 @@ test('Test Trim.action polyline - trim middle segment', () => {
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0), new Point(100, 0), new Point(150, 0)] });
-  core.scene.addItem('Line', { points: [new Point(25, -50), new Point(25, 50)] });
-  core.scene.addItem('Line', { points: [new Point(75, -50), new Point(75, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0), new Point(100, 0), new Point(150, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(25, -50), new Point(25, 50)] });
+  core.scene.addEntity('Line', { points: [new Point(75, -50), new Point(75, 50)] });
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1), core.scene.entities.get(2)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(50, 0));
   trim.action();
 
@@ -376,7 +376,7 @@ test('Test Trim.action polyline - trim middle segment', () => {
 test('Test Trim.action polyline - trim bulged arc segment', () => {
   // Polyline: (0,0) with bulge=1 -> arc -> (100,0) -> straight -> (200,0)
   // With bulge=1 (CCW) the semicircular arc goes through (50,-50)
-  // Arc center: (50,0), radius: 50
+  // Arc centre: (50,0), radius: 50
   // Boundary: vertical line at x=50
   // Intersection at (50,-50) — bottom of semicircle
   // Mouse at (75,-40) — right of intersection on the arc
@@ -385,11 +385,11 @@ test('Test Trim.action polyline - trim bulged arc segment', () => {
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0, 1), new Point(100, 0), new Point(200, 0)] });
-  core.scene.addItem('Line', { points: [new Point(50, -100), new Point(50, 100)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0, 1), new Point(100, 0), new Point(200, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(50, -100), new Point(50, 100)] });
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(75, -40));
   trim.action();
 
@@ -434,7 +434,7 @@ test('Trim.preview does not throw', () => {
 
 test('Trim.preview returns early when no boundary items set', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, -10), new Point(0, 10)] });
+  core.scene.addEntity('Line', { points: [new Point(0, -10), new Point(0, 10)] });
   DesignCore.Scene.previewEntities.clear();
 
   const trim = new Trim();
@@ -446,8 +446,8 @@ test('Trim.preview returns early when no boundary items set', () => {
 
 test('Trim.preview returns early when findClosestItem returns undefined', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, -10), new Point(0, 10)] });
-  core.scene.addItem('Line', { points: [new Point(-10, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, -10), new Point(0, 10)] });
+  core.scene.addEntity('Line', { points: [new Point(-10, 0), new Point(10, 0)] });
   DesignCore.Scene.previewEntities.clear();
 
   const trim = new Trim();
@@ -463,8 +463,8 @@ test('Trim.preview returns early when findClosestItem returns undefined', () =>
 test('Trim.preview returns early when hovered entity does not implement trim', () => {
   // Text does not override Entity.trim() — preview must not emit a notification.
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, -10), new Point(0, 10)] }); // boundary
-  core.scene.addItem('Text', { points: [new Point(5, 0)], string: 'hello' }); // unsupported
+  core.scene.addEntity('Line', { points: [new Point(0, -10), new Point(0, 10)] }); // boundary
+  core.scene.addEntity('Text', { points: [new Point(5, 0)], string: 'hello' }); // unsupported
   DesignCore.Scene.previewEntities.clear();
 
   const notifySpy = jest.spyOn(core, 'notify');
@@ -486,12 +486,12 @@ test('Trim.preview returns early when hovered entity does not implement trim', (
 test('Trim.preview returns early when hovered entity has no intersections with boundary', () => {
   // Two parallel horizontal lines — no intersection with the vertical boundary
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, -10), new Point(0, 10)] }); // boundary (vertical)
-  core.scene.addItem('Line', { points: [new Point(-10, 5), new Point(10, 5)] }); // hovered (horizontal, no intersection with boundary)
+  core.scene.addEntity('Line', { points: [new Point(0, -10), new Point(0, 10)] }); // boundary (vertical)
+  core.scene.addEntity('Line', { points: [new Point(-10, 5), new Point(10, 5)] }); // hovered (horizontal, no intersection with boundary)
   DesignCore.Scene.previewEntities.clear();
 
   // Boundary is entity 0; hovered is entity 1 — they are parallel on the y-axis, so no intersection
-  core.scene.addItem('Line', { points: [new Point(-10, 20), new Point(10, 20)] }); // extra line, no intersection
+  core.scene.addEntity('Line', { points: [new Point(-10, 20), new Point(10, 20)] }); // extra line, no intersection
 
   const trim = new Trim();
   trim.selectedBoundaryItems = [core.scene.entities.get(2)]; // horizontal boundary — parallel to hovered
@@ -510,8 +510,8 @@ test('Trim.preview populates previewEntities when entity can be trimmed', () =>
   // Vertical boundary at x=0; horizontal line from (-10,0) to (10,0) is the hovered entity.
   // Mouse at (5,0) → trims the right half, leaving the left half as a preview.
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, -10), new Point(0, 10)] }); // boundary
-  core.scene.addItem('Line', { points: [new Point(-10, 0), new Point(10, 0)] }); // hovered
+  core.scene.addEntity('Line', { points: [new Point(0, -10), new Point(0, 10)] }); // boundary
+  core.scene.addEntity('Line', { points: [new Point(-10, 0), new Point(10, 0)] }); // hovered
   DesignCore.Scene.previewEntities.clear();
 
   const trim = new Trim();
@@ -531,7 +531,7 @@ test('Trim.preview populates previewEntities when entity can be trimmed', () =>
 test('Trim.execute returns early when boundary input is undefined', async () => {
   core.scene.clear();
   core.scene.selectionManager.reset();
-  core.scene.addItem('Line', { points: [new Point(), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(), new Point(10, 0)] });
 
   await withMockInput(core.scene, [undefined], async () => {
     const trim = new Trim();
@@ -543,8 +543,8 @@ test('Trim.execute returns early when boundary input is undefined', async () =>
 test('Trim.execute exits selection loop when selection input is undefined', async () => {
   core.scene.clear();
   core.scene.selectionManager.reset();
-  core.scene.addItem('Line', { points: [new Point(), new Point(10, 0)] });
-  core.scene.addItem('Circle', { points: [new Point(), new Point(5, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(), new Point(10, 0)] });
+  core.scene.addEntity('Circle', { points: [new Point(), new Point(5, 0)] });
   // preselect first item as boundary
   core.scene.selectionManager.selectionSet.selectionSet.push(0);
 
@@ -560,9 +560,9 @@ test('Trim.execute exits selection loop when selection input is undefined', asyn
 test('Trim.execute calls actionCommand once per trim selection', async () => {
   core.scene.clear();
   core.scene.selectionManager.reset();
-  core.scene.addItem('Line', { points: [new Point(0, -10), new Point(0, 10)] });
-  core.scene.addItem('Circle', { points: [new Point(-5, 0), new Point(0, 0)] });
-  core.scene.addItem('Circle', { points: [new Point(-5, 0), new Point(0, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, -10), new Point(0, 10)] });
+  core.scene.addEntity('Circle', { points: [new Point(-5, 0), new Point(0, 0)] });
+  core.scene.addEntity('Circle', { points: [new Point(-5, 0), new Point(0, 0)] });
   // preselect line as boundary
   core.scene.selectionManager.selectionSet.selectionSet.push(0);
 
@@ -579,11 +579,11 @@ test('Trim.execute calls actionCommand once per trim selection', async () => {
   );
 });
 
-test('Trim.action does nothing when selectedItem is null', () => {
+test('Trim.action does nothing when selectedEntity is null', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(), new Point(10, 0)] });
   const trim = new Trim();
-  trim.selectedItem = null;
+  trim.selectedEntity = null;
   trim.selectedBoundaryItems = [core.scene.entities.get(0)];
 
   expect(() => trim.action()).not.toThrow();
@@ -591,24 +591,24 @@ test('Trim.action does nothing when selectedItem is null', () => {
 
 test('Trim.action does nothing when selectedBoundaryItems is empty', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(), new Point(10, 0)] });
   const trim = new Trim();
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   trim.selectedBoundaryItems = [];
 
   expect(() => trim.action()).not.toThrow();
-  expect(trim.selectedItem).toBeNull();
+  expect(trim.selectedEntity).toBeNull();
 });
 
 test('Trim.action notifies NOTRIM when selected entity lacks fromPolylinePoints', () => {
   // Use a stub entity that has toPolylinePoints but no fromPolylinePoints.
   // action() must notify and not throw.
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, -10), new Point(0, 10)] }); // boundary
+  core.scene.addEntity('Line', { points: [new Point(0, -10), new Point(0, 10)] }); // boundary
 
   const trim = new Trim();
   trim.selectedBoundaryItems = [core.scene.entities.get(0)];
-  trim.selectedItem = {
+  trim.selectedEntity = {
     type: 'FakeEntity',
     toPolylinePoints: () => [new Point(-5, 0), new Point(5, 0)],
     // deliberately no fromPolylinePoints
@@ -618,7 +618,7 @@ test('Trim.action notifies NOTRIM when selected entity lacks fromPolylinePoints'
   trim.action();
 
   expect(notifySpy).toHaveBeenCalledWith(expect.stringContaining(Strings.Message.NOTRIM));
-  expect(trim.selectedItem).toBeNull();
+  expect(trim.selectedEntity).toBeNull();
   notifySpy.mockRestore();
 });
 
@@ -626,7 +626,7 @@ test('Trim.preview silently skips entity that lacks fromPolylinePoints', () => {
   // Stub entity implements toPolylinePoints but not fromPolylinePoints.
   // preview() must return early without calling notify.
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, -10), new Point(0, 10)] }); // boundary
+  core.scene.addEntity('Line', { points: [new Point(0, -10), new Point(0, 10)] }); // boundary
   DesignCore.Scene.previewEntities.clear();
 
   const stubEntity = {
@@ -655,29 +655,29 @@ test('Trim.preview silently skips entity that lacks fromPolylinePoints', () => {
 test('Trim.action notifies when no intersection found (parallel lines)', () => {
   core.scene.clear();
   // Two parallel vertical lines - no intersection
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(0, 100)] });
-  core.scene.addItem('Line', { points: [new Point(10, 0), new Point(10, 100)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(0, 100)] });
+  core.scene.addEntity('Line', { points: [new Point(10, 0), new Point(10, 100)] });
 
   const trim = new Trim();
   trim.selectedBoundaryItems = [core.scene.entities.get(0)];
-  trim.selectedItem = core.scene.entities.get(1);
+  trim.selectedEntity = core.scene.entities.get(1);
 
   const notifySpy = jest.spyOn(core, 'notify').mockImplementation(() => {});
   trim.action();
 
   expect(notifySpy).toHaveBeenCalledWith(expect.stringContaining(Strings.Message.NOTRIM));
-  expect(trim.selectedItem).toBeNull();
+  expect(trim.selectedEntity).toBeNull();
   notifySpy.mockRestore();
 });
 
 test('Trim.action notifies when boundary item equals selected item', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(100, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(100, 0)] });
   const entity = core.scene.entities.get(0);
 
   const trim = new Trim();
   trim.selectedBoundaryItems = [entity];
-  trim.selectedItem = entity;
+  trim.selectedEntity = entity;
 
   const notifySpy = jest.spyOn(core, 'notify').mockImplementation(() => {});
   trim.action();
@@ -687,7 +687,7 @@ test('Trim.action notifies when boundary item equals selected item', () => {
 });
 
 test('Trim.action trims an arc', () => {
-  // Arc: center (0,0), start (10,0), end (-10,0) — CCW upper semicircle through (0,10)
+  // Arc: centre (0,0), start (10,0), end (-10,0) — CCW upper semicircle through (0,10)
   // Boundary: vertical line at x=0, intersects arc at (0,10)
   // Mouse at (7,7) — in the right half, selects (10,0)→(0,10) segment for removal
   // Expected: original arc removed, shorter arc from (0,10) to (-10,0) added
@@ -695,11 +695,11 @@ test('Trim.action trims an arc', () => {
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Arc', { points: [new Point(0, 0), new Point(10, 0), new Point(-10, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, -20), new Point(0, 20)] });
+  core.scene.addEntity('Arc', { points: [new Point(0, 0), new Point(10, 0), new Point(-10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, -20), new Point(0, 20)] });
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(7, 7));
   trim.action();
 
@@ -718,7 +718,7 @@ test('Trim.action trims an arc', () => {
 });
 
 test('Trim.action trims a circle', () => {
-  // Circle: center (0,0), radius 10
+  // Circle: centre (0,0), radius 10
   // Boundary: vertical line at x=0, intersects circle at (0,10) and (0,-10)
   // Mouse at (8,0) — on the right side
   // Expected: original circle removed, arc covering the right side added
@@ -726,11 +726,11 @@ test('Trim.action trims a circle', () => {
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Circle', { points: [new Point(0, 0), new Point(10, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, -20), new Point(0, 20)] });
+  core.scene.addEntity('Circle', { points: [new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, -20), new Point(0, 20)] });
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(8, 0));
   trim.action();
 
@@ -742,7 +742,7 @@ test('Trim.action trims a circle', () => {
     if (core.scene.entities.get(i).type === 'Arc') arc = core.scene.entities.get(i);
   }
   expect(arc).toBeDefined();
-  // Arc center should match the original circle center
+  // Arc centre should match the original circle centre
   expect(arc.points[0].x).toBeCloseTo(0, 10);
   expect(arc.points[0].y).toBeCloseTo(0, 10);
 });
@@ -757,16 +757,16 @@ test('Trim.action trims a closed polyline - produces open polyline with closed f
   core.scene.clear();
 
   // Five points where first === last → constructor pops last and sets flag=1
-  core.scene.addItem('Lwpolyline', {
+  core.scene.addEntity('Lwpolyline', {
     points: [new Point(0, 0), new Point(100, 0), new Point(100, 100), new Point(0, 100), new Point(0, 0)],
   });
-  core.scene.addItem('Line', { points: [new Point(50, -10), new Point(50, 110)] });
+  core.scene.addEntity('Line', { points: [new Point(50, -10), new Point(50, 110)] });
 
   const polyline = core.scene.entities.get(0);
   expect(polyline.flags.hasFlag(1)).toBe(true); // confirm closed before trim
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
-  trim.selectedItem = polyline;
+  trim.selectedEntity = polyline;
   core.mouse.setPosFromScenePoint(new Point(75, 50));
   trim.action();
 
@@ -791,18 +791,18 @@ test('Trim.action trims middle of a line - circle boundary creates two intersect
   // segment index 1. The sort comparator falls through to the
   // positionAlongSegment comparison (line 179 of trim.js) because the segment
   // indices are equal.
-  // Circle: center (50,0) radius 20 → intersects the x-axis at (30,0) and (70,0)
+  // Circle: centre (50,0) radius 20 → intersects the x-axis at (30,0) and (70,0)
   // Line: (0,0) → (100,0), mouse at (50,0) — inside the circle
   // Expected: original line removed, two shorter lines (0→30) and (70→100) added
 
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(100, 0)] });
-  core.scene.addItem('Circle', { points: [new Point(50, 0), new Point(70, 0)] }); // radius 20
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(100, 0)] });
+  core.scene.addEntity('Circle', { points: [new Point(50, 0), new Point(70, 0)] }); // radius 20
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(50, 0));
   trim.action();
 
@@ -838,7 +838,7 @@ test('Trim.execute catches and logs errors thrown during input', async () => {
 });
 
 test('Trim.action trims a circle near the seam (right side, mouse at angle 0)', () => {
-  // Circle: center (0,0), radius 10.
+  // Circle: centre (0,0), radius 10.
   // Circle.toPolylinePoints() always places the seam at angle 0 → vertex (10,0).
   // The old code failed when the mouse was near that seam because both intersections
   // appeared "after" the mouse in linear polyline order, leaving trimBefore=null.
@@ -851,11 +851,11 @@ test('Trim.action trims a circle near the seam (right side, mouse at angle 0)',
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Circle', { points: [new Point(0, 0), new Point(10, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, -20), new Point(0, 20)] });
+  core.scene.addEntity('Circle', { points: [new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, -20), new Point(0, 20)] });
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(8, 0));
   trim.action();
 
@@ -867,7 +867,7 @@ test('Trim.action trims a circle near the seam (right side, mouse at angle 0)',
   }
   expect(arc).toBeDefined();
   // Remaining arc is the left half: from (0,10) CCW through (-10,0) to (0,-10)
-  expect(arc.points[0].x).toBeCloseTo(0); // center
+  expect(arc.points[0].x).toBeCloseTo(0); // centre
   expect(arc.points[0].y).toBeCloseTo(0);
   expect(arc.points[1].x).toBeCloseTo(0); // start at (0,10)
   expect(arc.points[1].y).toBeCloseTo(10);
@@ -889,16 +889,16 @@ test('Trim.action trims a closed polyline near the seam vertex', () => {
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', {
+  core.scene.addEntity('Lwpolyline', {
     points: [new Point(0, 0), new Point(100, 0), new Point(100, 100), new Point(0, 100), new Point(0, 0)],
   });
-  core.scene.addItem('Line', { points: [new Point(-10, 50), new Point(110, 50)] });
+  core.scene.addEntity('Line', { points: [new Point(-10, 50), new Point(110, 50)] });
 
   const polyline = core.scene.entities.get(0);
   expect(polyline.flags.hasFlag(1)).toBe(true);
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
-  trim.selectedItem = polyline;
+  trim.selectedEntity = polyline;
   // Mouse in the BOTTOM half — forward arc between the two intersections, crosses the seam
   core.mouse.setPosFromScenePoint(new Point(50, 25));
   trim.action();
@@ -922,8 +922,8 @@ test('Trim.action trims a closed polyline near the seam vertex', () => {
 
 test('Trim.action trims an open polyline with two consecutive arc segments', () => {
   // Polyline: (0,0,b=1) -> arc1 -> (100,0,b=1) -> arc2 -> (200,0)
-  // arc1 center (50,0) radius 50, through (50,-50)
-  // arc2 center (150,0) radius 50, through (150,-50)
+  // arc1 centre (50,0) radius 50, through (50,-50)
+  // arc2 centre (150,0) radius 50, through (150,-50)
   // Boundary: vertical line at x=150, intersection at (150,-50) on arc2.
   // Mouse at (120,-40): on arc2 BEFORE the intersection (in arc-travel order).
   // Expected: keep right portion = (150,-50) -> (200,0); discard left side.
@@ -931,11 +931,11 @@ test('Trim.action trims an open polyline with two consecutive arc segments', ()
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0, 1), new Point(100, 0, 1), new Point(200, 0)] });
-  core.scene.addItem('Line', { points: [new Point(150, -100), new Point(150, 100)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0, 1), new Point(100, 0, 1), new Point(200, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(150, -100), new Point(150, 100)] });
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(120, -40));
   trim.action();
 
@@ -955,7 +955,7 @@ test('Trim.action trims an open polyline with two consecutive arc segments', ()
 });
 
 test('Trim.action trims an arc from the start (portionOne same-segment bulge)', () => {
-  // Arc: center (0,0), start (10,0), end (-10,0) — CCW upper semicircle through (0,10).
+  // Arc: centre (0,0), start (10,0), end (-10,0) — CCW upper semicircle through (0,10).
   // Boundary: vertical line at x=0, intersection at (0,10).
   // Mouse at (-7,7) — LEFT of intersection, so trimBefore=(0,10), trimAfter=null.
   // portionOne = startLoc(seg1,(10,0)) → trimBefore(seg1,(0,10)) — same-segment arc split.
@@ -964,11 +964,11 @@ test('Trim.action trims an arc from the start (portionOne same-segment bulge)',
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Arc', { points: [new Point(0, 0), new Point(10, 0), new Point(-10, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, -20), new Point(0, 20)] });
+  core.scene.addEntity('Arc', { points: [new Point(0, 0), new Point(10, 0), new Point(-10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, -20), new Point(0, 20)] });
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(-7, 7));
   trim.action();
 
@@ -987,7 +987,7 @@ test('Trim.action trims an arc from the start (portionOne same-segment bulge)',
 });
 
 test('Trim.action trims the middle of an arc (two intersections on same arc segment)', () => {
-  // Arc: center (0,0), start (10,0), end (-10,0) — CCW upper semicircle through (0,10).
+  // Arc: centre (0,0), start (10,0), end (-10,0) — CCW upper semicircle through (0,10).
   // Two boundaries: vertical line at x=-5 and x=5.
   // Intersections at (5,√75)≈(5,8.66) and (-5,√75)≈(-5,8.66), both on segment 1.
   // Mouse at (0,9) — between both intersections at the top.
@@ -996,12 +996,12 @@ test('Trim.action trims the middle of an arc (two intersections on same arc segm
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Arc', { points: [new Point(0, 0), new Point(10, 0), new Point(-10, 0)] });
-  core.scene.addItem('Line', { points: [new Point(5, -20), new Point(5, 20)] });
-  core.scene.addItem('Line', { points: [new Point(-5, -20), new Point(-5, 20)] });
+  core.scene.addEntity('Arc', { points: [new Point(0, 0), new Point(10, 0), new Point(-10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(5, -20), new Point(5, 20)] });
+  core.scene.addEntity('Line', { points: [new Point(-5, -20), new Point(-5, 20)] });
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1), core.scene.entities.get(2)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(0, 9));
   trim.action();
 
@@ -1036,12 +1036,12 @@ test('Trim.action trims with multiple boundary items', () => {
   const trim = new Trim();
   core.scene.clear();
 
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(200, 0)] });
-  core.scene.addItem('Line', { points: [new Point(50, -20), new Point(50, 20)] });
-  core.scene.addItem('Line', { points: [new Point(150, -20), new Point(150, 20)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(200, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(50, -20), new Point(50, 20)] });
+  core.scene.addEntity('Line', { points: [new Point(150, -20), new Point(150, 20)] });
 
   trim.selectedBoundaryItems = [core.scene.entities.get(1), core.scene.entities.get(2)];
-  trim.selectedItem = core.scene.entities.get(0);
+  trim.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(100, 0));
   trim.action();