@design-core/core 0.0.6 → 50.1.0

package/test/tools/fillet.test.js

@@ -1,6 +1,7 @@
 import { Core } from '../../core/core/core.js';
 import { Point } from '../../core/entities/point.js';
 import { Fillet } from '../../core/tools/fillet.js';
+import { DesignCore } from '../../core/designCore.js';
 import { Strings } from '../../core/lib/strings.js';
 import { SingleSelection } from '../../core/lib/selectionManager.js';
 import { expect, jest } from '@jest/globals';
@@ -16,8 +17,8 @@ test('Fillet.register returns correct command object', () => {
 
 test('Fillet.execute selects two entities and calls executeCommand', async () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(10, 0)] });
-  core.scene.addItem('Line', { points: [new Point(5, -5), new Point(5, 5)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(5, -5), new Point(5, 5)] });
 
   const executeCommandSpy = jest.fn();
 
@@ -44,7 +45,7 @@ test('Fillet.execute returns early when first input is undefined', async () => {
 
 test('Fillet.action does nothing when entities are not set', () => {
   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 entityCountBefore = core.scene.entities.count();
 
   const fillet = new Fillet();
@@ -55,8 +56,8 @@ test('Fillet.action does nothing when entities are not set', () => {
 
 test('Fillet.action notifies when entity type is not supported', () => {
   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(10, 0)] });
+  core.scene.addEntity('Circle', { points: [new Point(0, 0), new Point(5, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(10, 0)] });
 
   const notifySpy = jest.spyOn(core, 'notify');
 
@@ -74,8 +75,8 @@ test('Fillet.action notifies when entity type is not supported', () => {
 test('Fillet.action notifies for parallel lines', () => {
   core.scene.clear();
   // Two horizontal parallel lines
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(10, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, 5), new Point(10, 5)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 5), new Point(10, 5)] });
 
   const notifySpy = jest.spyOn(core, 'notify');
 
@@ -97,8 +98,8 @@ test('Fillet.action radius=0 trimMode=true trims both lines to intersection', ()
   // Horizontal: (0,0)→(8,0), Vertical: (10,-10)→(10,-2)
   // Their infinite extensions meet at (10, 0).
   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)] });
 
   core.scene.headers.filletRadius = 0;
   core.scene.headers.trimMode = true;
@@ -128,8 +129,8 @@ test('Fillet.action radius=0 trimMode=true trims both lines to intersection', ()
 
 test('Fillet.action radius=0 trimMode=false makes no changes', () => {
   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)] });
 
   core.scene.headers.filletRadius = 0;
   core.scene.headers.trimMode = false;
@@ -152,8 +153,8 @@ test('Fillet.action radius>0 trimMode=true adds arc and trims lines', () => {
   // Horizontal: (-10,0)→(0,0)  Vertical: (0,0)→(0,10)
   // With radius 2, tangent points are at (-2,0) and (0,2)
   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)] });
 
   core.scene.headers.filletRadius = 2;
   core.scene.headers.trimMode = true;
@@ -189,8 +190,8 @@ test('Fillet.action radius>0 trimMode=true adds arc and trims lines', () => {
 
 test('Fillet.action radius>0 trimMode=false adds arc only, lines unchanged', () => {
   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)] });
 
   core.scene.headers.filletRadius = 2;
   core.scene.headers.trimMode = false;
