Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Support projected PMI from static semantic constraints
Yuechen Li736a8e69b013
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentV2ParserTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentV2ParserTests.csindex 4a6a9099..b8ec0312 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentV2ParserTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentV2ParserTests.cs@@ -963,6 +963,36 @@ model:Assert.Contains(build.Diagnostics, d => d.Message.Contains("firmament-v2-pmi-export-deferred", StringComparison.Ordinal));}+ [Fact]+ public void FirmamentV2Parser_StaticFactFlowsThroughHoleRequireAndProjectedPmi()+ {+ var result = FirmamentV2Parser.Parse(Source("Canonical/valid/pmi-projected-hole-diameter-asymmetric-tolerance.firmament"));+ Assert.True(result.IsSuccess, string.Join(", ", result.Diagnostics));+ var document = Assert.IsType<FirmamentV2Document>(result.Document);+ var constraint = Assert.Single(document.StaticAuthoring!.SemanticConstraints!);+ Assert.True(constraint.ValidationSucceeded);+ Assert.Equal("Mount", constraint.Subject);+ Assert.Equal("MountSpecs[0].Diameter", constraint.ExpectedProvenance);+ var pmi = Assert.Single(document.PmiBlock!.Records);+ Assert.Equal("MountDiameterConstraint", pmi.Projection!.SourceRequireId);+ Assert.Equal(8d, Assert.Single(document.BoundPmi!.Dimensions).DimensionValue!.NumericValue);+ }++ [Fact]+ public void FirmamentV2Parser_ManualAndProjectedHoleDiameterHaveEquivalentPmiSemantics()+ {+ var result = FirmamentV2Parser.Parse(Source("Canonical/valid/pmi-manual-vs-projected-equivalence.firmament"));+ Assert.True(result.IsSuccess, string.Join(", ", result.Diagnostics));+ var dimensions = result.Document!.BoundPmi!.Dimensions.OrderBy(record => record.Name, StringComparer.Ordinal).ToArray();+ var manual = Assert.Single(dimensions, record => record.Name == "ManualCallout");+ var projected = Assert.Single(dimensions, record => record.Name == "ProjectedCallout");+ Assert.Equal(manual.Kind, projected.Kind);+ Assert.Equal(manual.DimensionValue!.NumericValue, projected.DimensionValue!.NumericValue);+ Assert.Equal(manual.DimensionTolerance, projected.DimensionTolerance);+ Assert.Equal(manual.DatumRefs, projected.DatumRefs);+ Assert.Equal("ProjectedDiameter", projected.ProjectionSource);+ }+private static string Source(string relative){var path = FixturePath(relative);diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/CanonicalStaticAuthoring.cs b/Aetheris.Kernel.Firmament/FirmamentV2/CanonicalStaticAuthoring.csindex 906fb15f..04d8eb2e 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/CanonicalStaticAuthoring.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/CanonicalStaticAuthoring.cs@@ -15,7 +15,7 @@ internal static class CanonicalStaticAuthoring{var canonicalRoot = Regex.IsMatch(source, @"^\s*Model\s+[A-Za-z_]\w*\s*\{", RegexOptions.CultureInvariant);var staticDeclaration = Regex.IsMatch(source, @"\b(?:Record|Static|Template\s+[A-Za-z_]\w*\s*\(|Pattern\s+\w+\s+Over)\b", RegexOptions.CultureInvariant);- if (!staticDeclaration && !(canonicalRoot && Regex.IsMatch(source, @"\bRequire\s+[A-Za-z_]\w*\s*=>", RegexOptions.CultureInvariant))) return new(source, null);+ if (!staticDeclaration && !(canonicalRoot && Regex.IsMatch(source, @"\b(?:Require\s+[A-Za-z_]\w*\s*(?:=>|\{)|Pmi\s*\{[\s\S]*?\bFrom\s*:)", RegexOptions.CultureInvariant))) return new(source, null);var changes = new List<(int Start, int Length, string Text)>();var names = new HashSet<string>(StringComparer.Ordinal);var recordTypes = new List<FirmamentV2RecordTypeDecl>();@@ -126,9 +126,36 @@ internal static class CanonicalStaticAuthoringif (!value) diagnostics.Add(Prefix + "require-failed:" + require.Groups["name"].Value + ":" + expression);changes.Add((require.Index, require.Length, string.Empty));}+ var semanticConstraints = new List<FirmamentV2SemanticConstraint>();+ foreach (Match header in Regex.Matches(source, @"\bRequire\s+(?<name>[A-Za-z_]\w*)\s*\{", RegexOptions.CultureInvariant))+ {+ var open = source.IndexOf('{', header.Index); var close = MatchPair(source, open, '{', '}');+ if (close < 0) { diagnostics.Add(FirmamentV2Parser.SemanticConstraintMalformed); continue; }+ var fields = RequireFields(source[(open + 1)..close]);+ if (!fields.TryGetValue("Actual", out var actual) || !fields.TryGetValue("Expected", out var expected))+ { diagnostics.Add(FirmamentV2Parser.SemanticConstraintMalformed); continue; }+ if (!TrySubject(actual, out var subject, out var property) || !TryLength(ResolveStaticValue(source, expected), out var nominal))+ { diagnostics.Add(FirmamentV2Parser.SemanticConstraintUnsupported); continue; }+ FirmamentV2Tolerance? tolerance = null;+ if (fields.TryGetValue("Tolerance", out var toleranceSource) && !TryTolerance(ResolveStaticValue(source, toleranceSource), out tolerance))+ { diagnostics.Add(FirmamentV2Parser.SemanticConstraintDimensionMismatch); continue; }+ var name = header.Groups["name"].Value;+ var span = new FirmamentV2SourceSpan(header.Index, close - header.Index + 1);+ requires.Add(new(name, $"{actual} == {expected}", true, span, "semantic-constraint", actual, expected, fields.GetValueOrDefault("Tolerance")));+ semanticConstraints.Add(new(name, subject, property, nominal, tolerance, false, span, expected));+ changes.Add((header.Index, close - header.Index + 1, string.Empty));+ }+ var projections = RewriteProjectedPmi(source, semanticConstraints, changes, diagnostics);if (diagnostics.Any(d => d.StartsWith(Prefix, StringComparison.Ordinal) || d.StartsWith(FirmamentV2Parser.DuplicateName, StringComparison.Ordinal))) return null;- foreach (var change in changes.OrderByDescending(x => x.Start)) source = source.Remove(change.Start, change.Length).Insert(change.Start, change.Text);- return new(source, new(recordTypes, arrays, templates.Select(t => new FirmamentV2CanonicalTemplateDecl(t.Name, t.Type, t.Parameter, t.Body, t.Span)).ToArray(), patterns, requires));+ // A static declaration / Require is erased as a whole. Do not also apply a+ // substitution nested inside that erased span: applying the nested edit first+ // changes the parent span's offsets and corrupts the following declaration.+ var erasures = changes.Where(change => change.Text.Length == 0).ToArray();+ foreach (var change in changes+ .Where(change => !erasures.Any(erase => erase.Start < change.Start && change.Start < erase.Start + erase.Length))+ .OrderByDescending(change => change.Start))+ source = source.Remove(change.Start, change.Length).Insert(change.Start, change.Text);+ return new(source, new(recordTypes, arrays, templates.Select(t => new FirmamentV2CanonicalTemplateDecl(t.Name, t.Type, t.Parameter, t.Body, t.Span)).ToArray(), patterns, requires, semanticConstraints, projections));}private static string? Instantiate(Template template, IReadOnlyDictionary<string, string> values, string id, bool patterned, List<string> diagnostics)@@ -150,8 +177,53 @@ internal static class CanonicalStaticAuthoring: id.Replace("[", "_", StringComparison.Ordinal).Replace("]", string.Empty, StringComparison.Ordinal);return $"{kind} {outputName}{declaration.Groups["tail"].Value} {{{body}}}";}- private static Dictionary<string, string> Fields(string body) => Regex.Matches(body, @"\b(?<name>[A-Za-z_]\w*)\s*:\s*(?<value>(?:Point2|Vector2)\s*\([^)]*\)|[-+]?\d+(?:\.\d+)?(?:mm|deg)?)", RegexOptions.CultureInvariant)+ private static Dictionary<string, string> Fields(string body) => Regex.Matches(body, @"\b(?<name>[A-Za-z_]\w*)\s*:\s*(?<value>(?:Point2|Vector2|PlusMinus)\s*\([^)]*\)|[-+]?\d+(?:\.\d+)?(?:mm|deg)?)", RegexOptions.CultureInvariant).Cast<Match>().ToDictionary(m => m.Groups["name"].Value, m => m.Groups["value"].Value, StringComparer.Ordinal);+ private static Dictionary<string, string> RequireFields(string body) => Regex.Matches(body, @"(?<name>[A-Za-z_]\w*)\s*:\s*(?<value>.*?)(?=\s+[A-Za-z_]\w*\s*:|$)", RegexOptions.CultureInvariant | RegexOptions.Singleline)+ .Cast<Match>().ToDictionary(m => m.Groups["name"].Value, m => m.Groups["value"].Value.Trim(), StringComparer.Ordinal);+ private static bool TrySubject(string text, out string subject, out string property)+ { var m = Regex.Match(text.Trim(), @"^(?<subject>[A-Za-z_]\w*)\.(?<property>Diameter)$", RegexOptions.CultureInvariant); subject = m.Groups["subject"].Value; property = m.Groups["property"].Value; return m.Success; }+ private static bool TryLength(string text, out FirmamentV2LiteralValue value)+ { var m = Regex.Match(text.Trim(), @"^(?<n>[-+]?\d+(?:\.\d+)?)mm$", RegexOptions.CultureInvariant); value = new(FirmamentV2PrimitiveType.Length, 0d); if (!m.Success || !double.TryParse(m.Groups["n"].Value, NumberStyles.Float, CultureInfo.InvariantCulture, out var n) || n <= 0d) return false; value = new(FirmamentV2PrimitiveType.Length, n, n, "mm", text); return true; }+ private static bool TryTolerance(string text, out FirmamentV2Tolerance? tolerance)+ { var m = Regex.Match(text.Trim(), @"^PlusMinus\(\s*(?<p>[-+]?\d+(?:\.\d+)?)mm\s*,\s*(?<m>[-+]?\d+(?:\.\d+)?)mm\s*\)$", RegexOptions.CultureInvariant); tolerance = null; if (!m.Success || !double.TryParse(m.Groups["p"].Value, CultureInfo.InvariantCulture, out var plus) || !double.TryParse(m.Groups["m"].Value, CultureInfo.InvariantCulture, out var minus) || plus < 0 || minus < 0) return false; tolerance = new(FirmamentV2ToleranceKind.Asymmetric, plus, minus, "mm", FirmamentV2PrimitiveType.Length, new(0, text.Length)); return true; }+ private static string ResolveStaticValue(string source, string expression)+ {+ var array = Regex.Match(expression.Trim(), @"^(?<array>[A-Za-z_]\w*)\s*\[\s*0\s*\]\s*\.\s*(?<field>[A-Za-z_]\w*)$", RegexOptions.CultureInvariant);+ if (array.Success)+ {+ var staticMatch = Regex.Match(source, $@"\bStatic\s+{Regex.Escape(array.Groups["array"].Value)}\s*:\s*[A-Za-z_]\w*\[\]\s*=\s*\[\s*[A-Za-z_]\w*\s*\{{(?<body>[\s\S]*?)\}}", RegexOptions.CultureInvariant);+ var field = staticMatch.Success ? Fields(staticMatch.Groups["body"].Value).GetValueOrDefault(array.Groups["field"].Value) : null;+ return field ?? expression.Trim();+ }+ var dotted = Regex.Match(expression.Trim(), @"^(?<record>[A-Za-z_]\w*)\.(?<field>[A-Za-z_]\w*)$", RegexOptions.CultureInvariant); if (!dotted.Success) return expression.Trim(); var record = Regex.Match(source, $@"\blet\s+{Regex.Escape(dotted.Groups["record"].Value)}\s*\{{(?<body>[\s\S]*?)\}}", RegexOptions.CultureInvariant); if (!record.Success) return expression.Trim(); var directField = Regex.Match(record.Groups["body"].Value, $@"(?m)^\s*{Regex.Escape(dotted.Groups["field"].Value)}\s*:\s*[A-Za-z_]\w*\s*=\s*(?<value>[^\r\n]+)", RegexOptions.CultureInvariant); return directField.Success ? directField.Groups["value"].Value.Trim() : expression.Trim(); }+ private static IReadOnlyDictionary<string, FirmamentV2PmiProjection> RewriteProjectedPmi(string source, IReadOnlyList<FirmamentV2SemanticConstraint> constraints, List<(int Start, int Length, string Text)> changes, List<string> diagnostics)+ {+ var result = new Dictionary<string, FirmamentV2PmiProjection>(StringComparer.Ordinal);+ foreach (Match pmi in Regex.Matches(source, @"\bPmi\s*\{", RegexOptions.CultureInvariant))+ {+ var outerOpen = source.IndexOf('{', pmi.Index); var outerClose = MatchPair(source, outerOpen, '{', '}'); if (outerClose < 0) continue;+ var body = source[(outerOpen + 1)..outerClose];+ foreach (Match entry in Regex.Matches(body, @"\b(?<kind>[A-Za-z_]\w*)\s+(?<name>[A-Za-z_]\w*)\s*\{", RegexOptions.CultureInvariant))+ {+ var entryOpen = outerOpen + 1 + body.IndexOf('{', entry.Index); var entryClose = MatchPair(source, entryOpen, '{', '}'); if (entryClose < 0) continue;+ var fields = RequireFields(source[(entryOpen + 1)..entryClose]);+ if (!fields.TryGetValue("From", out var from)) continue;+ if (!fields.TryGetValue("As", out var asKind) || !string.Equals(asKind, "HoleDiameter", StringComparison.Ordinal) || !string.Equals(entry.Groups["kind"].Value, "HoleDiameter", StringComparison.Ordinal)) { diagnostics.Add(FirmamentV2Parser.PmiProjectionUnsupportedKind); continue; }+ if (fields.Keys.Any(key => key is "Target" or "Value" or "Tolerance" or "Dimension" or "Diameter")) { diagnostics.Add(FirmamentV2Parser.PmiProjectedFieldMustNotOverrideSourceConstraint); continue; }+ var constraint = constraints.SingleOrDefault(c => string.Equals(c.Id, from, StringComparison.Ordinal));+ if (constraint is null) { diagnostics.Add(FirmamentV2Parser.PmiProjectionUnknownRequire); continue; }+ var value = constraint.NominalValue.NumericValue!.Value.ToString(CultureInfo.InvariantCulture) + "mm";+ var replacement = $"\n Target: {constraint.Subject}\n Value: {value}";+ if (constraint.Tolerance is { } tolerance) replacement += $"\n Tolerance: PlusMinus({tolerance.Plus.ToString(CultureInfo.InvariantCulture)}mm, {tolerance.Minus.ToString(CultureInfo.InvariantCulture)}mm)";+ if (fields.TryGetValue("DatumRefs", out var datum)) replacement += $"\n DatumRefs: {datum}";+ replacement += "\n ";+ changes.Add((entryOpen + 1, entryClose - entryOpen - 1, replacement));+ result[entry.Groups["name"].Value] = new(from, FirmamentV2PmiKind.HoleDiameter, new(entry.Index + outerOpen + 1, entry.Length));+ }+ }+ return result;+ }private static bool TryRequire(string expression, out bool value){value = false; var m = Regex.Match(expression, @"^(?<a>[-+]?\d+(?:\.\d+)?)(?<u>mm|deg)?\s*(?<op>>=|<=|==|>|<)\s*(?<b>[-+]?\d+(?:\.\d+)?)(?<v>mm|deg)?$", RegexOptions.CultureInvariant);diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.csindex d2af06d1..18010d20 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.cs@@ -200,10 +200,14 @@ public sealed record FirmamentV2SemanticHoleDecl(public enum FirmamentV2PmiKind { HoleDiameter, DatumPlane, Distance, Flatness, Parallel, Perpendicular, Coplanar }public sealed record FirmamentV2PmiDecl(string Name, FirmamentV2PmiKind Kind, string Target, double? Value = null);public sealed record FirmamentV2PmiBlock(IReadOnlyList<FirmamentV2PmiRecord> Records, FirmamentV2SourceSpan SourceSpan);-public sealed record FirmamentV2PmiRecord(FirmamentV2PmiKind Kind, string Name, IReadOnlyDictionary<string, FirmamentV2PmiField> Fields, FirmamentV2SourceSpan SourceSpan, FirmamentV2BoundPmiRecord? Bound = null);+public sealed record FirmamentV2PmiRecord(FirmamentV2PmiKind Kind, string Name, IReadOnlyDictionary<string, FirmamentV2PmiField> Fields, FirmamentV2SourceSpan SourceSpan, FirmamentV2BoundPmiRecord? Bound = null, FirmamentV2PmiProjection? Projection = null);public sealed record FirmamentV2PmiField(string Name, string Source, FirmamentV2SourceSpan SourceSpan, FirmamentV2ValueExpression? ValueExpression = null);public sealed record FirmamentV2BoundPmiBlock(IReadOnlyList<FirmamentV2BoundPmiRecord> Datums, IReadOnlyList<FirmamentV2BoundPmiRecord> Dimensions, IReadOnlyList<FirmamentV2BoundPmiRecord> Controls, IReadOnlyList<string> Diagnostics);-public sealed record FirmamentV2BoundPmiRecord(FirmamentV2PmiKind Kind, string Name, IReadOnlyList<string> Targets, FirmamentV2LiteralValue? DimensionValue, FirmamentV2Tolerance? DimensionTolerance, FirmamentV2LiteralValue? ControlTolerance, IReadOnlyList<string> DatumRefs, FirmamentV2SourceSpan SourceSpan);+public sealed record FirmamentV2BoundPmiRecord(FirmamentV2PmiKind Kind, string Name, IReadOnlyList<string> Targets, FirmamentV2LiteralValue? DimensionValue, FirmamentV2Tolerance? DimensionTolerance, FirmamentV2LiteralValue? ControlTolerance, IReadOnlyList<string> DatumRefs, FirmamentV2SourceSpan SourceSpan, string? ProjectionSource = null);+/// <summary>Reusable, validated dimensional intent. Only equality of a semantic feature property+/// to a length expectation is admitted in Preview 1.</summary>+public sealed record FirmamentV2SemanticConstraint(string Id, string Subject, string Property, FirmamentV2LiteralValue NominalValue, FirmamentV2Tolerance? Tolerance, bool ValidationSucceeded, FirmamentV2SourceSpan SourceSpan, string ExpectedProvenance);+public sealed record FirmamentV2PmiProjection(string SourceRequireId, FirmamentV2PmiKind AsKind, FirmamentV2SourceSpan SourceSpan);public sealed record FirmamentV2ConceptDecl(string Name, string RawValue, double NumericValue, string? Unit);public sealed record FirmamentV2TemplateDecl(string Process, string Name, IReadOnlyList<FirmamentV2ConceptDecl> Concepts);public sealed record FirmamentV2FillRegionDecl(string Name, IReadOnlyList<double> Size, IReadOnlyList<double> Center, FirmamentV2SourceSpan SourceSpan);@@ -213,12 +217,12 @@ public sealed record FirmamentV2ProfileDecl(string Name, string Frame, double Frpublic sealed record FirmamentV2ComposeDecl(string Name, IReadOnlyList<string> Operations, FirmamentV2SourceSpan SourceSpan);public sealed record FirmamentV2SelectionDecl(string Name, string Target, string Source, string Requirement, FirmamentV2SourceSpan SourceSpan);/// <summary>Normalized, erased-before-materialization evidence for canonical static authoring.</summary>-public sealed record FirmamentV2StaticAuthoringDocument(IReadOnlyList<FirmamentV2RecordTypeDecl> RecordTypes, IReadOnlyList<FirmamentV2StaticArrayDecl> Arrays, IReadOnlyList<FirmamentV2CanonicalTemplateDecl> Templates, IReadOnlyList<FirmamentV2CanonicalPatternDecl> Patterns, IReadOnlyList<FirmamentV2RequireDecl> Requires);+public sealed record FirmamentV2StaticAuthoringDocument(IReadOnlyList<FirmamentV2RecordTypeDecl> RecordTypes, IReadOnlyList<FirmamentV2StaticArrayDecl> Arrays, IReadOnlyList<FirmamentV2CanonicalTemplateDecl> Templates, IReadOnlyList<FirmamentV2CanonicalPatternDecl> Patterns, IReadOnlyList<FirmamentV2RequireDecl> Requires, IReadOnlyList<FirmamentV2SemanticConstraint>? SemanticConstraints = null, IReadOnlyDictionary<string, FirmamentV2PmiProjection>? PmiProjections = null);public sealed record FirmamentV2RecordTypeDecl(string Name, IReadOnlyDictionary<string, string> Fields, FirmamentV2SourceSpan SourceSpan);public sealed record FirmamentV2StaticArrayDecl(string Name, string ElementType, IReadOnlyList<IReadOnlyDictionary<string, string>> Elements, FirmamentV2SourceSpan SourceSpan);public sealed record FirmamentV2CanonicalTemplateDecl(string Name, string ParameterType, string ParameterName, string Body, FirmamentV2SourceSpan SourceSpan);public sealed record FirmamentV2CanonicalPatternDecl(string Name, string Source, string Template, int GeneratedCount, IReadOnlyList<string> GeneratedIds, FirmamentV2SourceSpan SourceSpan);-public sealed record FirmamentV2RequireDecl(string Name, string Expression, bool Value, FirmamentV2SourceSpan SourceSpan, string? Provenance = null);+public sealed record FirmamentV2RequireDecl(string Name, string Expression, bool Value, FirmamentV2SourceSpan SourceSpan, string? Provenance = null, string? Subject = null, string? Expected = null, string? ToleranceSource = null);public sealed record FirmamentV2LatticeFillDecl(string Name, string Host, FirmamentV2FillRegionDecl Region, string Pattern, double CellSize, double StrutRadius, string BoundaryPolicy, FirmamentV2SourceSpan SourceSpan);/// <summary>M9R's admitted standalone material body. It is intentionally distinct from the deferred host-replacement Fill.</summary>public sealed record FirmamentV2StandaloneLatticeFillDecl(string Name, FirmamentV2FillRegionDecl Region, string Pattern, int CellsX, int CellsY, int CellsZ, double CellSize, double StrutRadius, double NodeRadius, string Placement, FirmamentV2SourceSpan SourceSpan);diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.csindex 104b3025..d9e03795 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs@@ -124,6 +124,13 @@ public static class FirmamentV2Parserpublic const string ToleranceMissingPlus = "firmament-v2-tolerance-missing-plus";public const string ToleranceDroppedThroughArithmetic = "firmament-v2-tolerance-dropped-through-arithmetic";public const string ToleranceUnsupported = "firmament-v2-tolerance-unsupported";+ public const string SemanticConstraintMalformed = "firmament-v2-semantic-constraint-malformed";+ public const string SemanticConstraintUnsupported = "firmament-v2-semantic-constraint-unsupported";+ public const string SemanticConstraintDimensionMismatch = "firmament-v2-semantic-constraint-dimension-mismatch";+ public const string SemanticConstraintValidationFailed = "firmament-v2-semantic-constraint-validation-failed";+ public const string PmiProjectionUnknownRequire = "firmament-v2-pmi-projection-unknown-require";+ public const string PmiProjectionUnsupportedKind = "firmament-v2-pmi-projection-unsupported-kind";+ public const string PmiProjectedFieldMustNotOverrideSourceConstraint = "firmament-v2-pmi-projected-field-must-not-override-source-constraint";public const string ModifyTargetUnresolved = "firmament-v2-modify-target-unresolved";public const string ModifyTargetNotSolid = "firmament-v2-modify-target-not-solid";@@ -1146,6 +1153,7 @@ public static class FirmamentV2Parser{if (parsed.Document is null) return parsed;var normalized = parsed.Document with { StaticAuthoring = staticAuthoring, VolumeAssertions = ParseCanonicalVolumeAssertions(source, diagnostics) };+ normalized = BindSemanticConstraintProjections(normalized, diagnostics);if (diagnostics.Any(IsFatalDiagnosticCode))return FirmamentV2ParseResult.Failure(parsed.Diagnostics.Concat(diagnostics).Distinct(StringComparer.Ordinal).Order().ToArray(), FirmamentV2ParseDisposition.RecognizedInvalid);var symbolBinding = FirmamentV2CanonicalSymbolBinder.Bind(normalized, source);@@ -1158,6 +1166,46 @@ public static class FirmamentV2Parser};}+ private static FirmamentV2Document BindSemanticConstraintProjections(FirmamentV2Document document, List<string> diagnostics)+ {+ var staticAuthoring = document.StaticAuthoring;+ if (staticAuthoring?.SemanticConstraints is not { Count: > 0 }) return document;+ var holes = (document.ModifyBlocks ?? []).SelectMany(block => block.SemanticHoles).ToDictionary(hole => hole.Name, StringComparer.Ordinal);+ var constraints = new List<FirmamentV2SemanticConstraint>();+ foreach (var constraint in staticAuthoring.SemanticConstraints)+ {+ var hasHole = holes.TryGetValue(constraint.Subject, out var hole);+ var valid = constraint.Property == "Diameter" && hasHole;+ if (!valid) diagnostics.Add(SemanticConstraintUnsupported + ":" + constraint.Id);+ else+ {+ var actual = hole!.ShaftDiameter;+ var delta = actual - constraint.NominalValue.NumericValue!.Value;+ var admitted = delta >= 0d ? constraint.Tolerance?.Plus ?? 0d : constraint.Tolerance?.Minus ?? 0d;+ valid = Math.Abs(delta) <= admitted + 1e-9;+ if (!valid) diagnostics.Add(SemanticConstraintValidationFailed + ":" + constraint.Id);+ }+ constraints.Add(constraint with { ValidationSucceeded = valid });+ }+ var byId = constraints.ToDictionary(constraint => constraint.Id, StringComparer.Ordinal);+ var projections = staticAuthoring.PmiProjections ?? new Dictionary<string, FirmamentV2PmiProjection>(StringComparer.Ordinal);+ if (projections.Count == 0) return document with { StaticAuthoring = staticAuthoring with { SemanticConstraints = constraints } };+ var records = (document.PmiBlock?.Records ?? []).Select(record => projections.TryGetValue(record.Name, out var projection)+ ? record with { Projection = projection }+ : record).ToArray();+ foreach (var projection in projections)+ if (!byId.TryGetValue(projection.Value.SourceRequireId, out var constraint) || !constraint.ValidationSucceeded)+ diagnostics.Add(SemanticConstraintValidationFailed + ":" + projection.Value.SourceRequireId);+ FirmamentV2BoundPmiBlock? bound = document.BoundPmi;+ if (bound is not null)+ {+ FirmamentV2BoundPmiRecord Tag(FirmamentV2BoundPmiRecord record) => projections.TryGetValue(record.Name, out var projection)+ ? record with { ProjectionSource = projection.SourceRequireId } : record;+ bound = new(bound.Datums.Select(Tag).ToArray(), bound.Dimensions.Select(Tag).ToArray(), bound.Controls.Select(Tag).ToArray(), bound.Diagnostics);+ }+ return document with { StaticAuthoring = staticAuthoring with { SemanticConstraints = constraints }, PmiBlock = document.PmiBlock is null ? null : document.PmiBlock with { Records = records }, BoundPmi = bound };+ }+private static bool TryParseCubicMillimeters(string raw, out double value){value = double.NaN;@@ -1810,7 +1858,7 @@ public static class FirmamentV2Parser|| code.StartsWith(ConceptIrResolver.PointProjectionUnsupported, StringComparison.Ordinal)|| code.StartsWith("firmament-static-", StringComparison.Ordinal);-public static bool IsFatalDiagnosticCode(string code) => code.StartsWith("firmament-v2-assert-volume-", StringComparison.Ordinal) || code.StartsWith(AssertVolumeKindUnsupported, StringComparison.Ordinal) || code.StartsWith(CanonicalDeclarationUnknown + ":", StringComparison.Ordinal) || code.StartsWith(CanonicalConstructNotYetSupported + ":", StringComparison.Ordinal) || code.StartsWith(EdgeFinishProfileComposeBoundaryUnsupported, StringComparison.Ordinal) || IsConceptFatalDiagnostic(code) || code is UnknownConstructionPolicy or PrimitiveDoesNotSatisfyHollowConstructible or WallThicknessRequired or WallThicknessMustBePositive or UnsupportedOpening or MultipleOpeningsNotSupported or Phase3EdgeFinishSyntaxInvalid or 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 or UnknownReplacementBody or UnknownReplacementRegion or ReplacementKindMismatch or ReplacementFaceUnresolved or ReplacementUnsupportedKind or ReplacementVerificationFailed or ReplacementRadiusInvalid or ReplacementEndUnsupported or LetDuplicateName or LetUnknownType or LetMismatch or LetInvalidLiteral or LetUnitMismatch or LetLiteralOnly or LetRecordDuplicateName or LetRecordDuplicateField or LetReferenceUnknownRecord or LetReferenceUnknownField or LetReferenceNonRecord or LetReferenceRecordUsedAsValue or ExpressionUnknownSymbol or ExpressionUnknownRecord or ExpressionUnknownField or ExpressionRecordUsedAsValue or ExpressionScalarUsedAsRecord or ExpressionTypeMismatch or ExpressionInvalidOperator or ExpressionDivisionByZero or ExpressionCycle or ExpressionUnsupported or ToleranceInvalidType or ToleranceUnitMismatch or ToleranceInvalidLiteral or ToleranceNegativeBilateral or ToleranceMissingMinus or ToleranceMissingPlus or ToleranceUnsupported or RecognitionEvidenceRadiusInvalid or RecognitionEvidenceSurfaceFamilyUnknown or RecognitionEvidenceAxisInvalid or SemanticProposalKindMismatch or SemanticProposalRadiusInvalid or SemanticProposalTargetUnresolved or SemanticProposalEndUnsupported or ConceptUnknownFamily or ConceptUnknownConcept or ConceptMissingRequiredField or ConceptUnknownField or ConceptDuplicateField or ConceptFieldTypeMismatch or ConceptInvalidTarget or ConceptDescriptorUnavailable or PmiDuplicateBlock or PmiDuplicateRecord or PmiDuplicateDatum or PmiUnknownRecordKind or PmiMissingRequiredField or PmiUnknownField or PmiDuplicateField or PmiInvalidTarget or PmiUnknownDatum or PmiDimensionTypeMismatch or PmiDimensionMissingTolerance or PmiToleranceTypeMismatch or StandaloneFillRegionRequired or UnsupportedStandaloneFillPattern or InvalidCellCount or CellSizeMustBePositive or StrutRadiusMustBePositive or NodeRadiusMustBePositive or MaterialBoundsMismatch or StandaloneFillMultipleUnsupported;+ public static bool IsFatalDiagnosticCode(string code) => code.StartsWith("firmament-v2-assert-volume-", StringComparison.Ordinal) || code.StartsWith(SemanticConstraintMalformed, StringComparison.Ordinal) || code.StartsWith(SemanticConstraintUnsupported, StringComparison.Ordinal) || code.StartsWith(SemanticConstraintDimensionMismatch, StringComparison.Ordinal) || code.StartsWith(SemanticConstraintValidationFailed, StringComparison.Ordinal) || code.StartsWith(PmiProjectionUnknownRequire, StringComparison.Ordinal) || code.StartsWith(PmiProjectionUnsupportedKind, StringComparison.Ordinal) || code.StartsWith(PmiProjectedFieldMustNotOverrideSourceConstraint, StringComparison.Ordinal) || code.StartsWith(AssertVolumeKindUnsupported, StringComparison.Ordinal) || code.StartsWith(CanonicalDeclarationUnknown + ":", StringComparison.Ordinal) || code.StartsWith(CanonicalConstructNotYetSupported + ":", StringComparison.Ordinal) || code.StartsWith(EdgeFinishProfileComposeBoundaryUnsupported, StringComparison.Ordinal) || IsConceptFatalDiagnostic(code) || code is UnknownConstructionPolicy or PrimitiveDoesNotSatisfyHollowConstructible or WallThicknessRequired or WallThicknessMustBePositive or UnsupportedOpening or MultipleOpeningsNotSupported or Phase3EdgeFinishSyntaxInvalid or 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 or UnknownReplacementBody or UnknownReplacementRegion or ReplacementKindMismatch or ReplacementFaceUnresolved or ReplacementUnsupportedKind or ReplacementVerificationFailed or ReplacementRadiusInvalid or ReplacementEndUnsupported or LetDuplicateName or LetUnknownType or LetMismatch or LetInvalidLiteral or LetUnitMismatch or LetLiteralOnly or LetRecordDuplicateName or LetRecordDuplicateField or LetReferenceUnknownRecord or LetReferenceUnknownField or LetReferenceNonRecord or LetReferenceRecordUsedAsValue or ExpressionUnknownSymbol or ExpressionUnknownRecord or ExpressionUnknownField or ExpressionRecordUsedAsValue or ExpressionScalarUsedAsRecord or ExpressionTypeMismatch or ExpressionInvalidOperator or ExpressionDivisionByZero or ExpressionCycle or ExpressionUnsupported or ToleranceInvalidType or ToleranceUnitMismatch or ToleranceInvalidLiteral or ToleranceNegativeBilateral or ToleranceMissingMinus or ToleranceMissingPlus or ToleranceUnsupported or RecognitionEvidenceRadiusInvalid or RecognitionEvidenceSurfaceFamilyUnknown or RecognitionEvidenceAxisInvalid or SemanticProposalKindMismatch or SemanticProposalRadiusInvalid or SemanticProposalTargetUnresolved or SemanticProposalEndUnsupported or ConceptUnknownFamily or ConceptUnknownConcept or ConceptMissingRequiredField or ConceptUnknownField or ConceptDuplicateField or ConceptFieldTypeMismatch or ConceptInvalidTarget or ConceptDescriptorUnavailable or PmiDuplicateBlock or PmiDuplicateRecord or PmiDuplicateDatum or PmiUnknownRecordKind or PmiMissingRequiredField or PmiUnknownField or PmiDuplicateField or PmiInvalidTarget or PmiUnknownDatum or PmiDimensionTypeMismatch or PmiDimensionMissingTolerance or PmiToleranceTypeMismatch or StandaloneFillRegionRequired or UnsupportedStandaloneFillPattern or InvalidCellCount or CellSizeMustBePositive or StrutRadiusMustBePositive or NodeRadiusMustBePositive or MaterialBoundsMismatch or StandaloneFillMultipleUnsupported;private static IReadOnlyList<FirmamentV2Exposure> ParseExposures(string body, List<string> diagnostics){diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2ValidationReport.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2ValidationReport.csindex 0a7ff2dc..a46acf11 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2ValidationReport.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2ValidationReport.cs@@ -23,7 +23,7 @@ public sealed record FirmamentV2ValidationTolerance(string Kind, string Plus, stpublic sealed record FirmamentV2ValidationConceptRuntimeValidation(string Provider, string Status, IReadOnlyList<FirmamentV2ValidationDiagnostic> Diagnostics);public sealed record FirmamentV2ValidationConcept(string Kind, string? Name, string Family, string Concept, string Status, string DfmStatus, IReadOnlyList<FirmamentV2ValidationConceptField> Fields, IReadOnlyList<FirmamentV2ValidationDiagnostic> Diagnostics, FirmamentV2ValidationConceptRuntimeValidation? RuntimeValidation = null);public sealed record FirmamentV2ValidationConceptField(string Name, string Type, bool HasTolerance, string Source);-public sealed record FirmamentV2ValidationPmiRecord(string Kind, string Name, string Status, string ExportSupport, string? Target, IReadOnlyList<string> Targets, IReadOnlyList<string> DatumRefs, FirmamentV2ValidationDimension? Dimension, string? Reason, IReadOnlyList<FirmamentV2ValidationDiagnostic> Diagnostics);+public sealed record FirmamentV2ValidationPmiRecord(string Kind, string Name, string Status, string ExportSupport, string? Target, IReadOnlyList<string> Targets, IReadOnlyList<string> DatumRefs, FirmamentV2ValidationDimension? Dimension, string? Reason, IReadOnlyList<FirmamentV2ValidationDiagnostic> Diagnostics, string? ProjectionSource = null, string? SourceConstraintKind = null, string? SourceSubject = null, string? ValidationStatus = null, string? Provenance = null);public sealed record FirmamentV2ValidationDimension(string Nominal, FirmamentV2ValidationTolerance? Tolerance);public sealed record FirmamentV2ValidationConceptPmiObligation(string Kind, string SourceConcept, string? SourceName, string? Target, string? ExpectedDimensionField, string Status, string Severity, string? MatchedPmi = null, string? DiagnosticCode = null);@@ -205,6 +205,7 @@ public static class FirmamentV2ValidationReportBuilder? "export-deferred": "valid";+ var constraint = record.Projection is null ? null : (document.StaticAuthoring?.SemanticConstraints ?? []).SingleOrDefault(item => item.Id == record.Projection.SourceRequireId);return new FirmamentV2ValidationPmiRecord(KindName(record.Kind),record.Name,@@ -215,7 +216,12 @@ public static class FirmamentV2ValidationReportBuilderboundRecord?.DatumRefs ?? [],Dimension(boundRecord),exportSupport == "deferred" ? DeferredReason(record.Kind) : null,- itemDiagnostics);+ itemDiagnostics,+ record.Projection?.SourceRequireId,+ constraint is null ? null : "dimensional-equality",+ constraint is null ? null : constraint.Subject + "." + constraint.Property,+ constraint is null ? null : constraint.ValidationSucceeded ? "succeeded" : "failed",+ constraint?.ExpectedProvenance);}).ToArray();}diff --git a/docs/firmament/pmi-constraint-projection-x1.md b/docs/firmament/pmi-constraint-projection-x1.mdnew file mode 100644index 00000000..7c15b7cc--- /dev/null+++ b/docs/firmament/pmi-constraint-projection-x1.md@@ -0,0 +1,33 @@+# PMI constraint projection (X1)++Preview 1 keeps engineering intent in one authoritative place: Concept/static facts declare it, `Require` validates it against a semantic feature, and `Pmi` explicitly projects the successfully validated constraint into AP242.++```firmament+Require MountDiameterConstraint {+ Actual: Mount.Diameter+ Expected: 8mm+ Tolerance: PlusMinus(0.05mm, 0.02mm)+}+Pmi {+ Datum A { Target: face(+Z) }+ HoleDiameter MountDiameterCallout {+ From: MountDiameterConstraint+ As: HoleDiameter+ DatumRefs: [A]+ }+}+```++`From` is a named, dimensional `Require`; `As` is required and currently admits only `HoleDiameter`. The target (`Mount`), nominal, and tolerance come from the constraint. A projected callout must not specify `Target`, `Value`, `Diameter`, `Dimension`, or `Tolerance`; this is rejected as `firmament-v2-pmi-projected-field-must-not-override-source-constraint`.++The Require normalizes to a semantic constraint with source identity, subject/property, nominal length, structural tolerance, validation status, source span, and expected-value provenance. It validates before PMI is available: a missing hole/property or an actual diameter outside its tolerance fails the Require and prevents export.++Projected PMI lowers to the existing canonical PMI record and the existing `BuildV2SemanticPmi` AP242 exporter. There is no second STEP path. Inspection JSON reports `projectionSource`, `sourceConstraintKind`, `sourceSubject`, `validationStatus`, and `provenance` on projected PMI.++Direct `Concept -> PMI` projection is deliberately deferred. Preview 1 projection requires a checked Require, so exported PMI is validated semantic intent rather than an independent annotation language.++Current limit: only `Mount.Diameter`-style semantic hole diameter equality and `HoleDiameter` projection are admitted. Other Require forms remain their existing boolean/static form.++## Documentation-only authoring check++A clean authoring pass used the example above plus a canonical `Record`/`Static` fact. First attempt succeeded with no syntax retries: one static nominal and tolerance drove the Hole, named Require, and projected PMI. Inspection showed the static member provenance and AP242 build succeeded. Deliberately adding `Value:` to the projected PMI produced `firmament-v2-pmi-projected-field-must-not-override-source-constraint`; using an unknown `From:` produced `firmament-v2-pmi-projection-unknown-require`. The bounded `As: HoleDiameter` rule is explicit in the example, so no PMI-kind inference or parser archaeology was required.diff --git a/docs/firmament/v2-canonical-authoring.md b/docs/firmament/v2-canonical-authoring.mdindex 59403cc4..5876c79f 100644--- a/docs/firmament/v2-canonical-authoring.md+++ b/docs/firmament/v2-canonical-authoring.md@@ -295,3 +295,9 @@ For a convex rounded source corner, the current exact Profile EdgeFinish policyrejects `source radius < finish size`. Reduce the requested Chamfer/Fillet,increase the authored corner radius, or leave that corner sharp; no splinecompatibility blend is substituted.+# Projected HoleDiameter example++```firmament+Require MountDiameter { Actual: Mount.Diameter Expected: 8mm Tolerance: PlusMinus(0.05mm, 0.02mm) }+Pmi { HoleDiameter MountCallout { From: MountDiameter As: HoleDiameter } }+```diff --git a/docs/firmament/v2-pmi-authoring.md b/docs/firmament/v2-pmi-authoring.mdindex 876101c3..a6f1d496 100644--- a/docs/firmament/v2-pmi-authoring.md+++ b/docs/firmament/v2-pmi-authoring.md@@ -36,3 +36,6 @@ counterbore-diameter PMI kind. See`fixtures/FirmamentV2/Canonical/valid/profile-compose-l-bracket-counterbore-pmi.firmament`for the complete accepted example. Datum and HoleDiameter are the currentlysupported composed-host PMI kinds.+# Projected PMI++For a checked model fact, prefer a named `Require` and an explicit `From`/`As` projection. The PMI block supplies only PMI metadata (kind and datum references); it never repeats the target, nominal, or tolerance. See [PMI constraint projection X1](pmi-constraint-projection-x1.md).diff --git a/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-dimension-mismatch.firmament b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-dimension-mismatch.firmamentnew file mode 100644index 00000000..f445b74d--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-dimension-mismatch.firmament@@ -0,0 +1 @@+Model DimensionMismatch { Units: mm Box Base { Size: [80mm, 50mm, 12mm] } Modify Base { Hole<Shaft> Mount { On: +Z Center: Point2(20mm, 20mm) Diameter: 8mm End: ThroughAll } } Require MountDiameter { Actual: Mount.Diameter Expected: 8mm Tolerance: PlusMinus(0.05deg, 0.02deg) } Pmi { HoleDiameter Callout { From: MountDiameter As: HoleDiameter } } }diff --git a/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-failed-require.firmament b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-failed-require.firmamentnew file mode 100644index 00000000..a1483108--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-failed-require.firmament@@ -0,0 +1 @@+Model FailedRequire { Units: mm Box Base { Size: [80mm, 50mm, 12mm] } Modify Base { Hole<Shaft> Mount { On: +Z Center: Point2(20mm, 20mm) Diameter: 8mm End: ThroughAll } } Require MountDiameter { Actual: Mount.Diameter Expected: 9mm } Pmi { HoleDiameter Callout { From: MountDiameter As: HoleDiameter } } }diff --git a/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-override-tolerance.firmament b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-override-tolerance.firmamentnew file mode 100644index 00000000..406245bb--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-override-tolerance.firmament@@ -0,0 +1 @@+Model OverrideTolerance { Units: mm Box Base { Size: [80mm, 50mm, 12mm] } Modify Base { Hole<Shaft> Mount { On: +Z Center: Point2(20mm, 20mm) Diameter: 8mm End: ThroughAll } } Require MountDiameter { Actual: Mount.Diameter Expected: 8mm } Pmi { HoleDiameter Callout { From: MountDiameter As: HoleDiameter Tolerance: PlusMinus(0.1mm, 0.1mm) } } }diff --git a/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-override-value.firmament b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-override-value.firmamentnew file mode 100644index 00000000..a0a0fd06--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-override-value.firmament@@ -0,0 +1,23 @@+Model ProjectedPmiOverride {+ Units: mm+ Box Base { Size: [80mm, 50mm, 12mm] }+ Modify Base {+ Hole<Shaft> Mount {+ On: +Z+ Center: Point2(20mm, 20mm)+ Diameter: 8mm+ End: ThroughAll+ }+ }+ Require MountDiameterConstraint {+ Actual: Mount.Diameter+ Expected: 8mm+ }+ Pmi {+ HoleDiameter MountDiameterCallout {+ From: MountDiameterConstraint+ As: HoleDiameter+ Value: 9mm+ }+ }+}diff --git a/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-unknown-datum.firmament b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-unknown-datum.firmamentnew file mode 100644index 00000000..159f9faf--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-unknown-datum.firmament@@ -0,0 +1 @@+Model UnknownDatum { Units: mm Box Base { Size: [80mm, 50mm, 12mm] } Modify Base { Hole<Shaft> Mount { On: +Z Center: Point2(20mm, 20mm) Diameter: 8mm End: ThroughAll } } Require MountDiameter { Actual: Mount.Diameter Expected: 8mm } Pmi { HoleDiameter Callout { From: MountDiameter As: HoleDiameter DatumRefs: [MissingDatum] } } }diff --git a/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-unknown-require.firmament b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-unknown-require.firmamentnew file mode 100644index 00000000..6af16a42--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-unknown-require.firmament@@ -0,0 +1 @@+Model UnknownRequire { Units: mm Box Base { Size: [80mm, 50mm, 12mm] } Modify Base { Hole<Shaft> Mount { On: +Z Center: Point2(20mm, 20mm) Diameter: 8mm End: ThroughAll } } Pmi { HoleDiameter Callout { From: Missing As: HoleDiameter } } }diff --git a/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-wrong-constraint-kind.firmament b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-wrong-constraint-kind.firmamentnew file mode 100644index 00000000..c95a000d--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-wrong-constraint-kind.firmament@@ -0,0 +1 @@+Model WrongKind { Units: mm Box Base { Size: [80mm, 50mm, 12mm] } Modify Base { Hole<Shaft> Mount { On: +Z Center: Point2(20mm, 20mm) Diameter: 8mm End: ThroughAll } } Require MountDiameter { Actual: Mount.Diameter Expected: 8mm } Pmi { HoleDiameter Callout { From: MountDiameter As: Distance } } }diff --git a/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-wrong-pmi-kind.firmament b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-wrong-pmi-kind.firmamentnew file mode 100644index 00000000..32d9e8de--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/invalid/pmi-projection-wrong-pmi-kind.firmament@@ -0,0 +1 @@+Model WrongPmi { Units: mm Box Base { Size: [80mm, 50mm, 12mm] } Modify Base { Hole<Shaft> Mount { On: +Z Center: Point2(20mm, 20mm) Diameter: 8mm End: ThroughAll } } Require MountDiameter { Actual: Mount.Diameter Expected: 8mm } Pmi { Distance Callout { From: MountDiameter As: HoleDiameter } } }diff --git a/fixtures/FirmamentV2/Canonical/valid/pmi-manual-vs-projected-equivalence.firmament b/fixtures/FirmamentV2/Canonical/valid/pmi-manual-vs-projected-equivalence.firmamentnew file mode 100644index 00000000..226d8524--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/valid/pmi-manual-vs-projected-equivalence.firmament@@ -0,0 +1,14 @@+Model ManualProjectedEquivalence {+ Units: mm+ Box Base { Size: [80mm, 50mm, 12mm] }+ Modify Base {+ Hole<Shaft> ManualMount { On: +Z Center: Point2(15mm, 20mm) Diameter: 8mm End: ThroughAll }+ Hole<Shaft> ProjectedMount { On: +Z Center: Point2(35mm, 20mm) Diameter: 8mm End: ThroughAll }+ }+ Require ProjectedDiameter { Actual: ProjectedMount.Diameter Expected: 8mm Tolerance: PlusMinus(0.05mm, 0.02mm) }+ Pmi {+ Datum A { Target: face(+Z) }+ HoleDiameter ManualCallout { Target: ManualMount Value: 8mm Tolerance: PlusMinus(0.05mm, 0.02mm) DatumRefs: [A] }+ HoleDiameter ProjectedCallout { From: ProjectedDiameter As: HoleDiameter DatumRefs: [A] }+ }+}diff --git a/fixtures/FirmamentV2/Canonical/valid/pmi-projected-hole-diameter-asymmetric-tolerance.firmament b/fixtures/FirmamentV2/Canonical/valid/pmi-projected-hole-diameter-asymmetric-tolerance.firmamentnew file mode 100644index 00000000..e56acf01--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/valid/pmi-projected-hole-diameter-asymmetric-tolerance.firmament@@ -0,0 +1,26 @@+Model ProjectedPmiMountSpec {+ Units: mm++ Record MountSpec { Diameter: Length DiameterTolerance: Length }+ Static MountSpecs: MountSpec[] = [ MountSpec { Diameter: 8mm DiameterTolerance: PlusMinus(0.05mm, 0.02mm) } ]+ Box Base { Size: [80mm, 50mm, 12mm] }+ Modify Base {+ Hole<Shaft> Mount {+ On: +Z+ Center: Point2(20mm, 20mm)+ Diameter: MountSpecs[0].Diameter+ End: ThroughAll+ }+ }+ Require MountDiameterConstraint {+ Actual: Mount.Diameter+ Expected: MountSpecs[0].Diameter+ Tolerance: MountSpecs[0].DiameterTolerance+ }+ Pmi {+ HoleDiameter MountDiameterCallout {+ From: MountDiameterConstraint+ As: HoleDiameter+ }+ }+}diff --git a/fixtures/FirmamentV2/Canonical/valid/pmi-projected-hole-diameter.firmament b/fixtures/FirmamentV2/Canonical/valid/pmi-projected-hole-diameter.firmamentnew file mode 100644index 00000000..0f7a127c--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/valid/pmi-projected-hole-diameter.firmament@@ -0,0 +1,26 @@+Model ProjectedPmiMount {+ Units: mm++ Box Base { Size: [80mm, 50mm, 12mm] }+ Modify Base {+ Hole<Shaft> Mount {+ On: +Z+ Center: Point2(20mm, 20mm)+ Diameter: 8mm+ End: ThroughAll+ }+ }+ Require MountDiameterConstraint {+ Actual: Mount.Diameter+ Expected: 8mm+ Tolerance: PlusMinus(0.05mm, 0.02mm)+ }+ Pmi {+ Datum A { Target: face(+Z) }+ HoleDiameter MountDiameterCallout {+ From: MountDiameterConstraint+ As: HoleDiameter+ DatumRefs: [A]+ }+ }+}