Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Implement M4c primitive selector port contract validation
Yuechen Lifb79969fc431
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentDocumentCoherenceValidationTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentDocumentCoherenceValidationTests.csindex 80fb1dd2..0e0396d7 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentDocumentCoherenceValidationTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentDocumentCoherenceValidationTests.cs@@ -77,7 +77,7 @@ public sealed class FirmamentDocumentCoherenceValidationTeststarget: base.top_face-op: expect_selectable- target: base.side_a+ target: base.edgescount: 1""";diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentValidationRequiredFieldValidationTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentValidationRequiredFieldValidationTests.csindex f65013cf..81559449 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentValidationRequiredFieldValidationTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentValidationRequiredFieldValidationTests.cs@@ -47,7 +47,7 @@ public sealed class FirmamentValidationRequiredFieldValidationTestsheight: 2-op: expect_selectable- target: hole.entry_face+ target: hole.top_facecount: 4""");diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetFeatureExistenceTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetFeatureExistenceTests.csindex 14234203..1486f469 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetFeatureExistenceTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetFeatureExistenceTests.cs@@ -45,6 +45,7 @@ public sealed class FirmamentValidationTargetFeatureExistenceTests[InlineData("testdata/firmament/fixtures/m4b-valid-expect-exists-selector-target-port-surface-valid.firmament")][InlineData("testdata/firmament/fixtures/m4b-valid-expect-selectable-selector-target-port-surface-valid.firmament")][InlineData("testdata/firmament/fixtures/m4b-valid-mixed-bare-and-selector-targets.firmament")]+ [InlineData("testdata/firmament/fixtures/m4c-valid-primitive-selector-contracts.firmament")]public void Compiler_Accepts_SelectorShapedValidationTargets_WhenRootFeatureDefinedEarlier(string fixturePath){var result = CompileFixture(fixturePath);@@ -98,6 +99,30 @@ public sealed class FirmamentValidationTargetFeatureExistenceTestsfirstDiagnostic.Message);}+++ [Theory]+ [InlineData("testdata/firmament/fixtures/m4c-invalid-expect-exists-selector-target-port-not-allowed-box.firmament", "expect_exists", "box", "circular_edges", "box", 1)]+ [InlineData("testdata/firmament/fixtures/m4c-invalid-expect-exists-selector-target-port-not-allowed-sphere.firmament", "expect_exists", "sphere", "top_face", "sphere", 1)]+ [InlineData("testdata/firmament/fixtures/m4c-invalid-expect-selectable-selector-target-port-not-allowed-cylinder.firmament", "expect_selectable", "cylinder", "surface", "cylinder", 1)]+ [InlineData("testdata/firmament/fixtures/m4c-mixed-valid-and-invalid-selector-contracts.firmament", "expect_exists", "sph", "top_face", "sphere", 5)]+ public void Compiler_Rejects_SelectorShapedValidationTargets_WhenPortNotAllowedByPrimitiveFeatureContract(string fixturePath, string opName, string featureId, string portToken, string featureKind, int opIndex)+ {+ var first = CompileFixture(fixturePath);+ var second = CompileFixture(fixturePath);++ Assert.False(first.Compilation.IsSuccess);+ Assert.False(second.Compilation.IsSuccess);++ var firstDiagnostic = Assert.Single(first.Compilation.Diagnostics);+ var secondDiagnostic = Assert.Single(second.Compilation.Diagnostics);++ Assert.Equal(firstDiagnostic.Message, secondDiagnostic.Message);+ Assert.Equal(+ $"[{FirmamentDiagnosticCodes.ValidationTargetSelectorPortNotAllowedForFeatureKind.Value}] Validation op '{opName}' at index {opIndex} has selector port '{portToken}' not allowed for feature kind '{featureKind}' on feature id '{featureId}' via field 'target'.",+ firstDiagnostic.Message);+ }+private static FirmamentCompileResult CompileFixture(string fixturePath){var fixtureText = FirmamentCorpusHarness.ReadFixtureText(fixturePath);diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetShapeClassificationTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetShapeClassificationTests.csindex d317d6eb..93763c6b 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetShapeClassificationTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetShapeClassificationTests.cs@@ -8,7 +8,7 @@ public sealed class FirmamentValidationTargetShapeClassificationTests[InlineData("expect_exists", "base", "FeatureId")][InlineData("expect_exists", "base.top_face", "SelectorShaped")][InlineData("expect_selectable", "base", "FeatureId")]- [InlineData("expect_selectable", "mount_hole.entry_face", "SelectorShaped")]+ [InlineData("expect_selectable", "mount_hole.edges", "SelectorShaped")]public void Compiler_Classifies_ValidationTargets_BySurfaceShape(string opName, string target, string expectedShape){var selectorRoot = target.Split('.', 2, StringSplitOptions.None)[0];@@ -101,7 +101,7 @@ public sealed class FirmamentValidationTargetShapeClassificationTests}[Fact]- public void Compiler_DoesNotResolve_SelectorPorts_Semantically()+ public void Compiler_Allows_ContractLegalSelectorPorts_WithoutTopologyResolution(){const string source = """firmament:@@ -121,10 +121,10 @@ public sealed class FirmamentValidationTargetShapeClassificationTests1-op: expect_exists- target: base.nonexistent_port_name+ target: base.top_face-op: expect_selectable- target: base.any_other_port+ target: base.edgescount: 1""";diff --git a/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.cs b/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.csindex 2c7526f5..a7a9d77e 100644--- a/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.cs+++ b/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.cs@@ -29,6 +29,7 @@ public static class FirmamentDiagnosticCodespublic static readonly FirmamentDiagnosticCode ValidationTargetUnknownFeatureId = new($"{FirmamentDiagnosticConventions.ReferencePrefix}-0003");public static readonly FirmamentDiagnosticCode ValidationTargetUnknownSelectorRootFeatureId = new($"{FirmamentDiagnosticConventions.ReferencePrefix}-0004");public static readonly FirmamentDiagnosticCode ValidationTargetInvalidSelectorPortToken = new($"{FirmamentDiagnosticConventions.ReferencePrefix}-0005");+ public static readonly FirmamentDiagnosticCode ValidationTargetSelectorPortNotAllowedForFeatureKind = new($"{FirmamentDiagnosticConventions.ReferencePrefix}-0006");public static readonly FirmamentDiagnosticCode SelectorPlaceholder = new($"{FirmamentDiagnosticConventions.SelectorPrefix}-0001");public static readonly FirmamentDiagnosticCode SchemaPlaceholder = new($"{FirmamentDiagnosticConventions.SchemaPrefix}-0001");public static readonly FirmamentDiagnosticCode LoweringPlaceholder = new($"{FirmamentDiagnosticConventions.LoweringPrefix}-0001");diff --git a/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.cs b/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.csindex 4ecb4fc6..c95fdee4 100644--- a/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.cs+++ b/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.cs@@ -12,6 +12,7 @@ internal static class FirmamentDocumentCoherenceValidatorArgumentNullException.ThrowIfNull(parsedDocument);var featureIds = new HashSet<string>(StringComparer.Ordinal);+ var featureKindsById = new Dictionary<string, FirmamentKnownOpKind>(StringComparer.Ordinal);for (var index = 0; index < parsedDocument.Ops.Entries.Count; index++){@@ -19,7 +20,7 @@ internal static class FirmamentDocumentCoherenceValidatorif (entry.Family == FirmamentOpFamily.Validation){- ValidateValidationTargetReference(entry, index, featureIds, out var diagnostic);+ ValidateValidationTargetReference(entry, index, featureIds, featureKindsById, out var diagnostic);if (diagnostic is not null){return KernelResult<bool>.Failure([diagnostic]);@@ -51,6 +52,8 @@ internal static class FirmamentDocumentCoherenceValidator$"Feature-producing op '{entry.OpName}' at index {index} reuses duplicate feature id '{featureId}'.")]);}++ featureKindsById[featureId] = entry.KnownKind;}return KernelResult<bool>.Success(true);@@ -60,6 +63,7 @@ internal static class FirmamentDocumentCoherenceValidatorFirmamentParsedOpEntry entry,int index,HashSet<string> featureIds,+ IReadOnlyDictionary<string, FirmamentKnownOpKind> featureKindsById,out KernelDiagnostic? diagnostic){diagnostic = null;@@ -106,6 +110,24 @@ internal static class FirmamentDocumentCoherenceValidatordiagnostic = CreateDiagnostic(FirmamentDiagnosticCodes.ValidationTargetInvalidSelectorPortToken,$"Validation op '{entry.OpName}' at index {index} has invalid selector port token '{portToken}' via field 'target'.");+ return;+ }++ if (!featureKindsById.TryGetValue(rootFeatureId, out var rootFeatureKind))+ {+ return;+ }++ if (!FirmamentPrimitiveSelectorContracts.TryGetAllowedPorts(rootFeatureKind, out var allowedPorts))+ {+ return;+ }++ if (!allowedPorts.Contains(portToken))+ {+ diagnostic = CreateDiagnostic(+ FirmamentDiagnosticCodes.ValidationTargetSelectorPortNotAllowedForFeatureKind,+ $"Validation op '{entry.OpName}' at index {index} has selector port '{portToken}' not allowed for feature kind '{rootFeatureKind.ToString().ToLowerInvariant()}' on feature id '{rootFeatureId}' via field 'target'.");}}diff --git a/Aetheris.Kernel.Firmament/Validation/FirmamentPrimitiveSelectorContracts.cs b/Aetheris.Kernel.Firmament/Validation/FirmamentPrimitiveSelectorContracts.csnew file mode 100644index 00000000..de77e248--- /dev/null+++ b/Aetheris.Kernel.Firmament/Validation/FirmamentPrimitiveSelectorContracts.cs@@ -0,0 +1,53 @@+using Aetheris.Kernel.Firmament.ParsedModel;++namespace Aetheris.Kernel.Firmament.Validation;++internal static class FirmamentPrimitiveSelectorContracts+{+ private static readonly IReadOnlySet<string> BoxPorts = new HashSet<string>(StringComparer.Ordinal)+ {+ "top_face",+ "bottom_face",+ "side_faces",+ "edges",+ "vertices"+ };++ private static readonly IReadOnlySet<string> CylinderPorts = new HashSet<string>(StringComparer.Ordinal)+ {+ "top_face",+ "bottom_face",+ "side_face",+ "circular_edges",+ "edges",+ "vertices"+ };++ private static readonly IReadOnlySet<string> SpherePorts = new HashSet<string>(StringComparer.Ordinal)+ {+ "surface",+ "edges",+ "vertices"+ };++ public static bool TryGetAllowedPorts(FirmamentKnownOpKind featureKind, out IReadOnlySet<string> allowedPorts)+ {+ switch (featureKind)+ {+ case FirmamentKnownOpKind.Box:+ allowedPorts = BoxPorts;+ return true;+ case FirmamentKnownOpKind.Cylinder:+ allowedPorts = CylinderPorts;+ return true;+ case FirmamentKnownOpKind.Sphere:+ allowedPorts = SpherePorts;+ return true;+ default:+ allowedPorts = EmptyPorts;+ return false;+ }+ }++ private static readonly IReadOnlySet<string> EmptyPorts = new HashSet<string>(StringComparer.Ordinal);+}diff --git a/testdata/firmament/fixtures/m1c-valid-expect-selectable.firmament b/testdata/firmament/fixtures/m1c-valid-expect-selectable.firmamentindex 30ee1eed..be009c00 100644--- a/testdata/firmament/fixtures/m1c-valid-expect-selectable.firmament+++ b/testdata/firmament/fixtures/m1c-valid-expect-selectable.firmament@@ -13,5 +13,5 @@ ops[2]:height: 2-op: expect_selectable- target: hole.entry_face+ target: hole.top_facecount: 4diff --git a/testdata/firmament/fixtures/m2b-valid-expect-selectable-selector-target.firmament b/testdata/firmament/fixtures/m2b-valid-expect-selectable-selector-target.firmamentindex 9a037b80..14c01190 100644--- a/testdata/firmament/fixtures/m2b-valid-expect-selectable-selector-target.firmament+++ b/testdata/firmament/fixtures/m2b-valid-expect-selectable-selector-target.firmament@@ -12,5 +12,5 @@ ops[2]:radius: 2-op: expect_selectable- target: mount_hole.entry_face+ target: mount_hole.surfacecount: 2diff --git a/testdata/firmament/fixtures/m2c-valid-expect-selectable-selector-target-unresolved.firmament b/testdata/firmament/fixtures/m2c-valid-expect-selectable-selector-target-unresolved.firmamentindex a5891484..f0f0749c 100644--- a/testdata/firmament/fixtures/m2c-valid-expect-selectable-selector-target-unresolved.firmament+++ b/testdata/firmament/fixtures/m2c-valid-expect-selectable-selector-target-unresolved.firmament@@ -12,5 +12,5 @@ ops[2]:radius: 2-op: expect_selectable- target: mount_hole.entry_face+ target: mount_hole.surfacecount: 1diff --git a/testdata/firmament/fixtures/m2c-valid-mixed-bare-and-selector-targets.firmament b/testdata/firmament/fixtures/m2c-valid-mixed-bare-and-selector-targets.firmamentindex bc71d87d..b99b1847 100644--- a/testdata/firmament/fixtures/m2c-valid-mixed-bare-and-selector-targets.firmament+++ b/testdata/firmament/fixtures/m2c-valid-mixed-bare-and-selector-targets.firmament@@ -22,4 +22,4 @@ ops[4]:count: 1-op: expect_exists- target: base.edge_a+ target: base.edgesdiff --git a/testdata/firmament/fixtures/m4a-valid-expect-selectable-selector-target-root-earlier.firmament b/testdata/firmament/fixtures/m4a-valid-expect-selectable-selector-target-root-earlier.firmamentindex 837ea1c5..89f68d69 100644--- a/testdata/firmament/fixtures/m4a-valid-expect-selectable-selector-target-root-earlier.firmament+++ b/testdata/firmament/fixtures/m4a-valid-expect-selectable-selector-target-root-earlier.firmament@@ -13,5 +13,5 @@ ops[2]:height: 2-op: expect_selectable- target: mount_hole.entry_face+ target: mount_hole.top_facecount: 1diff --git a/testdata/firmament/fixtures/m4a-valid-mixed-bare-and-selector-targets.firmament b/testdata/firmament/fixtures/m4a-valid-mixed-bare-and-selector-targets.firmamentindex 2f577103..ff4edc52 100644--- a/testdata/firmament/fixtures/m4a-valid-mixed-bare-and-selector-targets.firmament+++ b/testdata/firmament/fixtures/m4a-valid-mixed-bare-and-selector-targets.firmament@@ -15,8 +15,8 @@ ops[4]:target: core-op: expect_exists- target: core.top_face+ target: core.surface-op: expect_selectable- target: core.any_port+ target: core.edgescount: 1diff --git a/testdata/firmament/fixtures/m4b-valid-mixed-bare-and-selector-targets.firmament b/testdata/firmament/fixtures/m4b-valid-mixed-bare-and-selector-targets.firmamentindex 35f64bc7..251f9232 100644--- a/testdata/firmament/fixtures/m4b-valid-mixed-bare-and-selector-targets.firmament+++ b/testdata/firmament/fixtures/m4b-valid-mixed-bare-and-selector-targets.firmament@@ -22,5 +22,5 @@ ops[4]:target: base-op: expect_selectable- target: boss.entry_face+ target: boss.surfacecount: 1diff --git a/testdata/firmament/fixtures/m4c-invalid-expect-exists-selector-target-port-not-allowed-box.firmament b/testdata/firmament/fixtures/m4c-invalid-expect-exists-selector-target-port-not-allowed-box.firmamentnew file mode 100644index 00000000..a4271b43--- /dev/null+++ b/testdata/firmament/fixtures/m4c-invalid-expect-exists-selector-target-port-not-allowed-box.firmament@@ -0,0 +1,18 @@+firmament:+ version: 1++model:+ name: demo+ units: mm++ops[2]:+ -+ op: box+ id: box+ size[3]:+ 1+ 1+ 1+ -+ op: expect_exists+ target: box.circular_edgesdiff --git a/testdata/firmament/fixtures/m4c-invalid-expect-exists-selector-target-port-not-allowed-sphere.firmament b/testdata/firmament/fixtures/m4c-invalid-expect-exists-selector-target-port-not-allowed-sphere.firmamentnew file mode 100644index 00000000..48ae7fc0--- /dev/null+++ b/testdata/firmament/fixtures/m4c-invalid-expect-exists-selector-target-port-not-allowed-sphere.firmament@@ -0,0 +1,15 @@+firmament:+ version: 1++model:+ name: demo+ units: mm++ops[2]:+ -+ op: sphere+ id: sphere+ radius: 1+ -+ op: expect_exists+ target: sphere.top_facediff --git a/testdata/firmament/fixtures/m4c-invalid-expect-selectable-selector-target-port-not-allowed-cylinder.firmament b/testdata/firmament/fixtures/m4c-invalid-expect-selectable-selector-target-port-not-allowed-cylinder.firmamentnew file mode 100644index 00000000..cdc045c1--- /dev/null+++ b/testdata/firmament/fixtures/m4c-invalid-expect-selectable-selector-target-port-not-allowed-cylinder.firmament@@ -0,0 +1,17 @@+firmament:+ version: 1++model:+ name: demo+ units: mm++ops[2]:+ -+ op: cylinder+ id: cylinder+ radius: 2+ height: 3+ -+ op: expect_selectable+ target: cylinder.surface+ count: 1diff --git a/testdata/firmament/fixtures/m4c-mixed-valid-and-invalid-selector-contracts.firmament b/testdata/firmament/fixtures/m4c-mixed-valid-and-invalid-selector-contracts.firmamentnew file mode 100644index 00000000..d9ee121f--- /dev/null+++ b/testdata/firmament/fixtures/m4c-mixed-valid-and-invalid-selector-contracts.firmament@@ -0,0 +1,34 @@+firmament:+ version: 1++model:+ name: demo+ units: mm++ops[6]:+ -+ op: box+ id: base+ size[3]:+ 4+ 5+ 6+ -+ op: cylinder+ id: cyl+ radius: 1+ height: 2+ -+ op: sphere+ id: sph+ radius: 3+ -+ op: expect_exists+ target: base.vertices+ -+ op: expect_selectable+ target: cyl.circular_edges+ count: 2+ -+ op: expect_exists+ target: sph.top_facediff --git a/testdata/firmament/fixtures/m4c-valid-primitive-selector-contracts.firmament b/testdata/firmament/fixtures/m4c-valid-primitive-selector-contracts.firmamentnew file mode 100644index 00000000..86a58172--- /dev/null+++ b/testdata/firmament/fixtures/m4c-valid-primitive-selector-contracts.firmament@@ -0,0 +1,37 @@+firmament:+ version: 1++model:+ name: demo+ units: mm++ops[7]:+ -+ op: box+ id: base+ size[3]:+ 10+ 20+ 30+ -+ op: cylinder+ id: cyl+ radius: 2+ height: 5+ -+ op: sphere+ id: sphere+ radius: 4+ -+ op: expect_exists+ target: base.top_face+ -+ op: expect_exists+ target: base.edges+ -+ op: expect_selectable+ target: cyl.circular_edges+ count: 2+ -+ op: expect_exists+ target: sphere.surfacediff --git a/testdata/firmament/manifests/firmament.corpus.json b/testdata/firmament/manifests/firmament.corpus.jsonindex a07e2df4..3005d376 100644--- a/testdata/firmament/manifests/firmament.corpus.json+++ b/testdata/firmament/manifests/firmament.corpus.json@@ -872,6 +872,56 @@"kernelCode": "ValidationFailed","firmamentCode": "FIRM-REF-0005"}+ },+ {+ "id": "m4c-valid-primitive-selector-contracts",+ "name": "Valid M4c selector ports allowed by primitive feature contracts",+ "fixturePath": "testdata/firmament/fixtures/m4c-valid-primitive-selector-contracts.firmament",+ "expectedOutcome": "success"+ },+ {+ "id": "m4c-invalid-expect-exists-selector-target-port-not-allowed-box",+ "name": "Invalid M4c expect_exists selector port not allowed for box",+ "fixturePath": "testdata/firmament/fixtures/m4c-invalid-expect-exists-selector-target-port-not-allowed-box.firmament",+ "expectedOutcome": "failure",+ "expectedDiagnostic": {+ "source": "firmament",+ "kernelCode": "ValidationFailed",+ "firmamentCode": "FIRM-REF-0006"+ }+ },+ {+ "id": "m4c-invalid-expect-exists-selector-target-port-not-allowed-sphere",+ "name": "Invalid M4c expect_exists selector port not allowed for sphere",+ "fixturePath": "testdata/firmament/fixtures/m4c-invalid-expect-exists-selector-target-port-not-allowed-sphere.firmament",+ "expectedOutcome": "failure",+ "expectedDiagnostic": {+ "source": "firmament",+ "kernelCode": "ValidationFailed",+ "firmamentCode": "FIRM-REF-0006"+ }+ },+ {+ "id": "m4c-invalid-expect-selectable-selector-target-port-not-allowed-cylinder",+ "name": "Invalid M4c expect_selectable selector port not allowed for cylinder",+ "fixturePath": "testdata/firmament/fixtures/m4c-invalid-expect-selectable-selector-target-port-not-allowed-cylinder.firmament",+ "expectedOutcome": "failure",+ "expectedDiagnostic": {+ "source": "firmament",+ "kernelCode": "ValidationFailed",+ "firmamentCode": "FIRM-REF-0006"+ }+ },+ {+ "id": "m4c-mixed-valid-and-invalid-selector-contracts",+ "name": "Invalid M4c mixed selectors with one contract-illegal primitive selector port",+ "fixturePath": "testdata/firmament/fixtures/m4c-mixed-valid-and-invalid-selector-contracts.firmament",+ "expectedOutcome": "failure",+ "expectedDiagnostic": {+ "source": "firmament",+ "kernelCode": "ValidationFailed",+ "firmamentCode": "FIRM-REF-0006"+ }}]}