@@ -216,8 +217,8 @@ test('Fillet.action radius>0 trimMode=false adds arc only, lines unchanged', ()
 test('Fillet.action notifies when radius is too large for the segments', () => {
   // Lines only 5 units long from intersection — radius 10 won't fit
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(-5, 0), new Point(0, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(0, 5)] });
+  core.scene.addEntity('Line', { points: [new Point(-5, 0), new Point(0, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(0, 5)] });
 
   core.scene.headers.filletRadius = 10;
   core.scene.headers.trimMode = true;
@@ -240,8 +241,8 @@ test('Fillet.action notifies when radius is too large for the segments', () => {
 test('Fillet.action arc centre is at correct position for 90° corner', () => {
   // 90° corner at origin, radius 3 → arc centre at (-3, 3)
   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)] });
 
   core.scene.headers.filletRadius = 3;
   core.scene.headers.trimMode = false;
@@ -271,8 +272,8 @@ test('Fillet.action selects correct corner when lines form a cross', () => {
   // Full cross: horizontal (-10,0)→(10,0), vertical (0,-10)→(0,10)
   // Click on the top-right quadrant → fillet should be in that quadrant
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(-10, 0), new Point(10, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, -10), new Point(0, 10)] });
+  core.scene.addEntity('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.headers.filletRadius = 2;
   core.scene.headers.trimMode = false;
@@ -296,8 +297,8 @@ test('Fillet.action selects correct corner when lines form a cross', () => {
 
 test('Fillet.action notifies when second entity type is not supported', () => {
   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');
 
@@ -318,8 +319,8 @@ test('Fillet.action notifies when click coincides with intersection', () => {
   // L-corner at origin. Clicking firstClickPoint exactly at (0,0) makes
   // firstClickDistance = 0, triggering the invalid-selection guard.
   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)] });
 
   core.scene.headers.filletRadius = 2;
   core.scene.headers.trimMode = true;
@@ -342,8 +343,8 @@ test('Fillet.action radius=0 notifies and makes no changes when click coincides
   // Click at exactly the intersection point — clickDistance = 0.
   // The guard must fire before applySharpTrim() runs.
   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)] });
 
   core.scene.headers.filletRadius = 0;
   core.scene.headers.trimMode = true;
@@ -414,7 +415,7 @@ test('Fillet.execute sets trimMode to false when No trim option is selected', as
 
 test('Fillet.execute re-prompts and notifies when first selected entity is not a Line', async () => {
   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 notifySpy = jest.spyOn(core, 'notify');
 
@@ -433,8 +434,8 @@ test('Fillet.execute re-prompts and notifies when first selected entity is not a
 
 test('Fillet.execute re-prompts and notifies when second selected entity is not a Line', async () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(-10, 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(-10, 0), new Point(10, 0)] });
+  core.scene.addEntity('Circle', { points: [new Point(0, 0), new Point(5, 0)] });
 
   const notifySpy = jest.spyOn(core, 'notify');
 
@@ -465,8 +466,8 @@ test('Fillet.execute re-prompts and notifies when second selected entity is not
 test('Fillet.action radius>0 trimMode=true Line first + Lwpolyline second keepStart: arc embedded as bulge', () => {
   // Click polyline near (-15,0) → segment 1. keepStart keeps the start portion.
   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)] });
 
   core.scene.headers.filletRadius = 2;
   core.scene.headers.trimMode = true;
@@ -506,8 +507,8 @@ test('Fillet.action radius>0 trimMode=true Line first + Lwpolyline second keepSt
 test('Fillet.action radius>0 trimMode=true Lwpolyline first + Line second keepStart: arc direction correct', () => {
   // Same geometry but entity order reversed — tests the polyToLineDir arc direction fix.
   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)] });
 
   core.scene.headers.filletRadius = 2;
   core.scene.headers.trimMode = true;
@@ -547,8 +548,8 @@ test('Fillet.action radius>0 trimMode=true Line + Lwpolyline keepEnd: keeps end
   // Click polyline near (8,0) → segment 3 (right of intersection). keepEnd.
   // arc centre = (2,2), polyTangent = (2,0), lineTangent = (0,2).
   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)] });
 
   core.scene.headers.filletRadius = 2;
   core.scene.headers.trimMode = true;
@@ -588,8 +589,8 @@ test('Fillet.action radius>0 trimMode=true Line + Lwpolyline keepEnd: keeps end
 test('Fillet.action radius=0 trimMode=true Line + Lwpolyline keepStart: line consumed to sharp corner', () => {
   // radius=0 → sharp intersection at (0,0), no arc.
   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)] });
 
   core.scene.headers.filletRadius = 0;
   core.scene.headers.trimMode = true;
@@ -628,7 +629,7 @@ test('Fillet.action radius>0 trimMode=true same Lwpolyline consecutive segments:
   // Segment 1: (-10,0)→(0,0), Segment 2: (0,0)→(0,10). Corner at (0,0).
   // radius=2 → arc centre (-2,2), tangents at (-2,0) and (0,2).
   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)] });
 
   core.scene.headers.filletRadius = 2;
   core.scene.headers.trimMode = true;
