Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Implement M4b selector port surface validation

Yuechen Lifc5a33cc5082
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveExecutionTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveExecutionTests.cs
index eddb3f37..5c624e63 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveExecutionTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveExecutionTests.cs
@@ -118,7 +118,7 @@ public sealed class FirmamentPrimitiveExecutionTests
Assert.True(result.Compilation.IsSuccess);
var artifact = result.Compilation.Value;
- Assert.Equal("firmament-m4a-selector-root-validated-primitives-and-booleans-executed", artifact.ArtifactKind);
+ Assert.Equal("firmament-m4b-selector-port-surface-validated-primitives-and-booleans-executed", artifact.ArtifactKind);
Assert.Equal(2, artifact.PrimitiveLoweringPlan!.Primitives.Count);
Assert.Equal(2, artifact.PrimitiveLoweringPlan.Booleans.Count);
Assert.Single(artifact.PrimitiveLoweringPlan.SkippedOps);
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentScaffoldTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentScaffoldTests.cs
index 877836f0..9d3f80ad 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentScaffoldTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentScaffoldTests.cs
@@ -37,7 +37,7 @@ public sealed class FirmamentScaffoldTests
Assert.True(result.Compilation.IsSuccess);
var artifact = result.Compilation.Value;
- Assert.Equal("firmament-m4a-selector-root-validated-primitives-and-booleans-executed", artifact.ArtifactKind);
+ Assert.Equal("firmament-m4b-selector-port-surface-validated-primitives-and-booleans-executed", artifact.ArtifactKind);
Assert.NotNull(artifact.ParsedDocument);
Assert.Equal("1", artifact.ParsedDocument!.Firmament.Version);
Assert.Equal("demo", artifact.ParsedDocument.Model.Name);
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetFeatureExistenceTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetFeatureExistenceTests.cs
index 12274aa5..14234203 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetFeatureExistenceTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentValidationTargetFeatureExistenceTests.cs
@@ -42,6 +42,9 @@ public sealed class FirmamentValidationTargetFeatureExistenceTests
[InlineData("testdata/firmament/fixtures/m4a-valid-expect-selectable-selector-target-root-earlier.firmament")]
[InlineData("testdata/firmament/fixtures/m2c-valid-expect-exists-selector-target-unresolved.firmament")]
[InlineData("testdata/firmament/fixtures/m2c-valid-expect-selectable-selector-target-unresolved.firmament")]
+ [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")]
public void Compiler_Accepts_SelectorShapedValidationTargets_WhenRootFeatureDefinedEarlier(string fixturePath)
{
var result = CompileFixture(fixturePath);
@@ -71,6 +74,30 @@ public sealed class FirmamentValidationTargetFeatureExistenceTests
firstDiagnostic.Message);
}
+
+
+ [Theory]
+ [InlineData("testdata/firmament/fixtures/m4b-invalid-expect-exists-selector-target-port-starts-digit.firmament", "expect_exists", "1port")]
+ [InlineData("testdata/firmament/fixtures/m4b-invalid-expect-selectable-selector-target-port-invalid-punctuation.firmament", "expect_selectable", "top-face")]
+ [InlineData("testdata/firmament/fixtures/m4b-invalid-expect-selectable-selector-target-port-whitespace.firmament", "expect_selectable", "top face")]
+ [InlineData("testdata/firmament/fixtures/m4b-invalid-expect-exists-selector-target-port-invalid-symbol.firmament", "expect_exists", "face$")]
+ public void Compiler_Rejects_SelectorShapedValidationTargets_WhenPortTokenMalformed(string fixturePath, string opName, string portToken)
+ {
+ 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.ValidationTargetInvalidSelectorPortToken.Value}] Validation op '{opName}' at index 1 has invalid selector port token '{portToken}' via field 'target'.",
+ firstDiagnostic.Message);
+ }
+
private static FirmamentCompileResult CompileFixture(string fixturePath)
{
var fixtureText = FirmamentCorpusHarness.ReadFixtureText(fixturePath);
diff --git a/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.cs b/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.cs
index 8cb982ee..2c7526f5 100644
--- a/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.cs
@@ -28,6 +28,7 @@ public static class FirmamentDiagnosticCodes
public static readonly FirmamentDiagnosticCode ReferenceUnknownFeatureId = new($"{FirmamentDiagnosticConventions.ReferencePrefix}-0002");
public 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 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/FirmamentCompilationArtifact.cs b/Aetheris.Kernel.Firmament/FirmamentCompilationArtifact.cs
index d88d6b75..7f9b9e6b 100644
--- a/Aetheris.Kernel.Firmament/FirmamentCompilationArtifact.cs
+++ b/Aetheris.Kernel.Firmament/FirmamentCompilationArtifact.cs
@@ -5,7 +5,7 @@ using Aetheris.Kernel.Firmament.ParsedModel;
namespace Aetheris.Kernel.Firmament;
public sealed record FirmamentCompilationArtifact(
- string ArtifactKind = "firmament-m4a-selector-root-validated-primitives-and-booleans-executed",
+ string ArtifactKind = "firmament-m4b-selector-port-surface-validated-primitives-and-booleans-executed",
FirmamentParsedDocument? ParsedDocument = null,
FirmamentPrimitiveLoweringPlan? PrimitiveLoweringPlan = null,
FirmamentPrimitiveExecutionResult? PrimitiveExecutionResult = null);
diff --git a/Aetheris.Kernel.Firmament/FirmamentCompiler.cs b/Aetheris.Kernel.Firmament/FirmamentCompiler.cs
index ec8a0d25..ae800147 100644
--- a/Aetheris.Kernel.Firmament/FirmamentCompiler.cs
+++ b/Aetheris.Kernel.Firmament/FirmamentCompiler.cs
@@ -71,7 +71,7 @@ public sealed class FirmamentCompiler
return new FirmamentCompileResult(
KernelResult<FirmamentCompilationArtifact>.Success(
new FirmamentCompilationArtifact(
- ArtifactKind: "firmament-m4a-selector-root-validated-primitives-and-booleans-executed",
+ ArtifactKind: "firmament-m4b-selector-port-surface-validated-primitives-and-booleans-executed",
ParsedDocument: targetShapeValidationResult.Value,
PrimitiveLoweringPlan: primitiveLoweringResult.Value,
PrimitiveExecutionResult: primitiveExecutionResult.Value)));
diff --git a/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.cs b/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.cs
index cbbfff8e..4ecb4fc6 100644
--- a/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.cs
+++ b/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.cs
@@ -97,6 +97,15 @@ internal static class FirmamentDocumentCoherenceValidator
diagnostic = CreateDiagnostic(
FirmamentDiagnosticCodes.ValidationTargetUnknownSelectorRootFeatureId,
$"Validation op '{entry.OpName}' at index {index} references unknown selector root feature id '{rootFeatureId}' via field 'target'.");
+ return;
+ }
+
+ var portToken = ExtractSelectorPort(targetRaw);
+ if (!FirmamentValidationTargetClassifier.IsValidIdentifier(portToken))
+ {
+ diagnostic = CreateDiagnostic(
+ FirmamentDiagnosticCodes.ValidationTargetInvalidSelectorPortToken,
+ $"Validation op '{entry.OpName}' at index {index} has invalid selector port token '{portToken}' via field 'target'.");
}
}
@@ -108,6 +117,14 @@ internal static class FirmamentDocumentCoherenceValidator
: target;
}
+ private static string ExtractSelectorPort(string target)
+ {
+ var separatorIndex = target.IndexOf('.', StringComparison.Ordinal);
+ return separatorIndex >= 0 && separatorIndex < target.Length - 1
+ ? target[(separatorIndex + 1)..]
+ : string.Empty;
+ }
+
private static string GetReferenceFieldName(FirmamentKnownOpKind kind) =>
kind switch
{
diff --git a/Aetheris.Kernel.Firmament/Validation/FirmamentValidationTargetClassifier.cs b/Aetheris.Kernel.Firmament/Validation/FirmamentValidationTargetClassifier.cs
index 3b308e1a..a7fb1b63 100644
--- a/Aetheris.Kernel.Firmament/Validation/FirmamentValidationTargetClassifier.cs
+++ b/Aetheris.Kernel.Firmament/Validation/FirmamentValidationTargetClassifier.cs
@@ -12,13 +12,6 @@ internal static class FirmamentValidationTargetClassifier
}
var trimmed = rawTarget.Trim();
- if (trimmed.Contains(' ', StringComparison.Ordinal)
- || trimmed.Contains('\t', StringComparison.Ordinal)
- || trimmed.Contains('\n', StringComparison.Ordinal)
- || trimmed.Contains('\r', StringComparison.Ordinal))
- {
- return false;
- }
var dotCount = 0;
foreach (var character in trimmed)
@@ -49,7 +42,7 @@ internal static class FirmamentValidationTargetClassifier
var left = trimmed[..separatorIndex];
var right = trimmed[(separatorIndex + 1)..];
- if (!IsValidIdentifier(left) || !IsValidIdentifier(right))
+ if (!IsValidIdentifier(left) || right.Length == 0)
{
return false;
}
@@ -58,7 +51,7 @@ internal static class FirmamentValidationTargetClassifier
return true;
}
- private static bool IsValidIdentifier(string value)
+ internal static bool IsValidIdentifier(string value)
{
if (value.Length == 0)
{
diff --git a/testdata/firmament/fixtures/m4b-invalid-expect-exists-selector-target-port-invalid-symbol.firmament b/testdata/firmament/fixtures/m4b-invalid-expect-exists-selector-target-port-invalid-symbol.firmament
new file mode 100644
index 00000000..03e8da2a
--- /dev/null
+++ b/testdata/firmament/fixtures/m4b-invalid-expect-exists-selector-target-port-invalid-symbol.firmament
@@ -0,0 +1,18 @@
+firmament:
+ version: 1
+
+model:
+ name: demo
+ units: mm
+
+ops[2]:
+ -
+ op: box
+ id: base
+ size[3]:
+ 4
+ 4
+ 4
+ -
+ op: expect_exists
+ target: base.face$
diff --git a/testdata/firmament/fixtures/m4b-invalid-expect-exists-selector-target-port-starts-digit.firmament b/testdata/firmament/fixtures/m4b-invalid-expect-exists-selector-target-port-starts-digit.firmament
new file mode 100644
index 00000000..f668a85e
--- /dev/null
+++ b/testdata/firmament/fixtures/m4b-invalid-expect-exists-selector-target-port-starts-digit.firmament
@@ -0,0 +1,18 @@
+firmament:
+ version: 1
+
+model:
+ name: demo
+ units: mm
+
+ops[2]:
+ -
+ op: box
+ id: base
+ size[3]:
+ 4
+ 4
+ 4
+ -
+ op: expect_exists
+ target: base.1port
diff --git a/testdata/firmament/fixtures/m4b-invalid-expect-selectable-selector-target-port-invalid-punctuation.firmament b/testdata/firmament/fixtures/m4b-invalid-expect-selectable-selector-target-port-invalid-punctuation.firmament
new file mode 100644
index 00000000..85b470a9
--- /dev/null
+++ b/testdata/firmament/fixtures/m4b-invalid-expect-selectable-selector-target-port-invalid-punctuation.firmament
@@ -0,0 +1,19 @@
+firmament:
+ version: 1
+
+model:
+ name: demo
+ units: mm
+
+ops[2]:
+ -
+ op: box
+ id: base
+ size[3]:
+ 4
+ 4
+ 4
+ -
+ op: expect_selectable
+ target: base.top-face
+ count: 1
diff --git a/testdata/firmament/fixtures/m4b-invalid-expect-selectable-selector-target-port-whitespace.firmament b/testdata/firmament/fixtures/m4b-invalid-expect-selectable-selector-target-port-whitespace.firmament
new file mode 100644
index 00000000..b226517c
--- /dev/null
+++ b/testdata/firmament/fixtures/m4b-invalid-expect-selectable-selector-target-port-whitespace.firmament
@@ -0,0 +1,19 @@
+firmament:
+ version: 1
+
+model:
+ name: demo
+ units: mm
+
+ops[2]:
+ -
+ op: box
+ id: base
+ size[3]:
+ 4
+ 4
+ 4
+ -
+ op: expect_selectable
+ target: base.top face
+ count: 1
diff --git a/testdata/firmament/fixtures/m4b-valid-expect-exists-selector-target-port-surface-valid.firmament b/testdata/firmament/fixtures/m4b-valid-expect-exists-selector-target-port-surface-valid.firmament
new file mode 100644
index 00000000..75f51582
--- /dev/null
+++ b/testdata/firmament/fixtures/m4b-valid-expect-exists-selector-target-port-surface-valid.firmament
@@ -0,0 +1,18 @@
+firmament:
+ version: 1
+
+model:
+ name: demo
+ units: mm
+
+ops[2]:
+ -
+ op: box
+ id: base
+ size[3]:
+ 8
+ 6
+ 4
+ -
+ op: expect_exists
+ target: base.top_face
diff --git a/testdata/firmament/fixtures/m4b-valid-expect-selectable-selector-target-port-surface-valid.firmament b/testdata/firmament/fixtures/m4b-valid-expect-selectable-selector-target-port-surface-valid.firmament
new file mode 100644
index 00000000..f6fcb692
--- /dev/null
+++ b/testdata/firmament/fixtures/m4b-valid-expect-selectable-selector-target-port-surface-valid.firmament
@@ -0,0 +1,17 @@
+firmament:
+ version: 1
+
+model:
+ name: demo
+ units: mm
+
+ops[2]:
+ -
+ op: cylinder
+ id: hole
+ radius: 2
+ height: 10
+ -
+ op: expect_selectable
+ target: hole.circular_edges
+ count: 2
diff --git a/testdata/firmament/fixtures/m4b-valid-mixed-bare-and-selector-targets.firmament b/testdata/firmament/fixtures/m4b-valid-mixed-bare-and-selector-targets.firmament
new file mode 100644
index 00000000..35f64bc7
--- /dev/null
+++ b/testdata/firmament/fixtures/m4b-valid-mixed-bare-and-selector-targets.firmament
@@ -0,0 +1,26 @@
+firmament:
+ version: 1
+
+model:
+ name: demo
+ units: mm
+
+ops[4]:
+ -
+ op: box
+ id: base
+ size[3]:
+ 10
+ 10
+ 2
+ -
+ op: sphere
+ id: boss
+ radius: 2
+ -
+ op: expect_exists
+ target: base
+ -
+ op: expect_selectable
+ target: boss.entry_face
+ count: 1
diff --git a/testdata/firmament/manifests/firmament.corpus.json b/testdata/firmament/manifests/firmament.corpus.json
index 68c386c7..a07e2df4 100644
--- a/testdata/firmament/manifests/firmament.corpus.json
+++ b/testdata/firmament/manifests/firmament.corpus.json
@@ -810,6 +810,68 @@
"kernelCode": "ValidationFailed",
"firmamentCode": "FIRM-REF-0004"
}
+ },
+ {
+ "id": "m4b-valid-expect-exists-selector-target-port-surface-valid",
+ "name": "Valid M4b expect_exists selector-shaped target with surface-valid port token",
+ "fixturePath": "testdata/firmament/fixtures/m4b-valid-expect-exists-selector-target-port-surface-valid.firmament",
+ "expectedOutcome": "success"
+ },
+ {
+ "id": "m4b-valid-expect-selectable-selector-target-port-surface-valid",
+ "name": "Valid M4b expect_selectable selector-shaped target with surface-valid port token",
+ "fixturePath": "testdata/firmament/fixtures/m4b-valid-expect-selectable-selector-target-port-surface-valid.firmament",
+ "expectedOutcome": "success"
+ },
+ {
+ "id": "m4b-valid-mixed-bare-and-selector-targets",
+ "name": "Valid M4b mixed bare and selector-shaped targets with valid selector ports",
+ "fixturePath": "testdata/firmament/fixtures/m4b-valid-mixed-bare-and-selector-targets.firmament",
+ "expectedOutcome": "success"
+ },
+ {
+ "id": "m4b-invalid-expect-exists-selector-target-port-starts-digit",
+ "name": "Invalid M4b expect_exists selector-shaped target port token starts with digit",
+ "fixturePath": "testdata/firmament/fixtures/m4b-invalid-expect-exists-selector-target-port-starts-digit.firmament",
+ "expectedOutcome": "failure",
+ "expectedDiagnostic": {
+ "source": "firmament",
+ "kernelCode": "ValidationFailed",
+ "firmamentCode": "FIRM-REF-0005"
+ }
+ },
+ {
+ "id": "m4b-invalid-expect-selectable-selector-target-port-invalid-punctuation",
+ "name": "Invalid M4b expect_selectable selector-shaped target port token has punctuation",
+ "fixturePath": "testdata/firmament/fixtures/m4b-invalid-expect-selectable-selector-target-port-invalid-punctuation.firmament",
+ "expectedOutcome": "failure",
+ "expectedDiagnostic": {
+ "source": "firmament",
+ "kernelCode": "ValidationFailed",
+ "firmamentCode": "FIRM-REF-0005"
+ }
+ },
+ {
+ "id": "m4b-invalid-expect-selectable-selector-target-port-whitespace",
+ "name": "Invalid M4b expect_selectable selector-shaped target port token has whitespace",
+ "fixturePath": "testdata/firmament/fixtures/m4b-invalid-expect-selectable-selector-target-port-whitespace.firmament",
+ "expectedOutcome": "failure",
+ "expectedDiagnostic": {
+ "source": "firmament",
+ "kernelCode": "ValidationFailed",
+ "firmamentCode": "FIRM-REF-0005"
+ }
+ },
+ {
+ "id": "m4b-invalid-expect-exists-selector-target-port-invalid-symbol",
+ "name": "Invalid M4b expect_exists selector-shaped target port token has invalid symbol",
+ "fixturePath": "testdata/firmament/fixtures/m4b-invalid-expect-exists-selector-target-port-invalid-symbol.firmament",
+ "expectedOutcome": "failure",
+ "expectedDiagnostic": {
+ "source": "firmament",
+ "kernelCode": "ValidationFailed",
+ "firmamentCode": "FIRM-REF-0005"
+ }
}
]
}