diff --git a/packages/concerto-linter/default-ruleset/src/functions/find-abstract-declaration.ts b/packages/concerto-linter/default-ruleset/src/functions/find-abstract-declaration.ts index a3d3152df2..6080980e9a 100644 --- a/packages/concerto-linter/default-ruleset/src/functions/find-abstract-declaration.ts +++ b/packages/concerto-linter/default-ruleset/src/functions/find-abstract-declaration.ts @@ -54,9 +54,26 @@ export const hasConcreteSubclass: IFunction = ( } } + const declMap = new Map(); for (const decl of allDeclarations) { - if (decl && !decl.isAbstract && decl.superType && typeof decl.superType.name === 'string') { - abstractNames.delete(decl.superType.name); + if (decl && typeof decl.name === 'string') { + declMap.set(decl.name, decl); + } + } + + for (const decl of allDeclarations) { + if (decl && !decl.isAbstract) { + let current: Declaration | undefined = decl; + const visited = new Set(); + while (current?.superType && typeof current.superType.name === 'string') { + const superTypeName = current.superType.name; + if (visited.has(superTypeName)) { + break; + } + visited.add(superTypeName); + abstractNames.delete(superTypeName); + current = declMap.get(superTypeName); + } } } if (abstractNames.size > 0) { diff --git a/packages/concerto-linter/default-ruleset/test/fixtures/abstract-must-subclassed-multilevel-invalid.cto b/packages/concerto-linter/default-ruleset/test/fixtures/abstract-must-subclassed-multilevel-invalid.cto new file mode 100644 index 0000000000..4fd7a382eb --- /dev/null +++ b/packages/concerto-linter/default-ruleset/test/fixtures/abstract-must-subclassed-multilevel-invalid.cto @@ -0,0 +1,17 @@ +namespace org.example@1.0.0 + +abstract concept Vehicle { + o String make +} + +abstract concept LandVehicle extends Vehicle { + o String terrain +} + +abstract concept WaterVehicle extends Vehicle { + o Double maxKts +} + +concept Car extends LandVehicle { + o Integer numberOfDoors +} diff --git a/packages/concerto-linter/default-ruleset/test/fixtures/abstract-must-subclassed-multilevel-valid.cto b/packages/concerto-linter/default-ruleset/test/fixtures/abstract-must-subclassed-multilevel-valid.cto new file mode 100644 index 0000000000..a8d3117623 --- /dev/null +++ b/packages/concerto-linter/default-ruleset/test/fixtures/abstract-must-subclassed-multilevel-valid.cto @@ -0,0 +1,13 @@ +namespace org.example@1.0.0 + +abstract concept Vehicle { + o String make +} + +abstract concept MotorVehicle extends Vehicle { + o String engineType +} + +concept Car extends MotorVehicle { + o Integer numberOfDoors +} diff --git a/packages/concerto-linter/default-ruleset/test/rules/abstract-must-subclassed.test.ts b/packages/concerto-linter/default-ruleset/test/rules/abstract-must-subclassed.test.ts index 78c6fcdf01..f17c461f00 100644 --- a/packages/concerto-linter/default-ruleset/test/rules/abstract-must-subclassed.test.ts +++ b/packages/concerto-linter/default-ruleset/test/rules/abstract-must-subclassed.test.ts @@ -30,4 +30,24 @@ describe('Abstract Must Be Subclassed Rule', () => { const messageText = results.map(r => r.message).join(' '); expect(messageText).toContain('must have concrete subclasses'); }); + + test('should not report violations when abstract declarations have indirect concrete subclasses via multi-level inheritance', async () => { + const results = await testRules({ + rules: { + 'abstract-must-subclassed': abstractMustSubclassed, + } + }, 'abstract-must-subclassed-multilevel-valid.cto'); + expect(results).toHaveLength(0); + }); + + test('should only report un-subclassed abstract declarations in branching multi-level inheritance', async () => { + const results = await testRules({ + rules: { + 'abstract-must-subclassed': abstractMustSubclassed, + } + }, 'abstract-must-subclassed-multilevel-invalid.cto'); + expect(results).toHaveLength(1); + expect(results[0].message).toContain('\'WaterVehicle\''); + }); }); +