@@ -670,7 +671,7 @@ test('Fillet.action radius>0 trimMode=true same Lwpolyline open ends: separate A
   // radius=2, clicks at (-3,0) and (1,3):
   //   arc centre = (-1,2), firstTangent = (-1,0), secondTangent = (1,2).
   core.scene.clear();
-  core.scene.addItem('Lwpolyline', { points: [new Point(-5, 0), new Point(0, 0), new Point(1, 0), new Point(1, 5)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(-5, 0), new Point(0, 0), new Point(1, 0), new Point(1, 5)] });
 
   core.scene.headers.filletRadius = 2;
   core.scene.headers.trimMode = true;
@@ -712,7 +713,7 @@ test('Fillet.action radius>0 trimMode=true closed Lwpolyline seg3+closing-seg: c
   // Closing segment (idx=4) goes (0,10)→(0,0); seg 3 goes (10,10)→(0,10).
   // Corner at (0,10) — radius=2 replaces the shared vertex with arc bulge points.
   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);
 
@@ -744,7 +745,7 @@ test('Fillet.action radius>0 trimMode=true closed Lwpolyline closing-wrap (seg4+
   // Corner at (0,0) shared by closing seg (idx=4) and seg 1.
   // Bug: without the closed-poly guard, this was treated as open-ends → wrong path.
   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);
 
@@ -776,7 +777,7 @@ test('Fillet.action radius>0 trimMode=true closed Lwpolyline closing-wrap (seg4+
 test('Fillet.action radius>0 trimMode=false closed Lwpolyline closing-wrap: standalone Arc only', () => {
   // trimMode=false: no polyline mutation; only Arc entity added.
   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);
 
@@ -802,8 +803,8 @@ test('Fillet.action radius>0 trimMode=false closed Lwpolyline closing-wrap: stan
 
 test('Fillet.action radius>0 trimMode=false Line + Lwpolyline: standalone arc added, entities unchanged', () => {
   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)] });
 
   core.scene.headers.filletRadius = 2;
   core.scene.headers.trimMode = false;
@@ -842,14 +843,14 @@ test('Fillet.action radius>0 trimMode=false Line + Lwpolyline: standalone arc ad
 //   – lowerTangent = (0,2)  on the closing segment (left edge, y=2)
 //   – upperTangent = (2,0)  on segment 1 (bottom edge, x=2)
 //   – bulge on lowerTangent must be POSITIVE (CCW arc from (0,2) to (2,0) through ≈(0.59,0.59))
-//     (BasePolyline convention: –ve bulge = CW, +ve bulge = CCW)
+//     (PolylineBase convention: –ve bulge = CW, +ve bulge = CCW)
 //
 // Before the fix the lowerTangent/upperTangent assignment was inverted, producing
 // an arc that traversed the exterior of the square.
 
 test('Fillet.action closing-wrap: lowerTangent is on closing segment (left edge)', () => {
   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);
 
@@ -888,7 +889,7 @@ test('Fillet.action closing-wrap: arc bulge sign is positive (CCW, fillet inside
   // Before the fix the lowerTangent/upperTangent were swapped, producing an arc
   // that traversed the exterior of the square.
   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);
 
@@ -914,7 +915,7 @@ test('Fillet.action closing-wrap: arc bulge sign is positive (CCW, fillet inside
 test('Fillet.action closing-wrap reversed pick order: arc bulge sign and tangent positions are correct', () => {
   // Swap firstPick/secondPick — should produce the same geometry.
   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);
 
@@ -944,3 +945,183 @@ test('Fillet.action closing-wrap reversed pick order: arc bulge sign and tangent
   expect(poly.points[1].y).toBeCloseTo(0);
   expect(poly.points[0].bulge).toBeGreaterThan(0);
 });
+
+// ─── action: entity property inheritance ─────────────────────────────────────
+
+test('Fillet.action arc inherits layer, lineWidth, lineType from first entity', () => {
+  // Perpendicular L-corner at origin; first entity on a non-default layer.
+  core.scene.clear();
+  core.scene.addEntity('Line', { points: [new Point(-10, 0), new Point(0, 0)], layer: 'walls', lineWidth: 5, lineType: 'DASHED' });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(0, 10)] });
+
+  core.scene.headers.filletRadius = 2;
+  core.scene.headers.trimMode = false;
+
+  const fillet = new Fillet();
+  fillet.firstPick.entity = core.scene.entities.get(0);
+  fillet.secondPick.entity = core.scene.entities.get(1);
+  fillet.firstPick.clickPoint = new Point(-5, 0);
+  fillet.secondPick.clickPoint = new Point(0, 5);
+  fillet.action();
+
+  expect(core.scene.entities.count()).toBe(3);
+  const arc = core.scene.entities.get(2);
+  expect(arc.type).toBe('Arc');
+  expect(arc.getProperty('layer')).toBe('walls');
+  expect(arc.getProperty('lineWidth')).toBe(5);
+  expect(arc.getProperty('lineType')).toBe('DASHED');
+});
+
+test('Fillet.preview does not throw', () => {
+  const fillet = new Fillet();
+  expect(() => fillet.preview()).not.toThrow();
+});
+
+test('Fillet.preview returns early when findClosestItem returns undefined', () => {
+  core.scene.clear();
+  core.scene.addEntity('Line', { points: [new Point(-10, 0), new Point(0, 0)] });
+  DesignCore.Scene.previewEntities.clear();
+
+  const fillet = new Fillet();
+  fillet.firstPick.entity = core.scene.entities.get(0);
+  fillet.firstPick.clickPoint = new Point(-5, 0);
+
+  const findSpy = jest.spyOn(core.scene.selectionManager, 'findClosestItem').mockReturnValue(undefined);
+  DesignCore.Mouse.pointOnScene = () => new Point(0, 5);
+  fillet.preview();
+  findSpy.mockRestore();
+
+  expect(DesignCore.Scene.previewEntities.count()).toBe(0);
+});
+
+test('Fillet.preview adds fillet arc to previewEntities in no-trim mode', () => {
+  core.scene.clear();
+  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)] });
+  DesignCore.Scene.previewEntities.clear();
+
+  core.scene.headers.filletRadius = 2;
+  core.scene.headers.trimMode = false;
+
+  const fillet = new Fillet();
+  fillet.firstPick.entity = core.scene.entities.get(0);
+  fillet.firstPick.clickPoint = new Point(-5, 0);
+
+  const findSpy = jest.spyOn(core.scene.selectionManager, 'findClosestItem').mockReturnValue(1);
+  DesignCore.Mouse.pointOnScene = () => new Point(0, 5);
+  fillet.preview();
+  findSpy.mockRestore();
+
+  expect(DesignCore.Scene.previewEntities.count()).toBeGreaterThanOrEqual(1);
+});
+
+test('Fillet.preview adds dulled segments and arc to previewEntities in trim mode', () => {
+  core.scene.clear();
+  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)] });
+  DesignCore.Scene.previewEntities.clear();
+
+  core.scene.headers.filletRadius = 2;
+  core.scene.headers.trimMode = true;
+
+  const fillet = new Fillet();
+  fillet.firstPick.entity = core.scene.entities.get(0);
+  fillet.firstPick.clickPoint = new Point(-5, 0);
+
+  const findSpy = jest.spyOn(core.scene.selectionManager, 'findClosestItem').mockReturnValue(1);
+  DesignCore.Mouse.pointOnScene = () => new Point(0, 5);
+  fillet.preview();
+  findSpy.mockRestore();
+
+  // dulled firstSeg + dulled secondSeg + firstTrimLine + secondTrimLine + arc = 5
+  expect(DesignCore.Scene.previewEntities.count()).toBeGreaterThanOrEqual(5);
+});
+
+test('Fillet.execute returns early when second-entity input is undefined (inner loop)', async () => {
+  core.scene.clear();
+  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 executeCommandSpy = jest.fn();
+  // Only one input: the first selection. Second requestInput returns undefined → inner loop returns.
+  await withMockInput(
+      core.scene,
+      [new SingleSelection(0, new Point(-5, 0))],
+      async () => {
+        const fillet = new Fillet();
+        await fillet.execute();
+        expect(executeCommandSpy).not.toHaveBeenCalled();
+      },
+      { extraMethods: { executeCommand: executeCommandSpy } },
+  );
+});
+
+test('Fillet.execute notifies NONCONSECUTIVESEGMENTS for non-adjacent polyline segments', async () => {
+  // 5-point polyline → 4 segments. Pick segment 1 (near -15,0) then segment 3 (near 5,0).
+  // Neither consecutive nor open-ends → NONCONSECUTIVESEGMENTS, then undefined to exit.
+  core.scene.clear();
+  core.scene.addEntity('Lwpolyline', { points: [new Point(-20, 0), new Point(-10, 0), new Point(0, 0), new Point(10, 0), new Point(20, 0)] });
+
+  const notifySpy = jest.spyOn(core, 'notify');
+  await withMockInput(
+      core.scene,
+      [new SingleSelection(0, new Point(-15, 0)), new SingleSelection(0, new Point(5, 0)), undefined],
+      async () => {
+        const fillet = new Fillet();
+        await fillet.execute();
+      },
+  );
+  expect(notifySpy).toHaveBeenCalledWith(expect.stringContaining(Strings.Message.NONCONSECUTIVESEGMENTS));
+  notifySpy.mockRestore();
+});
+
+test('Fillet.execute Trim→Trim keeps trimMode=true', async () => {
+  core.scene.headers.trimMode = true;
+
+  await withMockInput(
+      core.scene,
+      ['Trim', 'Trim', undefined],
+      async () => {
+        const fillet = new Fillet();
+        await fillet.execute();
+      },
+  );
+
+  expect(core.scene.headers.trimMode).toBe(true);
+});
+
+// ─── regression: bulge must not leak onto Line endpoints ─────────────────────
+
+test('Fillet.action two fillets on the same line: trimmed endpoints have bulge = 0', () => {
+  // Line A: (-10, 0) → (10, 0)  horizontal
+  // Line B: (-10, 2) → (-10, -2) vertical at left end
+  // Line C: ( 10, 2) → ( 10, -2) vertical at right end
+  // Fillet A–B at the left corner, then A–C at the right corner.
+  // arc.toPolylinePoints() sets bulge on the start point;
+  // that value must not bleed onto the Line endpoints.
+  core.scene.clear();
+  core.scene.addEntity('Line', { points: [new Point(-10, 0), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(-10, 2), new Point(-10, -2)] });
+  core.scene.addEntity('Line', { points: [new Point(10, 2), new Point(10, -2)] });
+
+  core.scene.headers.filletRadius = 1;
+  core.scene.headers.trimMode = true;
+
+  const fillet1 = new Fillet();
+  fillet1.firstPick.entity = core.scene.entities.get(0);
+  fillet1.secondPick.entity = core.scene.entities.get(1);
+  fillet1.firstPick.clickPoint = new Point(-5, 0);
+  fillet1.secondPick.clickPoint = new Point(-10, 1);
+  fillet1.action();
+
+  const fillet2 = new Fillet();
+  fillet2.firstPick.entity = core.scene.entities.get(0);
+  fillet2.secondPick.entity = core.scene.entities.get(2);
+  fillet2.firstPick.clickPoint = new Point(5, 0);
+  fillet2.secondPick.clickPoint = new Point(10, 1);
+  fillet2.action();
+
+  const line = core.scene.entities.get(0);
+  expect(line.points[0].bulge).toBe(0);
+  expect(line.points[1].bulge).toBe(0);
+});

