Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Refactor import composition seam for future source families
Yuechen Licf1ef292d7b3
diff --git a/Aetheris.Kernel.Core.Tests/Step242/ImportOrchestratorTests.cs b/Aetheris.Kernel.Core.Tests/Step242/ImportOrchestratorTests.csindex a97e3954..1e2778d5 100644--- a/Aetheris.Kernel.Core.Tests/Step242/ImportOrchestratorTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/ImportOrchestratorTests.cs@@ -1,5 +1,8 @@using Aetheris.Kernel.Core.Step242;using Aetheris.Kernel.Core.Import;+using Aetheris.Kernel.Core.Brep;+using Aetheris.Kernel.Core.Results;+using Aetheris.Kernel.Core.Topology;namespace Aetheris.Kernel.Core.Tests.Step242;@@ -78,9 +81,53 @@ public sealed class ImportOrchestratorTestsAssert.Equal(6, import.Value.Topology.Faces.Count());}+ [Fact]+ public void CreateDefault_AllowsAdditionalSourceFamilyRegistrationWithoutChangingStepBehavior()+ {+ var orchestrator = ImportOrchestrator.CreateDefault(builder =>+ builder+ .AddConnector(new StubSourceConnector())+ .AddLane(new StubImportLane()));++ var result = orchestrator.Import(new ImportRequest("FIRMAMENT:test"));++ Assert.True(result.BodyResult.IsSuccess);+ Assert.Equal("stub-connector", result.Connector);+ Assert.Equal(ImportLaneKind.Compatibility, result.Lane);+ Assert.Equal("FIRMAMENT", result.SourceFamily);+ }+private static string LoadFixture(string relativePath){var path = Path.Combine(Step242CorpusManifestRunner.RepoRoot(), relativePath.Replace('/', Path.DirectorySeparatorChar));return File.ReadAllText(path);}++ private sealed class StubParsedSourceDocument : IParsedSourceDocument+ {+ public string SourceFamily => "FIRMAMENT";+ }++ private sealed class StubSourceConnector : ISourceConnector+ {+ public string Name => "stub-connector";++ public bool CanOpen(ImportRequest request) => request.SourceText.StartsWith("FIRMAMENT:", StringComparison.Ordinal);++ public KernelResult<IParsedSourceDocument> Parse(ImportRequest request)+ => KernelResult<IParsedSourceDocument>.Success(new StubParsedSourceDocument());+ }++ private sealed class StubImportLane : IImportLane+ {+ public string Name => "stub-lane";++ public ImportLaneKind Kind => ImportLaneKind.Compatibility;++ public bool CanImport(IParsedSourceDocument document, ImportPolicy policy)+ => document is StubParsedSourceDocument;++ public KernelResult<BrepBody> Import(IParsedSourceDocument document, ImportPolicy policy)+ => KernelResult<BrepBody>.Success(new BrepBody(new TopologyModel(), new BrepGeometryStore(), new BrepBindingModel()));+ }}diff --git a/Aetheris.Kernel.Core/Import/ImportOrchestrator.cs b/Aetheris.Kernel.Core/Import/ImportOrchestrator.csindex 29821a4e..881607d7 100644--- a/Aetheris.Kernel.Core/Import/ImportOrchestrator.cs+++ b/Aetheris.Kernel.Core/Import/ImportOrchestrator.cs@@ -40,16 +40,13 @@ public sealed class ImportOrchestrator_lanes = lanes;}- public static ImportOrchestrator CreateDefault()+ public static ImportOrchestrator CreateDefault(Action<ImportCompositionBuilder>? configure = null){- var stepConnector = new Step242.StepSourceConnector();- return new ImportOrchestrator(- connectors: [stepConnector],- lanes:- [- new Step242.Step242ExactBRepImportLane(),- new Step242.Step242TessellatedImportLane()- ]);+ var builder = new ImportCompositionBuilder();+ Step242.Step242ImportComposition.Register(builder);+ configure?.Invoke(builder);++ return new ImportOrchestrator(builder.Connectors, builder.Lanes);}public ImportResult Import(ImportRequest request)@@ -111,3 +108,25 @@ public sealed class ImportOrchestratorreturn _lanes.FirstOrDefault(l => l.CanImport(document, policy));}}++public sealed class ImportCompositionBuilder+{+ private readonly List<ISourceConnector> _connectors = [];+ private readonly List<IImportLane> _lanes = [];++ internal IReadOnlyList<ISourceConnector> Connectors => _connectors;++ internal IReadOnlyList<IImportLane> Lanes => _lanes;++ public ImportCompositionBuilder AddConnector(ISourceConnector connector)+ {+ _connectors.Add(connector);+ return this;+ }++ public ImportCompositionBuilder AddLane(IImportLane lane)+ {+ _lanes.Add(lane);+ return this;+ }+}diff --git a/Aetheris.Kernel.Core/Step242/StepImportConnectorAndLanes.cs b/Aetheris.Kernel.Core/Step242/StepImportConnectorAndLanes.csindex e4258bd5..b6d2cb4d 100644--- a/Aetheris.Kernel.Core/Step242/StepImportConnectorAndLanes.cs+++ b/Aetheris.Kernel.Core/Step242/StepImportConnectorAndLanes.cs@@ -10,6 +10,17 @@ using Aetheris.Kernel.Core.Topology;namespace Aetheris.Kernel.Core.Step242;+public static class Step242ImportComposition+{+ public static ImportCompositionBuilder Register(ImportCompositionBuilder builder)+ {+ return builder+ .AddConnector(new StepSourceConnector())+ .AddLane(new Step242ExactBRepImportLane())+ .AddLane(new Step242TessellatedImportLane());+ }+}+internal sealed class StepParsedSourceDocument(Step242ParsedDocument document) : IParsedSourceDocument{public Step242ParsedDocument Document { get; } = document;diff --git a/Aetheris.Kernel.Firmament/README.md b/Aetheris.Kernel.Firmament/README.mdindex b11a6f88..71b7b811 100644--- a/Aetheris.Kernel.Firmament/README.md+++ b/Aetheris.Kernel.Firmament/README.md@@ -14,3 +14,5 @@ Implemented scaffolding:Not implemented yet: parser, semantic validation, selectors, lowering, or STEP behavior. The corpus scaffold is infrastructure-only and will be expanded by future parser/validator/lowering work.The top-level lanes (`Connectors`, `ParsedModel`, `Lanes`, `Mapping`, `Diagnostics`) are intentionally separated to guide future implementation work.++Pre-M0 composition seam note: `ImportOrchestrator.CreateDefault(...)` now supports additive registration while keeping STEP/AP242 as the default import composition, so Firmament can later register its own source-family connector/lane without reshaping STEP-specific wiring.