Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Add inline STEP recognition labels
Yuechen Li438766b78798
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentV2InlineStepTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentV2InlineStepTests.csindex 8853cf53..e0c1b926 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentV2InlineStepTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentV2InlineStepTests.cs@@ -48,7 +48,9 @@ public sealed class FirmamentV2InlineStepTestspublic static TheoryData<string, string, string, double> InlinePmiCases => new(){{ "inline-step-v2-datum-pmi-on-canonical-face-emits-in-step", "SHAPE_ASPECT('firmament-datum:A'", "PROPERTY_DEFINITION('datum:A:importedPart'", 480d },- { "inline-step-v2-hole-diameter-pmi-on-canonical-face-emits-in-step", "SHAPE_DIMENSION_REPRESENTATION('diameter:importedPart.holeDiameter'", "PROPERTY_DEFINITION('diameter:importedPart.holeDiameter'", 480d - Math.PI * 1d * 1d * 6d }+ { "inline-step-v2-hole-diameter-pmi-on-canonical-face-emits-in-step", "SHAPE_DIMENSION_REPRESENTATION('diameter:importedPart.holeDiameter'", "PROPERTY_DEFINITION('diameter:importedPart.holeDiameter'", 480d - Math.PI * 1d * 1d * 6d },+ { "inline-step-v2-recognized-face-datum-pmi-emits-in-step", "SHAPE_ASPECT('firmament-datum:A'", "PROPERTY_DEFINITION('datum:A:importedPart'", 480d },+ { "inline-step-v2-recognized-hole-diameter-pmi-emits-in-step", "SHAPE_DIMENSION_REPRESENTATION('diameter:importedPart.mountHoleDiameter'", "PROPERTY_DEFINITION('diameter:importedPart.mountHoleDiameter'", 480d - Math.PI * 1d * 1d * 6d }};[Theory]@@ -90,6 +92,55 @@ public sealed class FirmamentV2InlineStepTests}}++ [Fact]+ public void InlineStep_RecognizedRegion_ParsesAndStoresMetadata()+ {+ var repo = FindRepoRoot();+ var source = File.ReadAllText(Path.Combine(repo, "fixtures/FirmamentV2/InlineStep/valid/inline-step-v2-recognized-face-datum-pmi-emits-in-step.valid.firmfixture"));+ var parse = FirmamentV2Parser.Parse(source, Path.Combine(repo, "fixtures/FirmamentV2/InlineStep/valid"));++ Assert.True(parse.IsSuccess, string.Join(Environment.NewLine, parse.Diagnostics));+ var region = Assert.Single(parse.Document!.RecognizedRegions!);+ Assert.Equal("importedPart", region.BodyName);+ Assert.Equal("topFace", region.RegionName);+ Assert.Equal("datumPlane", region.Kind);+ Assert.Equal("#40", Assert.Single(region.FaceRefs));+ Assert.Equal("high", region.Confidence);+ Assert.Equal("importedPart.region(\"topFace\")", Assert.Single(parse.Document.Pmi!).Target);+ }++ [Theory]+ [InlineData("kind: bogus\n faces: [\"#40\"]\n confidence: high", FirmamentV2Parser.InvalidRecognitionKind)]+ [InlineData("kind: datumPlane\n faces: [\"#40\"]\n confidence: maybe", FirmamentV2Parser.InvalidRecognitionConfidence)]+ [InlineData("kind: datumPlane\n faces: [\"#999999\"]\n confidence: high", FirmamentV2Parser.UnknownRecognitionFace)]+ public void InlineStep_InvalidRecognitionMetadata_RejectsDeterministically(string regionBody, string diagnostic)+ {+ var source = $$"""+model BadRecognition { units mm solid importedPart: InlineStep { path: "../testdata/canonical-box-10x8x6.step" } recognize importedPart { region topFace { {{regionBody}} } } }+""";+ var parse = FirmamentV2Parser.Parse(source, Path.Combine(FindRepoRoot(), "fixtures/FirmamentV2/InlineStep/valid"));++ Assert.False(parse.IsSuccess);+ Assert.Contains(diagnostic, parse.Diagnostics);+ }++ [Theory]+ [InlineData("recognize missingPart { region topFace { kind: datumPlane faces: [\"#40\"] confidence: high } }", FirmamentV2Parser.UnknownRecognitionBody)]+ [InlineData("recognize importedPart { region topFace { kind: datumPlane faces: [\"#40\"] confidence: high } region topFace { kind: datumPlane faces: [\"#77\"] confidence: high } }", FirmamentV2Parser.DuplicateRegion)]+ [InlineData("recognize importedPart { region topFace { kind: datumPlane faces: [\"#40\"] confidence: high } } pmi { datum A { target: importedPart.region(\"missingRegion\") } }", FirmamentV2Parser.UnknownRecognitionRegion)]+ [InlineData("recognize importedPart { region mountHole { kind: holeShaft faces: [\"#40\"] confidence: high } } pmi { datum A { target: importedPart.region(\"mountHole\") } }", FirmamentV2Parser.PmiRecognizedRegionKindMismatch)]+ public void InlineStep_InvalidRecognizedTargets_RejectDeterministically(string tail, string diagnostic)+ {+ var source = $$"""+model BadRecognitionTarget { units mm solid importedPart: InlineStep { path: "../testdata/canonical-box-10x8x6.step" } {{tail}} }+""";+ var parse = FirmamentV2Parser.Parse(source, Path.Combine(FindRepoRoot(), "fixtures/FirmamentV2/InlineStep/valid"));++ Assert.False(parse.IsSuccess);+ Assert.Contains(diagnostic, parse.Diagnostics);+ }+[Theory][InlineData("inline-step-v2-pmi-unknown-body.invalid.firmfixture", FirmamentV2Parser.InlineStepUnknownBody)][InlineData("inline-step-v2-pmi-unknown-face.invalid.firmfixture", FirmamentV2Parser.InlineStepUnknownFace)]diff --git a/Aetheris.Kernel.Firmament/FirmamentBuildAndExport.cs b/Aetheris.Kernel.Firmament/FirmamentBuildAndExport.csindex 8b907f5a..26986b3e 100644--- a/Aetheris.Kernel.Firmament/FirmamentBuildAndExport.cs+++ b/Aetheris.Kernel.Firmament/FirmamentBuildAndExport.cs@@ -372,14 +372,14 @@ public static class FirmamentBuildAndExport{result.Add(new Step242SemanticPmiHole(pmiHole.FeatureId, pmi.Value.Value, null, "explicit_v2_semantic_hole_diameter", null, null));}- else if (TryResolveV2ImportedFaceTarget(targetBinding, pmi.Target, out var importedTarget))+ else if (TryResolveV2RecognizedRegionTarget(document, targetBinding, pmi.Target, out var importedTarget) || TryResolveV2ImportedFaceTarget(targetBinding, pmi.Target, out importedTarget)){result.Add(new Step242SemanticPmiHole($"{targetSolid}.{pmi.Name}", pmi.Value.Value, null, $"imported_canonical_face:{importedTarget}", null, null));}}else if (pmi.Kind == FirmamentV2PmiKind.DatumPlane){- var selector = ResolveV2DatumTarget(targetBinding, pmi.Target);+ var selector = TryResolveV2RecognizedRegionTarget(document, targetBinding, pmi.Target, out var recognizedDatumTarget) ? recognizedDatumTarget : ResolveV2DatumTarget(targetBinding, pmi.Target);result.Add(new Step242SemanticPmiDatum(targetSolid, "plane", pmi.Name, selector));}}@@ -387,6 +387,27 @@ public static class FirmamentBuildAndExportreturn result;}++ private static bool TryResolveV2RecognizedRegionTarget(FirmamentV2Document document, FirmamentV2SolidBinding solid, string target, out string resolved)+ {+ resolved = string.Empty;+ const string marker = ".region(\"";+ if (solid.InlineStep is null || !target.StartsWith(solid.Name + marker, StringComparison.Ordinal) || !target.EndsWith("\")", StringComparison.Ordinal))+ {+ return false;+ }++ var regionName = target[(solid.Name.Length + marker.Length)..^2];+ var region = document.RecognizedRegions?.FirstOrDefault(r => string.Equals(r.BodyName, solid.Name, StringComparison.Ordinal) && string.Equals(r.RegionName, regionName, StringComparison.Ordinal));+ if (region is null || region.FaceRefs.Count == 0 || !solid.InlineStep.TopologyMap.TryResolveFaceEntity(region.FaceRefs[0], out var faceId))+ {+ return false;+ }++ resolved = $"{solid.Name}.{region.RegionName}.{faceId}:{region.FaceRefs[0]}";+ return true;+ }+private static bool TryResolveV2ImportedFaceTarget(FirmamentV2SolidBinding solid, string target, out string resolved){resolved = string.Empty;diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.csindex 44f581c0..b26309ae 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.cs@@ -1,6 +1,6 @@namespace Aetheris.Kernel.Firmament.FirmamentV2;-public sealed record FirmamentV2Document(string ModelName, string Units, IReadOnlyList<FirmamentV2SolidBinding> Solids, IReadOnlyList<FirmamentV2ModifyBlock>? ModifyBlocks = null, IReadOnlyList<FirmamentV2TemplateDecl>? Templates = null, IReadOnlyList<FirmamentV2PmiDecl>? Pmi = null)+public sealed record FirmamentV2Document(string ModelName, string Units, IReadOnlyList<FirmamentV2SolidBinding> Solids, IReadOnlyList<FirmamentV2ModifyBlock>? ModifyBlocks = null, IReadOnlyList<FirmamentV2TemplateDecl>? Templates = null, IReadOnlyList<FirmamentV2PmiDecl>? Pmi = null, IReadOnlyList<FirmamentV2RecognizedRegion>? RecognizedRegions = null){public FirmamentV2SolidBinding Solid => Solids[^1];public FirmamentV2SideHoleIntent? SideHoleIntent => ModifyBlocks?.SelectMany(m => m.Regions.Select(r =>@@ -33,6 +33,11 @@ public sealed record ImportedStepTopologyMap(IReadOnlyDictionary<string, string>{public bool TryResolveFaceEntity(string entityRef, out string faceId) => FaceEntityToFaceId.TryGetValue(entityRef, out faceId!);}+public sealed record FirmamentV2RecognizedRegion(string BodyName, string RegionName, string Kind, IReadOnlyList<string> FaceRefs, string Confidence)+{+ public string TargetSource => $"{BodyName}.region(\"{RegionName}\")";+}+public sealed record FirmamentV2ImportedStepFaceTarget(string BodySymbol, string EntityRef){public string Source => $"{BodySymbol}.face(\"{EntityRef}\")";diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.csindex 00ecccd8..58b4743c 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs@@ -85,6 +85,13 @@ public static class FirmamentV2Parserpublic const string PmiImportedTargetNotFace = "firmament-pmi-imported-target-not-face";public const string PmiImportedTargetRequiresCanonicalStep = "firmament-pmi-imported-target-requires-canonical-step";public const string PmiInvalidImportedTarget = "firmament-pmi-invalid-imported-target";+ public const string UnknownRecognitionBody = "firmament-inline-step-unknown-recognition-body";+ public const string UnknownRecognitionFace = "firmament-inline-step-unknown-recognition-face";+ public const string DuplicateRegion = "firmament-inline-step-duplicate-region";+ public const string UnknownRecognitionRegion = "firmament-inline-step-unknown-recognition-region";+ public const string InvalidRecognitionKind = "firmament-inline-step-invalid-recognition-kind";+ public const string InvalidRecognitionConfidence = "firmament-inline-step-invalid-recognition-confidence";+ public const string PmiRecognizedRegionKindMismatch = "firmament-pmi-recognized-region-kind-mismatch";private static readonly Regex ModelRegex = new(@"\bmodel\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{", RegexOptions.CultureInvariant);private static readonly Regex UnitsRegex = new(@"\bunits\s+(?<units>[A-Za-z_][A-Za-z0-9_]*)\b", RegexOptions.CultureInvariant);@@ -103,10 +110,16 @@ public static class FirmamentV2Parserprivate static readonly Regex ThroughRegex = new(@"\bthrough\s*:\s*(?<target>face\([^)]*\)|[A-Za-z_][A-Za-z0-9_]*)", RegexOptions.CultureInvariant);private static readonly Regex CenterRegex = new(@"\bcenter\s*:\s*\[(?<values>[^\]]*)\]", RegexOptions.CultureInvariant | RegexOptions.Singleline);private static readonly Regex SemanticHoleHeaderRegex = new(@"\bhole\s*<\s*(?<variant>[A-Za-z_][A-Za-z0-9_]*)\s*>\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{", RegexOptions.CultureInvariant);+ private static readonly Regex RecognizeHeaderRegex = new(@"\brecognize\s+(?<body>[A-Za-z_][A-Za-z0-9_]*)\s*\{", RegexOptions.CultureInvariant);+ private static readonly Regex RecognitionRegionHeaderRegex = new(@"\bregion\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{", RegexOptions.CultureInvariant);+ private static readonly Regex KindRegex = new("\\bkind\\s*:\\s*(?<kind>\"[^\"]+\"|[A-Za-z_][A-Za-z0-9_]*(?:\\s*<\\s*[A-Za-z_][A-Za-z0-9_]*\\s*>)?)", RegexOptions.CultureInvariant);+ private static readonly Regex FacesRegex = new(@"\bfaces\s*:\s*\[(?<faces>[^\]]*)\]", RegexOptions.CultureInvariant | RegexOptions.Singleline);+ private static readonly Regex ConfidenceRegex = new(@"\bconfidence\s*:\s*(?<confidence>[A-Za-z_][A-Za-z0-9_]*)", RegexOptions.CultureInvariant);private static readonly Regex PmiHeaderRegex = new(@"\bpmi\s*\{", RegexOptions.CultureInvariant);private static readonly Regex PmiEntryHeaderRegex = new(@"\b(?<kind>[A-Za-z_][A-Za-z0-9_]*)\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{", RegexOptions.CultureInvariant);- private static readonly Regex TargetRegex = new("\\btarget\\s*:\\s*(?<target>[A-Za-z_][A-Za-z0-9_]*\\.face\\(\\\"#[0-9]+\\\"\\)|[A-Za-z_][A-Za-z0-9_]*\\.[A-Za-z_][A-Za-z0-9_]*\\([^)]*\\)|face\\([^)]+\\)|[A-Za-z_][A-Za-z0-9_]*)", RegexOptions.CultureInvariant);+ private static readonly Regex TargetRegex = new(@"\btarget\s*:\s*(?<target>[A-Za-z_][A-Za-z0-9_]*\.(?:face|region)\(""[#A-Za-z0-9_]+""\)|[A-Za-z_][A-Za-z0-9_]*\.[A-Za-z_][A-Za-z0-9_]*\([^)]*\)|face\([^)]+\)|[A-Za-z_][A-Za-z0-9_]*)", RegexOptions.CultureInvariant);private static readonly Regex ImportedFaceTargetRegex = new("^(?<body>[A-Za-z_][A-Za-z0-9_]*)\\.face\\(\\\"(?<entity>#[0-9]+)\\\"\\)$", RegexOptions.CultureInvariant);+ private static readonly Regex RecognizedRegionTargetRegex = new("^(?<body>[A-Za-z_][A-Za-z0-9_]*)\\.region\\(\\\"(?<region>[A-Za-z_][A-Za-z0-9_]*)\\\"\\)$", RegexOptions.CultureInvariant);private static readonly Regex ValueRegex = new(@"\b(?:value|diameter)\s*:\s*(?<value>[^\s}]+)", RegexOptions.CultureInvariant);private static readonly Regex TemplateHeaderRegex = new(@"\btemplate\s*<\s*(?<process>[A-Za-z_][A-Za-z0-9_]*)\s*>\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{", RegexOptions.CultureInvariant);private static readonly Regex ConceptRegex = new(@"\bconcept\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*:\s*(?<value>[-+0-9.eE]+)\s*(?<unit>[A-Za-z_][A-Za-z0-9_]*)?", RegexOptions.CultureInvariant);@@ -159,11 +172,12 @@ public static class FirmamentV2Parservar modifyBlocks = ParseModifyBlocks(source, byName, diagnostics);var templates = ParseTemplates(source, diagnostics);- var pmi = ParsePmi(source, byName, modifyBlocks, diagnostics);+ var recognizedRegions = ParseRecognizedRegions(source, byName, diagnostics);+ var pmi = ParsePmi(source, byName, modifyBlocks, recognizedRegions, diagnostics);FirmamentV2Document? document = null;if (modelMatch.Success && unitsMatch.Success && solids.Count > 0 && !diagnostics.Any(IsFatalDiagnostic))- document = new FirmamentV2Document(modelMatch.Groups["name"].Value, unitsMatch.Groups["units"].Value, solids, modifyBlocks, templates, pmi);+ document = new FirmamentV2Document(modelMatch.Groups["name"].Value, unitsMatch.Groups["units"].Value, solids, modifyBlocks, templates, pmi, recognizedRegions);diagnostics.Add(document is null ? "firmament-v2-parse-failed" : "firmament-v2-parse-succeeded");diagnostics.Sort(StringComparer.Ordinal);@@ -277,7 +291,7 @@ public static class FirmamentV2Parserreturn new(name, "Box", new FirmamentV2BoxRecord(values, []), baseName, new Dictionary<string, IReadOnlyList<double>>(StringComparer.Ordinal) { ["size"] = values });}- private static bool IsFatalDiagnostic(string code) => code is PrimitiveFieldMissing or PrimitiveFieldUnknown or PrimitiveFieldInvalid or MissingModel or MissingUnits or MissingSolid or UnsupportedConstruct or UnknownRecordType or BoxMissingSize or BoxSizeArity or DegenerateDimension or NameUnresolved or DuplicateName or WithRequiresRecord or WithRequiresBoxRecord or WithFieldNotFound or WithFieldTypeMismatch or WithForwardReference or WithDerivedRecordInvalid or ExposeBlockUnsupported or ExposeRequiresBoxRecord or ExposeAliasDuplicate or ExposeAliasInvalid or SelectorUnsupported or SelectorAxisInvalid or SelectorSubselectorUnsupported or FatArrowOutsideExpose or RawBackendIdReferenceForbidden or ModifyTargetUnresolved or ModifyTargetNotSolid or RegionUnsupported or RegionAttachmentSelectorUnsupported or CutUnsupported or CutToolUnsupported or CylinderRadiusMissing or CylinderRadiusInvalid or CylinderRadiusNotFinite or ThroughSelectorUnsupported or AliasUnresolved or AliasRefTypeUnsupported or SideHoleAliasMustResolveToFace or SideHoleAliasResolvesToUnsupportedFace or SideHoleOnlyPlusXMinusXSupported or SideHoleRouteUnsupported or SideHoleSameFaceUnsupported or SideHoleAxisNotYetSupported or SideHoleRadiusExceedsClearance or CylinderCenterInvalid or CylinderCenterArityInvalid or CylinderCenterNotFinite or SideHoleCenterExceedsClearance or HoleVariantUnknown or HoleEntryFaceMissing or HoleCenterMissing or HoleShaftMissing or HoleEndMissing or HoleDiameterInvalid or HoleDepthInvalid or HoleCounterboreInvalid or HoleCountersinkInvalid or PmiKindUnknown or PmiTargetMissing or PmiTargetUnresolved or PmiDiameterInvalid or PmiDuplicateName or InlineStepUnknownBody or InlineStepUnknownFace or PmiImportedTargetNotFace or PmiImportedTargetRequiresCanonicalStep or PmiInvalidImportedTarget or InlineStepPathMissing or InlineStepPathInvalid or InlineStepFileMissing or InlineStepRequiresCanonical;+ private static bool IsFatalDiagnostic(string code) => code is PrimitiveFieldMissing or PrimitiveFieldUnknown or PrimitiveFieldInvalid or MissingModel or MissingUnits or MissingSolid or UnsupportedConstruct or UnknownRecordType or BoxMissingSize or BoxSizeArity or DegenerateDimension or NameUnresolved or DuplicateName or WithRequiresRecord or WithRequiresBoxRecord or WithFieldNotFound or WithFieldTypeMismatch or WithForwardReference or WithDerivedRecordInvalid or ExposeBlockUnsupported or ExposeRequiresBoxRecord or ExposeAliasDuplicate or ExposeAliasInvalid or SelectorUnsupported or SelectorAxisInvalid or SelectorSubselectorUnsupported or FatArrowOutsideExpose or RawBackendIdReferenceForbidden or ModifyTargetUnresolved or ModifyTargetNotSolid or RegionUnsupported or RegionAttachmentSelectorUnsupported or CutUnsupported or CutToolUnsupported or CylinderRadiusMissing or CylinderRadiusInvalid or CylinderRadiusNotFinite or ThroughSelectorUnsupported or AliasUnresolved or AliasRefTypeUnsupported or SideHoleAliasMustResolveToFace or SideHoleAliasResolvesToUnsupportedFace or SideHoleOnlyPlusXMinusXSupported or SideHoleRouteUnsupported or SideHoleSameFaceUnsupported or SideHoleAxisNotYetSupported or SideHoleRadiusExceedsClearance or CylinderCenterInvalid or CylinderCenterArityInvalid or CylinderCenterNotFinite or SideHoleCenterExceedsClearance or HoleVariantUnknown or HoleEntryFaceMissing or HoleCenterMissing or HoleShaftMissing or HoleEndMissing or HoleDiameterInvalid or HoleDepthInvalid or HoleCounterboreInvalid or HoleCountersinkInvalid or PmiKindUnknown or PmiTargetMissing or PmiTargetUnresolved or PmiDiameterInvalid or PmiDuplicateName or InlineStepUnknownBody or InlineStepUnknownFace or PmiImportedTargetNotFace or PmiImportedTargetRequiresCanonicalStep or PmiInvalidImportedTarget or InlineStepPathMissing or InlineStepPathInvalid or InlineStepFileMissing or InlineStepRequiresCanonical or UnknownRecognitionBody or UnknownRecognitionFace or DuplicateRegion or UnknownRecognitionRegion or InvalidRecognitionKind or InvalidRecognitionConfidence or PmiRecognizedRegionKindMismatch;private static IReadOnlyList<FirmamentV2Exposure> ParseExposures(string body, List<string> diagnostics){@@ -566,7 +580,55 @@ public static class FirmamentV2Parserreturn templates;}- private static IReadOnlyList<FirmamentV2PmiDecl> ParsePmi(string source, Dictionary<string, FirmamentV2SolidBinding> solids, IReadOnlyList<FirmamentV2ModifyBlock> modifyBlocks, List<string> diagnostics)++ private static IReadOnlyList<FirmamentV2RecognizedRegion> ParseRecognizedRegions(string source, Dictionary<string, FirmamentV2SolidBinding> solids, List<string> diagnostics)+ {+ var result = new List<FirmamentV2RecognizedRegion>();+ var seen = new HashSet<string>(StringComparer.Ordinal);+ foreach (Match rm in RecognizeHeaderRegex.Matches(source))+ {+ var bodyName = rm.Groups["body"].Value;+ if (!solids.TryGetValue(bodyName, out var solid) || solid.InlineStep is null)+ {+ diagnostics.Add(UnknownRecognitionBody);+ continue;+ }+ var open = source.IndexOf('{', rm.Index);+ var close = FindMatchingBrace(source, open);+ if (close < 0) { diagnostics.Add(UnsupportedConstruct); continue; }+ var block = source[(open + 1)..close];+ foreach (Match rr in RecognitionRegionHeaderRegex.Matches(block))+ {+ var regionName = rr.Groups["name"].Value;+ if (!seen.Add($"{bodyName}.{regionName}")) { diagnostics.Add(DuplicateRegion); continue; }+ var regionOpen = block.IndexOf('{', rr.Index);+ var regionClose = FindMatchingBrace(block, regionOpen);+ if (regionClose < 0) { diagnostics.Add(UnsupportedConstruct); continue; }+ var rb = block[(regionOpen + 1)..regionClose];+ var kindMatch = KindRegex.Match(rb);+ var kind = kindMatch.Success ? NormalizeRecognitionKind(kindMatch.Groups["kind"].Value) : string.Empty;+ if (kind is not ("datumPlane" or "holeShaft")) { diagnostics.Add(InvalidRecognitionKind); continue; }+ var confidenceMatch = ConfidenceRegex.Match(rb);+ var confidence = confidenceMatch.Success ? confidenceMatch.Groups["confidence"].Value : "medium";+ if (confidence is not ("low" or "medium" or "high" or "certain")) { diagnostics.Add(InvalidRecognitionConfidence); continue; }+ var facesMatch = FacesRegex.Match(rb);+ var faces = facesMatch.Success+ ? Regex.Matches(facesMatch.Groups["faces"].Value, "\\\"(?<face>#[0-9]+)\\\"", RegexOptions.CultureInvariant).Select(m => m.Groups["face"].Value).ToArray()+ : [];+ if (faces.Length == 0 || faces.Any(f => !solid.InlineStep.TopologyMap.TryResolveFaceEntity(f, out _))) { diagnostics.Add(UnknownRecognitionFace); continue; }+ result.Add(new FirmamentV2RecognizedRegion(bodyName, regionName, kind, faces, confidence));+ }+ }+ return result;+ }++ private static string NormalizeRecognitionKind(string raw)+ {+ raw = raw.Trim().Trim('"').Replace(" ", string.Empty, StringComparison.Ordinal);+ return string.Equals(raw, "hole<shaft>", StringComparison.Ordinal) ? "holeShaft" : raw;+ }++ private static IReadOnlyList<FirmamentV2PmiDecl> ParsePmi(string source, Dictionary<string, FirmamentV2SolidBinding> solids, IReadOnlyList<FirmamentV2ModifyBlock> modifyBlocks, IReadOnlyList<FirmamentV2RecognizedRegion> recognizedRegions, List<string> diagnostics){var match = PmiHeaderRegex.Match(source);if (!match.Success) return [];@@ -577,6 +639,7 @@ public static class FirmamentV2Parservar entries = new List<FirmamentV2PmiDecl>();var names = new HashSet<string>(StringComparer.Ordinal);var holeNames = modifyBlocks.SelectMany(m => m.SemanticHoles).Select(h => h.Name).ToHashSet(StringComparer.Ordinal);+ var regionByTarget = recognizedRegions.ToDictionary(r => r.TargetSource, r => r, StringComparer.Ordinal);var aliases = solids.Values.SelectMany(s => s.Box?.Exposures ?? []).Select(e => e.Alias).ToHashSet(StringComparer.Ordinal);foreach (Match em in PmiEntryHeaderRegex.Matches(body)){@@ -599,6 +662,13 @@ public static class FirmamentV2Parserentries.Add(new FirmamentV2PmiDecl(name, FirmamentV2PmiKind.HoleDiameter, target, value));continue;}+ if (RecognizedRegionTargetRegex.IsMatch(target))+ {+ if (!regionByTarget.TryGetValue(target, out var region)) { diagnostics.Add(UnknownRecognitionRegion); continue; }+ if (region.Kind != "holeShaft") { diagnostics.Add(PmiRecognizedRegionKindMismatch); continue; }+ entries.Add(new FirmamentV2PmiDecl(name, FirmamentV2PmiKind.HoleDiameter, target, value));+ continue;+ }if (!holeNames.Contains(target)) { diagnostics.Add(PmiTargetUnresolved); continue; }entries.Add(new FirmamentV2PmiDecl(name, FirmamentV2PmiKind.HoleDiameter, target, value));}@@ -609,6 +679,13 @@ public static class FirmamentV2Parserentries.Add(new FirmamentV2PmiDecl(name, FirmamentV2PmiKind.DatumPlane, target));continue;}+ if (RecognizedRegionTargetRegex.IsMatch(target))+ {+ if (!regionByTarget.TryGetValue(target, out var region)) { diagnostics.Add(UnknownRecognitionRegion); continue; }+ if (region.Kind != "datumPlane") { diagnostics.Add(PmiRecognizedRegionKindMismatch); continue; }+ entries.Add(new FirmamentV2PmiDecl(name, FirmamentV2PmiKind.DatumPlane, target));+ continue;+ }if (!aliases.Contains(target) && !FaceSelectorRegex.IsMatch(target)) { diagnostics.Add(PmiTargetUnresolved); continue; }entries.Add(new FirmamentV2PmiDecl(name, FirmamentV2PmiKind.DatumPlane, target));}@@ -622,7 +699,7 @@ public static class FirmamentV2Parserprivate static bool TryValidateImportedFaceTarget(string target, Dictionary<string, FirmamentV2SolidBinding> solids, List<string> diagnostics){- if (target.Contains('.', StringComparison.Ordinal) && !ImportedFaceTargetRegex.IsMatch(target))+ if (target.Contains(".face(", StringComparison.Ordinal) && !ImportedFaceTargetRegex.IsMatch(target)){diagnostics.Add(PmiInvalidImportedTarget);return false;diff --git a/docs/implementation/inline-step-x3-recognition-labels.md b/docs/implementation/inline-step-x3-recognition-labels.mdnew file mode 100644index 00000000..6dfbc415--- /dev/null+++ b/docs/implementation/inline-step-x3-recognition-labels.md@@ -0,0 +1,42 @@+# INLINE-STEP-X3 recognition labels++INLINE-STEP-X3 adds metadata-only recognition labels under a canonical inline STEP body. A label says that imported faces probably represent a semantic candidate region; it does not replace geometry, suppress regions, compute residual bodies, or perform automatic recognition.++## Syntax++```firmament+recognize importedPart {+ region topFace {+ kind: datumPlane+ faces: ["#40"]+ confidence: high+ }++ region mountHole {+ kind: holeShaft+ faces: ["#191"]+ confidence: high+ }+}+```++PMI can target labels with `importedPart.region("name")`.++## Supported scope++- Canonical Aetheris AP242 inline STEP only; arbitrary vendor STEP remains rejected.+- Face-only topology references through the existing imported `ADVANCED_FACE` entity map.+- Recognition kinds: `datumPlane` and `holeShaft` (`hole<shaft>` normalizes to `holeShaft`).+- Confidence values: `low`, `medium`, `high`, `certain`; omitted confidence defaults to `medium`.+- Datum PMI accepts `datumPlane`; diameter PMI accepts `holeShaft`.++## Fixtures and AP242 evidence++- `fixtures/FirmamentV2/InlineStep/valid/inline-step-v2-recognized-face-datum-pmi-emits-in-step.valid.firmfixture` checks semantic datum evidence such as `SHAPE_ASPECT('firmament-datum:A')` and `PROPERTY_DEFINITION('datum:A:importedPart')`.+- `fixtures/FirmamentV2/InlineStep/valid/inline-step-v2-recognized-hole-diameter-pmi-emits-in-step.valid.firmfixture` checks semantic diameter evidence such as `SHAPE_DIMENSION_REPRESENTATION('diameter:importedPart.mountHoleDiameter')` and `PROPERTY_DEFINITION('diameter:importedPart.mountHoleDiameter')`.++No graphical PMI markers, leader lines, drawing views, or annotation layout are required.++## Deferred++Automatic recognition, semantic replacement, residual accounting, edge/vertex regions, robust geometric signatures, hybrid body emission, arbitrary vendor STEP references, and graphical PMI remain deferred.diff --git a/fixtures/FirmamentV2/InlineStep/valid/inline-step-v2-recognized-face-datum-pmi-emits-in-step.valid.firmfixture b/fixtures/FirmamentV2/InlineStep/valid/inline-step-v2-recognized-face-datum-pmi-emits-in-step.valid.firmfixturenew file mode 100644index 00000000..9e26f6d4--- /dev/null+++ b/fixtures/FirmamentV2/InlineStep/valid/inline-step-v2-recognized-face-datum-pmi-emits-in-step.valid.firmfixture@@ -0,0 +1,43 @@+// fixture-id: inline-step-v2-recognized-face-datum-pmi-emits-in-step+// case: inline-step-v2-recognized-face-datum-pmi-emits-in-step+// category: InlineStep+// syntax-version: FirmamentV2+// validity: valid+// implementation: parser-backed+// expected: valid+// tier: inline-step+// expected-stage: step-verified+// current-stage: step-verified+// feature-area: inline-step-recognition-labels+// build-command: aetheris build+// roundtrip-required: true+// expected-volume: 480+// expected-topology: faces=6, vertices=8, edges=12+// canonical-input-required: true+// recognized-region-required: true+// semantic-pmi-required: true+// graphical-pmi-required: false+// input-step: ../testdata/canonical-box-10x8x6.step+// semantic-pmi-evidence: SHAPE_ASPECT('firmament-datum:A'), PROPERTY_DEFINITION('datum:A:importedPart')+// notes: INLINE-STEP-X3 labels imported face #40 as topFace datumPlane metadata and routes datum PMI through Step242Exporter; no graphical PMI or geometry replacement.+model InlineStepRecognizedFaceDatumPmi {+ units mm++ solid importedPart: InlineStep {+ path: "../testdata/canonical-box-10x8x6.step"+ }++ recognize importedPart {+ region topFace {+ kind: datumPlane+ faces: ["#40"]+ confidence: high+ }+ }++ pmi {+ datum A {+ target: importedPart.region("topFace")+ }+ }+}diff --git a/fixtures/FirmamentV2/InlineStep/valid/inline-step-v2-recognized-hole-diameter-pmi-emits-in-step.valid.firmfixture b/fixtures/FirmamentV2/InlineStep/valid/inline-step-v2-recognized-hole-diameter-pmi-emits-in-step.valid.firmfixturenew file mode 100644index 00000000..09b47778--- /dev/null+++ b/fixtures/FirmamentV2/InlineStep/valid/inline-step-v2-recognized-hole-diameter-pmi-emits-in-step.valid.firmfixture@@ -0,0 +1,44 @@+// fixture-id: inline-step-v2-recognized-hole-diameter-pmi-emits-in-step+// case: inline-step-v2-recognized-hole-diameter-pmi-emits-in-step+// category: InlineStep+// syntax-version: FirmamentV2+// validity: valid+// implementation: parser-backed+// expected: valid+// tier: inline-step+// expected-stage: step-verified+// current-stage: step-verified+// feature-area: inline-step-recognition-labels+// build-command: aetheris build+// roundtrip-required: true+// expected-volume: 461.15044407846124+// expected-topology: faces=7+// canonical-input-required: true+// recognized-region-required: true+// semantic-pmi-required: true+// graphical-pmi-required: false+// input-step: ../testdata/canonical-through-hole.step+// semantic-pmi-evidence: SHAPE_DIMENSION_REPRESENTATION('diameter:importedPart.mountHoleDiameter'), PROPERTY_DEFINITION('diameter:importedPart.mountHoleDiameter')+// notes: INLINE-STEP-X3 labels imported cylindrical face #191 as mountHole holeShaft metadata and routes diameter PMI through Step242Exporter; no graphical PMI or geometry replacement.+model InlineStepRecognizedHoleDiameterPmi {+ units mm++ solid importedPart: InlineStep {+ path: "../testdata/canonical-through-hole.step"+ }++ recognize importedPart {+ region mountHole {+ kind: holeShaft+ faces: ["#191"]+ confidence: high+ }+ }++ pmi {+ diameter mountHoleDiameter {+ target: importedPart.region("mountHole")+ value: 2mm+ }+ }+}