package/test/tools/matchProp.test.js

@@ -8,12 +8,12 @@ import { jest } from '@jest/globals';
 const core = new Core();
 
 // Add items to scene
-DesignCore.Scene.addItem('Line', { points: [new Point(10, 0), new Point(20, 0)], layer: 'test' });
-DesignCore.Scene.addItem('Circle', { points: [new Point(10, 0), new Point(20, 0)] });
-DesignCore.Scene.addItem('Polyline', { points: [new Point(10, 0), new Point(20, 0)] });
-DesignCore.Scene.addItem('Arc', { points: [new Point(10, 0), new Point(10, 10), new Point(0, 10)] });
-DesignCore.Scene.addItem('Rectangle', { points: [new Point(10, 0), new Point(0, 10)] });
-DesignCore.Scene.addItem('Text', { points: [new Point(10, 0), new Point(0, 10)], height: 10, rotation: 0, string: 'text test' });
+DesignCore.Scene.addEntity('Line', { points: [new Point(10, 0), new Point(20, 0)], layer: 'test' });
+DesignCore.Scene.addEntity('Circle', { points: [new Point(10, 0), new Point(20, 0)] });
+DesignCore.Scene.addEntity('Polyline', { points: [new Point(10, 0), new Point(20, 0)] });
+DesignCore.Scene.addEntity('Arc', { points: [new Point(10, 0), new Point(10, 10), new Point(0, 10)] });
+DesignCore.Scene.addEntity('Rectangle', { points: [new Point(10, 0), new Point(0, 10)] });
+DesignCore.Scene.addEntity('Text', { points: [new Point(10, 0), new Point(0, 10)], height: 10, rotation: 0, string: 'text test' });
 
 test('Test MatchProp.execute requests source and targets and completes', async () => {
   const match = new MatchProp();
@@ -69,16 +69,16 @@ test('Test MatchProp.action matches properties from source to targets', () => {
   // Validate that layer property was matched to targets
   for (let i = 0; i < match.destinationSetIndices.length; i++) {
     const tgt = core.scene.entities.get(match.destinationSetIndices[i]);
-    expect(tgt.layer).toBe('test');
+    expect(tgt.getProperty('layer')).toBe('test');
   }
 
   const circle = core.scene.entities.get(1);
-  expect(circle.radius).toBe(10); // original radius
+  expect(circle.getProperty('radius')).toBe(10); // original radius
 
   const arc = core.scene.entities.get(3);
-  expect(arc.radius).toBe(10); // original radius
+  expect(arc.getProperty('radius')).toBe(10); // original radius
 
   const text = core.scene.entities.get(5);
-  expect(text.height).toBe(10); // original height
-  expect(text.string).toBe('text test'); // original string
+  expect(text.getProperty('height')).toBe(10); // original height
+  expect(text.getProperty('string')).toBe('text test'); // original string
 });