Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Add guitar functional-feature authoring
Yuechen Li9de8065419ae
diff --git a/Aetheris.CLI.Tests/SculptingCliTests.cs b/Aetheris.CLI.Tests/SculptingCliTests.csindex 604ff557..4b27cabb 100644--- a/Aetheris.CLI.Tests/SculptingCliTests.cs+++ b/Aetheris.CLI.Tests/SculptingCliTests.cs@@ -5,6 +5,46 @@ namespace Aetheris.CLI.Tests;public sealed class SculptingCliTests{+ [Theory]+ [InlineData("surf-x3b-add-section-chain-grip")]+ [InlineData("surf-x4-remove-section-chain-g1-duct")]+ public void EmbeddedStationChainsStayWithSculptingOwner(string name)+ {+ var fixture = Path.Combine(Root(), "fixtures/Canonical/BodyState", name + ".firmament");+ var directory = Path.Combine(Root(), "artifacts/local/tests/sculpting-owner", Guid.NewGuid().ToString("N"));+ Directory.CreateDirectory(directory);+ var output = Path.Combine(directory, "part.step");+ var mismatched = Path.Combine(directory, "mismatched.firmament");+ try+ {+ foreach (var operation in new[] { "validate", "inspect", "build" })+ {+ var stdout = new StringWriter(); var stderr = new StringWriter();+ string[] args = operation == "build" ? [operation, fixture, "--output", output, "--json"] : [operation, fixture, "--json"];+ Assert.Equal(0, CliRunner.Run(args, stdout, stderr));+ using var json = JsonDocument.Parse(stdout.ToString());+ var result = operation == "validate" ? json.RootElement.GetProperty("firmamentV2Validation") : json.RootElement;+ Assert.Equal("Sculpting", result.GetProperty("domain").GetString());+ }+ Assert.True(File.Exists(output));+ File.WriteAllText(mismatched, "schema SectionChain\n" + File.ReadAllText(fixture));+ var rejected = Path.Combine(directory, "rejected.step");+ foreach (var operation in new[] { "validate", "build" })+ {+ var stdout = new StringWriter();+ string[] args = operation == "build" ? [operation, mismatched, "--output", rejected, "--json"] : [operation, mismatched, "--json"];+ Assert.NotEqual(0, CliRunner.Run(args, stdout, new StringWriter()));+ Assert.Contains("firmament-schema-mismatch", stdout.ToString());+ Assert.False(File.Exists(rejected));+ }+ }+ finally+ {+ foreach (var path in Directory.GetFiles(directory)) File.Delete(path);+ Directory.Delete(directory);+ }+ }+[Fact]public void BuildInspectAndValidateExposeStructuredSculptStateEvidence(){diff --git a/Aetheris.Kernel.Firmament.Tests/Assembly/ArticulatedSubassemblyTests.cs b/Aetheris.Kernel.Firmament.Tests/Assembly/ArticulatedSubassemblyTests.csindex e4c558cf..f80a2227 100644--- a/Aetheris.Kernel.Firmament.Tests/Assembly/ArticulatedSubassemblyTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/Assembly/ArticulatedSubassemblyTests.cs@@ -82,11 +82,11 @@ public sealed class ArticulatedSubassemblyTests}[Theory]- [InlineData("B: Articulated.First.Mount", "B: Articulated.First.Tool")]+ [InlineData("b: Articulated.First.Mount", "b: Articulated.First.Tool")][InlineData("from: Mount;", "from: Tool;")]public void MovingInternalPortsCannotSilentlyBecomeRigidInstallationMounts(string from, string to){- var source = File.ReadAllText(Fixture("articulated-subassemblies.firmament")).Replace(from, to);+ var source = File.ReadAllText(Fixture("articulated-subassemblies.firmament")).ReplaceRequired(from, to);var parsed = new AssemblyM0Parser().Parse(source);Assert.True(parsed.IsSuccess, Evidence(parsed.Diagnostics));var compiled = new AssemblyM0Compiler().Compile(parsed.Source!);@@ -179,7 +179,7 @@ public sealed class ArticulatedSubassemblyTests[InlineData("translateLocal:", "translateLocla:", "firmament-v2-canonical-field-unknown")]public void InvalidDerivedFramesAreRejected(string from, string to, string code){- var source = File.ReadAllText(Fixture("derived-datum-frames.firmament")).Replace(from, to);+ var source = File.ReadAllText(Fixture("derived-datum-frames.firmament")).ReplaceRequired(from, to);var parsed = new AssemblyM0Parser().Parse(source, "derived-datum-frames.firmament");Assert.False(parsed.IsSuccess);Assert.Contains(parsed.Diagnostics, d => d.Code == code);diff --git a/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblyAuthoringFoundationTests.cs b/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblyAuthoringFoundationTests.csindex 934093cb..6be51d7b 100644--- a/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblyAuthoringFoundationTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblyAuthoringFoundationTests.cs@@ -10,7 +10,7 @@ public sealed class AssemblyAuthoringFoundationTestspublic void PublishedOriginsEvaluateLengthArithmetic(string expression, double height){var path = FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/published-ports.firmament");- var source = File.ReadAllText(path).Replace("[0mm,0mm,H]", $"[0mm,0mm,{expression}]");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(path)).ReplaceRequired("[0mm,0mm,H]", $"[0mm,0mm,{expression}]");var result = new AssemblyM1Pipeline().Compile(source, path);Assert.True(result.IsSuccess, string.Join("\n", result.Diagnostics));Assert.Equal(height, result.Ir!.Instances.Single(i => i.Path.ToString() == "PublishedPorts.Child").ResolvedTransform!.Matrix[14], 7);@@ -23,7 +23,7 @@ public sealed class AssemblyAuthoringFoundationTestspublic void PublishedOriginsRejectInvalidLengthExpressions(string expression){var path = FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/published-ports.firmament");- var source = File.ReadAllText(path).Replace("[0mm,0mm,H]", $"[0mm,0mm,{expression}]");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(path)).ReplaceRequired("[0mm,0mm,H]", $"[0mm,0mm,{expression}]");var result = new AssemblyM1Pipeline().Compile(source, path);Assert.False(result.IsSuccess);Assert.Contains(result.Diagnostics, d => d.Code == "assembly-port-frame-origin-invalid");@@ -64,7 +64,7 @@ public sealed class AssemblyAuthoringFoundationTestspublic void FixedSeatingRequiresFrameMembersRatherThanCompositePorts(){var path = FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/published-ports.firmament");- var source = File.ReadAllText(path).Replace("Placement { From: Bottom.Frame; To: PublishedPorts.Base.Top.Frame; }", "");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(path)).ReplaceRequired("Placement { From: Bottom.Frame; To: PublishedPorts.Base.Top.Frame; }", "");source = source.Insert(source.LastIndexOf('}'), "Interface<Fixed> Seat { A: PublishedPorts.Base.Top; B: PublishedPorts.Child.Bottom.Frame; Gap: 0mm; }");var result = new AssemblyM1Pipeline().Compile(source, path);Assert.False(result.IsSuccess);@@ -99,7 +99,7 @@ public sealed class AssemblyAuthoringFoundationTestspublic void PublishedPortsRejectUnresolvedAndDuplicateMembers(string extra, string code){var path = FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/published-ports.firmament");- var source = File.ReadAllText(path).Replace("Semantic Top {", "Semantic Top { " + extra);+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(path)).ReplaceRequired("Semantic Top {", "Semantic Top { " + extra);var result = new AssemblyM1Pipeline().Compile(source, path);Assert.False(result.IsSuccess);Assert.Contains(result.Diagnostics, d => d.Code == code);@@ -138,7 +138,7 @@ public sealed class AssemblyAuthoringFoundationTestspublic void FixedSeatingIsOneRelationAndZeroPosePreservesGapAndClocking(){var path = FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/published-ports.firmament");- var source = File.ReadAllText(path).Replace("Placement { From: Bottom.Frame; To: PublishedPorts.Base.Top.Frame; }", "");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(path)).ReplaceRequired("Placement { From: Bottom.Frame; To: PublishedPorts.Base.Top.Frame; }", "");var index=source.LastIndexOf('}');source=source.Insert(index,"Interface<Fixed> Seat { A: PublishedPorts.Base.Top.Frame; B: PublishedPorts.Child.Bottom.Frame; Gap: 2mm; Clocking: 90deg; Orientation: OpposedDirection; }");var compiled=new AssemblyM1Pipeline().Compile(source,path);diff --git a/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblyDisplayMeshTests.cs b/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblyDisplayMeshTests.csindex b9cad9a9..9d8bc542 100644--- a/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblyDisplayMeshTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblyDisplayMeshTests.cs@@ -38,7 +38,7 @@ public sealed class AssemblyDisplayMeshTestspublic void ExplicitObliquePlacementKeepsDoublePrecision(){var fixture = FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/Assembly/annular-pair.firmament");- var source = File.ReadAllText(fixture).Replace("1,0,0,0,0,1,0,0,0,0,1,0,60,0,0,1", "0.7071067811865476,0.7071067811865475,0,0,-0.7071067811865475,0.7071067811865476,0,0,0,0,1,0,60,0,0,1", StringComparison.Ordinal);+ var source = File.ReadAllText(fixture).ReplaceRequired("Placement { from: Origin; to: Parent; translateLocal: [60mm, 0mm, 0mm]; }", "Placement LegacyExplicit = [0.7071067811865476,0.7071067811865475,0,0,-0.7071067811865475,0.7071067811865476,0,0,0,0,1,0,60,0,0,1];");var compilation = new AssemblyM1Pipeline().Compile(source, fixture);Assert.True(compilation.IsSuccess, string.Join("\n", compilation.Diagnostics.Select(d => d.Message)));var transform = compilation.Ir!.Instances.Single(i => i.Path.ToString() == "AnnularPair.Second").ResolvedTransform!.Matrix;diff --git a/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblySiteAuthoringTests.cs b/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblySiteAuthoringTests.csindex 050c12bf..1f5976a7 100644--- a/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblySiteAuthoringTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/Assembly/AssemblySiteAuthoringTests.cs@@ -81,7 +81,8 @@ public sealed class AssemblySiteAuthoringTests[InlineData("Across: YZ;", "Across: YZ; Across: XZ;")]public void InvalidSiteRecipesFailAtAuthoringBoundary(string oldValue, string newValue){- var parsed = new AssemblyM0Parser().Parse(File.ReadAllText(Fixture).Replace(oldValue, newValue));+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture));+ var parsed = new AssemblyM0Parser().Parse(source.ReplaceRequired(oldValue, newValue));Assert.False(parsed.IsSuccess);Assert.Contains(parsed.Diagnostics, d => d.Code == "assembly-pattern-invalid" && d.Message.Contains("assembly-sites-invalid"));}diff --git a/Aetheris.Kernel.Firmament.Tests/Assembly/CoaxialDatumTests.cs b/Aetheris.Kernel.Firmament.Tests/Assembly/CoaxialDatumTests.csindex 95866db0..e07082cb 100644--- a/Aetheris.Kernel.Firmament.Tests/Assembly/CoaxialDatumTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/Assembly/CoaxialDatumTests.cs@@ -7,10 +7,10 @@ namespace Aetheris.Kernel.Firmament.Tests.Assembly;public sealed class CoaxialDatumTests{private const string Fixture = "fixtures/Canonical/AssemblyInterfaces/coaxial-knob.firmasm";- private static string Source => FirmamentV2.FirmamentSourceSpelling.Normalize(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/GuitarX0/materials.firmament"))- + File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/GuitarX0/hardware-definitions.firmament"))- + File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/GuitarX0/knob.firmament"))- + string.Join('\n', File.ReadAllLines(FirmamentCorpusHarness.ResolveFixtureFullPath(Fixture)).Where(l => !l.StartsWith("Include"))));+ private static string Source => FirmamentV2.FirmamentSourceSpelling.Normalize(FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/GuitarX0/materials.firmament")))+ + FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/GuitarX0/hardware-definitions.firmament")))+ + FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/GuitarX0/knob.firmament")))+ + string.Join('\n', File.ReadAllLines(FirmamentCorpusHarness.ResolveFixtureFullPath(Fixture)).Where(l => !l.StartsWith("include", StringComparison.OrdinalIgnoreCase))));[Fact]public void CompleteKnobRotatesAsOneRigidOccurrenceWithNoGeometryRebuild()@@ -58,7 +58,7 @@ public sealed class CoaxialDatumTestsusing var session = new FirmamentCompilationSession();var first = session.Compile(Source);Assert.True(first.IsSuccess,Evidence(first.Diagnostics));- var shifted = session.Compile(Source.Replace("Origin: [3mm,4mm,5mm]","Origin: [13mm,4mm,5mm]").Replace("At: 7mm","At: -7mm"));+ var shifted = session.Compile(Source.ReplaceRequired("Origin: [3mm,4mm,5mm]","Origin: [13mm,4mm,5mm]").Replace("At: 7mm","At: -7mm"));Assert.True(shifted.IsSuccess,Evidence(shifted.Diagnostics));Assert.Equal(3,shifted.Reuse!.ReusedDefinitions);Assert.Equal(6,Instance(shifted.Ir!.Instances,"Controls.VolumeKnob").ResolvedTransform!.Matrix[12],6);@@ -68,7 +68,7 @@ public sealed class CoaxialDatumTests[Fact]public void CompositePublicAxisAndFrameFollowSolvedLocalChildPlacement(){- var source = Source.Replace("At: 0mm; Clocking: 0deg;","At: 2mm; Clocking: 0deg;");+ var source = Source.ReplaceRequired("At: 0mm; Clocking: 0deg;","At: 2mm; Clocking: 0deg;");Assert.NotEqual(Source, source);var result = new AssemblyM0Compiler().Compile(new AssemblyM0Parser().Parse(source).Source!);Assert.True(result.IsSuccess,Evidence(result.Diagnostics));@@ -85,7 +85,7 @@ public sealed class CoaxialDatumTests[Fact]public void OpposedDirectionReversesMemberAxisWithoutReversingStation(){- var source = Source.Replace("At: 7mm; Clocking: 30deg;","At: 7mm; Clocking: 30deg; Orientation: OpposedDirection;");+ var source = Source.ReplaceRequired("At: 7mm; Clocking: 30deg;","At: 7mm; Clocking: 30deg; Orientation: OpposedDirection;");var result = new AssemblyM0Compiler().Compile(new AssemblyM0Parser().Parse(source).Source!);Assert.True(result.IsSuccess,Evidence(result.Diagnostics));var knob = Instance(result.Ir!.Instances,"Controls.VolumeKnob");@@ -98,7 +98,7 @@ public sealed class CoaxialDatumTests[Fact]public void ClockingDefaultsToZeroAndReferenceProjectsPerpendicularToDirection(){- var source = Source.Replace("Clocking: 30deg;", "").Replace("Reference: [0,3,1]", "Reference: [9,3,1]");+ var source = Source.ReplaceRequired("Clocking: 30deg;", "").Replace("Reference: [0,3,1]", "Reference: [9,3,1]");var result = new AssemblyM0Compiler().Compile(new AssemblyM0Parser().Parse(source).Source!);Assert.True(result.IsSuccess,Evidence(result.Diagnostics));var m=Instance(result.Ir!.Instances,"Controls.VolumeKnob").ResolvedTransform!.Matrix;@@ -128,7 +128,7 @@ public sealed class CoaxialDatumTestspublic void InvalidAxisContractsFailClosed(string from,string to,string code){Assert.Contains(from, Source);- var result = new AssemblyM0Parser().Parse(Source.Replace(from,to));+ var result = new AssemblyM0Parser().Parse(Source.ReplaceRequired(from,to));Assert.False(result.IsSuccess);Assert.Contains(result.Diagnostics,d=>d.Code==code);}diff --git a/Aetheris.Kernel.Firmament.Tests/Assembly/ConceptPointAuthoringTests.cs b/Aetheris.Kernel.Firmament.Tests/Assembly/ConceptPointAuthoringTests.csindex 5fee038a..8894b367 100644--- a/Aetheris.Kernel.Firmament.Tests/Assembly/ConceptPointAuthoringTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/Assembly/ConceptPointAuthoringTests.cs@@ -5,8 +5,8 @@ namespace Aetheris.Kernel.Firmament.Tests.Assembly;public sealed class ConceptPointAuthoringTests{- private static string Source => File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath(- "fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points.firmament"));+ private static string Source => FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath(+ "fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points.firmament")));[Fact]public void CheckedLocalPointsExpandThroughOrdinaryAssemblyAndExport()@@ -55,7 +55,7 @@ public sealed class ConceptPointAuthoringTestsreturn result.Ir!;}var before = Compile(Source);- var after = Compile(Source.Replace("628mm", "630mm"));+ var after = Compile(Source.ReplaceRequired("628mm", "630mm"));Assert.Equal(before.ConceptPoints!.SelectMany(c => c.Points).Select(p => p.StableId),after.ConceptPoints!.SelectMany(c => c.Points).Select(p => p.StableId));foreach (var occurrence in before.Instances)@@ -90,7 +90,7 @@ public sealed class ConceptPointAuthoringTests[InlineData("Function Distance", "Comptime Function Distance")]public void InvalidRecipesAndImpureOrUnboundedFunctionsFailClosed(string from, string to){- var result = new AssemblyM0Parser().Parse(Source.Replace(from, to));+ var result = new AssemblyM0Parser().Parse(Source.ReplaceRequired(from, to));Assert.False(result.IsSuccess);Assert.Contains(result.Diagnostics, d => d.Code == "assembly-pattern-invalid"&& d.Message.Contains("firmament-concept-points-", StringComparison.Ordinal)@@ -100,16 +100,16 @@ public sealed class ConceptPointAuthoringTests[Fact]public void FunctionsAreAvailableToPartAuthoringWithoutAComptimeKeyword(){- var parsed = FirmamentV2Parser.Parse(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath(- "fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/scalar-functions-part.firmament")));+ var parsed = FirmamentV2Parser.Parse(FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath(+ "fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/scalar-functions-part.firmament"))));Assert.True(parsed.IsSuccess, string.Join("\n", parsed.Diagnostics));}[Fact]public void PointCollectionsAlsoRemainTypedAndErasedInPartAuthoring(){- var parsed = FirmamentV2Parser.Parse(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath(- "fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points-part.firmament")));+ var parsed = FirmamentV2Parser.Parse(FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath(+ "fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points-part.firmament"))));Assert.True(parsed.IsSuccess, string.Join("\n", parsed.Diagnostics));var points = Assert.Single(parsed.Document!.StaticAuthoring!.ConceptPoints!);Assert.Equal("Point2", points.ElementType);@@ -119,7 +119,7 @@ public sealed class ConceptPointAuthoringTests[Fact]public void TinyFunctionResultsRoundTripIntoPhysicalPlacement(){- var source = "Function Tiny() -> Length = 1e-20mm;\n" + Source.Replace("Nut.Crossings.Bass.X", "Tiny()");+ var source = "Function Tiny() -> Length = 1e-20mm;\n" + Source.ReplaceRequired("Nut.Crossings.Bass.X", "Tiny()");var result = new AssemblyM1Pipeline().Compile(source);Assert.True(result.IsSuccess, string.Join("\n", result.Diagnostics));var bass = result.Ir!.Instances.Single(i => i.Path.ToString() == "PointWitness.Bass");@@ -130,11 +130,11 @@ public sealed class ConceptPointAuthoringTestspublic void EvaluationBudgetsStopDeepSyntaxAndBranchingFunctionGraphs(){var nested = new string('(', 130) + "scale" + new string(')', 130);- var deep = new AssemblyM0Parser().Parse(Source.Replace("scale * (1.0 - Pow(2.0, -n / 12.0))", nested));+ var deep = new AssemblyM0Parser().Parse(Source.ReplaceRequired("scale * (1.0 - Pow(2.0, -n / 12.0))", nested));Assert.False(deep.IsSuccess);var graph = string.Join("\n", Enumerable.Range(0, 20).Select(n =>$"Function Branch{n}(x: Length) -> Length = " + (n == 19 ? "x;" : $"Branch{n+1}(x) + Branch{n+1}(x);")));- var excessive = new AssemblyM0Parser().Parse(graph + "\n" + Source.Replace("PadHeight(1mm)", "Branch0(1mm)"));+ var excessive = new AssemblyM0Parser().Parse(graph + "\n" + Source.ReplaceRequired("PadHeight(1mm)", "Branch0(1mm)"));Assert.False(excessive.IsSuccess);Assert.Contains(excessive.Diagnostics, d => d.Message.Contains("function-call-invalid", StringComparison.Ordinal));}diff --git a/Aetheris.Kernel.Firmament.Tests/Assembly/LinearStationAuthoringTests.cs b/Aetheris.Kernel.Firmament.Tests/Assembly/LinearStationAuthoringTests.csindex 2aa99d30..6d61572f 100644--- a/Aetheris.Kernel.Firmament.Tests/Assembly/LinearStationAuthoringTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/Assembly/LinearStationAuthoringTests.cs@@ -4,8 +4,8 @@ namespace Aetheris.Kernel.Firmament.Tests.Assembly;public sealed class LinearStationAuthoringTests{- private static string Source => File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath(- "fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/linear-stations.firmament"));+ private static string Source => FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath(+ "fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/linear-stations.firmament")));private static AssemblyIr Compile(string source){@@ -32,7 +32,7 @@ public sealed class LinearStationAuthoringTestsAssert.Equal(18, first.ResolvedTransform.Matrix[13], 10);Assert.Equal(20, first.ResolvedTransform.Matrix[14], 10);// A board placement change propagates via its port, not station coordinates.- var moved = new AssemblyM1Pipeline().Compile(Source.Replace("20mm,30mm", "20mm,37mm"));+ var moved = new AssemblyM1Pipeline().Compile(Source.ReplaceRequired("20mm,30mm", "20mm,37mm"));Assert.True(moved.IsSuccess, string.Join("\n", moved.Diagnostics));foreach (var inlay in result.Ir.Instances.Where(i => i.Path.ToString().EndsWith(".Inlay", StringComparison.Ordinal))){@@ -49,7 +49,7 @@ public sealed class LinearStationAuthoringTestspublic void ReorderingAndEditingStationsPreserveKeyedIdentitiesAndMoveOnlyEditedStation(){var before = Compile(Source);- var after = Compile(Source.Replace("First: 10mm; Second: 23.5mm; Third: -4mm;", "Third: -4mm; Second: 24mm; First: 10mm;"));+ var after = Compile(Source.ReplaceRequired("First: 10mm; Second: 23.5mm; Third: -4mm;", "Third: -4mm; Second: 24mm; First: 10mm;"));var points = Assert.Single(after.ConceptPoints!).Points;Assert.Equal(new[] { "Third", "Second", "First" }, points.Select(p => p.Key));Assert.Equal(new[] { 0, 1, 2 }, points.Select(p => p.Ordinal));@@ -67,7 +67,7 @@ public sealed class LinearStationAuthoringTests[Fact]public void Point3StationsAndLargeFiniteDirectionsUseTheSameBoundedRecipe(){- var result = Compile(Source.Replace("Points<Point2>", "Points<Point3>").Replace("Point2(0mm,0mm)", "Point3(1mm,2mm,3mm)")+ var result = Compile(Source.ReplaceRequired("Points<Point2>", "Points<Point3>").Replace("Point2(0mm,0mm)", "Point3(1mm,2mm,3mm)").Replace("[0,-2]", "[0,0,-1e308]"));var points = Assert.Single(result.ConceptPoints!).Points;Assert.Equal(new[] { 1d, 2, -7 }, points[0].Coordinates);@@ -77,7 +77,7 @@ public sealed class LinearStationAuthoringTests[Fact]public void NestedScalarCallsInDirectionAndStationDistancesStayDimensionChecked(){- var result = Compile(Source.Replace("[0,-2]", "[0,-Pow(2,3)]").Replace("First: 10mm", "First: 5mm * Pow(2,1)"));+ var result = Compile(Source.ReplaceRequired("[0,-2]", "[0,-Pow(2,3)]").Replace("First: 10mm", "First: 5mm * Pow(2,1)"));Assert.Equal(-10, Assert.Single(result.ConceptPoints!).Points[0].Coordinates[1]);}@@ -94,7 +94,7 @@ public sealed class LinearStationAuthoringTests[InlineData("First: 10mm; Second: 23.5mm; Third: -4mm;", "")]public void InvalidStationRecipesFailClosed(string from, string to){- var parsed = new AssemblyM0Parser().Parse(Source.Replace(from, to));+ var parsed = new AssemblyM0Parser().Parse(Source.ReplaceRequired(from, to));Assert.False(parsed.IsSuccess);Assert.Contains(parsed.Diagnostics, d => d.Message.Contains("firmament-concept-points-"));}@@ -103,8 +103,8 @@ public sealed class LinearStationAuthoringTestspublic void TooManyStationsAndCoordinateOverflowAreRejected(){var many = string.Join(";", Enumerable.Range(0, 1025).Select(i => $"Station{i}: {i}mm")) + ";";- Assert.False(new AssemblyM0Parser().Parse(Source.Replace("First: 10mm; Second: 23.5mm; Third: -4mm;", many)).IsSuccess);- Assert.False(new AssemblyM0Parser().Parse(Source.Replace("Point2(0mm,0mm)", "Point2(0mm,-1e308mm)")+ Assert.False(new AssemblyM0Parser().Parse(Source.ReplaceRequired("First: 10mm; Second: 23.5mm; Third: -4mm;", many)).IsSuccess);+ Assert.False(new AssemblyM0Parser().Parse(Source.ReplaceRequired("Point2(0mm,0mm)", "Point2(0mm,-1e308mm)").Replace("First: 10mm", "First: 1e308mm")).IsSuccess);}}diff --git a/Aetheris.Kernel.Firmament.Tests/Assembly/NestedOccurrenceFrameTests.cs b/Aetheris.Kernel.Firmament.Tests/Assembly/NestedOccurrenceFrameTests.csindex af1540c1..97d26ca4 100644--- a/Aetheris.Kernel.Firmament.Tests/Assembly/NestedOccurrenceFrameTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/Assembly/NestedOccurrenceFrameTests.cs@@ -4,6 +4,22 @@ namespace Aetheris.Kernel.Firmament.Tests.Assembly;public sealed class NestedOccurrenceFrameTests{+ [Fact]+ public void ParentPlacementAndInternalMatePreserveNestedWorldTransforms()+ {+ var source = FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/fixed-nested-usd.firmament");+ var compiled = new AssemblyM1Pipeline().CompileFile(source);+ Assert.True(compiled.IsSuccess, string.Join("\n", compiled.Diagnostics));+ var first = Assert.Single(compiled.Ir!.Instances, i => i.Path.ToString() == "FixedNested.Module.First");+ var second = Assert.Single(compiled.Ir.Instances, i => i.Path.ToString() == "FixedNested.Module.Second");+ Assert.Equal(40, first.ResolvedTransform!.Matrix[12], 9);+ Assert.Equal(10, first.ResolvedTransform.Matrix[13], 9);+ Assert.Equal(3, first.ResolvedTransform.Matrix[14], 9);+ Assert.Equal(40 + 60 / Math.Sqrt(2), second.ResolvedTransform!.Matrix[12], 9);+ Assert.Equal(10 + 60 / Math.Sqrt(2), second.ResolvedTransform.Matrix[13], 9);+ Assert.True(AssemblyIrAp242Exporter.Export(compiled).IsSuccess);+ }+[Fact]public void TranslatedNestedMembersComposeOnceUnderARotatedParent(){diff --git a/Aetheris.Kernel.Firmament.Tests/BossPocketSemanticFeatureTests.cs b/Aetheris.Kernel.Firmament.Tests/BossPocketSemanticFeatureTests.csindex 18ff4ff6..1b113e36 100644--- a/Aetheris.Kernel.Firmament.Tests/BossPocketSemanticFeatureTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/BossPocketSemanticFeatureTests.cs@@ -10,7 +10,7 @@ public sealed class BossPocketSemanticFeatureTests[Fact]public void PracticalBossPocketWitness_LowersThroughOneSectionStack_AndRoundTripsStep(){- var parsed = PrismaticProfileCompositionParser.Parse(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament")));+ var parsed = PrismaticProfileCompositionParser.Parse(FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))));Assert.Empty(parsed.Diagnostics);var stack = Assert.IsType<PrismaticSectionStackConstruction>(PrismaticSectionStackCompiler.Normalize(parsed, out var diagnostics));Assert.Empty(diagnostics);@@ -44,7 +44,7 @@ public sealed class BossPocketSemanticFeatureTests[Fact]public void PublicParserAndBuild_ReportFirstClassBossAndPocketIdentity(){- var source = File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"));+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament")));var parse = FirmamentV2Parser.Parse(source);Assert.True(parse.IsSuccess, string.Join("; ", parse.Diagnostics));Assert.Equal("MountBoss", Assert.Single(parse.Document!.Bosses!).Name);@@ -63,7 +63,7 @@ public sealed class BossPocketSemanticFeatureTests[InlineData("minimumWallThickness", "7", "Template.minimumWallThickness")]public void PocketMinimumFloor_UsesExistingTemplateConceptChannel(string concept, string value, string policy){- var source = File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))).Replace("; MinimumFloorThickness: 2mm", string.Empty, StringComparison.Ordinal).Replace(" Concept Struct Layout On XY", $" template<CNC> ShopDefault {{ concept {concept}: {value} mm }}\n\n Concept Struct Layout On XY", StringComparison.Ordinal);var parsed = PrismaticProfileCompositionParser.Parse(source);@@ -74,7 +74,7 @@ public sealed class BossPocketSemanticFeatureTests[Fact]public void PocketTemplateFloorPolicy_ParticipatesInRealBuildPath(){- var source = File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))).Replace("; MinimumFloorThickness: 2mm", string.Empty, StringComparison.Ordinal).Replace(" Concept Struct Layout On XY", " template<CNC> ShopDefault { concept minimumFloorThickness: 5 mm }\n\n Concept Struct Layout On XY", StringComparison.Ordinal);var build = FirmamentBuildAndExport.CompileSource(source);@@ -87,7 +87,7 @@ public sealed class BossPocketSemanticFeatureTests[Fact]public void PocketMinimumFloor_UsesCanonicalCncPolicyBeforeLegacyCompatibilityChannel(){- var source = File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))).Replace("; MinimumFloorThickness: 2mm", string.Empty, StringComparison.Ordinal).Replace(" Concept Struct Layout On XY", """Concept CncManufacturingPolicy {@@ -113,7 +113,7 @@ public sealed class BossPocketSemanticFeatureTests[Fact]public void BossPocketCounterboreCombination_BuildsAndReimports(){- var source = File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))).Replace("Hole<Shaft> MountHole { On: +Z; Center: [-12mm, 0mm]; Diameter: 6mm; End: ThroughAll; Role: MountingHole }","Hole<Counterbore> MountHole { On: +Z; Center: [-12mm, 0mm]; Diameter: 6mm; CounterboreDiameter: 10mm; CounterboreDepth: 3mm; End: ThroughAll; Role: MountingHole }", StringComparison.Ordinal);var build = FirmamentBuildAndExport.CompileSource(source);@@ -126,7 +126,7 @@ public sealed class BossPocketSemanticFeatureTests[Fact]public void BossPocketEdgeFinishCombination_PreservesSemanticInventory_WhenAdmitted(){- var source = File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))).Replace("Boss MountBoss { On: Top; Profile: BossProfile;", "Boss MountBoss { On: Top; Profile: RectBossProfile;", StringComparison.Ordinal);source = AddBeforeModelClose(source," Modify Body { EdgeFinish BossTop { Target: RectBossProfile.Outer On: Top Kind: Chamfer Distance: 1mm } }\n");@@ -144,7 +144,7 @@ public sealed class BossPocketSemanticFeatureTests[InlineData("11", "firmament-pocket-through-depth", "remainingFloor=-1mm")]public void PocketFloorGuardrails_RejectWithEngineeringQuantities(string depth, string code, string quantity){- var source = File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))).Replace("Depth: 4mm", $"Depth: {depth}mm", StringComparison.Ordinal);var parsed = PrismaticProfileCompositionParser.Parse(source);Assert.Null(parsed.Feature);@@ -157,7 +157,7 @@ public sealed class BossPocketSemanticFeatureTests[InlineData("On: Top; Profile: BossProfile", "On: Top; Profile: MissingProfile", "firmament-boss-invalid-profile")]public void BossGuardrails_AreTyped(string before, string after, string code){- var source = File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament")).Replace(before, after, StringComparison.Ordinal);+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))).Replace(before, after, StringComparison.Ordinal);var parsed = PrismaticProfileCompositionParser.Parse(source);Assert.Null(parsed.Feature);Assert.Contains(parsed.Diagnostics, diagnostic => diagnostic.StartsWith(code + ":MountBoss", StringComparison.Ordinal));@@ -168,7 +168,7 @@ public sealed class BossPocketSemanticFeatureTests[InlineData("[25mm, 0mm]", "tangent")]public void BossConnectivity_RejectsDisjointAndPointContact(string center, string _){- var source = File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))).Replace("Boss MountBoss { On: Top; Profile: BossProfile;", "Boss MountBoss { On: Top; Profile: RectBossProfile;", StringComparison.Ordinal).Replace("Rect2 BossPad { Center: [-12mm, 0mm]", $"Rect2 BossPad {{ Center: {center}", StringComparison.Ordinal);var parsed = PrismaticProfileCompositionParser.Parse(source);@@ -183,7 +183,7 @@ public sealed class BossPocketSemanticFeatureTests[InlineData("MinimumFloorThickness: 2mm", "MinimumFloorThickness: 0mm", "firmament-pocket-minimum-floor-policy-invalid")]public void PocketGuardrails_AreTyped(string before, string after, string code){- var source = File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament")).Replace(before, after, StringComparison.Ordinal);+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Boss/boss-pocket-block.firmament"))).Replace(before, after, StringComparison.Ordinal);var parsed = PrismaticProfileCompositionParser.Parse(source);Assert.Null(parsed.Feature);Assert.Contains(parsed.Diagnostics, diagnostic => diagnostic.StartsWith(code + ":ElectronicsRecess", StringComparison.Ordinal));diff --git a/Aetheris.Kernel.Firmament.Tests/CompositionLanguageTests.cs b/Aetheris.Kernel.Firmament.Tests/CompositionLanguageTests.csindex 53dd698c..56124c71 100644--- a/Aetheris.Kernel.Firmament.Tests/CompositionLanguageTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/CompositionLanguageTests.cs@@ -54,7 +54,7 @@ public sealed class CompositionLanguageTestsvar completion = FirmamentLanguageService.Complete(draft, "draft.firmament", "1", draft.Length);Assert.DoesNotContain(completion.Fields, f => f.Name == "Frame");Assert.Contains(completion.Fields, f => f.Name == "Profile");- var route = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/WireForm/line-guide.firmament");+ var route = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/WireForm/line-guide.firmament"));Assert.Empty(FirmamentLanguageAnalysisService.Analyze(route, "guide.firmament", "1").Diagnostics);var invalid = FirmamentLanguageAnalysisService.Analyze(route.Replace("Distance: 60mm", "Distance: 100mm"), "guide.firmament", "2");Assert.Contains(invalid.Diagnostics, d => d.Message.Contains("guide-interval-invalid"));diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentConventionTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentConventionTests.csindex df8cb533..1bde27de 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentConventionTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentConventionTests.cs@@ -5,6 +5,29 @@ namespace Aetheris.Kernel.Firmament.Tests;public sealed class FirmamentConventionTests{+ [Theory]+ [InlineData("fixtures/Regression/FrontendX2/traceloop-rect2.firmament", true)]+ [InlineData("fixtures/Invalid/Pipeline/traceloop-non-loop.firmament", false)]+ public void TraceLoopAdmissionDependsOnBoundaryClosure(string path, bool admitted)+ {+ var source = FirmamentCorpusHarness.ReadFixtureText(path);+ Assert.Equal(admitted, FirmamentV2Parser.Parse(source).IsSuccess);+ Assert.Equal(admitted, FirmamentBuildAndExport.CompileSource(source).IsSuccess);+ }++ [Fact]+ public void CookbookInnerLoopBuildsWithDistinctSegmentIdentities()+ {+ var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Pipeline/profile-with-inner-loop.firmament");+ var built = FirmamentBuildAndExport.CompileSource(source);+ Assert.True(built.IsSuccess, string.Join("\n", built.Diagnostics));+ var imported = Aetheris.Kernel.Core.Step242.Step242Importer.ImportBody(built.Value.StepText);+ Assert.True(imported.IsSuccess);+ var mass = Aetheris.Kernel.Core.Brep.Verification.BrepMassProperties.Evaluate(imported.Value);+ Assert.True(mass.IsEnclosed);+ Assert.Equal((40 * 30 - 16 * 10) * 4, mass.AbsoluteVolume, 8);+ }+[Fact]public void MechanicalPassPreservesAuthoredDataArgumentsMembersAndOpaqueText(){diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentCorpusHarness.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentCorpusHarness.csindex 4402a09c..7176fab6 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentCorpusHarness.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentCorpusHarness.cs@@ -30,6 +30,20 @@ internal static class FirmamentCorpusHarnessreturn NormalizeLf(File.ReadAllText(fullPath, Encoding.UTF8));}+ // Some historical mutation tests intentionally inject the PascalCase aliases.+ // Normalize their input explicitly; ordinary fixture reads and the CLI corpus+ // continue to exercise the current authored spelling without this adapter.+ public static string CanonicalMutationSource(string source) =>+ FirmamentV2.FirmamentSourceSpelling.Normalize(source);++ public static string ReplaceRequired(this string source, string before, string after,+ StringComparison comparison = StringComparison.Ordinal)+ {+ Assert.True(source.Contains(before, comparison), $"Mutation target was absent: {before}");+ Assert.NotEqual(before, after);+ return source.Replace(before, after, comparison);+ }+public static string NormalizeLf(string value) => value.Replace("\r\n", "\n", StringComparison.Ordinal).Replace("\r", "\n", StringComparison.Ordinal);public static string RepoRoot()diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentDirectiveAndCasingTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentDirectiveAndCasingTests.csindex 1e4b93ec..42650dca 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentDirectiveAndCasingTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentDirectiveAndCasingTests.cs@@ -110,7 +110,7 @@ public sealed class FirmamentDirectiveAndCasingTests[InlineData("Normal: [1,0,0]", "Normal: [1,0,0]; typo: 3", "typo")]public void AstSymmetryClosesItsConsumedScopes(string oldText, string newText, string code){- var source = File.ReadAllText(Canonical("Symmetry/mirrored-hole")).Replace(oldText, newText, StringComparison.Ordinal);+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Canonical("Symmetry/mirrored-hole"))).ReplaceRequired(oldText, newText);Assert.False(FirmamentV2Parser.Parse(source).IsSuccess);Assert.False(FirmamentBuildAndExport.CompileSource(source).IsSuccess);Assert.Contains(FirmamentV2Parser.Parse(source).Diagnostics, d => d.Contains(code, StringComparison.Ordinal));diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentDomainFrontendMigrationTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentDomainFrontendMigrationTests.csindex e27b1208..0df91fdd 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentDomainFrontendMigrationTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentDomainFrontendMigrationTests.cs@@ -74,7 +74,7 @@ public sealed class FirmamentDomainFrontendMigrationTests[Fact]public void MultipleGearDefinitionsAreInspectableButNormalValidationDoesNotPromiseSingleBodyBuild(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/GearInterfaces/spur-pair.firmament");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/GearInterfaces/spur-pair.firmament"));Assert.True(GearAuthoring.Parse(source).IsSuccess);var parsed = FirmamentV2Parser.Parse(source);Assert.True(parsed.IsSuccess);@@ -97,7 +97,7 @@ public sealed class FirmamentDomainFrontendMigrationTests[InlineData("two-section-ruled.firmament", "Seam: Bottom", "Seam: Bottom; Fillet Lost { Radius: 1mm }")]public void SectionOwnersConsumeAllFieldsAndStatements(string file, string before, string after){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/" + file).Replace(before, after, StringComparison.Ordinal);+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/" + file)).Replace(before, after, StringComparison.Ordinal);Assert.False(SectionChainAuthoringParser.Compile(source, materialize: false).IsSuccess);var parsed = FirmamentV2Parser.Parse(source);Assert.False(parsed.IsSuccess); Assert.Equal("UnifiedSectionChain", parsed.ParserRoute);@@ -107,7 +107,7 @@ public sealed class FirmamentDomainFrontendMigrationTests[Fact]public void LegacyUnitHeaderUsesMechanicalAstAndRetainsExactStep(){- var header = FirmamentCorpusHarness.ReadFixtureText("fixtures/Regression/FrontendMigration/legacy-unit-header.firmament");+ var header = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Regression/FrontendMigration/legacy-unit-header.firmament"));var explicitBody = "Model Old { Units: mm; " + header[(header.IndexOf('\n') + 1)..] + " }";var first = FirmamentBuildAndExport.CompileSource(header); var second = FirmamentBuildAndExport.CompileSource(explicitBody);Assert.True(first.IsSuccess); Assert.True(second.IsSuccess);@@ -119,7 +119,7 @@ public sealed class FirmamentDomainFrontendMigrationTests[Fact]public void NamedSurfaceSectionSyntaxPreservesIdentityWithoutCapturingWith(){- var syntax = FirmamentSyntaxParser.Parse(FirmamentCorpusHarness.ReadFixtureText("fixtures/Regression/FrontendMigration/named-surface-section-syntax.firmament"));+ var syntax = FirmamentSyntaxParser.Parse(FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Regression/FrontendMigration/named-surface-section-syntax.firmament")));Assert.True(syntax.IsSuccess, string.Join("\n", syntax.Diagnostics));var items = Assert.IsType<SequenceSyntax>(Assert.Single(syntax.Document.Statements.OfType<DeclarationSyntax>()).Initializer).Items;Assert.Equal(["S0", "S1"], items.Select(i => Assert.IsType<ObjectSyntax>(i.Value).Name!.Text));@@ -129,7 +129,7 @@ public sealed class FirmamentDomainFrontendMigrationTests[Fact]public void SurfaceExpressionMigrationPreservesWorldPointsAndBoundaryIdentities(){- var parsed = FirmamentV2Parser.Parse(FirmamentCorpusHarness.ReadFixtureText("fixtures/Regression/FrontendMigration/panel-parametric.firmament"));+ var parsed = FirmamentV2Parser.Parse(FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Regression/FrontendMigration/panel-parametric.firmament")));Assert.True(parsed.IsSuccess, string.Join("\n", parsed.Diagnostics));var panel = Assert.Single(parsed.Document!.Panels!);Assert.Equal("panel:Saddle", panel.StableId);@@ -149,7 +149,7 @@ public sealed class FirmamentDomainFrontendMigrationTests[Fact]public void GearDefinitionExtractionLeavesAssemblyRequirementsWithTheirOwner(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/AssemblyInterfaces/gear-with-ordinary-part.firmament")+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/AssemblyInterfaces/gear-with-ordinary-part.firmament"))+ "\nInterface<Axial> OptionalCapability { Role A requires AxisCapable; Role B requires AxisCapable; }";var definitions = GearAuthoring.ParseDefinitions(source);Assert.True(definitions.IsSuccess, string.Join("\n", definitions.Diagnostics));@@ -182,7 +182,7 @@ public sealed class FirmamentDomainFrontendMigrationTests[InlineData("Plateau")]public void AdmittedAstCannotBeReroutedByConstructTextInComments(string domain){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Regression/FrontendMigration/incidental-domain-text.firmament").Replace("$domain", domain, StringComparison.Ordinal);+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Regression/FrontendMigration/incidental-domain-text.firmament")).Replace("$domain", domain, StringComparison.Ordinal);var plain = source[..source.IndexOf("/*", StringComparison.Ordinal)];var first = FirmamentBuildAndExport.CompileSource(plain); var second = FirmamentBuildAndExport.CompileSource(source);Assert.True(first.IsSuccess, string.Join("\n", first.Diagnostics));@@ -197,10 +197,10 @@ public sealed class FirmamentDomainFrontendMigrationTests[InlineData("Plateau Raised", "Plateau Raised On XZ")]public void PlateauIntentIsBoundBeforeItsAdmittedBaseCanExecute(string before, string after){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament").Replace(before, after, StringComparison.Ordinal);+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament")).Replace(before, after, StringComparison.Ordinal);Assert.False(FirmamentV2Parser.Parse(source).IsSuccess);Assert.False(FirmamentBuildAndExport.CompileSource(source).IsSuccess);}- private static string Source(string kind) => FirmamentCorpusHarness.ReadFixtureText("fixtures/Regression/FrontendMigration/" + kind.ToLowerInvariant() + ".firmament");+ private static string Source(string kind) => FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Regression/FrontendMigration/" + kind.ToLowerInvariant() + ".firmament"));}diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentLanguageOutlineTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentLanguageOutlineTests.csindex 47dd970f..596ead07 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentLanguageOutlineTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentLanguageOutlineTests.cs@@ -138,7 +138,7 @@ public sealed class FirmamentLanguageOutlineTestsAssert.Contains("AtlasIndustrial/AtlasIndustrial/Base -> base.firmament::AtlasBase", cross);Assert.Contains("AtlasIndustrial/AtlasIndustrial/Gripper -> gripper.firmament::GripperBody", cross);Assert.Contains("AtlasIndustrial/AtlasIndustrial/Gripper -> materials.firmament::BlackPaint", cross);- Assert.Contains(outline.Edges, e => e.From == "AtlasIndustrial/Shoulder" && e.Via == "field:A"+ Assert.Contains(outline.Edges, e => e.From == "AtlasIndustrial/Shoulder" && e.Via == "field:a"&& e.To == "AtlasIndustrial/AtlasIndustrial/Base" && e.Member == "Hinge");Assert.True(Assert.Single(outline.Nodes, n => n.Id == "AtlasIndustrial/AtlasIndustrial/Gripper").Occurrence);Assert.Empty(outline.Externals);diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentTypedToleranceTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentTypedToleranceTests.csindex 5cbe659d..8b27521c 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentTypedToleranceTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentTypedToleranceTests.cs@@ -165,8 +165,8 @@ public sealed class FirmamentTypedToleranceTests[InlineData("fixtures/Canonical/WireForm/axis-coil.firmament")]public void UnqualifiedScalarConsumersCannotSilentlyDiscardTheDeclaration(string fixture){- var sweep = File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath(fixture))- .Replace("Units: mm", "Units: mm\n Static unusedRequirement: Length = 8mm tol 0.1mm", StringComparison.Ordinal);+ var sweep = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath(fixture)))+ .ReplaceRequired("Units: mm", "Units: mm\n Static unusedRequirement: Length = 8mm tol 0.1mm", StringComparison.Ordinal);var result = FirmamentBuildAndExport.CompileSource(sweep, null);Assert.False(result.IsSuccess);Assert.Contains(result.Diagnostics, d => d.Message.Contains("static-scalar-consumer-unsupported", StringComparison.Ordinal));diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentV2FeatureFunctionTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentV2FeatureFunctionTests.csindex 5b55e9ac..e9d22d4d 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentV2FeatureFunctionTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentV2FeatureFunctionTests.cs@@ -200,8 +200,8 @@ public sealed class FirmamentV2FeatureFunctionTests{var path = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory,"../../../../fixtures/Canonical/Feature/boss-pocket-feature.firmament"));- var source = File.ReadAllText(path)- .Replace("Feature RaisedPad", "Feature PadProfile", StringComparison.Ordinal)+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(path))+ .ReplaceRequired("Feature RaisedPad", "Feature PadProfile", StringComparison.Ordinal).Replace("RaisedPad(Shape:", "PadProfile(Shape:", StringComparison.Ordinal).Replace(" Concept Struct Layout On XY", " Record LegacySpec { Center: Point2 }\n Template<spec: LegacySpec> LegacyMount { Hole<Shaft> Item { On: +Z Center: spec.Center Diameter: 4mm End: ThroughAll } }\n Concept Struct Layout On XY", StringComparison.Ordinal);var selection = FirmamentFrontendSchemas.Select(source);diff --git a/Aetheris.Kernel.Firmament.Tests/FunctionalPickupTests.cs b/Aetheris.Kernel.Firmament.Tests/FunctionalPickupTests.csindex 236702c5..0128e243 100644--- a/Aetheris.Kernel.Firmament.Tests/FunctionalPickupTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FunctionalPickupTests.cs@@ -6,7 +6,7 @@ namespace Aetheris.Kernel.Firmament.Tests;public sealed class FunctionalPickupTests{- private static string Source => File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/Feature/pickup-functional.firmament"));+ private static string Source => FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/Feature/pickup-functional.firmament")));[Fact]public void PickupHasEightNamedBossesPrivateProfilesAndOneExactClosedBody()@@ -97,7 +97,7 @@ public sealed class FunctionalPickupTests[InlineData("Point2 LowerCenter", "Point2 WrongCenter", "firmament-boundary2-invalid-dimensions")]public void InvalidPickupStopsAtTheOwningSemanticBoundary(string before, string after, string diagnostic){- var result = FirmamentBuildAndExport.CompileSource(Source.Replace(before, after));+ var result = FirmamentBuildAndExport.CompileSource(Source.ReplaceRequired(before, after));Assert.False(result.IsSuccess);Assert.Contains(result.Diagnostics, d => d.Message.StartsWith(diagnostic, StringComparison.Ordinal));}@@ -105,7 +105,7 @@ public sealed class FunctionalPickupTests[Fact]public void WithOverrideChangesPoleSpacingAndExpansionRemainsDeterministic(){- var source = Source.Replace("Humbucker<Spec: StandardPickup>", "Humbucker<Spec: BridgePickupSpec>")+ var source = Source.ReplaceRequired("Humbucker<Spec: StandardPickup>", "Humbucker<Spec: BridgePickupSpec>").Replace("with { PolePitch: 10.2mm }", "with { PolePitch: 10.4mm }");var first = FirmamentBuildAndExport.CompileSource(source);var second = FirmamentBuildAndExport.CompileSource(source);diff --git a/Aetheris.Kernel.Firmament.Tests/PlanarPlateauTests.cs b/Aetheris.Kernel.Firmament.Tests/PlanarPlateauTests.csindex 91bee6a8..6f6bddca 100644--- a/Aetheris.Kernel.Firmament.Tests/PlanarPlateauTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/PlanarPlateauTests.cs@@ -11,7 +11,7 @@ public sealed class PlanarPlateauTests[Fact]public void MixedFootprintProducesExactContactsAndG2PatchJoins(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/smooth-corner-sections.firmament");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/smooth-corner-sections.firmament"));var input = SectionChainAuthoringParser.Compile(source, materialize: false);Assert.True(input.IsSuccess, string.Join("\n", input.Diagnostics));var section = input.Chain!.Sections[0];@@ -23,7 +23,7 @@ public sealed class PlanarPlateauTests[Fact]public void MixedPlateauGraftsTrimmedManifoldAndPreservesBaseTopology(){- var input = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/smooth-corner-sections.firmament"), false).Chain!.Sections[0];+ var input = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/smooth-corner-sections.firmament")), false).Chain!.Sections[0];var source = BrepPrimitives.CreateBox(100, 80, 5).Value;var top = source.Bindings.FaceBindings.Single(b => source.Geometry.GetSurface(b.SurfaceGeometryId).Plane is { } p && p.Normal.ToVector().Z > .99);var frame = input.Frame with { Origin = new Point3D(0, 0, 2.5) };@@ -62,7 +62,7 @@ public sealed class PlanarPlateauTests[InlineData(10)]public void SemanticPlateauWorksAtSeveralScales(double scale){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament"));source = System.Text.RegularExpressions.Regex.Replace(source, @"([-+]?\d+(?:\.\d+)?)mm", m =>(double.Parse(m.Groups[1].Value, System.Globalization.CultureInfo.InvariantCulture) * scale).ToString("R", System.Globalization.CultureInfo.InvariantCulture) + "mm");var built = FirmamentBuildAndExport.CompileSource(source);@@ -80,7 +80,7 @@ public sealed class PlanarPlateauTests[InlineData("Size: [60mm,40mm]", "Size: [120mm,40mm]", "plateau-contact-outside-support")]public void InvalidPlateausFailBeforeExport(string from, string to, string error){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament").Replace(from, to);+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament")).Replace(from, to);var result = FirmamentBuildAndExport.CompileSource(source);Assert.False(result.IsSuccess);Assert.Contains(result.Diagnostics, d => d.Message == error);@@ -89,7 +89,7 @@ public sealed class PlanarPlateauTests[Fact]public void TightCornersAndStraightOnlyLoopsShareTheSamePath(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament"));var tight = FirmamentBuildAndExport.CompileSource(source.Replace("CornerExtent: 8mm", "CornerExtent: 1mm"));Assert.True(tight.IsSuccess, string.Join("\n", tight.Diagnostics.Select(d => d.Message)));Assert.All(tight.Value.Plateau!.Contacts.Joins, j => Assert.Equal("G2WithinSampledTolerance", j.Status));@@ -107,7 +107,7 @@ public sealed class PlanarPlateauTests[InlineData("Rect2 BaseBoundary { Center: [0mm,0mm] Size: [100mm,80mm] }", "RoundedRect2 BaseBoundary { Center: [0mm,0mm] Size: [100mm,80mm] Radius: 18mm }")]public void ParametersRegenerateThroughOrdinaryPipeline(string from, string to){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament"));Assert.Contains(from, source);var result = FirmamentBuildAndExport.CompileSource(source.Replace(from, to));Assert.True(result.IsSuccess, string.Join("\n", result.Diagnostics.Select(d => d.Message)));@@ -131,7 +131,7 @@ public sealed class PlanarPlateauTests[Fact]public void PolynomialPcurvesKeepDegreeKnotsAndExactPlaneParameters(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/Surfacing/g2-planar-plateau.firmament"));var built = FirmamentBuildAndExport.CompileSource(source);Assert.True(built.IsSuccess);Assert.True(built.Value.Plateau!.Pcurves.MaximumReconstructionDeviation < 1e-9);diff --git a/Aetheris.Kernel.Firmament.Tests/SectionChainAuthoringTests.cs b/Aetheris.Kernel.Firmament.Tests/SectionChainAuthoringTests.csindex 6ee1fc43..35f8b467 100644--- a/Aetheris.Kernel.Firmament.Tests/SectionChainAuthoringTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/SectionChainAuthoringTests.cs@@ -8,7 +8,7 @@ public sealed class SectionChainAuthoringTests[Fact]public void SolidLoftBuildsCappedRuledCircleToEllipse(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/solid-loft-common-ray.firmament");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/solid-loft-common-ray.firmament"));var result = SectionChainAuthoringParser.Compile(source);Assert.True(result.IsSuccess, string.Join(Environment.NewLine, result.Diagnostics));Assert.Equal(4, result.Chain!.Sections[0].Profile.Spans.Count);@@ -21,7 +21,7 @@ public sealed class SectionChainAuthoringTests[Fact]public void HollowLoftCommonRayRemovesLampShadePhaseTwist(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/ThreeDm/lamp-shade-loft.firmament");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/ThreeDm/lamp-shade-loft.firmament"));var result = SectionChainAuthoringParser.Compile(source);Assert.True(result.IsSuccess, string.Join(Environment.NewLine, result.Diagnostics));Assert.Equal(SectionTransitionPolicy.Ruled, result.Chain!.TransitionPolicy);@@ -41,7 +41,7 @@ public sealed class SectionChainAuthoringTests[Fact]public void HollowLoftTwistBuildsRuledHyperboloidWithMeasuredWaist(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/hollow-loft-twist.firmament");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/hollow-loft-twist.firmament"));var result = SectionChainAuthoringParser.Compile(source);Assert.True(result.IsSuccess, string.Join(Environment.NewLine, result.Diagnostics));var rear = result.Chain!.Sections[0];@@ -61,7 +61,7 @@ public sealed class SectionChainAuthoringTests[Fact]public void HollowLoftRejectsTwistBeyondBound(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/hollow-loft-twist.firmament")+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/hollow-loft-twist.firmament")).Replace("Twist: 63deg", "Twist: 181deg", StringComparison.Ordinal);var result = SectionChainAuthoringParser.Compile(source);Assert.False(result.IsSuccess);@@ -71,7 +71,7 @@ public sealed class SectionChainAuthoringTests[Fact]public void HollowLoftRejectsMalformedTwistInsteadOfUsingZero(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/hollow-loft-twist.firmament")+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/hollow-loft-twist.firmament")).Replace("Twist: 63deg", "Twist: accidental", StringComparison.Ordinal);var result = SectionChainAuthoringParser.Compile(source);Assert.False(result.IsSuccess);@@ -81,7 +81,7 @@ public sealed class SectionChainAuthoringTests[Fact]public void ExplicitSketchProfilesSupportTiltedRuledTransitions(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/explicit-sketch-ruled.firmament");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/explicit-sketch-ruled.firmament"));var result = SectionChainAuthoringParser.Compile(source);Assert.True(result.IsSuccess, string.Join(Environment.NewLine, result.Diagnostics));@@ -97,7 +97,7 @@ public sealed class SectionChainAuthoringTests[InlineData(64, 44, 9, 27)]public void SmoothCornersRemoveFootprintCurvatureJump(double width, double height, double extent, double rotation){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/smooth-corner-sections.firmament")+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/smooth-corner-sections.firmament")).Replace("Size: [60mm,40mm] CornerExtent: 8mm", FormattableString.Invariant($"Size: [{width}mm,{height}mm] CornerExtent: {extent}mm Rotation: {rotation}deg"));var result = SectionChainAuthoringParser.Compile(source);Assert.True(result.IsSuccess, string.Join("\n", result.Diagnostics));@@ -118,7 +118,7 @@ public sealed class SectionChainAuthoringTests[InlineData("21mm")]public void SmoothCornersRejectDegenerateSideSpans(string extent){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/smooth-corner-sections.firmament")+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/smooth-corner-sections.firmament")).Replace("CornerExtent: 8mm", "CornerExtent: " + extent);var result = SectionChainAuthoringParser.Compile(source);Assert.False(result.IsSuccess);@@ -129,8 +129,8 @@ public sealed class SectionChainAuthoringTests[Fact]public void RoundedProfileNormalizationReachesStepAndReportsRealCurvatureJump(){- var result = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.ReadFixtureText(- "fixtures/Canonical/SectionChain/normalized-rounded-sections.firmament"));+ var result = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText(+ "fixtures/Canonical/SectionChain/normalized-rounded-sections.firmament")));Assert.True(result.IsSuccess, string.Join("\n", result.Diagnostics));Assert.Equal(12, result.Materialization!.ProfileNormalization!.Curves.Count);Assert.All(result.Materialization.GeometricJoins.Where(j => j.BoundaryKind == "NeighboringProfileSpans"), j =>@@ -147,8 +147,8 @@ public sealed class SectionChainAuthoringTests[Fact]public void G2RequestIsNotSilentlyDowngradedToNormalizedG1(){- var result = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.ReadFixtureText(- "fixtures/Canonical/SectionChain/normalized-rounded-sections.firmament").Replace("Continuity: G1", "Continuity: G2"));+ var result = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText(+ "fixtures/Canonical/SectionChain/normalized-rounded-sections.firmament")).Replace("Continuity: G1", "Continuity: G2"));Assert.False(result.IsSuccess);Assert.Contains("section-chain-continuity-invalid:G2", result.Diagnostics);Assert.Null(result.Materialization);@@ -163,7 +163,7 @@ public sealed class SectionChainAuthoringTests[InlineData("g0-explicit-ruled.firmament", 2, SectionTermination.Cap, SectionTermination.Cap)]public void CanonicalFixtureCorpusQualifies(string name, int count, SectionTermination start, SectionTermination end){- var result = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/" + name));+ var result = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/" + name)));Assert.True(result.IsSuccess, string.Join(Environment.NewLine, result.Diagnostics));Assert.Equal(count, result.Chain!.Sections.Count);Assert.Equal(start, result.Chain.StartTermination);@@ -173,8 +173,8 @@ public sealed class SectionChainAuthoringTests[Fact]public void ContinuityIntentSelectsTheSeparatedTransitionLaw(){- var g1 = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/g1-two-transition.firmament"));- var g0 = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/g0-explicit-ruled.firmament"));+ var g1 = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/g1-two-transition.firmament")));+ var g0 = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/g0-explicit-ruled.firmament")));Assert.True(g1.IsSuccess, string.Join(Environment.NewLine, g1.Diagnostics));Assert.True(g0.IsSuccess, string.Join(Environment.NewLine, g0.Diagnostics));Assert.Equal(SectionChainContinuity.G1, g1.Chain!.Continuity);@@ -186,7 +186,7 @@ public sealed class SectionChainAuthoringTests[Fact]public void InvalidFoldoverFixtureFailsBeforeAnyStepArtifact(){- var result = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.ReadFixtureText("fixtures/Invalid/SectionChain/transition-foldover.firmament"));+ var result = SectionChainAuthoringParser.Compile(FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Invalid/SectionChain/transition-foldover.firmament")));Assert.False(result.IsSuccess);Assert.Contains(result.Diagnostics, diagnostic => diagnostic.StartsWith("section-chain-transition-foldover:A->B/", StringComparison.Ordinal));Assert.Null(result.Materialization?.Body);@@ -195,7 +195,7 @@ public sealed class SectionChainAuthoringTests[Fact]public void CanonicalConceptPathsLowerThroughSemanticSectionChainIrAndMaterialize(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/two-section-ruled.firmament");+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/two-section-ruled.firmament"));var result = SectionChainAuthoringParser.Compile(source);Assert.True(result.IsSuccess, string.Join(Environment.NewLine, result.Diagnostics));@@ -212,7 +212,7 @@ public sealed class SectionChainAuthoringTests[Fact]public void DuplicateExplicitTargetCorrespondenceFailsBeforeMaterialization(){- var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/two-section-ruled.firmament")+ var source = FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/SectionChain/two-section-ruled.firmament")).Replace("Start: Cap", "Correspond Bad {\n From: Start\n To: End\n Bottom -> Bottom\n Right -> Bottom\n Top -> Top\n Left -> Left\n }\n Start: Cap", StringComparison.Ordinal);var result = SectionChainAuthoringParser.Compile(source);Assert.False(result.IsSuccess);diff --git a/Aetheris.Kernel.Firmament.Tests/SemanticAuthorityConvergenceTests.cs b/Aetheris.Kernel.Firmament.Tests/SemanticAuthorityConvergenceTests.csindex 08e3ee44..b17955e8 100644--- a/Aetheris.Kernel.Firmament.Tests/SemanticAuthorityConvergenceTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/SemanticAuthorityConvergenceTests.cs@@ -10,7 +10,7 @@ public sealed class SemanticAuthorityConvergenceTests[Fact]public void SequentialBosses_ResolveTopAgainstCurrentFootprintSupport(){- var source=File.ReadAllText(Fixture("Canonical/Features/Composition/boss-stack-current-top.firmament"));+ var source=FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Composition/boss-stack-current-top.firmament")));var parsed=PrismaticProfileCompositionParser.Parse(source);Assert.Empty(parsed.Diagnostics);var stack=Assert.IsType<PrismaticSectionStackConstruction>(PrismaticSectionStackCompiler.Normalize(parsed,out var diagnostics));@@ -30,7 +30,7 @@ public sealed class SemanticAuthorityConvergenceTests[Fact]public void ExplicitBaseTop_RemainsDistinctFromRelativeCurrentTop(){- var source=File.ReadAllText(Fixture("Canonical/Features/Composition/boss-stack-current-top.firmament"))+ var source=FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Composition/boss-stack-current-top.firmament"))).Replace("Boss Upper { On: Top;","Boss Upper { On: Base.Top;",StringComparison.Ordinal);var parsed=PrismaticProfileCompositionParser.Parse(source);Assert.Empty(parsed.Diagnostics);var upper=Assert.Single(parsed.Feature!.Bosses!,x=>x.Name=="Upper");@@ -42,7 +42,7 @@ public sealed class SemanticAuthorityConvergenceTests[Fact]public void EqualCurrentTopSupports_FailWithTypedAmbiguity(){- var parsed=PrismaticProfileCompositionParser.Parse(File.ReadAllText(Fixture("Invalid/FeatureComposition/feature-support-top-ambiguous.firmament")));+ var parsed=PrismaticProfileCompositionParser.Parse(FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Invalid/FeatureComposition/feature-support-top-ambiguous.firmament"))));Assert.Null(parsed.Feature);Assert.Contains(parsed.Diagnostics,x=>x.StartsWith("feature-support-ambiguous:Top:feature=Bridge:candidates=Left,Right",StringComparison.Ordinal));}@@ -50,9 +50,9 @@ public sealed class SemanticAuthorityConvergenceTests[Fact]public void MultipleBaseRoles_FailTypedWithoutRawSingleException(){- var exception=Record.Exception(()=>PrismaticProfileCompositionParser.Parse(File.ReadAllText(Fixture("Invalid/FeatureComposition/compose-multiple-base.firmament"))));+ var exception=Record.Exception(()=>PrismaticProfileCompositionParser.Parse(FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Invalid/FeatureComposition/compose-multiple-base.firmament")))));Assert.Null(exception);- var parsed=PrismaticProfileCompositionParser.Parse(File.ReadAllText(Fixture("Invalid/FeatureComposition/compose-multiple-base.firmament")));+ var parsed=PrismaticProfileCompositionParser.Parse(FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Invalid/FeatureComposition/compose-multiple-base.firmament"))));Assert.Null(parsed.Feature);Assert.Contains("compose-role-cardinality:Base:expected=1:actual=2",parsed.Diagnostics);}@@ -60,7 +60,7 @@ public sealed class SemanticAuthorityConvergenceTests[Fact]public void PrimitiveBoxCounterboreThenChamfer_UsesCombinedCurrentStatePlanAndRoundTrips(){- var build=FirmamentBuildAndExport.CompileSource(File.ReadAllText(Fixture("Canonical/Features/Composition/box-counterbore-chamfer.firmament")));+ var build=FirmamentBuildAndExport.CompileSource(FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Composition/box-counterbore-chamfer.firmament"))));Assert.True(build.IsSuccess,string.Join("; ",build.Diagnostics.Select(x=>x.Message)));Assert.Equal("CombinedHoleEdgeFinish",build.Value!.Combined!.Route);var bottomArea=10d*15d;var topArea=8d*13d;@@ -70,7 +70,7 @@ public sealed class SemanticAuthorityConvergenceTestsvar imported=Step242Importer.ImportBody(build.Value.StepText);Assert.True(imported.IsSuccess,string.Join("; ",imported.Diagnostics.Select(x=>x.Message)));Assert.True(BrepMassProperties.Evaluate(imported.Value!).IsEnclosed);Assert.True(build.Value.StepText.Contains("CYLINDRICAL_SURFACE",StringComparison.Ordinal));- var repeated=FirmamentBuildAndExport.CompileSource(File.ReadAllText(Fixture("Canonical/Features/Composition/box-counterbore-chamfer.firmament")));+ var repeated=FirmamentBuildAndExport.CompileSource(FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical/Features/Composition/box-counterbore-chamfer.firmament"))));Assert.True(repeated.IsSuccess,string.Join("; ",repeated.Diagnostics.Select(x=>x.Message)));Assert.Equal(build.Value.StepText,repeated.Value!.StepText);}diff --git a/Aetheris.Kernel.Firmament.Tests/SurfX2BlendBoundaryTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfX2BlendBoundaryTests.csindex 3ce17011..bca23a42 100644--- a/Aetheris.Kernel.Firmament.Tests/SurfX2BlendBoundaryTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/SurfX2BlendBoundaryTests.cs@@ -33,7 +33,7 @@ public sealed class SurfX2BlendBoundaryTests[Fact]public void CandidateSetWinnerDeltaAndStepAreDeterministic(){- var source = File.ReadAllText(Fixture("Canonical", "Sculpting", "surf-x2-judged-housing.firmament"));+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical", "Sculpting", "surf-x2-judged-housing.firmament")));var first = SculptingAuthoring.Compile(source); var second = SculptingAuthoring.Compile(source);Assert.True(first.IsSuccess); Assert.True(second.IsSuccess);@@ -62,7 +62,7 @@ public sealed class SurfX2BlendBoundaryTests[Fact]public void ExplicitFallbackAndEligibleManualOverrideAreVisible(){- var source = File.ReadAllText(Fixture("Canonical", "Sculpting", "surf-x2-judged-housing.firmament"));+ var source = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical", "Sculpting", "surf-x2-judged-housing.firmament")));var fallback = SculptingAuthoring.Compile(source.Replace("Minimum: G2", "Minimum: G1", StringComparison.Ordinal).Replace("MaximumDegree: 10", "MaximumDegree: 4", StringComparison.Ordinal));Assert.True(fallback.IsSuccess, string.Join(" | ", fallback.Diagnostics.Select(item => item.Message)));Assert.Equal("PowerM2Degree4", fallback.OutputState!.BlendJudgment!.SelectedCandidateId);diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceSpanSupportX1Tests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceSpanSupportX1Tests.csindex 3496f321..23add408 100644--- a/Aetheris.Kernel.Firmament.Tests/SurfaceSpanSupportX1Tests.cs+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceSpanSupportX1Tests.cs@@ -73,8 +73,8 @@ public sealed class SurfaceSpanSupportX1Tests[Fact]public void CounterborePattern_ValidatesEveryExpandedInstanceAndIdentifiesFailure(){- var validSource = File.ReadAllText(Fixture("Canonical", "Span", "plane-hole-support.firmament"));- var invalidSource = File.ReadAllText(Fixture("Invalid", "Span", "plane-hole-footprint-crossing.firmament"));+ var validSource = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical", "Span", "plane-hole-support.firmament")));+ var invalidSource = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Invalid", "Span", "plane-hole-footprint-crossing.firmament")));var valid = FirmamentBuildAndExport.CompileSource(validSource);Assert.True(valid.IsSuccess, string.Join(Environment.NewLine, valid.Diagnostics.Select(item => item.Message)));@@ -140,8 +140,8 @@ public sealed class SurfaceSpanSupportX1Tests[Fact]public void SpanSupportAndEquivalentWholePlaneSupport_ExportIdenticalGeometry(){- var boundedSource = File.ReadAllText(Fixture("Canonical", "Span", "plane-hole-support.firmament"));- var wholePlaneSource = boundedSource.Replace("On: MountingArea", "On: +Z", StringComparison.Ordinal);+ var boundedSource = FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(Fixture("Canonical", "Span", "plane-hole-support.firmament")));+ var wholePlaneSource = boundedSource.ReplaceRequired("On: MountingArea", "On: +Z", StringComparison.Ordinal);var bounded = FirmamentBuildAndExport.CompileSource(boundedSource);var whole = FirmamentBuildAndExport.CompileSource(wholePlaneSource);diff --git a/Aetheris.Kernel.Firmament.Tests/WireFormTests.cs b/Aetheris.Kernel.Firmament.Tests/WireFormTests.csindex c54cf6ec..2a01a4fe 100644--- a/Aetheris.Kernel.Firmament.Tests/WireFormTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/WireFormTests.cs@@ -111,13 +111,13 @@ public sealed class WireFormTests[Fact]public void CylinderSurfaceCoil_IsAxisCoilEquivalentAndSurfaceFamiliesRetainClearanceLaw(){- var surface = WireFormAuthoring.Parse(File.ReadAllText(Fixture("Canonical", "WireForm", "cylinder-surface-coil.firmament"))).Value;+ var surface = WireFormAuthoring.Parse(File.ReadAllText(Fixture("Regression", "WireFormSurfaceSupport", "cylinder-surface-coil.firmament"))).Value;var cylinder = Assert.IsType<WireSurfaceCoilAir>(surface.Operations[0]); Assert.Equal("Cylinder", cylinder.SupportKind); Assert.Equal(1d, cylinder.MeasuredSupportClearanceMm);var axisSource = File.ReadAllText(Fixture("Canonical", "WireForm", "axis-coil.firmament")).Replace("Radius: 12mm", "Radius: 12mm").Replace("Turns: 8", "Turns: 6").Replace("Pitch: 5mm", "Pitch: 5mm");var axis = Assert.IsType<WireAxisCoilAir>(WireFormAuthoring.Parse(axisSource).Value.Operations[0]);for (var i = 0; i <= 100; i++) Assert.True((axis.Evaluate(i / 100d) - cylinder.Evaluate(i / 100d)).Length < 1e-9);- foreach (var fixture in new[] { "frustum-surface-coil", "sphere-surface-coil" }) { var parsed = WireFormAuthoring.Parse(File.ReadAllText(Fixture("Canonical", "WireForm", fixture + ".firmament"))); Assert.True(parsed.IsSuccess); var coil = Assert.IsType<WireSurfaceCoilAir>(parsed.Value.Operations[0]); Assert.Equal(1d, coil.MeasuredSupportClearanceMm); Assert.True(coil.MinimumSelfClearanceMm > 0d); Assert.True(coil.ApproximationError.MaxMm <= coil.ApproximationToleranceMm); }- var blender = Assert.IsType<WireSurfaceCoilAir>(WireFormAuthoring.Parse(File.ReadAllText(Fixture("Canonical", "WireForm", "blender-ball-coil.firmament"))).Value.Operations[0]);+ foreach (var fixture in new[] { "frustum-surface-coil", "sphere-surface-coil" }) { var parsed = WireFormAuthoring.Parse(File.ReadAllText(Fixture("Regression", "WireFormSurfaceSupport", fixture + ".firmament"))); Assert.True(parsed.IsSuccess); var coil = Assert.IsType<WireSurfaceCoilAir>(parsed.Value.Operations[0]); Assert.Equal(1d, coil.MeasuredSupportClearanceMm); Assert.True(coil.MinimumSelfClearanceMm > 0d); Assert.True(coil.ApproximationError.MaxMm <= coil.ApproximationToleranceMm); }+ var blender = Assert.IsType<WireSurfaceCoilAir>(WireFormAuthoring.Parse(File.ReadAllText(Fixture("Regression", "WireFormSurfaceSupport", "blender-ball-coil.firmament"))).Value.Operations[0]);Assert.Equal("Sphere", blender.SupportKind); Assert.Equal("CaptiveBallProxy", blender.SupportName); Assert.Equal("LatitudeProgression", blender.ProgressionLaw);}diff --git a/Aetheris.Kernel.Firmament.Tests/WireLineGuideTests.cs b/Aetheris.Kernel.Firmament.Tests/WireLineGuideTests.csindex 7975196c..121f520f 100644--- a/Aetheris.Kernel.Firmament.Tests/WireLineGuideTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/WireLineGuideTests.cs@@ -5,7 +5,7 @@ namespace Aetheris.Kernel.Firmament.Tests;public sealed class WireLineGuideTests{- private static string Source => FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/WireForm/line-guide.firmament");+ private static string Source => FirmamentCorpusHarness.CanonicalMutationSource(FirmamentCorpusHarness.ReadFixtureText("fixtures/Canonical/WireForm/line-guide.firmament"));[Fact]public void LockedGuideSurvivesAutomaticEntryAndExactStepRoundtrip(){@@ -32,7 +32,7 @@ public sealed class WireLineGuideTests[InlineData("HarnessLayout.Groove", "HarnessLayout.Missing", "guide-unresolved")]public void UnsupportedGuideIntentHasNamedFailure(string from, string to, string diagnostic){- var result = WireFormAuthoring.Parse(Source.Replace(from, to));+ var result = WireFormAuthoring.Parse(Source.ReplaceRequired(from, to));Assert.False(result.IsSuccess);Assert.Contains(result.Diagnostics, d => d.Message.Contains(diagnostic));}@@ -40,7 +40,7 @@ public sealed class WireLineGuideTests[Fact]public void ReverseGuideKeepsTheRequestedIntervalAndTangentExit(){- var source = Source.Replace("Point3(0mm,-40mm,0mm)", "Point3(100mm,-40mm,0mm)")+ var source = Source.ReplaceRequired("Point3(0mm,-40mm,0mm)", "Point3(100mm,-40mm,0mm)").Replace("From: 20mm", "From: 80mm").Replace("Direction: Forward", "Direction: Reverse").Replace("Point3(120mm,0mm,0mm)", "Point3(-20mm,0mm,0mm)");var parsed = WireFormAuthoring.Parse(source);diff --git a/Aetheris.Kernel.Firmament.Tests/WirePointRouteTests.cs b/Aetheris.Kernel.Firmament.Tests/WirePointRouteTests.csindex 60dc7d82..4a0d91de 100644--- a/Aetheris.Kernel.Firmament.Tests/WirePointRouteTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/WirePointRouteTests.cs@@ -5,7 +5,7 @@ namespace Aetheris.Kernel.Firmament.Tests;public sealed class WirePointRouteTests{- private static string Source => File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/WireForm/point-route.firmament"));+ private static string Source => FirmamentCorpusHarness.CanonicalMutationSource(File.ReadAllText(FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/WireForm/point-route.firmament")));[Fact]public void ArbitraryPlaneRouteDerivesTangentFilletAndExportsExactManifold()@@ -32,7 +32,7 @@ public sealed class WirePointRouteTests[Fact]public void ExplicitPoint2LiftingUsesSharedFrameTranslationAndRotation(){- var source = Source.Replace("At: Point3(20mm,30mm,20mm);", "At: Point2(20mm,20mm); On { From: World; TranslateLocal: [0mm,30mm,0mm]; RotateLocal: { Axis: X; Angle: 90deg } }");+ var source = Source.ReplaceRequired("At: Point3(20mm,30mm,20mm);", "At: Point2(20mm,20mm); On { From: World; TranslateLocal: [0mm,30mm,0mm]; RotateLocal: { Axis: X; Angle: 90deg } }");var parsed = WireFormAuthoring.Parse(source);Assert.True(parsed.IsSuccess, string.Join("\n", parsed.Diagnostics));Assert.True((parsed.Value.EndState.Position - new Point3D(20, 30, 20)).Length < 1e-12);@@ -50,7 +50,7 @@ public sealed class WirePointRouteTests[InlineData("At: Point3(20mm,30mm,20mm);", "At: Point2(20mm,20mm);", "point-invalid")]public void InvalidOrUnsupportedIntentProducesNamedDiagnostic(string before, string after, string code){- var parsed = WireFormAuthoring.Parse(Source.Replace(before, after));+ var parsed = WireFormAuthoring.Parse(Source.ReplaceRequired(before, after));Assert.False(parsed.IsSuccess);Assert.Contains(parsed.Diagnostics, d => d.Message.Contains("wire-route-" + code));}diff --git a/Aetheris.Kernel.Firmament/Assembly/AssemblyFrameAuthoring.cs b/Aetheris.Kernel.Firmament/Assembly/AssemblyFrameAuthoring.csindex 4b4aaefb..76bae6c4 100644--- a/Aetheris.Kernel.Firmament/Assembly/AssemblyFrameAuthoring.cs+++ b/Aetheris.Kernel.Firmament/Assembly/AssemblyFrameAuthoring.cs@@ -186,6 +186,11 @@ internal static class AssemblyFrameAuthoringdiagnostics.Add(new("assembly-placement-authority-conflict", $"Anchored occurrence '{path}' cannot also have authored placement."));bool DrivesOccurrence(MateSource mate){+ bool Inside(MateRoleAssignment role) => role.Participant.ToString() == path+ || role.Participant.ToString().StartsWith(path + ".", StringComparison.Ordinal);+ // A child's mate does not drive placement of its container.+ // Only endpoints owned by this occurrence can compete with it.+ if (mate.Roles.All(Inside)) return false;var definition = source.Interfaces.FirstOrDefault(d => d.Name == mate.InterfaceName);var movingRole = "B";if (definition?.Family == MechanicalInterfaceFamily.Fixed)@@ -198,7 +203,9 @@ internal static class AssemblyFrameAuthoring|| source.Anchor.ToString().StartsWith(bOwner.Path + ".", StringComparison.Ordinal))) movingRole = "A";}return mate.Roles.Any(r => (r.Role == movingRole || r.Role == "Moving")- && (r.Participant.ToString() == path || r.Participant.ToString().StartsWith(path + ".", StringComparison.Ordinal)));+ && original.Where(i => r.Participant.ToString() == i.Path.ToString()+ || r.Participant.ToString().StartsWith(i.Path + ".", StringComparison.Ordinal))+ .OrderByDescending(i => i.Path.Segments.Count).FirstOrDefault()?.StableId == owner.StableId);}if (member.ExplicitTransform is not null || source.Mates.Any(DrivesOccurrence))diagnostics.Add(new("assembly-placement-authority-conflict", $"Occurrence '{path}' has both authored placement and another placement driver."));diff --git a/Aetheris.Kernel.Firmament/FirmamentFrontendSchema.cs b/Aetheris.Kernel.Firmament/FirmamentFrontendSchema.csindex 42bc3f7e..4e3498d5 100644--- a/Aetheris.Kernel.Firmament/FirmamentFrontendSchema.cs+++ b/Aetheris.Kernel.Firmament/FirmamentFrontendSchema.cs@@ -73,7 +73,7 @@ public static class FirmamentFrontendSchemasreturn new($"firmament-feature-schema-unsupported:{schema}", "fatal", $"Feature recipes are not supported by schema {schema}.");var detected = DetectDistinctFrontend(source);if (detected is null && FirmamentV2Parser.MechanicalDeclarations(syntax.Statements)- .Any(d => FirmamentV2Parser.IsPrimitiveDeclaration(d) || d.Type.Name.Text is "Compose" or "Extrude" or "Revolve" || Enum.TryParse<GearFamily>(d.Type.Name.Text, out _)))+ .Any(d => FirmamentV2Parser.IsPrimitiveDeclaration(d) || d.Type.Name.Text is "Compose" or "Extrude" or "Revolve" or "BodyState" or "SculptState" || Enum.TryParse<GearFamily>(d.Type.Name.Text, out _)))detected = FirmamentFrontendSchema.Mechanical;return detected is not null && detected != schema? new($"firmament-schema-mismatch:declared={schema}:source={detected}", "fatal", $"Schema {schema} cannot compile a {detected} document.") : null;diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/SectionChainAuthoringParser.cs b/Aetheris.Kernel.Firmament/FirmamentV2/SectionChainAuthoringParser.csindex 32b558bb..4a4e968a 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/SectionChainAuthoringParser.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/SectionChainAuthoringParser.cs@@ -38,8 +38,16 @@ public static class SectionChainAuthoringParserreturn source is null || errors.Count != 0 ? new(false, null, null, errors.Select(d => d.Code + ":" + d.Message).ToArray()): Compile(source, materialize);}- public static bool IsSectionChainSource(string source) => FirmamentV2Parser.MechanicalDeclarations(FirmamentSyntaxParser.Parse(source).Document.Statements)- .Any(d => d.Type.Name.Text is "SectionChain" or "Loft");+ public static bool IsSectionChainSource(string source)+ {+ var declarations = FirmamentV2Parser.MechanicalDeclarations(FirmamentSyntaxParser.Parse(source).Document.Statements).ToArray();+ var sculpting = declarations.Any(d => d.Type.Name.Text is "BodyState" or "SculptState");+ // Surfacing owns its Station-shaped construction chains. Do not steal+ // their containing document; ordinary Section/Loft productions still+ // claim mixed documents so unsupported material cannot disappear.+ return declarations.Any(d => d.Type.Name.Text == "Loft" || d.Type.Name.Text == "SectionChain"+ && (!sculpting || d.Body?.Statements.OfType<DeclarationSyntax>().Any(s => s.Type.Name.Text == "Station") != true));+ }public static SectionChainAuthoringResult Compile(string source, bool materialize = true){diff --git a/Aetheris.Modules.Tests/SurfX0SculptingTests.cs b/Aetheris.Modules.Tests/SurfX0SculptingTests.csindex f4c820f5..b023192a 100644--- a/Aetheris.Modules.Tests/SurfX0SculptingTests.cs+++ b/Aetheris.Modules.Tests/SurfX0SculptingTests.cs@@ -6,6 +6,27 @@ namespace Aetheris.Modules.Tests;public sealed class SurfX0SculptingTests{+ [Fact]+ public void PreferredFieldAliasesPreserveHousingIdentityAndExactStep()+ {+ var path = Path.Combine(RepositoryRoot(), "fixtures/Canonical/Sculpting/sculpted-housing.firmament");+ var source = File.ReadAllText(path);+ var preferred = source.Replace("Units:", "units:").Replace("Size:", "size:")+ .Replace("Center:", "center:").Replace("Diameter:", "diameter:")+ .Replace("Input:", "input:").Replace("Output:", "output:");+ var first = SculptingAuthoring.Compile(source);+ var second = SculptingAuthoring.Compile(preferred);+ Assert.True(first.IsSuccess, string.Join(';', first.Diagnostics));+ Assert.True(second.IsSuccess, string.Join(';', second.Diagnostics));+ Assert.Equal(first.OutputState!.StateId, second.OutputState!.StateId);+ Assert.Equal(SculptStepExporter.Export(first.OutputState, first.ModelName).Step,+ SculptStepExporter.Export(second.OutputState, second.ModelName).Step);+ var malformed = SculptingAuthoring.Compile(preferred.Replace("center:", "heigth:"));+ Assert.False(malformed.IsSuccess);+ Assert.Contains(malformed.Diagnostics, d => d.Code == "sculpt-field-invalid");+ Assert.Empty(malformed.States);+ }+[Fact]public void CanonicalOffsetRegionProducesImmutableSinglePredecessorStateAndInspectableDelta(){diff --git a/Aetheris.SheetMetal.Tests/SheetMetalSemanticSyntaxTests.cs b/Aetheris.SheetMetal.Tests/SheetMetalSemanticSyntaxTests.csindex 5b0595ce..4ff2aae9 100644--- a/Aetheris.SheetMetal.Tests/SheetMetalSemanticSyntaxTests.cs+++ b/Aetheris.SheetMetal.Tests/SheetMetalSemanticSyntaxTests.cs@@ -5,6 +5,23 @@ namespace Aetheris.SheetMetal.Tests;public sealed class SheetMetalSemanticSyntaxTests{+ [Theory]+ [InlineData("l-bracket-with-hole")]+ [InlineData("l-bracket-multiple-holes")]+ [InlineData("sensor-bracket")]+ [InlineData("u-channel")]+ public void SharedProfileOnImplicitBasePreservesLegacyGeometryAndIdentities(string name)+ {+ var original = SheetMetalFirmament.CompileFile(Path.Combine(Repo, "fixtures/Compatibility/FirmamentV2/SheetMetal", name + ".firmament"));+ var modern = SheetMetalFirmament.CompileFile(Path.Combine(Repo, "fixtures/Canonical/SheetMetal", name + ".firmament"));+ Assert.Equal(Step(original), Step(modern));+ Assert.True(modern.Spec!.LegacySyntax);+ Assert.Equal(original.Part!.Regions.Select(r => r.StableId), modern.Part!.Regions.Select(r => r.StableId));+ Assert.Equal(original.Part.Bends.Select(b => b.StableId), modern.Part.Bends.Select(b => b.StableId));+ Assert.Equal(original.Part.Features.Select(f => f.StableId), modern.Part.Features.Select(f => f.StableId));+ Assert.Equal(original.FlatPattern!.DeterministicHash, modern.FlatPattern!.DeterministicHash);+ }+private static string Repo{getdiff --git a/Aetheris.SheetMetal/SheetMetalAuthoredLowering.cs b/Aetheris.SheetMetal/SheetMetalAuthoredLowering.csindex 35621f51..3382b84f 100644--- a/Aetheris.SheetMetal/SheetMetalAuthoredLowering.cs+++ b/Aetheris.SheetMetal/SheetMetalAuthoredLowering.cs@@ -117,6 +117,8 @@ internal static class AuthoredSheetMetalCompiler&& FirmamentSyntaxValues.TryMeasure(rectangle.Arguments[0].Value, "mm", out var w)&& FirmamentSyntaxValues.TryMeasure(rectangle.Arguments[1].Value, "mm", out var d))baseSpec = new("Base", w, d);+ else if (legacyBaseValue is not null)+ baseSpec = SheetMetalProfileBinding.Base(source, "Base", legacyBaseValue, Point3D.Origin, syntaxErrors, binding);else{var named = bases.SingleOrDefault();diff --git a/Aetheris.SheetMetal/SheetMetalProfileBinding.cs b/Aetheris.SheetMetal/SheetMetalProfileBinding.csindex 6dffb7bf..66576676 100644--- a/Aetheris.SheetMetal/SheetMetalProfileBinding.cs+++ b/Aetheris.SheetMetal/SheetMetalProfileBinding.cs@@ -16,6 +16,14 @@ internal static class SheetMetalProfileBindingvar origin = fields.Take("Origin");var offset = Vector3(origin) ?? Point3D.Origin;if (origin is not null && Vector3(origin) is null) errors.Add($"sheetmetal-base-origin-invalid: Base '{name}' origin requires three Length coordinates.");+ var result = Base(source, name, value, offset, errors, binding);+ fields.Complete();+ return result;+ }++ internal static AuthoredSheetBaseSpec? Base(string source, string name, ExpressionSyntax? value,+ Point3D offset, List<string> errors, FirmamentDomainBinding? binding = null)+ {AuthoredSheetBaseSpec? result = null;if (value is ObjectSyntax { Type: ReferenceSyntax { Name.Text: "Rectangle" } } legacy){@@ -37,7 +45,6 @@ internal static class SheetMetalProfileBinding{ Origin = new(offset.X + bounds.MinX, offset.Y + bounds.MinY, offset.Z) };else errors.Add($"sheetmetal-base-profile-unsupported: Base '{name}' requires one axis-aligned rectangular Profile; arbitrary blank boundaries are not admitted by the formed/flat lowerer.");}- fields.Complete();return result;}diff --git a/Aetheris.Surfacing/SculptingAuthoring.cs b/Aetheris.Surfacing/SculptingAuthoring.csindex 41be69e1..ff841b96 100644--- a/Aetheris.Surfacing/SculptingAuthoring.cs+++ b/Aetheris.Surfacing/SculptingAuthoring.cs@@ -22,7 +22,7 @@ public static class SculptingAuthoringvar patches = new Dictionary<string, BoundedSurfacePatch>(StringComparer.Ordinal);var sectionChains = new Dictionary<string, SectionChain>(StringComparer.Ordinal);var model = ModelHeader.Match(source); if (!model.Success) return Fail("<unknown>", "sculpt-source-malformed", "Sculpting source requires 'Model Name { ... }'.");- if (!Regex.IsMatch(source, @"\bUnits\s*:\s*mm\b", RegexOptions.CultureInvariant)) diagnostics.Add(new("sculpt-units-invalid", "SURF-X0 authoring requires millimetres."));+ if (!Regex.IsMatch(source, @"\b[Uu]nits\s*:\s*mm\b", RegexOptions.CultureInvariant)) diagnostics.Add(new("sculpt-units-invalid", "SURF-X0 authoring requires millimetres."));foreach (var block in Blocks(source, "SurfacePatch")){var degree = NumberVector(block.Body, "Degree", 2, diagnostics); var domain = NumberVector(block.Body, "Domain", 4, diagnostics);@@ -59,8 +59,9 @@ public static class SculptingAuthoringvar baseClock = Stopwatch.StartNew();foreach (var block in Blocks(source, "BodyState")){+ var errorsBefore = diagnostics.Count;var size = Vector(block.Body, "Size", 3, diagnostics); var holes = ParseHoles(block.Body, diagnostics);- if (size is null) continue;+ if (size is null || diagnostics.Count != errorsBefore) continue;var created = SculptedHousingFactory.CreateBase(block.Name, size[0], size[1], size[2], holes);if (!created.IsSuccess || created.OutputState is null) diagnostics.AddRange(created.Diagnostics);else if (!states.TryAdd(block.Name, created.OutputState)) diagnostics.Add(new("sculpt-state-duplicate", $"BodyState '{block.Name}' is declared more than once."));@@ -247,20 +248,24 @@ public static class SculptingAuthoringreturn result;}private static int MatchingBrace(string source, int open) { var depth = 0; var quoted = false; for (var i = open; i < source.Length; i++) { if (source[i] == '"' && (i == 0 || source[i - 1] != '\\')) quoted = !quoted; if (quoted) continue; if (source[i] == '{') depth++; else if (source[i] == '}' && --depth == 0) return i; } return -1; }- private static string? ScalarText(string body, string field) { var m = Regex.Match(body, $@"(?m)^\s*{Regex.Escape(field)}\s*:\s*(?<v>[A-Za-z_]\w*)\s*$", RegexOptions.CultureInvariant); return m.Success ? m.Groups["v"].Value : null; }+ // Alias only the first character of an owned field; authored values,+ // semantic paths and enum symbols remain case-sensitive.+ private static string FieldSpelling(string field) =>+ $"(?:{Regex.Escape(field)}|{Regex.Escape(char.ToLowerInvariant(field[0]) + field[1..])})";+ private static string? ScalarText(string body, string field) { var m = Regex.Match(body, $@"(?m)^\s*{FieldSpelling(field)}\s*:\s*(?<v>[A-Za-z_]\w*)\s*$", RegexOptions.CultureInvariant); return m.Success ? m.Groups["v"].Value : null; }private static int? Integer(string body, string field){- var match = Regex.Match(body, $@"(?m)^\s*{Regex.Escape(field)}\s*:\s*(?<v>\d+)\s*$", RegexOptions.CultureInvariant);+ var match = Regex.Match(body, $@"(?m)^\s*{FieldSpelling(field)}\s*:\s*(?<v>\d+)\s*$", RegexOptions.CultureInvariant);return match.Success && int.TryParse(match.Groups["v"].Value, NumberStyles.None, CultureInfo.InvariantCulture, out var value) ? value : null;}private static double? Length(string body, string field, List<SculptDiagnostic> diagnostics){- var m = Regex.Match(body, $@"(?m)^\s*{Regex.Escape(field)}\s*:\s*(?<v>[-+]?\d+(?:\.\d+)?)mm\s*$", RegexOptions.CultureInvariant);+ var m = Regex.Match(body, $@"(?m)^\s*{FieldSpelling(field)}\s*:\s*(?<v>[-+]?\d+(?:\.\d+)?)mm\s*$", RegexOptions.CultureInvariant);if (m.Success) return double.Parse(m.Groups["v"].Value, CultureInfo.InvariantCulture); diagnostics.Add(new("sculpt-field-invalid", $"Field '{field}' requires a millimetre length.")); return null;}private static double[]? Vector(string body, string field, int count, List<SculptDiagnostic> diagnostics){- var m = Regex.Match(body, $@"(?m)^\s*{Regex.Escape(field)}\s*:\s*\[(?<v>[^\]]+)\]\s*$", RegexOptions.CultureInvariant);+ var m = Regex.Match(body, $@"(?m)^\s*{FieldSpelling(field)}\s*:\s*\[(?<v>[^\]]+)\]\s*$", RegexOptions.CultureInvariant);if (m.Success){var values = m.Groups["v"].Value.Split(',').Select(x => Regex.Match(x.Trim(), @"^(?<v>[-+]?\d+(?:\.\d+)?)mm$", RegexOptions.CultureInvariant)).ToArray();@@ -270,7 +275,7 @@ public static class SculptingAuthoring}private static IReadOnlyList<string> List(string body, string field){- var m = Regex.Match(body, $@"(?m)^\s*{Regex.Escape(field)}\s*:\s*\[(?<v>[^\]]*)\]\s*$", RegexOptions.CultureInvariant);+ var m = Regex.Match(body, $@"(?m)^\s*{FieldSpelling(field)}\s*:\s*\[(?<v>[^\]]*)\]\s*$", RegexOptions.CultureInvariant);return m.Success ? m.Groups["v"].Value.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) : [];}private static PreservationContract Preservation(string entity) => new(entity, entity == SculptedHousingFactory.MountingHolePattern ? PreservationMode.PatternPlacementAndDiameter : PreservationMode.ExactGeometry);@@ -288,7 +293,7 @@ public static class SculptingAuthoring}private static double[]? NumberVectorAny(string body, string field, List<SculptDiagnostic> diagnostics){- var match = Regex.Match(body, $@"(?m)^\s*{Regex.Escape(field)}\s*:\s*\[(?<v>[^\]]+)\]\s*$", RegexOptions.CultureInvariant);+ var match = Regex.Match(body, $@"(?m)^\s*{FieldSpelling(field)}\s*:\s*\[(?<v>[^\]]+)\]\s*$", RegexOptions.CultureInvariant);if (!match.Success) { diagnostics.Add(new("sculpt-field-invalid", $"Field '{field}' requires a dimensionless number list.")); return null; }var tokens = match.Groups["v"].Value.Split(',', StringSplitOptions.TrimEntries); var values = new double[tokens.Length];for (var i = 0; i < tokens.Length; i++) if (!double.TryParse(tokens[i], NumberStyles.Float, CultureInfo.InvariantCulture, out values[i]))diff --git a/docs/development/FIRMAMENT-LANGUAGE-DECISIONS-2026-10.md b/docs/development/FIRMAMENT-LANGUAGE-DECISIONS-2026-10.mdindex cc608746..52154634 100644--- a/docs/development/FIRMAMENT-LANGUAGE-DECISIONS-2026-10.md+++ b/docs/development/FIRMAMENT-LANGUAGE-DECISIONS-2026-10.md@@ -397,3 +397,26 @@ sheet audit. This is an implementation follow-up, not another shadow milestone.Boolean-composable domain EqualPitch/Mirror intrinsics remain separate work.Legacy domain checks are AST-owned; ordinary predicate/bundle Concepts use thecommon checker. These limits do not grant apparent successful admission.++## V2 corpus modernization follow-up (2026-10-17)++The [corpus report](FIRMAMENT-V2-CORPUS-MODERNIZATION-2026-10.md) records the+current-source sweep, original outcomes, qualification levels and remaining+compiler-honesty failure. This does not close X2.++| Decision | Disposition | Rationale |+| --- | --- | --- |+| CORPUS-01: Preferred vocabulary | Applied | Use admitted camelCase fields/lowercase links and bare construction Path/2D shapes. Keep PascalCase aliases and authored/public identities. |+| CORPUS-02: Sheet boundaries | Applied | Shared Rect2 Profiles replace legacy rectangular boundaries without changing Slot geometry. Points and anchors use ordinary constructor calls. |+| CORPUS-03: Implicit Base identity | Fixed | Permit `base: profile` through the shared Base Profile binder. Preserve implicit region/bend IDs; a named Base is a distinct identity choice. Original source/geometry witnesses remain under Compatibility. |+| CORPUS-04: Relative assembly placement | Fixed | Use Parent for relative placement. Child-owned mates do not drive their containing occurrence; retain competing-authority rejection on the actual owner. |+| CORPUS-05: Surfacing casing/crash | Fixed, AST migration remains | Existing owner reads first-character field aliases and stops before construction after bad mounting data. A shared structural parse is not proof this independent reader is migrated. |+| CORPUS-06: Inner-loop segment identity | Fixed source | Give inner segments explicit aliases; preserve 4160 mm3 intended volume. |+| CORPUS-07: SurfaceCoil supports | Separate semantic/capability prerequisite | Preserve centerline-only witnesses outside Canonical. Define nonmaterial analytic support binding before admitting support solids plus wire output; never erase material implicitly. |+| CORPUS-08: Fixture qualification levels | Applied | Qualify modules through real consumers; inspect gear interfaces; record missing garment bodies separately. Solver-invalid and DFM-warning specimens are not syntax failures. Preserve the now-valid Rect2 TraceLoop specimen and use an open Line2 for the actual negative. |+| CORPUS-09: Piping optional fields | Open, next AST owner migration | Both lowercase connectionType and unknown fields currently disappear; validate/build accept. Migrate Piping's existing construct/field ownership to shared AST consumption before its casing sweep. Two pending source witnesses are intentionally not counted as correct admission. |+| CORPUS-10: Legacy semantic-panel Pattern | Deferred identity reconciliation | Keep existing PanelLayout.MountingHoles[index] public paths. Decide explicit identity projection when migrating this Count/Pitch bundle to keyed Feature expansion; do not change IDs for presentation alone. |+| CORPUS-11: Embedded BodyState chains | Fixed ownership | Station-shaped SectionChain construction data belongs to the containing surfacing document. Ordinary Section/Loft and explicit schema guards retain their own rejection behavior; validate/build/inspect must select the same owner. |++No additional fatality allowlist, source macro system or parallel frontend was+introduced. No decision above grants missing geometry or blanket X2 acceptance.diff --git a/docs/development/FIRMAMENT-V2-CORPUS-MODERNIZATION-2026-10.md b/docs/development/FIRMAMENT-V2-CORPUS-MODERNIZATION-2026-10.mdnew file mode 100644index 00000000..152fc200--- /dev/null+++ b/docs/development/FIRMAMENT-V2-CORPUS-MODERNIZATION-2026-10.md@@ -0,0 +1,310 @@+# Firmament V2 corpus modernization — 2026-10-17++## Result and scope++**Meaningful progression.** The current cookbook has been mechanically+modernized and four compiler blockers repaired. Full language consistency is+not claimed: the pass isolated a concrete remaining Piping admission defect.+The complete fixture collection was measured with its actual production+owners, including legacy, negative, experimental and module inputs.++Baseline revision: `a3b6e9549e47767659ec1fa702f851f59c17efec`.+The initial working tree was clean. The source sweep changes 295 current+canonical files, preserves authored/public identities, and moves four original+centerline-only SurfaceCoil specimens unchanged into regression evidence.+There are now 369 canonical `.firmament`/`.firmasm` files.++Historical negative inputs, compatibility sources, Claude's X4 cases/references,+geometry goldens, and speculative language inputs were not style-swept.+One stale negative was corrected with its original source preserved separately.+The full corpus collection is broader than the cookbook; structural acceptance+and domain inspection are not universal engineering-build qualification.++## Plan executed++1. Inventory the entire fixture collection and capture production-owner outcomes+ and existing canonical artifacts before source changes.+2. Modernize admitted vocabulary through the existing lexer/AST-aware formatter;+ use AST spans for bounded construction-alias and sheet Profile source edits.+3. Repair genuine compiler blockers in their existing owners; preserve original+ evidence and classify fixture/context errors separately.+4. Extend the existing canonical qualification manifest and runner to cover every+ current source with the correct owner or consuming product.+5. Rebuild, run focused/fast/full regressions, recollect production outcomes and+ compare STEP, identities and world transforms. Record unresolved seams.++## Source decisions++| Area | Applied decision |+| --- | --- |+| Built-in vocabulary | camelCase fields and lowercase admitted linking words; existing PascalCase aliases remain supported. |+| Public identities | Preserve Model/Struct names, Record fields, library parameter names, semantic ports, occurrence paths and Set keys. No global symbol renaming. |+| Construction declarations | Prefer bare `Path` and 2D shapes; remove redundant `Concept` modifiers from those declarations. Preserve requirement Concepts and `Concept Struct` layouts. |+| Sheet bases | Named shared `Profile = Rect2` with the same minimum corner and dimensions; implicit `base: blankProfile` preserves the historical Base identity family, while named Bases retain their names. |+| Sheet rectangular openings | Named shared Rect2 Profiles; preserve legacy rectangular Slot geometry rather than silently rounding it. |+| Sheet points/anchors | Prefer `Point2(...)` and `CenteredAt(...)`; preserve dimension expressions, product policies and public schema member casing. |+| Coil spelling | Prefer Helix in ordinary recipes; retain the explicitly named AxisCoil compatibility witness. |+| Raw placement matrices | Replace canonical LegacyExplicit declarations with readable parent-relative frame placements, preserving translation and rotation. Retain explicit-matrix compatibility coverage in the precision test. |+| Legacy sheet Pattern | Preserve the semantic-panel witness's `PanelLayout.MountingHoles[index]` identities. Replacing its Count/Pitch effect bundle with keyed Feature expansion is a separate public-identity migration. |+| Unmigrated domain properties | Retain their actually supported spelling. Do not pretend the formatter's metadata covers independently owned Piping/FEA/surfacing vocabularies. |++Sheet Slot dimensions were read from the owning lowering: direct legacy cuts+are rectangles with Length along local U and Width along V. The migration uses+that exact Rect2 size. Legacy layout Pattern Slots are a different capsule+contract and were not mechanically converted.++## Findings and repairs++### Implicit sheet Base spelling owns historical identities++Full regression caught a genuine identity change: rewriting `Base: Rectangle`+as `Base Base { profile: blank }` changed edge-based legacy region/bend IDs.+The parser used the presence of the implicit Base field to select that identity+family. Changing the disconnected-graph test's expected ID would have hidden+the migration defect.++The existing implicit Base field now accepts a shared Profile through the same+`SheetMetalProfileBinding.Base` capability authority as named Bases. The four+modern sources use `base: blankProfile`; no identity override or new parser+route was added. Four unchanged original sources are retained under+`Compatibility/FirmamentV2/SheetMetal`. Tests require exact formed STEP, region,+bend and feature IDs, and deterministic flat hashes to match.++### Nested assembly placement falsely conflicts with child mates++Replacing `fixed-nested-usd`'s relative matrix exposed+`assembly-placement-authority-conflict`: the frame owner treated a mate between+children as a driver of the containing assembly. The same overly broad prefix+test also prevented an explicitly placed grouping assembly from containing+externally mated child parts.++`AssemblyFrameAuthoring` now checks which occurrence owns the moving endpoint.+A child's driver does not compete with its container's placement; mates wholly+inside an assembly do not drive its placement either. Existing competing+authorities on the same occurrence continue to reject. A focused regression+checks the nested rotated parent's world coordinates and AP242 export; existing+USD tests retain the complete joint families and executable pose path.++Relative matrices require `to: Parent`. Rewriting them as `to: World` can reset+nested placements. Identity placements are also needed for otherwise disconnected+members; omitting them can leave a material occurrence unresolved. The accepted+source explicitly preserves these authorities.++### Sculpting casing produces a runtime exception++The shared formatter changed Model units and nested Hole fields, but the separate+surfacing owner read only PascalCase properties. Missing centers/diameters left+an empty mounting-hole list which reached base construction and threw an index+exception instead of returning the field diagnostics.++The existing surfacing field readers now accept the first-character casing+aliases of their own requested fields. Authored values and semantic identifiers+remain case-sensitive. Base construction stops when its field/hole reads fail.+Tests compare state identity and exact STEP between spellings, then require+malformed mounting data to return diagnostics and no constructed states.++This is a bounded repair in the existing owner, not a claim that surfacing's+independent text reader has completed AST migration.++### Embedded construction chains steal the BodyState document owner++The ordinary CLI gate exposed a pre-existing validate/build contradiction for+all six BodyState cookbook sources. Validation used Sculpting; build and inspect+claimed their embedded SectionChain declarations and sent the document to the+ordinary Section/Loft frontend. They then rejected the BodyState, SculptState+and Station productions.++The existing AST-based SectionChain recognition predicate now leaves the+Station-shaped construction chains in a concrete BodyState/SculptState document+with their surfacing owner. Ordinary Section/Loft productions still claim mixed+documents and reject unsupported material. The existing schema-family guard+recognizes BodyState/SculptState as Mechanical, so an explicit SectionChain+schema cannot bypass admission. CLI tests run validate, inspect and build on+representative X3b/X4 bodies, then require mismatched schema rejection without+emitting STEP. No additional route or text rewrite was introduced.++### The inner-loop cookbook recipe is invalid++`Pipeline/profile-with-inner-loop` reused Bottom/Left/Top/Right identities across+its outer and inner loops. Production rejected it with segment-identity+collisions. Explicit `as InnerBottom` and corresponding aliases repair the+recipe. A real build/reimport test checks enclosure and the analytic volume+`(40 * 30 - 16 * 10) * 4 = 4160 mm³`. There was no admitted baseline geometry+for this previously invalid source to preserve.++### Four SurfaceCoil examples overstate qualification++The original analytic-support sources are accepted by `WireFormAuthoring.Parse`+and its centerline tests, but ordinary Model admission rejects the additional+material supports; BlenderBall additionally declares two material bodies.+The original files were moved byte-for-byte to+`fixtures/Regression/WireFormSurfaceSupport`, and the owning tests and public+guide now describe the actual centerline-only boundary.++The next capability needs explicit nonmaterial analytic supports with scoped AST+binding. Silently erasing declared support solids is not an acceptable repair.++### Qualification manifest and negative-fixture classifications++The previous canonical runner omitted newer families, tried reusable modules as+standalone products, sent some ordinary part files to assembly inspection, sent+multi-gear interface witnesses to normal single-body validation, and rejected+the preferred `units:` spelling with its old style regex.++The existing manifest now records owner operations, 69 module consumers, and four+explicit external-body boundaries. Every module's named consumer must qualify;+dependency reachability was checked against includes and typed resource imports.+The runner includes `.firmasm`, preserves per-product JSON, writes a qualification+index under ignored artifacts, and reports all failures instead of terminating+while printing its first error. Expected rejection is a separate level, never+counted as a successful product.++Three initially accepted `Invalid/` inputs were investigated:++| Input | Actual finding and disposition |+| --- | --- |+| `Pipeline/traceloop-non-loop` | A Rect2 is closed and now legitimately supports TraceLoop. Preserve that original source in `Regression/FrontendX2/traceloop-rect2`; the negative now contains an actually open Line2. Tests check parse/build outcomes for both. |+| `FEA/ExperimentalShell/singular-map` | Compile succeeds; the owning solver test requires `thinwall-map-singular` from `LinearElasticSolver.Solve`. A compile-only corpus result is not solver acceptance. |+| `SheetMetal/tray-dfm-violation` | Geometry deliberately builds. `SheetMetalDfm.Evaluate` reports Warning with an actionable corner-resolution finding; the repaired tray reports Pass. This is a quality-policy witness, not invalid language. |++Four FigureFit garment sources correctly require an external body. Standalone+validation's `garment-fit-body-required` is recorded as `ExternalBodyRequired`,+separately from successful products. No fit certification is implied.++## Remaining blocker: Piping loses optional field intent++Minimal reproductions are committed under `Regression/FrontendX2`:++- `piping-field-casing.pending`: requests `connectionType: Weld`; validate+ accepts and inspection reports `Generic` for both ports.+- `piping-field-unknown.pending`: supplies `unexpectedIntent: Weld`; the unknown+ field is ignored and validation accepts.++The ordinary `ConnectionType: Weld` reference reports Weld for both ports.+These are known failing compiler-honesty witnesses, not expected-success tests+or qualified cookbook examples. The public syntax/piping guides disclose the+current admission defect.++The exact coupling is `PipingAuthoring.Parse` calling its `Field(string body,+string name, ...)` helper over independently extracted brace text. It discards+field ownership and consumption, and optional fields substitute defaults when+the requested spelling is absent. Adding one alias would leave unknown fields+silently accepted. Adding a second schema or whole-source rewrite would repeat+the debt this pass is removing.++The smallest next prerequisite is to project Piping's existing declaration+nodes into its current semantic records and use shared `FirmamentSyntaxFields`+consumption at each existing construct owner. Preserve its route planner,+geometry lowerers, BOM and equipment/nozzle semantics. Only then migrate all+piping field spellings and require both pending witnesses to become correct+admission/rejection tests. The subsequent domain sweep must inspect FEA and the+independent surfacing reader as well; they are not qualified by structural+parse success alone.++## Qualification evidence++Raw local evidence belongs under `artifacts/local/corpus-modernization/`.+The initial complete collection contains 1,481 sources, all 373 initial canonical+sources structurally parsed, and no production-owner exceptions. The baseline+classification counts are retained in its report; they do not grant universal+semantic parity.++Final qualification against the completed implementation:++| Check | Observed result |+| --- | --- |+| Release solution build, serial, compiler sharing disabled | Succeeded; 0 errors, 30 existing warnings |+| Fast kernel lane | 1,076 passed |+| Full serial solution lane, including corpus tests | **5,379 passed across 21 test assemblies; 0 failed/skipped** |+| Focused frontend/assembly pass before the final owner repair | 490 passed |+| Focused final CLI owner/schema/public-link checks | 12 passed |+| Focused sheet-metal pass, including four original identity references | 161 passed |+| Current cookbook | **369/369 classified: 296 successful owner operations, 69 consumer-qualified modules, 4 explicit external-body boundaries** |+| Complete structural/production-owner collection | 1,488 sources; 1,124 structurally parsed, 364 rejected; all 369 canonical sources structurally parsed; no owner exceptions |+| Existing STEP-producing canonical operations with pre-change artifacts | 182 pairs; 180 byte-identical; the two differing flat exports have equivalent geometry as detailed below |+| All canonical sheet-metal formed exports against original source | **19/19 byte-identical STEP** |+| Before/after assembly evidence | **52/52** retain public instance/definition identities, exact part STEP hashes/metrics and resolved world matrices within 1e-9 |+| Before/after Scene inspection evidence | **7/7** retain counts, bounds, public nodes and layout facts after excluding source spans/placement-authority provenance |+| Original domain-migration hash references | **37/37 matched** |+| Claude's unchanged X4 CLI/geometry corpus | **32/32 passed**; no recording/rebaselining |+| Shared-profile CLI corpus and documentation specimens | 26/26 passed; formed/flat reference parity retained |+| Semantic/manufacturing CLI corpus | 29/29 passed |++The two flat STEP byte differences are the network-appliance and power-supply+enclosures. Shared rectangular Profiles serialize the same rectangle contours+with a different vertex/edge traversal order. Reusing the X4 inspection/verification+oracle found no differences in topology counts, surface families, structural+assessment, world bounds (1e-9) or volume (1e-9 relative). Coordinate-resolved+vertex and edge/curve-family inventories also match. All 19 **formed** exports+are byte-identical. No changed geometry golden was recorded.++Scene inspection does not expose every world occurrence matrix. Its 7/7 result+is limited to the stated facts; the 52 assembly comparisons independently check+their world transforms. This is not a claimed pre/post GLB byte comparison.++Among sources present both before and after, production admission changed only+for the repaired inner-loop cookbook recipe (rejected to accepted) and the stale+non-loop negative replaced with an actual open guide (accepted to rejected).+The original now-valid Rect2 specimen was preserved. Four added compatibility+references, that original Rect2 source, and two explicitly pending Piping defect+specimens account for the seven-source increase from 1,481 to 1,488.++The final complete collection's classifications are:++| Classification | Count | Interpretation |+| --- | ---: | --- |+| Admitted | 627 | The recorded production owner returned success at its stated level; this includes the two explicitly documented pending Piping semantic defects. It is not a universal correctness verdict. |+| BothRejected | 6 | Structural and production rejection retained as source evidence. |+| DeclarationModule | 42 | Collection recognizes the declaration-only shape; the cookbook manifest additionally qualifies all 69 actual contextual modules through consumers. |+| ExperimentalSource | 40 | Speculative/experimental sources, not language compatibility promises. |+| LegacyGrammarBoundary | 329 | Legacy/serialized leading-token inputs; measured separately from native V2 structural parsing. |+| NegativeFixtureAccepted | 2 | The solver-stage singular-map and DFM-warning witnesses explained above. |+| NegativeFixtureRejected | 287 | Explicit negative paths rejected by their recorded owner. |+| SemanticOrCapabilityRejection | 155 | Located outcomes retained for binding, domain/context and capability review, including contextual modules and external-body requirements. |++Reproduce the maintained qualification paths from the repository root:++```powershell+dotnet build Aetheris.slnx -c Release -m:1 -nr:false -p:UseSharedCompilation=false --no-restore+dotnet test Aetheris.Kernel.Core.Tests -c Release --no-build --filter "Category!=SlowCorpus"+dotnet test Aetheris.slnx -c Release --no-build -m:1 -- RunConfiguration.MaxCpuCount=1+./scripts/Test-CanonicalFixtures.ps1 -NoBuild+dotnet Aetheris.CLI/bin/Release/net10.0/aetheris.dll frontend-shadow --corpus fixtures --production --output-dir artifacts/local/corpus-modernization/collection+python fixtures/Regression/FrontendX4/run.py+python fixtures/Regression/SheetMetalSyntax/run.py+python fixtures/Regression/SheetMetalSemantics/run.py+./scripts/qualify-firmament-domain-frontend.ps1 -OutputDirectory artifacts/local/corpus-modernization/domain-parity+```++The existing developer command name `frontend-shadow` collects both structural+and real production-owner results here; it is not a new shadow parser or an+engineering-admission bypass. Raw collection, STEP comparison and full test logs+are under the ignored task artifact directory. Frozen Zig checks were not run:+no Zig compiler/build infrastructure changed. Remote CI and a live Helios browser+workflow were not run or claimed.++## Code-quality boundary++No parser route, diagnostic-code fatality allowlist, kernel feature, editor+validator or runtime source-rewrite layer was introduced. The source migration+used the existing formatter and temporary AST-span tooling under ignored local+artifacts. The matrix conversion was a bounded one-time edit checked against+resolved world transforms. Existing domain algorithms and goldens were retained.++The surfacing change reuses each field reader's existing requested name; its+case-only regex fragment adds no independent field vocabulary or document+dispatch. The fixture runner's regex is a source-style guard, not compiler+admission. Legacy negative tests explicitly normalize their mutation inputs+where they intentionally inject PascalCase aliases; ordinary source reads and+the real CLI qualification still consume the modern files directly. Required+mutation helpers fail if their target fragment disappears.++No X2 closure, global language-consistency verdict, new geometry capability,+garment fit certification, or browser workflow certification is claimed.++The final public-Markdown link check and `git diff --check` pass; the modified+PowerShell runner parses without errors. Build/compiler node reuse was disabled,+and all task-owned .NET CLI/test/compiler hosts exited after qualification.+Automatic approval review rejected removal of disposable intermediate artifact+directories with the stated reason "blocked by policy". Those ignored files+remain alongside the retained before/after evidence; no cleanup was bypassed.diff --git a/docs/public/firmament/piping.md b/docs/public/firmament/piping.mdindex 66197f03..250ac1df 100644--- a/docs/public/firmament/piping.md+++ b/docs/public/firmament/piping.md@@ -12,6 +12,13 @@ The router is a design assistant. `RouteProposal` is inspectable; acceptance cop## Ports and logical connections+Use the documented PascalCase piping properties in this guide. The corpus+modernization pass found that `connectionType: Weld` is currently ignored and+becomes Generic, and unknown optional Port fields can also be ignored. These are+open compiler defects, not admitted aliases. Their source specimens and the AST+owner migration prerequisite are recorded in the+[corpus report](../../development/FIRMAMENT-V2-CORPUS-MODERNIZATION-2026-10.md).+`Port` is the piping specialization of an Assembly Interface. It has stable identity, a position/DatumFrame, an outward axis direction, a `PipePolicy`, and a bounded connection style.```firmamentdiff --git a/docs/public/firmament/sheet-metal.md b/docs/public/firmament/sheet-metal.mdindex 95d9e7e5..d8d15642 100644--- a/docs/public/firmament/sheet-metal.md+++ b/docs/public/firmament/sheet-metal.md@@ -131,7 +131,15 @@ feed them through the shared boundary authority.Existing `Base: Rectangle(w, d)` and named`Base deck { Profile: Rectangle { Width: 80mm; Height: 50mm; }; }` retain their-geometry. Legacy cuts using `Profile: Rectangle`, `Circle` or `Slot`, including+geometry. To modernize an implicit Base while preserving its established region+and bend identities, use `base: blank` with a named rectangular Profile. This+feeds the same Profile capability binder as `Base deck { profile: blank }`.+Choosing a named Base changes the public identity family; it is not a cosmetic+rewrite of the implicit Base field. The+[compatibility witnesses](../../../fixtures/Compatibility/FirmamentV2/SheetMetal/README.md)+check exact formed STEP, region/bend/feature IDs and flat hashes.++Legacy cuts using `Profile: Rectangle`, `Circle` or `Slot`, includinginline dimensions and tuple placement, remain admitted. **Legacy `Slot` cuts arerectangular** in this route; they are not silently converted into capsules. Use anamed `Profile` built with `Slot2` when a rounded slot is intended.diff --git a/docs/public/firmament/syntax.md b/docs/public/firmament/syntax.mdindex cf96706a..a8a61c81 100644--- a/docs/public/firmament/syntax.md+++ b/docs/public/firmament/syntax.md@@ -119,6 +119,22 @@ keeps authored names and members unchanged. Geometry operations `Reverse`,`Close` and `TraceLoop` remain PascalCase, like other constructs. See[language style](language-style.md) for formatter behavior and domain scope.+The [current cookbook](../../../fixtures/Canonical/README.md) applies these+conventions across the existing V2 corpus. `Path` and 2D shapes are construction+declarations already; prefer `Path outline` and `Circle2 bore` to their redundant+`Concept` aliases. Keep `Concept Requirement` for requirements and+`Concept Struct layout` for grouped construction data. Existing published names+remain stable even when their historical capitalization differs from new local+style. Use `to: Parent` when replacing a relative transform; `to: World`+explicitly means the assembly root frame.++Domain property migration is still incomplete. Piping currently needs its+documented `ConnectionType: Weld` spelling: the lowercase alias can silently+default to Generic. This is a known compiler defect, tracked with reproductions+in the [corpus report](../../development/FIRMAMENT-V2-CORPUS-MODERNIZATION-2026-10.md),+and prevents declaring X2 complete. Follow each domain guide for its admitted+properties; this style table does not add aliases to an independent owner.+### Whitespace, comments and terminatorsUse two-space indentation. Put ordinary fields on separate lines, or separatediff --git a/docs/public/firmament/wire-form.md b/docs/public/firmament/wire-form.mdindex 50b73ef0..e2f2abc0 100644--- a/docs/public/firmament/wire-form.md+++ b/docs/public/firmament/wire-form.md@@ -45,7 +45,17 @@ Helix Winding {}```-`SurfaceCoil` generates a wire centerline by winding around a known support surface while maintaining a requested side and clearance. The author specifies winding intent; Aetheris derives the changing 3D path. X1 admits authored analytic `Cylinder`, `Frustum`/`Cone`, and `Sphere` supports. Cylinder/frustum winding uses `AxialPitch`. Sphere winding uses honest linear-latitude progression between `StartLatitude` and `EndLatitude`; it does not claim equal geodesic spacing and excludes the exact poles.+`SurfaceCoil` has an evaluable centerline law for analytic `Cylinder`,+`Frustum`/`Cone`, and `Sphere` supports. This is currently **internal centerline+qualification**, not an admitted multi-body Model recipe. Declaring support+solids alongside a WireForm fails normal validate/build admission; the compiler+does not silently discard those solids. An explicit nonmaterial support binding+is still needed. The preserved [regression witnesses](../../../fixtures/Regression/WireFormSurfaceSupport/README.md)+record the boundary. Cylinder/frustum winding uses `AxialPitch`. Sphere winding+uses linear-latitude progression between `StartLatitude` and `EndLatitude`,+without equal-geodesic-spacing claims and excluding the exact poles.++**Internal centerline fragment — this is not a complete buildable Model:**```firmamentFrustum CupInnerFrustum { BottomRadius: 18mm; TopRadius: 30mm; Height: 60mm }@@ -65,7 +75,11 @@ The semantic/evaluable winding law remains authoritative. Coil-containing formsX1 coils remain continuous, unbranched, open paths. WIRE-X2 adds a distinct closed `Knot` operation for named mathematical knot families; it does not turn coils into closed paths or force Straight/Bend through spline approximation. See [Mathematical Knots](mathematical-knots.md). Arbitrary/freeform supports, variable pitch or section, intentional contact, spring mechanics, contact dynamics, and branching remain unsupported. Surface support identity is authored rather than imported-face-ID based. Direct `Concept Path` plus `Sweep` remains the lower-level choice for explicitly authored line/arc trajectories.-See the canonical [Helix](../../../fixtures/Canonical/WireForm/helix.firmament), [AxisCoil compatibility fixture](../../../fixtures/Canonical/WireForm/axis-coil.firmament), [frustum SurfaceCoil](../../../fixtures/Canonical/WireForm/frustum-surface-coil.firmament), [sphere SurfaceCoil](../../../fixtures/Canonical/WireForm/sphere-surface-coil.firmament), [composed Straight/Coil/Straight](../../../fixtures/Canonical/WireForm/straight-coil-straight.firmament), [90-degree bend](../../../fixtures/Canonical/WireForm/single-bend-90.firmament), and [Paperclip](../../../fixtures/Canonical/WireForm/paperclip.firmament).+See the canonical [Helix](../../../fixtures/Canonical/WireForm/helix.firmament),+[AxisCoil compatibility fixture](../../../fixtures/Canonical/WireForm/axis-coil.firmament),+[composed Straight/Coil/Straight](../../../fixtures/Canonical/WireForm/straight-coil-straight.firmament),+[90-degree bend](../../../fixtures/Canonical/WireForm/single-bend-90.firmament),+and [Paperclip](../../../fixtures/Canonical/WireForm/paperclip.firmament).`aetheris inspect source.firmament --json` reports the semantic `wireForm` object, including `operations`, `totalStraightLength`, `totalBendLength`, and compiler-derived `totalWireLength`. A materializing `build --json` adds volume, mass, surface inventory, manifold/reimport status, rational/faceted counts, and the STEP hash.diff --git a/fixtures/Canonical/Assembly/annular-pair.firmament b/fixtures/Canonical/Assembly/annular-pair.firmamentindex d53eee44..c4bc7fc7 100644--- a/fixtures/Canonical/Assembly/annular-pair.firmament+++ b/fixtures/Canonical/Assembly/annular-pair.firmament@@ -1,17 +1,17 @@Template < R: Length > Struct Sleeve {- Circle2 Outside { Center: [0mm,0mm] Radius: R }- Circle2 Inside { Center: [0mm,0mm] Radius: 15mm }- Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside As InnerBoundary |> TraceLoop } }- Extrude Body { Profile: Section From: -10mm To: 10mm }+ Circle2 Outside { center: [0mm,0mm] radius: R }+ Circle2 Inside { center: [0mm,0mm] radius: 15mm }+ Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside as InnerBoundary |> TraceLoop } }+ Extrude Body { profile: Section from: -10mm to: 10mm }}Assembly AnnularPair {<Assembly AnnularPair><Part First = Sleeve<R: 20mm>>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1];+ Placement { from: Origin; to: Parent; }</Part><Part Second = Sleeve<R: 20mm>>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,60,0,0,1];+ Placement { from: Origin; to: Parent; translateLocal: [60mm, 0mm, 0mm]; }</Part></Assembly>- Anchor: AnnularPair;+ anchor: AnnularPair;}diff --git a/fixtures/Canonical/Assembly/bearing-module.firmament b/fixtures/Canonical/Assembly/bearing-module.firmamentindex 107ada67..b5539fba 100644--- a/fixtures/Canonical/Assembly/bearing-module.firmament+++ b/fixtures/Canonical/Assembly/bearing-module.firmament@@ -59,7 +59,7 @@ Assembly BearingModule {</Assembly></Assembly>- Anchor: BearingModule.FixedSupport.Housing.Bore;+ anchor: BearingModule.FixedSupport.Housing.Bore;Mate ShaftInBearing: ShaftBore {Shaft: BearingModule.Rotor.Shaft.Journal;diff --git a/fixtures/Canonical/Assembly/coil-on-stem.firmament b/fixtures/Canonical/Assembly/coil-on-stem.firmamentindex c9355c73..bb2f2913 100644--- a/fixtures/Canonical/Assembly/coil-on-stem.firmament+++ b/fixtures/Canonical/Assembly/coil-on-stem.firmament@@ -1,14 +1,14 @@Template < R: Length > Struct Stem {- Circle2 Outside { Center: [0mm,0mm] Radius: R }+ Circle2 Outside { center: [0mm,0mm] radius: R }Profile Section { Loop Outer { Outside |> TraceLoop } }- Extrude Body { Profile: Section From: -10mm To: 60mm }+ Extrude Body { profile: Section from: -10mm to: 60mm }}Template < P: Length > Struct Spring {WireForm SpringWire {Diameter: 2mmMaterial: Standard.Materials.StainlessSteel.304_AnnealedStartFrame { Origin: [0mm,0mm,0mm]; Tangent: [1,0,0]; Up: [0,0,1] }- AxisCoil Winding { Radius: 9mm; Turns: 6; Pitch: P; Handedness: RightHanded; StartPhase: 0deg }+ Helix Winding { radius: 9mm; turns: 6; pitch: P; handedness: RightHanded; startPhase: 0deg }}}Interface SpringOnRod {@@ -29,6 +29,6 @@ Assembly GuidedSpring {</Part><Part Coil = Spring<P: 6mm>> </Part></Assembly>- Anchor: GuidedSpring.Rod.SpringSeat;+ anchor: GuidedSpring.Rod.SpringSeat;Mate Install: SpringOnRod { Spring: GuidedSpring.Coil.Winding; Rod: GuidedSpring.Rod.SpringSeat; }}diff --git a/fixtures/Canonical/Assembly/template-block-pair.firmament b/fixtures/Canonical/Assembly/template-block-pair.firmamentindex 9b6a6a2f..1cf93e7e 100644--- a/fixtures/Canonical/Assembly/template-block-pair.firmament+++ b/fixtures/Canonical/Assembly/template-block-pair.firmament@@ -20,13 +20,13 @@ Template < Spec: BlockSpec >Struct AssemblyBlock: AssemblyBlockConcept {Require Positive => Spec.Width > 0mm && Spec.Depth > 0mm && Spec.Height > 0mmConcept Struct Design: AssemblyBlockConcept {- Bounds: Box3 { Size: [Spec.Width, Spec.Depth, Spec.Height] }+ Bounds: Box3 { size: [Spec.Width, Spec.Depth, Spec.Height] }Axis: Bounds.Center.Axis(+Z)Seat: Bounds.Face(+Z)Base: Bounds.Face(-Z)Height: Spec.Height}- Box Body { Bounds: Design.Bounds }+ Box Body { bounds: Design.Bounds }Modify Body {EdgeFinish ProofBreak {Face: Design.Seat@@ -35,7 +35,7 @@ Struct AssemblyBlock: AssemblyBlockConcept {Distance: 1mm}}- Expose {+ expose {Bounds: Design.BoundsAxis: Design.AxisSeat: Design.Seat@@ -59,7 +59,7 @@ Assembly TemplateBlockPair {<Part Moving = AssemblyBlock<Spec: MovingSpec>></Part></Assembly>- Anchor: TemplateBlockPair.Fixed.Interface;+ anchor: TemplateBlockPair.Fixed.Interface;Mate Seat: SeatedAxis {Fixed: TemplateBlockPair.Fixed.Interface;diff --git a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points-part.firmament b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points-part.firmamentindex 07bc8103..1f7ecf8f 100644--- a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points-part.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points-part.firmament@@ -1,7 +1,7 @@Model PointsPart {- Units: mm+ units: mmConcept Struct Layout {Points<Point2> Sizes { Small: Point2(2mm,3mm); Large: Point2(4mm,6mm); }}- Box Body { Size: [Layout.Sizes.Large.X,Layout.Sizes.Small.Y,1mm] }+ Box Body { size: [Layout.Sizes.Large.X,Layout.Sizes.Small.Y,1mm] }}diff --git a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points.firmament b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points.firmamentindex dc9324b8..d24c4225 100644--- a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/concept-points.firmament@@ -2,8 +2,8 @@ Function Distance(n: Int, scale: Length) -> Length = scale * (1.0 - Pow(2.0, -nFunction PadHeight(h: Length) -> Length = h + 1mm;Concept Struct Nut {Points<Point2> Crossings {- Keys: [Bass, Middle, Treble];- Linear { Start: Point2(-18mm,0mm); Step: [18mm,0mm]; }+ keys: [Bass, Middle, Treble];+ Linear { start: Point2(-18mm,0mm); step: [18mm,0mm]; }}Points<Point3> Supports {Left: Point3(-18mm,0mm,2mm);@@ -12,29 +12,29 @@ Concept Struct Nut {}Concept Struct Board {Points<Point2> Frets {- Series { Index: n; First: 1; Count: 12; KeyPrefix: Fret;- Position: Point2(0mm, -Distance(n,628mm)); }+ Series { index: n; first: 1; count: 12; keyPrefix: Fret;+ position: Point2(0mm, -Distance(n,628mm)); }}}Template<H: Length> Struct Pad {- Rect2 Outline { Center: [0mm,0mm]; Size: [4mm,2mm] }+ Rect2 Outline { center: [0mm,0mm]; size: [4mm,2mm] }Profile P { Loop Outer { Outline |> TraceLoop } }- Extrude Body { Profile: P; From: 0mm; To: H }- Expose { Semantic Bottom { DatumFrame Frame = [0mm,0mm,0mm] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ Extrude Body { profile: P; from: 0mm; to: H }+ expose { Semantic Bottom { DatumFrame Frame = [0mm,0mm,0mm] x [1,0,0] y [0,1,0] z [0,0,1]; } }}Assembly PointWitness {<Assembly PointWitness>- Pattern Frets Over Board.Frets {+ Pattern Frets over Board.Frets {point => <Part Fret = Pad<H:PadHeight(1mm)>>- Placement { From: Bottom.Frame; To: BoardSeat.Frame;- TranslateLocal: [point.Position.X,point.Position.Y,0mm]; }+ Placement { from: Bottom.Frame; to: BoardSeat.Frame;+ translateLocal: [point.Position.X,point.Position.Y,0mm]; }</Part>}<Part Bass = Pad<H:1mm>>- Placement { From: Bottom.Frame; To: World;- TranslateLocal: [Nut.Crossings.Bass.X,Nut.Crossings.Bass.Y,Nut.Supports.Left.Z]; }+ Placement { from: Bottom.Frame; to: World;+ translateLocal: [Nut.Crossings.Bass.X,Nut.Crossings.Bass.Y,Nut.Supports.Left.Z]; }</Part></Assembly>- FrameTransform BoardSeat { From: World; TranslateLocal: [0mm,658mm,62mm]; }- Anchor: PointWitness;+ FrameTransform BoardSeat { from: World; translateLocal: [0mm,658mm,62mm]; }+ anchor: PointWitness;}diff --git a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/linear-stations.firmament b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/linear-stations.firmamentindex c5434a87..14d402c1 100644--- a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/linear-stations.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/linear-stations.firmament@@ -1,17 +1,17 @@Concept Struct Markers {Points<Point2> Seats {Linear {- Start: Point2(0mm,0mm);- Direction: [0,-2];+ start: Point2(0mm,0mm);+ direction: [0,-2];Stations { First: 10mm; Second: 23.5mm; Third: -4mm; }}}}Template<H: Length> Struct Pad {- Rect2 Outline { Center: [0mm,0mm]; Size: [4mm,2mm] }+ Rect2 Outline { center: [0mm,0mm]; size: [4mm,2mm] }Profile P { Loop Outer { Outline |> TraceLoop } }- Extrude Body { Profile: P; From: 0mm; To: H }- Expose {+ Extrude Body { profile: P; from: 0mm; to: H }+ expose {Semantic Bottom { DatumFrame Frame = [0mm,0mm,0mm] x [1,0,0] y [0,1,0] z [0,0,1]; }Semantic MarkerOrigin { DatumFrame Frame = [0mm,0mm,H] x [1,0,0] y [0,1,0] z [0,0,1]; }}@@ -19,14 +19,14 @@ Template<H: Length> Struct Pad {Assembly StationWitness {<Assembly StationWitness><Part Board = Pad<H:2mm>>- Placement { From: Bottom.Frame; To: World; TranslateLocal: [10mm,20mm,30mm]; RotateLocal: { Axis: X; Angle: 90deg } }+ Placement { from: Bottom.Frame; to: World; translateLocal: [10mm,20mm,30mm]; rotateLocal: { axis: X; angle: 90deg } }</Part>- Pattern Markers Over Markers.Seats {+ Pattern Markers over Markers.Seats {point => <Part Inlay = Pad<H:0.3mm>>- Placement { From: Bottom.Frame; To: MarkerDatum.Frame; TranslateLocal: [point.Position.X,point.Position.Y,0mm]; }+ Placement { from: Bottom.Frame; to: MarkerDatum.Frame; translateLocal: [point.Position.X,point.Position.Y,0mm]; }</Part>}</Assembly>- FrameTransform MarkerDatum { From: StationWitness.Board.MarkerOrigin.Frame; }- Anchor: StationWitness;+ FrameTransform MarkerDatum { from: StationWitness.Board.MarkerOrigin.Frame; }+ anchor: StationWitness;}diff --git a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/mounting-rows.firmament b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/mounting-rows.firmamentindex ba7a83d5..8fbb1de3 100644--- a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/mounting-rows.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/mounting-rows.firmament@@ -1,36 +1,36 @@Template<H: Length> Struct Post {- Circle2 Outline { Center: [0mm,0mm]; Radius: 2mm }+ Circle2 Outline { center: [0mm,0mm]; radius: 2mm }Profile P { Loop Outer { Outline |> TraceLoop } }- Extrude Body { Profile: P; From: 0mm; To: H }- Expose { Semantic Bottom { DatumFrame Frame = [0mm,0mm,0mm] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ Extrude Body { profile: P; from: 0mm; to: H }+ expose { Semantic Bottom { DatumFrame Frame = [0mm,0mm,0mm] x [1,0,0] y [0,1,0] z [0,0,1]; } }}Subassembly Tuner {<Assembly Tuner>- <Part Post = Post<H:8mm>> Placement { From: Bottom.Frame; To: World; } </Part>- <Part Button = Post<H:3mm>> Placement { From: Bottom.Frame; To: World; TranslateLocal: [-5mm,0mm,0mm]; } </Part>+ <Part Post = Post<H:8mm>> Placement { from: Bottom.Frame; to: World; } </Part>+ <Part Button = Post<H:3mm>> Placement { from: Bottom.Frame; to: World; translateLocal: [-5mm,0mm,0mm]; } </Part></Assembly>- Anchor: Tuner;- Expose { DatumFrame Mount = Post.Bottom.Frame; }+ anchor: Tuner;+ expose { DatumFrame Mount = Post.Bottom.Frame; }}Linear Sites BassSites {- Keys: [Low, Middle, High];- Start: [-10mm,20mm,0mm];- Step: [0mm,30mm,0mm];+ keys: [Low, Middle, High];+ start: [-10mm,20mm,0mm];+ step: [0mm,30mm,0mm];}-Mirrored Sites TrebleSites From BassSites { Across: YZ; }+Mirrored Sites TrebleSites from BassSites { Across: YZ; }Assembly MountingRows {<Assembly MountingRows>- Pattern BassRow Over BassSites {+ Pattern BassRow over BassSites {site => <Assembly Unit = Tuner>- Placement { From: Mount; To: Tilt.Frame; TranslateLocal: [site.X,site.Y,site.Z]; }+ Placement { from: Mount; to: Tilt.Frame; translateLocal: [site.X,site.Y,site.Z]; }</Assembly>}- Pattern TrebleRow Over TrebleSites {+ Pattern TrebleRow over TrebleSites {site => <Assembly Unit = Tuner>- Placement { From: Mount; To: Tilt.Frame; TranslateLocal: [site.X,site.Y,site.Z]; RotateLocal: { Axis: Z; Angle: 180deg } }+ Placement { from: Mount; to: Tilt.Frame; translateLocal: [site.X,site.Y,site.Z]; rotateLocal: { axis: Z; angle: 180deg } }</Assembly>}</Assembly>- FrameTransform Tilt { From: World; TranslateLocal: [0mm,0mm,7mm]; RotateLocal: { Axis: X; Angle: -13deg } }- Anchor: MountingRows;+ FrameTransform Tilt { from: World; translateLocal: [0mm,0mm,7mm]; rotateLocal: { axis: X; angle: -13deg } }+ anchor: MountingRows;}diff --git a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/product-notes.firmasm b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/product-notes.firmasmindex 23e8cdb3..df316b5b 100644--- a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/product-notes.firmasm+++ b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/product-notes.firmasm@@ -7,19 +7,19 @@ Static Release: ReleaseInfo {AuthoringTolerance: 0.1mm}Template<H: Length> Struct Pad {- Rect2 R { Center: [0mm,0mm]; Size: [10mm,10mm] }+ Rect2 R { center: [0mm,0mm]; size: [10mm,10mm] }Profile P { Loop Outer { R |> TraceLoop } }- Extrude Body { Profile: P From: 0mm To: H }+ Extrude Body { profile: P from: 0mm to: H }}Assembly Product {- Provenance: Release;+ provenance: Release;Pmi {- Note DesignIntent { Target: Product; Text: "Presentation geometry; authoring convention 0.1 mm, not a certified manufacturing tolerance."; }- Note Finish { Target: Product.A; Text: "Designer's note: {illustrative} #17; https://example.test/a // literal text"; }+ Note DesignIntent { target: Product; text: "Presentation geometry; authoring convention 0.1 mm, not a certified manufacturing tolerance."; }+ Note Finish { target: Product.A; text: "Designer's note: {illustrative} #17; https://example.test/a // literal text"; }}<Assembly Product>- <Part A = Pad<H:2mm>> Placement { From: Origin; To: World; } </Part>- <Part B = Pad<H:2mm>> Placement { From: Origin; To: World; TranslateLocal: [20mm,0mm,0mm]; } </Part>+ <Part A = Pad<H:2mm>> Placement { from: Origin; to: World; } </Part>+ <Part B = Pad<H:2mm>> Placement { from: Origin; to: World; translateLocal: [20mm,0mm,0mm]; } </Part></Assembly>- Anchor: Product;+ anchor: Product;}diff --git a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/published-ports.firmament b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/published-ports.firmamentindex 91a1e3ce..e6b0f2d8 100644--- a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/published-ports.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/published-ports.firmament@@ -1,8 +1,8 @@Template<H: Length> Struct Post {- Circle2 Outline { Center: [0mm,0mm] Radius: 4mm }+ Circle2 Outline { center: [0mm,0mm] radius: 4mm }Profile P { Loop Outer { Outline |> TraceLoop } }- Extrude Body { Profile: P From: 0mm To: H }- Expose {+ Extrude Body { profile: P from: 0mm to: H }+ expose {Semantic Top { DatumFrame Frame = [0mm,0mm,H] x [1,0,0] y [0,1,0] z [0,0,1]; }Semantic Bottom { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }}@@ -10,11 +10,11 @@ Template<H: Length> Struct Post {Assembly PublishedPorts {<Assembly PublishedPorts><Part Base = Post<H:14mm>>- Placement { From: Origin; To: World; }+ Placement { from: Origin; to: World; }</Part><Part Child = Post<H:14mm>>- Placement { From: Bottom.Frame; To: PublishedPorts.Base.Top.Frame; }+ Placement { from: Bottom.Frame; to: PublishedPorts.Base.Top.Frame; }</Part></Assembly>- Anchor: PublishedPorts;+ anchor: PublishedPorts;}diff --git a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/scalar-functions-part.firmament b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/scalar-functions-part.firmamentindex 6dd96159..6bc3c071 100644--- a/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/scalar-functions-part.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/AuthoringFoundation/scalar-functions-part.firmament@@ -1,5 +1,5 @@Model ScalarPart {- Units: mm+ units: mmFunction Height(n: Int) -> Length = 2mm * n;- Box Body { Size: [2mm,3mm,Height(4)] }+ Box Body { size: [2mm,3mm,Height(4)] }}diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/bridge-assembly.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/bridge-assembly.firmamentindex 8578eb43..459edcea 100644--- a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/bridge-assembly.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/bridge-assembly.firmament@@ -2,12 +2,12 @@ include "hardware-layout.firmament";// Exact semicircular extrusion. The published seat is its flat diameter face;// the crown datum keeps string endpoints on the rail instead of a free offset.Template<L: Length,R: Length> Struct TailpieceRail {- Concept Path Section {+ Path Section {start: Point2(0mm,-R); heading: 0degArc Crown { Radius: R; Turn: 180deg }Close Diameter}- Profile RailSection From Section+ Profile RailSection from SectionExtrude Body { profile: RailSection; from: -L / 2; to: L / 2 }expose {Semantic BottomSeat { DatumFrame Frame = [0mm,0mm,0mm] x [0,0,-1] y [0,1,0] z [1,0,0]; }diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/hardware-definitions.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/hardware-definitions.firmamentindex 99aad0f5..caeff97b 100644--- a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/hardware-definitions.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/hardware-definitions.firmament@@ -23,19 +23,19 @@ Template<H: Length> Struct Board {expose { Semantic MarkerOrigin { DatumFrame Frame = [0mm,658mm,H] x [1,0,0] y [0,1,0] z [0,0,1]; } }Point2 RightNut { position: [21.5mm,660mm] }Point2 LeftNut { position: [-21.5mm,660mm] }- Concept Path Outline { start: Point2(-28mm,120mm) heading: 0deg+ Path Outline { start: Point2(-28mm,120mm) heading: 0degLine End { length: 56mm }Line Right { to: RightNut }Line Nut { to: LeftNut }Close Left}- Profile P From Outline+ Profile P from OutlineExtrude Body { profile: P from: 0mm to: H }}// Short solid scarf under the veneer, behind the nut. The rounded back is// supplied by Neck's section chain; this closes the front of the angled join.Template<L: Length> Struct HeadstockScarf {- Concept Path Side {+ Path Side {start: Point2(-1.5mm,6.8mm); heading: 0degLine Back { to: BackEnd }Line Shoulder { to: FrontEnd }@@ -45,7 +45,7 @@ Template<L: Length> Struct HeadstockScarf {Point2 NutCorner { position: [-3.1mm,14mm] }Point2 FrontEnd { position: [8mm,14mm] }Point2 BackEnd { position: [8mm,7mm] }- Profile P From Side+ Profile P from SideExtrude Body { profile: P; from: -L / 2; to: L / 2 }expose { Semantic Mount { DatumFrame Frame = [0mm,0mm,0mm] x [0,0,1] y [1,0,0] z [0,1,0]; } }}@@ -59,7 +59,7 @@ Template<H: Length, RootStart: Length = 0mm, RootHalfWidth: Length = 21.5mm, RooPoint2 LCrown { position: [-12mm,160mm] }Point2 LSide { position: [-39mm,154mm] }Point2 LFlare { position: [-34mm,40mm] }- Concept Path Outline { start: Point2(-RootHalfWidth,RootStart) heading: 0deg+ Path Outline { start: Point2(-RootHalfWidth,RootStart) heading: 0degLine Base { length: RootWidth }Line FlareR { to: RFlare }Line SideR { to: RSide }@@ -69,7 +69,7 @@ Template<H: Length, RootStart: Length = 0mm, RootHalfWidth: Length = 21.5mm, RooLine SideL { to: LFlare }Close FlareL}- Profile P From Outline+ Profile P from OutlineExtrude Body { profile: P from: 0mm to: H }}diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/neck-profile.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/neck-profile.firmamentindex 18d50073..2ea2829c 100644--- a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/neck-profile.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/neck-profile.firmament@@ -27,12 +27,12 @@ Profile NeckBack {CubicBezier2 SeatTreble { from: Right; control1: SeatRight; control2: SeatA; to: SeatMiddle }CubicBezier2 SeatBass { from: SeatMiddle; control1: SeatB; control2: SeatLeft; to: Left }Loop Outer {- Segment Edge0 { Trace: BassShoulder; From: Left; To: LeftMid }- Segment Edge1 { Trace: BassBack; From: LeftMid; To: Back }- Segment Edge2 { Trace: TrebleBack; From: Back; To: RightMid }- Segment Edge3 { Trace: TrebleShoulder; From: RightMid; To: Right }- Segment Edge4 { Trace: SeatTreble; From: Right; To: SeatMiddle }- Segment Edge5 { Trace: SeatBass; From: SeatMiddle; To: Left }+ Segment Edge0 { trace: BassShoulder; from: Left; to: LeftMid }+ Segment Edge1 { trace: BassBack; from: LeftMid; to: Back }+ Segment Edge2 { trace: TrebleBack; from: Back; to: RightMid }+ Segment Edge3 { trace: TrebleShoulder; from: RightMid; to: Right }+ Segment Edge4 { trace: SeatTreble; from: Right; to: SeatMiddle }+ Segment Edge5 { trace: SeatBass; from: SeatMiddle; to: Left }}}@@ -43,18 +43,18 @@ Template<HalfWidth: Length, Depth: Length> Profile HeadRoot {Point2 RightBottom { position: [HalfWidth,-Depth] }Point2 RightTop { position: [HalfWidth,0mm] }Point2 Seat { position: [0mm,0mm] }- Line2 Left { From: LeftTop; To: LeftBottom }- Line2 BassBack { From: LeftBottom; To: Back }- Line2 TrebleBack { From: Back; To: RightBottom }- Line2 Right { From: RightBottom; To: RightTop }- Line2 TrebleSeat { From: RightTop; To: Seat }- Line2 BassSeat { From: Seat; To: LeftTop }+ Line2 Left { from: LeftTop; to: LeftBottom }+ Line2 BassBack { from: LeftBottom; to: Back }+ Line2 TrebleBack { from: Back; to: RightBottom }+ Line2 Right { from: RightBottom; to: RightTop }+ Line2 TrebleSeat { from: RightTop; to: Seat }+ Line2 BassSeat { from: Seat; to: LeftTop }Loop Outer {- Segment Edge0 { Trace: Left; From: LeftTop; To: LeftBottom }- Segment Edge1 { Trace: BassBack; From: LeftBottom; To: Back }- Segment Edge2 { Trace: TrebleBack; From: Back; To: RightBottom }- Segment Edge3 { Trace: Right; From: RightBottom; To: RightTop }- Segment Edge4 { Trace: TrebleSeat; From: RightTop; To: Seat }- Segment Edge5 { Trace: BassSeat; From: Seat; To: LeftTop }+ Segment Edge0 { trace: Left; from: LeftTop; to: LeftBottom }+ Segment Edge1 { trace: BassBack; from: LeftBottom; to: Back }+ Segment Edge2 { trace: TrebleBack; from: Back; to: RightBottom }+ Segment Edge3 { trace: Right; from: RightBottom; to: RightTop }+ Segment Edge4 { trace: TrebleSeat; from: RightTop; to: Seat }+ Segment Edge5 { trace: BassSeat; from: Seat; to: LeftTop }}}diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/tuners-assembly.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/tuners-assembly.firmamentindex afe17ab5..8c8acb98 100644--- a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/tuners-assembly.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/tuners-assembly.firmament@@ -6,7 +6,7 @@ Linear Sites BassTunerSites {start: [-27mm,58mm,0mm];step: [0mm,36mm,0mm];}-Mirrored Sites TrebleTunerSites From BassTunerSites { Across: YZ; }+Mirrored Sites TrebleTunerSites from BassTunerSites { Across: YZ; }Subassembly GuitarTuners {<Assembly GuitarTuners>diff --git a/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/atlas-industrial.firmament b/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/atlas-industrial.firmamentindex 65f177f1..134961fe 100644--- a/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/atlas-industrial.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/atlas-industrial.firmament@@ -16,9 +16,9 @@ Assembly AtlasIndustrial {<Assembly RightJaw = AtlasRightJaw></Assembly></Assembly>anchor: AtlasIndustrial.Base;- Interface<Revolute> Shoulder { A: AtlasIndustrial.Base.Hinge; B: AtlasIndustrial.UpperArm.Input; }- Interface<Revolute> Elbow { A: AtlasIndustrial.UpperArm.Output; B: AtlasIndustrial.ForeArm.Input; }- Interface<Fixed> WristMount { A: AtlasIndustrial.ForeArm.Output; B: AtlasIndustrial.Gripper.Input.Frame; }- Interface<Prismatic> GripLeft { A: AtlasIndustrial.Gripper.Left; B: AtlasIndustrial.LeftJaw.Slide; }- Interface<Prismatic> GripRight { A: AtlasIndustrial.Gripper.Right; B: AtlasIndustrial.RightJaw.Slide; }+ Interface<Revolute> Shoulder { a: AtlasIndustrial.Base.Hinge; b: AtlasIndustrial.UpperArm.Input; }+ Interface<Revolute> Elbow { a: AtlasIndustrial.UpperArm.Output; b: AtlasIndustrial.ForeArm.Input; }+ Interface<Fixed> WristMount { a: AtlasIndustrial.ForeArm.Output; b: AtlasIndustrial.Gripper.Input.Frame; }+ Interface<Prismatic> GripLeft { a: AtlasIndustrial.Gripper.Left; b: AtlasIndustrial.LeftJaw.Slide; }+ Interface<Prismatic> GripRight { a: AtlasIndustrial.Gripper.Right; b: AtlasIndustrial.RightJaw.Slide; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/fore-housing.firmament b/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/fore-housing.firmamentindex 24bdaea3..0da50b7b 100644--- a/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/fore-housing.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/fore-housing.firmament@@ -1,6 +1,6 @@// Smooth, tapered mechanical housing. Exact capped SectionChain; millimetres.Model AtlasForeHousing {- Units: mm+ units: mmexpose {Semantic Input { DatumFrame Frame = [0mm,0mm,0mm] x [1,0,0] y [0,0,-1] z [0,1,0]; }Semantic Output { DatumFrame Frame = [180mm,0mm,0mm] x [1,0,0] y [0,1,0] z [0,0,1]; }@@ -17,43 +17,43 @@ Model AtlasForeHousing {Construction Plane FC { Trace: Stations.C }Construction Plane FD { Trace: Stations.D }Construction Plane FE { Trace: Stations.E }- RoundedRect2 Root { Center: [0mm,0mm] Size: [48mm,52mm] Radius: 12mm }- RoundedRect2 Belly { Center: [0mm,0mm] Size: [50mm,56mm] Radius: 12mm }- RoundedRect2 Waist { Center: [0mm,0mm] Size: [34mm,34mm] Radius: 10mm }- RoundedRect2 Tip { Center: [0mm,0mm] Size: [32mm,36mm] Radius: 10mm }+ RoundedRect2 Root { center: [0mm,0mm] size: [48mm,52mm] radius: 12mm }+ RoundedRect2 Belly { center: [0mm,0mm] size: [50mm,56mm] radius: 12mm }+ RoundedRect2 Waist { center: [0mm,0mm] size: [34mm,34mm] radius: 10mm }+ RoundedRect2 Tip { center: [0mm,0mm] size: [32mm,36mm] radius: 10mm }Profile PRoot { Loop Outer { Root |> TraceLoop } }Profile PBelly { Loop Outer { Belly |> TraceLoop } }Profile PWaist { Loop Outer { Waist |> TraceLoop } }Profile PTip { Loop Outer { Tip |> TraceLoop } }SectionChain Housing {- Continuity: G1+ continuity: G1ApproximationTolerance: 0.0001mmSection A {- Frame: FA- Profile: PRoot- Seam: Bottom+ frame: FA+ profile: PRoot+ seam: Bottom}Section B {- Frame: FB- Profile: PBelly- Seam: Bottom+ frame: FB+ profile: PBelly+ seam: Bottom}Section C {- Frame: FC- Profile: PWaist- Seam: Bottom+ frame: FC+ profile: PWaist+ seam: Bottom}Section D {- Frame: FD- Profile: PTip- Seam: Bottom+ frame: FD+ profile: PTip+ seam: Bottom}Section E {- Frame: FE- Profile: PTip- Seam: Bottom+ frame: FE+ profile: PTip+ seam: Bottom}- Start: Cap- End: Cap+ start: Cap+ end: Cap}}diff --git a/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/hardware.firmament b/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/hardware.firmamentindex f8cb9744..b07e6e1c 100644--- a/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/hardware.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/hardware.firmament@@ -8,7 +8,7 @@ Template<R: Length, H: Length> Struct Drum {Template<R: Length, Bore: Length, H: Length> Struct Ring {Circle2 Outside { center: [0mm,0mm]; radius: R }Circle2 Inside { center: [0mm,0mm]; radius: Bore }- Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside As BoreBoundary |> TraceLoop } }+ Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside as BoreBoundary |> TraceLoop } }Extrude Body { profile: Section; from: 0mm; to: H }expose { Semantic BottomSeat { DatumFrame Frame = [0mm,0mm,0mm] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/upper-housing.firmament b/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/upper-housing.firmamentindex 7df3f858..63d412ec 100644--- a/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/upper-housing.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/IndustrialAtlas/upper-housing.firmament@@ -1,6 +1,6 @@// Smooth, tapered mechanical housing. Exact capped SectionChain; millimetres.Model AtlasUpperHousing {- Units: mm+ units: mmexpose {Semantic Input { DatumFrame Frame = [0mm,0mm,0mm] x [1,0,0] y [0,0,-1] z [0,1,0]; }Semantic Output { DatumFrame Frame = [200mm,0mm,0mm] x [1,0,0] y [0,0,-1] z [0,1,0]; }@@ -17,43 +17,43 @@ Model AtlasUpperHousing {Construction Plane FC { Trace: Stations.C }Construction Plane FD { Trace: Stations.D }Construction Plane FE { Trace: Stations.E }- RoundedRect2 Root { Center: [0mm,0mm] Size: [62mm,66mm] Radius: 16mm }- RoundedRect2 Belly { Center: [0mm,0mm] Size: [60mm,72mm] Radius: 16mm }- RoundedRect2 Waist { Center: [0mm,0mm] Size: [42mm,48mm] Radius: 12mm }- RoundedRect2 Tip { Center: [0mm,0mm] Size: [48mm,52mm] Radius: 14mm }+ RoundedRect2 Root { center: [0mm,0mm] size: [62mm,66mm] radius: 16mm }+ RoundedRect2 Belly { center: [0mm,0mm] size: [60mm,72mm] radius: 16mm }+ RoundedRect2 Waist { center: [0mm,0mm] size: [42mm,48mm] radius: 12mm }+ RoundedRect2 Tip { center: [0mm,0mm] size: [48mm,52mm] radius: 14mm }Profile PRoot { Loop Outer { Root |> TraceLoop } }Profile PBelly { Loop Outer { Belly |> TraceLoop } }Profile PWaist { Loop Outer { Waist |> TraceLoop } }Profile PTip { Loop Outer { Tip |> TraceLoop } }SectionChain Housing {- Continuity: G1+ continuity: G1ApproximationTolerance: 0.0001mmSection A {- Frame: FA- Profile: PRoot- Seam: Bottom+ frame: FA+ profile: PRoot+ seam: Bottom}Section B {- Frame: FB- Profile: PBelly- Seam: Bottom+ frame: FB+ profile: PBelly+ seam: Bottom}Section C {- Frame: FC- Profile: PWaist- Seam: Bottom+ frame: FC+ profile: PWaist+ seam: Bottom}Section D {- Frame: FD- Profile: PTip- Seam: Bottom+ frame: FD+ profile: PTip+ seam: Bottom}Section E {- Frame: FE- Profile: PTip- Seam: Bottom+ frame: FE+ profile: PTip+ seam: Bottom}- Start: Cap- End: Cap+ start: Cap+ end: Cap}}diff --git a/fixtures/Canonical/AssemblyInterfaces/articulated-subassemblies.firmament b/fixtures/Canonical/AssemblyInterfaces/articulated-subassemblies.firmamentindex f7d047b9..414fa7c2 100644--- a/fixtures/Canonical/AssemblyInterfaces/articulated-subassemblies.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/articulated-subassemblies.firmament@@ -3,7 +3,7 @@ Template<H: Length> Struct Link {Circle2 C { center: [0mm,0mm]; radius: 1mm }Profile P { Loop Outer { C |> TraceLoop } }Extrude Body { profile: P; from: 0mm; to: H }- Expose { Semantic Pivot { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Pivot { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}Subassembly Arm {<Assembly Arm>@@ -15,8 +15,8 @@ Subassembly Arm {<Part Tip = Link<H:4mm>></Part></Assembly>anchor: Arm.Base.Pivot;- Interface<Revolute> Elbow { A: Arm.Rigid.Tip.Frame; B: Arm.Tip.Pivot.Frame; }- Expose { DatumFrame Mount = Base.Pivot.Frame; DatumFrame Tool = Tip.Pivot.Frame; Mate Bend = Elbow; }+ Interface<Revolute> Elbow { a: Arm.Rigid.Tip.Frame; b: Arm.Tip.Pivot.Frame; }+ expose { DatumFrame Mount = Base.Pivot.Frame; DatumFrame Tool = Tip.Pivot.Frame; Mate Bend = Elbow; }}Assembly Articulated {<Assembly Articulated>@@ -29,7 +29,7 @@ Assembly Articulated {</Assembly></Assembly>anchor: Articulated;- Interface<Prismatic> Slide { A: Articulated.Root.Frame; B: Articulated.Slider.Pivot.Frame; }- Interface<Fixed> Follow { A: Articulated.First.Tool; B: Articulated.Follower.Pivot.Frame; }- Interface<Revolute> Shoulder { A: Articulated.Root.Frame; B: Articulated.First.Mount; }+ Interface<Prismatic> Slide { a: Articulated.Root.Frame; b: Articulated.Slider.Pivot.Frame; }+ Interface<Fixed> Follow { a: Articulated.First.Tool; b: Articulated.Follower.Pivot.Frame; }+ Interface<Revolute> Shoulder { a: Articulated.Root.Frame; b: Articulated.First.Mount; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/bevel-subassembly-pair.firmament b/fixtures/Canonical/AssemblyInterfaces/bevel-subassembly-pair.firmamentindex 525536b9..85428b39 100644--- a/fixtures/Canonical/AssemblyInterfaces/bevel-subassembly-pair.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/bevel-subassembly-pair.firmament@@ -1,13 +1,13 @@Units: mmBevelGear Pinion { Module: 1mm Teeth: 20 PressureAngle: 20deg FaceWidth: 5mm BoreDiameter: 5mm PitchConeAngle: 26.565051177deg }BevelGear Gear { Module: 1mm Teeth: 40 PressureAngle: 20deg FaceWidth: 5mm BoreDiameter: 8mm PitchConeAngle: 63.434948823deg }-Subassembly BevelInput { <Assembly BevelInput><Part Gear = Pinion></Part></Assembly> Anchor: BevelInput.Gear; Expose { Gear Port = Gear; } }-Subassembly BevelOutput { <Assembly BevelOutput><Part Gear = Gear></Part></Assembly> Anchor: BevelOutput.Gear; Expose { Gear Port = Gear; } }+Subassembly BevelInput { <Assembly BevelInput><Part Gear = Pinion></Part></Assembly> anchor: BevelInput.Gear; expose { Gear Port = Gear; } }+Subassembly BevelOutput { <Assembly BevelOutput><Part Gear = Gear></Part></Assembly> anchor: BevelOutput.Gear; expose { Gear Port = Gear; } }Assembly BevelBridge {<Assembly BevelBridge><Assembly A = BevelInput></Assembly><Assembly B = BevelOutput>Placement ImportedOccurrence = [1,0,0,0, 0,0,1,0, 0,-1,0,0, 0,0,0,1];</Assembly></Assembly>- Anchor: BevelBridge.A.Port;- Interface<Gear> Mesh { A: BevelBridge.A.Port; B: BevelBridge.B.Port; ShaftAngle: 90deg }+ anchor: BevelBridge.A.Port;+ Interface<Gear> Mesh { a: BevelBridge.A.Port; b: BevelBridge.B.Port; ShaftAngle: 90deg }}diff --git a/fixtures/Canonical/AssemblyInterfaces/coaxial-knob.firmasm b/fixtures/Canonical/AssemblyInterfaces/coaxial-knob.firmasmindex ca53e9db..7a118d2f 100644--- a/fixtures/Canonical/AssemblyInterfaces/coaxial-knob.firmasm+++ b/fixtures/Canonical/AssemblyInterfaces/coaxial-knob.firmasm@@ -1,13 +1,13 @@-Include "GuitarX0/materials.firmament";-Include "GuitarX0/hardware-definitions.firmament";-Include "GuitarX0/knob.firmament";+include "GuitarX0/materials.firmament";+include "GuitarX0/hardware-definitions.firmament";+include "GuitarX0/knob.firmament";// One Concept spindle drives the complete rigid knob, along world X.Concept Struct ControlLayout {- Axis VolumeAxis { Origin: [3mm,4mm,5mm]; Direction: [2,0,0]; Reference: [0,3,1]; }+ Axis VolumeAxis { origin: [3mm,4mm,5mm]; direction: [2,0,0]; reference: [0,3,1]; }}Assembly Controls {<Assembly Controls><Assembly VolumeKnob = ControlKnob></Assembly></Assembly>- Anchor: Controls;- Interface<Revolute> VolumeControl { Datum: ControlLayout.VolumeAxis; Members: [Controls.VolumeKnob.Spindle]; }- Mate VolumeRotation: VolumeControl { Member: Controls.VolumeKnob.Spindle; At: 7mm; Clocking: 30deg; }+ anchor: Controls;+ Interface<Revolute> VolumeControl { datum: ControlLayout.VolumeAxis; members: [Controls.VolumeKnob.Spindle]; }+ Mate VolumeRotation: VolumeControl { member: Controls.VolumeKnob.Spindle; at: 7mm; clocking: 30deg; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/derived-datum-frames.firmament b/fixtures/Canonical/AssemblyInterfaces/derived-datum-frames.firmamentindex 8d95797f..3e476d4a 100644--- a/fixtures/Canonical/AssemblyInterfaces/derived-datum-frames.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/derived-datum-frames.firmament@@ -7,7 +7,7 @@ Template<H:Length> Struct Pin {Circle2 C { center: [0mm,0mm]; radius: 1mm }Profile P { Loop Outer { C |> TraceLoop } }Extrude Body { profile: P; from: 0mm; to: H }- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}Assembly SharedFrames {<Assembly SharedFrames><Part Cam = Pin<H:4mm>></Part></Assembly>diff --git a/fixtures/Canonical/AssemblyInterfaces/digit-module.firmament b/fixtures/Canonical/AssemblyInterfaces/digit-module.firmamentindex a7ce7e9f..62962785 100644--- a/fixtures/Canonical/AssemblyInterfaces/digit-module.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/digit-module.firmament@@ -17,14 +17,14 @@ Subassembly DigitModule {</Part></Assembly>- Anchor: DigitModule.Bearing.Joint;+ anchor: DigitModule.Bearing.Joint;Interface<Revolute> ShaftBearing {- A: DigitModule.Shaft.Joint;- B: DigitModule.Bearing.Joint;+ a: DigitModule.Shaft.Joint;+ b: DigitModule.Bearing.Joint;}- Expose {+ expose {Semantic Input = Bearing.Joint;Semantic Output = Shaft.Joint;}diff --git a/fixtures/Canonical/AssemblyInterfaces/executable-cell.firmament b/fixtures/Canonical/AssemblyInterfaces/executable-cell.firmamentindex 653b1415..85ab32c4 100644--- a/fixtures/Canonical/AssemblyInterfaces/executable-cell.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/executable-cell.firmament@@ -13,13 +13,13 @@ Template < Spec: CellBlockSpec >Struct CellBlock: CellBlockConcept {Require Positive => Spec.Width > 0mm && Spec.Depth > 0mm && Spec.Height > 0mmConcept Struct Design: CellBlockConcept {- Bounds: Box3 { Size: [Spec.Width, Spec.Depth, Spec.Height] }+ Bounds: Box3 { size: [Spec.Width, Spec.Depth, Spec.Height] }Axis: Bounds.Center.Axis(+Z)Seat: Bounds.Face(+Z)Base: Bounds.Face(-Z)Height: Spec.Height}- Box Body { Bounds: Design.Bounds }+ Box Body { bounds: Design.Bounds }Modify Body {EdgeFinish ProofBreak {Face: Design.Seat@@ -28,7 +28,7 @@ Struct CellBlock: CellBlockConcept {Distance: 1mm}}- Expose {+ expose {Bounds: Design.BoundsAxis: Design.AxisSeat: Design.Seat@@ -43,6 +43,6 @@ Subassembly ExecutableCell {Semantic Port { Axis Axis = [0,0,0] -> [0,0,1]; }</Part></Assembly>- Anchor: ExecutableCell.Body.Port;- Expose { Semantic Port = Body.Port; }+ anchor: ExecutableCell.Body.Port;+ expose { Semantic Port = Body.Port; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/executable-machine.firmament b/fixtures/Canonical/AssemblyInterfaces/executable-machine.firmamentindex 79b483a0..37ff8640 100644--- a/fixtures/Canonical/AssemblyInterfaces/executable-machine.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/executable-machine.firmament@@ -1,4 +1,4 @@-Include "executable-cell.firmament";+include "executable-cell.firmament";Interface<Axial> InstallCell { Role A requires AxisCapable; Role B requires AxisCapable; }@@ -11,7 +11,7 @@ Assembly ExecutableMachine {<Assembly CellA = ExecutableCell></Assembly><Assembly CellB = ExecutableCell></Assembly></Assembly>- Anchor: ExecutableMachine.Frame.Left;+ anchor: ExecutableMachine.Frame.Left;Mate PlaceA: InstallCell { A: ExecutableMachine.CellA.Port; B: ExecutableMachine.Frame.Left; }Mate PlaceB: InstallCell { A: ExecutableMachine.CellB.Port; B: ExecutableMachine.Frame.Right; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/exposed-gear-port.firmament b/fixtures/Canonical/AssemblyInterfaces/exposed-gear-port.firmamentindex 9f11b9b3..f5d2ff2d 100644--- a/fixtures/Canonical/AssemblyInterfaces/exposed-gear-port.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/exposed-gear-port.firmament@@ -15,12 +15,12 @@ Subassembly DigitModule {Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 60,0,0,1];</Part></Assembly>- Anchor: DigitModule.InputGear;+ anchor: DigitModule.InputGear;Interface<Gear> InternalMesh {- A: DigitModule.InputGear;- B: DigitModule.OutputGear;+ a: DigitModule.InputGear;+ b: DigitModule.OutputGear;}- Expose {+ expose {Gear Input = InputGear;Gear Output = OutputGear;}@@ -33,9 +33,9 @@ Assembly Register {Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 120,0,0,1];</Assembly></Assembly>- Anchor: Register.Digit0.Output;+ anchor: Register.Digit0.Output;Interface<Gear> Transfer {- A: Register.Digit0.Output;- B: Register.Digit1.Input;+ a: Register.Digit0.Output;+ b: Register.Digit1.Input;}}diff --git a/fixtures/Canonical/AssemblyInterfaces/external-occt-slider-usd.firmament b/fixtures/Canonical/AssemblyInterfaces/external-occt-slider-usd.firmamentindex 18d5bef1..4420a716 100644--- a/fixtures/Canonical/AssemblyInterfaces/external-occt-slider-usd.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/external-occt-slider-usd.firmament@@ -10,6 +10,6 @@ Assembly ExternalSlider {Semantic Slide { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }</Part></Assembly>- Anchor: ExternalSlider.Rail.Slide;- Interface<Prismatic> Travel { A: ExternalSlider.Rail.Slide; B: ExternalSlider.Carriage.Slide; }+ anchor: ExternalSlider.Rail.Slide;+ Interface<Prismatic> Travel { a: ExternalSlider.Rail.Slide; b: ExternalSlider.Carriage.Slide; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/external-step-slider.firmament b/fixtures/Canonical/AssemblyInterfaces/external-step-slider.firmamentindex b334ccac..86da971a 100644--- a/fixtures/Canonical/AssemblyInterfaces/external-step-slider.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/external-step-slider.firmament@@ -9,6 +9,6 @@ Assembly ExternalSlider {Semantic Slide { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }</Part></Assembly>- Anchor: ExternalSlider.Rail.Slide;- Interface<Prismatic> Travel { A: ExternalSlider.Rail.Slide; B: ExternalSlider.Carriage.Slide; }+ anchor: ExternalSlider.Rail.Slide;+ Interface<Prismatic> Travel { a: ExternalSlider.Rail.Slide; b: ExternalSlider.Carriage.Slide; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/fixed-nested-usd.firmament b/fixtures/Canonical/AssemblyInterfaces/fixed-nested-usd.firmamentindex 2a56507b..bb46fbbb 100644--- a/fixtures/Canonical/AssemblyInterfaces/fixed-nested-usd.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/fixed-nested-usd.firmament@@ -1,18 +1,18 @@Template < R: Length > Struct Sleeve {- Circle2 Outside { Center: [0mm,0mm] Radius: R }- Circle2 Inside { Center: [0mm,0mm] Radius: 15mm }- Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside As InnerBoundary |> TraceLoop } }- Extrude Body { Profile: Section From: -10mm To: 10mm }+ Circle2 Outside { center: [0mm,0mm] radius: R }+ Circle2 Inside { center: [0mm,0mm] radius: 15mm }+ Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside as InnerBoundary |> TraceLoop } }+ Extrude Body { profile: Section from: -10mm to: 10mm }}Assembly FixedNested {<Assembly FixedNested><Part Base = Sleeve<R: 20mm>>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1];+ Placement { from: Origin; to: Parent; }</Part><Assembly Module>- Placement LegacyExplicit = [0.7071067811865476,0.7071067811865475,0,0,-0.7071067811865475,0.7071067811865476,0,0,0,0,1,0,40,10,3,1];+ Placement { from: Origin; to: Parent; translateLocal: [40mm, 10mm, 3mm]; rotateLocal: { axis: Z; angle: 45deg; }; }<Part First = Sleeve<R: 20mm>>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1];+ Placement { from: Origin; to: Parent; }Semantic Mount { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }Semantic Output { DatumFrame Frame = [60,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }</Part>@@ -21,6 +21,6 @@ Assembly FixedNested {</Part></Assembly></Assembly>- Anchor: FixedNested;- Interface<Fixed> Seat { A: FixedNested.Module.First.Output; B: FixedNested.Module.Second.Mount; }+ anchor: FixedNested;+ Interface<Fixed> Seat { a: FixedNested.Module.First.Output; b: FixedNested.Module.Second.Mount; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/gear-between-subassemblies.firmament b/fixtures/Canonical/AssemblyInterfaces/gear-between-subassemblies.firmamentindex 776687a9..4b001615 100644--- a/fixtures/Canonical/AssemblyInterfaces/gear-between-subassemblies.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/gear-between-subassemblies.firmament@@ -2,14 +2,14 @@ Units: mmSpurGear Wheel { Module: 2mm Teeth: 20 PressureAngle: 20deg FaceWidth: 6mm BoreDiameter: 5mm Phase: 3deg }Subassembly GearCell {<Assembly GearCell><Part Wheel = Wheel></Part></Assembly>- Anchor: GearCell.Wheel;- Expose { Gear Port = Wheel; }+ anchor: GearCell.Wheel;+ expose { Gear Port = Wheel; }}Assembly GearCells {<Assembly GearCells><Assembly A = GearCell></Assembly><Assembly B = GearCell>Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 40,0,0,1];</Assembly></Assembly>- Anchor: GearCells.A.Port;- Interface<Gear> Transfer { A: GearCells.A.Port; B: GearCells.B.Port; }+ anchor: GearCells.A.Port;+ Interface<Gear> Transfer { a: GearCells.A.Port; b: GearCells.B.Port; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/gear-with-ordinary-part.firmament b/fixtures/Canonical/AssemblyInterfaces/gear-with-ordinary-part.firmamentindex 8049a98f..02bbafde 100644--- a/fixtures/Canonical/AssemblyInterfaces/gear-with-ordinary-part.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/gear-with-ordinary-part.firmament@@ -1,9 +1,9 @@Units: mmSpurGear Drive { Module: 2mm Teeth: 20 PressureAngle: 20deg FaceWidth: 8mm BoreDiameter: 8.4mm }Template < R: Length, H: Length > Struct Shaft {- Circle2 Outside { Center: [0mm,0mm] Radius: R }+ Circle2 Outside { center: [0mm,0mm] radius: R }Profile Section { Loop Outer { Outside |> TraceLoop } }- Extrude Body { Profile: Section From: 0mm To: H }+ Extrude Body { profile: Section from: 0mm to: H }}Subassembly GearAndShaft {<Assembly GearAndShaft>@@ -13,8 +13,8 @@ Subassembly GearAndShaft {Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,-16,1];</Part></Assembly>- Anchor: GearAndShaft.Wheel;- Expose { Gear Drive = Wheel; Semantic Mount = Axle.Mount; }+ anchor: GearAndShaft.Wheel;+ expose { Gear Drive = Wheel; Semantic Mount = Axle.Mount; }}Assembly MixedMechanism {<Assembly MixedMechanism>@@ -23,6 +23,6 @@ Assembly MixedMechanism {Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 40,0,0,1];</Assembly></Assembly>- Anchor: MixedMechanism.First.Mount;- Interface<Gear> Mesh { A: MixedMechanism.First.Drive; B: MixedMechanism.Second.Drive; }+ anchor: MixedMechanism.First.Mount;+ Interface<Gear> Mesh { a: MixedMechanism.First.Drive; b: MixedMechanism.Second.Drive; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/index-plate-with-gear.firmament b/fixtures/Canonical/AssemblyInterfaces/index-plate-with-gear.firmamentindex 54b077c3..9b67d756 100644--- a/fixtures/Canonical/AssemblyInterfaces/index-plate-with-gear.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/index-plate-with-gear.firmament@@ -1,5 +1,5 @@Units: mm-Include "../../DifferenceEngine/parts/Storage.firmament";+include "../../DifferenceEngine/parts/Storage.firmament";SpurGear Drive { Module: 2mm Teeth: 20 PressureAngle: 20deg FaceWidth: 8mm BoreDiameter: 8.4mm }Assembly IndexedGear {<Assembly IndexedGear>@@ -8,5 +8,5 @@ Assembly IndexedGear {Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,10,1];</Part></Assembly>- Anchor: IndexedGear.Wheel;+ anchor: IndexedGear.Wheel;}diff --git a/fixtures/Canonical/AssemblyInterfaces/machine.firmament b/fixtures/Canonical/AssemblyInterfaces/machine.firmamentindex 5a3f6c13..81109bf2 100644--- a/fixtures/Canonical/AssemblyInterfaces/machine.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/machine.firmament@@ -1,4 +1,4 @@-Include "register.firmament";+include "register.firmament";Assembly DifferenceEngineReadiness {<Assembly DifferenceEngineReadiness>@@ -6,11 +6,11 @@ Assembly DifferenceEngineReadiness {<Assembly RegisterB = Register></Assembly></Assembly>- Anchor: DifferenceEngineReadiness.RegisterA.Output;+ anchor: DifferenceEngineReadiness.RegisterA.Output;// The parent sees only public ports; no Digit or Shaft path crosses the boundary.Interface<Axial> RegisterCarry {- A: DifferenceEngineReadiness.RegisterB.Input;- B: DifferenceEngineReadiness.RegisterA.Output;+ a: DifferenceEngineReadiness.RegisterB.Input;+ b: DifferenceEngineReadiness.RegisterA.Output;}}diff --git a/fixtures/Canonical/AssemblyInterfaces/nested-occurrence-frames.firmament b/fixtures/Canonical/AssemblyInterfaces/nested-occurrence-frames.firmamentindex 6c509058..b4d9045e 100644--- a/fixtures/Canonical/AssemblyInterfaces/nested-occurrence-frames.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/nested-occurrence-frames.firmament@@ -1,8 +1,8 @@Units: mmTemplate < H: Length > Struct Pin {- Circle2 Circle { Center: [0mm,0mm] Radius: 1mm }+ Circle2 Circle { center: [0mm,0mm] radius: 1mm }Profile Section { Loop Outer { Circle |> TraceLoop } }- Extrude Body { Profile: Section From: 0mm To: H }+ Extrude Body { profile: Section from: 0mm to: H }}Subassembly Inner {<Assembly Inner>@@ -11,7 +11,7 @@ Subassembly Inner {Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 5,7,11,1];</Part></Assembly>- Anchor: Inner.Origin;+ anchor: Inner.Origin;}Subassembly Middle {<Assembly Middle>@@ -20,7 +20,7 @@ Subassembly Middle {Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 30,0,40,1];</Assembly></Assembly>- Anchor: Middle.Origin;+ anchor: Middle.Origin;}Assembly NestedFrames {<Assembly NestedFrames>@@ -29,5 +29,5 @@ Assembly NestedFrames {Placement ImportedOccurrence = [0,1,0,0, -1,0,0,0, 0,0,1,0, 100,200,300,1];</Assembly></Assembly>- Anchor: NestedFrames.Origin;+ anchor: NestedFrames.Origin;}diff --git a/fixtures/Canonical/AssemblyInterfaces/nested-register-gear.firmament b/fixtures/Canonical/AssemblyInterfaces/nested-register-gear.firmamentindex 464be0a4..df687209 100644--- a/fixtures/Canonical/AssemblyInterfaces/nested-register-gear.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/nested-register-gear.firmament@@ -2,19 +2,19 @@ Units: mmSpurGear Wheel { Module: 2mm Teeth: 20 PressureAngle: 20deg FaceWidth: 6mm BoreDiameter: 5mm Phase: 9deg }Subassembly DigitModule {<Assembly DigitModule><Part Gear = Wheel></Part></Assembly>- Anchor: DigitModule.Gear;- Expose { Gear Input = Gear; Gear Output = Gear; }+ anchor: DigitModule.Gear;+ expose { Gear Input = Gear; Gear Output = Gear; }}Subassembly Register {<Assembly Register><Assembly Digit = DigitModule></Assembly></Assembly>- Anchor: Register.Digit.Input;- Expose { Gear Input = Digit.Input; Gear Output = Digit.Output; }+ anchor: Register.Digit.Input;+ expose { Gear Input = Digit.Input; Gear Output = Digit.Output; }}Assembly Machine {<Assembly Machine><Assembly RegisterA = Register></Assembly><Assembly RegisterB = Register>Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 40,0,0,1];</Assembly></Assembly>- Anchor: Machine.RegisterA.Output;- Interface<Gear> RegisterTransfer { A: Machine.RegisterA.Output; B: Machine.RegisterB.Input; }+ anchor: Machine.RegisterA.Output;+ Interface<Gear> RegisterTransfer { a: Machine.RegisterA.Output; b: Machine.RegisterB.Input; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/physical-ai-demo.firmament b/fixtures/Canonical/AssemblyInterfaces/physical-ai-demo.firmamentindex 4f40c1c6..cf0cea12 100644--- a/fixtures/Canonical/AssemblyInterfaces/physical-ai-demo.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/physical-ai-demo.firmament@@ -1,38 +1,38 @@// ATLAS: exact Aetheris SCARA demonstrator. Appearance is a downstream USD override.Template<R: Length, H: Length> Struct Pedestal {- Circle2 Outside { Center: [0mm,0mm] Radius: R }- Circle2 Inside { Center: [0mm,0mm] Radius: 36mm }- Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside As InnerBoundary |> TraceLoop } }- Extrude Body { Profile: Section From: 0mm To: H }+ Circle2 Outside { center: [0mm,0mm] radius: R }+ Circle2 Inside { center: [0mm,0mm] radius: 36mm }+ Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside as InnerBoundary |> TraceLoop } }+ Extrude Body { profile: Section from: 0mm to: H }}Template<L: Length, W: Length, H: Length> Struct GuardLink {- Rect2 Stock { Center: [70mm,0mm] Size: [L,W] }- Circle2 Vent1 { Center: [40mm,0mm] Radius: 7mm }- Circle2 Vent2 { Center: [60mm,0mm] Radius: 7mm }- Circle2 Vent3 { Center: [80mm,0mm] Radius: 7mm }+ Rect2 Stock { center: [70mm,0mm] size: [L,W] }+ Circle2 Vent1 { center: [40mm,0mm] radius: 7mm }+ Circle2 Vent2 { center: [60mm,0mm] radius: 7mm }+ Circle2 Vent3 { center: [80mm,0mm] radius: 7mm }Profile Section {Loop Outer { Stock.Bottom |> Stock.Right |> Stock.Top |> Stock.Left |> Close }- Loop Vent1 { Vent1 As Vent1Boundary |> TraceLoop }- Loop Vent2 { Vent2 As Vent2Boundary |> TraceLoop }- Loop Vent3 { Vent3 As Vent3Boundary |> TraceLoop }+ Loop Vent1 { Vent1 as Vent1Boundary |> TraceLoop }+ Loop Vent2 { Vent2 as Vent2Boundary |> TraceLoop }+ Loop Vent3 { Vent3 as Vent3Boundary |> TraceLoop }}- Extrude Body { Profile: Section From: 0mm To: H }+ Extrude Body { profile: Section from: 0mm to: H }}Template<R: Length> Struct JointRing {- Circle2 Outside { Center: [0mm,0mm] Radius: R }- Circle2 Inside { Center: [0mm,0mm] Radius: 13mm }- Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside As InnerBoundary |> TraceLoop } }- Extrude Body { Profile: Section From: -3mm To: 3mm }+ Circle2 Outside { center: [0mm,0mm] radius: R }+ Circle2 Inside { center: [0mm,0mm] radius: 13mm }+ Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside as InnerBoundary |> TraceLoop } }+ Extrude Body { profile: Section from: -3mm to: 3mm }}Template<W: Length> Struct GripperHead {- Rect2 Stock { Center: [0mm,0mm] Size: [28mm,W] }+ Rect2 Stock { center: [0mm,0mm] size: [28mm,W] }Profile Section { Loop Outer { Stock.Bottom |> Stock.Right |> Stock.Top |> Stock.Left |> Close } }- Extrude Body { Profile: Section From: 0mm To: 18mm }+ Extrude Body { profile: Section from: 0mm to: 18mm }}Template<L: Length> Struct Finger {- Rect2 Stock { Center: [22.5mm,0mm] Size: [L,8mm] }+ Rect2 Stock { center: [22.5mm,0mm] size: [L,8mm] }Profile Section { Loop Outer { Stock.Bottom |> Stock.Right |> Stock.Top |> Stock.Left |> Close } }- Extrude Body { Profile: Section From: -20mm To: 0mm }+ Extrude Body { profile: Section from: -20mm to: 0mm }}Assembly Atlas {<Assembly Atlas>@@ -40,7 +40,7 @@ Assembly Atlas {Semantic Hinge { DatumFrame Frame = [0,0,60] x [1,0,0] y [0,1,0] z [0,0,1]; }</Part><Assembly UpperArm>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1];+ Placement { from: Origin; to: Parent; }<Part Housing = GuardLink<L: 160mm, W: 44mm, H: 22mm>>Semantic Input { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }Semantic Output { DatumFrame Frame = [150,0,24] x [1,0,0] y [0,1,0] z [0,0,1]; }@@ -54,7 +54,7 @@ Assembly Atlas {</Part></Assembly><Assembly ForeArm>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1];+ Placement { from: Origin; to: Parent; }<Part Housing = GuardLink<L: 130mm, W: 34mm, H: 16mm>>Semantic Input { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }Semantic Output { DatumFrame Frame = [130,0,20] x [1,0,0] y [0,1,0] z [0,0,1]; }@@ -76,13 +76,13 @@ Assembly Atlas {Semantic Slide { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,0,1] z [0,-1,0]; }</Part></Assembly>- Anchor: Atlas.Base.Hinge;- Interface<Revolute> Shoulder { A: Atlas.Base.Hinge; B: Atlas.UpperArm.Housing.Input; }- Interface<Revolute> Elbow { A: Atlas.UpperArm.Housing.Output; B: Atlas.ForeArm.Housing.Input; }- Interface<Fixed> WristMount { A: Atlas.ForeArm.Housing.Output; B: Atlas.Wrist.Mount; }- Interface<Prismatic> GripLeft { A: Atlas.Wrist.Left; B: Atlas.LeftFinger.Slide; }- Interface<Prismatic> GripRight { A: Atlas.Wrist.Right; B: Atlas.RightFinger.Slide; }- Interface<Fixed> ShoulderTrim { A: Atlas.UpperArm.Housing.Collar; B: Atlas.UpperArm.ShoulderCollar.Mount; }- Interface<Fixed> ElbowTrim { A: Atlas.UpperArm.Housing.Output; B: Atlas.UpperArm.ElbowCollar.Mount; }- Interface<Fixed> WristTrim { A: Atlas.ForeArm.Housing.Output; B: Atlas.ForeArm.WristCollar.Mount; }+ anchor: Atlas.Base.Hinge;+ Interface<Revolute> Shoulder { a: Atlas.Base.Hinge; b: Atlas.UpperArm.Housing.Input; }+ Interface<Revolute> Elbow { a: Atlas.UpperArm.Housing.Output; b: Atlas.ForeArm.Housing.Input; }+ Interface<Fixed> WristMount { a: Atlas.ForeArm.Housing.Output; b: Atlas.Wrist.Mount; }+ Interface<Prismatic> GripLeft { a: Atlas.Wrist.Left; b: Atlas.LeftFinger.Slide; }+ Interface<Prismatic> GripRight { a: Atlas.Wrist.Right; b: Atlas.RightFinger.Slide; }+ Interface<Fixed> ShoulderTrim { a: Atlas.UpperArm.Housing.Collar; b: Atlas.UpperArm.ShoulderCollar.Mount; }+ Interface<Fixed> ElbowTrim { a: Atlas.UpperArm.Housing.Output; b: Atlas.UpperArm.ElbowCollar.Mount; }+ Interface<Fixed> WristTrim { a: Atlas.ForeArm.Housing.Output; b: Atlas.ForeArm.WristCollar.Mount; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/register.firmament b/fixtures/Canonical/AssemblyInterfaces/register.firmamentindex 1c0aee19..7e6bb8f3 100644--- a/fixtures/Canonical/AssemblyInterfaces/register.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/register.firmament@@ -1,4 +1,4 @@-Include "digit-module.firmament";+include "digit-module.firmament";// One definition contains two occurrences of the shared DigitModule definition.Subassembly Register {@@ -7,11 +7,11 @@ Subassembly Register {<Assembly Digit1 = DigitModule></Assembly></Assembly>- Anchor: Register.Digit0.Output;+ anchor: Register.Digit0.Output;Interface<Custom> CarryLink {- A: Register.Digit1.Input;- B: Register.Digit0.Output;+ a: Register.Digit1.Input;+ b: Register.Digit0.Output;Mate AxisCoincident A.Axis B.Axis;Mate PlaneCoincident A.Seat B.Seat;Mate PointCoincident A.Locator B.Locator;@@ -19,7 +19,7 @@ Subassembly Register {Allow rotation:about-axis;}- Expose {+ expose {Semantic Input = Digit0.Input;Semantic Output = Digit1.Output;}diff --git a/fixtures/Canonical/AssemblyInterfaces/relative-moving-frames.firmament b/fixtures/Canonical/AssemblyInterfaces/relative-moving-frames.firmamentindex accc05dd..15037098 100644--- a/fixtures/Canonical/AssemblyInterfaces/relative-moving-frames.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/relative-moving-frames.firmament@@ -18,7 +18,7 @@ Assembly RelativeFrames {Semantic Input { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }</Part></Assembly>- Interface<Revolute> Base { A: RelativeFrames.Ground.Frame; B: RelativeFrames.Rotor.Input.Frame; }- Interface<Revolute> Elbow { A: RelativeFrames.Rigid.Output.Frame; B: RelativeFrames.Tip.Input.Frame; }+ Interface<Revolute> Base { a: RelativeFrames.Ground.Frame; b: RelativeFrames.Rotor.Input.Frame; }+ Interface<Revolute> Elbow { a: RelativeFrames.Rigid.Output.Frame; b: RelativeFrames.Tip.Input.Frame; }anchor: RelativeFrames;}diff --git a/fixtures/Canonical/AssemblyInterfaces/three-gear-train-hierarchical.firmament b/fixtures/Canonical/AssemblyInterfaces/three-gear-train-hierarchical.firmamentindex c3030d97..d466103a 100644--- a/fixtures/Canonical/AssemblyInterfaces/three-gear-train-hierarchical.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/three-gear-train-hierarchical.firmament@@ -7,15 +7,15 @@ Subassembly InputStage {<Part Driver = Driver></Part><Part Idler = Idler>Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 25,0,0,1];</Part></Assembly>- Anchor: InputStage.Driver;- Interface<Gear> FirstMesh { A: InputStage.Driver; B: InputStage.Idler; }- Expose { Gear Output = Idler; }+ anchor: InputStage.Driver;+ Interface<Gear> FirstMesh { a: InputStage.Driver; b: InputStage.Idler; }+ expose { Gear Output = Idler; }}Assembly GearTrain {<Assembly GearTrain><Assembly Stage = InputStage></Assembly><Part Output = Output>Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 60,0,0,1];</Part></Assembly>- Anchor: GearTrain.Stage.Output;- Interface<Gear> SecondMesh { A: GearTrain.Stage.Output; B: GearTrain.Output; }+ anchor: GearTrain.Stage.Output;+ Interface<Gear> SecondMesh { a: GearTrain.Stage.Output; b: GearTrain.Output; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/two-link-arm-usd.firmament b/fixtures/Canonical/AssemblyInterfaces/two-link-arm-usd.firmamentindex 5c487513..1be31557 100644--- a/fixtures/Canonical/AssemblyInterfaces/two-link-arm-usd.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/two-link-arm-usd.firmament@@ -1,13 +1,13 @@// Production geometry for the canonical Interface-only arm witness.Template<R: Length> Struct ArmBase {- Circle2 Outside { Center: [0mm,0mm] Radius: R }+ Circle2 Outside { center: [0mm,0mm] radius: R }Profile Section { Loop Outer { Outside |> TraceLoop } }- Extrude Body { Profile: Section From: -4mm To: 0mm }+ Extrude Body { profile: Section from: -4mm to: 0mm }}Template<L: Length> Struct ArmLink {- Rect2 Stock { Center: [10mm,0mm] Size: [L,5mm] }+ Rect2 Stock { center: [10mm,0mm] size: [L,5mm] }Profile Section { Loop Outer { Stock.Bottom |> Stock.Right |> Stock.Top |> Stock.Left |> Close } }- Extrude Body { Profile: Section From: 0mm To: 3mm }+ Extrude Body { profile: Section from: 0mm to: 3mm }}Assembly TwoLinkArm {<Assembly TwoLinkArm>@@ -22,7 +22,7 @@ Assembly TwoLinkArm {Semantic Input { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }</Part></Assembly>- Anchor: TwoLinkArm.Base.Hinge;- Interface<Revolute> Shoulder { A: TwoLinkArm.Base.Hinge; B: TwoLinkArm.Link1.Input; }- Interface<Revolute> Elbow { A: TwoLinkArm.Link1.Output; B: TwoLinkArm.Link2.Input; }+ anchor: TwoLinkArm.Base.Hinge;+ Interface<Revolute> Shoulder { a: TwoLinkArm.Base.Hinge; b: TwoLinkArm.Link1.Input; }+ Interface<Revolute> Elbow { a: TwoLinkArm.Link1.Output; b: TwoLinkArm.Link2.Input; }}diff --git a/fixtures/Canonical/AssemblyInterfaces/two-link-arm.firmament b/fixtures/Canonical/AssemblyInterfaces/two-link-arm.firmamentindex 6d76edea..b30a93d8 100644--- a/fixtures/Canonical/AssemblyInterfaces/two-link-arm.firmament+++ b/fixtures/Canonical/AssemblyInterfaces/two-link-arm.firmament@@ -11,7 +11,7 @@ Assembly TwoLinkArm {Semantic Input { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }</Part></Assembly>- Anchor: TwoLinkArm.Base.Hinge;- Interface<Revolute> Shoulder { A: TwoLinkArm.Base.Hinge; B: TwoLinkArm.Link1.Input; }- Interface<Revolute> Elbow { A: TwoLinkArm.Link1.Output; B: TwoLinkArm.Link2.Input; }+ anchor: TwoLinkArm.Base.Hinge;+ Interface<Revolute> Shoulder { a: TwoLinkArm.Base.Hinge; b: TwoLinkArm.Link1.Input; }+ Interface<Revolute> Elbow { a: TwoLinkArm.Link1.Output; b: TwoLinkArm.Link2.Input; }}diff --git a/fixtures/Canonical/Basics/box.firmament b/fixtures/Canonical/Basics/box.firmamentindex 8b58b750..51964025 100644--- a/fixtures/Canonical/Basics/box.firmament+++ b/fixtures/Canonical/Basics/box.firmament@@ -1,8 +1,8 @@Model BareBox {- Units: mm+ units: mmBox Base {- Size: [80mm, 50mm, 25mm]+ size: [80mm, 50mm, 25mm]}Assert Volume Base {Expected: 100000mm^3diff --git a/fixtures/Canonical/Basics/cylinder.firmament b/fixtures/Canonical/Basics/cylinder.firmamentindex acbfe105..678dddb7 100644--- a/fixtures/Canonical/Basics/cylinder.firmament+++ b/fixtures/Canonical/Basics/cylinder.firmament@@ -1,5 +1,5 @@Model BareCylinder {- Units: mm+ units: mmCylinder Base {Radius: 12mmdiff --git a/fixtures/Canonical/BodyState/surf-x3b-add-section-chain-grip.firmament b/fixtures/Canonical/BodyState/surf-x3b-add-section-chain-grip.firmamentindex f6da760d..12ee4605 100644--- a/fixtures/Canonical/BodyState/surf-x3b-add-section-chain-grip.firmament+++ b/fixtures/Canonical/BodyState/surf-x3b-add-section-chain-grip.firmament@@ -1,5 +1,5 @@Model SurfX3bAddSectionChainGrip {- Units: mm+ units: mmSectionChain GripChain {StartTermination: Open@@ -18,10 +18,10 @@ Model SurfX3bAddSectionChainGrip {BodyState Base {Size: [80mm, 40mm, 20mm]- Hole MountA { Center: [-25mm, -12mm]- Diameter: 4mm }- Hole MountB { Center: [25mm, 12mm]- Diameter: 4mm }+ Hole MountA { center: [-25mm, -12mm]+ diameter: 4mm }+ Hole MountB { center: [25mm, 12mm]+ diameter: 4mm }}SculptState GripAdded {diff --git a/fixtures/Canonical/BodyState/surf-x3b-multi-operation-replay.firmament b/fixtures/Canonical/BodyState/surf-x3b-multi-operation-replay.firmamentindex 17ce6eea..fc87f917 100644--- a/fixtures/Canonical/BodyState/surf-x3b-multi-operation-replay.firmament+++ b/fixtures/Canonical/BodyState/surf-x3b-multi-operation-replay.firmament@@ -1,5 +1,5 @@Model SurfX3bMultiOperationReplay {- Units: mm+ units: mmSectionChain GripChain {StartTermination: Open@@ -16,10 +16,10 @@ Model SurfX3bMultiOperationReplay {BodyState Base {Size: [80mm, 40mm, 20mm]- Hole MountA { Center: [-25mm, -12mm]- Diameter: 4mm }- Hole MountB { Center: [25mm, 12mm]- Diameter: 4mm }+ Hole MountA { center: [-25mm, -12mm]+ diameter: 4mm }+ Hole MountB { center: [25mm, 12mm]+ diameter: 4mm }}SculptState HoleOne {Input: Basediff --git a/fixtures/Canonical/BodyState/surf-x3b-remove-section-chain-duct.firmament b/fixtures/Canonical/BodyState/surf-x3b-remove-section-chain-duct.firmamentindex 5079418b..85fe966a 100644--- a/fixtures/Canonical/BodyState/surf-x3b-remove-section-chain-duct.firmament+++ b/fixtures/Canonical/BodyState/surf-x3b-remove-section-chain-duct.firmament@@ -1,5 +1,5 @@Model SurfX3bRemoveSectionChainDuct {- Units: mm+ units: mmSectionChain DuctChain {StartTermination: Open@@ -18,10 +18,10 @@ Model SurfX3bRemoveSectionChainDuct {BodyState Base {Size: [80mm, 40mm, 20mm]- Hole MountA { Center: [-25mm, -12mm]- Diameter: 4mm }- Hole MountB { Center: [25mm, 12mm]- Diameter: 4mm }+ Hole MountA { center: [-25mm, -12mm]+ diameter: 4mm }+ Hole MountB { center: [25mm, 12mm]+ diameter: 4mm }}SculptState DuctRemoved {diff --git a/fixtures/Canonical/BodyState/surf-x3b-safe-feature-after-add.firmament b/fixtures/Canonical/BodyState/surf-x3b-safe-feature-after-add.firmamentindex 8cc659cb..678ecb9c 100644--- a/fixtures/Canonical/BodyState/surf-x3b-safe-feature-after-add.firmament+++ b/fixtures/Canonical/BodyState/surf-x3b-safe-feature-after-add.firmament@@ -1,5 +1,5 @@Model SurfX3bSafeFeatureAfterAdd {- Units: mm+ units: mmSectionChain GripChain {StartTermination: OpenEndTermination: Cap@@ -12,10 +12,10 @@ Model SurfX3bSafeFeatureAfterAdd {}BodyState Base {Size: [80mm, 40mm, 20mm]- Hole MountA { Center: [-25mm, -12mm]- Diameter: 4mm }- Hole MountB { Center: [25mm, 12mm]- Diameter: 4mm }+ Hole MountA { center: [-25mm, -12mm]+ diameter: 4mm }+ Hole MountB { center: [25mm, 12mm]+ diameter: 4mm }}SculptState GripAdded {Input: Basediff --git a/fixtures/Canonical/BodyState/surf-x4-add-section-chain-g1-grip.firmament b/fixtures/Canonical/BodyState/surf-x4-add-section-chain-g1-grip.firmamentindex 92b8e3d6..43384472 100644--- a/fixtures/Canonical/BodyState/surf-x4-add-section-chain-g1-grip.firmament+++ b/fixtures/Canonical/BodyState/surf-x4-add-section-chain-g1-grip.firmament@@ -1,7 +1,7 @@Model SurfX4AddSectionChainG1Grip {- Units: mm+ units: mmSectionChain GripChain {- Continuity: G1+ continuity: G1StartTermination: OpenEndTermination: CapStation Attach { Origin: [0mm, 0mm, 10mm]@@ -17,10 +17,10 @@ Model SurfX4AddSectionChainG1Grip {}BodyState Base {Size: [80mm, 40mm, 20mm]- Hole MountA { Center: [-25mm, -12mm]- Diameter: 4mm }- Hole MountB { Center: [25mm, 12mm]- Diameter: 4mm }+ Hole MountA { center: [-25mm, -12mm]+ diameter: 4mm }+ Hole MountB { center: [25mm, 12mm]+ diameter: 4mm }}SculptState GripAdded {Input: Basediff --git a/fixtures/Canonical/BodyState/surf-x4-remove-section-chain-g1-duct.firmament b/fixtures/Canonical/BodyState/surf-x4-remove-section-chain-g1-duct.firmamentindex f6ec028e..f16f80be 100644--- a/fixtures/Canonical/BodyState/surf-x4-remove-section-chain-g1-duct.firmament+++ b/fixtures/Canonical/BodyState/surf-x4-remove-section-chain-g1-duct.firmament@@ -1,7 +1,7 @@Model SurfX4RemoveSectionChainG1Duct {- Units: mm+ units: mmSectionChain DuctChain {- Continuity: G1+ continuity: G1StartTermination: OpenEndTermination: OpenStation West { Origin: [-40mm, 0mm, 10mm]@@ -17,10 +17,10 @@ Model SurfX4RemoveSectionChainG1Duct {}BodyState Base {Size: [80mm, 40mm, 20mm]- Hole MountA { Center: [-25mm, -12mm]- Diameter: 4mm }- Hole MountB { Center: [25mm, 12mm]- Diameter: 4mm }+ Hole MountA { center: [-25mm, -12mm]+ diameter: 4mm }+ Hole MountB { center: [25mm, 12mm]+ diameter: 4mm }}SculptState DuctRemoved {Input: Basediff --git a/fixtures/Canonical/Boundary2/closed-boundary-family.firmament b/fixtures/Canonical/Boundary2/closed-boundary-family.firmamentindex 90f5e0b1..a61444ef 100644--- a/fixtures/Canonical/Boundary2/closed-boundary-family.firmament+++ b/fixtures/Canonical/Boundary2/closed-boundary-family.firmament@@ -1,5 +1,5 @@Model ClosedBoundaryFamily {- Units: mm+ units: mmStatic OutlinePoints: Set<Point2> {A => Point2(-18mm, -10mm)@@ -9,22 +9,22 @@ Model ClosedBoundaryFamily {D => Point2(-18mm, 8mm)}- Rect2 Plate { Center: [0mm, 0mm] Size: [100mm, 60mm] }+ Rect2 Plate { center: [0mm, 0mm] size: [100mm, 60mm] }Square2 Pad { Center: [0mm, 0mm] Size: 40mm }Triangle2<Equilateral> Equilateral { Center: [0mm, 0mm] Side: 40mm }Triangle2<Isosceles> Isosceles { Center: [0mm, 0mm] Base: 40mm Height: 30mm }Triangle2<Right> RightAngle { Origin: [0mm, 0mm] Legs: [30mm, 40mm] }Triangle2<Explicit> ExplicitTriangle { A: [0mm, 0mm] B: [30mm, 0mm] C: [0mm, 20mm] }- Circle2 Bore { Center: [0mm, 0mm] Diameter: 12mm }+ Circle2 Bore { center: [0mm, 0mm] Diameter: 12mm }Ellipse2 Opening { Center: [0mm, 0mm] AxisLengths: [40mm, 20mm] Rotation: 15deg }Slot2 CableSlot { Center: [0mm, 0mm] Length: 50mm Width: 12mm }- RoundedRect2 MountingRegion { Center: [0mm, 0mm] Size: [80mm, 44mm] Radius: 8mm }+ RoundedRect2 MountingRegion { center: [0mm, 0mm] size: [80mm, 44mm] radius: 8mm }Polygon2<Rhombus> Diamond { Center: [0mm, 0mm] Diagonals: [50mm, 32mm] }Polygon2<Parallelogram> Leaning { Center: [0mm, 0mm] Base: 40mm Height: 24mm Shear: 10mm }Polygon2<Trapezoid> Tapered { Center: [0mm, 0mm] BottomWidth: 44mm TopWidth: 28mm Height: 24mm }- Polygon2<Explicit> AuthoredOutline { Vertices: OutlinePoints }+ Polygon2<Explicit> AuthoredOutline { vertices: OutlinePoints }RegularPolygon2<6> Hex { Center: [0mm, 0mm] AcrossFlats: 32mm Rotation: 30deg }Profile PlateProfile { Loop Outer { Plate |> TraceLoop } Loop BoreLoop { Bore |> TraceLoop } }- Struct Part { Extrude Solid { Profile: PlateProfile From: 0mm To: 5mm } }+ Struct Part { Extrude Solid { profile: PlateProfile from: 0mm to: 5mm } }}diff --git a/fixtures/Canonical/Boundary2/edited-panel.firmament b/fixtures/Canonical/Boundary2/edited-panel.firmamentindex b1e94ac6..3774e5d3 100644--- a/fixtures/Canonical/Boundary2/edited-panel.firmament+++ b/fixtures/Canonical/Boundary2/edited-panel.firmament@@ -1,20 +1,20 @@Use Profile.Modifications;Model EditedPanel {- Units: mm+ units: mmConcept Struct Layout {- Rect2 Blank { Center: [0mm,0mm]; Size: [120mm,80mm] }+ Rect2 Blank { center: [0mm,0mm]; size: [120mm,80mm] }}Static ServiceTab: ProfileTabSpec { Center: 60mm; Width: 24mm; Extension: 8mm }ProfileDelta ServiceTabEdit = Tab<P: ServiceTab, Owner: Layout.Blank.Top>- Profile Panel Using Layout {- From: Blank+ Profile Panel using Layout {+ from: BlankApply ServiceTabEditReplace Grip {- On: Blank.Right- Range: [20mm,60mm]- Through: [[48mm,-10mm], [48mm,10mm]]- Join: Tangent+ on: Blank.Right+ range: [20mm,60mm]+ through: [[48mm,-10mm], [48mm,10mm]]+ join: Tangent}}- Extrude Body { Profile: Panel From: 0mm To: 3mm }+ Extrude Body { profile: Panel from: 0mm to: 3mm }}diff --git a/fixtures/Canonical/Concepts/shape-prefix.firmament b/fixtures/Canonical/Concepts/shape-prefix.firmamentindex b9fd1da2..124a6211 100644--- a/fixtures/Canonical/Concepts/shape-prefix.firmament+++ b/fixtures/Canonical/Concepts/shape-prefix.firmament@@ -1,7 +1,7 @@Model GuidePlate {units: mmConcept Struct layout on XY {- Concept Slot2 boundary { center: [0mm, 0mm]; length: 40mm; width: 12mm }+ Slot2 boundary { center: [0mm, 0mm]; length: 40mm; width: 12mm }}Profile outline using layout { Loop Outer { boundary |> TraceLoop } }Extrude Body { profile: outline; from: 0mm; to: 5mm }diff --git a/fixtures/Canonical/DisplayProjection/cone.firmament b/fixtures/Canonical/DisplayProjection/cone.firmamentindex 811fbef7..7203d443 100644--- a/fixtures/Canonical/DisplayProjection/cone.firmament+++ b/fixtures/Canonical/DisplayProjection/cone.firmament@@ -1,4 +1,4 @@Model RetainedCone {- Units: mm+ units: mmCone Base { BottomRadius: 12mm; TopRadius: 0mm; Height: 30mm }}diff --git a/fixtures/Canonical/DisplayProjection/locating-pin.firmament b/fixtures/Canonical/DisplayProjection/locating-pin.firmamentindex d884f852..4b09bc54 100644--- a/fixtures/Canonical/DisplayProjection/locating-pin.firmament+++ b/fixtures/Canonical/DisplayProjection/locating-pin.firmament@@ -1,6 +1,6 @@// Nominal straight cylindrical locating pin: diameter 6 mm, length 20 mm.// This bounded display specimen makes no edge-finish or manufacturing-release claim.Model LocatingPin {- Units: mm+ units: mmCylinder PinBody { Radius: 3mm; Height: 20mm; }}diff --git a/fixtures/Canonical/DisplayProjection/mixed.firmament b/fixtures/Canonical/DisplayProjection/mixed.firmamentindex 21284335..753a00a5 100644--- a/fixtures/Canonical/DisplayProjection/mixed.firmament+++ b/fixtures/Canonical/DisplayProjection/mixed.firmament@@ -1,27 +1,27 @@Template < R: Length > Model AnalyticCylinder {- Units: mm; Cylinder Body { Radius: R; Height: 30mm; }+ units: mm; Cylinder Body { Radius: R; Height: 30mm; }}Template < W: Length > Struct MeshPlate {- Circle2 Outer { Center: [0mm,0mm]; Radius: W; }- Circle2 Inner { Center: [0mm,0mm]; Radius: 4mm; }- Profile Ring { Loop Outer { Outer |> TraceLoop } Loop Bore { Inner As InnerBoundary |> TraceLoop } }- Extrude Body { Profile: Ring; From: 0mm; To: 5mm; }+ Circle2 Outer { center: [0mm,0mm]; radius: W; }+ Circle2 Inner { center: [0mm,0mm]; radius: 4mm; }+ Profile Ring { Loop Outer { Outer |> TraceLoop } Loop Bore { Inner as InnerBoundary |> TraceLoop } }+ Extrude Body { profile: Ring; from: 0mm; to: 5mm; }}-Appearance CopperLook { Color: [.55,.18,.06]; Roughness: .3; Metallic: .7; }-Material Copper { Identity: "copper"; Appearance: CopperLook; }-Appearance BlueSteelLook { Color: [.02,.15,.5]; Roughness: .5; Metallic: .6; }-Material BlueSteel { Identity: "steel"; Appearance: BlueSteelLook; }+Appearance CopperLook { color: [.55,.18,.06]; roughness: .3; metallic: .7; }+Material Copper { identity: "copper"; appearance: CopperLook; }+Appearance BlueSteelLook { color: [.02,.15,.5]; roughness: .5; metallic: .6; }+Material BlueSteel { identity: "steel"; appearance: BlueSteelLook; }Assembly MixedDisplay {<Assembly MixedDisplay>- <Part CylinderA = AnalyticCylinder<R:12mm>> Material: Copper;- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1];+ <Part CylinderA = AnalyticCylinder<R:12mm>> material: Copper;+ Placement { from: Origin; to: Parent; }</Part><Part CylinderB = AnalyticCylinder<R:12mm>>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,50,0,0,1];+ Placement { from: Origin; to: Parent; translateLocal: [50mm, 0mm, 0mm]; }</Part>- <Part Mesh = MeshPlate<W:20mm>> Material: BlueSteel;- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,0,-60,10,1];+ <Part Mesh = MeshPlate<W:20mm>> material: BlueSteel;+ Placement { from: Origin; to: Parent; translateLocal: [0mm, -60mm, 10mm]; }</Part></Assembly>- Anchor: MixedDisplay;+ anchor: MixedDisplay;}diff --git a/fixtures/Canonical/DisplayProjection/sphere.firmament b/fixtures/Canonical/DisplayProjection/sphere.firmamentindex b2288c10..0dab5156 100644--- a/fixtures/Canonical/DisplayProjection/sphere.firmament+++ b/fixtures/Canonical/DisplayProjection/sphere.firmament@@ -1,4 +1,4 @@Model RetainedSphere {- Units: mm+ units: mmSphere Base { Radius: 12mm }}diff --git a/fixtures/Canonical/DisplayProjection/torus.firmament b/fixtures/Canonical/DisplayProjection/torus.firmamentindex 4a3b09f2..24a93ed4 100644--- a/fixtures/Canonical/DisplayProjection/torus.firmament+++ b/fixtures/Canonical/DisplayProjection/torus.firmament@@ -1,4 +1,4 @@Model RetainedTorus {- Units: mm+ units: mmTorus Base { MajorRadius: 20mm; MinorRadius: 5mm }}diff --git a/fixtures/Canonical/Drawings/bearing-block-production-drawing.firmament b/fixtures/Canonical/Drawings/bearing-block-production-drawing.firmamentindex 3ff152ee..9e62647a 100644--- a/fixtures/Canonical/Drawings/bearing-block-production-drawing.firmament+++ b/fixtures/Canonical/Drawings/bearing-block-production-drawing.firmament@@ -1,5 +1,5 @@Model BearingBlock {- Units: mm+ units: mmEnum BearingSize { BB080 BB100 BB120 }Record BearingStandard {@@ -16,13 +16,13 @@ Model BearingBlock {Depth: [12mm, 16mm, 20mm]BoreDiameter: [8mm, 10mm, 12mm]}- Box Base { Size: [80mm, 50mm, 12mm] }+ Box Base { size: [80mm, 50mm, 12mm] }Modify Base {Hole<Shaft> Mount {- On: +Z- Center: Point2(0mm, 0mm)- Diameter: 8mm- End: ThroughAll+ on: +Z+ center: Point2(0mm, 0mm)+ diameter: 8mm+ end: ThroughAll}}Require MountDiameterConstraint {diff --git a/fixtures/Canonical/EditableV8/assemblies/cam-left.firmament b/fixtures/Canonical/EditableV8/assemblies/cam-left.firmamentindex 3054b25f..15b36c04 100644--- a/fixtures/Canonical/EditableV8/assemblies/cam-left.firmament+++ b/fixtures/Canonical/EditableV8/assemblies/cam-left.firmament@@ -38,5 +38,5 @@ Subassembly CamLeft {</Part>Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }</Assembly>- Anchor: CamLeft;+ anchor: CamLeft;}diff --git a/fixtures/Canonical/EditableV8/assemblies/cam-right.firmament b/fixtures/Canonical/EditableV8/assemblies/cam-right.firmamentindex 455c791b..421fec3b 100644--- a/fixtures/Canonical/EditableV8/assemblies/cam-right.firmament+++ b/fixtures/Canonical/EditableV8/assemblies/cam-right.firmament@@ -38,5 +38,5 @@ Subassembly CamRight {</Part>Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }</Assembly>- Anchor: CamRight;+ anchor: CamRight;}diff --git a/fixtures/Canonical/EditableV8/assemblies/crankcase.firmament b/fixtures/Canonical/EditableV8/assemblies/crankcase.firmamentindex f639b21a..02ae5496 100644--- a/fixtures/Canonical/EditableV8/assemblies/crankcase.firmament+++ b/fixtures/Canonical/EditableV8/assemblies/crankcase.firmament@@ -32,5 +32,5 @@ Subassembly Crankcase {</Part>Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }</Assembly>- Anchor: Crankcase;+ anchor: Crankcase;}diff --git a/fixtures/Canonical/EditableV8/assemblies/crankshaft.firmament b/fixtures/Canonical/EditableV8/assemblies/crankshaft.firmamentindex 05496437..8f2d4908 100644--- a/fixtures/Canonical/EditableV8/assemblies/crankshaft.firmament+++ b/fixtures/Canonical/EditableV8/assemblies/crankshaft.firmament@@ -73,5 +73,5 @@ Subassembly Crankshaft {Semantic Pin3 = Crankpin3.Mount;Semantic Pin4 = Crankpin4.Mount;}- Anchor: Crankshaft;+ anchor: Crankshaft;}diff --git a/fixtures/Canonical/EditableV8/assemblies/stage-a.firmament b/fixtures/Canonical/EditableV8/assemblies/stage-a.firmamentindex a00808b6..5b2be780 100644--- a/fixtures/Canonical/EditableV8/assemblies/stage-a.firmament+++ b/fixtures/Canonical/EditableV8/assemblies/stage-a.firmament@@ -47,5 +47,5 @@ Subassembly StageA {</Assembly>Mate InstallRod: JournalBoreSeat { Moving: StageA.Rod1.Mount; Fixed: StageA.Crankpin1.Mount; }Mate InstallPin: WristPinSeat { Moving: StageA.WristPin1.Mount; Fixed: StageA.Rod1.SmallEnd; }- Anchor: StageA;+ anchor: StageA;}diff --git a/fixtures/Canonical/EditableV8/assemblies/stage-b.firmament b/fixtures/Canonical/EditableV8/assemblies/stage-b.firmamentindex ecab0f5f..935e3bfa 100644--- a/fixtures/Canonical/EditableV8/assemblies/stage-b.firmament+++ b/fixtures/Canonical/EditableV8/assemblies/stage-b.firmament@@ -80,7 +80,7 @@ Subassembly StageB {</Assembly>Mate InstallRod: JournalBoreSeat { Moving: StageB.Rod1.Mount; Fixed: StageB.Crankpin1.Mount; }Mate InstallPin: WristPinSeat { Moving: StageB.WristPin1.Mount; Fixed: StageB.Rod1.SmallEnd; }- Anchor: StageB;+ anchor: StageB;Mate InstallIntakeSpring1: SpringStemFit { Spring: StageB.IntakeSpring1.Winding; Stem: StageB.IntakeStem1.Mount; }Mate InstallExhaustSpring1: SpringStemFit { Spring: StageB.ExhaustSpring1.Winding; Stem: StageB.ExhaustStem1.Mount; }}diff --git a/fixtures/Canonical/EditableV8/parts/Camshaft.firmament b/fixtures/Canonical/EditableV8/parts/Camshaft.firmamentindex ebcf0be4..95cae45e 100644--- a/fixtures/Canonical/EditableV8/parts/Camshaft.firmament+++ b/fixtures/Canonical/EditableV8/parts/Camshaft.firmament@@ -4,7 +4,7 @@ include "../construction";Struct Camshaft {Struct Stock = DiscStock<r: 8mm, zmin: d.caseMin, zmax: d.caseMax>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/ConnectingRod.firmament b/fixtures/Canonical/EditableV8/parts/ConnectingRod.firmamentindex 4d202f37..45634642 100644--- a/fixtures/Canonical/EditableV8/parts/ConnectingRod.firmament+++ b/fixtures/Canonical/EditableV8/parts/ConnectingRod.firmament@@ -4,7 +4,7 @@ include "../construction";Struct ConnectingRod {Struct Stock = RodStock<l: d.rodLength, h: d.rodHeight, c: d.rodCenter>- Expose { Semantic BigEnd { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 44.4mm; }+ expose { Semantic BigEnd { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 44.4mm; }Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 44.4mm; }Semantic SmallEnd { Axis Axis = [0mm,d.rodLength,0mm] -> [0,0,1]; DatumFrame Frame = [0mm,d.rodLength,0mm] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 16.4mm; }}diff --git a/fixtures/Canonical/EditableV8/parts/CrankWeb.firmament b/fixtures/Canonical/EditableV8/parts/CrankWeb.firmamentindex e5e87a9e..246bff36 100644--- a/fixtures/Canonical/EditableV8/parts/CrankWeb.firmament+++ b/fixtures/Canonical/EditableV8/parts/CrankWeb.firmament@@ -4,7 +4,7 @@ include "../construction";Struct CrankWeb {Struct Stock = PlateStock<w: 60mm, h: d.webHeight, c: d.webCenter, zmin: -6mm, zmax: 6mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/CrankcaseRail.firmament b/fixtures/Canonical/EditableV8/parts/CrankcaseRail.firmamentindex a1250c3f..1bac4b7e 100644--- a/fixtures/Canonical/EditableV8/parts/CrankcaseRail.firmament+++ b/fixtures/Canonical/EditableV8/parts/CrankcaseRail.firmament@@ -4,7 +4,7 @@ include "../construction";Struct CrankcaseRail {Struct Stock = PlateStock<w: 20mm, h: 16mm, c: 0mm, zmin: d.caseMin, zmax: d.caseMax>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/Crankpin.firmament b/fixtures/Canonical/EditableV8/parts/Crankpin.firmamentindex c1d24af9..40bac55a 100644--- a/fixtures/Canonical/EditableV8/parts/Crankpin.firmament+++ b/fixtures/Canonical/EditableV8/parts/Crankpin.firmament@@ -4,7 +4,7 @@ include "../construction";Struct Crankpin {Struct Stock = DiscStock<r: 22mm, zmin: -13mm, zmax: 13mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 44mm; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 44mm; } }}diff --git a/fixtures/Canonical/EditableV8/parts/CylinderHead.firmament b/fixtures/Canonical/EditableV8/parts/CylinderHead.firmamentindex 8009f9e6..d7f34f5a 100644--- a/fixtures/Canonical/EditableV8/parts/CylinderHead.firmament+++ b/fixtures/Canonical/EditableV8/parts/CylinderHead.firmament@@ -4,7 +4,7 @@ include "../construction";Struct CylinderHead {Struct Stock = TwoBoreStock<w: d.headWidth, h: 70mm, c: 0mm, zmin: -5mm, zmax: 5mm, holeY0: -20mm, holeD0: 8.4mm, holeY1: 20mm, holeD1: 8.4mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/CylinderSleeve.firmament b/fixtures/Canonical/EditableV8/parts/CylinderSleeve.firmamentindex 5e294539..1d3519e5 100644--- a/fixtures/Canonical/EditableV8/parts/CylinderSleeve.firmament+++ b/fixtures/Canonical/EditableV8/parts/CylinderSleeve.firmament@@ -4,7 +4,7 @@ include "../construction";Struct CylinderSleeve {Struct Stock = AnnulusStock<rout: d.sleeveOuterRadius, rin: d.boreRadius, zmin: d.sleeveMin, zmax: d.sleeveMax>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/ExhaustValve.firmament b/fixtures/Canonical/EditableV8/parts/ExhaustValve.firmamentindex 71c629b3..37014b77 100644--- a/fixtures/Canonical/EditableV8/parts/ExhaustValve.firmament+++ b/fixtures/Canonical/EditableV8/parts/ExhaustValve.firmament@@ -4,7 +4,7 @@ include "../construction";Struct ExhaustValve {Struct Stock = DiscStock<r: 14mm, zmin: -2mm, zmax: 2mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/Flywheel.firmament b/fixtures/Canonical/EditableV8/parts/Flywheel.firmamentindex 44715317..a853dcee 100644--- a/fixtures/Canonical/EditableV8/parts/Flywheel.firmament+++ b/fixtures/Canonical/EditableV8/parts/Flywheel.firmament@@ -4,7 +4,7 @@ include "../construction";Struct Flywheel {Struct Stock = DiscStock<r: 75mm, zmin: -8mm, zmax: 8mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/IntakeValve.firmament b/fixtures/Canonical/EditableV8/parts/IntakeValve.firmamentindex cc02a16b..f63085b1 100644--- a/fixtures/Canonical/EditableV8/parts/IntakeValve.firmament+++ b/fixtures/Canonical/EditableV8/parts/IntakeValve.firmament@@ -4,7 +4,7 @@ include "../construction";Struct IntakeValve {Struct Stock = DiscStock<r: 16mm, zmin: -2mm, zmax: 2mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/LongMainJournal.firmament b/fixtures/Canonical/EditableV8/parts/LongMainJournal.firmamentindex 4490a6dc..137cbdf7 100644--- a/fixtures/Canonical/EditableV8/parts/LongMainJournal.firmament+++ b/fixtures/Canonical/EditableV8/parts/LongMainJournal.firmament@@ -4,7 +4,7 @@ include "../construction";Struct LongMainJournal {Struct Stock = DiscStock<r: 25mm, zmin: d.journalMin, zmax: d.journalMax>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/MainJournal.firmament b/fixtures/Canonical/EditableV8/parts/MainJournal.firmamentindex b579618d..255ec15c 100644--- a/fixtures/Canonical/EditableV8/parts/MainJournal.firmament+++ b/fixtures/Canonical/EditableV8/parts/MainJournal.firmament@@ -4,7 +4,7 @@ include "../construction";Struct MainJournal {Struct Stock = DiscStock<r: 25mm, zmin: -10mm, zmax: 10mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/MainSupport.firmament b/fixtures/Canonical/EditableV8/parts/MainSupport.firmamentindex 7c464595..1565aff1 100644--- a/fixtures/Canonical/EditableV8/parts/MainSupport.firmament+++ b/fixtures/Canonical/EditableV8/parts/MainSupport.firmament@@ -4,7 +4,7 @@ include "../construction";Struct MainSupport {Struct Stock = OneBoreStock<w: 72mm, h: d.supportHeight, c: d.supportCenter, zmin: -8mm, zmax: 8mm, holeY0: 0mm, holeD0: 50.8mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/PairedCrankpin.firmament b/fixtures/Canonical/EditableV8/parts/PairedCrankpin.firmamentindex cbc5ed4b..3f928fab 100644--- a/fixtures/Canonical/EditableV8/parts/PairedCrankpin.firmament+++ b/fixtures/Canonical/EditableV8/parts/PairedCrankpin.firmament@@ -4,7 +4,7 @@ include "../construction";Struct PairedCrankpin {Struct Stock = DiscStock<r: 22mm, zmin: -16mm, zmax: 16mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 44mm; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 44mm; } }}diff --git a/fixtures/Canonical/EditableV8/parts/PistonCrown.firmament b/fixtures/Canonical/EditableV8/parts/PistonCrown.firmamentindex 0420b350..96e31b61 100644--- a/fixtures/Canonical/EditableV8/parts/PistonCrown.firmament+++ b/fixtures/Canonical/EditableV8/parts/PistonCrown.firmament@@ -4,7 +4,7 @@ include "../construction";Struct PistonCrown {Struct Stock = DiscStock<r: d.pistonRadius, zmin: -7.5mm, zmax: 7.5mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/PistonLug.firmament b/fixtures/Canonical/EditableV8/parts/PistonLug.firmamentindex 5cd74de7..a76a11c6 100644--- a/fixtures/Canonical/EditableV8/parts/PistonLug.firmament+++ b/fixtures/Canonical/EditableV8/parts/PistonLug.firmament@@ -4,7 +4,7 @@ include "../construction";Struct PistonLug {Struct Stock = OneBoreStock<w: 24mm, h: 37mm, c: 6.5mm, zmin: -3mm, zmax: 3mm, holeY0: 0mm, holeD0: 16.4mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/PistonSkirt.firmament b/fixtures/Canonical/EditableV8/parts/PistonSkirt.firmamentindex 63c30ffb..1250bfd9 100644--- a/fixtures/Canonical/EditableV8/parts/PistonSkirt.firmament+++ b/fixtures/Canonical/EditableV8/parts/PistonSkirt.firmament@@ -4,7 +4,7 @@ include "../construction";Struct PistonSkirt {Struct Stock = AnnulusStock<rout: d.pistonRadius, rin: d.skirtInnerRadius, zmin: -12.5mm, zmax: 12.5mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/SpringRetainer.firmament b/fixtures/Canonical/EditableV8/parts/SpringRetainer.firmamentindex 60a10e59..43401196 100644--- a/fixtures/Canonical/EditableV8/parts/SpringRetainer.firmament+++ b/fixtures/Canonical/EditableV8/parts/SpringRetainer.firmament@@ -4,7 +4,7 @@ include "../construction";Struct SpringRetainer {Struct Stock = AnnulusStock<rout: 12mm, rin: 4.2mm, zmin: -1.5mm, zmax: 1.5mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/TimingLobe.firmament b/fixtures/Canonical/EditableV8/parts/TimingLobe.firmamentindex 7e25c2f9..5f1160f8 100644--- a/fixtures/Canonical/EditableV8/parts/TimingLobe.firmament+++ b/fixtures/Canonical/EditableV8/parts/TimingLobe.firmament@@ -4,7 +4,7 @@ include "../construction";Struct TimingLobe {Struct Stock = AnnulusStock<rout: 12mm, rin: 8.2mm, zmin: -4mm, zmax: 4mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; } }}diff --git a/fixtures/Canonical/EditableV8/parts/ValveStem.firmament b/fixtures/Canonical/EditableV8/parts/ValveStem.firmamentindex d0d2e8ff..a4fc42fa 100644--- a/fixtures/Canonical/EditableV8/parts/ValveStem.firmament+++ b/fixtures/Canonical/EditableV8/parts/ValveStem.firmament@@ -4,7 +4,7 @@ include "../construction";Struct ValveStem {Struct Stock = DiscStock<r: 4mm, zmin: -30mm, zmax: 30mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 8mm; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 8mm; } }}diff --git a/fixtures/Canonical/EditableV8/parts/WristPin.firmament b/fixtures/Canonical/EditableV8/parts/WristPin.firmamentindex a5dab17a..6a2d95e8 100644--- a/fixtures/Canonical/EditableV8/parts/WristPin.firmament+++ b/fixtures/Canonical/EditableV8/parts/WristPin.firmament@@ -4,7 +4,7 @@ include "../construction";Struct WristPin {Struct Stock = DiscStock<r: 8mm, zmin: -22mm, zmax: 22mm>- Expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 16mm; } }+ expose { Semantic Mount { Axis Axis = [0,0,0] -> [0,0,1]; DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; Dimension Diameter = 16mm; } }}diff --git a/fixtures/Canonical/EditableV8/stage-a.firmasm b/fixtures/Canonical/EditableV8/stage-a.firmasmindex 3a559e08..6ed1dffa 100644--- a/fixtures/Canonical/EditableV8/stage-a.firmasm+++ b/fixtures/Canonical/EditableV8/stage-a.firmasm@@ -10,5 +10,5 @@ Assembly SliderCrankStageA {Placement { from: Origin; to: World; translateLocal: [0mm,0mm,35mm]; }</Assembly></Assembly>- Anchor: SliderCrankStageA;+ anchor: SliderCrankStageA;}diff --git a/fixtures/Canonical/EditableV8/stage-b.firmasm b/fixtures/Canonical/EditableV8/stage-b.firmasmindex 04f470e9..73b6edc9 100644--- a/fixtures/Canonical/EditableV8/stage-b.firmasm+++ b/fixtures/Canonical/EditableV8/stage-b.firmasm@@ -10,5 +10,5 @@ Assembly SliderCrankStageA {Placement { from: Origin; to: World; translateLocal: [0mm,0mm,35mm]; }</Assembly></Assembly>- Anchor: SliderCrankStageA;+ anchor: SliderCrankStageA;}diff --git a/fixtures/Canonical/FEA/ExperimentalShell/curved-body-force-shell.firmament b/fixtures/Canonical/FEA/ExperimentalShell/curved-body-force-shell.firmamentindex 1037fc8b..33858763 100644--- a/fixtures/Canonical/FEA/ExperimentalShell/curved-body-force-shell.firmament+++ b/fixtures/Canonical/FEA/ExperimentalShell/curved-body-force-shell.firmament@@ -1,12 +1,12 @@Model CurvedBodyForceWitness {- Units: mm- Box Patch { Size: [400mm, 139.626340159546mm, 2mm] }+ units: mm+ Box Patch { size: [400mm, 139.626340159546mm, 2mm] }Modify Patch {Hole<Shaft> Opening {- On: +Z- Center: Point2(0mm, 0mm)- Diameter: 60mm- End: ThroughAll+ on: +Z+ center: Point2(0mm, 0mm)+ diameter: 60mm+ end: ThroughAll}}diff --git a/fixtures/Canonical/FEA/ExperimentalShell/cut-boundary-plate.firmament b/fixtures/Canonical/FEA/ExperimentalShell/cut-boundary-plate.firmamentindex e2645b7a..2f9077fa 100644--- a/fixtures/Canonical/FEA/ExperimentalShell/cut-boundary-plate.firmament+++ b/fixtures/Canonical/FEA/ExperimentalShell/cut-boundary-plate.firmament@@ -1,12 +1,12 @@Model ExperimentalPerforatedPlate {- Units: mm- Box Plate { Size: [4000mm, 4000mm, 1000mm] }+ units: mm+ Box Plate { size: [4000mm, 4000mm, 1000mm] }Modify Plate {Hole<Shaft> Opening {- On: +Z- Center: Point2(0mm, 0mm)- Diameter: 2000mm- End: ThroughAll+ on: +Z+ center: Point2(0mm, 0mm)+ diameter: 2000mm+ end: ThroughAll}}diff --git a/fixtures/Canonical/FEA/ExperimentalShell/flat-cantilever.firmament b/fixtures/Canonical/FEA/ExperimentalShell/flat-cantilever.firmamentindex ec79224e..2436a772 100644--- a/fixtures/Canonical/FEA/ExperimentalShell/flat-cantilever.firmament+++ b/fixtures/Canonical/FEA/ExperimentalShell/flat-cantilever.firmament@@ -1,6 +1,6 @@Model ExperimentalThinPlate {- Units: mm- Box Plate { Size: [100mm, 20mm, 2mm] }+ units: mm+ Box Plate { size: [100mm, 20mm, 2mm] }Analysis LinearElastic ThinPlateCantilever {Mode: ExperimentalShelldiff --git a/fixtures/Canonical/FEA/ExperimentalShell/native-flat-cantilever.firmament b/fixtures/Canonical/FEA/ExperimentalShell/native-flat-cantilever.firmamentindex dd21d3f0..2a632103 100644--- a/fixtures/Canonical/FEA/ExperimentalShell/native-flat-cantilever.firmament+++ b/fixtures/Canonical/FEA/ExperimentalShell/native-flat-cantilever.firmament@@ -2,7 +2,7 @@ SheetMetal NativeFlatPlate {Thickness: 2mm;Material: "Standard.Materials.Steel.ASTM_A36";KFactor: 0.42;- Base Plate { Profile: Rectangle { Width: 100mm; Height: 20mm; }; }+ Base Plate { profile: Rectangle { Width: 100mm; Height: 20mm; }; }}Analysis LinearElastic NativeFlatCantilever {diff --git a/fixtures/Canonical/FEA/ExperimentalShell/native-l-bracket.firmament b/fixtures/Canonical/FEA/ExperimentalShell/native-l-bracket.firmamentindex 851329a0..2a0f8cb4 100644--- a/fixtures/Canonical/FEA/ExperimentalShell/native-l-bracket.firmament+++ b/fixtures/Canonical/FEA/ExperimentalShell/native-l-bracket.firmament@@ -3,7 +3,7 @@ SheetMetal LBracket {Thickness: 1.5mm;Material: "Standard.Materials.Aluminum.5052_H32";KFactor: 0.42;- Base Main { Profile: Rectangle { Width: 80mm; Height: 40mm; }; }+ Base Main { profile: Rectangle { Width: 80mm; Height: 40mm; }; }Flange Wall {From: Main.Left;Length: 25mm;diff --git a/fixtures/Canonical/FEA/ExperimentalShell/native-u-channel.firmament b/fixtures/Canonical/FEA/ExperimentalShell/native-u-channel.firmamentindex 78f2f7bf..f9c3e0d7 100644--- a/fixtures/Canonical/FEA/ExperimentalShell/native-u-channel.firmament+++ b/fixtures/Canonical/FEA/ExperimentalShell/native-u-channel.firmament@@ -2,7 +2,7 @@ SheetMetal NativeUChannel {Thickness: 1.5mm;Material: "Standard.Materials.Aluminum.5052_H32";KFactor: 0.42;- Base Base { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Base Base { profile: Rectangle { Width: 100mm; Height: 60mm; }; }Flange LeftFlange {From: Base.Left;Length: 25mm;@@ -17,8 +17,8 @@ SheetMetal NativeUChannel {InsideRadius: 2mm;Direction: Up;}- Hole MountA { On: Base; Center: (25mm, 30mm); Diameter: 8mm; }- Hole MountB { On: Base; Center: (75mm, 30mm); Diameter: 8mm; }+ Hole MountA { on: Base; center: (25mm, 30mm); diameter: 8mm; }+ Hole MountB { on: Base; center: (75mm, 30mm); diameter: 8mm; }}Analysis LinearElastic NativeUChannelLoad {diff --git a/fixtures/Canonical/FEA/cantilever.firmament b/fixtures/Canonical/FEA/cantilever.firmamentindex fe40ff00..e5b83df2 100644--- a/fixtures/Canonical/FEA/cantilever.firmament+++ b/fixtures/Canonical/FEA/cantilever.firmament@@ -1,6 +1,6 @@Model CantileverWitness {- Units: mm- Box Beam { Size: [120mm, 20mm, 20mm] }+ units: mm+ Box Beam { size: [120mm, 20mm, 20mm] }Analysis LinearElastic Cantilever {Body: Beamdiff --git a/fixtures/Canonical/FEA/material-resolved-cantilever.firmament b/fixtures/Canonical/FEA/material-resolved-cantilever.firmamentindex 42d978ca..ce58e478 100644--- a/fixtures/Canonical/FEA/material-resolved-cantilever.firmament+++ b/fixtures/Canonical/FEA/material-resolved-cantilever.firmament@@ -1,6 +1,6 @@Model SteelCantilever {- Units: mm- Box Beam { Size: [100mm, 30mm, 15mm] }+ units: mm+ Box Beam { size: [100mm, 30mm, 15mm] }Analysis LinearElastic ServiceLoad {Body: Beamdiff --git a/fixtures/Canonical/Feature/boss-pocket-feature.firmament b/fixtures/Canonical/Feature/boss-pocket-feature.firmamentindex 289eafb8..ed36d75c 100644--- a/fixtures/Canonical/Feature/boss-pocket-feature.firmament+++ b/fixtures/Canonical/Feature/boss-pocket-feature.firmament@@ -1,32 +1,32 @@schema MechanicalModel BossPocketFeature {- Units: mm+ units: mmFeature RaisedPad(Shape: Profile, Height: Length) -> Boss {- return Boss { On: Top Profile: Shape Height: Height }+ return Boss { on: Top profile: Shape height: Height }}Feature Recess(Shape: Profile, Depth: Length, Floor: Length = 2mm) -> Pocket {- return Pocket { On: Top Profile: Shape Depth: Depth MinimumFloorThickness: Floor }+ return Pocket { on: Top profile: Shape depth: Depth MinimumFloorThickness: Floor }}- Concept Struct Layout On XY {- Rect2 Stock { Center: [0mm, 0mm] Size: [40mm, 24mm] }- Rect2 Pad { Center: [-10mm, 0mm] Size: [8mm, 8mm] }- Rect2 Cutout { Center: [10mm, 0mm] Size: [8mm, 8mm] }+ Concept Struct Layout on XY {+ Rect2 Stock { center: [0mm, 0mm] size: [40mm, 24mm] }+ Rect2 Pad { center: [-10mm, 0mm] size: [8mm, 8mm] }+ Rect2 Cutout { center: [10mm, 0mm] size: [8mm, 8mm] }}- Profile BaseProfile Using Layout { Loop Outer {+ Profile BaseProfile using Layout { Loop Outer {Stock.Bottom|> Stock.Right|> Stock.Top|> Stock.Left|> Close} }- Profile PadProfile Using Layout { Loop Outer {+ Profile PadProfile using Layout { Loop Outer {Pad.Bottom|> Pad.Right|> Pad.Top|> Pad.Left|> Close} }- Profile CutoutProfile Using Layout { Loop Outer {+ Profile CutoutProfile using Layout { Loop Outer {Cutout.Bottom|> Cutout.Right|> Cutout.Top@@ -35,7 +35,7 @@ Model BossPocketFeature {} }Struct Product {Compose Body {- Base Stock { Profile: BaseProfile From: 0mm To: 10mm Role: Stock }+ Base Stock { profile: BaseProfile from: 0mm to: 10mm role: Stock }RaisedPad(Shape: PadProfile, Height: 5mm)Recess(Shape: CutoutProfile, Depth: 4mm)}diff --git a/fixtures/Canonical/Feature/edge-finish-feature.firmament b/fixtures/Canonical/Feature/edge-finish-feature.firmamentindex 8425741c..65722537 100644--- a/fixtures/Canonical/Feature/edge-finish-feature.firmament+++ b/fixtures/Canonical/Feature/edge-finish-feature.firmament@@ -1,12 +1,12 @@schema MechanicalModel EdgeFinishFeature {- Units: mm+ units: mmFeature StandardTopChamfer(Size: Length = 1mm) -> EdgeFinish {return EdgeFinish { Face: +Z Target: Boundary Kind: Chamfer Distance: Size }}- Box Plate { Size: [30mm, 20mm, 8mm] }+ Box Plate { size: [30mm, 20mm, 8mm] }Modify Plate {- Hole<Shaft> Mount { On: +Z Center: Point2(0mm, 0mm) Diameter: 5mm End: ThroughAll }+ Hole<Shaft> Mount { on: +Z center: Point2(0mm, 0mm) diameter: 5mm end: ThroughAll }StandardTopChamfer()}}diff --git a/fixtures/Canonical/Feature/feature-pattern.firmament b/fixtures/Canonical/Feature/feature-pattern.firmamentindex a6b669f8..efa1ffdc 100644--- a/fixtures/Canonical/Feature/feature-pattern.firmament+++ b/fixtures/Canonical/Feature/feature-pattern.firmament@@ -1,22 +1,22 @@schema MechanicalFeature MountHole(Center: Point3, Diameter: Length = 6mm) -> Hole<Shaft> {return Hole<Shaft> {- On: Base.Top- Center: Center- Diameter: Diameter- End: ThroughAll+ on: Base.Top+ center: Center+ diameter: Diameter+ end: ThroughAll}}Concept Struct Design {- Bounds: Box3 { Size: [60mm, 40mm, 10mm] }+ Bounds: Box3 { size: [60mm, 40mm, 10mm] }Points: Grid {- Within: Bounds.Face(+Z).Inset(8mm)- Columns: 2- Rows: 2+ within: Bounds.Face(+Z).Inset(8mm)+ columns: 2+ rows: 2}}Struct PatternPlate {- Box Base { Bounds: Design.Bounds }+ Box Base { bounds: Design.Bounds }Modify Base {Pattern Mounts {Source: Design.Pointsdiff --git a/fixtures/Canonical/Feature/feature-with-derived-values.firmament b/fixtures/Canonical/Feature/feature-with-derived-values.firmamentindex f6541314..c2c31f25 100644--- a/fixtures/Canonical/Feature/feature-with-derived-values.firmament+++ b/fixtures/Canonical/Feature/feature-with-derived-values.firmament@@ -1,17 +1,17 @@schema MechanicalModel DerivedCounterboreFeature {- Units: mm+ units: mmFeature M8Counterbore(Center: Point2, Depth: Length = 4mm) -> Hole<Counterbore> {let CounterboreDiameter: Length = 8.5mm + 5.5mmreturn Hole<Counterbore> {- On: +Z- Center: Center- Diameter: 8.5mm- CounterboreDiameter: CounterboreDiameter- CounterboreDepth: Depth- End: ThroughAll+ on: +Z+ center: Center+ diameter: 8.5mm+ counterboreDiameter: CounterboreDiameter+ counterboreDepth: Depth+ end: ThroughAll}}- Box Plate { Size: [30mm, 20mm, 8mm] }+ Box Plate { size: [30mm, 20mm, 8mm] }Modify Plate { M8Counterbore(Center: Point2(0mm, 0mm)) }}diff --git a/fixtures/Canonical/Feature/nested-feature-call.firmament b/fixtures/Canonical/Feature/nested-feature-call.firmamentindex 92b4ced1..139adb58 100644--- a/fixtures/Canonical/Feature/nested-feature-call.firmament+++ b/fixtures/Canonical/Feature/nested-feature-call.firmament@@ -1,19 +1,19 @@schema MechanicalModel NestedFeatureCall {- Units: mm+ units: mmFeature CoreCounterbore(Center: Point2, Depth: Length) -> Hole<Counterbore> {return Hole<Counterbore> {- On: +Z- Center: Center- Diameter: 8.5mm- CounterboreDiameter: 14mm- CounterboreDepth: Depth- End: ThroughAll+ on: +Z+ center: Center+ diameter: 8.5mm+ counterboreDiameter: 14mm+ counterboreDepth: Depth+ end: ThroughAll}}Feature M8Counterbore(Center: Point2) -> Hole<Counterbore> {return CoreCounterbore(Center: Center, Depth: 4mm)}- Box Plate { Size: [30mm, 20mm, 8mm] }+ Box Plate { size: [30mm, 20mm, 8mm] }Modify Plate { M8Counterbore(Center: Point2(0mm, 0mm)) }}diff --git a/fixtures/Canonical/Feature/pickup-functional.firmament b/fixtures/Canonical/Feature/pickup-functional.firmamentindex 2932c35d..31deb195 100644--- a/fixtures/Canonical/Feature/pickup-functional.firmament+++ b/fixtures/Canonical/Feature/pickup-functional.firmament@@ -1,6 +1,6 @@schema MechanicalModel PickupFunctional {- Units: mm+ units: mm// One exact pickup part; all construction coordinates are local to its Mount.Record PickupSpec {Width: Length; Depth: Length; BaseHeight: Length@@ -15,38 +15,38 @@ Static StandardPickup: PickupSpec {Static BridgePickupSpec = StandardPickup with { PolePitch: 10.2mm }Feature Coil(Center: Point2, Width: Length, Depth: Length, Height: Length, Support: Plane) -> Boss {- RoundedRect2 Outline { Center: Center; Size: [Width,Depth]; Radius: 3mm }+ RoundedRect2 Outline { center: Center; size: [Width,Depth]; radius: 3mm }Profile Section { Loop Outer { Outline |> TraceLoop } }- return Boss { On: Support; Profile: Section; Height: Height }+ return Boss { on: Support; profile: Section; height: Height }}Feature Pole(Center: Point2, Support: Plane) -> Boss {- Circle2 Outline { Center: Center; Radius: 2.2mm }+ Circle2 Outline { center: Center; radius: 2.2mm }Profile Section { Loop Outer { Outline |> TraceLoop } }- return Boss { On: Support; Profile: Section; Height: 1mm }+ return Boss { on: Support; profile: Section; height: 1mm }}Template<Spec: PickupSpec> Struct Humbucker {- Concept Struct Layout On XY {- Point2 UpperCenter { Position: [0mm,Spec.CoilOffset] }- Point2 LowerCenter { Position: [0mm,-Spec.CoilOffset] }- Axis2 Longitudinal { Origin: [0mm,0mm]; Direction: [1,0] }- Axis2 Transverse { Origin: [0mm,0mm]; Direction: [0,1] }- Point2 FirstPole { Position: [-2.5 * Spec.PolePitch,Spec.CoilOffset] }- RoundedRect2 BaseOutline { Center: [0mm,0mm]; Size: [Spec.Width,Spec.Depth]; Radius: 4mm }+ Concept Struct Layout on XY {+ Point2 UpperCenter { position: [0mm,Spec.CoilOffset] }+ Point2 LowerCenter { position: [0mm,-Spec.CoilOffset] }+ Axis2 Longitudinal { origin: [0mm,0mm]; direction: [1,0] }+ Axis2 Transverse { origin: [0mm,0mm]; direction: [0,1] }+ Point2 FirstPole { position: [-2.5 * Spec.PolePitch,Spec.CoilOffset] }+ RoundedRect2 BaseOutline { center: [0mm,0mm]; size: [Spec.Width,Spec.Depth]; radius: 4mm }}- Profile BaseProfile Using Layout { Loop Outer { BaseOutline |> TraceLoop } }- Plane BaseTop { Origin: [0mm,0mm,Spec.BaseHeight]; Normal: [0,0,1]; Up: [0,1,0] }- Plane CoilTop { Origin: [0mm,0mm,Spec.BaseHeight + Spec.CoilHeight]; Normal: [0,0,1]; Up: [0,1,0] }+ Profile BaseProfile using Layout { Loop Outer { BaseOutline |> TraceLoop } }+ Plane BaseTop { origin: [0mm,0mm,Spec.BaseHeight]; normal: [0,0,1]; up: [0,1,0] }+ Plane CoilTop { origin: [0mm,0mm,Spec.BaseHeight + Spec.CoilHeight]; normal: [0,0,1]; up: [0,1,0] }Compose Body {- Base Housing { Profile: BaseProfile; From: 0mm; To: Spec.BaseHeight; Role: Stock }+ Base Housing { profile: BaseProfile; from: 0mm; to: Spec.BaseHeight; role: Stock }Feature UpperCoil = Coil(Center: Layout.UpperCenter, Width: Spec.CoilWidth, Depth: Spec.CoilDepth, Height: Spec.CoilHeight, Support: BaseTop)Feature LowerCoil = Coil(Center: Layout.LowerCenter, Width: Spec.CoilWidth, Depth: Spec.CoilDepth, Height: Spec.CoilHeight, Support: BaseTop)Feature PoleSeed = Pole(Center: Layout.FirstPole, Support: CoilTop)Linear Pattern Poles {- Source: PoleSeed- Direction: Layout.Longitudinal.Direction- Count: 6- Spacing: Spec.PolePitch+ source: PoleSeed+ direction: Layout.Longitudinal.Direction+ count: 6+ spacing: Spec.PolePitch}}}diff --git a/fixtures/Canonical/Feature/simple-hole-feature.firmament b/fixtures/Canonical/Feature/simple-hole-feature.firmamentindex 29e6e12a..111a712f 100644--- a/fixtures/Canonical/Feature/simple-hole-feature.firmament+++ b/fixtures/Canonical/Feature/simple-hole-feature.firmament@@ -1,15 +1,15 @@schema MechanicalModel SimpleHoleFeature {- Units: mm+ units: mmFeature MountHole(Center: Point2, Diameter: Length = 6mm) -> Hole<Shaft> {return Hole<Shaft> {- On: +Z- Center: Center- Diameter: Diameter- End: ThroughAll+ on: +Z+ center: Center+ diameter: Diameter+ end: ThroughAll}}- Box Plate { Size: [60mm, 30mm, 8mm] }+ Box Plate { size: [60mm, 30mm, 8mm] }Modify Plate {MountHole(Center: Point2(-18mm, 0mm))MountHole(Center: Point2(18mm, 0mm))diff --git a/fixtures/Canonical/Features/Boss/boss-pocket-block.firmament b/fixtures/Canonical/Features/Boss/boss-pocket-block.firmamentindex 88e64eed..33934969 100644--- a/fixtures/Canonical/Features/Boss/boss-pocket-block.firmament+++ b/fixtures/Canonical/Features/Boss/boss-pocket-block.firmament@@ -1,36 +1,36 @@Model BossPocketMountingBlock {- Units: mm+ units: mm- Concept Struct Layout On XY {- Rect2 Stock { Center: [0mm, 0mm]; Size: [40mm, 24mm] }- Point2 BossCenter { Position: [-12mm, 0mm] }- Point2 BossEast { Position: [-6mm, 0mm] }- Point2 BossNorth { Position: [-12mm, 6mm] }- Point2 BossWest { Position: [-18mm, 0mm] }- Point2 BossSouth { Position: [-12mm, -6mm] }- Circle2 BossCircle { Center: BossCenter; Radius: 6mm }- Rect2 BossPad { Center: [-12mm, 0mm]; Size: [10mm, 10mm] }- Rect2 Recess { Center: [10mm, 0mm]; Size: [8mm, 8mm] }+ Concept Struct Layout on XY {+ Rect2 Stock { center: [0mm, 0mm]; size: [40mm, 24mm] }+ Point2 BossCenter { position: [-12mm, 0mm] }+ Point2 BossEast { position: [-6mm, 0mm] }+ Point2 BossNorth { position: [-12mm, 6mm] }+ Point2 BossWest { position: [-18mm, 0mm] }+ Point2 BossSouth { position: [-12mm, -6mm] }+ Circle2 BossCircle { center: BossCenter; radius: 6mm }+ Rect2 BossPad { center: [-12mm, 0mm]; size: [10mm, 10mm] }+ Rect2 Recess { center: [10mm, 0mm]; size: [8mm, 8mm] }}- Profile BaseProfile Using Layout { Loop Outer {+ Profile BaseProfile using Layout { Loop Outer {Stock.Bottom|> Stock.Right|> Stock.Top|> Stock.Left|> Close} }- Profile BossProfile Using Layout { Loop Outer {+ Profile BossProfile using Layout { Loop Outer {BossCircle |> TraceLoop} }- Profile PocketProfile Using Layout { Loop Outer {+ Profile PocketProfile using Layout { Loop Outer {Recess.Bottom|> Recess.Right|> Recess.Top|> Recess.Left|> Close} }- Profile RectBossProfile Using Layout { Loop Outer {+ Profile RectBossProfile using Layout { Loop Outer {BossPad.Bottom|> BossPad.Right|> BossPad.Top@@ -40,10 +40,10 @@ Model BossPocketMountingBlock {Struct MountingBlock {Compose Body {- Base Stock { Profile: BaseProfile; From: 0mm; To: 10mm; Role: Stock }- Boss MountBoss { On: Top; Profile: BossProfile; Height: 6mm }- Pocket ElectronicsRecess { On: Top; Profile: PocketProfile; Depth: 4mm; MinimumFloorThickness: 2mm }- Hole<Shaft> MountHole { On: +Z; Center: [-12mm, 0mm]; Diameter: 6mm; End: ThroughAll; Role: MountingHole }+ Base Stock { profile: BaseProfile; from: 0mm; to: 10mm; role: Stock }+ Boss MountBoss { on: Top; profile: BossProfile; height: 6mm }+ Pocket ElectronicsRecess { on: Top; profile: PocketProfile; depth: 4mm; MinimumFloorThickness: 2mm }+ Hole<Shaft> MountHole { on: +Z; center: [-12mm, 0mm]; diameter: 6mm; end: ThroughAll; Role: MountingHole }}}}diff --git a/fixtures/Canonical/Features/Boss/circular-boss-through-hole.firmament b/fixtures/Canonical/Features/Boss/circular-boss-through-hole.firmamentindex c6f4e787..18bc6164 100644--- a/fixtures/Canonical/Features/Boss/circular-boss-through-hole.firmament+++ b/fixtures/Canonical/Features/Boss/circular-boss-through-hole.firmament@@ -1,31 +1,31 @@Model CircularBossThroughHole {- Units: mm+ units: mm- Concept Struct Layout On XY {- Rect2 Stock { Center: [0mm, 0mm]; Size: [50mm, 32mm] }- Point2 Center { Position: [0mm, 0mm] }- Point2 East { Position: [8mm, 0mm] }- Point2 North { Position: [0mm, 8mm] }- Point2 West { Position: [-8mm, 0mm] }- Point2 South { Position: [0mm, -8mm] }- Circle2 Pad { Center: Center; Radius: 8mm }+ Concept Struct Layout on XY {+ Rect2 Stock { center: [0mm, 0mm]; size: [50mm, 32mm] }+ Point2 Center { position: [0mm, 0mm] }+ Point2 East { position: [8mm, 0mm] }+ Point2 North { position: [0mm, 8mm] }+ Point2 West { position: [-8mm, 0mm] }+ Point2 South { position: [0mm, -8mm] }+ Circle2 Pad { center: Center; radius: 8mm }}- Profile BaseProfile Using Layout { Loop Outer {+ Profile BaseProfile using Layout { Loop Outer {Stock.Bottom|> Stock.Right|> Stock.Top|> Stock.Left|> Close} }- Profile BossProfile Using Layout { Loop Outer {+ Profile BossProfile using Layout { Loop Outer {Pad |> TraceLoop} }Struct BearingMount {Compose Body {- Base Stock { Profile: BaseProfile; From: 0mm; To: 8mm; Role: Stock }- Boss BearingBoss { On: Top; Profile: BossProfile; Height: 6mm }- Hole<Shaft> BearingBore { On: +Z; Center: [0mm, 0mm]; Diameter: 8mm; End: ThroughAll }+ Base Stock { profile: BaseProfile; from: 0mm; to: 8mm; role: Stock }+ Boss BearingBoss { on: Top; profile: BossProfile; height: 6mm }+ Hole<Shaft> BearingBore { on: +Z; center: [0mm, 0mm]; diameter: 8mm; end: ThroughAll }}}}diff --git a/fixtures/Canonical/Features/Boss/rectangular-boss.firmament b/fixtures/Canonical/Features/Boss/rectangular-boss.firmamentindex 1b97071f..b14ac831 100644--- a/fixtures/Canonical/Features/Boss/rectangular-boss.firmament+++ b/fixtures/Canonical/Features/Boss/rectangular-boss.firmament@@ -1,18 +1,18 @@Model RectangularBoss {- Units: mm+ units: mm- Concept Struct Layout On XY {- Rect2 Stock { Center: [0mm, 0mm]; Size: [50mm, 32mm] }- Rect2 Pad { Center: [0mm, 0mm]; Size: [20mm, 12mm] }+ Concept Struct Layout on XY {+ Rect2 Stock { center: [0mm, 0mm]; size: [50mm, 32mm] }+ Rect2 Pad { center: [0mm, 0mm]; size: [20mm, 12mm] }}- Profile BaseProfile Using Layout { Loop Outer {+ Profile BaseProfile using Layout { Loop Outer {Stock.Bottom|> Stock.Right|> Stock.Top|> Stock.Left|> Close} }- Profile BossProfile Using Layout { Loop Outer {+ Profile BossProfile using Layout { Loop Outer {Pad.Bottom|> Pad.Right|> Pad.Top@@ -22,8 +22,8 @@ Model RectangularBoss {Struct BracketBlock {Compose Body {- Base Stock { Profile: BaseProfile; From: 0mm; To: 8mm; Role: Stock }- Boss MountingPad { On: Top; Profile: BossProfile; Height: 5mm }+ Base Stock { profile: BaseProfile; from: 0mm; to: 8mm; role: Stock }+ Boss MountingPad { on: Top; profile: BossProfile; height: 5mm }}}}diff --git a/fixtures/Canonical/Features/Composition/boss-stack-current-top.firmament b/fixtures/Canonical/Features/Composition/boss-stack-current-top.firmamentindex 02803ed3..30e278a1 100644--- a/fixtures/Canonical/Features/Composition/boss-stack-current-top.firmament+++ b/fixtures/Canonical/Features/Composition/boss-stack-current-top.firmament@@ -1,34 +1,34 @@Model BossStackCurrentTop {- Units: mm- Concept Struct Layout On XY {- Rect2 BaseRect { Center: [0mm, 0mm]; Size: [40mm, 30mm] }- Rect2 MiddleRect { Center: [0mm, 0mm]; Size: [24mm, 18mm] }- Rect2 UpperRect { Center: [0mm, 0mm]; Size: [12mm, 8mm] }+ units: mm+ Concept Struct Layout on XY {+ Rect2 BaseRect { center: [0mm, 0mm]; size: [40mm, 30mm] }+ Rect2 MiddleRect { center: [0mm, 0mm]; size: [24mm, 18mm] }+ Rect2 UpperRect { center: [0mm, 0mm]; size: [12mm, 8mm] }}- Profile BaseProfile Using Layout { Loop Outer {- BaseRect.Bottom As B- |> BaseRect.Right As R- |> BaseRect.Top As T- |> BaseRect.Left As L+ Profile BaseProfile using Layout { Loop Outer {+ BaseRect.Bottom as B+ |> BaseRect.Right as R+ |> BaseRect.Top as T+ |> BaseRect.Left as L|> Close} }- Profile MiddleProfile Using Layout { Loop Outer {- MiddleRect.Bottom As B- |> MiddleRect.Right As R- |> MiddleRect.Top As T- |> MiddleRect.Left As L+ Profile MiddleProfile using Layout { Loop Outer {+ MiddleRect.Bottom as B+ |> MiddleRect.Right as R+ |> MiddleRect.Top as T+ |> MiddleRect.Left as L|> Close} }- Profile UpperProfile Using Layout { Loop Outer {- UpperRect.Bottom As B- |> UpperRect.Right As R- |> UpperRect.Top As T- |> UpperRect.Left As L+ Profile UpperProfile using Layout { Loop Outer {+ UpperRect.Bottom as B+ |> UpperRect.Right as R+ |> UpperRect.Top as T+ |> UpperRect.Left as L|> Close} }Struct Part { Compose Body {- Base Stock { Profile: BaseProfile; From: 0mm; To: 10mm; Role: Stock }- Boss Middle { On: Top; Profile: MiddleProfile; Height: 6mm }- Boss Upper { On: Top; Profile: UpperProfile; Height: 4mm }+ Base Stock { profile: BaseProfile; from: 0mm; to: 10mm; role: Stock }+ Boss Middle { on: Top; profile: MiddleProfile; height: 6mm }+ Boss Upper { on: Top; profile: UpperProfile; height: 4mm }} }}diff --git a/fixtures/Canonical/Features/Composition/box-counterbore-chamfer.firmament b/fixtures/Canonical/Features/Composition/box-counterbore-chamfer.firmamentindex 66fc4a8a..65b5a78e 100644--- a/fixtures/Canonical/Features/Composition/box-counterbore-chamfer.firmament+++ b/fixtures/Canonical/Features/Composition/box-counterbore-chamfer.firmament@@ -1,8 +1,8 @@Model BoxCounterboreChamfer {- Units: mm- Box Base { Size: [10mm, 15mm, 20mm] }+ units: mm+ Box Base { size: [10mm, 15mm, 20mm] }Modify Base {- Hole<Counterbore> Mount { On: +Z Center: Point2(0mm, 0mm) Diameter: 4mm CounterboreDiameter: 7mm CounterboreDepth: 3mm End: ThroughAll }+ Hole<Counterbore> Mount { on: +Z center: Point2(0mm, 0mm) diameter: 4mm counterboreDiameter: 7mm counterboreDepth: 3mm end: ThroughAll }EdgeFinish TopBreak { Face: +Z Target: Boundary Kind: Chamfer Distance: 1mm }}}diff --git a/fixtures/Canonical/Features/EdgeFinish/boundary-chamfer.firmament b/fixtures/Canonical/Features/EdgeFinish/boundary-chamfer.firmamentindex 81c6247e..f9b79b9a 100644--- a/fixtures/Canonical/Features/EdgeFinish/boundary-chamfer.firmament+++ b/fixtures/Canonical/Features/EdgeFinish/boundary-chamfer.firmament@@ -1,8 +1,8 @@Model HoleAndChamfer {- Units: mm- Box Base { Size: [80mm, 50mm, 25mm] }+ units: mm+ Box Base { size: [80mm, 50mm, 25mm] }Modify Base {- Hole<Shaft> Mount { On: +Z Center: Point2(0mm, 0mm) Diameter: 8mm End: ThroughAll }+ Hole<Shaft> Mount { on: +Z center: Point2(0mm, 0mm) diameter: 8mm end: ThroughAll }EdgeFinish TopBreak { Face: +Z Target: Boundary Kind: Chamfer Distance: 1.5mm }}}diff --git a/fixtures/Canonical/Features/EdgeFinish/semantic-selection-chamfer.firmament b/fixtures/Canonical/Features/EdgeFinish/semantic-selection-chamfer.firmamentindex 5e367621..d13af224 100644--- a/fixtures/Canonical/Features/EdgeFinish/semantic-selection-chamfer.firmament+++ b/fixtures/Canonical/Features/EdgeFinish/semantic-selection-chamfer.firmament@@ -1,23 +1,23 @@Model SelectionChamferPart {- Units: mm- Concept Struct RectangleLayout On XY {- Point2 SouthWest { Position: [-10mm, -5mm] }- Point2 SouthEast { Position: [10mm, -5mm] }- Point2 NorthEast { Position: [10mm, 5mm] }- Point2 NorthWest { Position: [-10mm, 5mm] }- Line2 South { From: SouthWest; To: SouthEast }- Line2 East { From: SouthEast; To: NorthEast }- Line2 North { From: NorthEast; To: NorthWest }- Line2 West { From: NorthWest; To: SouthWest }+ units: mm+ Concept Struct RectangleLayout on XY {+ Point2 SouthWest { position: [-10mm, -5mm] }+ Point2 SouthEast { position: [10mm, -5mm] }+ Point2 NorthEast { position: [10mm, 5mm] }+ Point2 NorthWest { position: [-10mm, 5mm] }+ Line2 South { from: SouthWest; to: SouthEast }+ Line2 East { from: SouthEast; to: NorthEast }+ Line2 North { from: NorthEast; to: NorthWest }+ Line2 West { from: NorthWest; to: SouthWest }}- Profile MainPlate Using RectangleLayout { Loop Outer {- South As SouthEdge- |> East As EastEdge- |> North As NorthEdge- |> West As WestEdge+ Profile MainPlate using RectangleLayout { Loop Outer {+ South as SouthEdge+ |> East as EastEdge+ |> North as NorthEdge+ |> West as WestEdge|> Close} }- Struct Plate { Extrude MainPlate { Profile: MainPlate; From: -2mm; To: 0mm } }+ Struct Plate { Extrude MainPlate { profile: MainPlate; from: -2mm; to: 0mm } }Selection OuterTopBoundary {Target: TopBoundarySource: MainPlate.ProfileSegments([SouthEdge, EastEdge, NorthEdge, WestEdge])diff --git a/fixtures/Canonical/Features/EdgeFinish/single-edge-fillet.firmament b/fixtures/Canonical/Features/EdgeFinish/single-edge-fillet.firmamentindex 8f126d8b..ce8c7bc3 100644--- a/fixtures/Canonical/Features/EdgeFinish/single-edge-fillet.firmament+++ b/fixtures/Canonical/Features/EdgeFinish/single-edge-fillet.firmament@@ -1,19 +1,19 @@Model ProfileStraightEdgeFilletTop {-Units: mm-Concept Struct RectangleLayout On XY {- Point2 A { Position: [0mm, 0mm] } Point2 B { Position: [20mm, 0mm] }- Point2 C { Position: [20mm, 10mm] } Point2 D { Position: [0mm, 10mm] }- Line2 South { From: A; To: B } Line2 East { From: B; To: C }- Line2 North { From: C; To: D } Line2 West { From: D; To: A }+units: mm+Concept Struct RectangleLayout on XY {+ Point2 A { position: [0mm, 0mm] } Point2 B { position: [20mm, 0mm] }+ Point2 C { position: [20mm, 10mm] } Point2 D { position: [0mm, 10mm] }+ Line2 South { from: A; to: B } Line2 East { from: B; to: C }+ Line2 North { from: C; to: D } Line2 West { from: D; to: A }}-Profile Bracket Using RectangleLayout { Loop Outer {+Profile Bracket using RectangleLayout { Loop Outer {South|> East|> North|> West|> Close} }-Struct Body { Extrude Bracket { Profile: Bracket; From: 0mm; To: 8mm } }+Struct Body { Extrude Bracket { profile: Bracket; from: 0mm; to: 8mm } }Modify Body { EdgeFinish SouthTopRound { Target: Bracket.Outer.South On: Top Kind: Fillet Radius: 2mm EndClearance: 3mm } }Assert Volume Body {Expected: 1587.982297150257mm^3diff --git a/fixtures/Canonical/Features/Holes/blind-hole.firmament b/fixtures/Canonical/Features/Holes/blind-hole.firmamentindex a323893e..1a1b56bb 100644--- a/fixtures/Canonical/Features/Holes/blind-hole.firmament+++ b/fixtures/Canonical/Features/Holes/blind-hole.firmament@@ -1,16 +1,16 @@Model BlindShaftHole {- Units: mm+ units: mmBox Base {- Size: [60mm, 40mm, 20mm]+ size: [60mm, 40mm, 20mm]}Modify Base {Hole<Shaft> BlindMount {- On: +Z- Center: Point2(0mm, 0mm)- Diameter: 8mm- End: Blind 10mm+ on: +Z+ center: Point2(0mm, 0mm)+ diameter: 8mm+ end: Blind 10mm}}}diff --git a/fixtures/Canonical/Features/Holes/counterbore.firmament b/fixtures/Canonical/Features/Holes/counterbore.firmamentindex 44d3f9fe..9e64476a 100644--- a/fixtures/Canonical/Features/Holes/counterbore.firmament+++ b/fixtures/Canonical/Features/Holes/counterbore.firmament@@ -1,16 +1,16 @@Model CounterboreHole {- Units: mm+ units: mm- Box Base { Size: [70mm, 45mm, 18mm] }+ Box Base { size: [70mm, 45mm, 18mm] }Modify Base {Hole<Counterbore> Mount {- On: +Z- Center: Point2(0mm, 0mm)- Diameter: 6mm- CounterboreDiameter: 12mm- CounterboreDepth: 5mm- End: ThroughAll+ on: +Z+ center: Point2(0mm, 0mm)+ diameter: 6mm+ counterboreDiameter: 12mm+ counterboreDepth: 5mm+ end: ThroughAll}}}diff --git a/fixtures/Canonical/Features/Holes/countersink.firmament b/fixtures/Canonical/Features/Holes/countersink.firmamentindex daf1860c..04610d6e 100644--- a/fixtures/Canonical/Features/Holes/countersink.firmament+++ b/fixtures/Canonical/Features/Holes/countersink.firmament@@ -1,16 +1,16 @@Model CountersinkHole {- Units: mm+ units: mm- Box Base { Size: [70mm, 45mm, 18mm] }+ Box Base { size: [70mm, 45mm, 18mm] }Modify Base {Hole<Countersink> Mount {- On: +Z- Center: Point2(0mm, 0mm)- Diameter: 6mm- CountersinkDiameter: 14mm- CountersinkAngle: 90deg- End: ThroughAll+ on: +Z+ center: Point2(0mm, 0mm)+ diameter: 6mm+ countersinkDiameter: 14mm+ countersinkAngle: 90deg+ end: ThroughAll}}}diff --git a/fixtures/Canonical/Features/Holes/through-hole.firmament b/fixtures/Canonical/Features/Holes/through-hole.firmamentindex b3973bde..f0b2356c 100644--- a/fixtures/Canonical/Features/Holes/through-hole.firmament+++ b/fixtures/Canonical/Features/Holes/through-hole.firmament@@ -1,16 +1,16 @@Model ThroughHole {- Units: mm+ units: mmBox Base {- Size: [80mm, 50mm, 25mm]+ size: [80mm, 50mm, 25mm]}Modify Base {Hole<Shaft> Mount {- On: +Z- Center: Point2(0mm, 0mm)- Diameter: 8mm- End: ThroughAll+ on: +Z+ center: Point2(0mm, 0mm)+ diameter: 8mm+ end: ThroughAll}}}diff --git a/fixtures/Canonical/Features/Pocket/rectangular-pocket.firmament b/fixtures/Canonical/Features/Pocket/rectangular-pocket.firmamentindex 348c0a48..9f9b373a 100644--- a/fixtures/Canonical/Features/Pocket/rectangular-pocket.firmament+++ b/fixtures/Canonical/Features/Pocket/rectangular-pocket.firmament@@ -1,19 +1,19 @@// Pocket is finite. Use Hole or Slot when material must be removed through-all.Model RectangularPocket {- Units: mm+ units: mm- Concept Struct Layout On XY {- Rect2 Stock { Center: [0mm, 0mm]; Size: [50mm, 32mm] }- Rect2 Recess { Center: [0mm, 0mm]; Size: [24mm, 14mm] }+ Concept Struct Layout on XY {+ Rect2 Stock { center: [0mm, 0mm]; size: [50mm, 32mm] }+ Rect2 Recess { center: [0mm, 0mm]; size: [24mm, 14mm] }}- Profile BaseProfile Using Layout { Loop Outer {+ Profile BaseProfile using Layout { Loop Outer {Stock.Bottom|> Stock.Right|> Stock.Top|> Stock.Left|> Close} }- Profile PocketProfile Using Layout { Loop Outer {+ Profile PocketProfile using Layout { Loop Outer {Recess.Bottom|> Recess.Right|> Recess.Top@@ -23,8 +23,8 @@ Model RectangularPocket {Struct MachinedBlock {Compose Body {- Base Stock { Profile: BaseProfile; From: 0mm; To: 10mm; Role: Stock }- Pocket Recess { On: Top; Profile: PocketProfile; Depth: 4mm; MinimumFloorThickness: 3mm }+ Base Stock { profile: BaseProfile; from: 0mm; to: 10mm; role: Stock }+ Pocket Recess { on: Top; profile: PocketProfile; depth: 4mm; MinimumFloorThickness: 3mm }}}}diff --git a/fixtures/Canonical/Features/Slots/rounded-rectangle-opening.firmament b/fixtures/Canonical/Features/Slots/rounded-rectangle-opening.firmamentindex 058b539d..0a68b678 100644--- a/fixtures/Canonical/Features/Slots/rounded-rectangle-opening.firmament+++ b/fixtures/Canonical/Features/Slots/rounded-rectangle-opening.firmament@@ -1,17 +1,17 @@Model RoundedRectangleSlotPart {- Units: mm- Concept Struct SlotLayout On XY {- Rect2 Stock { Center: [0mm, 0mm]; Size: [200mm, 100mm] }+ units: mm+ Concept Struct SlotLayout on XY {+ Rect2 Stock { center: [0mm, 0mm]; size: [200mm, 100mm] }}- Profile Plate Using SlotLayout { Loop Outer {- Stock.Bottom As South- |> Stock.Right As East- |> Stock.Top As North- |> Stock.Left As West+ Profile Plate using SlotLayout { Loop Outer {+ Stock.Bottom as South+ |> Stock.Right as East+ |> Stock.Top as North+ |> Stock.Left as West|> Close} }Struct SlotFixture { Compose SlotBody {- Base Stock { Profile: Plate; From: -10mm; To: 10mm; Role: Stock }+ Base Stock { profile: Plate; from: -10mm; to: 10mm; role: Stock }Slot<RoundedRectangle> Opening { Center: Point2(0mm, 0mm); Direction: Vector2(1, 0); Length: 100mm; Width: 50mm; CornerRadius: 8mm; Extent: ThroughAll; Role: ThroughSlot }} }Selection OpeningEntry { Target: SlotEntry Source: Slot(Opening) Require: ClosedLoop }diff --git a/fixtures/Canonical/Features/Slots/straight-slot.firmament b/fixtures/Canonical/Features/Slots/straight-slot.firmamentindex ac1d2711..5abfc9f4 100644--- a/fixtures/Canonical/Features/Slots/straight-slot.firmament+++ b/fixtures/Canonical/Features/Slots/straight-slot.firmament@@ -1,17 +1,17 @@Model CapsuleSlotPart {- Units: mm- Concept Struct SlotLayout On XY {- Rect2 Stock { Center: [0mm, 0mm]; Size: [200mm, 100mm] }+ units: mm+ Concept Struct SlotLayout on XY {+ Rect2 Stock { center: [0mm, 0mm]; size: [200mm, 100mm] }}- Profile Plate Using SlotLayout { Loop Outer {- Stock.Bottom As South- |> Stock.Right As East- |> Stock.Top As North- |> Stock.Left As West+ Profile Plate using SlotLayout { Loop Outer {+ Stock.Bottom as South+ |> Stock.Right as East+ |> Stock.Top as North+ |> Stock.Left as West|> Close} }Struct SlotFixture { Compose SlotBody {- Base Stock { Profile: Plate; From: -10mm; To: 10mm; Role: Stock }+ Base Stock { profile: Plate; from: -10mm; to: 10mm; role: Stock }Slot<Capsule> Relief { Center: Point2(0mm, 0mm); Direction: Vector2(1, 0); Length: 80mm; Width: 40mm; Extent: ThroughAll; Role: ThroughSlot }} }Selection ReliefEntry { Target: SlotEntry Source: Slot(Relief) Require: ClosedLoop }diff --git a/fixtures/Canonical/Features/Sweep/circular-arc-sweep.firmament b/fixtures/Canonical/Features/Sweep/circular-arc-sweep.firmamentindex 9f043401..bfc7994a 100644--- a/fixtures/Canonical/Features/Sweep/circular-arc-sweep.firmament+++ b/fixtures/Canonical/Features/Sweep/circular-arc-sweep.firmament@@ -1,8 +1,8 @@Model BentWireArc {- Units: mm- Concept Path Centerline {- Start: Point2(0mm, 0mm)- Heading: 0deg+ units: mm+ Path Centerline {+ start: Point2(0mm, 0mm)+ heading: 0degArc Bend { Radius: 8mm; Turn: 180deg }}Sweep Wire {diff --git a/fixtures/Canonical/Features/Sweep/circular-line-sweep.firmament b/fixtures/Canonical/Features/Sweep/circular-line-sweep.firmamentindex 71651538..6c1f8cdd 100644--- a/fixtures/Canonical/Features/Sweep/circular-line-sweep.firmament+++ b/fixtures/Canonical/Features/Sweep/circular-line-sweep.firmament@@ -1,9 +1,9 @@Model StraightWire {- Units: mm- Concept Path Centerline {- Start: Point2(0mm, 0mm)- Heading: 0deg- Line Stock { Length: 40mm }+ units: mm+ Path Centerline {+ start: Point2(0mm, 0mm)+ heading: 0deg+ Line Stock { length: 40mm }}Sweep Wire {Path: Centerlinediff --git a/fixtures/Canonical/Features/Sweep/circular-planar-path-sweep.firmament b/fixtures/Canonical/Features/Sweep/circular-planar-path-sweep.firmamentindex 285c0462..682da644 100644--- a/fixtures/Canonical/Features/Sweep/circular-planar-path-sweep.firmament+++ b/fixtures/Canonical/Features/Sweep/circular-planar-path-sweep.firmament@@ -1,11 +1,11 @@Model UWire {- Units: mm- Concept Path Centerline {- Start: Point2(0mm, 0mm)- Heading: 90deg- Line LeftLeg { Length: 25mm }+ units: mm+ Path Centerline {+ start: Point2(0mm, 0mm)+ heading: 90deg+ Line LeftLeg { length: 25mm }Arc Return { Radius: 6mm; Turn: -180deg }- Line RightLeg { Length: 25mm }+ Line RightLeg { length: 25mm }}Sweep Wire {Path: Centerlinediff --git a/fixtures/Canonical/Garment/flared-skirt.firmament b/fixtures/Canonical/Garment/flared-skirt.firmamentindex 28b3b6fe..1c01792b 100644--- a/fixtures/Canonical/Garment/flared-skirt.firmament+++ b/fixtures/Canonical/Garment/flared-skirt.firmament@@ -14,10 +14,10 @@ Feature SkirtPanel(topWidth: Length = 502.654825mm, bottomWidth: Length = 738.27Line2 leftGuide { from: upperLeft; to: lowerLeft }return Profile {Loop Outer {- Segment Bottom { Trace: hemGuide; From: lowerLeft; To: lowerRight }- Segment Right { Trace: rightGuide; From: lowerRight; To: upperRight }- Segment Top { Trace: waistGuide; From: upperRight; To: upperLeft }- Segment Left { Trace: leftGuide; From: upperLeft; To: lowerLeft }+ Segment Bottom { trace: hemGuide; from: lowerLeft; to: lowerRight }+ Segment Right { trace: rightGuide; from: lowerRight; to: upperRight }+ Segment Top { trace: waistGuide; from: upperRight; to: upperLeft }+ Segment Left { trace: leftGuide; from: upperLeft; to: lowerLeft }}}}diff --git a/fixtures/Canonical/Garment/shorts.firmament b/fixtures/Canonical/Garment/shorts.firmamentindex 678aa963..31cd6827 100644--- a/fixtures/Canonical/Garment/shorts.firmament+++ b/fixtures/Canonical/Garment/shorts.firmament@@ -18,18 +18,18 @@ Feature ShortsPanel(length: Length = 400mm) -> Profile {Line2 innerLegGuide { from: crotch; to: hemInner }return Profile {Loop Outer {- Segment hem { Trace: hemGuide; From: hemInner; To: hemOuter }- Segment outerLeg { Trace: outerLegGuide; From: hemOuter; To: hipOuter }- Segment outerHip { Trace: outerHipGuide; From: hipOuter; To: waistOuter }- Segment waist { Trace: waistGuide; From: waistOuter; To: waistInner }- Segment rise { Trace: riseGuide; From: waistInner; To: crotch }- Segment innerLeg { Trace: innerLegGuide; From: crotch; To: hemInner }+ Segment hem { trace: hemGuide; from: hemInner; to: hemOuter }+ Segment outerLeg { trace: outerLegGuide; from: hemOuter; to: hipOuter }+ Segment outerHip { trace: outerHipGuide; from: hipOuter; to: waistOuter }+ Segment waist { trace: waistGuide; from: waistOuter; to: waistInner }+ Segment rise { trace: riseGuide; from: waistInner; to: crotch }+ Segment innerLeg { trace: innerLegGuide; from: crotch; to: hemInner }}}}Feature frontCut = ShortsPanel();Plane center { origin: [0mm, 0mm, 0mm]; normal: [1, 0, 0]; up: [0, 0, 1] }-Mirrored Profile backCut From frontCut { Across: center }+Mirrored Profile backCut from frontCut { across: center }Garment BasicShorts {meshSize: 60mm;diff --git a/fixtures/Canonical/Garment/tunic.firmament b/fixtures/Canonical/Garment/tunic.firmamentindex d3327c67..36812e47 100644--- a/fixtures/Canonical/Garment/tunic.firmament+++ b/fixtures/Canonical/Garment/tunic.firmament@@ -28,17 +28,17 @@ Feature TunicPanel(height: Length = 560mm) -> Profile {Line2 leftSideGuide { from: pitLeft; to: hemLeft }return Profile {Loop Outer {- Segment hem { Trace: hemGuide; From: hemLeft; To: hemRight }- Segment rightSide { Trace: rightSideGuide; From: hemRight; To: pitRight }- Segment rightArmLower { Trace: rightArmLowerGuide; From: pitRight; To: innerPitRight }- Segment rightArmUpper { Trace: rightArmUpperGuide; From: innerPitRight; To: shoulderRight }- Segment rightShoulder { Trace: rightShoulderGuide; From: shoulderRight; To: neckRightPoint }- Segment neckRight { Trace: neckRightGuide; From: neckRightPoint; To: neckBottom }- Segment neckLeft { Trace: neckLeftGuide; From: neckBottom; To: neckLeftPoint }- Segment leftShoulder { Trace: leftShoulderGuide; From: neckLeftPoint; To: shoulderLeft }- Segment leftArmUpper { Trace: leftArmUpperGuide; From: shoulderLeft; To: innerPitLeft }- Segment leftArmLower { Trace: leftArmLowerGuide; From: innerPitLeft; To: pitLeft }- Segment leftSide { Trace: leftSideGuide; From: pitLeft; To: hemLeft }+ Segment hem { trace: hemGuide; from: hemLeft; to: hemRight }+ Segment rightSide { trace: rightSideGuide; from: hemRight; to: pitRight }+ Segment rightArmLower { trace: rightArmLowerGuide; from: pitRight; to: innerPitRight }+ Segment rightArmUpper { trace: rightArmUpperGuide; from: innerPitRight; to: shoulderRight }+ Segment rightShoulder { trace: rightShoulderGuide; from: shoulderRight; to: neckRightPoint }+ Segment neckRight { trace: neckRightGuide; from: neckRightPoint; to: neckBottom }+ Segment neckLeft { trace: neckLeftGuide; from: neckBottom; to: neckLeftPoint }+ Segment leftShoulder { trace: leftShoulderGuide; from: neckLeftPoint; to: shoulderLeft }+ Segment leftArmUpper { trace: leftArmUpperGuide; from: shoulderLeft; to: innerPitLeft }+ Segment leftArmLower { trace: leftArmLowerGuide; from: innerPitLeft; to: pitLeft }+ Segment leftSide { trace: leftSideGuide; from: pitLeft; to: hemLeft }}}}diff --git a/fixtures/Canonical/GearInterfaces/bevel-pair.firmament b/fixtures/Canonical/GearInterfaces/bevel-pair.firmamentindex 20e2611f..d7937155 100644--- a/fixtures/Canonical/GearInterfaces/bevel-pair.firmament+++ b/fixtures/Canonical/GearInterfaces/bevel-pair.firmament@@ -1,6 +1,6 @@Model BevelPair {- Units: mm+ units: mmBevelGear Pinion { Module: 1mm Teeth: 20 PressureAngle: 20deg FaceWidth: 5mm BoreDiameter: 5mm PitchConeAngle: 26.565051177deg }BevelGear Gear { Module: 1mm Teeth: 40 PressureAngle: 20deg FaceWidth: 5mm BoreDiameter: 8mm PitchConeAngle: 63.434948823deg }- Interface<Gear> Mesh { A: Pinion B: Gear ShaftAngle: 90deg }+ Interface<Gear> Mesh { a: Pinion b: Gear ShaftAngle: 90deg }}diff --git a/fixtures/Canonical/GearInterfaces/internal-spur-pair.firmament b/fixtures/Canonical/GearInterfaces/internal-spur-pair.firmamentindex 88cb1c68..ab74aeda 100644--- a/fixtures/Canonical/GearInterfaces/internal-spur-pair.firmament+++ b/fixtures/Canonical/GearInterfaces/internal-spur-pair.firmament@@ -1,6 +1,6 @@Model InternalSpurPair {- Units: mm+ units: mmSpurGear Pinion { Module: 1mm Teeth: 20 PressureAngle: 20deg FaceWidth: 6mm BoreDiameter: 5mm }InternalSpurGear Ring { Module: 1mm Teeth: 60 PressureAngle: 20deg FaceWidth: 6mm OutsideDiameter: 65mm Phase: 3deg }- Interface<Gear> Mesh { A: Pinion B: Ring }+ Interface<Gear> Mesh { a: Pinion b: Ring }}diff --git a/fixtures/Canonical/GearInterfaces/miter-pair.firmament b/fixtures/Canonical/GearInterfaces/miter-pair.firmamentindex f99fafbc..9ec37376 100644--- a/fixtures/Canonical/GearInterfaces/miter-pair.firmament+++ b/fixtures/Canonical/GearInterfaces/miter-pair.firmament@@ -1,6 +1,6 @@Model MiterPair {- Units: mm+ units: mmMiterGear A { Module: 1.5mm Teeth: 20 PressureAngle: 20deg FaceWidth: 8mm BoreDiameter: 8mm PitchConeAngle: 45deg }MiterGear B { Module: 1.5mm Teeth: 20 PressureAngle: 20deg FaceWidth: 8mm BoreDiameter: 8mm PitchConeAngle: 45deg Phase: 9deg }- Interface<Gear> Mesh { A: A B: B ShaftAngle: 90deg }+ Interface<Gear> Mesh { a: A b: B ShaftAngle: 90deg }}diff --git a/fixtures/Canonical/GearInterfaces/print-oriented-spur-pair.firmament b/fixtures/Canonical/GearInterfaces/print-oriented-spur-pair.firmamentindex 123b97d2..9121f7eb 100644--- a/fixtures/Canonical/GearInterfaces/print-oriented-spur-pair.firmament+++ b/fixtures/Canonical/GearInterfaces/print-oriented-spur-pair.firmament@@ -1,6 +1,6 @@Model PrintOrientedSpurPair {- Units: mm+ units: mmSpurGear Driver { Module: 2mm Teeth: 20 PressureAngle: 20deg FaceWidth: 8mm BoreDiameter: 8.4mm Backlash: 0.15mm }SpurGear Driven { Module: 2mm Teeth: 40 PressureAngle: 20deg FaceWidth: 8mm BoreDiameter: 8.4mm Backlash: 0.15mm Phase: 4.5deg }- Interface<Gear> Mesh { A: Driver B: Driven }+ Interface<Gear> Mesh { a: Driver b: Driven }}diff --git a/fixtures/Canonical/GearInterfaces/ratchet-pawl.firmament b/fixtures/Canonical/GearInterfaces/ratchet-pawl.firmamentindex 013412ac..2ebdbddf 100644--- a/fixtures/Canonical/GearInterfaces/ratchet-pawl.firmament+++ b/fixtures/Canonical/GearInterfaces/ratchet-pawl.firmament@@ -1,6 +1,6 @@Model RatchetPawl {- Units: mm+ units: mmRatchetGear Wheel { Teeth: 60 OutsideDiameter: 40mm FaceWidth: 6mm BoreDiameter: 10mm DriveFaceAngle: 0deg }Pawl Stop { Width: 16mm Length: 38mm Thickness: 6mm PivotDiameter: 5mm NoseLength: 6mm EngagementAngle: 15deg }- Interface<Gear> OneWay { A: Wheel B: Stop EngagementPhase: 2deg AllowedDirection: Clockwise }+ Interface<Gear> OneWay { a: Wheel b: Stop EngagementPhase: 2deg AllowedDirection: Clockwise }}diff --git a/fixtures/Canonical/GearInterfaces/spur-pair.firmament b/fixtures/Canonical/GearInterfaces/spur-pair.firmamentindex ef421508..c794ed32 100644--- a/fixtures/Canonical/GearInterfaces/spur-pair.firmament+++ b/fixtures/Canonical/GearInterfaces/spur-pair.firmament@@ -1,6 +1,6 @@Model SpurPair {- Units: mm+ units: mmSpurGear Driver { Module: 2mm Teeth: 24 PressureAngle: 20deg FaceWidth: 10mm BoreDiameter: 8mm }SpurGear Driven { Module: 2mm Teeth: 48 PressureAngle: 20deg FaceWidth: 10mm BoreDiameter: 12mm Phase: 3.75deg }- Interface<Gear> Mesh { A: Driver B: Driven }+ Interface<Gear> Mesh { a: Driver b: Driven }}diff --git a/fixtures/Canonical/GearInterfaces/three-gear-train.firmament b/fixtures/Canonical/GearInterfaces/three-gear-train.firmamentindex bcb427cd..b14a2b84 100644--- a/fixtures/Canonical/GearInterfaces/three-gear-train.firmament+++ b/fixtures/Canonical/GearInterfaces/three-gear-train.firmament@@ -1,8 +1,8 @@Model ThreeGearTrain {- Units: mm+ units: mmSpurGear A { Module: 1mm Teeth: 20 PressureAngle: 20deg FaceWidth: 6mm BoreDiameter: 5mm }SpurGear Idler { Module: 1mm Teeth: 30 PressureAngle: 20deg FaceWidth: 6mm BoreDiameter: 5mm Phase: 6deg }SpurGear C { Module: 1mm Teeth: 40 PressureAngle: 20deg FaceWidth: 6mm BoreDiameter: 5mm }- Interface<Gear> AToIdler { A: A B: Idler }- Interface<Gear> IdlerToC { A: Idler B: C }+ Interface<Gear> AToIdler { a: A b: Idler }+ Interface<Gear> IdlerToC { a: Idler b: C }}diff --git a/fixtures/Canonical/Gears/bevel-basic.firmament b/fixtures/Canonical/Gears/bevel-basic.firmamentindex b0387e33..406bace3 100644--- a/fixtures/Canonical/Gears/bevel-basic.firmament+++ b/fixtures/Canonical/Gears/bevel-basic.firmament@@ -1,5 +1,5 @@Model BevelBasic {- Units: mm+ units: mmBevelGear RedirectGear {Module: 1mmTeeth: 45diff --git a/fixtures/Canonical/Gears/bevel-pair-gear.firmament b/fixtures/Canonical/Gears/bevel-pair-gear.firmamentindex 63fa1bc8..68b8727f 100644--- a/fixtures/Canonical/Gears/bevel-pair-gear.firmament+++ b/fixtures/Canonical/Gears/bevel-pair-gear.firmament@@ -1,4 +1,4 @@Model BevelPairGear {- Units: mm+ units: mmBevelGear Gear { Module: 1mm Teeth: 40 PressureAngle: 20deg FaceWidth: 5mm BoreDiameter: 8mm PitchConeAngle: 63.434948823deg }}diff --git a/fixtures/Canonical/Gears/bevel-pair-pinion.firmament b/fixtures/Canonical/Gears/bevel-pair-pinion.firmamentindex 7cc5e095..54936612 100644--- a/fixtures/Canonical/Gears/bevel-pair-pinion.firmament+++ b/fixtures/Canonical/Gears/bevel-pair-pinion.firmament@@ -1,4 +1,4 @@Model BevelPairPinion {- Units: mm+ units: mmBevelGear Pinion { Module: 1mm Teeth: 20 PressureAngle: 20deg FaceWidth: 5mm BoreDiameter: 5mm PitchConeAngle: 26.565051177deg }}diff --git a/fixtures/Canonical/Gears/internal-spur-basic.firmament b/fixtures/Canonical/Gears/internal-spur-basic.firmamentindex 45676487..42404ce8 100644--- a/fixtures/Canonical/Gears/internal-spur-basic.firmament+++ b/fixtures/Canonical/Gears/internal-spur-basic.firmament@@ -1,5 +1,5 @@Model InternalSpurBasic {- Units: mm+ units: mmInternalSpurGear Ring {Module: 0.5mmTeeth: 100diff --git a/fixtures/Canonical/Gears/miter-basic.firmament b/fixtures/Canonical/Gears/miter-basic.firmamentindex 5051681b..1ecad0d5 100644--- a/fixtures/Canonical/Gears/miter-basic.firmament+++ b/fixtures/Canonical/Gears/miter-basic.firmament@@ -1,5 +1,5 @@Model MiterBasic {- Units: mm+ units: mmMiterGear EqualRedirect {Module: 1.5mmTeeth: 20diff --git a/fixtures/Canonical/Gears/pawl-basic.firmament b/fixtures/Canonical/Gears/pawl-basic.firmamentindex 9229d501..13483ea1 100644--- a/fixtures/Canonical/Gears/pawl-basic.firmament+++ b/fixtures/Canonical/Gears/pawl-basic.firmament@@ -1,5 +1,5 @@Model PawlBasic {- Units: mm+ units: mmPawl StopPawl {Width: 16mmLength: 38mmdiff --git a/fixtures/Canonical/Gears/ratchet-basic.firmament b/fixtures/Canonical/Gears/ratchet-basic.firmamentindex 4f1c9e35..20a42995 100644--- a/fixtures/Canonical/Gears/ratchet-basic.firmament+++ b/fixtures/Canonical/Gears/ratchet-basic.firmament@@ -1,5 +1,5 @@Model RatchetBasic {- Units: mm+ units: mmRatchetGear IndexWheel {Teeth: 60OutsideDiameter: 40mmdiff --git a/fixtures/Canonical/Gears/spur-basic.firmament b/fixtures/Canonical/Gears/spur-basic.firmamentindex cca5f805..db992e25 100644--- a/fixtures/Canonical/Gears/spur-basic.firmament+++ b/fixtures/Canonical/Gears/spur-basic.firmament@@ -1,5 +1,5 @@Model SpurBasic {- Units: mm+ units: mmSpurGear DriveGear {Module: 2mmTeeth: 24diff --git a/fixtures/Canonical/Gears/spur-driven-48.firmament b/fixtures/Canonical/Gears/spur-driven-48.firmamentindex 914e3189..c86eea78 100644--- a/fixtures/Canonical/Gears/spur-driven-48.firmament+++ b/fixtures/Canonical/Gears/spur-driven-48.firmament@@ -1,4 +1,4 @@Model SpurDriven48 {- Units: mm+ units: mmSpurGear Driven { Module: 2mm Teeth: 48 PressureAngle: 20deg FaceWidth: 10mm BoreDiameter: 12mm Phase: 3.75deg }}diff --git a/fixtures/Canonical/Gears/spur-high-tooth.firmament b/fixtures/Canonical/Gears/spur-high-tooth.firmamentindex 6007c209..519cf6e1 100644--- a/fixtures/Canonical/Gears/spur-high-tooth.firmament+++ b/fixtures/Canonical/Gears/spur-high-tooth.firmament@@ -1,4 +1,4 @@Model SpurHighTooth {- Units: mm+ units: mmSpurGear TimingWheel { Module: 0.8mm Teeth: 100 PressureAngle: 20deg FaceWidth: 6mm BoreDiameter: 12mm Backlash: 0.05mm }}diff --git a/fixtures/Canonical/Integration/inline-step-recognize-replace.firmament b/fixtures/Canonical/Integration/inline-step-recognize-replace.firmamentindex 5bb57ec9..494c55af 100644--- a/fixtures/Canonical/Integration/inline-step-recognize-replace.firmament+++ b/fixtures/Canonical/Integration/inline-step-recognize-replace.firmament@@ -1,5 +1,5 @@Model InlineStepRecognizeReplace {- Units: mm+ units: mmInlineStep Source {Path: "../../../testdata/firmament/inline-step/canonical-through-hole.step"@@ -19,10 +19,10 @@ Model InlineStepRecognizeReplace {}Replace Source.MountHole With Hole<Shaft> MountHole {- On: Source.Face(7)- Center: Point2(0mm, 0mm)- Diameter: 2mm- End: ThroughAll+ on: Source.Face(7)+ center: Point2(0mm, 0mm)+ diameter: 2mm+ end: ThroughAllHostSize: [10mm, 8mm, 6mm]}}diff --git a/fixtures/Canonical/Integration/inspection-block.firmament b/fixtures/Canonical/Integration/inspection-block.firmamentindex ddc8dc61..75441ab7 100644--- a/fixtures/Canonical/Integration/inspection-block.firmament+++ b/fixtures/Canonical/Integration/inspection-block.firmament@@ -1,7 +1,7 @@Model InspectionBlock {- Units: mm- Box Body { Size: [60mm, 40mm, 12mm] }+ units: mm+ Box Body { size: [60mm, 40mm, 12mm] }Modify Body {- Hole<Shaft> Mount { On: +Z Center: Point2(0mm, 0mm) Diameter: 6mm End: ThroughAll }+ Hole<Shaft> Mount { on: +Z center: Point2(0mm, 0mm) diameter: 6mm end: ThroughAll }}}diff --git a/fixtures/Canonical/Integration/machined-mounting-block.firmament b/fixtures/Canonical/Integration/machined-mounting-block.firmamentindex acd8197f..4a1f026a 100644--- a/fixtures/Canonical/Integration/machined-mounting-block.firmament+++ b/fixtures/Canonical/Integration/machined-mounting-block.firmament@@ -1,27 +1,27 @@Model MachinedMountingBlock {- Units: mm+ units: mm- Concept Struct Layout On XY {- Rect2 Stock { Center: [0mm, 0mm]; Size: [70mm, 44mm] }- Rect2 BossPad { Center: [-16mm, 0mm]; Size: [14mm, 14mm] }- Rect2 Recess { Center: [10mm, 0mm]; Size: [20mm, 16mm] }+ Concept Struct Layout on XY {+ Rect2 Stock { center: [0mm, 0mm]; size: [70mm, 44mm] }+ Rect2 BossPad { center: [-16mm, 0mm]; size: [14mm, 14mm] }+ Rect2 Recess { center: [10mm, 0mm]; size: [20mm, 16mm] }}- Profile BaseProfile Using Layout { Loop Outer {+ Profile BaseProfile using Layout { Loop Outer {Stock.Bottom|> Stock.Right|> Stock.Top|> Stock.Left|> Close} }- Profile BossProfile Using Layout { Loop Outer {+ Profile BossProfile using Layout { Loop Outer {BossPad.Bottom|> BossPad.Right|> BossPad.Top|> BossPad.Left|> Close} }- Profile PocketProfile Using Layout { Loop Outer {+ Profile PocketProfile using Layout { Loop Outer {Recess.Bottom|> Recess.Right|> Recess.Top@@ -31,26 +31,26 @@ Model MachinedMountingBlock {Struct MountingBlock {Compose Body {- Base Stock { Profile: BaseProfile; From: 0mm; To: 12mm; Role: Stock }- Boss ConnectorBoss { On: Top; Profile: BossProfile; Height: 6mm }- Pocket ElectronicsRecess { On: Top; Profile: PocketProfile; Depth: 4mm; MinimumFloorThickness: 3mm }- Hole<Shaft> ConnectorBore { On: +Z; Center: [-16mm, 0mm]; Diameter: 6mm; End: ThroughAll; Role: Connector }+ Base Stock { profile: BaseProfile; from: 0mm; to: 12mm; role: Stock }+ Boss ConnectorBoss { on: Top; profile: BossProfile; height: 6mm }+ Pocket ElectronicsRecess { on: Top; profile: PocketProfile; depth: 4mm; MinimumFloorThickness: 3mm }+ Hole<Shaft> ConnectorBore { on: +Z; center: [-16mm, 0mm]; diameter: 6mm; end: ThroughAll; Role: Connector }Hole<Counterbore> MountNorth {- On: +Z- Center: [26mm, 13mm]- Diameter: 6mm- CounterboreDiameter: 11mm- CounterboreDepth: 3mm- End: ThroughAll+ on: +Z+ center: [26mm, 13mm]+ diameter: 6mm+ counterboreDiameter: 11mm+ counterboreDepth: 3mm+ end: ThroughAllRole: MountingHole}Hole<Counterbore> MountSouth {- On: +Z- Center: [26mm, -13mm]- Diameter: 6mm- CounterboreDiameter: 11mm- CounterboreDepth: 3mm- End: ThroughAll+ on: +Z+ center: [26mm, -13mm]+ diameter: 6mm+ counterboreDiameter: 11mm+ counterboreDepth: 3mm+ end: ThroughAllRole: MountingHole}}diff --git a/fixtures/Canonical/Integration/paperclip-maximizer.firmament b/fixtures/Canonical/Integration/paperclip-maximizer.firmamentindex a9d6234a..cd84ce03 100644--- a/fixtures/Canonical/Integration/paperclip-maximizer.firmament+++ b/fixtures/Canonical/Integration/paperclip-maximizer.firmament@@ -1,5 +1,5 @@Model MaximumPaperclips {- Units: mm+ units: mmRecord PaperclipPolicy { WireDiameter: Length OuterLegLength: Length InnerLegLength: Length OuterBendRadius: Length InnerBendRadius: Length Material: String }Static StandardPaperclip: PaperclipPolicy = PaperclipPolicy {WireDiameter: 1mm OuterLegLength: 15mm InnerLegLength: 14mm OuterBendRadius: 5mm InnerBendRadius: 3mmdiff --git a/fixtures/Canonical/Integration/standard-products/flanged-adapter-eight-pattern.firmament b/fixtures/Canonical/Integration/standard-products/flanged-adapter-eight-pattern.firmamentindex 5a4eed59..21d26088 100644--- a/fixtures/Canonical/Integration/standard-products/flanged-adapter-eight-pattern.firmament+++ b/fixtures/Canonical/Integration/standard-products/flanged-adapter-eight-pattern.firmament@@ -1,5 +1,5 @@Model ImportedEightHoleFlange {- Units: mm+ units: mmUse Standard.Products.MechanicalStatic EightHoleFlange = Standard.Products.Mechanical.StandardFlangedAdapter with {diff --git a/fixtures/Canonical/Integration/standard-products/mounting-plate-library-use.firmament b/fixtures/Canonical/Integration/standard-products/mounting-plate-library-use.firmamentindex 6987fc75..ceebc2b1 100644--- a/fixtures/Canonical/Integration/standard-products/mounting-plate-library-use.firmament+++ b/fixtures/Canonical/Integration/standard-products/mounting-plate-library-use.firmament@@ -1,5 +1,5 @@Model ImportedMountingPlate {- Units: mm+ units: mmUse Standard.Products.MechanicalStatic MyPlate = Standard.Products.Mechanical.StandardMountingPlate with {diff --git a/fixtures/Canonical/Materials/material-catalog-coupon.firmament b/fixtures/Canonical/Materials/material-catalog-coupon.firmamentindex 24f01491..8b683b9e 100644--- a/fixtures/Canonical/Materials/material-catalog-coupon.firmament+++ b/fixtures/Canonical/Materials/material-catalog-coupon.firmament@@ -1,6 +1,6 @@Model CatalogMaterialCoupon {- Units: mm- Box Coupon { Size: [80mm, 20mm, 2mm] }+ units: mm+ Box Coupon { size: [80mm, 20mm, 2mm] }Analysis LinearElastic CouponPull {Body: Coupondiff --git a/fixtures/Canonical/Offset/prism-groove.firmament b/fixtures/Canonical/Offset/prism-groove.firmamentindex 3a0fc4ea..cfd483f8 100644--- a/fixtures/Canonical/Offset/prism-groove.firmament+++ b/fixtures/Canonical/Offset/prism-groove.firmament@@ -1,11 +1,11 @@Model PrismGroove {- Units: mm- Rect2 Stock { Center: [0mm,0mm]; Size: [40mm,30mm] }- Rect2 Groove { Center: [18mm,0mm]; Size: [10mm,6mm] }+ units: mm+ Rect2 Stock { center: [0mm,0mm]; size: [40mm,30mm] }+ Rect2 Groove { center: [18mm,0mm]; size: [10mm,6mm] }Profile StockProfile { Loop Outer { Stock.Bottom |> Stock.Right |> Stock.Top |> Stock.Left |> Close } }Profile GrooveProfile { Loop Outer { Groove.Bottom |> Groove.Right |> Groove.Top |> Groove.Left |> Close } }Compose Plate {- Base StockBody { Profile: StockProfile; From: 0mm; To: 10mm; Role: Stock }+ Base StockBody { profile: StockProfile; from: 0mm; to: 10mm; role: Stock }RemoveOffset<Prism> GrooveCut { Target: Plate; On: Top; Profile: GrooveProfile; Depth: 4mm }}}diff --git a/fixtures/Canonical/Offset/prism-pad.firmament b/fixtures/Canonical/Offset/prism-pad.firmamentindex 796fd96e..188684d5 100644--- a/fixtures/Canonical/Offset/prism-pad.firmament+++ b/fixtures/Canonical/Offset/prism-pad.firmament@@ -1,11 +1,11 @@Model PrismPad {- Units: mm- Rect2 Stock { Center: [0mm,0mm]; Size: [40mm,30mm] }- Rect2 Pad { Center: [10mm,0mm]; Size: [10mm,8mm] }+ units: mm+ Rect2 Stock { center: [0mm,0mm]; size: [40mm,30mm] }+ Rect2 Pad { center: [10mm,0mm]; size: [10mm,8mm] }Profile StockProfile { Loop Outer { Stock.Bottom |> Stock.Right |> Stock.Top |> Stock.Left |> Close } }Profile PadProfile { Loop Outer { Pad.Bottom |> Pad.Right |> Pad.Top |> Pad.Left |> Close } }Compose Plate {- Base StockBody { Profile: StockProfile; From: 0mm; To: 10mm; Role: Stock }+ Base StockBody { profile: StockProfile; from: 0mm; to: 10mm; role: Stock }AddOffset<Prism> LocalPad { Target: Plate; On: Top; Profile: PadProfile; Height: 3mm }}}diff --git a/fixtures/Canonical/Offset/prism-through-notch.firmament b/fixtures/Canonical/Offset/prism-through-notch.firmamentindex 86658ced..23fd9600 100644--- a/fixtures/Canonical/Offset/prism-through-notch.firmament+++ b/fixtures/Canonical/Offset/prism-through-notch.firmament@@ -1,11 +1,11 @@Model PrismThroughNotch {- Units: mm- Rect2 Stock { Center: [0mm,0mm]; Size: [40mm,30mm] }- Rect2 Notch { Center: [19mm,0mm]; Size: [10mm,10mm] }+ units: mm+ Rect2 Stock { center: [0mm,0mm]; size: [40mm,30mm] }+ Rect2 Notch { center: [19mm,0mm]; size: [10mm,10mm] }Profile StockProfile { Loop Outer { Stock.Bottom |> Stock.Right |> Stock.Top |> Stock.Left |> Close } }Profile NotchProfile { Loop Outer { Notch.Bottom |> Notch.Right |> Notch.Top |> Notch.Left |> Close } }Compose Plate {- Base StockBody { Profile: StockProfile; From: 0mm; To: 10mm; Role: Stock }+ Base StockBody { profile: StockProfile; from: 0mm; to: 10mm; role: Stock }RemoveOffset<Prism> EdgeNotch { Target: Plate; On: Top; Profile: NotchProfile; Termination: ThroughAll }}}diff --git a/fixtures/Canonical/PMI/counterbore-shaft-diameter.firmament b/fixtures/Canonical/PMI/counterbore-shaft-diameter.firmamentindex cd1585ea..cc768fe5 100644--- a/fixtures/Canonical/PMI/counterbore-shaft-diameter.firmament+++ b/fixtures/Canonical/PMI/counterbore-shaft-diameter.firmament@@ -1,5 +1,5 @@Model ProfileComposeLBracketCounterborePmi {- Units: mm+ units: mmRecord MountSpec { Center: Point2 Diameter: Length }Static Mounts: MountSpec[] = [@@ -8,40 +8,40 @@ Model ProfileComposeLBracketCounterborePmi {]Template<spec: MountSpec> ShaftHole {Hole<Shaft> Mount {- On: +Z- Center: spec.Center- Diameter: spec.Diameter- End: ThroughAll+ on: +Z+ center: spec.Center+ diameter: spec.Diameter+ end: ThroughAll}}- Concept Struct Layout On XY {- Rect2 Horizontal { Center: [0mm, -10mm]; Size: [80mm, 20mm] }- Rect2 Vertical { Center: [-30mm, 10mm]; Size: [20mm, 60mm] }- Point2 Notch { Position: [-20mm, 0mm] }+ Concept Struct Layout on XY {+ Rect2 Horizontal { center: [0mm, -10mm]; size: [80mm, 20mm] }+ Rect2 Vertical { center: [-30mm, 10mm]; size: [20mm, 60mm] }+ Point2 Notch { position: [-20mm, 0mm] }}- Profile Bracket Using Layout { Loop Outer {- Horizontal.Bottom As South- |> Horizontal.Right As East- |> Horizontal.Top To Notch As Inner- |> Vertical.Right To Vertical.TopRight As Upright- |> Vertical.Top As North- |> Vertical.Left To Horizontal.BottomLeft As West+ Profile Bracket using Layout { Loop Outer {+ Horizontal.Bottom as South+ |> Horizontal.Right as East+ |> Horizontal.Top to Notch as Inner+ |> Vertical.Right to Vertical.TopRight as Upright+ |> Vertical.Top as North+ |> Vertical.Left to Horizontal.BottomLeft as West|> Close} }Struct BracketBody {Compose BracketBody {- Base Stock { Profile: Bracket; From: 0mm; To: 12mm; Role: Stock }- Pattern MountPattern Over Mounts { ShaftHole<Current> }+ Base Stock { profile: Bracket; from: 0mm; to: 12mm; role: Stock }+ Pattern MountPattern over Mounts { ShaftHole<Current> }Hole<Counterbore> CounterboredMount {- On: +Z- Center: Point2(-30mm, -10mm)- Diameter: 8mm- CounterboreDiameter: 14mm- CounterboreDepth: 4mm- End: ThroughAll+ on: +Z+ center: Point2(-30mm, -10mm)+ diameter: 8mm+ counterboreDiameter: 14mm+ counterboreDepth: 4mm+ end: ThroughAll}}}diff --git a/fixtures/Canonical/PMI/hole-diameter-and-datum.firmament b/fixtures/Canonical/PMI/hole-diameter-and-datum.firmamentindex 78496199..d73724b7 100644--- a/fixtures/Canonical/PMI/hole-diameter-and-datum.firmament+++ b/fixtures/Canonical/PMI/hole-diameter-and-datum.firmament@@ -1,13 +1,13 @@Model CanonicalPmiMount {- Units: mm+ units: mm- Box Base { Size: [80mm, 50mm, 12mm] }+ Box Base { size: [80mm, 50mm, 12mm] }Modify Base {Hole<Shaft> Mount {- On: +Z- Center: Point2(0mm, 0mm)- Diameter: 8mm- End: ThroughAll+ on: +Z+ center: Point2(0mm, 0mm)+ diameter: 8mm+ end: ThroughAll}}Pmi {diff --git a/fixtures/Canonical/PMI/hole-wall-selector.firmament b/fixtures/Canonical/PMI/hole-wall-selector.firmamentindex 20a792a4..7242c7a4 100644--- a/fixtures/Canonical/PMI/hole-wall-selector.firmament+++ b/fixtures/Canonical/PMI/hole-wall-selector.firmament@@ -1,8 +1,8 @@Model WallReference {- Units: mm- Box Body { Size: [40mm, 30mm, 8mm] }+ units: mm+ Box Body { size: [40mm, 30mm, 8mm] }Modify Body {- Hole<Shaft> H { On: +Z Center: Point2(0mm, 0mm) Diameter: 8mm End: ThroughAll }+ Hole<Shaft> H { on: +Z center: Point2(0mm, 0mm) diameter: 8mm end: ThroughAll }}Pmi {HoleDiameter WallDiameter { Target: face(H.Wall) Value: 8mm }diff --git a/fixtures/Canonical/PMI/multiple-hole-dimensions-with-chamfer.firmament b/fixtures/Canonical/PMI/multiple-hole-dimensions-with-chamfer.firmamentindex 7932367f..d12f824a 100644--- a/fixtures/Canonical/PMI/multiple-hole-dimensions-with-chamfer.firmament+++ b/fixtures/Canonical/PMI/multiple-hole-dimensions-with-chamfer.firmament@@ -1,9 +1,9 @@Model MountingPlate {- Units: mm- Box Plate { Size: [80mm, 50mm, 8mm] }+ units: mm+ Box Plate { size: [80mm, 50mm, 8mm] }Modify Plate {- Hole<Shaft> MountLeft { On: +Z Center: Point2(-25mm, 0mm) Diameter: 8mm End: ThroughAll }- Hole<Shaft> MountRight { On: +Z Center: Point2(25mm, 0mm) Diameter: 8mm End: ThroughAll }+ Hole<Shaft> MountLeft { on: +Z center: Point2(-25mm, 0mm) diameter: 8mm end: ThroughAll }+ Hole<Shaft> MountRight { on: +Z center: Point2(25mm, 0mm) diameter: 8mm end: ThroughAll }EdgeFinish TopBreak { Face: +Z Target: Boundary Kind: Chamfer Distance: 1mm }}Pmi {diff --git a/fixtures/Canonical/Patterns/four-hole-pattern.firmament b/fixtures/Canonical/Patterns/four-hole-pattern.firmamentindex 2e74a268..0c499f35 100644--- a/fixtures/Canonical/Patterns/four-hole-pattern.firmament+++ b/fixtures/Canonical/Patterns/four-hole-pattern.firmament@@ -1,5 +1,5 @@Model FourHolePlate {- Units: mm+ units: mmRecord MountSpec { Center: Point2 Diameter: Length }Static Mounts: MountSpec[] = [@@ -10,15 +10,15 @@ Model FourHolePlate {]Template<spec: MountSpec> MountHole {Hole<Shaft> Mount {- On: +Z- Center: spec.Center- Diameter: spec.Diameter- End: ThroughAll+ on: +Z+ center: spec.Center+ diameter: spec.Diameter+ end: ThroughAll}}- Box Plate { Size: [80mm, 50mm, 8mm] }+ Box Plate { size: [80mm, 50mm, 8mm] }Modify Plate {- Pattern MountPattern Over Mounts { MountHole<Current> }+ Pattern MountPattern over Mounts { MountHole<Current> }}}diff --git a/fixtures/Canonical/Patterns/record-array-hole-pattern.firmament b/fixtures/Canonical/Patterns/record-array-hole-pattern.firmamentindex e4090973..7bacb8da 100644--- a/fixtures/Canonical/Patterns/record-array-hole-pattern.firmament+++ b/fixtures/Canonical/Patterns/record-array-hole-pattern.firmament@@ -1,5 +1,5 @@Model GeneratedMounts {- Units: mm+ units: mmRecord MountSpec { Center: Point2 Diameter: Length }Static Mounts: MountSpec[] = [MountSpec { Center: Point2(-20mm, 0mm) Diameter: 8mm }@@ -8,14 +8,14 @@ Model GeneratedMounts {Require ValidDiameter => 8mm > 0mmTemplate<spec: MountSpec> MountHole {Hole<Shaft> Mount {- On: +Z- Center: spec.Center- Diameter: spec.Diameter- End: ThroughAll+ on: +Z+ center: spec.Center+ diameter: spec.Diameter+ end: ThroughAll}}- Box Base { Size: [80mm, 40mm, 10mm] }+ Box Base { size: [80mm, 40mm, 10mm] }Modify Base {- Pattern MountPattern Over Mounts { MountHole<Current> }+ Pattern MountPattern over Mounts { MountHole<Current> }}}diff --git a/fixtures/Canonical/Patterns/record-array-slot-pattern.firmament b/fixtures/Canonical/Patterns/record-array-slot-pattern.firmamentindex 698f9fb9..de755d5f 100644--- a/fixtures/Canonical/Patterns/record-array-slot-pattern.firmament+++ b/fixtures/Canonical/Patterns/record-array-slot-pattern.firmament@@ -1,5 +1,5 @@Model GeneratedSlots {- Units: mm+ units: mmRecord SlotSpec { Center: Point2 Direction: Vector2 Length: Length Width: Length }Static Vents: SlotSpec[] = [@@ -22,22 +22,22 @@ Model GeneratedSlots {}}- Concept Struct Layout On XY {- Rect2 Stock { Center: Point2(0mm, 0mm); Size: [200mm, 100mm] }+ Concept Struct Layout on XY {+ Rect2 Stock { center: Point2(0mm, 0mm); size: [200mm, 100mm] }}- Profile Plate Using Layout {+ Profile Plate using Layout {Loop Outer {- Stock.Bottom As South- |> Stock.Right As East- |> Stock.Top As North- |> Stock.Left As West+ Stock.Bottom as South+ |> Stock.Right as East+ |> Stock.Top as North+ |> Stock.Left as West|> Close}}Struct Plate {Compose Body {- Base Stock { Profile: Plate; From: -10mm; To: 10mm; Role: Stock }- Pattern SlotPattern Over Vents { Vent<Current> }+ Base Stock { profile: Plate; from: -10mm; to: 10mm; role: Stock }+ Pattern SlotPattern over Vents { Vent<Current> }}}}diff --git a/fixtures/Canonical/Perforation/cylindrical-grid-24.firmament b/fixtures/Canonical/Perforation/cylindrical-grid-24.firmamentindex 2b663a3b..e4808c7d 100644--- a/fixtures/Canonical/Perforation/cylindrical-grid-24.firmament+++ b/fixtures/Canonical/Perforation/cylindrical-grid-24.firmament@@ -7,15 +7,15 @@ Struct CylindricalGrid24 {}Modify Body {Perforation Vents {- On: OuterWall- Diameter: 5mm- Layout: CylindricalGrid- Pitch: 14mm- CircumferentialPitch: 18.5mm- MarginTop: 13mm- MarginBottom: 13mm- MinimumLigament: 2mm- StartAngle: 0deg+ on: OuterWall+ diameter: 5mm+ layout: CylindricalGrid+ pitch: 14mm+ circumferentialPitch: 18.5mm+ marginTop: 13mm+ marginBottom: 13mm+ minimumLigament: 2mm+ startAngle: 0deg}}}diff --git a/fixtures/Canonical/Perforation/cylindrical-grid-8.firmament b/fixtures/Canonical/Perforation/cylindrical-grid-8.firmamentindex bfe975b8..fed9b07a 100644--- a/fixtures/Canonical/Perforation/cylindrical-grid-8.firmament+++ b/fixtures/Canonical/Perforation/cylindrical-grid-8.firmament@@ -7,15 +7,15 @@ Struct CylindricalGrid8 {}Modify Body {Perforation Vents {- On: OuterWall- Diameter: 5mm- Layout: CylindricalGrid- Pitch: 14mm- CircumferentialPitch: 18.5mm- MarginTop: 26mm- MarginBottom: 26mm- MinimumLigament: 2mm- StartAngle: 0deg+ on: OuterWall+ diameter: 5mm+ layout: CylindricalGrid+ pitch: 14mm+ circumferentialPitch: 18.5mm+ marginTop: 26mm+ marginBottom: 26mm+ minimumLigament: 2mm+ startAngle: 0deg}}}diff --git a/fixtures/Canonical/Perforation/cylindrical-ordning-blank.firmament b/fixtures/Canonical/Perforation/cylindrical-ordning-blank.firmamentindex e9e7ccd5..63dab245 100644--- a/fixtures/Canonical/Perforation/cylindrical-ordning-blank.firmament+++ b/fixtures/Canonical/Perforation/cylindrical-ordning-blank.firmament@@ -7,15 +7,15 @@ Struct OrdningInspiredPerforatedBlank {}Modify Body {Perforation SideVents {- On: OuterWall- Diameter: 9mm- Layout: CylindricalGrid- Pitch: 15mm- CircumferentialPitch: 18mm- MarginTop: 12mm- MarginBottom: 20mm- MinimumLigament: 2mm- StartAngle: 9deg+ on: OuterWall+ diameter: 9mm+ layout: CylindricalGrid+ pitch: 15mm+ circumferentialPitch: 18mm+ marginTop: 12mm+ marginBottom: 20mm+ minimumLigament: 2mm+ startAngle: 9deg}}}diff --git a/fixtures/Canonical/Perforation/cylindrical-staggered-32.firmament b/fixtures/Canonical/Perforation/cylindrical-staggered-32.firmamentindex 754c1f78..c80f683e 100644--- a/fixtures/Canonical/Perforation/cylindrical-staggered-32.firmament+++ b/fixtures/Canonical/Perforation/cylindrical-staggered-32.firmament@@ -7,15 +7,15 @@ Struct CylindricalStaggered32 {}Modify Body {Perforation Vents {- On: OuterWall- Diameter: 6mm- Layout: CylindricalStaggered- Pitch: 17mm- CircumferentialPitch: 23.25mm- MarginTop: 12mm- MarginBottom: 12mm- MinimumLigament: 2mm- StartAngle: 0deg+ on: OuterWall+ diameter: 6mm+ layout: CylindricalStaggered+ pitch: 17mm+ circumferentialPitch: 23.25mm+ marginTop: 12mm+ marginBottom: 12mm+ minimumLigament: 2mm+ startAngle: 0deg}}}diff --git a/fixtures/Canonical/Perforation/flat-hex-panel.firmament b/fixtures/Canonical/Perforation/flat-hex-panel.firmamentindex ef9d956a..822cb93e 100644--- a/fixtures/Canonical/Perforation/flat-hex-panel.firmament+++ b/fixtures/Canonical/Perforation/flat-hex-panel.firmament@@ -1,14 +1,14 @@Model FlatHexPanel {- Units: mm- Box Panel { Size: [90mm, 70mm, 3mm] }+ units: mm+ Box Panel { size: [90mm, 70mm, 3mm] }Modify Panel {Perforation Vent {- On: +Z- Diameter: 6mm- Layout: Hex- Pitch: 9mm- Margin: 8mm- MinimumLigament: 2mm+ on: +Z+ diameter: 6mm+ layout: Hex+ pitch: 9mm+ margin: 8mm+ minimumLigament: 2mm}}}diff --git a/fixtures/Canonical/Pipeline/line-arc-profile.firmament b/fixtures/Canonical/Pipeline/line-arc-profile.firmamentindex 574431c9..d95d8275 100644--- a/fixtures/Canonical/Pipeline/line-arc-profile.firmament+++ b/fixtures/Canonical/Pipeline/line-arc-profile.firmament@@ -1,11 +1,11 @@schema Mechanical-Concept Path Stadium {- Start: Point2(0mm, 0mm)- Heading: 0deg- Line Bottom { Length: 30mm }+Path Stadium {+ start: Point2(0mm, 0mm)+ heading: 0deg+ Line Bottom { length: 30mm }Arc Right { Radius: 8mm; Turn: 180deg }- Line Top { Length: 30mm }+ Line Top { length: 30mm }Arc Left { Radius: 8mm; Turn: 180deg }}@@ -19,4 +19,4 @@ Profile StadiumProfile {}}-Extrude Solid { Profile: StadiumProfile; From: 0mm; To: 5mm }+Extrude Solid { profile: StadiumProfile; from: 0mm; to: 5mm }diff --git a/fixtures/Canonical/Pipeline/manual-profile-parity.firmament b/fixtures/Canonical/Pipeline/manual-profile-parity.firmamentindex b12909b1..7f034c9b 100644--- a/fixtures/Canonical/Pipeline/manual-profile-parity.firmament+++ b/fixtures/Canonical/Pipeline/manual-profile-parity.firmament@@ -1,35 +1,35 @@schema MechanicalModel ProfilePipelineFlagship {- Units: mm+ units: mm- Concept Struct Layout On XY {- Rect2 Stock { Center: [0mm, 0mm]; Size: [40mm, 24mm] }- Rect2 Pad { Center: [-10mm, 0mm]; Size: [10mm, 10mm] }- Rect2 Cutout { Center: [10mm, 0mm]; Size: [8mm, 8mm] }+ Concept Struct Layout on XY {+ Rect2 Stock { center: [0mm, 0mm]; size: [40mm, 24mm] }+ Rect2 Pad { center: [-10mm, 0mm]; size: [10mm, 10mm] }+ Rect2 Cutout { center: [10mm, 0mm]; size: [8mm, 8mm] }}- Profile BaseProfile Using Layout { Loop Outer {- Segment Bottom { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }- Segment Right { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }- Segment Top { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }- Segment Left { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }+ Profile BaseProfile using Layout { Loop Outer {+ Segment Bottom { trace: Stock.Bottom; from: Stock.BottomLeft; to: Stock.BottomRight }+ Segment Right { trace: Stock.Right; from: Stock.BottomRight; to: Stock.TopRight }+ Segment Top { trace: Stock.Top; from: Stock.TopRight; to: Stock.TopLeft }+ Segment Left { trace: Stock.Left; from: Stock.TopLeft; to: Stock.BottomLeft }} }- Profile PadProfile Using Layout { Loop Outer {- Segment Bottom { Trace: Pad.Bottom; From: Pad.BottomLeft; To: Pad.BottomRight }- Segment Right { Trace: Pad.Right; From: Pad.BottomRight; To: Pad.TopRight }- Segment Top { Trace: Pad.Top; From: Pad.TopRight; To: Pad.TopLeft }- Segment Left { Trace: Pad.Left; From: Pad.TopLeft; To: Pad.BottomLeft }+ Profile PadProfile using Layout { Loop Outer {+ Segment Bottom { trace: Pad.Bottom; from: Pad.BottomLeft; to: Pad.BottomRight }+ Segment Right { trace: Pad.Right; from: Pad.BottomRight; to: Pad.TopRight }+ Segment Top { trace: Pad.Top; from: Pad.TopRight; to: Pad.TopLeft }+ Segment Left { trace: Pad.Left; from: Pad.TopLeft; to: Pad.BottomLeft }} }- Profile CutoutProfile Using Layout { Loop Outer {- Segment Bottom { Trace: Cutout.Bottom; From: Cutout.BottomLeft; To: Cutout.BottomRight }- Segment Right { Trace: Cutout.Right; From: Cutout.BottomRight; To: Cutout.TopRight }- Segment Top { Trace: Cutout.Top; From: Cutout.TopRight; To: Cutout.TopLeft }- Segment Left { Trace: Cutout.Left; From: Cutout.TopLeft; To: Cutout.BottomLeft }+ Profile CutoutProfile using Layout { Loop Outer {+ Segment Bottom { trace: Cutout.Bottom; from: Cutout.BottomLeft; to: Cutout.BottomRight }+ Segment Right { trace: Cutout.Right; from: Cutout.BottomRight; to: Cutout.TopRight }+ Segment Top { trace: Cutout.Top; from: Cutout.TopRight; to: Cutout.TopLeft }+ Segment Left { trace: Cutout.Left; from: Cutout.TopLeft; to: Cutout.BottomLeft }} }Struct Part { Compose Body {- Base StockBody { Profile: BaseProfile; From: 0mm; To: 8mm; Role: Stock }+ Base StockBody { profile: BaseProfile; from: 0mm; to: 8mm; role: Stock }Add RaisedPad { Profile: PadProfile; From: 8mm; To: 12mm; Role: Boss }Remove ThroughCutout { Profile: CutoutProfile; From: 0mm; To: 8mm; Role: ThroughCut }} }diff --git a/fixtures/Canonical/Pipeline/open-path.firmament b/fixtures/Canonical/Pipeline/open-path.firmamentindex 5de3c03b..9c22a12f 100644--- a/fixtures/Canonical/Pipeline/open-path.firmament+++ b/fixtures/Canonical/Pipeline/open-path.firmament@@ -1,17 +1,17 @@schema SweepModel PipelineSweep {- Units: mm+ units: mm- Concept Path Source {- Start: Point2(0mm, 0mm)- Heading: 90deg- Line LeftLeg { Length: 25mm }+ Path Source {+ start: Point2(0mm, 0mm)+ heading: 90deg+ Line LeftLeg { length: 25mm }Arc Return { Radius: 6mm; Turn: -180deg }- Line RightLeg { Length: 25mm }+ Line RightLeg { length: 25mm }}- Concept Path Centerline {+ Path Centerline {Source.LeftLeg|> Source.Return|> Source.RightLegdiff --git a/fixtures/Canonical/Pipeline/profile-pipeline-flagship.firmament b/fixtures/Canonical/Pipeline/profile-pipeline-flagship.firmamentindex 546f9e1c..e56776ea 100644--- a/fixtures/Canonical/Pipeline/profile-pipeline-flagship.firmament+++ b/fixtures/Canonical/Pipeline/profile-pipeline-flagship.firmament@@ -1,15 +1,15 @@schema MechanicalModel ProfilePipelineFlagship {- Units: mm+ units: mm- Concept Struct Layout On XY {- Rect2 Stock { Center: [0mm, 0mm]; Size: [40mm, 24mm] }- Rect2 Pad { Center: [-10mm, 0mm]; Size: [10mm, 10mm] }- Rect2 Cutout { Center: [10mm, 0mm]; Size: [8mm, 8mm] }+ Concept Struct Layout on XY {+ Rect2 Stock { center: [0mm, 0mm]; size: [40mm, 24mm] }+ Rect2 Pad { center: [-10mm, 0mm]; size: [10mm, 10mm] }+ Rect2 Cutout { center: [10mm, 0mm]; size: [8mm, 8mm] }}- Profile BaseProfile Using Layout {+ Profile BaseProfile using Layout {Loop Outer {Stock.Bottom|> Stock.Right@@ -19,17 +19,17 @@ Model ProfilePipelineFlagship {}}- Profile PadProfile Using Layout {+ Profile PadProfile using Layout {Loop Outer { Pad.Bottom |> Pad.Right |> Pad.Top |> Pad.Left |> Close }}- Profile CutoutProfile Using Layout {+ Profile CutoutProfile using Layout {Loop Outer { Cutout.Bottom |> Cutout.Right |> Cutout.Top |> Cutout.Left |> Close }}Struct Part {Compose Body {- Base StockBody { Profile: BaseProfile; From: 0mm; To: 8mm; Role: Stock }+ Base StockBody { profile: BaseProfile; from: 0mm; to: 8mm; role: Stock }Add RaisedPad { Profile: PadProfile; From: 8mm; To: 12mm; Role: Boss }Remove ThroughCutout { Profile: CutoutProfile; From: 0mm; To: 8mm; Role: ThroughCut }}diff --git a/fixtures/Canonical/Pipeline/profile-with-inner-loop.firmament b/fixtures/Canonical/Pipeline/profile-with-inner-loop.firmamentindex cad2c87a..4dc8d64e 100644--- a/fixtures/Canonical/Pipeline/profile-with-inner-loop.firmament+++ b/fixtures/Canonical/Pipeline/profile-with-inner-loop.firmament@@ -1,11 +1,11 @@schema Mechanical-Rect2 Stock { Center: [0mm, 0mm]; Size: [40mm, 30mm] }-Rect2 Cutout { Center: [0mm, 0mm]; Size: [16mm, 10mm] }+Rect2 Stock { center: [0mm, 0mm]; size: [40mm, 30mm] }+Rect2 Cutout { center: [0mm, 0mm]; size: [16mm, 10mm] }Profile Plate {Loop Outer { Stock.Bottom |> Stock.Right |> Stock.Top |> Stock.Left |> Close }- Loop Inner { Reverse Cutout.Bottom |> Reverse Cutout.Left |> Reverse Cutout.Top |> Reverse Cutout.Right |> Close }+ Loop Inner { Reverse Cutout.Bottom as InnerBottom |> Reverse Cutout.Left as InnerLeft |> Reverse Cutout.Top as InnerTop |> Reverse Cutout.Right as InnerRight |> Close }}-Extrude Solid { Profile: Plate; From: 0mm; To: 4mm }+Extrude Solid { profile: Plate; from: 0mm; to: 4mm }diff --git a/fixtures/Canonical/Pipeline/rectangle-profile.firmament b/fixtures/Canonical/Pipeline/rectangle-profile.firmamentindex 4dfa701d..e841f358 100644--- a/fixtures/Canonical/Pipeline/rectangle-profile.firmament+++ b/fixtures/Canonical/Pipeline/rectangle-profile.firmament@@ -1,6 +1,6 @@schema Mechanical-Rect2 Stock { Center: [0mm, 0mm]; Size: [40mm, 24mm] }+Rect2 Stock { center: [0mm, 0mm]; size: [40mm, 24mm] }Profile BaseProfile {Loop Outer {@@ -12,4 +12,4 @@ Profile BaseProfile {}}-Extrude Solid { Profile: BaseProfile; From: 0mm; To: 8mm }+Extrude Solid { profile: BaseProfile; from: 0mm; to: 8mm }diff --git a/fixtures/Canonical/Pipeline/traceloop-profile.firmament b/fixtures/Canonical/Pipeline/traceloop-profile.firmamentindex e99a5c92..77fd4745 100644--- a/fixtures/Canonical/Pipeline/traceloop-profile.firmament+++ b/fixtures/Canonical/Pipeline/traceloop-profile.firmament@@ -1,13 +1,13 @@schema Mechanical-Concept Path Outline {- Start: Point2(0mm, 0mm)- Heading: 0deg- Line Bottom { Length: 30mm }- Line Right { Turn: 90deg; Length: 20mm }- Line Top { Turn: 90deg; Length: 30mm }+Path Outline {+ start: Point2(0mm, 0mm)+ heading: 0deg+ Line Bottom { length: 30mm }+ Line Right { Turn: 90deg; length: 20mm }+ Line Top { Turn: 90deg; length: 30mm }Close Left}Profile Plate { Outline |> TraceLoop }-Extrude Solid { Profile: Plate; From: 0mm; To: 5mm }+Extrude Solid { profile: Plate; from: 0mm; to: 5mm }diff --git a/fixtures/Canonical/Piping/autorouted-connection.firmament b/fixtures/Canonical/Piping/autorouted-connection.firmamentindex b19b05a2..5effc16c 100644--- a/fixtures/Canonical/Piping/autorouted-connection.firmament+++ b/fixtures/Canonical/Piping/autorouted-connection.firmament@@ -1,5 +1,5 @@Model AutoRouteWitness {- Units: mm+ units: mmPipingSystem AutoWitness {PipePolicy Pipe25 { OuterDiameter: 25mm; WallThickness: 2mm; Material: "Standard.Materials.StainlessSteel.304_Annealed"; }Port Pump { Position: [0mm,0mm,0mm]; Direction: [1,0,0]; PipePolicy: Pipe25; ConnectionType: Flange; }diff --git a/fixtures/Canonical/Piping/elbow90.firmament b/fixtures/Canonical/Piping/elbow90.firmamentindex 641399a9..d1637f81 100644--- a/fixtures/Canonical/Piping/elbow90.firmament+++ b/fixtures/Canonical/Piping/elbow90.firmament@@ -1,5 +1,5 @@Model Elbow90Witness {- Units: mm+ units: mmPipingSystem ElbowWitness {PipePolicy Pipe25 { OuterDiameter: 25mm; WallThickness: 2mm; Material: "Standard.Materials.StainlessSteel.304_Annealed"; }Port Inlet { Position: [0mm,0mm,0mm]; Direction: [1,0,0]; PipePolicy: Pipe25; ConnectionType: Weld; }diff --git a/fixtures/Canonical/Piping/explicit-route.firmament b/fixtures/Canonical/Piping/explicit-route.firmamentindex 431d0c9d..5577cd0e 100644--- a/fixtures/Canonical/Piping/explicit-route.firmament+++ b/fixtures/Canonical/Piping/explicit-route.firmament@@ -1,5 +1,5 @@Model ExplicitRouteWitness {- Units: mm+ units: mmPipingSystem ExplicitWitness {PipePolicy Pipe25 { OuterDiameter: 25mm; WallThickness: 2mm; Material: "Standard.Materials.StainlessSteel.304_Annealed"; }Port PumpDischarge { Position: [0mm,0mm,100mm]; Direction: [1,0,0]; PipePolicy: Pipe25; ConnectionType: Flange; }diff --git a/fixtures/Canonical/Piping/local-reroute.firmament b/fixtures/Canonical/Piping/local-reroute.firmamentindex 68a4afc0..0b677b68 100644--- a/fixtures/Canonical/Piping/local-reroute.firmament+++ b/fixtures/Canonical/Piping/local-reroute.firmament@@ -1,5 +1,5 @@Model LocalRerouteWitness {- Units: mm+ units: mmPipingSystem LocalWitness {PipePolicy Pipe25 { OuterDiameter: 25mm; WallThickness: 2mm; Material: "Standard.Materials.StainlessSteel.304_Annealed"; }Port Pump { Position: [0mm,0mm,0mm]; Direction: [1,0,0]; PipePolicy: Pipe25; ConnectionType: Flange; }diff --git a/fixtures/Canonical/Piping/pipe-segment.firmament b/fixtures/Canonical/Piping/pipe-segment.firmamentindex d8068ddf..b1458ef5 100644--- a/fixtures/Canonical/Piping/pipe-segment.firmament+++ b/fixtures/Canonical/Piping/pipe-segment.firmament@@ -1,5 +1,5 @@Model PipeSegmentWitness {- Units: mm+ units: mmPipingSystem SegmentWitness {PipePolicy Pipe25 { OuterDiameter: 25mm; WallThickness: 2mm; Material: "Standard.Materials.StainlessSteel.304_Annealed"; }Port Inlet { Position: [0mm,0mm,0mm]; Direction: [1,0,0]; PipePolicy: Pipe25; ConnectionType: Weld; }diff --git a/fixtures/Canonical/Piping/pump-skid.firmament b/fixtures/Canonical/Piping/pump-skid.firmamentindex b2ffb7ea..e37f8288 100644--- a/fixtures/Canonical/Piping/pump-skid.firmament+++ b/fixtures/Canonical/Piping/pump-skid.firmament@@ -1,5 +1,5 @@Model X3PumpCoolingSkid {- Units: mm+ units: mmPipingSystem CoolingSkid {PipePolicy Pipe25 { OuterDiameter: 25mm; WallThickness: 2mm; Material: "Standard.Materials.StainlessSteel.304_Annealed"; }Port PumpDischarge { Position: [100mm,100mm,250mm]; Direction: [1,0,0]; PipePolicy: Pipe25; ConnectionType: Flange; Equipment: Pump; NozzleLength: 50mm; }diff --git a/fixtures/Canonical/Piping/route-around-keepout.firmament b/fixtures/Canonical/Piping/route-around-keepout.firmamentindex a22be8b5..6b9cf45c 100644--- a/fixtures/Canonical/Piping/route-around-keepout.firmament+++ b/fixtures/Canonical/Piping/route-around-keepout.firmament@@ -1,5 +1,5 @@Model RouteAroundKeepOut {- Units: mm+ units: mmPipingSystem KeepOutWitness {PipePolicy Pipe25 { OuterDiameter: 25mm; WallThickness: 2mm; Material: "Standard.Materials.StainlessSteel.304_Annealed"; }Port Pump { Position: [0mm,0mm,0mm]; Direction: [1,0,0]; PipePolicy: Pipe25; ConnectionType: Flange; }diff --git a/fixtures/Canonical/Piping/tee.firmament b/fixtures/Canonical/Piping/tee.firmamentindex 71eaafb9..39419b53 100644--- a/fixtures/Canonical/Piping/tee.firmament+++ b/fixtures/Canonical/Piping/tee.firmament@@ -1,6 +1,6 @@Use Standard.PipingModel StandardTeeWitness {- Units: mm+ units: mmLet TeeProduct = Standard.Piping.TeeLet TeePolicy = Standard.Piping.TeePolicyPipingSystem TeeLibraryWitness {diff --git a/fixtures/Canonical/PlasticShell/plastic-shell-autorib-materialized.firmament b/fixtures/Canonical/PlasticShell/plastic-shell-autorib-materialized.firmamentindex d245a41c..4d1d9510 100644--- a/fixtures/Canonical/PlasticShell/plastic-shell-autorib-materialized.firmament+++ b/fixtures/Canonical/PlasticShell/plastic-shell-autorib-materialized.firmament@@ -1,5 +1,5 @@Model PlasticShellAutoRibMaterialized {- Units: mm+ units: mmPlasticShell Housing {Exterior: Frustum BottomRadius: 50 mm TopRadius: 52 mm Height: 20 mm Material: ABSToolingDirection: [0, 0, 1] MinimumDraftAngle: 3 deg Preserve: [ExteriorDesignSurface]diff --git a/fixtures/Canonical/PlasticShell/plastic-shell-basic.firmament b/fixtures/Canonical/PlasticShell/plastic-shell-basic.firmamentindex 2909eb21..52bda526 100644--- a/fixtures/Canonical/PlasticShell/plastic-shell-basic.firmament+++ b/fixtures/Canonical/PlasticShell/plastic-shell-basic.firmament@@ -1,5 +1,5 @@Model PlasticShellBasic {- Units: mm+ units: mmPlasticShell Cup {Exterior: FrustumBottomRadius: 30 mmdiff --git a/fixtures/Canonical/PlasticShell/plastic-shell-enclosure.firmament b/fixtures/Canonical/PlasticShell/plastic-shell-enclosure.firmamentindex c417be99..7b16029a 100644--- a/fixtures/Canonical/PlasticShell/plastic-shell-enclosure.firmament+++ b/fixtures/Canonical/PlasticShell/plastic-shell-enclosure.firmament@@ -1,5 +1,5 @@Model MoldX0ElectronicsEnclosureHalf {- Units: mm+ units: mmPlasticShell EnclosureHalf {Exterior: FrustumBottomRadius: 55 mmdiff --git a/fixtures/Canonical/PlasticShell/plastic-shell-materialized-enclosure.firmament b/fixtures/Canonical/PlasticShell/plastic-shell-materialized-enclosure.firmamentindex 79dcadf6..36c288e1 100644--- a/fixtures/Canonical/PlasticShell/plastic-shell-materialized-enclosure.firmament+++ b/fixtures/Canonical/PlasticShell/plastic-shell-materialized-enclosure.firmament@@ -1,6 +1,6 @@// X0a flagship alias: the physical result is generated from the same manufacturing intent as MOLD-X0.Model MoldX0aMaterializedEnclosure {- Units: mm+ units: mmPlasticShell EnclosureHalf {Exterior: Frustum BottomRadius: 55 mm TopRadius: 57 mm Height: 20 mm Material: ABSToolingDirection: [0, 0, 1] MinimumDraftAngle: 3 deg Preserve: [ExteriorDesignSurface, MountingInterface]diff --git a/fixtures/Canonical/PlasticShell/plastic-shell-materialized-rib.firmament b/fixtures/Canonical/PlasticShell/plastic-shell-materialized-rib.firmamentindex a325ad46..679d0c33 100644--- a/fixtures/Canonical/PlasticShell/plastic-shell-materialized-rib.firmament+++ b/fixtures/Canonical/PlasticShell/plastic-shell-materialized-rib.firmament@@ -1,5 +1,5 @@Model PlasticShellMaterializedRib {- Units: mm+ units: mmPlasticShell Housing {Exterior: Frustum BottomRadius: 42 mm TopRadius: 44 mm Height: 18 mm Material: ABSToolingDirection: [0, 0, 1] MinimumDraftAngle: 3 deg Preserve: [ExteriorDesignSurface]diff --git a/fixtures/Canonical/PlasticShell/plastic-shell-materialized-standoff.firmament b/fixtures/Canonical/PlasticShell/plastic-shell-materialized-standoff.firmamentindex 76f285c1..ef7fd904 100644--- a/fixtures/Canonical/PlasticShell/plastic-shell-materialized-standoff.firmament+++ b/fixtures/Canonical/PlasticShell/plastic-shell-materialized-standoff.firmament@@ -1,5 +1,5 @@Model PlasticShellMaterializedStandoff {- Units: mm+ units: mmPlasticShell Housing {Exterior: Frustum BottomRadius: 40 mm TopRadius: 42 mm Height: 18 mm Material: ABSToolingDirection: [0, 0, 1] MinimumDraftAngle: 3 deg Preserve: [ExteriorDesignSurface]diff --git a/fixtures/Canonical/PlasticShell/plastic-shell-rib-standoff-junction.firmament b/fixtures/Canonical/PlasticShell/plastic-shell-rib-standoff-junction.firmamentindex 5953ee66..d6ade592 100644--- a/fixtures/Canonical/PlasticShell/plastic-shell-rib-standoff-junction.firmament+++ b/fixtures/Canonical/PlasticShell/plastic-shell-rib-standoff-junction.firmament@@ -1,5 +1,5 @@Model PlasticShellRibStandoffJunction {- Units: mm+ units: mmPlasticShell Housing {Exterior: Frustum BottomRadius: 45 mm TopRadius: 47 mm Height: 18 mm Material: ABSToolingDirection: [0, 0, 1] MinimumDraftAngle: 3 deg Preserve: [ExteriorDesignSurface]diff --git a/fixtures/Canonical/Presentation/ordning-utensil-holder-blended.firmament b/fixtures/Canonical/Presentation/ordning-utensil-holder-blended.firmamentindex 52bcb12c..76971642 100644--- a/fixtures/Canonical/Presentation/ordning-utensil-holder-blended.firmament+++ b/fixtures/Canonical/Presentation/ordning-utensil-holder-blended.firmament@@ -8,15 +8,15 @@ Struct OrdningInspiredBlendedBlank {}Modify Body {Perforation SideVents {- On: OuterWall- Diameter: 9mm- Layout: CylindricalGrid- Pitch: 15mm- CircumferentialPitch: 18mm- MarginTop: 12mm- MarginBottom: 20mm- MinimumLigament: 2mm- StartAngle: 9deg+ on: OuterWall+ diameter: 9mm+ layout: CylindricalGrid+ pitch: 15mm+ circumferentialPitch: 18mm+ marginTop: 12mm+ marginBottom: 20mm+ minimumLigament: 2mm+ startAngle: 9deg}}}diff --git a/fixtures/Canonical/Primitives/cone.firmament b/fixtures/Canonical/Primitives/cone.firmamentindex 1b9d2571..b1c8f44e 100644--- a/fixtures/Canonical/Primitives/cone.firmament+++ b/fixtures/Canonical/Primitives/cone.firmament@@ -1,5 +1,5 @@Model ConeExample {- Units: mm+ units: mmCone Body {BottomRadius: 10mmdiff --git a/fixtures/Canonical/Primitives/frustum.firmament b/fixtures/Canonical/Primitives/frustum.firmamentindex e91faac9..64c05ce4 100644--- a/fixtures/Canonical/Primitives/frustum.firmament+++ b/fixtures/Canonical/Primitives/frustum.firmament@@ -1,5 +1,5 @@Model TaperedBoss {- Units: mm+ units: mmFrustum Base {BottomRadius: 20mmdiff --git a/fixtures/Canonical/Primitives/pointed-cone.firmament b/fixtures/Canonical/Primitives/pointed-cone.firmamentindex 137ef992..6d65ce9b 100644--- a/fixtures/Canonical/Primitives/pointed-cone.firmament+++ b/fixtures/Canonical/Primitives/pointed-cone.firmament@@ -1,5 +1,5 @@Model PointedConeExample {- Units: mm+ units: mmCone Body {BottomRadius: 6mmdiff --git a/fixtures/Canonical/Primitives/rounded-box.firmament b/fixtures/Canonical/Primitives/rounded-box.firmamentindex e5806507..1e39209a 100644--- a/fixtures/Canonical/Primitives/rounded-box.firmament+++ b/fixtures/Canonical/Primitives/rounded-box.firmament@@ -1,5 +1,5 @@Model RoundedEnclosure {- Units: mm+ units: mmRoundedBox Base {Size: [80mm, 50mm, 25mm]diff --git a/fixtures/Canonical/Primitives/sphere.firmament b/fixtures/Canonical/Primitives/sphere.firmamentindex d4cf1d4c..c8c3de96 100644--- a/fixtures/Canonical/Primitives/sphere.firmament+++ b/fixtures/Canonical/Primitives/sphere.firmament@@ -1,5 +1,5 @@Model SphereExample {- Units: mm+ units: mmSphere Body {Radius: 7.5mmdiff --git a/fixtures/Canonical/Primitives/torus.firmament b/fixtures/Canonical/Primitives/torus.firmamentindex c3b1d8f2..f4a1c552 100644--- a/fixtures/Canonical/Primitives/torus.firmament+++ b/fixtures/Canonical/Primitives/torus.firmament@@ -1,5 +1,5 @@Model TorusExample {- Units: mm+ units: mmTorus Body {MajorRadius: 12mmdiff --git a/fixtures/Canonical/Profiles/closed-loop-profile.firmament b/fixtures/Canonical/Profiles/closed-loop-profile.firmamentindex 959aafdd..340f6395 100644--- a/fixtures/Canonical/Profiles/closed-loop-profile.firmament+++ b/fixtures/Canonical/Profiles/closed-loop-profile.firmament@@ -1,13 +1,13 @@Model ConceptPathRectangle {- Units: mm- Concept Path Outline {- Start: Point2(-10mm, -5mm)- Heading: 0deg- Line South { Length: 20mm }- Line East { Turn: 90deg; Length: 10mm }- Line North { Turn: 90deg; Length: 20mm }+ units: mm+ Path Outline {+ start: Point2(-10mm, -5mm)+ heading: 0deg+ Line South { length: 20mm }+ Line East { Turn: 90deg; length: 10mm }+ Line North { Turn: 90deg; length: 20mm }Close West}- Profile Plate From Outline- Struct Body { Extrude Plate { Profile: Plate; From: -2mm; To: 0mm } }+ Profile Plate from Outline+ Struct Body { Extrude Plate { profile: Plate; from: -2mm; to: 0mm } }}diff --git a/fixtures/Canonical/Profiles/concept-path-line-arc-profile.firmament b/fixtures/Canonical/Profiles/concept-path-line-arc-profile.firmamentindex 1b71eaf4..ed4ac390 100644--- a/fixtures/Canonical/Profiles/concept-path-line-arc-profile.firmament+++ b/fixtures/Canonical/Profiles/concept-path-line-arc-profile.firmament@@ -1,14 +1,14 @@Model ConceptPathArc {- Units: mm- Concept Path RoundedCorner {- Start: Point2(0mm, 0mm)- Heading: 0deg- Line Base { Length: 40mm }- Line Rise { Turn: 90deg; Length: 20mm }+ units: mm+ Path RoundedCorner {+ start: Point2(0mm, 0mm)+ heading: 0deg+ Line Base { length: 40mm }+ Line Rise { Turn: 90deg; length: 20mm }Arc OuterFillet { Radius: 10mm; Turn: 90deg }- Line Top { Length: 30mm }+ Line Top { length: 30mm }Close Left}- Profile Plate From RoundedCorner- Struct Body { Extrude Plate { Profile: Plate; From: 0mm; To: 2mm } }+ Profile Plate from RoundedCorner+ Struct Body { Extrude Plate { profile: Plate; from: 0mm; to: 2mm } }}diff --git a/fixtures/Canonical/Profiles/line-arc-profile-extrusion.firmament b/fixtures/Canonical/Profiles/line-arc-profile-extrusion.firmamentindex 0b4ec90f..760bdc45 100644--- a/fixtures/Canonical/Profiles/line-arc-profile-extrusion.firmament+++ b/fixtures/Canonical/Profiles/line-arc-profile-extrusion.firmament@@ -1,19 +1,19 @@Model ProfilePlate {- Units: mm+ units: mm- Concept Struct Layout On XY {- Rect2 Stock { Center: [0mm, 0mm]; Size: [20mm, 10mm] }+ Concept Struct Layout on XY {+ Rect2 Stock { center: [0mm, 0mm]; size: [20mm, 10mm] }}- Profile Plate Using Layout {- Stock.Bottom As South- |> Stock.Right As East- |> Stock.Top As North- |> Stock.Left As West+ Profile Plate using Layout {+ Stock.Bottom as South+ |> Stock.Right as East+ |> Stock.Top as North+ |> Stock.Left as West|> Close}Struct PlateBody {- Extrude Plate { Profile: Plate; From: -2mm; To: 2mm }+ Extrude Plate { profile: Plate; from: -2mm; to: 2mm }}}diff --git a/fixtures/Canonical/Profiles/profile-delta-recess-extrusion.firmament b/fixtures/Canonical/Profiles/profile-delta-recess-extrusion.firmamentindex 46eb8365..01b17fb8 100644--- a/fixtures/Canonical/Profiles/profile-delta-recess-extrusion.firmament+++ b/fixtures/Canonical/Profiles/profile-delta-recess-extrusion.firmament@@ -1,5 +1,5 @@Model ProfileDeltaPlate {- Units: mm+ units: mmEnum RecessKind { Cable Service }Record LocalRecessSpec {@@ -37,10 +37,10 @@ Model ProfileDeltaPlate {Transition LeadOut { Kind: Diagonal; Run: P.Lead; To: Carrier; }}- Concept Struct Layout On XY {- Rect2 PlateBase { Center: [50mm, 20mm]; Size: [100mm, 40mm]; }+ Concept Struct Layout on XY {+ Rect2 PlateBase { center: [50mm, 20mm]; size: [100mm, 40mm]; }}ProfileDelta CableRelief = LocalRecess < P: PlateRecess, Owner: PlateBase.Bottom >- Profile Plate From PlateBase- Struct PlateBody { Extrude Solid { Profile: Plate; From: 0mm; To: 3mm; } }+ Profile Plate from PlateBase+ Struct PlateBody { Extrude Solid { profile: Plate; from: 0mm; to: 3mm; } }}diff --git a/fixtures/Canonical/Profiles/rect2-profile-extrusion.firmament b/fixtures/Canonical/Profiles/rect2-profile-extrusion.firmamentindex 0c7672c6..a20d9a61 100644--- a/fixtures/Canonical/Profiles/rect2-profile-extrusion.firmament+++ b/fixtures/Canonical/Profiles/rect2-profile-extrusion.firmament@@ -1,13 +1,13 @@-Concept Struct Rect2Layout On XY {- Rect2 Base { Center: [0mm, 0mm]; Size: [20mm, 10mm]; Role: ProfileGuide }+Concept Struct Rect2Layout on XY {+ Rect2 Base { center: [0mm, 0mm]; size: [20mm, 10mm]; Role: ProfileGuide }}-Profile MainPlate Using Rect2Layout {+Profile MainPlate using Rect2Layout {Loop Outer {- Base.Bottom As South- |> Base.Right As East- |> Base.Top As North- |> Base.Left As West+ Base.Bottom as South+ |> Base.Right as East+ |> Base.Top as North+ |> Base.Left as West|> Close}}-Struct Plate { Extrude MainPlate { Profile: MainPlate; From: 0mm; To: 5mm } }+Struct Plate { Extrude MainPlate { profile: MainPlate; from: 0mm; to: 5mm } }diff --git a/fixtures/Canonical/Profiles/template-control-arithmetic.firmament b/fixtures/Canonical/Profiles/template-control-arithmetic.firmamentindex e1ddb4c0..25f5d576 100644--- a/fixtures/Canonical/Profiles/template-control-arithmetic.firmament+++ b/fixtures/Canonical/Profiles/template-control-arithmetic.firmament@@ -1,23 +1,23 @@Template<W: Length,H: Length> Profile ControlRectangle {- Point2 A { Position: [-W / 2,-H / 2] }- Point2 B { Position: [W / 2,-H / 2] }- Point2 C { Position: [W / 2,H / 2] }- Point2 D { Position: [-W / 2,H / 2] }- Point2 HandleA { Position: [-W / 6,-H / 2] }- Point2 HandleB { Position: [W / 6,-H / 2] }- CubicBezier2 Bottom { From: A; Control1: HandleA; Control2: HandleB; To: B }- Line2 Right { From: B; To: C }- Line2 Top { From: C; To: D }- Line2 Left { From: D; To: A }+ Point2 A { position: [-W / 2,-H / 2] }+ Point2 B { position: [W / 2,-H / 2] }+ Point2 C { position: [W / 2,H / 2] }+ Point2 D { position: [-W / 2,H / 2] }+ Point2 HandleA { position: [-W / 6,-H / 2] }+ Point2 HandleB { position: [W / 6,-H / 2] }+ CubicBezier2 Bottom { from: A; control1: HandleA; control2: HandleB; to: B }+ Line2 Right { from: B; to: C }+ Line2 Top { from: C; to: D }+ Line2 Left { from: D; to: A }Loop Outer {- Segment Bottom { Trace: Bottom; From: A; To: B }- Segment Right { Trace: Right; From: B; To: C }- Segment Top { Trace: Top; From: C; To: D }- Segment Left { Trace: Left; From: D; To: A }+ Segment Bottom { trace: Bottom; from: A; to: B }+ Segment Right { trace: Right; from: B; to: C }+ Segment Top { trace: Top; from: C; to: D }+ Segment Left { trace: Left; from: D; to: A }}}Model ControlArithmetic {- Units: mm+ units: mmProfile P = ControlRectangle<W:40mm,H:20mm>- Struct Body { Extrude Plate { Profile: P; From: 0mm; To: 2mm } }+ Struct Body { Extrude Plate { profile: P; from: 0mm; to: 2mm } }}diff --git a/fixtures/Canonical/README.md b/fixtures/Canonical/README.mdindex 6874540d..bbc03c74 100644--- a/fixtures/Canonical/README.md+++ b/fixtures/Canonical/README.md@@ -7,10 +7,10 @@ Everything in this directory is current authoring guidance. Examples progress fr| create a box | `Basics/box.firmament` | `Model`, `Units`, named `Box`, `Assert` || create a cylinder | `Basics/cylinder.firmament` | direct `Cylinder` || create analytic primitives | `Primitives/` | `Frustum`, `RoundedBox`, `Sphere`, `Cone`, `Torus` |-| draw a readable local profile | `Profiles/concept-path-line-arc-profile.firmament` | `Concept Path`, line, arc, closed profile, extrusion |+| draw a readable local profile | `Profiles/concept-path-line-arc-profile.firmament` | `Path`, line, arc, closed profile, extrusion || derive a semantic profile variant | `Profiles/profile-delta-recess-extrusion.firmament` | Table, `with`, `Template`, `ProfileDelta`, ordinary extrusion || add a rectangular boss | `Features/Boss/rectangular-boss.firmament` | first-class finite `Boss` |-| sweep a circular profile | `Features/Sweep/circular-planar-path-sweep.firmament` | bounded planar `Concept Path`, line/arc, constant circular `Sweep` |+| sweep a circular profile | `Features/Sweep/circular-planar-path-sweep.firmament` | bounded planar `Path`, line/arc, constant circular `Sweep` || make wire geometry | `Features/Sweep/` | tangent open paths, analytic cylinders/tori, capped solid || author formed wire or rod | `WireForm/` | stock, `StartFrame`, ordered `Straight`/`Bend`, 3D frame transport, derived cut length || add a boss and bore | `Features/Boss/circular-boss-through-hole.firmament` | circular `Boss`, through shaft `Hole` |@@ -36,7 +36,29 @@ Everything in this directory is current authoring guidance. Examples progress fr| route a piping system | `Piping/pump-skid.firmament` | logical Connection, equipment-owned nozzle Interfaces/mates, scoped owner exemption, explicit/accepted Routes, strict foreign KeepOut clearance, fittings, BOM/Cut List || combine machining operations | `Integration/machined-mounting-block.firmament` | Boss, Pocket, holes, counterbores, chamfer, PMI |-`Pocket` never means through-all; use a supported `Hole` or `Slot` for through removal. Bounded two-section [`Loft` and `Loft<Hollow>`](../../docs/public/firmament/loft.md) and WireForm [`Helix`](WireForm/helix.firmament) are admitted; general smooth/rail loft, arbitrary Boolean authoring, and freeform surface features are not in Preview 3; see [`docs/public/reference/supported-features.md`](../../docs/public/reference/supported-features.md).+`Pocket` never means through-all; use a supported `Hole` or `Slot` for through removal. Bounded two-section [`Loft` and `Loft<Hollow>`](../../docs/public/firmament/loft.md), WireForm [`Helix`](WireForm/helix.firmament), and the explicitly bounded freeform replacement examples above are admitted. Check the current [supported-feature boundaries](../../docs/public/reference/supported-features.md) before extending a recipe.++## Current style and qualification levels++Built-in fields use camelCase and linking words use lowercase. `Path` and 2D+shape declarations need no `Concept` prefix. Requirement Concepts and+`Concept Struct` construction layouts keep their distinct roles. Published+Record members, Template arguments, semantic ports and occurrence names preserve+their identities; a style pass does not rename a library API.++Sheet-metal blanks and rectangular openings use named shared `Profile`/`Rect2`+boundaries. The migrated legacy sheet `Slot` cuts remain rectangular; making them+rounded would be an engineering change. Slot2 means an overall-length capsule.++Not every file is a standalone STEP product. `qualification.json` declares the+real owner operation and names a consuming product for reusable modules.+Gear-interface examples qualify inspection, garment examples qualify their+documented validation level, and scenes qualify scene compilation. Four+figure-bound garment sources explicitly expect the missing-external-body+diagnostic; those are recorded as boundaries, not successful products. A module's+consumer must itself pass. Geometry regressions and compatibility witnesses live+outside this cookbook. In particular, SurfaceCoil centerline-only witnesses are+under `Regression/WireFormSurfaceSupport`, pending normal support admission.## Ownershipdiff --git a/fixtures/Canonical/Revolve/arbitrary-axis.firmament b/fixtures/Canonical/Revolve/arbitrary-axis.firmamentindex 5bd38f77..cc9f5262 100644--- a/fixtures/Canonical/Revolve/arbitrary-axis.firmament+++ b/fixtures/Canonical/Revolve/arbitrary-axis.firmament@@ -1,11 +1,11 @@schema MechanicalModel ArbitraryAxisTurn {- Units: mm- Axis Tilted { Origin: [3mm, 4mm, 5mm]; Direction: [1, 1, 0] }- Concept Struct Supports { Datum: Plane { Origin: [3mm,4mm,5mm]; Normal: [1,-1,0]; Up: [0,0,1] } }+ units: mm+ Axis Tilted { origin: [3mm, 4mm, 5mm]; direction: [1, 1, 0] }+ Concept Struct Supports { Datum: Plane { origin: [3mm,4mm,5mm]; normal: [1,-1,0]; up: [0,0,1] } }Construction Plane SectionFrame { Trace: Supports.Datum }- Rect2 Section { Center: [0mm, 15mm]; Size: [20mm, 10mm] }- Profile SectionProfile Using SectionFrame { Loop Outer { Section |> TraceLoop } }+ Rect2 Section { center: [0mm, 15mm]; size: [20mm, 10mm] }+ Profile SectionProfile using SectionFrame { Loop Outer { Section |> TraceLoop } }Revolve TiltedRing { Profile: SectionProfile; About: Tilted; Angle: half }}diff --git a/fixtures/Canonical/Revolve/knob.firmament b/fixtures/Canonical/Revolve/knob.firmamentindex 23c93d0e..e94d2af8 100644--- a/fixtures/Canonical/Revolve/knob.firmament+++ b/fixtures/Canonical/Revolve/knob.firmament@@ -1,8 +1,8 @@schema MechanicalModel TurnedKnob {- Units: mm- Axis MainAxis { Origin: [0mm, 0mm, 0mm]; Direction: [0, 1, 0] }+ units: mm+ Axis MainAxis { origin: [0mm, 0mm, 0mm]; direction: [0, 1, 0] }Static KnobPoints: Set<Point2> {StemBottomInner => Point2(5mm, -18mm)StemBottomOuter => Point2(15mm, -18mm)@@ -13,7 +13,7 @@ Model TurnedKnob {CrownInner => Point2(6mm, 16mm)StemTopInner => Point2(5mm, 10mm)}- Polygon2<Explicit> KnobBoundary { Vertices: KnobPoints }+ Polygon2<Explicit> KnobBoundary { vertices: KnobPoints }Profile KnobSection { Loop Outer { KnobBoundary |> TraceLoop } }Revolve Knob { Profile: KnobSection; About: MainAxis; Angle: full }}diff --git a/fixtures/Canonical/Revolve/partial-quarter.firmament b/fixtures/Canonical/Revolve/partial-quarter.firmamentindex 017ae5e9..2240a6e3 100644--- a/fixtures/Canonical/Revolve/partial-quarter.firmament+++ b/fixtures/Canonical/Revolve/partial-quarter.firmament@@ -1,9 +1,9 @@schema MechanicalModel QuarterSector {- Units: mm- Axis MainAxis { Origin: [0mm, 0mm, 0mm]; Direction: [0, 1, 0] }- Rect2 Section { Center: [15mm, 0mm]; Size: [10mm, 20mm] }+ units: mm+ Axis MainAxis { origin: [0mm, 0mm, 0mm]; direction: [0, 1, 0] }+ Rect2 Section { center: [15mm, 0mm]; size: [10mm, 20mm] }Profile RingSection { Loop Outer { Section |> TraceLoop } }Revolve Sector { Profile: RingSection; About: MainAxis; Angle: quarter }}diff --git a/fixtures/Canonical/Revolve/sphere.firmament b/fixtures/Canonical/Revolve/sphere.firmamentindex 6a11e6d2..205b6363 100644--- a/fixtures/Canonical/Revolve/sphere.firmament+++ b/fixtures/Canonical/Revolve/sphere.firmament@@ -1,16 +1,16 @@schema MechanicalModel RevolvedSphere {- Units: mm- Axis MainAxis { Origin: [0mm, 0mm, 0mm]; Direction: [0, 1, 0] }- Point2 South { Position: [0mm, -20mm] }- Point2 North { Position: [0mm, 20mm] }- Point2 Center { Position: [0mm, 0mm] }- Concept Circle2 Meridian { Center: Center; Radius: 20mm }- Line2 Diameter { From: North; To: South }+ units: mm+ Axis MainAxis { origin: [0mm, 0mm, 0mm]; direction: [0, 1, 0] }+ Point2 South { position: [0mm, -20mm] }+ Point2 North { position: [0mm, 20mm] }+ Point2 Center { position: [0mm, 0mm] }+ Circle2 Meridian { center: Center; radius: 20mm }+ Line2 Diameter { from: North; to: South }Profile SphereSection { Loop Outer {- Meridian From South To North As Arc- |> Diameter As AxisClosure+ Meridian from South to North as Arc+ |> Diameter as AxisClosure|> Close} }Revolve Ball { Profile: SphereSection; About: MainAxis; Angle: full }diff --git a/fixtures/Canonical/Revolve/stepped-shaft.firmament b/fixtures/Canonical/Revolve/stepped-shaft.firmamentindex ccf83d64..c85005b0 100644--- a/fixtures/Canonical/Revolve/stepped-shaft.firmament+++ b/fixtures/Canonical/Revolve/stepped-shaft.firmament@@ -1,8 +1,8 @@schema MechanicalModel SteppedShaft {- Units: mm- Axis MainAxis { Origin: [0mm, 0mm, 0mm]; Direction: [0, 1, 0] }+ units: mm+ Axis MainAxis { origin: [0mm, 0mm, 0mm]; direction: [0, 1, 0] }Static SectionPoints: Set<Point2> {InnerBottom => Point2(5mm, -30mm)OuterBottom => Point2(15mm, -30mm)@@ -13,7 +13,7 @@ Model SteppedShaft {OuterTop => Point2(12mm, 30mm)InnerTop => Point2(5mm, 30mm)}- Polygon2<Explicit> ShaftBoundary { Vertices: SectionPoints }+ Polygon2<Explicit> ShaftBoundary { vertices: SectionPoints }Profile ShaftSection { Loop Outer { ShaftBoundary |> TraceLoop } }Revolve Shaft { Profile: ShaftSection; About: MainAxis; Angle: full }}diff --git a/fixtures/Canonical/Scene/FactoryX0/kit.firmament b/fixtures/Canonical/Scene/FactoryX0/kit.firmamentindex c317c542..c26a449f 100644--- a/fixtures/Canonical/Scene/FactoryX0/kit.firmament+++ b/fixtures/Canonical/Scene/FactoryX0/kit.firmament@@ -19,14 +19,14 @@ Template<L: Length, W: Length, H: Length> Struct Bin {Profile rim {Loop Outer { outer |> TraceLoop }Loop Inner {- Reverse inner.Bottom As InnerBottom- |> Reverse inner.BottomLeftCorner As InnerBottomLeftCorner- |> Reverse inner.Left As InnerLeft- |> Reverse inner.TopLeftCorner As InnerTopLeftCorner- |> Reverse inner.Top As InnerTop- |> Reverse inner.TopRightCorner As InnerTopRightCorner- |> Reverse inner.Right As InnerRight- |> Reverse inner.BottomRightCorner As InnerBottomRightCorner+ Reverse inner.Bottom as InnerBottom+ |> Reverse inner.BottomLeftCorner as InnerBottomLeftCorner+ |> Reverse inner.Left as InnerLeft+ |> Reverse inner.TopLeftCorner as InnerTopLeftCorner+ |> Reverse inner.Top as InnerTop+ |> Reverse inner.TopRightCorner as InnerTopRightCorner+ |> Reverse inner.Right as InnerRight+ |> Reverse inner.BottomRightCorner as InnerBottomRightCorner|> Close}}diff --git a/fixtures/Canonical/Schema/wireform-u-wire.firmament b/fixtures/Canonical/Schema/wireform-u-wire.firmamentindex 0eac7bd6..323f2cf6 100644--- a/fixtures/Canonical/Schema/wireform-u-wire.firmament+++ b/fixtures/Canonical/Schema/wireform-u-wire.firmament@@ -1,7 +1,7 @@schema WireFormModel StandardUWire {- Units: mm+ units: mmWireForm UWire {Diameter: 1mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/Sculpting/sculpt-base-housing.firmament b/fixtures/Canonical/Sculpting/sculpt-base-housing.firmamentindex 9093013e..e8c698cb 100644--- a/fixtures/Canonical/Sculpting/sculpt-base-housing.firmament+++ b/fixtures/Canonical/Sculpting/sculpt-base-housing.firmament@@ -1,15 +1,15 @@Model BaseHousing {- Units: mm+ units: mmBodyState Base {Size: [100mm, 80mm, 20mm]- Hole H1 { Center: [-20mm, -12mm]- Diameter: 4mm }- Hole H2 { Center: [20mm, -12mm]- Diameter: 4mm }- Hole H3 { Center: [20mm, 12mm]- Diameter: 4mm }- Hole H4 { Center: [-20mm, 12mm]- Diameter: 4mm }+ Hole H1 { center: [-20mm, -12mm]+ diameter: 4mm }+ Hole H2 { center: [20mm, -12mm]+ diameter: 4mm }+ Hole H3 { center: [20mm, 12mm]+ diameter: 4mm }+ Hole H4 { center: [-20mm, 12mm]+ diameter: 4mm }}SculptState CrownRaised {Input: Basediff --git a/fixtures/Canonical/Sculpting/sculpt-branch-variants.firmament b/fixtures/Canonical/Sculpting/sculpt-branch-variants.firmamentindex b2abf76e..e8bc8646 100644--- a/fixtures/Canonical/Sculpting/sculpt-branch-variants.firmament+++ b/fixtures/Canonical/Sculpting/sculpt-branch-variants.firmament@@ -1,16 +1,16 @@Model SculptBranchVariants {- Units: mm+ units: mmBodyState Base {Size: [100mm, 80mm, 20mm]- Hole H1 { Center: [-20mm, -12mm]- Diameter: 4mm }- Hole H2 { Center: [20mm, -12mm]- Diameter: 4mm }- Hole H3 { Center: [20mm, 12mm]- Diameter: 4mm }- Hole H4 { Center: [-20mm, 12mm]- Diameter: 4mm }+ Hole H1 { center: [-20mm, -12mm]+ diameter: 4mm }+ Hole H2 { center: [20mm, -12mm]+ diameter: 4mm }+ Hole H3 { center: [20mm, 12mm]+ diameter: 4mm }+ Hole H4 { center: [-20mm, 12mm]+ diameter: 4mm }}SculptState CrownRaised {diff --git a/fixtures/Canonical/Sculpting/sculpt-offset-region.firmament b/fixtures/Canonical/Sculpting/sculpt-offset-region.firmamentindex f886abfb..f5fe56b7 100644--- a/fixtures/Canonical/Sculpting/sculpt-offset-region.firmament+++ b/fixtures/Canonical/Sculpting/sculpt-offset-region.firmament@@ -1,16 +1,16 @@Model SculptedHousing {- Units: mm+ units: mmBodyState Base {Size: [100mm, 80mm, 20mm]- Hole H1 { Center: [-20mm, -12mm]- Diameter: 4mm }- Hole H2 { Center: [20mm, -12mm]- Diameter: 4mm }- Hole H3 { Center: [20mm, 12mm]- Diameter: 4mm }- Hole H4 { Center: [-20mm, 12mm]- Diameter: 4mm }+ Hole H1 { center: [-20mm, -12mm]+ diameter: 4mm }+ Hole H2 { center: [20mm, -12mm]+ diameter: 4mm }+ Hole H3 { center: [20mm, 12mm]+ diameter: 4mm }+ Hole H4 { center: [-20mm, 12mm]+ diameter: 4mm }}SculptState CrownRaised {diff --git a/fixtures/Canonical/Sculpting/sculpt-preserve-interface.firmament b/fixtures/Canonical/Sculpting/sculpt-preserve-interface.firmamentindex 1fa2b24f..cddc49a7 100644--- a/fixtures/Canonical/Sculpting/sculpt-preserve-interface.firmament+++ b/fixtures/Canonical/Sculpting/sculpt-preserve-interface.firmament@@ -1,16 +1,16 @@Model SculptPreserveInterface {- Units: mm+ units: mmBodyState Base {Size: [100mm, 80mm, 20mm]- Hole H1 { Center: [-20mm, -12mm]- Diameter: 4mm }- Hole H2 { Center: [20mm, -12mm]- Diameter: 4mm }- Hole H3 { Center: [20mm, 12mm]- Diameter: 4mm }- Hole H4 { Center: [-20mm, 12mm]- Diameter: 4mm }+ Hole H1 { center: [-20mm, -12mm]+ diameter: 4mm }+ Hole H2 { center: [20mm, -12mm]+ diameter: 4mm }+ Hole H3 { center: [20mm, 12mm]+ diameter: 4mm }+ Hole H4 { center: [-20mm, 12mm]+ diameter: 4mm }}SculptState CrownRaised {diff --git a/fixtures/Canonical/Sculpting/sculpted-housing.firmament b/fixtures/Canonical/Sculpting/sculpted-housing.firmamentindex 3c13cbda..b3e69f66 100644--- a/fixtures/Canonical/Sculpting/sculpted-housing.firmament+++ b/fixtures/Canonical/Sculpting/sculpted-housing.firmament@@ -1,16 +1,16 @@Model ControllerCover {- Units: mm+ units: mmBodyState Base {Size: [100mm, 80mm, 20mm]- Hole H1 { Center: [-20mm, -12mm]- Diameter: 4mm }- Hole H2 { Center: [20mm, -12mm]- Diameter: 4mm }- Hole H3 { Center: [20mm, 12mm]- Diameter: 4mm }- Hole H4 { Center: [-20mm, 12mm]- Diameter: 4mm }+ Hole H1 { center: [-20mm, -12mm]+ diameter: 4mm }+ Hole H2 { center: [20mm, -12mm]+ diameter: 4mm }+ Hole H3 { center: [20mm, 12mm]+ diameter: 4mm }+ Hole H4 { center: [-20mm, 12mm]+ diameter: 4mm }}SculptState CrownRaised {diff --git a/fixtures/Canonical/Sculpting/surf-x1-freeform-housing.firmament b/fixtures/Canonical/Sculpting/surf-x1-freeform-housing.firmamentindex f4df54d1..aa998d37 100644--- a/fixtures/Canonical/Sculpting/surf-x1-freeform-housing.firmament+++ b/fixtures/Canonical/Sculpting/surf-x1-freeform-housing.firmament@@ -1,5 +1,5 @@Model FreeformControllerCover {- Units: mm+ units: mmSurfacePatch CrownPatch {Degree: [3, 3]@@ -24,14 +24,14 @@ Model FreeformControllerCover {BodyState Base {Size: [100mm, 80mm, 20mm]- Hole H1 { Center: [-38mm, -28mm]- Diameter: 4mm }- Hole H2 { Center: [38mm, -28mm]- Diameter: 4mm }- Hole H3 { Center: [38mm, 28mm]- Diameter: 4mm }- Hole H4 { Center: [-38mm, 28mm]- Diameter: 4mm }+ Hole H1 { center: [-38mm, -28mm]+ diameter: 4mm }+ Hole H2 { center: [38mm, -28mm]+ diameter: 4mm }+ Hole H3 { center: [38mm, 28mm]+ diameter: 4mm }+ Hole H4 { center: [-38mm, 28mm]+ diameter: 4mm }}SculptState FreeformCrown {diff --git a/fixtures/Canonical/Sculpting/surf-x1a-trimmed-freeform-housing.firmament b/fixtures/Canonical/Sculpting/surf-x1a-trimmed-freeform-housing.firmamentindex c1f04ecb..e6607586 100644--- a/fixtures/Canonical/Sculpting/surf-x1a-trimmed-freeform-housing.firmament+++ b/fixtures/Canonical/Sculpting/surf-x1a-trimmed-freeform-housing.firmament@@ -1,5 +1,5 @@Model TrimmedFreeformControllerCover {- Units: mm+ units: mmSurfacePatch CrownPatchX1a {Degree: [3, 3]@@ -28,14 +28,14 @@ Model TrimmedFreeformControllerCover {BodyState Base {Size: [100mm, 80mm, 20mm]- Hole H1 { Center: [-47mm, -32mm]- Diameter: 4mm }- Hole H2 { Center: [47mm, -32mm]- Diameter: 4mm }- Hole H3 { Center: [47mm, -26mm]- Diameter: 4mm }- Hole H4 { Center: [-47mm, -26mm]- Diameter: 4mm }+ Hole H1 { center: [-47mm, -32mm]+ diameter: 4mm }+ Hole H2 { center: [47mm, -32mm]+ diameter: 4mm }+ Hole H3 { center: [47mm, -26mm]+ diameter: 4mm }+ Hole H4 { center: [-47mm, -26mm]+ diameter: 4mm }}SculptState TrimmedCrown {diff --git a/fixtures/Canonical/Sculpting/surf-x2-g1-blend.firmament b/fixtures/Canonical/Sculpting/surf-x2-g1-blend.firmamentindex 4ab217f0..da185ced 100644--- a/fixtures/Canonical/Sculpting/surf-x2-g1-blend.firmament+++ b/fixtures/Canonical/Sculpting/surf-x2-g1-blend.firmament@@ -1,9 +1,9 @@Model QualifiedG1Blend {- Units: mm+ units: mmBodyState Base {Size: [100mm, 80mm, 20mm]- Hole H1 { Center: [-47mm, -32mm]- Diameter: 4mm }+ Hole H1 { center: [-47mm, -32mm]+ diameter: 4mm }}SculptState G1Crown {Input: Basediff --git a/fixtures/Canonical/Sculpting/surf-x2-judged-housing.firmament b/fixtures/Canonical/Sculpting/surf-x2-judged-housing.firmamentindex afacf8b2..7a88354f 100644--- a/fixtures/Canonical/Sculpting/surf-x2-judged-housing.firmament+++ b/fixtures/Canonical/Sculpting/surf-x2-judged-housing.firmament@@ -1,16 +1,16 @@Model JudgedBlendHousing {- Units: mm+ units: mmBodyState Base {Size: [100mm, 80mm, 20mm]- Hole H1 { Center: [-47mm, -32mm]- Diameter: 4mm }- Hole H2 { Center: [47mm, -32mm]- Diameter: 4mm }- Hole H3 { Center: [47mm, 32mm]- Diameter: 4mm }- Hole H4 { Center: [-47mm, 32mm]- Diameter: 4mm }+ Hole H1 { center: [-47mm, -32mm]+ diameter: 4mm }+ Hole H2 { center: [47mm, -32mm]+ diameter: 4mm }+ Hole H3 { center: [47mm, 32mm]+ diameter: 4mm }+ Hole H4 { center: [-47mm, 32mm]+ diameter: 4mm }}SculptState JudgedCrown {diff --git a/fixtures/Canonical/Sculpting/surf-x2-manual-candidate.firmament b/fixtures/Canonical/Sculpting/surf-x2-manual-candidate.firmamentindex 332286bc..c7e90148 100644--- a/fixtures/Canonical/Sculpting/surf-x2-manual-candidate.firmament+++ b/fixtures/Canonical/Sculpting/surf-x2-manual-candidate.firmament@@ -1,9 +1,9 @@Model ManualEligibleBlendCandidate {- Units: mm+ units: mmBodyState Base {Size: [100mm, 80mm, 20mm]- Hole H1 { Center: [-47mm, -32mm]- Diameter: 4mm }+ Hole H1 { center: [-47mm, -32mm]+ diameter: 4mm }}SculptState ManualCrown {Input: Basediff --git a/fixtures/Canonical/SectionChain/eight-section-ergonomic.firmament b/fixtures/Canonical/SectionChain/eight-section-ergonomic.firmamentindex 4a024840..995fc362 100644--- a/fixtures/Canonical/SectionChain/eight-section-ergonomic.firmament+++ b/fixtures/Canonical/SectionChain/eight-section-ergonomic.firmament@@ -1,5 +1,5 @@Model EightSectionErgonomic {- Units: mm+ units: mmConcept Struct Stations {D0: Plane { Origin: [0mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }D1: Plane { Origin: [12mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }@@ -18,41 +18,41 @@ Model EightSectionErgonomic {Construction Plane F5 { Trace: Stations.D5 }Construction Plane F6 { Trace: Stations.D6 }Construction Plane F7 { Trace: Stations.D7 }- Concept Path Small { Start: Point2(-4mm,-3mm) Heading: 0deg Line Bottom { Length: 8mm } Line Right { Turn: 90deg; Length: 6mm } Line Top { Turn: 90deg; Length: 8mm } Close Left }- Concept Path Medium { Start: Point2(-10mm,-7mm) Heading: 0deg Line Bottom { Length: 20mm } Line Right { Turn: 90deg; Length: 14mm } Line Top { Turn: 90deg; Length: 20mm } Close Left }- Concept Path Large { Start: Point2(-14mm,-10mm) Heading: 0deg Line Bottom { Length: 28mm } Line Right { Turn: 90deg; Length: 20mm } Line Top { Turn: 90deg; Length: 28mm } Close Left }- Concept Path Peak { Start: Point2(-16mm,-11mm) Heading: 0deg Line Bottom { Length: 32mm } Line Right { Turn: 90deg; Length: 22mm } Line Top { Turn: 90deg; Length: 32mm } Close Left }- Profile PSmall From Small- Profile PMedium From Medium- Profile PLarge From Large- Profile PPeak From Peak+ Path Small { start: Point2(-4mm,-3mm) heading: 0deg Line Bottom { length: 8mm } Line Right { Turn: 90deg; length: 6mm } Line Top { Turn: 90deg; length: 8mm } Close Left }+ Path Medium { start: Point2(-10mm,-7mm) heading: 0deg Line Bottom { length: 20mm } Line Right { Turn: 90deg; length: 14mm } Line Top { Turn: 90deg; length: 20mm } Close Left }+ Path Large { start: Point2(-14mm,-10mm) heading: 0deg Line Bottom { length: 28mm } Line Right { Turn: 90deg; length: 20mm } Line Top { Turn: 90deg; length: 28mm } Close Left }+ Path Peak { start: Point2(-16mm,-11mm) heading: 0deg Line Bottom { length: 32mm } Line Right { Turn: 90deg; length: 22mm } Line Top { Turn: 90deg; length: 32mm } Close Left }+ Profile PSmall from Small+ Profile PMedium from Medium+ Profile PLarge from Large+ Profile PPeak from PeakSectionChain EightSectionErgonomic {Transition: Ruled- Section Nose { Frame: F0- Profile: PSmall- Seam: Bottom }- Section Front { Frame: F1- Profile: PMedium- Seam: Bottom }- Section PalmFront { Frame: F2- Profile: PLarge- Seam: Bottom }- Section Rise { Frame: F3- Profile: PPeak- Seam: Bottom }- Section Peak { Frame: F4- Profile: PPeak- Seam: Bottom }- Section PalmRear { Frame: F5- Profile: PLarge- Seam: Bottom }- Section Rear { Frame: F6- Profile: PMedium- Seam: Bottom }- Section Tail { Frame: F7- Profile: PSmall- Seam: Bottom }- Start: Cap- End: Cap+ Section Nose { frame: F0+ profile: PSmall+ seam: Bottom }+ Section Front { frame: F1+ profile: PMedium+ seam: Bottom }+ Section PalmFront { frame: F2+ profile: PLarge+ seam: Bottom }+ Section Rise { frame: F3+ profile: PPeak+ seam: Bottom }+ Section Peak { frame: F4+ profile: PPeak+ seam: Bottom }+ Section PalmRear { frame: F5+ profile: PLarge+ seam: Bottom }+ Section Rear { frame: F6+ profile: PMedium+ seam: Bottom }+ Section Tail { frame: F7+ profile: PSmall+ seam: Bottom }+ start: Cap+ end: Cap}}diff --git a/fixtures/Canonical/SectionChain/explicit-sketch-ruled.firmament b/fixtures/Canonical/SectionChain/explicit-sketch-ruled.firmamentindex d24da76a..3da94ef4 100644--- a/fixtures/Canonical/SectionChain/explicit-sketch-ruled.firmament+++ b/fixtures/Canonical/SectionChain/explicit-sketch-ruled.firmament@@ -1,65 +1,65 @@Model ExplicitSketchRuled {- Units: mm+ units: mmConcept Struct Frames {- Near: Plane { Origin: [0mm, 0mm, 0mm]; Normal: [0, 0, 1]; Up: [0, 1, 0] }- Far: Plane { Origin: [4mm, 0mm, 12mm]; Normal: [0.2, 0, 0.9797958971132712]; Up: [0, 1, 0] }+ Near: Plane { origin: [0mm, 0mm, 0mm]; normal: [0, 0, 1]; up: [0, 1, 0] }+ Far: Plane { origin: [4mm, 0mm, 12mm]; normal: [0.2, 0, 0.9797958971132712]; up: [0, 1, 0] }}Construction Plane NearFrame { Trace: Frames.Near }Construction Plane FarFrame { Trace: Frames.Far }- Concept Struct NearSketch On XY {- Point2 A { Position: [-2mm, -2mm] }- Point2 B { Position: [2mm, -2mm] }- Point2 C { Position: [2mm, 2mm] }- Point2 D { Position: [-2mm, 2mm] }- Line2 South { From: A; To: B }- Line2 East { From: B; To: C }- Line2 North { From: C; To: D }- Line2 West { From: D; To: A }+ Concept Struct NearSketch on XY {+ Point2 A { position: [-2mm, -2mm] }+ Point2 B { position: [2mm, -2mm] }+ Point2 C { position: [2mm, 2mm] }+ Point2 D { position: [-2mm, 2mm] }+ Line2 South { from: A; to: B }+ Line2 East { from: B; to: C }+ Line2 North { from: C; to: D }+ Line2 West { from: D; to: A }}- Profile NearProfile Using NearSketch {+ Profile NearProfile using NearSketch {Loop Outer {- Segment South { Trace: South; From: A; To: B }- Segment East { Trace: East; From: B; To: C }- Segment North { Trace: North; From: C; To: D }- Segment West { Trace: West; From: D; To: A }+ Segment South { trace: South; from: A; to: B }+ Segment East { trace: East; from: B; to: C }+ Segment North { trace: North; from: C; to: D }+ Segment West { trace: West; from: D; to: A }}}- Concept Struct FarSketch On XY {- Point2 A { Position: [-5mm, -5mm] }- Point2 B { Position: [5mm, -5mm] }- Point2 C { Position: [5mm, 5mm] }- Point2 D { Position: [-5mm, 5mm] }- Line2 South { From: A; To: B }- Line2 East { From: B; To: C }- Line2 North { From: C; To: D }- Line2 West { From: D; To: A }+ Concept Struct FarSketch on XY {+ Point2 A { position: [-5mm, -5mm] }+ Point2 B { position: [5mm, -5mm] }+ Point2 C { position: [5mm, 5mm] }+ Point2 D { position: [-5mm, 5mm] }+ Line2 South { from: A; to: B }+ Line2 East { from: B; to: C }+ Line2 North { from: C; to: D }+ Line2 West { from: D; to: A }}- Profile FarProfile Using FarSketch {+ Profile FarProfile using FarSketch {Loop Outer {- Segment South { Trace: South; From: A; To: B }- Segment East { Trace: East; From: B; To: C }- Segment North { Trace: North; From: C; To: D }- Segment West { Trace: West; From: D; To: A }+ Segment South { trace: South; from: A; to: B }+ Segment East { trace: East; from: B; to: C }+ Segment North { trace: North; from: C; to: D }+ Segment West { trace: West; from: D; to: A }}}SectionChain Transition {- Continuity: G0+ continuity: G0Transition: RuledSection Near {- Frame: NearFrame- Profile: NearProfile- Seam: South+ frame: NearFrame+ profile: NearProfile+ seam: South}Section Far {- Frame: FarFrame- Profile: FarProfile- Seam: South+ frame: FarFrame+ profile: FarProfile+ seam: South}- Start: Cap- End: Cap+ start: Cap+ end: Cap}}diff --git a/fixtures/Canonical/SectionChain/g0-explicit-ruled.firmament b/fixtures/Canonical/SectionChain/g0-explicit-ruled.firmamentindex 7dc73f4c..9f162dd1 100644--- a/fixtures/Canonical/SectionChain/g0-explicit-ruled.firmament+++ b/fixtures/Canonical/SectionChain/g0-explicit-ruled.firmament@@ -1,27 +1,27 @@Model G0ExplicitRuled {- Units: mm+ units: mmConcept Struct Stations {D0: Plane { Origin: [0mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }D1: Plane { Origin: [20mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }}Construction Plane F0 { Trace: Stations.D0 }Construction Plane F1 { Trace: Stations.D1 }- Concept Path Box { Start: Point2(-4mm,-3mm) Heading: 0deg Line Bottom { Length: 8mm } Line Right { Turn: 90deg; Length: 6mm } Line Top { Turn: 90deg; Length: 8mm } Close Left }- Profile PBox From Box+ Path Box { start: Point2(-4mm,-3mm) heading: 0deg Line Bottom { length: 8mm } Line Right { Turn: 90deg; length: 6mm } Line Top { Turn: 90deg; length: 8mm } Close Left }+ Profile PBox from BoxSectionChain G0ExplicitRuled {- Continuity: G0+ continuity: G0Transition: RuledSection A {- Frame: F0- Profile: PBox- Seam: Bottom+ frame: F0+ profile: PBox+ seam: Bottom}Section B {- Frame: F1- Profile: PBox- Seam: Bottom+ frame: F1+ profile: PBox+ seam: Bottom}- Start: Cap- End: Cap+ start: Cap+ end: Cap}}diff --git a/fixtures/Canonical/SectionChain/g1-two-transition.firmament b/fixtures/Canonical/SectionChain/g1-two-transition.firmamentindex 8ca8dbac..db6db56a 100644--- a/fixtures/Canonical/SectionChain/g1-two-transition.firmament+++ b/fixtures/Canonical/SectionChain/g1-two-transition.firmament@@ -1,5 +1,5 @@Model G1TwoTransition {- Units: mm+ units: mmConcept Struct Stations {D0: Plane { Origin: [0mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }D1: Plane { Origin: [20mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }@@ -8,28 +8,28 @@ Model G1TwoTransition {Construction Plane F0 { Trace: Stations.D0 }Construction Plane F1 { Trace: Stations.D1 }Construction Plane F2 { Trace: Stations.D2 }- Concept Path Small { Start: Point2(-4mm,-3mm) Heading: 0deg Line Bottom { Length: 8mm } Line Right { Turn: 90deg; Length: 6mm } Line Top { Turn: 90deg; Length: 8mm } Close Left }- Concept Path Large { Start: Point2(-10mm,-7mm) Heading: 0deg Line Bottom { Length: 20mm } Line Right { Turn: 90deg; Length: 14mm } Line Top { Turn: 90deg; Length: 20mm } Close Left }- Profile PSmall From Small- Profile PLarge From Large+ Path Small { start: Point2(-4mm,-3mm) heading: 0deg Line Bottom { length: 8mm } Line Right { Turn: 90deg; length: 6mm } Line Top { Turn: 90deg; length: 8mm } Close Left }+ Path Large { start: Point2(-10mm,-7mm) heading: 0deg Line Bottom { length: 20mm } Line Right { Turn: 90deg; length: 14mm } Line Top { Turn: 90deg; length: 20mm } Close Left }+ Profile PSmall from Small+ Profile PLarge from LargeSectionChain G1TwoTransition {- Continuity: G1+ continuity: G1Section A {- Frame: F0- Profile: PSmall- Seam: Bottom+ frame: F0+ profile: PSmall+ seam: Bottom}Section B {- Frame: F1- Profile: PLarge- Seam: Bottom+ frame: F1+ profile: PLarge+ seam: Bottom}Section C {- Frame: F2- Profile: PSmall- Seam: Bottom+ frame: F2+ profile: PSmall+ seam: Bottom}- Start: Cap- End: Cap+ start: Cap+ end: Cap}}diff --git a/fixtures/Canonical/SectionChain/hollow-loft-twist.firmament b/fixtures/Canonical/SectionChain/hollow-loft-twist.firmamentindex e5e590e7..fba84545 100644--- a/fixtures/Canonical/SectionChain/hollow-loft-twist.firmament+++ b/fixtures/Canonical/SectionChain/hollow-loft-twist.firmament@@ -1,27 +1,27 @@schema SectionChainModel TwistedRuledShell {- Units: mm+ units: mmConcept Struct Stations {Lower: Plane { Origin: [0mm, 0mm, 0mm]; Normal: [0, 0, 1]; Up: [0, 1, 0] }Upper: Plane { Origin: [0mm, 0mm, 50mm]; Normal: [0, 0, 1]; Up: [0, 1, 0] }}Construction Plane LowerFrame { Trace: Stations.Lower }Construction Plane UpperFrame { Trace: Stations.Upper }- Circle2 LowerCircle { Center: [0mm, 0mm] Radius: 25mm }- Circle2 UpperCircle { Center: [0mm, 0mm] Radius: 25mm }+ Circle2 LowerCircle { center: [0mm, 0mm] radius: 25mm }+ Circle2 UpperCircle { center: [0mm, 0mm] radius: 25mm }Profile LowerOutline { Loop Outer { LowerCircle |> TraceLoop } }Profile UpperOutline { Loop Outer { UpperCircle |> TraceLoop } }Loft<Hollow> Hyperboloid {- RearProfile: LowerOutline- RearFrame: LowerFrame- FrontProfile: UpperOutline- FrontFrame: UpperFrame+ rearProfile: LowerOutline+ rearFrame: LowerFrame+ frontProfile: UpperOutline+ frontFrame: UpperFrameThickness: 1mm- Rule: Ruled- Correspondence: CommonRay- Reference: [1, 0, 0]- Twist: 63deg+ rule: Ruled+ correspondence: CommonRay+ reference: [1, 0, 0]+ twist: 63degSeamGap: 0.1deg}}diff --git a/fixtures/Canonical/SectionChain/normalized-rounded-sections.firmament b/fixtures/Canonical/SectionChain/normalized-rounded-sections.firmamentindex 7aad4034..4245c685 100644--- a/fixtures/Canonical/SectionChain/normalized-rounded-sections.firmament+++ b/fixtures/Canonical/SectionChain/normalized-rounded-sections.firmament@@ -1,34 +1,34 @@Model NormalizedRoundedSections {- Units: mm+ units: mmConcept Struct Frames {- A: Plane { Origin: [0mm,0mm,0mm] Normal: [0,0,1] Up: [0,1,0] }- B: Plane { Origin: [0mm,0mm,8mm] Normal: [0,0,1] Up: [0,1,0] }- C: Plane { Origin: [0mm,0mm,16mm] Normal: [0,0,1] Up: [0,1,0] }+ A: Plane { origin: [0mm,0mm,0mm] normal: [0,0,1] up: [0,1,0] }+ B: Plane { origin: [0mm,0mm,8mm] normal: [0,0,1] up: [0,1,0] }+ C: Plane { origin: [0mm,0mm,16mm] normal: [0,0,1] up: [0,1,0] }}Construction Plane FA { Trace: Frames.A }Construction Plane FB { Trace: Frames.B }Construction Plane FC { Trace: Frames.C }- RoundedRect2 Outline { Center: [0mm,0mm] Size: [60mm,40mm] Radius: 8mm }+ RoundedRect2 Outline { center: [0mm,0mm] size: [60mm,40mm] radius: 8mm }Profile P { Loop Outer { Outline |> TraceLoop } }SectionChain RoundedSections {- Continuity: G1+ continuity: G1ApproximationTolerance: 0.00001mmSection A {- Frame: FA- Profile: P- Seam: Bottom+ frame: FA+ profile: P+ seam: Bottom}Section B {- Frame: FB- Profile: P- Seam: Bottom+ frame: FB+ profile: P+ seam: Bottom}Section C {- Frame: FC- Profile: P- Seam: Bottom+ frame: FC+ profile: P+ seam: Bottom}- Start: Cap- End: Cap+ start: Cap+ end: Cap}}diff --git a/fixtures/Canonical/SectionChain/open-chain.firmament b/fixtures/Canonical/SectionChain/open-chain.firmamentindex 7919871f..3f948583 100644--- a/fixtures/Canonical/SectionChain/open-chain.firmament+++ b/fixtures/Canonical/SectionChain/open-chain.firmament@@ -1,22 +1,22 @@Model OpenSectionChain {- Units: mm+ units: mmConcept Struct Stations {A: Plane { Origin: [0mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }B: Plane { Origin: [20mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }}Construction Plane FA { Trace: Stations.A }Construction Plane FB { Trace: Stations.B }- Concept Path Outline { Start: Point2(-5mm,-4mm) Heading: 0deg Line Bottom { Length: 10mm } Line Right { Turn: 90deg; Length: 8mm } Line Top { Turn: 90deg; Length: 10mm } Close Left }- Profile P From Outline+ Path Outline { start: Point2(-5mm,-4mm) heading: 0deg Line Bottom { length: 10mm } Line Right { Turn: 90deg; length: 8mm } Line Top { Turn: 90deg; length: 10mm } Close Left }+ Profile P from OutlineSectionChain OpenSectionChain {Transition: Ruled- Section A { Frame: FA- Profile: P- Seam: Bottom }- Section B { Frame: FB- Profile: P- Seam: Bottom }- Start: Open- End: Open+ Section A { frame: FA+ profile: P+ seam: Bottom }+ Section B { frame: FB+ profile: P+ seam: Bottom }+ start: Open+ end: Open}}diff --git a/fixtures/Canonical/SectionChain/six-section-ergonomic.firmament b/fixtures/Canonical/SectionChain/six-section-ergonomic.firmamentindex 6322e61d..8d7745f3 100644--- a/fixtures/Canonical/SectionChain/six-section-ergonomic.firmament+++ b/fixtures/Canonical/SectionChain/six-section-ergonomic.firmament@@ -1,5 +1,5 @@Model SixSectionErgonomic {- Units: mm+ units: mmConcept Struct Stations {P0: Plane { Origin: [0mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }P1: Plane { Origin: [14mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }@@ -15,40 +15,40 @@ Model SixSectionErgonomic {Construction Plane F4 { Trace: Stations.P4 }Construction Plane F5 { Trace: Stations.P5 }- Concept Path O0 { Start: Point2(-4mm,-3mm) Heading: 0deg Line Bottom { Length: 8mm } Line Right { Turn: 90deg; Length: 6mm } Line Top { Turn: 90deg; Length: 8mm } Close Left }- Concept Path O1 { Start: Point2(-9mm,-6mm) Heading: 0deg Line Bottom { Length: 18mm } Line Right { Turn: 90deg; Length: 12mm } Line Top { Turn: 90deg; Length: 18mm } Close Left }- Concept Path O2 { Start: Point2(-13mm,-9mm) Heading: 0deg Line Bottom { Length: 26mm } Line Right { Turn: 90deg; Length: 18mm } Line Top { Turn: 90deg; Length: 26mm } Close Left }- Concept Path O3 { Start: Point2(-15mm,-10mm) Heading: 0deg Line Bottom { Length: 30mm } Line Right { Turn: 90deg; Length: 20mm } Line Top { Turn: 90deg; Length: 30mm } Close Left }- Concept Path O4 { Start: Point2(-11mm,-7mm) Heading: 0deg Line Bottom { Length: 22mm } Line Right { Turn: 90deg; Length: 14mm } Line Top { Turn: 90deg; Length: 22mm } Close Left }- Concept Path O5 { Start: Point2(-5mm,-3.5mm) Heading: 0deg Line Bottom { Length: 10mm } Line Right { Turn: 90deg; Length: 7mm } Line Top { Turn: 90deg; Length: 10mm } Close Left }- Profile R0 From O0- Profile R1 From O1- Profile R2 From O2- Profile R3 From O3- Profile R4 From O4- Profile R5 From O5+ Path O0 { start: Point2(-4mm,-3mm) heading: 0deg Line Bottom { length: 8mm } Line Right { Turn: 90deg; length: 6mm } Line Top { Turn: 90deg; length: 8mm } Close Left }+ Path O1 { start: Point2(-9mm,-6mm) heading: 0deg Line Bottom { length: 18mm } Line Right { Turn: 90deg; length: 12mm } Line Top { Turn: 90deg; length: 18mm } Close Left }+ Path O2 { start: Point2(-13mm,-9mm) heading: 0deg Line Bottom { length: 26mm } Line Right { Turn: 90deg; length: 18mm } Line Top { Turn: 90deg; length: 26mm } Close Left }+ Path O3 { start: Point2(-15mm,-10mm) heading: 0deg Line Bottom { length: 30mm } Line Right { Turn: 90deg; length: 20mm } Line Top { Turn: 90deg; length: 30mm } Close Left }+ Path O4 { start: Point2(-11mm,-7mm) heading: 0deg Line Bottom { length: 22mm } Line Right { Turn: 90deg; length: 14mm } Line Top { Turn: 90deg; length: 22mm } Close Left }+ Path O5 { start: Point2(-5mm,-3.5mm) heading: 0deg Line Bottom { length: 10mm } Line Right { Turn: 90deg; length: 7mm } Line Top { Turn: 90deg; length: 10mm } Close Left }+ Profile R0 from O0+ Profile R1 from O1+ Profile R2 from O2+ Profile R3 from O3+ Profile R4 from O4+ Profile R5 from O5SectionChain SixSectionErgonomic {Transition: Ruled- Section Nose { Frame: F0- Profile: R0- Seam: Bottom }- Section Front { Frame: F1- Profile: R1- Seam: Bottom }- Section PalmFront { Frame: F2- Profile: R2- Seam: Bottom }- Section Peak { Frame: F3- Profile: R3- Seam: Bottom }- Section PalmRear { Frame: F4- Profile: R4- Seam: Bottom }- Section Tail { Frame: F5- Profile: R5- Seam: Bottom }- Start: Cap- End: Cap+ Section Nose { frame: F0+ profile: R0+ seam: Bottom }+ Section Front { frame: F1+ profile: R1+ seam: Bottom }+ Section PalmFront { frame: F2+ profile: R2+ seam: Bottom }+ Section Peak { frame: F3+ profile: R3+ seam: Bottom }+ Section PalmRear { frame: F4+ profile: R4+ seam: Bottom }+ Section Tail { frame: F5+ profile: R5+ seam: Bottom }+ start: Cap+ end: Cap}}diff --git a/fixtures/Canonical/SectionChain/smooth-corner-sections.firmament b/fixtures/Canonical/SectionChain/smooth-corner-sections.firmamentindex 314da58a..3f15f15d 100644--- a/fixtures/Canonical/SectionChain/smooth-corner-sections.firmament+++ b/fixtures/Canonical/SectionChain/smooth-corner-sections.firmament@@ -1,9 +1,9 @@Model SmoothCornerSections {- Units: mm+ units: mmConcept Struct Frames {- A: Plane { Origin: [0mm,0mm,0mm] Normal: [0,0,1] Up: [0,1,0] }- B: Plane { Origin: [0mm,0mm,8mm] Normal: [0,0,1] Up: [0,1,0] }- C: Plane { Origin: [0mm,0mm,16mm] Normal: [0,0,1] Up: [0,1,0] }+ A: Plane { origin: [0mm,0mm,0mm] normal: [0,0,1] up: [0,1,0] }+ B: Plane { origin: [0mm,0mm,8mm] normal: [0,0,1] up: [0,1,0] }+ C: Plane { origin: [0mm,0mm,16mm] normal: [0,0,1] up: [0,1,0] }}Construction Plane FA { Trace: Frames.A }Construction Plane FB { Trace: Frames.B }@@ -11,24 +11,24 @@ Model SmoothCornerSections {SmoothRoundedRect2 Outline { Center: [0mm,0mm] Size: [60mm,40mm] CornerExtent: 8mm }Profile P { Loop Outer { Outline |> TraceLoop } }SectionChain RoundedSections {- Continuity: G1+ continuity: G1ApproximationTolerance: 0.00001mmSection A {- Frame: FA- Profile: P- Seam: Bottom+ frame: FA+ profile: P+ seam: Bottom}Section B {- Frame: FB- Profile: P- Seam: Bottom+ frame: FB+ profile: P+ seam: Bottom}Section C {- Frame: FC- Profile: P- Seam: Bottom+ frame: FC+ profile: P+ seam: Bottom}- Start: Cap- End: Cap+ start: Cap+ end: Cap}}diff --git a/fixtures/Canonical/SectionChain/solid-loft-common-ray.firmament b/fixtures/Canonical/SectionChain/solid-loft-common-ray.firmamentindex 56106d80..ed695240 100644--- a/fixtures/Canonical/SectionChain/solid-loft-common-ray.firmament+++ b/fixtures/Canonical/SectionChain/solid-loft-common-ray.firmament@@ -1,24 +1,24 @@schema SectionChainModel RuledSolidLoft {- Units: mm+ units: mmConcept Struct Stations {Lower: Plane { Origin: [0mm, 0mm, 0mm]; Normal: [0, 0, 1]; Up: [0, 1, 0] }Upper: Plane { Origin: [0mm, 0mm, 50mm]; Normal: [0, 0, 1]; Up: [0, 1, 0] }}Construction Plane LowerFrame { Trace: Stations.Lower }Construction Plane UpperFrame { Trace: Stations.Upper }- Circle2 LowerCircle { Center: [0mm, 0mm] Radius: 25mm }+ Circle2 LowerCircle { center: [0mm, 0mm] radius: 25mm }Ellipse2 UpperEllipse { Center: [0mm, 0mm] AxisLengths: [60mm, 40mm] Rotation: 25deg }Profile LowerOutline { Loop Outer { LowerCircle |> TraceLoop } }Profile UpperOutline { Loop Outer { UpperEllipse |> TraceLoop } }Loft Body {- RearProfile: LowerOutline- RearFrame: LowerFrame- FrontProfile: UpperOutline- FrontFrame: UpperFrame- Rule: Ruled- Correspondence: CommonRay- Reference: [1, 0, 0]+ rearProfile: LowerOutline+ rearFrame: LowerFrame+ frontProfile: UpperOutline+ frontFrame: UpperFrame+ rule: Ruled+ correspondence: CommonRay+ reference: [1, 0, 0]}}diff --git a/fixtures/Canonical/SectionChain/two-section-ruled.firmament b/fixtures/Canonical/SectionChain/two-section-ruled.firmamentindex d7567d09..3edf4a7f 100644--- a/fixtures/Canonical/SectionChain/two-section-ruled.firmament+++ b/fixtures/Canonical/SectionChain/two-section-ruled.firmament@@ -1,5 +1,5 @@Model TwoSectionRuled {- Units: mm+ units: mmConcept Struct Stations {StartDatum: Plane { Origin: [0mm, 0mm, 0mm]; Normal: [1, 0, 0]; Up: [0, 0, 1] }@@ -8,38 +8,38 @@ Model TwoSectionRuled {Construction Plane StartFrame { Trace: Stations.StartDatum }Construction Plane EndFrame { Trace: Stations.EndDatum }- Concept Path StartOutline {- Start: Point2(-10mm, -6mm)- Heading: 0deg- Line Bottom { Length: 20mm }- Line Right { Turn: 90deg; Length: 12mm }- Line Top { Turn: 90deg; Length: 20mm }+ Path StartOutline {+ start: Point2(-10mm, -6mm)+ heading: 0deg+ Line Bottom { length: 20mm }+ Line Right { Turn: 90deg; length: 12mm }+ Line Top { Turn: 90deg; length: 20mm }Close Left}- Concept Path EndOutline {- Start: Point2(-8mm, -5mm)- Heading: 0deg- Line Bottom { Length: 16mm }- Line Right { Turn: 90deg; Length: 10mm }- Line Top { Turn: 90deg; Length: 16mm }+ Path EndOutline {+ start: Point2(-8mm, -5mm)+ heading: 0deg+ Line Bottom { length: 16mm }+ Line Right { Turn: 90deg; length: 10mm }+ Line Top { Turn: 90deg; length: 16mm }Close Left}- Profile StartProfile From StartOutline- Profile EndProfile From EndOutline+ Profile StartProfile from StartOutline+ Profile EndProfile from EndOutlineSectionChain TwoSectionRuled {Transition: RuledSection Start {- Frame: StartFrame- Profile: StartProfile- Seam: Bottom+ frame: StartFrame+ profile: StartProfile+ seam: Bottom}Section End {- Frame: EndFrame- Profile: EndProfile- Seam: Bottom+ frame: EndFrame+ profile: EndProfile+ seam: Bottom}- Start: Cap- End: Cap+ start: Cap+ end: Cap}}diff --git a/fixtures/Canonical/Set/mounting-points.firmament b/fixtures/Canonical/Set/mounting-points.firmamentindex 29c19860..c60a872b 100644--- a/fixtures/Canonical/Set/mounting-points.firmament+++ b/fixtures/Canonical/Set/mounting-points.firmament@@ -1,14 +1,14 @@Model NamedMountingPoints {- Units: mm+ units: mmFeature M8Counterbore(Center: Point2) -> Hole<Counterbore> {return Hole<Counterbore> {- On: MountingArea- Center: Center- Diameter: 8mm- CounterboreDiameter: 16mm- CounterboreDepth: 3mm- End: ThroughAll+ on: MountingArea+ center: Center+ diameter: 8mm+ counterboreDiameter: 16mm+ counterboreDepth: 3mm+ end: ThroughAll}}@@ -20,28 +20,28 @@ Model NamedMountingPoints {}Concept Struct Supports {- Top: Plane { Origin: [0mm,0mm,8mm]; Normal: [0,0,1]; Up: [0,1,0] }+ Top: Plane { origin: [0mm,0mm,8mm]; normal: [0,0,1]; up: [0,1,0] }}Construction Plane TopSupport { Trace: Supports.Top }- Concept Struct Layout On XY {- Rect2 Stock { Center: [0mm,0mm]; Size: [100mm,80mm] }+ Concept Struct Layout on XY {+ Rect2 Stock { center: [0mm,0mm]; size: [100mm,80mm] }Polygon2<Rhombus> MountBoundaryShape {Center: [0mm,0mm]Diagonals: [90mm,64mm]}}- Profile StockProfile Using Layout {+ Profile StockProfile using Layout {Loop Outer { Stock.Bottom |> Stock.Right |> Stock.Top |> Stock.Left |> Close }}- Profile MountBoundary Using Layout {+ Profile MountBoundary using Layout {Loop Outer { MountBoundaryShape |> TraceLoop }}Span<Plane> MountingArea { On: TopSupport; Boundary: MountBoundary }Struct Part {Compose Plate {- Base StockBody { Profile: StockProfile; From: 0mm; To: 8mm; Role: Stock }- Pattern Mounts Over MountPoints {+ Base StockBody { profile: StockProfile; from: 0mm; to: 8mm; role: Stock }+ Pattern Mounts over MountPoints {point => M8Counterbore(Center: point)}}diff --git a/fixtures/Canonical/Set/named-point-access.firmament b/fixtures/Canonical/Set/named-point-access.firmamentindex 436817b4..bdc45824 100644--- a/fixtures/Canonical/Set/named-point-access.firmament+++ b/fixtures/Canonical/Set/named-point-access.firmament@@ -1,19 +1,19 @@Model NamedPointAccess {- Units: mm+ units: mmStatic BoundaryPoints: Set<Point2> {South => Point2(0mm, -32mm)East => Point2(45mm, 0mm)North => Point2(0mm, 32mm)West => Point2(-45mm, 0mm)}- Concept Struct Layout On XY {- Line2 SE { From: BoundaryPoints.South; To: BoundaryPoints.East }- Line2 EN { From: BoundaryPoints.East; To: BoundaryPoints.North }- Line2 NW { From: BoundaryPoints.North; To: BoundaryPoints.West }- Line2 WS { From: BoundaryPoints.West; To: BoundaryPoints.South }+ Concept Struct Layout on XY {+ Line2 SE { from: BoundaryPoints.South; to: BoundaryPoints.East }+ Line2 EN { from: BoundaryPoints.East; to: BoundaryPoints.North }+ Line2 NW { from: BoundaryPoints.North; to: BoundaryPoints.West }+ Line2 WS { from: BoundaryPoints.West; to: BoundaryPoints.South }}- Profile Boundary Using Layout {+ Profile Boundary using Layout {Loop Outer { SE |> EN |> NW |> WS |> Close }}- Struct PlateBody { Extrude Body { Profile: Boundary; From: 0mm; To: 4mm } }+ Struct PlateBody { Extrude Body { profile: Boundary; from: 0mm; to: 4mm } }}diff --git a/fixtures/Canonical/Set/pattern-feature-map.firmament b/fixtures/Canonical/Set/pattern-feature-map.firmamentindex c14d61ea..94dddb11 100644--- a/fixtures/Canonical/Set/pattern-feature-map.firmament+++ b/fixtures/Canonical/Set/pattern-feature-map.firmament@@ -1,14 +1,14 @@Model SetFeaturePattern {- Units: mm+ units: mmFeature Drill(Center: Point2) -> Hole<Shaft> {- return Hole<Shaft> { On: +Z Center: Center Diameter: 6mm End: ThroughAll }+ return Hole<Shaft> { on: +Z center: Center diameter: 6mm end: ThroughAll }}Static Points: Set<Point2> {First => Point2(-12mm, 0mm)Second => Point2(12mm, 0mm)}- Box Base { Size: [50mm, 30mm, 8mm] }+ Box Base { size: [50mm, 30mm, 8mm] }Modify Base {- Pattern Drills Over Points { point => Drill(point) }+ Pattern Drills over Points { point => Drill(point) }}}diff --git a/fixtures/Canonical/Set/record-payloads.firmament b/fixtures/Canonical/Set/record-payloads.firmamentindex c57c0a46..93107b42 100644--- a/fixtures/Canonical/Set/record-payloads.firmament+++ b/fixtures/Canonical/Set/record-payloads.firmament@@ -1,15 +1,15 @@Model NamedRecordPayloads {- Units: mm+ units: mmRecord MountSpec { Center: Point2 Diameter: Length }Static Mounts: Set<MountSpec> {Left => MountSpec { Center: Point2(-20mm, 0mm) Diameter: 8mm }Right => MountSpec { Center: Point2(20mm, 0mm) Diameter: 8mm }}Template<spec: MountSpec> MountHole {- Hole<Shaft> Mount { On: +Z Center: spec.Center Diameter: spec.Diameter End: ThroughAll }+ Hole<Shaft> Mount { on: +Z center: spec.Center diameter: spec.Diameter end: ThroughAll }}- Box Base { Size: [80mm, 40mm, 10mm] }+ Box Base { size: [80mm, 40mm, 10mm] }Modify Base {- Pattern MountPattern Over Mounts { spec => MountHole<Current> }+ Pattern MountPattern over Mounts { spec => MountHole<Current> }}}diff --git a/fixtures/Canonical/SheetMetal/electronics-tray.firmament b/fixtures/Canonical/SheetMetal/electronics-tray.firmamentindex 2dde00cb..a7586ff5 100644--- a/fixtures/Canonical/SheetMetal/electronics-tray.firmament+++ b/fixtures/Canonical/SheetMetal/electronics-tray.firmament@@ -1,15 +1,19 @@+Profile mainProfile = Rect2 { center: [(240mm) / 2, (180mm) / 2]; size: [240mm, 180mm] }+Profile ventAProfile = Rect2 { center: [0mm, 0mm]; size: [50mm, 8mm] }+Profile ventBProfile = Rect2 { center: [0mm, 0mm]; size: [50mm, 8mm] }+// Four adjacent walls with automatic relief semantics, holes, and vent slots.SheetMetal ElectronicsTray {- Thickness: 1.2mm;- Material: "5052-H32 Aluminum";- KFactor: 0.42;- Base Main { Profile: Rectangle { Width: 240mm; Height: 180mm; }; }- Flange FrontWall { From: Main.Front; Height: 40mm; Angle: 90deg; Radius: 1.5mm; Relief: Auto; }- Flange RightWall { From: Main.Right; Height: 30mm; Angle: 90deg; Radius: 1.5mm; Relief: Auto; }- Flange RearWall { From: Main.Rear; Height: 40mm; Angle: 90deg; Radius: 1.5mm; Relief: Auto; }- Flange LeftWall { From: Main.Left; Height: 30mm; Angle: 90deg; Radius: 1.5mm; Relief: Auto; }- Hole MountA { On: Main; Center: (20mm, 20mm); Diameter: 4mm; }- Hole MountB { On: Main; Center: (220mm, 160mm); Diameter: 4mm; }- Cut VentA { On: Main; Profile: Slot { Length: 50mm; Width: 8mm; }; At: (90mm, 90mm); }- Cut VentB { On: Main; Profile: Slot { Length: 50mm; Width: 8mm; }; At: (150mm, 90mm); }+ thickness: 1.2mm;+ material: "5052-H32 Aluminum";+ kFactor: 0.42;+ Base Main { profile: mainProfile; }+ Flange FrontWall { from: Main.Front; height: 40mm; angle: 90deg; radius: 1.5mm; relief: Auto; }+ Flange RightWall { from: Main.Right; height: 30mm; angle: 90deg; radius: 1.5mm; relief: Auto; }+ Flange RearWall { from: Main.Rear; height: 40mm; angle: 90deg; radius: 1.5mm; relief: Auto; }+ Flange LeftWall { from: Main.Left; height: 30mm; angle: 90deg; radius: 1.5mm; relief: Auto; }+ Hole MountA { on: Main; center: Point2(20mm, 20mm); diameter: 4mm; }+ Hole MountB { on: Main; center: Point2(220mm, 160mm); diameter: 4mm; }+ Cut VentA { on: Main; profile: ventAProfile; at: Point2(90mm, 90mm); }+ Cut VentB { on: Main; profile: ventBProfile; at: Point2(150mm, 90mm); }}diff --git a/fixtures/Canonical/SheetMetal/four-wall-tray-multiple-openings.firmament b/fixtures/Canonical/SheetMetal/four-wall-tray-multiple-openings.firmamentindex 9a1abd95..042f5d6e 100644--- a/fixtures/Canonical/SheetMetal/four-wall-tray-multiple-openings.firmament+++ b/fixtures/Canonical/SheetMetal/four-wall-tray-multiple-openings.firmament@@ -1,10 +1,12 @@+Profile baseProfile = Rect2 { center: [(80mm) / 2, (60mm) / 2]; size: [80mm, 60mm] }+SheetMetal FourReliefTray {- Thickness: 1.2mm;- KFactor: 0.42;- Material: "5052-H32";- Base Base { Profile: Rectangle { Width: 80mm; Height: 60mm; }; }- Flange Front { From: Base.Front; Height: 18mm; Angle: 90deg; Radius: 1.5mm; Relief: Rectangular; }- Flange Right { From: Base.Right; Height: 18mm; Angle: 90deg; Radius: 1.5mm; Relief: Rectangular; }- Flange Rear { From: Base.Rear; Height: 18mm; Angle: 90deg; Radius: 1.5mm; Relief: Rectangular; }- Flange Left { From: Base.Left; Height: 18mm; Angle: 90deg; Radius: 1.5mm; Relief: Rectangular; }+ thickness: 1.2mm;+ kFactor: 0.42;+ material: "5052-H32";+ Base Base { profile: baseProfile; }+ Flange Front { from: Base.Front; height: 18mm; angle: 90deg; radius: 1.5mm; relief: Rectangular; }+ Flange Right { from: Base.Right; height: 18mm; angle: 90deg; radius: 1.5mm; relief: Rectangular; }+ Flange Rear { from: Base.Rear; height: 18mm; angle: 90deg; radius: 1.5mm; relief: Rectangular; }+ Flange Left { from: Base.Left; height: 18mm; angle: 90deg; radius: 1.5mm; relief: Rectangular; }}diff --git a/fixtures/Canonical/SheetMetal/inset-partial-flange.firmament b/fixtures/Canonical/SheetMetal/inset-partial-flange.firmamentindex 3e9daa6d..aa82e885 100644--- a/fixtures/Canonical/SheetMetal/inset-partial-flange.firmament+++ b/fixtures/Canonical/SheetMetal/inset-partial-flange.firmament@@ -1,22 +1,24 @@+Profile panelProfile = Rect2 { center: [(100mm) / 2, (60mm) / 2]; size: [100mm, 60mm] }+// A bounded bend path is feature intent, not a free edge.SheetMetal InsetPartialFlange {- Thickness: 1mm;- KFactor: 0.5;- Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }- Flange Wall { From: Panel.Rear; Height: 20mm; Angle: 90deg; Radius: 2mm; }+ thickness: 1mm;+ kFactor: 0.5;+ Base Panel { profile: panelProfile; }+ Flange Wall { from: Panel.Rear; height: 20mm; angle: 90deg; radius: 2mm; }AttachmentPath ServiceFlangeAttachment {- On: Wall.Outer;- Inset: 2mm;- Span: 40mm;- SpanOffset: 5mm;- Release: ToCarrier;+ on: Wall.Outer;+ inset: 2mm;+ span: 40mm;+ spanOffset: 5mm;+ release: ToCarrier;}Flange ServiceFlange {- From: Wall.ServiceFlangeAttachment;- Height: 12mm;- Angle: 45deg;- Radius: 2mm;+ from: Wall.ServiceFlangeAttachment;+ height: 12mm;+ angle: 45deg;+ radius: 2mm;}}diff --git a/fixtures/Canonical/SheetMetal/l-bracket-multiple-holes.firmament b/fixtures/Canonical/SheetMetal/l-bracket-multiple-holes.firmamentindex b28ce530..fc2bb38c 100644--- a/fixtures/Canonical/SheetMetal/l-bracket-multiple-holes.firmament+++ b/fixtures/Canonical/SheetMetal/l-bracket-multiple-holes.firmament@@ -1,27 +1,29 @@+Profile blankProfile = Rect2 { center: [(100mm) / 2, (60mm) / 2]; size: [100mm, 60mm] }+SheetMetal TwoHoleLBracket {- Thickness: 1.5mm;- Material: "5052-H32 Aluminum";- KFactor: 0.42;+ thickness: 1.5mm;+ material: "5052-H32 Aluminum";+ kFactor: 0.42;- Base: Rectangle(100mm, 60mm);+ base: blankProfile;Flange Upright {- From: Base.Rear;- Length: 35mm;- Angle: 90deg;- InsideRadius: 2mm;- Direction: Up;+ from: Base.Rear;+ length: 35mm;+ angle: 90deg;+ insideRadius: 2mm;+ direction: Up;}Hole MountLeft {- On: Base;- Center: (25mm, 25mm);- Diameter: 8mm;+ on: Base;+ center: Point2(25mm, 25mm);+ diameter: 8mm;}Hole MountRight {- On: Base;- Center: (75mm, 25mm);- Diameter: 8mm;+ on: Base;+ center: Point2(75mm, 25mm);+ diameter: 8mm;}}diff --git a/fixtures/Canonical/SheetMetal/l-bracket-with-hole.firmament b/fixtures/Canonical/SheetMetal/l-bracket-with-hole.firmamentindex a81162b4..1cb9cc83 100644--- a/fixtures/Canonical/SheetMetal/l-bracket-with-hole.firmament+++ b/fixtures/Canonical/SheetMetal/l-bracket-with-hole.firmament@@ -1,21 +1,23 @@+Profile blankProfile = Rect2 { center: [(80mm) / 2, (50mm) / 2]; size: [80mm, 50mm] }+SheetMetal MountingBracket {- Thickness: 1.5mm;- Material: "5052-H32 Aluminum";- KFactor: 0.42;+ thickness: 1.5mm;+ material: "5052-H32 Aluminum";+ kFactor: 0.42;- Base: Rectangle(80mm, 50mm);+ base: blankProfile;Flange Upright {- From: Base.Rear;- Length: 30mm;- Angle: 90deg;- InsideRadius: 2mm;- Direction: Up;+ from: Base.Rear;+ length: 30mm;+ angle: 90deg;+ insideRadius: 2mm;+ direction: Up;}Hole Mount {- On: Base;- Center: (40mm, 20mm);- Diameter: 8mm;+ on: Base;+ center: Point2(40mm, 20mm);+ diameter: 8mm;}}diff --git a/fixtures/Canonical/SheetMetal/l-bracket.firmament b/fixtures/Canonical/SheetMetal/l-bracket.firmamentindex 2de98041..971a9768 100644--- a/fixtures/Canonical/SheetMetal/l-bracket.firmament+++ b/fixtures/Canonical/SheetMetal/l-bracket.firmament@@ -1,14 +1,16 @@+Profile mainProfile = Rect2 { center: [(80mm) / 2, (40mm) / 2]; size: [80mm, 40mm] }+// Minimal source-independent single-bend bracket.SheetMetal LBracket {- Thickness: 1.5mm;- Material: "5052-H32 Aluminum";- KFactor: 0.42;- Base Main { Profile: Rectangle { Width: 80mm; Height: 40mm; }; }+ thickness: 1.5mm;+ material: "5052-H32 Aluminum";+ kFactor: 0.42;+ Base Main { profile: mainProfile; }Flange Wall {- From: Main.Left;- Length: 25mm;- Angle: 90deg;- InsideRadius: 2mm;- Direction: Up;+ from: Main.Left;+ length: 25mm;+ angle: 90deg;+ insideRadius: 2mm;+ direction: Up;}}diff --git a/fixtures/Canonical/SheetMetal/network-appliance-enclosure.firmament b/fixtures/Canonical/SheetMetal/network-appliance-enclosure.firmamentindex f93e68c7..d6610ad8 100644--- a/fixtures/Canonical/SheetMetal/network-appliance-enclosure.firmament+++ b/fixtures/Canonical/SheetMetal/network-appliance-enclosure.firmament@@ -1,3 +1,10 @@+Profile rearPowerInletProfile = Rect2 { center: [0mm, 0mm]; size: [12mm, 18mm] }+Profile rearEthernetProfile = Rect2 { center: [0mm, 0mm]; size: [14mm, 16mm] }+Profile leftVentAProfile = Rect2 { center: [0mm, 0mm]; size: [18mm, 3mm] }+Profile leftVentBProfile = Rect2 { center: [0mm, 0mm]; size: [18mm, 3mm] }+Profile rightVentAProfile = Rect2 { center: [0mm, 0mm]; size: [18mm, 3mm] }+Profile rightVentBProfile = Rect2 { center: [0mm, 0mm]; size: [18mm, 3mm] }+Use SheetMetal.ProductFamilies;Static NetworkSpec: EnclosureSpec = EnclosureSpec {@@ -15,16 +22,16 @@ SheetMetal NetworkAppliance = ElectronicsEnclosure < Spec: NetworkSpec >// Ordinary downstream authoring against the specialized object's semantic regions.Extend SheetMetal NetworkAppliance {- Hole FrontIndicatorGreen { On: Front; Center: (45mm, 18mm); Diameter: 3mm; }- Hole FrontIndicatorAmber { On: Front; Center: (55mm, 18mm); Diameter: 3mm; }- Cut RearPowerInlet { On: Rear; At: (35mm, 18mm); Profile: Rectangle; Width: 18mm; Length: 12mm; }- Cut RearEthernet { On: Rear; At: (80mm, 18mm); Profile: Rectangle; Width: 16mm; Length: 14mm; }- Cut LeftVentA { On: Left; At: (30mm, 15mm); Profile: Slot; Width: 3mm; Length: 18mm; }- Cut LeftVentB { On: Left; At: (55mm, 15mm); Profile: Slot; Width: 3mm; Length: 18mm; }- Cut RightVentA { On: Right; At: (30mm, 15mm); Profile: Slot; Width: 3mm; Length: 18mm; }- Cut RightVentB { On: Right; At: (55mm, 15mm); Profile: Slot; Width: 3mm; Length: 18mm; }- Hole MountA { On: Body; Center: (25mm, 25mm); Diameter: 3.2mm; }- Hole MountB { On: Body; Center: (135mm, 25mm); Diameter: 3.2mm; }- Hole MountC { On: Body; Center: (25mm, 85mm); Diameter: 3.2mm; }- Hole MountD { On: Body; Center: (135mm, 85mm); Diameter: 3.2mm; }+ Hole FrontIndicatorGreen { on: Front; center: Point2(45mm, 18mm); diameter: 3mm; }+ Hole FrontIndicatorAmber { on: Front; center: Point2(55mm, 18mm); diameter: 3mm; }+ Cut RearPowerInlet { on: Rear; at: Point2(35mm, 18mm); profile: rearPowerInletProfile; }+ Cut RearEthernet { on: Rear; at: Point2(80mm, 18mm); profile: rearEthernetProfile; }+ Cut LeftVentA { on: Left; at: Point2(30mm, 15mm); profile: leftVentAProfile; }+ Cut LeftVentB { on: Left; at: Point2(55mm, 15mm); profile: leftVentBProfile; }+ Cut RightVentA { on: Right; at: Point2(30mm, 15mm); profile: rightVentAProfile; }+ Cut RightVentB { on: Right; at: Point2(55mm, 15mm); profile: rightVentBProfile; }+ Hole MountA { on: Body; center: Point2(25mm, 25mm); diameter: 3.2mm; }+ Hole MountB { on: Body; center: Point2(135mm, 25mm); diameter: 3.2mm; }+ Hole MountC { on: Body; center: Point2(25mm, 85mm); diameter: 3.2mm; }+ Hole MountD { on: Body; center: Point2(135mm, 85mm); diameter: 3.2mm; }}diff --git a/fixtures/Canonical/SheetMetal/power-supply-enclosure.firmament b/fixtures/Canonical/SheetMetal/power-supply-enclosure.firmamentindex e371736e..eb68c4fc 100644--- a/fixtures/Canonical/SheetMetal/power-supply-enclosure.firmament+++ b/fixtures/Canonical/SheetMetal/power-supply-enclosure.firmament@@ -1,3 +1,6 @@+Profile acInletProfile = Rect2 { center: [0mm, 0mm]; size: [20mm, 28mm] }+Profile dcOutletProfile = Rect2 { center: [0mm, 0mm]; size: [14mm, 24mm] }+Use SheetMetal.ProductFamilies;Static PsuSpec: EnclosureSpec = EnclosureSpec {@@ -14,10 +17,10 @@ Static PsuSpec: EnclosureSpec = EnclosureSpec {SheetMetal PsuEnclosure = ElectronicsEnclosure < Spec: PsuSpec >Extend SheetMetal PsuEnclosure {- Cut AcInlet { On: Rear; At: (32mm, 21mm); Profile: Rectangle; Width: 28mm; Length: 20mm; }- Cut DcOutlet { On: Front; At: (115mm, 21mm); Profile: Rectangle; Width: 24mm; Length: 14mm; }- Hole Mount1 { On: Body; Center: (20mm, 20mm); Diameter: 4mm; }- Hole Mount2 { On: Body; Center: (130mm, 20mm); Diameter: 4mm; }- Hole Mount3 { On: Body; Center: (20mm, 80mm); Diameter: 4mm; }- Hole Mount4 { On: Body; Center: (130mm, 80mm); Diameter: 4mm; }+ Cut AcInlet { on: Rear; at: Point2(32mm, 21mm); profile: acInletProfile; }+ Cut DcOutlet { on: Front; at: Point2(115mm, 21mm); profile: dcOutletProfile; }+ Hole Mount1 { on: Body; center: Point2(20mm, 20mm); diameter: 4mm; }+ Hole Mount2 { on: Body; center: Point2(130mm, 20mm); diameter: 4mm; }+ Hole Mount3 { on: Body; center: Point2(20mm, 80mm); diameter: 4mm; }+ Hole Mount4 { on: Body; center: Point2(130mm, 80mm); diameter: 4mm; }}diff --git a/fixtures/Canonical/SheetMetal/profile-delta-service-recess.firmament b/fixtures/Canonical/SheetMetal/profile-delta-service-recess.firmamentindex 3982c1fe..3140a7d6 100644--- a/fixtures/Canonical/SheetMetal/profile-delta-service-recess.firmament+++ b/fixtures/Canonical/SheetMetal/profile-delta-service-recess.firmament@@ -1,3 +1,5 @@+Profile deckProfile = Rect2 { center: [(120mm) / 2, (80mm) / 2]; size: [120mm, 80mm] }+Use Profile.Modifications;Static WallRecess: ProfileRecessSpec = ProfileRecessSpec {@@ -11,7 +13,7 @@ Static WallRecess: ProfileRecessSpec = ProfileRecessSpec {ProfileDelta UserDefinedWallRecess = Recess < P: WallRecess, Owner: Wall.Outer >SheetMetal DeltaTray {- Thickness: 1mm;- Base Deck { Profile: Rectangle { Width: 120mm; Height: 80mm; }; }- Flange Wall { From: Deck.Front; Height: 20mm; Angle: 90deg; Radius: 2mm; }+ thickness: 1mm;+ Base Deck { profile: deckProfile; }+ Flange Wall { from: Deck.Front; height: 20mm; angle: 90deg; radius: 2mm; }}diff --git a/fixtures/Canonical/SheetMetal/profile-delta-tab-family.firmament b/fixtures/Canonical/SheetMetal/profile-delta-tab-family.firmamentindex 595bbe51..c46b8e59 100644--- a/fixtures/Canonical/SheetMetal/profile-delta-tab-family.firmament+++ b/fixtures/Canonical/SheetMetal/profile-delta-tab-family.firmament@@ -1,3 +1,5 @@+Profile deckProfile = Rect2 { center: [(100mm) / 2, (60mm) / 2]; size: [100mm, 60mm] }+Use Profile.Modifications;Static Table TabStandards: ProfileTabSpec {@@ -13,9 +15,9 @@ Static WideServiceTab: ProfileTabSpec = StandardServiceTab with {ProfileDelta ServiceTab = Tab < P: WideServiceTab, Owner: Wall.Outer >SheetMetal TabbedBracket {- Thickness: 1.5mm;- Material: "5052-H32 Aluminum";- KFactor: 0.42;- Base Deck { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }- Flange Wall { From: Deck.Rear; Height: 24mm; Angle: 90deg; Radius: 2mm; }+ thickness: 1.5mm;+ material: "5052-H32 Aluminum";+ kFactor: 0.42;+ Base Deck { profile: deckProfile; }+ Flange Wall { from: Deck.Rear; height: 24mm; angle: 90deg; radius: 2mm; }}diff --git a/fixtures/Canonical/SheetMetal/profiledelta-add-area.firmament b/fixtures/Canonical/SheetMetal/profiledelta-add-area.firmamentindex 65ceb4a5..29d3cf36 100644--- a/fixtures/Canonical/SheetMetal/profiledelta-add-area.firmament+++ b/fixtures/Canonical/SheetMetal/profiledelta-add-area.firmament@@ -1,3 +1,5 @@+Profile deckProfile = Rect2 { center: [(100mm) / 2, (50mm) / 2]; size: [100mm, 50mm] }+Use Profile.Modifications;Static AddedTab: ProfileTabSpec = ProfileTabSpec {@@ -8,7 +10,7 @@ Static AddedTab: ProfileTabSpec = ProfileTabSpec {ProfileDelta ServiceTab = Tab < P: AddedTab, Owner: Wall.Outer >SheetMetal TabAreaWitness {- Thickness: 1mm;- Base Deck { Profile: Rectangle { Width: 100mm; Height: 50mm; }; }- Flange Wall { From: Deck.Front; Height: 35mm; Angle: 90deg; Radius: 2mm; }+ thickness: 1mm;+ Base Deck { profile: deckProfile; }+ Flange Wall { from: Deck.Front; height: 35mm; angle: 90deg; radius: 2mm; }}diff --git a/fixtures/Canonical/SheetMetal/profiledelta-add-hole-area.firmament b/fixtures/Canonical/SheetMetal/profiledelta-add-hole-area.firmamentindex fc3142df..81d6ee73 100644--- a/fixtures/Canonical/SheetMetal/profiledelta-add-hole-area.firmament+++ b/fixtures/Canonical/SheetMetal/profiledelta-add-hole-area.firmament@@ -1,3 +1,5 @@+Profile deckProfile = Rect2 { center: [(100mm) / 2, (50mm) / 2]; size: [100mm, 50mm] }+Use Profile.Modifications;Static AddedTab: ProfileTabSpec = ProfileTabSpec {@@ -8,8 +10,8 @@ Static AddedTab: ProfileTabSpec = ProfileTabSpec {ProfileDelta ServiceTab = Tab < P: AddedTab, Owner: Wall.Outer >SheetMetal TabHoleAreaWitness {- Thickness: 1mm;- Base Deck { Profile: Rectangle { Width: 100mm; Height: 50mm; }; }- Flange Wall { From: Deck.Front; Height: 35mm; Angle: 90deg; Radius: 2mm; }- Hole Mount { On: Deck; Center: (50mm, 25mm); Diameter: 8mm; }+ thickness: 1mm;+ Base Deck { profile: deckProfile; }+ Flange Wall { from: Deck.Front; height: 35mm; angle: 90deg; radius: 2mm; }+ Hole Mount { on: Deck; center: Point2(50mm, 25mm); diameter: 8mm; }}diff --git a/fixtures/Canonical/SheetMetal/profiledelta-remove-area.firmament b/fixtures/Canonical/SheetMetal/profiledelta-remove-area.firmamentindex a21d0711..8ad1cdcf 100644--- a/fixtures/Canonical/SheetMetal/profiledelta-remove-area.firmament+++ b/fixtures/Canonical/SheetMetal/profiledelta-remove-area.firmament@@ -1,16 +1,18 @@+Profile deckProfile = Rect2 { center: [(100mm) / 2, (50mm) / 2]; size: [100mm, 50mm] }+ProfileDelta ServiceNotch {- On: Wall.Outer;- Anchor: CenteredAt 50mm;- Side: Inward;- Level Carrier { Offset: 0mm; }- Level Cut { Offset: 6mm; }- Transition Enter { Kind: Step; To: Cut; }- Span Land { Run: 15mm; At: Cut; }- Transition Exit { Kind: Step; To: Carrier; }+ on: Wall.Outer;+ anchor: CenteredAt(50mm);+ side: Inward;+ Level Carrier { offset: 0mm; }+ Level Cut { offset: 6mm; }+ Transition Enter { kind: Step; to: Cut; }+ Span Land { run: 15mm; at: Cut; }+ Transition Exit { kind: Step; to: Carrier; }}SheetMetal NotchAreaWitness {- Thickness: 1mm;- Base Deck { Profile: Rectangle { Width: 100mm; Height: 50mm; }; }- Flange Wall { From: Deck.Front; Height: 35mm; Angle: 90deg; Radius: 2mm; }+ thickness: 1mm;+ Base Deck { profile: deckProfile; }+ Flange Wall { from: Deck.Front; height: 35mm; angle: 90deg; radius: 2mm; }}diff --git a/fixtures/Canonical/SheetMetal/semantic-panel.firmament b/fixtures/Canonical/SheetMetal/semantic-panel.firmamentindex 30d35765..4c505889 100644--- a/fixtures/Canonical/SheetMetal/semantic-panel.firmament+++ b/fixtures/Canonical/SheetMetal/semantic-panel.firmament@@ -1,3 +1,5 @@+Profile panelProfile = Rect2 { center: [(100mm) / 2, (60mm) / 2]; size: [100mm, 60mm] }+Concept SemanticPanelIntent {Panel: SheetRegionMountingHoles: SheetPattern@@ -5,19 +7,19 @@ Concept SemanticPanelIntent {}Concept Struct PanelLayout {- Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Datum MountingPatternCenter { on: Panel; at: Panel.Center; }Pattern MountingHoles {- On: Panel;- Feature: Circle { Diameter: 6mm; };- Center: MountingPatternCenter;- Count: 4;- Pitch: (20mm, 0mm);+ on: Panel;+ feature: Circle { diameter: 6mm; };+ center: MountingPatternCenter;+ count: 4;+ pitch: (20mm, 0mm);}}SheetMetal SemanticPanel : SemanticPanelIntent {- Thickness: 1.5mm;- KFactor: 0.42;- Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }- Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+ thickness: 1.5mm;+ kFactor: 0.42;+ Base Panel { profile: panelProfile; }+ Flange RearLip { from: Panel.Rear; height: 15mm; angle: 90deg; radius: 2mm; direction: Up; }}diff --git a/fixtures/Canonical/SheetMetal/sensor-bracket.firmament b/fixtures/Canonical/SheetMetal/sensor-bracket.firmamentindex 88443391..af04d2ec 100644--- a/fixtures/Canonical/SheetMetal/sensor-bracket.firmament+++ b/fixtures/Canonical/SheetMetal/sensor-bracket.firmament@@ -1,18 +1,20 @@+Profile blankProfile = Rect2 { center: [(70mm) / 2, (45mm) / 2]; size: [70mm, 45mm] }+SheetMetal SensorBracket {- Thickness: 1.5mm;- Material: "5052-H32 Aluminum";- KFactor: 0.42;- Base: Rectangle(70mm, 45mm);+ thickness: 1.5mm;+ material: "5052-H32 Aluminum";+ kFactor: 0.42;+ base: blankProfile;Flange Upright {- From: Base.Rear;- Length: 25mm;- Angle: 90deg;- InsideRadius: 2mm;- Direction: Up;+ from: Base.Rear;+ length: 25mm;+ angle: 90deg;+ insideRadius: 2mm;+ direction: Up;}Hole Mount {- On: Base;- Center: (35mm, 18mm);- Diameter: 6mm;+ on: Base;+ center: Point2(35mm, 18mm);+ diameter: 6mm;}}diff --git a/fixtures/Canonical/SheetMetal/tray-dfm-policy.firmament b/fixtures/Canonical/SheetMetal/tray-dfm-policy.firmamentindex 816ba32f..b690f013 100644--- a/fixtures/Canonical/SheetMetal/tray-dfm-policy.firmament+++ b/fixtures/Canonical/SheetMetal/tray-dfm-policy.firmament@@ -1,8 +1,10 @@+Profile mainProfile = Rect2 { center: [(80mm) / 2, (60mm) / 2]; size: [80mm, 60mm] }+// Repair from semantic DFM suggestion: width >= thickness, depth >= radius + thickness.SheetMetal FixedTrayDfm {- Thickness: 1.2mm;- KFactor: 0.42;- Base Main { Profile: Rectangle { Width: 80mm; Height: 60mm; }; }- Flange Front { From: Main.Front; Height: 12mm; Angle: 90deg; Radius: 1.5mm; Relief: Rectangular; ReliefWidth: 1.2mm; ReliefDepth: 2.7mm; }- Flange Right { From: Main.Right; Height: 12mm; Angle: 90deg; Radius: 1.5mm; Relief: Rectangular; ReliefWidth: 1.2mm; ReliefDepth: 2.7mm; }+ thickness: 1.2mm;+ kFactor: 0.42;+ Base Main { profile: mainProfile; }+ Flange Front { from: Main.Front; height: 12mm; angle: 90deg; radius: 1.5mm; relief: Rectangular; reliefWidth: 1.2mm; reliefDepth: 2.7mm; }+ Flange Right { from: Main.Right; height: 12mm; angle: 90deg; radius: 1.5mm; relief: Rectangular; reliefWidth: 1.2mm; reliefDepth: 2.7mm; }}diff --git a/fixtures/Canonical/SheetMetal/u-channel.firmament b/fixtures/Canonical/SheetMetal/u-channel.firmamentindex 5be2e8bc..289f6bf0 100644--- a/fixtures/Canonical/SheetMetal/u-channel.firmament+++ b/fixtures/Canonical/SheetMetal/u-channel.firmament@@ -1,36 +1,38 @@+Profile blankProfile = Rect2 { center: [(100mm) / 2, (60mm) / 2]; size: [100mm, 60mm] }+// Minimal two-bend channel.SheetMetal SimpleUChannel {- Thickness: 1.5mm;- Material: "5052-H32 Aluminum";- KFactor: 0.42;+ thickness: 1.5mm;+ material: "5052-H32 Aluminum";+ kFactor: 0.42;- Base: Rectangle(100mm, 60mm);+ base: blankProfile;Flange LeftFlange {- From: Base.Left;- Length: 25mm;- Angle: 90deg;- InsideRadius: 2mm;- Direction: Up;+ from: Base.Left;+ length: 25mm;+ angle: 90deg;+ insideRadius: 2mm;+ direction: Up;}Flange RightFlange {- From: Base.Right;- Length: 20mm;- Angle: 90deg;- InsideRadius: 2mm;- Direction: Up;+ from: Base.Right;+ length: 20mm;+ angle: 90deg;+ insideRadius: 2mm;+ direction: Up;}Hole MountA {- On: Base;- Center: (25mm, 30mm);- Diameter: 8mm;+ on: Base;+ center: Point2(25mm, 30mm);+ diameter: 8mm;}Hole MountB {- On: Base;- Center: (75mm, 30mm);- Diameter: 8mm;+ on: Base;+ center: Point2(75mm, 30mm);+ diameter: 8mm;}}diff --git a/fixtures/Canonical/Span/line-pipeline.firmament b/fixtures/Canonical/Span/line-pipeline.firmamentindex 293eff7a..1e0ec8be 100644--- a/fixtures/Canonical/Span/line-pipeline.firmament+++ b/fixtures/Canonical/Span/line-pipeline.firmament@@ -1,12 +1,12 @@// LANG-SPAN-X1: MountingEdge is a view of Stock.Bottom, not helper geometry.-Rect2 Stock { Center: [50mm, 20mm]; Size: [100mm, 40mm] }-Point2 MountLeft { Position: [30mm, 0mm] }-Point2 MountRight { Position: [70mm, 0mm] }-Point2 UpperRight { Position: [70mm, 20mm] }-Point2 UpperLeft { Position: [30mm, 20mm] }-Line2 Rise { From: MountRight; To: UpperRight }-Line2 Top { From: UpperRight; To: UpperLeft }-Line2 Down { From: UpperLeft; To: MountLeft }+Rect2 Stock { center: [50mm, 20mm]; size: [100mm, 40mm] }+Point2 MountLeft { position: [30mm, 0mm] }+Point2 MountRight { position: [70mm, 0mm] }+Point2 UpperRight { position: [70mm, 20mm] }+Point2 UpperLeft { position: [30mm, 20mm] }+Line2 Rise { from: MountRight; to: UpperRight }+Line2 Top { from: UpperRight; to: UpperLeft }+Line2 Down { from: UpperLeft; to: MountLeft }Span<Line> MountingEdge {On: Stock.Bottom@@ -17,4 +17,4 @@ Span<Line> MountingEdge {Profile MountingPlate {Loop Outer { MountingEdge |> Rise |> Top |> Down |> Close }}-Extrude Plate { Profile: MountingPlate; From: 0mm; To: 2mm }+Extrude Plate { profile: MountingPlate; from: 0mm; to: 2mm }diff --git a/fixtures/Canonical/Span/plane-hole-support.firmament b/fixtures/Canonical/Span/plane-hole-support.firmamentindex 73e60192..019518c5 100644--- a/fixtures/Canonical/Span/plane-hole-support.firmament+++ b/fixtures/Canonical/Span/plane-hole-support.firmament@@ -1,10 +1,10 @@schema MechanicalModel PlaneHoleSupport {- Units: mm+ units: mmConcept Struct Supports {- Top: Plane { Origin: [0mm,0mm,8mm]; Normal: [0,0,1]; Up: [0,1,0] }+ Top: Plane { origin: [0mm,0mm,8mm]; normal: [0,0,1]; up: [0,1,0] }}Construction Plane TopSupport { Trace: Supports.Top }@@ -17,31 +17,31 @@ Model PlaneHoleSupport {]Template<spec: MountSpec> M8Counterbore {Hole<Counterbore> Mount {- On: MountingArea- Center: spec.Center- Diameter: 8mm- CounterboreDiameter: 16mm- CounterboreDepth: 3mm- End: ThroughAll+ on: MountingArea+ center: spec.Center+ diameter: 8mm+ counterboreDiameter: 16mm+ counterboreDepth: 3mm+ end: ThroughAll}}- Concept Struct Layout On XY {- Rect2 Stock { Center: [0mm,0mm]; Size: [100mm,80mm] }- Point2 South { Position: [0mm,-32mm] }- Point2 East { Position: [45mm,0mm] }- Point2 North { Position: [0mm,32mm] }- Point2 West { Position: [-45mm,0mm] }- Line2 SE { From: South; To: East }- Line2 EN { From: East; To: North }- Line2 NW { From: North; To: West }- Line2 WS { From: West; To: South }+ Concept Struct Layout on XY {+ Rect2 Stock { center: [0mm,0mm]; size: [100mm,80mm] }+ Point2 South { position: [0mm,-32mm] }+ Point2 East { position: [45mm,0mm] }+ Point2 North { position: [0mm,32mm] }+ Point2 West { position: [-45mm,0mm] }+ Line2 SE { from: South; to: East }+ Line2 EN { from: East; to: North }+ Line2 NW { from: North; to: West }+ Line2 WS { from: West; to: South }}- Profile StockProfile Using Layout {+ Profile StockProfile using Layout {Loop Outer { Stock.Bottom |> Stock.Right |> Stock.Top |> Stock.Left |> Close }}- Profile MountBoundary Using Layout {+ Profile MountBoundary using Layout {Loop Outer { SE |> EN |> NW |> WS |> Close }}@@ -49,8 +49,8 @@ Model PlaneHoleSupport {Struct Part {Compose Plate {- Base StockBody { Profile: StockProfile; From: 0mm; To: 8mm; Role: Stock }- Pattern MountPattern Over Mounts { M8Counterbore<Current> }+ Base StockBody { profile: StockProfile; from: 0mm; to: 8mm; role: Stock }+ Pattern MountPattern over Mounts { M8Counterbore<Current> }}}}diff --git a/fixtures/Canonical/Structural/butt-joint.firmament b/fixtures/Canonical/Structural/butt-joint.firmamentindex 79fc35db..f3f81156 100644--- a/fixtures/Canonical/Structural/butt-joint.firmament+++ b/fixtures/Canonical/Structural/butt-joint.firmament@@ -1,5 +1,5 @@Model ButtJoint {- Units: mm+ units: mmStructure Tee { Node A = [0mm,0mm,0mm]; Node B = [800mm,0mm,0mm]; Node C = [400mm,-400mm,0mm]; Node D = [400mm,0mm,0mm]; Path ThroughAxis: A -> B; Path TerminatingAxis: C -> D; }Section RHS { Kind: SquareTube; Width: 40mm; Thickness: 3mm; }Member Through { Path: ThroughAxis; Section: RHS; Material: Standard.Materials.Steel.ASTM_A36; Orientation: [0,0,1]; }diff --git a/fixtures/Canonical/Structural/miter-joint.firmament b/fixtures/Canonical/Structural/miter-joint.firmamentindex 06d9bd3a..43bf501a 100644--- a/fixtures/Canonical/Structural/miter-joint.firmament+++ b/fixtures/Canonical/Structural/miter-joint.firmament@@ -1,5 +1,5 @@Model MiterJoint {- Units: mm+ units: mmStructure Corner { Node A = [0mm,0mm,0mm]; Node B = [600mm,0mm,0mm]; Node C = [600mm,400mm,0mm]; Path Horizontal: A -> B; Path Vertical: B -> C; }Section RHS { Kind: SquareTube; Width: 40mm; Thickness: 3mm; }Member Horizontal { Path: Horizontal; Section: RHS; Material: Standard.Materials.Steel.ASTM_A36; Orientation: [0,0,1]; }diff --git a/fixtures/Canonical/Structural/oriented-angle-member.firmament b/fixtures/Canonical/Structural/oriented-angle-member.firmamentindex 72b6aeda..5e887d6d 100644--- a/fixtures/Canonical/Structural/oriented-angle-member.firmament+++ b/fixtures/Canonical/Structural/oriented-angle-member.firmament@@ -1,5 +1,5 @@Model OrientedAngleMember {- Units: mm+ units: mmStructure Brace { Node A = [0mm,0mm,0mm]; Node B = [0mm,0mm,500mm]; Path Axis: A -> B; }Section L40 { Kind: Angle; Width: 40mm; Height: 40mm; Thickness: 4mm; }Member Brace { Path: Axis; Section: L40; Material: Standard.Materials.Steel.ASTM_A36; Orientation: [1,0,0]; }diff --git a/fixtures/Canonical/Structural/rectangular-tube-member.firmament b/fixtures/Canonical/Structural/rectangular-tube-member.firmamentindex 4ff8c79e..07a368dc 100644--- a/fixtures/Canonical/Structural/rectangular-tube-member.firmament+++ b/fixtures/Canonical/Structural/rectangular-tube-member.firmament@@ -1,5 +1,5 @@Model RectangularTubeMember {- Units: mm+ units: mmStructure Beam { Node A = [0mm,0mm,0mm]; Node B = [0mm,900mm,0mm]; Path Axis: A -> B; }Section RHS { Kind: RectangularTube; Width: 60mm; Height: 40mm; Thickness: 3mm; }Member Beam { Path: Axis; Section: RHS; Material: Standard.Materials.Steel.ASTM_A36; Orientation: [0,0,1]; }diff --git a/fixtures/Canonical/Structural/simple-structural-frame.firmament b/fixtures/Canonical/Structural/simple-structural-frame.firmamentindex 95bf4a71..ad8a136e 100644--- a/fixtures/Canonical/Structural/simple-structural-frame.firmament+++ b/fixtures/Canonical/Structural/simple-structural-frame.firmament@@ -1,5 +1,5 @@Model SimpleStructuralFrame {- Units: mm+ units: mmStructure Frame { Node A = [0mm,0mm,0mm]; Node B = [1000mm,0mm,0mm]; Node C = [1000mm,600mm,0mm]; Node D = [0mm,600mm,0mm]; Path AB: A -> B; Path BC: B -> C; Path CD: C -> D; Path DA: D -> A; }Section RHS { Kind: SquareTube; Width: 40mm; Thickness: 3mm; }Member AB { Path: AB; Section: RHS; Material: Standard.Materials.Steel.ASTM_A36; Orientation: [0,0,1]; }diff --git a/fixtures/Canonical/Structural/square-tube-member.firmament b/fixtures/Canonical/Structural/square-tube-member.firmamentindex e6de7092..018cbcc7 100644--- a/fixtures/Canonical/Structural/square-tube-member.firmament+++ b/fixtures/Canonical/Structural/square-tube-member.firmament@@ -1,5 +1,5 @@Model SquareTubeMember {- Units: mm+ units: mmStructure Beam { Node A = [0mm,0mm,0mm]; Node B = [750mm,0mm,0mm]; Path Axis: A -> B; }Section RHS { Kind: SquareTube; Width: 40mm; Thickness: 3mm; }Member Beam { Path: Axis; Section: RHS; Material: Standard.Materials.Steel.ASTM_A36; Orientation: [0,0,1]; }diff --git a/fixtures/Canonical/Structural/welded-workbench.firmament b/fixtures/Canonical/Structural/welded-workbench.firmamentindex dd71c5fc..31e4971a 100644--- a/fixtures/Canonical/Structural/welded-workbench.firmament+++ b/fixtures/Canonical/Structural/welded-workbench.firmament@@ -1,5 +1,5 @@Model WeldedWorkbench {- Units: mm+ units: mmStructure WorkbenchFrame {Node FLL = [0mm, 0mm, 0mm];diff --git a/fixtures/Canonical/Surfacing/g2-planar-plateau.firmament b/fixtures/Canonical/Surfacing/g2-planar-plateau.firmamentindex 34944228..41917580 100644--- a/fixtures/Canonical/Surfacing/g2-planar-plateau.firmament+++ b/fixtures/Canonical/Surfacing/g2-planar-plateau.firmament@@ -1,9 +1,9 @@Model GenericG2Plateau {- Units: mm+ units: mmStruct Part {- Rect2 BaseBoundary { Center: [0mm,0mm] Size: [100mm,80mm] }+ Rect2 BaseBoundary { center: [0mm,0mm] size: [100mm,80mm] }Profile BaseSection { Loop Outer { BaseBoundary |> TraceLoop } }- Extrude Body { Profile: BaseSection From: 0mm To: 5mm }+ Extrude Body { profile: BaseSection from: 0mm to: 5mm }SmoothRoundedRect2 Footprint { Center: [0mm,0mm] Size: [60mm,40mm] CornerExtent: 8mm }Profile PlateauFootprint { Loop Outer { Footprint |> TraceLoop } }Plateau Raised {diff --git a/fixtures/Canonical/Symmetry/mirrored-feature-with-override.firmament b/fixtures/Canonical/Symmetry/mirrored-feature-with-override.firmamentindex 2107cbcd..b18cf201 100644--- a/fixtures/Canonical/Symmetry/mirrored-feature-with-override.firmament+++ b/fixtures/Canonical/Symmetry/mirrored-feature-with-override.firmament@@ -1,11 +1,11 @@schema MechanicalModel MirroredFeatureWithOverride {- Units: mm- Plane CenterPlane { Origin: [0mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }- Box Plate { Size: [90mm, 44mm, 8mm] }+ units: mm+ Plane CenterPlane { origin: [0mm,0mm,0mm]; normal: [1,0,0]; up: [0,0,1] }+ Box Plate { size: [90mm, 44mm, 8mm] }Modify Plate {- Hole<Shaft> LeftMount { On: +Z; Center: Point2(26mm, 0mm); Diameter: 6mm; End: ThroughAll }- Mirrored Feature RightMount From LeftMount { Across: CenterPlane }+ Hole<Shaft> LeftMount { on: +Z; center: Point2(26mm, 0mm); diameter: 6mm; end: ThroughAll }+ Mirrored Feature RightMount from LeftMount { across: CenterPlane }Feature RightMountCustom = RightMount with { Diameter: 8mm }}}diff --git a/fixtures/Canonical/Symmetry/mirrored-hole.firmament b/fixtures/Canonical/Symmetry/mirrored-hole.firmamentindex 31672a81..f4691c9d 100644--- a/fixtures/Canonical/Symmetry/mirrored-hole.firmament+++ b/fixtures/Canonical/Symmetry/mirrored-hole.firmament@@ -1,10 +1,10 @@schema MechanicalModel MirroredMountingHoles {- Units: mm- Plane CenterPlane { Origin: [0mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }- Box Plate { Size: [80mm, 40mm, 8mm] }+ units: mm+ Plane CenterPlane { origin: [0mm,0mm,0mm]; normal: [1,0,0]; up: [0,0,1] }+ Box Plate { size: [80mm, 40mm, 8mm] }Modify Plate {- Hole<Shaft> LeftMount { On: +Z Center: Point2(24mm, 0mm) Diameter: 6mm End: ThroughAll }- Mirrored Feature RightMount From LeftMount { Across: CenterPlane }+ Hole<Shaft> LeftMount { on: +Z center: Point2(24mm, 0mm) diameter: 6mm end: ThroughAll }+ Mirrored Feature RightMount from LeftMount { across: CenterPlane }}}diff --git a/fixtures/Canonical/Symmetry/mirrored-profile.firmament b/fixtures/Canonical/Symmetry/mirrored-profile.firmamentindex 5ed6fcae..bf237059 100644--- a/fixtures/Canonical/Symmetry/mirrored-profile.firmament+++ b/fixtures/Canonical/Symmetry/mirrored-profile.firmament@@ -1,8 +1,8 @@schema MechanicalModel MirroredProfileExtrusion {- Units: mm+ units: mmConcept Struct Supports {- Center: Plane { Origin: [0mm,0mm,0mm]; Normal: [1,0,0]; Up: [0,0,1] }+ Center: Plane { origin: [0mm,0mm,0mm]; normal: [1,0,0]; up: [0,0,1] }}Construction Plane CenterPlane { Trace: Supports.Center }@@ -14,6 +14,6 @@ Model MirroredProfileExtrusion {Profile LeftProfile {Loop Outer { LeftBoundary |> TraceLoop }}- Mirrored Profile RightProfile From LeftProfile { Across: CenterPlane }- Struct Body { Extrude RightPrism { Profile: RightProfile; From: 0mm; To: 8mm } }+ Mirrored Profile RightProfile from LeftProfile { across: CenterPlane }+ Struct Body { Extrude RightPrism { profile: RightProfile; from: 0mm; to: 8mm } }}diff --git a/fixtures/Canonical/Symmetry/mirrored-revolve.firmament b/fixtures/Canonical/Symmetry/mirrored-revolve.firmamentindex be14a68f..073d7e4f 100644--- a/fixtures/Canonical/Symmetry/mirrored-revolve.firmament+++ b/fixtures/Canonical/Symmetry/mirrored-revolve.firmament@@ -1,10 +1,10 @@schema MechanicalModel MirroredRevolve {- Units: mm- Plane MidPlane { Origin: [0mm,0mm,0mm]; Normal: [0,1,0]; Up: [0,0,1] }- Axis MainAxis { Origin: [0mm,0mm,0mm]; Direction: [0,1,0] }- Rect2 LowerBoundary { Center: [9mm, -14mm] Size: [6mm, 12mm] }+ units: mm+ Plane MidPlane { origin: [0mm,0mm,0mm]; normal: [0,1,0]; up: [0,0,1] }+ Axis MainAxis { origin: [0mm,0mm,0mm]; direction: [0,1,0] }+ Rect2 LowerBoundary { center: [9mm, -14mm] size: [6mm, 12mm] }Profile LowerSection { Loop Outer { LowerBoundary |> TraceLoop } }- Mirrored Profile UpperSection From LowerSection { Across: MidPlane }+ Mirrored Profile UpperSection from LowerSection { across: MidPlane }Revolve UpperRing { Profile: UpperSection; About: MainAxis; Angle: half }}diff --git a/fixtures/Canonical/Symmetry/partial-radial-pattern.firmament b/fixtures/Canonical/Symmetry/partial-radial-pattern.firmamentindex bb36f29a..8c347f75 100644--- a/fixtures/Canonical/Symmetry/partial-radial-pattern.firmament+++ b/fixtures/Canonical/Symmetry/partial-radial-pattern.firmament@@ -1,10 +1,10 @@schema MechanicalModel PartialRadialPattern {- Units: mm- Axis MainAxis { Origin: [0mm,0mm,0mm]; Direction: [0,0,1] }- Box Plate { Size: [80mm, 80mm, 8mm] }+ units: mm+ Axis MainAxis { origin: [0mm,0mm,0mm]; direction: [0,0,1] }+ Box Plate { size: [80mm, 80mm, 8mm] }Modify Plate {- Hole<Shaft> HoleSeed { On: +Z Center: Point2(24mm, 0mm) Diameter: 4mm End: ThroughAll }- Radial Pattern HalfArc { Source: HoleSeed About: MainAxis Count: 5 Angle: half }+ Hole<Shaft> HoleSeed { on: +Z center: Point2(24mm, 0mm) diameter: 4mm end: ThroughAll }+ Radial Pattern HalfArc { source: HoleSeed about: MainAxis count: 5 angle: half }}}diff --git a/fixtures/Canonical/Symmetry/radial-bolt-circle.firmament b/fixtures/Canonical/Symmetry/radial-bolt-circle.firmamentindex 5c279683..020e7483 100644--- a/fixtures/Canonical/Symmetry/radial-bolt-circle.firmament+++ b/fixtures/Canonical/Symmetry/radial-bolt-circle.firmament@@ -1,10 +1,10 @@schema MechanicalModel RadialBoltCircle {- Units: mm- Axis MainAxis { Origin: [0mm,0mm,0mm]; Direction: [0,0,1] }- Box Flange { Size: [80mm, 80mm, 8mm] }+ units: mm+ Axis MainAxis { origin: [0mm,0mm,0mm]; direction: [0,0,1] }+ Box Flange { size: [80mm, 80mm, 8mm] }Modify Flange {- Hole<Shaft> BoltSeed { On: +Z Center: Point2(26mm, 0mm) Diameter: 6mm End: ThroughAll }- Radial Pattern BoltCircle { Source: BoltSeed About: MainAxis Count: 6 Angle: full }+ Hole<Shaft> BoltSeed { on: +Z center: Point2(26mm, 0mm) diameter: 6mm end: ThroughAll }+ Radial Pattern BoltCircle { source: BoltSeed about: MainAxis count: 6 angle: full }}}diff --git a/fixtures/Canonical/Templates/cnc-dfm-policy.firmament b/fixtures/Canonical/Templates/cnc-dfm-policy.firmamentindex 7d0991e5..2850b7a6 100644--- a/fixtures/Canonical/Templates/cnc-dfm-policy.firmament+++ b/fixtures/Canonical/Templates/cnc-dfm-policy.firmament@@ -40,20 +40,20 @@ Struct CncCoupon: CncCouponContract {MinimumHoleDiameter: Policy.MinimumHoleDiameter}Concept Struct Layout: CncCouponContract {- Bounds: Box3 { Size: [30mm, 20mm, 6mm] }+ Bounds: Box3 { size: [30mm, 20mm, 6mm] }TopPlane: Bounds.Face(+Z)- ProbePoints: Grid { Within: Bounds.Face(+Z).Inset(5mm); Columns: 1; Rows: 1 }+ ProbePoints: Grid { within: Bounds.Face(+Z).Inset(5mm); columns: 1; rows: 1 }}- Box Coupon { Bounds: Layout.Bounds }+ Box Coupon { bounds: Layout.Bounds }Modify Coupon {Hole<Shaft> Probe {- On: Coupon.Top- Center: Layout.ProbePoints[0]- Diameter: 4mm- End: ThroughAll+ on: Coupon.Top+ center: Layout.ProbePoints[0]+ diameter: 4mm+ end: ThroughAll}}- Expose {+ expose {Bounds: Layout.BoundsTopPlane: Coupon.TopProbePoints: Layout.ProbePointsdiff --git a/fixtures/Canonical/Templates/fdm-dfm-policy.firmament b/fixtures/Canonical/Templates/fdm-dfm-policy.firmamentindex 82e692da..563a23e3 100644--- a/fixtures/Canonical/Templates/fdm-dfm-policy.firmament+++ b/fixtures/Canonical/Templates/fdm-dfm-policy.firmament@@ -39,20 +39,20 @@ Struct FdmCoupon: FdmCouponContract {LayerHeight: Policy.LayerHeight}Concept Struct Layout: FdmCouponContract {- Bounds: Box3 { Size: [20mm, 20mm, 4mm] }+ Bounds: Box3 { size: [20mm, 20mm, 4mm] }TopPlane: Bounds.Face(+Z)- ProbePoints: Grid { Within: Bounds.Face(+Z).Inset(5mm); Columns: 1; Rows: 1 }+ ProbePoints: Grid { within: Bounds.Face(+Z).Inset(5mm); columns: 1; rows: 1 }}- Box Coupon { Bounds: Layout.Bounds }+ Box Coupon { bounds: Layout.Bounds }Modify Coupon {Hole<Shaft> Probe {- On: Coupon.Top- Center: Layout.ProbePoints[0]- Diameter: 4mm- End: ThroughAll+ on: Coupon.Top+ center: Layout.ProbePoints[0]+ diameter: 4mm+ end: ThroughAll}}- Expose {+ expose {Bounds: Layout.BoundsTopPlane: Coupon.TopProbePoints: Layout.ProbePointsdiff --git a/fixtures/Canonical/Templates/generic-mounting-plate.firmament b/fixtures/Canonical/Templates/generic-mounting-plate.firmamentindex 763cf193..f37655aa 100644--- a/fixtures/Canonical/Templates/generic-mounting-plate.firmament+++ b/fixtures/Canonical/Templates/generic-mounting-plate.firmament@@ -8,24 +8,24 @@ Template<Width: Length, Height: Length, Thickness: Length, HoleDiameter: Length>Struct MountingPlate: MountingPlateContract {Require Positive => Width > 0mm && Height > 0mm && Thickness > 0mm && HoleDiameter > 0mmConcept Struct Design: MountingPlateContract {- Bounds: Box3 { Size: [Width, Height, Thickness] }+ Bounds: Box3 { size: [Width, Height, Thickness] }TopPlane: Bounds.Face(+Z)MountPoints: Grid {- Within: Bounds.Face(+Z).Inset(10mm)- Columns: 1- Rows: 1+ within: Bounds.Face(+Z).Inset(10mm)+ columns: 1+ rows: 1}}- Box Plate { Bounds: Design.Bounds }+ Box Plate { bounds: Design.Bounds }Modify Plate {Hole<Shaft> CenterMount {- On: Plate.Top- Center: Design.MountPoints[0]- Diameter: HoleDiameter- End: ThroughAll+ on: Plate.Top+ center: Design.MountPoints[0]+ diameter: HoleDiameter+ end: ThroughAll}}- Expose {+ expose {Bounds: Design.BoundsTopPlane: Plate.TopMountPoints: Design.MountPointsdiff --git a/fixtures/Canonical/Templates/local-closed-boundaries.firmament b/fixtures/Canonical/Templates/local-closed-boundaries.firmamentindex 5d07c4ec..b5e1b10b 100644--- a/fixtures/Canonical/Templates/local-closed-boundaries.firmament+++ b/fixtures/Canonical/Templates/local-closed-boundaries.firmament@@ -1,14 +1,14 @@Model LocalClosedBoundaries {- Units: mm+ units: mmTemplate < R: Length > Struct Disc {- Circle2 Outside { Center: [0mm,0mm] Radius: R }+ Circle2 Outside { center: [0mm,0mm] radius: R }Profile Section { Loop Outer { Outside |> TraceLoop } }- Extrude Body { Profile: Section From: 0mm To: 8mm }+ Extrude Body { profile: Section from: 0mm to: 8mm }}Template < Width: Length > Struct Plate {- Rect2 Outside { Center: [0mm,0mm] Size: [Width,20mm] }+ Rect2 Outside { center: [0mm,0mm] size: [Width,20mm] }Profile Section { Loop Outer { Outside |> TraceLoop } }- Extrude Body { Profile: Section From: 0mm To: 8mm }+ Extrude Body { profile: Section from: 0mm to: 8mm }}Struct Selected = Disc<R: 20mm>}diff --git a/fixtures/Canonical/Templates/nested-template-pmi.firmament b/fixtures/Canonical/Templates/nested-template-pmi.firmamentindex 797fb8ce..a1abe5a2 100644--- a/fixtures/Canonical/Templates/nested-template-pmi.firmament+++ b/fixtures/Canonical/Templates/nested-template-pmi.firmament@@ -1,5 +1,5 @@Model NestedTemplatePmi {- Units: mm+ units: mmConcept MountingPlateContract {Bounds: Box3@@ -9,24 +9,24 @@ Model NestedTemplatePmi {Template<> Struct PmiPlate {Concept Struct Design: MountingPlateContract {- Bounds: Box3 { Size: [40mm, 30mm, 8mm] }+ Bounds: Box3 { size: [40mm, 30mm, 8mm] }TopPlane: Bounds.Face(+Z)MountPoints: Grid {- Within: Bounds.Face(+Z).Inset(10mm)- Columns: 1- Rows: 1+ within: Bounds.Face(+Z).Inset(10mm)+ columns: 1+ rows: 1}}- Box Base { Bounds: Design.Bounds }+ Box Base { bounds: Design.Bounds }Modify Base {Hole<Shaft> Mount {- On: Base.Top- Center: Design.MountPoints[0]- Diameter: 6mm- End: ThroughAll+ on: Base.Top+ center: Design.MountPoints[0]+ diameter: 6mm+ end: ThroughAll}}- Expose {+ expose {Bounds: Design.BoundsTopPlane: Base.TopMountPoints: Design.MountPointsdiff --git a/fixtures/Canonical/Templates/paperclip.firmament b/fixtures/Canonical/Templates/paperclip.firmamentindex e63a006c..cccd8bb6 100644--- a/fixtures/Canonical/Templates/paperclip.firmament+++ b/fixtures/Canonical/Templates/paperclip.firmament@@ -1,5 +1,5 @@Model StandardProductsOfficePaperclip {- Units: mm+ units: mmRecord PaperclipPolicy {WireDiameter: LengthOuterLegLength: Lengthdiff --git a/fixtures/Canonical/Templates/record-array-profile-family.firmament b/fixtures/Canonical/Templates/record-array-profile-family.firmamentindex 980c22aa..de676a40 100644--- a/fixtures/Canonical/Templates/record-array-profile-family.firmament+++ b/fixtures/Canonical/Templates/record-array-profile-family.firmament@@ -1,24 +1,24 @@Model GeneratedProfile {- Units: mm+ units: mmRecord ProfileSpec { Center: Point2 }Static Specs: ProfileSpec[] = [ ProfileSpec { Center: Point2(0mm, 0mm) } ]Template<spec: ProfileSpec> PlateProfile {- Profile Plate Using Layout {+ Profile Plate using Layout {Loop Outer {- Stock.Bottom As South- |> Stock.Right As East- |> Stock.Top As North- |> Stock.Left As West+ Stock.Bottom as South+ |> Stock.Right as East+ |> Stock.Top as North+ |> Stock.Left as West|> Close}}}- Concept Struct Layout On XY {- Rect2 Stock { Center: Specs[0].Center; Size: [20mm, 10mm] }+ Concept Struct Layout on XY {+ Rect2 Stock { center: Specs[0].Center; size: [20mm, 10mm] }}PlateProfile<Specs[0]>- Struct PlateBody { Extrude Plate { Profile: Plate; From: -2mm; To: 2mm } }+ Struct PlateBody { Extrude Plate { profile: Plate; from: -2mm; to: 2mm } }}diff --git a/fixtures/Canonical/Templates/sheet-metal-dfm-policy.firmament b/fixtures/Canonical/Templates/sheet-metal-dfm-policy.firmamentindex f83eb178..a4395b14 100644--- a/fixtures/Canonical/Templates/sheet-metal-dfm-policy.firmament+++ b/fixtures/Canonical/Templates/sheet-metal-dfm-policy.firmament@@ -36,20 +36,20 @@ Struct SheetMetalCoupon: SheetMetalCouponContract {KFactor: Policy.KFactor}Concept Struct Layout: SheetMetalCouponContract {- Bounds: Box3 { Size: [40mm, 20mm, Policy.Thickness] }+ Bounds: Box3 { size: [40mm, 20mm, Policy.Thickness] }TopPlane: Bounds.Face(+Z)- ProbePoints: Grid { Within: Bounds.Face(+Z).Inset(5mm); Columns: 1; Rows: 1 }+ ProbePoints: Grid { within: Bounds.Face(+Z).Inset(5mm); columns: 1; rows: 1 }}- Box Coupon { Bounds: Layout.Bounds }+ Box Coupon { bounds: Layout.Bounds }Modify Coupon {Hole<Shaft> Probe {- On: Coupon.Top- Center: Layout.ProbePoints[0]- Diameter: 4mm- End: ThroughAll+ on: Coupon.Top+ center: Layout.ProbePoints[0]+ diameter: 4mm+ end: ThroughAll}}- Expose {+ expose {Bounds: Layout.BoundsTopPlane: Coupon.TopProbePoints: Layout.ProbePointsdiff --git a/fixtures/Canonical/Templates/table-driven-mounting-plate.firmament b/fixtures/Canonical/Templates/table-driven-mounting-plate.firmamentindex bf17248a..9a72ff26 100644--- a/fixtures/Canonical/Templates/table-driven-mounting-plate.firmament+++ b/fixtures/Canonical/Templates/table-driven-mounting-plate.firmament@@ -1,5 +1,5 @@Model TableTemplateConceptPathCompose {- Units: mm+ units: mmEnum PlateKind { Small Large }Record PlateStandard {Kind: PlateKind@@ -26,17 +26,17 @@ Model TableTemplateConceptPathCompose {Template<Spec: PlateSpec>Struct PlateTemplate {Require Positive => Spec.Standard.Width > 0mm && Spec.Standard.Height > 0mm && Spec.Thickness > 0mm- Concept Path Outline {- Start: Point2(0mm, 0mm)- Heading: 0deg- Line South { Length: Spec.Standard.Width }- Line East { Turn: 90deg; Length: Spec.Standard.Height }- Line North { Turn: 90deg; Length: Spec.Standard.Width }+ Path Outline {+ start: Point2(0mm, 0mm)+ heading: 0deg+ Line South { length: Spec.Standard.Width }+ Line East { Turn: 90deg; length: Spec.Standard.Height }+ Line North { Turn: 90deg; length: Spec.Standard.Width }Close West}- Profile PlateProfile From Outline+ Profile PlateProfile from OutlineCompose Body {- Base Stock { Profile: PlateProfile; From: 0mm; To: Spec.Thickness; Role: Stock }+ Base Stock { profile: PlateProfile; from: 0mm; to: Spec.Thickness; role: Stock }}Selection TopBoundary {Target: TopBoundarydiff --git a/fixtures/Canonical/ThreeDm/lamp-base-intent.firmament b/fixtures/Canonical/ThreeDm/lamp-base-intent.firmamentindex a10469ed..e76e4cfe 100644--- a/fixtures/Canonical/ThreeDm/lamp-base-intent.firmament+++ b/fixtures/Canonical/ThreeDm/lamp-base-intent.firmament@@ -1,38 +1,38 @@Model LampBaseIntent {- Units: mm+ units: mm// The large opening is the XY datum. Source XY is translated by (-38, 0) mm.- Concept Struct BaseSketch On XY {- Point2 Nose { Position: [-144.9mm, 0mm] }- Point2 UpperNoseHandle { Position: [-144.9mm, 53.96mm] }- Point2 UpperShoulderHandle { Position: [-47.32mm, 74.4mm] }- Point2 UpperShoulder { Position: [-5.5mm, 74.4mm] }- Point2 LowerShoulder { Position: [-5.5mm, -74.4mm] }- Point2 LowerShoulderHandle { Position: [-47.32mm, -74.4mm] }- Point2 LowerNoseHandle { Position: [-144.9mm, -53.96mm] }- Point2 RoundCenter { Position: [-5.5mm, 0mm] }- Point2 OpeningCenter { Position: [0mm, 0mm] }- Point2 PostMountCenter { Position: [-116mm, 0mm] }- Point2 AuxiliaryMountCenter { Position: [-82mm, -25mm] }+ Concept Struct BaseSketch on XY {+ Point2 Nose { position: [-144.9mm, 0mm] }+ Point2 UpperNoseHandle { position: [-144.9mm, 53.96mm] }+ Point2 UpperShoulderHandle { position: [-47.32mm, 74.4mm] }+ Point2 UpperShoulder { position: [-5.5mm, 74.4mm] }+ Point2 LowerShoulder { position: [-5.5mm, -74.4mm] }+ Point2 LowerShoulderHandle { position: [-47.32mm, -74.4mm] }+ Point2 LowerNoseHandle { position: [-144.9mm, -53.96mm] }+ Point2 RoundCenter { position: [-5.5mm, 0mm] }+ Point2 OpeningCenter { position: [0mm, 0mm] }+ Point2 PostMountCenter { position: [-116mm, 0mm] }+ Point2 AuxiliaryMountCenter { position: [-82mm, -25mm] }- CubicBezier2 UpperFlank { From: UpperShoulder; Control1: UpperShoulderHandle; Control2: UpperNoseHandle; To: Nose }- Circle2 RoundEnd { Center: RoundCenter; Radius: 74.4mm }- CubicBezier2 LowerFlank { From: Nose; Control1: LowerNoseHandle; Control2: LowerShoulderHandle; To: LowerShoulder }- Circle2 LargeOpening { Center: OpeningCenter; Radius: 61.6mm }- Circle2 PostMount { Center: PostMountCenter; Radius: 7mm }- Circle2 AuxiliaryMount { Center: AuxiliaryMountCenter; Radius: 3.5mm }+ CubicBezier2 UpperFlank { from: UpperShoulder; control1: UpperShoulderHandle; control2: UpperNoseHandle; to: Nose }+ Circle2 RoundEnd { center: RoundCenter; radius: 74.4mm }+ CubicBezier2 LowerFlank { from: Nose; control1: LowerNoseHandle; control2: LowerShoulderHandle; to: LowerShoulder }+ Circle2 LargeOpening { center: OpeningCenter; radius: 61.6mm }+ Circle2 PostMount { center: PostMountCenter; radius: 7mm }+ Circle2 AuxiliaryMount { center: AuxiliaryMountCenter; radius: 3.5mm }}- Profile PlateSection Using BaseSketch {+ Profile PlateSection using BaseSketch {Loop Outer {- Segment Lower { Trace: LowerFlank; From: Nose; To: LowerShoulder }- Segment Round { Trace: RoundEnd; From: LowerShoulder; To: UpperShoulder; Sweep: CounterClockwise }- Segment Upper { Trace: UpperFlank; From: UpperShoulder; To: Nose }+ Segment Lower { trace: LowerFlank; from: Nose; to: LowerShoulder }+ Segment Round { trace: RoundEnd; from: LowerShoulder; to: UpperShoulder; sweep: CounterClockwise }+ Segment Upper { trace: UpperFlank; from: UpperShoulder; to: Nose }}- Loop Inner { LargeOpening As OpeningBoundary |> TraceLoop }- Loop Inner { PostMount As PostBoundary |> TraceLoop }- Loop Inner { AuxiliaryMount As AuxiliaryBoundary |> TraceLoop }+ Loop Inner { LargeOpening as OpeningBoundary |> TraceLoop }+ Loop Inner { PostMount as PostBoundary |> TraceLoop }+ Loop Inner { AuxiliaryMount as AuxiliaryBoundary |> TraceLoop }}- Struct Base { Extrude PrimaryPlate { Profile: PlateSection; From: 0mm; To: 12mm } }+ Struct Base { Extrude PrimaryPlate { profile: PlateSection; from: 0mm; to: 12mm } }}diff --git a/fixtures/Canonical/ThreeDm/lamp-shade-loft.firmament b/fixtures/Canonical/ThreeDm/lamp-shade-loft.firmamentindex 486bd4c8..d991aaae 100644--- a/fixtures/Canonical/ThreeDm/lamp-shade-loft.firmament+++ b/fixtures/Canonical/ThreeDm/lamp-shade-loft.firmament@@ -1,6 +1,6 @@schema SectionChainModel CartesianLampShade {- Units: mm+ units: mmConcept Struct Stations {RearDatum: Plane { Origin: [-39mm, 0mm, 451.4mm]; Normal: [0.8, 0, -0.6]; Up: [0, 1, 0] }@@ -9,21 +9,21 @@ Model CartesianLampShade {Construction Plane RearFrame { Trace: Stations.RearDatum }Construction Plane FrontFrame { Trace: Stations.FrontDatum }- Circle2 RearContour { Center: [0mm, 0mm] Radius: 27mm }+ Circle2 RearContour { center: [0mm, 0mm] radius: 27mm }Ellipse2 FrontContour { Center: [-0.374mm, 0mm] AxisLengths: [162.284mm, 157.836mm] Rotation: 174.97169564455444deg }Profile RearOutline { Loop Outer { RearContour |> TraceLoop } }Profile FrontOutline { Loop Outer { FrontContour |> TraceLoop } }Loft<Hollow> Shade {- RearProfile: RearOutline- RearFrame: RearFrame- FrontProfile: FrontOutline- FrontFrame: FrontFrame+ rearProfile: RearOutline+ rearFrame: RearFrame+ frontProfile: FrontOutline+ frontFrame: FrontFrameThickness: 1mm- Rule: Ruled- Correspondence: CommonRay- Reference: [0, 1, 0]- Twist: 0deg+ rule: Ruled+ correspondence: CommonRay+ reference: [0, 1, 0]+ twist: 0degSeamGap: 0.1deg}}diff --git a/fixtures/Canonical/ThreeDm/lamp-visible-intent.firmament b/fixtures/Canonical/ThreeDm/lamp-visible-intent.firmamentindex 3d41d85e..8a7d2693 100644--- a/fixtures/Canonical/ThreeDm/lamp-visible-intent.firmament+++ b/fixtures/Canonical/ThreeDm/lamp-visible-intent.firmament@@ -4,56 +4,56 @@ Template<OpeningRadius: Length>Struct LampBase {// The large opening is the XY datum. Source XY is translated by (-38, 0) mm.- Concept Struct BaseSketch On XY {- Point2 Nose { Position: [-144.9mm, 0mm] }- Point2 UpperNoseHandle { Position: [-144.9mm, 53.96mm] }- Point2 UpperShoulderHandle { Position: [-47.32mm, 74.4mm] }- Point2 UpperShoulder { Position: [-5.5mm, 74.4mm] }- Point2 LowerShoulder { Position: [-5.5mm, -74.4mm] }- Point2 LowerShoulderHandle { Position: [-47.32mm, -74.4mm] }- Point2 LowerNoseHandle { Position: [-144.9mm, -53.96mm] }- Point2 RoundCenter { Position: [-5.5mm, 0mm] }- Point2 OpeningCenter { Position: [0mm, 0mm] }- Point2 PostMountCenter { Position: [-116mm, 0mm] }- Point2 AuxiliaryMountCenter { Position: [-82mm, -25mm] }+ Concept Struct BaseSketch on XY {+ Point2 Nose { position: [-144.9mm, 0mm] }+ Point2 UpperNoseHandle { position: [-144.9mm, 53.96mm] }+ Point2 UpperShoulderHandle { position: [-47.32mm, 74.4mm] }+ Point2 UpperShoulder { position: [-5.5mm, 74.4mm] }+ Point2 LowerShoulder { position: [-5.5mm, -74.4mm] }+ Point2 LowerShoulderHandle { position: [-47.32mm, -74.4mm] }+ Point2 LowerNoseHandle { position: [-144.9mm, -53.96mm] }+ Point2 RoundCenter { position: [-5.5mm, 0mm] }+ Point2 OpeningCenter { position: [0mm, 0mm] }+ Point2 PostMountCenter { position: [-116mm, 0mm] }+ Point2 AuxiliaryMountCenter { position: [-82mm, -25mm] }- CubicBezier2 UpperFlank { From: UpperShoulder; Control1: UpperShoulderHandle; Control2: UpperNoseHandle; To: Nose }- Circle2 RoundEnd { Center: RoundCenter; Radius: 74.4mm }- CubicBezier2 LowerFlank { From: Nose; Control1: LowerNoseHandle; Control2: LowerShoulderHandle; To: LowerShoulder }- Circle2 LargeOpening { Center: OpeningCenter; Radius: OpeningRadius }- Circle2 PostMount { Center: PostMountCenter; Radius: 7mm }- Circle2 AuxiliaryMount { Center: AuxiliaryMountCenter; Radius: 3.5mm }+ CubicBezier2 UpperFlank { from: UpperShoulder; control1: UpperShoulderHandle; control2: UpperNoseHandle; to: Nose }+ Circle2 RoundEnd { center: RoundCenter; radius: 74.4mm }+ CubicBezier2 LowerFlank { from: Nose; control1: LowerNoseHandle; control2: LowerShoulderHandle; to: LowerShoulder }+ Circle2 LargeOpening { center: OpeningCenter; radius: OpeningRadius }+ Circle2 PostMount { center: PostMountCenter; radius: 7mm }+ Circle2 AuxiliaryMount { center: AuxiliaryMountCenter; radius: 3.5mm }}- Profile PlateSection Using BaseSketch {+ Profile PlateSection using BaseSketch {Loop Outer {- Segment Lower { Trace: LowerFlank; From: Nose; To: LowerShoulder }- Segment Round { Trace: RoundEnd; From: LowerShoulder; To: UpperShoulder; Sweep: CounterClockwise }- Segment Upper { Trace: UpperFlank; From: UpperShoulder; To: Nose }+ Segment Lower { trace: LowerFlank; from: Nose; to: LowerShoulder }+ Segment Round { trace: RoundEnd; from: LowerShoulder; to: UpperShoulder; sweep: CounterClockwise }+ Segment Upper { trace: UpperFlank; from: UpperShoulder; to: Nose }}- Loop Inner { LargeOpening As OpeningBoundary |> TraceLoop }- Loop Inner { PostMount As PostBoundary |> TraceLoop }- Loop Inner { AuxiliaryMount As AuxiliaryBoundary |> TraceLoop }+ Loop Inner { LargeOpening as OpeningBoundary |> TraceLoop }+ Loop Inner { PostMount as PostBoundary |> TraceLoop }+ Loop Inner { AuxiliaryMount as AuxiliaryBoundary |> TraceLoop }}- Struct Base { Extrude PrimaryPlate { Profile: PlateSection; From: 0mm; To: 12mm } }+ Struct Base { Extrude PrimaryPlate { profile: PlateSection; from: 0mm; to: 12mm } }}// Product frame follows the source millimetre XY/Z axes. The base profile has its own opening-centered datum.Template<PoleRadius: Length, PoleHeight: Length>Struct Upright {- Circle2 SectionCircle { Center: [0mm,0mm] Radius: PoleRadius }+ Circle2 SectionCircle { center: [0mm,0mm] radius: PoleRadius }Profile Section { Loop Outer { SectionCircle |> TraceLoop } }- Extrude Shaft { Profile: Section From: 0mm To: PoleHeight }+ Extrude Shaft { profile: Section from: 0mm to: PoleHeight }}Template<OuterRadius: Length, InnerRadius: Length, CollarHeight: Length>Struct AnnularCollar {- Circle2 Outside { Center: [0mm,0mm] Radius: OuterRadius }- Circle2 Inside { Center: [0mm,0mm] Radius: InnerRadius }- Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside As BoreBoundary |> TraceLoop } }- Extrude Body { Profile: Section From: 0mm To: CollarHeight }+ Circle2 Outside { center: [0mm,0mm] radius: OuterRadius }+ Circle2 Inside { center: [0mm,0mm] radius: InnerRadius }+ Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside as BoreBoundary |> TraceLoop } }+ Extrude Body { profile: Section from: 0mm to: CollarHeight }}// The original underside nut sits within the omitted recessed pocket. This@@ -61,49 +61,49 @@ Struct AnnularCollar {Template<WidthAcrossFlats: Length, BoreRadius: Length, NutHeight: Length>Struct HexNut {RegularPolygon2<6> Outside { Center: [0mm, 0mm] AcrossFlats: WidthAcrossFlats Rotation: 0deg }- Circle2 Bore { Center: [0mm, 0mm] Radius: BoreRadius }- Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Bore As BoreBoundary |> TraceLoop } }- Extrude Body { Profile: Section From: 0mm To: NutHeight }+ Circle2 Bore { center: [0mm, 0mm] radius: BoreRadius }+ Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Bore as BoreBoundary |> TraceLoop } }+ Extrude Body { profile: Section from: 0mm to: NutHeight }}Template<PivotRadius: Length, PivotLength: Length>Struct PivotPin {- Circle2 SectionCircle { Center: [0mm,0mm] Radius: PivotRadius }+ Circle2 SectionCircle { center: [0mm,0mm] radius: PivotRadius }Profile Section { Loop Outer { SectionCircle |> TraceLoop } }- Extrude Body { Profile: Section From: 0mm To: PivotLength }+ Extrude Body { profile: Section from: 0mm to: PivotLength }}Template<OutsideRadius: Length, InsideRadius: Length, TubeLength: Length>Struct HeadTube {- Circle2 Outside { Center: [0mm,0mm] Radius: OutsideRadius }- Circle2 Inside { Center: [0mm,0mm] Radius: InsideRadius }- Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside As InteriorBoundary |> TraceLoop } }- Extrude Body { Profile: Section From: 0mm To: TubeLength }+ Circle2 Outside { center: [0mm,0mm] radius: OutsideRadius }+ Circle2 Inside { center: [0mm,0mm] radius: InsideRadius }+ Profile Section { Loop Outer { Outside |> TraceLoop } Loop Inner { Inside as InteriorBoundary |> TraceLoop } }+ Extrude Body { profile: Section from: 0mm to: TubeLength }}Assembly CartesianLamp {<Assembly CartesianLamp><Part Base = LampBase<OpeningRadius: 61.6mm>>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,38,0,0,1];+ Placement { from: Origin; to: Parent; translateLocal: [38mm, 0mm, 0mm]; }</Part><Part Pole = Upright<PoleRadius: 5.5mm, PoleHeight: 429mm>>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,-78,0,2,1];+ Placement { from: Origin; to: Parent; translateLocal: [-78mm, 0mm, 2mm]; }</Part><Part LowerCollar = AnnularCollar<OuterRadius: 9mm, InnerRadius: 5.5mm, CollarHeight: 11mm>>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,-78,0,12,1];+ Placement { from: Origin; to: Parent; translateLocal: [-78mm, 0mm, 12mm]; }</Part><Part MountNut = HexNut<WidthAcrossFlats: 17.32mm, BoreRadius: 5.5mm, NutHeight: 3mm>>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,-78,0,-3,1];+ Placement { from: Origin; to: Parent; translateLocal: [-78mm, 0mm, -3mm]; }</Part><Part Pivot = PivotPin<PivotRadius: 10mm, PivotLength: 20mm>>- Placement LegacyExplicit = [1,0,0,0,0,0,-1,0,0,1,0,0,-78,-10,441,1];+ Placement { from: Origin; to: Parent; translateLocal: [-78mm, -10mm, 441mm]; rotateLocal: { axis: X; angle: -90deg; }; }</Part><Part LampBody = HeadTube<OutsideRadius: 27mm, InsideRadius: 26mm, TubeLength: 143.5mm>>- Placement LegacyExplicit = [-0.6,0,-0.8,0,0,1,0,0,0.8,0,-0.6,0,-153.8,0,537.5,1];+ Placement { from: Origin; to: Parent; translateLocal: [-153.8mm, 0mm, 537.5mm]; rotateLocal: { axis: Y; angle: 126.86989764584402deg; }; }</Part><Part Shade = LoftFile<"lamp-shade-loft.firmament">>- Placement LegacyExplicit = [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1];+ Placement { from: Origin; to: Parent; }</Part></Assembly>- Anchor: CartesianLamp;+ anchor: CartesianLamp;}diff --git a/fixtures/Canonical/WebSdk/editable-bracket.firmament b/fixtures/Canonical/WebSdk/editable-bracket.firmamentindex d9a296d8..e57b41fd 100644--- a/fixtures/Canonical/WebSdk/editable-bracket.firmament+++ b/fixtures/Canonical/WebSdk/editable-bracket.firmament@@ -1,7 +1,7 @@Model WebBracket {- Units: mm- Box Plate { Size: [50mm, 40mm, 8mm] }+ units: mm+ Box Plate { size: [50mm, 40mm, 8mm] }Modify Plate {- Hole<Shaft> CenterMount { On: +Z Center: Point2(0mm, 0mm) Diameter: 8mm End: ThroughAll }+ Hole<Shaft> CenterMount { on: +Z center: Point2(0mm, 0mm) diameter: 8mm end: ThroughAll }}}diff --git a/fixtures/Canonical/WebSdk/shared-block-assembly.firmament b/fixtures/Canonical/WebSdk/shared-block-assembly.firmamentindex 73ed839d..8d39839d 100644--- a/fixtures/Canonical/WebSdk/shared-block-assembly.firmament+++ b/fixtures/Canonical/WebSdk/shared-block-assembly.firmament@@ -1,9 +1,9 @@Units: mmTemplate < H: Length > Struct WebBlock {- Circle2 Circle { Center: [0mm,0mm] Radius: 4mm }+ Circle2 Circle { center: [0mm,0mm] radius: 4mm }Profile Section { Loop Outer { Circle |> TraceLoop } }- Extrude Body { Profile: Section From: 0mm To: H }+ Extrude Body { profile: Section from: 0mm to: H }}Assembly WebBlockPair {@@ -13,5 +13,5 @@ Assembly WebBlockPair {Placement ImportedOccurrence = [1,0,0,0, 0,1,0,0, 0,0,1,0, 20,0,0,1];</Part></Assembly>- Anchor: WebBlockPair.Fixed;+ anchor: WebBlockPair.Fixed;}diff --git a/fixtures/Canonical/WireForm/Knot/figure-eight.firmament b/fixtures/Canonical/WireForm/Knot/figure-eight.firmamentindex 69e32f50..b6bb491c 100644--- a/fixtures/Canonical/WireForm/Knot/figure-eight.firmament+++ b/fixtures/Canonical/WireForm/Knot/figure-eight.firmament@@ -1,5 +1,5 @@Model KnotFigureEight {- Units: mm+ units: mmWireForm FigureEightSculpture {Diameter: 6mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/Knot/rotated-trefoil.firmament b/fixtures/Canonical/WireForm/Knot/rotated-trefoil.firmamentindex cbcd2f8a..a1d4cffe 100644--- a/fixtures/Canonical/WireForm/Knot/rotated-trefoil.firmament+++ b/fixtures/Canonical/WireForm/Knot/rotated-trefoil.firmament@@ -1,5 +1,5 @@Model RotatedTrefoil {- Units: mm+ units: mmWireForm RotatedTrefoil {Diameter: 6mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/Knot/torus-knot-3-5.firmament b/fixtures/Canonical/WireForm/Knot/torus-knot-3-5.firmamentindex 1898c959..fc12c44f 100644--- a/fixtures/Canonical/WireForm/Knot/torus-knot-3-5.firmament+++ b/fixtures/Canonical/WireForm/Knot/torus-knot-3-5.firmament@@ -1,5 +1,5 @@Model TorusKnot35 {- Units: mm+ units: mmWireForm TorusKnotSculpture {Diameter: 5mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/Knot/trefoil-near-limit.firmament b/fixtures/Canonical/WireForm/Knot/trefoil-near-limit.firmamentindex 1ae22be8..c2a14a01 100644--- a/fixtures/Canonical/WireForm/Knot/trefoil-near-limit.firmament+++ b/fixtures/Canonical/WireForm/Knot/trefoil-near-limit.firmament@@ -1,5 +1,5 @@Model TrefoilNearLimit {- Units: mm+ units: mmWireForm TrefoilNearLimit {Diameter: 22mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/Knot/trefoil-thin.firmament b/fixtures/Canonical/WireForm/Knot/trefoil-thin.firmamentindex 4e0c71ed..8da249d8 100644--- a/fixtures/Canonical/WireForm/Knot/trefoil-thin.firmament+++ b/fixtures/Canonical/WireForm/Knot/trefoil-thin.firmament@@ -1,5 +1,5 @@Model TrefoilThin {- Units: mm+ units: mmWireForm TrefoilThin {Diameter: 3mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/Knot/trefoil.firmament b/fixtures/Canonical/WireForm/Knot/trefoil.firmamentindex b731bf3d..ce81a447 100644--- a/fixtures/Canonical/WireForm/Knot/trefoil.firmament+++ b/fixtures/Canonical/WireForm/Knot/trefoil.firmament@@ -1,5 +1,5 @@Model Knot1Trefoil {- Units: mm+ units: mmWireForm Knot1 {Diameter: 6mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/axis-coil.firmament b/fixtures/Canonical/WireForm/axis-coil.firmamentindex 727caeaf..3b05c5fe 100644--- a/fixtures/Canonical/WireForm/axis-coil.firmament+++ b/fixtures/Canonical/WireForm/axis-coil.firmament@@ -1,5 +1,5 @@Model AxisCoilWitness {- Units: mm+ units: mmWireForm AxisSpring {Diameter: 2mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/helix.firmament b/fixtures/Canonical/WireForm/helix.firmamentindex 6df139c9..048854d0 100644--- a/fixtures/Canonical/WireForm/helix.firmament+++ b/fixtures/Canonical/WireForm/helix.firmament@@ -1,15 +1,15 @@Model HelixWitness {- Units: mm+ units: mmWireForm AxisSpring {Diameter: 2mmMaterial: Standard.Materials.StainlessSteel.304_AnnealedStartFrame { Origin: [0mm,0mm,0mm]; Tangent: [1,0,0]; Up: [0,0,1] }Helix Winding {- Radius: 12mm- Turns: 8- Pitch: 5mm- Handedness: RightHanded- StartPhase: 0deg+ radius: 12mm+ turns: 8+ pitch: 5mm+ handedness: RightHanded+ startPhase: 0deg}}}diff --git a/fixtures/Canonical/WireForm/left-handed-axis-coil.firmament b/fixtures/Canonical/WireForm/left-handed-axis-coil.firmamentindex 0467eee4..51f8d235 100644--- a/fixtures/Canonical/WireForm/left-handed-axis-coil.firmament+++ b/fixtures/Canonical/WireForm/left-handed-axis-coil.firmament@@ -1,9 +1,9 @@Model LeftAxisCoilWitness {- Units: mm+ units: mmWireForm LeftSpring {Diameter: 2mmMaterial: Standard.Materials.StainlessSteel.304_AnnealedStartFrame { Origin: [0mm,0mm,0mm]; Tangent: [1,0,0]; Up: [0,0,1] }- AxisCoil Winding { Radius: 12mm; Turns: 6; Height: 30mm; Handedness: LeftHanded }+ Helix Winding { radius: 12mm; turns: 6; height: 30mm; handedness: LeftHanded }}}diff --git a/fixtures/Canonical/WireForm/line-guide.firmament b/fixtures/Canonical/WireForm/line-guide.firmamentindex 3f4e86ac..c3ec7c05 100644--- a/fixtures/Canonical/WireForm/line-guide.firmament+++ b/fixtures/Canonical/WireForm/line-guide.firmament@@ -1,16 +1,16 @@Model GuidedLead {- Units: mm+ units: mmConcept Struct HarnessLayout {Line3 Groove { From: Point3(0mm,0mm,0mm); To: Point3(100mm,0mm,0mm); }}WireRoute Signal {- Diameter: 2mm;- Material: Standard.Materials.StainlessSteel.304_Annealed;- MinimumBendRadius: 10mm;+ diameter: 2mm;+ material: Standard.Materials.StainlessSteel.304_Annealed;+ minimumBendRadius: 10mm;Path {- Start { At: Point3(0mm,-40mm,0mm); }- Follow MainGroove { Curve: HarnessLayout.Groove; From: 20mm; Distance: 60mm; Direction: Forward; }- End { At: Point3(120mm,0mm,0mm); }+ Start { at: Point3(0mm,-40mm,0mm); }+ Follow MainGroove { curve: HarnessLayout.Groove; from: 20mm; distance: 60mm; direction: Forward; }+ End { at: Point3(120mm,0mm,0mm); }}}}diff --git a/fixtures/Canonical/WireForm/paperclip.firmament b/fixtures/Canonical/WireForm/paperclip.firmamentindex 2a9afbac..e487c081 100644--- a/fixtures/Canonical/WireForm/paperclip.firmament+++ b/fixtures/Canonical/WireForm/paperclip.firmament@@ -1,5 +1,5 @@Model CanonicalWireFormPaperclip {- Units: mm+ units: mmWireForm Paperclip {Diameter: 1mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/point-route.firmament b/fixtures/Canonical/WireForm/point-route.firmamentindex 5023b306..e5726bef 100644--- a/fixtures/Canonical/WireForm/point-route.firmament+++ b/fixtures/Canonical/WireForm/point-route.firmament@@ -1,12 +1,12 @@schema WireFormModel PointRoute {WireRoute Lead {- Diameter: 1mm;- MinimumBendRadius: 4mm;+ diameter: 1mm;+ minimumBendRadius: 4mm;Path {- Start { At: Point3(0mm,0mm,0mm); }- Corner Bend { At: Point3(0mm,30mm,0mm); Radius: 4mm; }- End { At: Point3(20mm,30mm,20mm); }+ Start { at: Point3(0mm,0mm,0mm); }+ Corner Bend { at: Point3(0mm,30mm,0mm); radius: 4mm; }+ End { at: Point3(20mm,30mm,20mm); }}}}diff --git a/fixtures/Canonical/WireForm/single-bend-180.firmament b/fixtures/Canonical/WireForm/single-bend-180.firmamentindex 8b30446c..b86a9d4a 100644--- a/fixtures/Canonical/WireForm/single-bend-180.firmament+++ b/fixtures/Canonical/WireForm/single-bend-180.firmament@@ -1,5 +1,5 @@Model SingleBend180 {- Units: mm+ units: mmWireForm Wire {Diameter: 1mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/single-bend-90.firmament b/fixtures/Canonical/WireForm/single-bend-90.firmamentindex dd63723f..688ab7a8 100644--- a/fixtures/Canonical/WireForm/single-bend-90.firmament+++ b/fixtures/Canonical/WireForm/single-bend-90.firmament@@ -1,5 +1,5 @@Model SingleBend90 {- Units: mm+ units: mmWireForm Wire {Diameter: 1mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/straight-coil-straight.firmament b/fixtures/Canonical/WireForm/straight-coil-straight.firmamentindex 335cbbb3..e4673c4a 100644--- a/fixtures/Canonical/WireForm/straight-coil-straight.firmament+++ b/fixtures/Canonical/WireForm/straight-coil-straight.firmament@@ -1,11 +1,11 @@Model ComposedCoilWitness {- Units: mm+ units: mmWireForm ComposedSpring {Diameter: 2mmMaterial: Standard.Materials.StainlessSteel.304_AnnealedStartFrame { Origin: [0mm,0mm,0mm]; Tangent: [1,0,0]; Up: [0,0,1] }Straight Lead { Length: 10mm }- AxisCoil Winding { Radius: 10mm; Turns: 4; Pitch: 5mm; Handedness: RightHanded }+ Helix Winding { radius: 10mm; turns: 4; pitch: 5mm; handedness: RightHanded }Straight Tail { Length: 10mm }}}diff --git a/fixtures/Canonical/WireForm/straight-wire.firmament b/fixtures/Canonical/WireForm/straight-wire.firmamentindex e895cdd0..35a0b0b6 100644--- a/fixtures/Canonical/WireForm/straight-wire.firmament+++ b/fixtures/Canonical/WireForm/straight-wire.firmament@@ -1,5 +1,5 @@Model StraightWire {- Units: mm+ units: mmWireForm Wire {Diameter: 1mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/three-dimensional-bends.firmament b/fixtures/Canonical/WireForm/three-dimensional-bends.firmamentindex d7ec2bac..61e60ee8 100644--- a/fixtures/Canonical/WireForm/three-dimensional-bends.firmament+++ b/fixtures/Canonical/WireForm/three-dimensional-bends.firmament@@ -1,5 +1,5 @@Model ThreeDimensionalBentWire {- Units: mm+ units: mmWireForm BentWire3D {Diameter: 1mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/WireForm/u-wire.firmament b/fixtures/Canonical/WireForm/u-wire.firmamentindex 31bc38be..cbce1f87 100644--- a/fixtures/Canonical/WireForm/u-wire.firmament+++ b/fixtures/Canonical/WireForm/u-wire.firmament@@ -1,5 +1,5 @@Model StandardUWire {- Units: mm+ units: mmWireForm UWire {Diameter: 1mmMaterial: Standard.Materials.StainlessSteel.304_Annealeddiff --git a/fixtures/Canonical/qualification.json b/fixtures/Canonical/qualification.jsonindex 92378eda..8b30a8a7 100644--- a/fixtures/Canonical/qualification.json+++ b/fixtures/Canonical/qualification.json@@ -1,50 +1,615 @@{"schemaVersion": 1,"expectedDiagnostics": [- { "path": "Garment/garmentcode-dress-guided.firmament", "codes": ["garment-fit-body-required"] },- { "path": "Garment/tshirt-dress.firmament", "codes": ["garment-fit-body-required"] },- { "path": "Garment/sundress.firmament", "codes": ["garment-fit-body-required"] },- { "path": "Garment/sundress-posed.firmament", "codes": ["garment-fit-body-required"] },- { "path": "PlasticShell/plastic-shell-autorib-materialized.firmament", "codes": ["plastic-shell-constant-section-feature-zero-draft"] },- { "path": "PlasticShell/plastic-shell-enclosure.firmament", "codes": ["plastic-shell-constant-section-feature-zero-draft"] },- { "path": "PlasticShell/plastic-shell-materialized-enclosure.firmament", "codes": ["plastic-shell-constant-section-feature-zero-draft"] },- { "path": "PlasticShell/plastic-shell-materialized-rib.firmament", "codes": ["plastic-shell-constant-section-feature-zero-draft"] },- { "path": "PlasticShell/plastic-shell-materialized-standoff.firmament", "codes": ["plastic-shell-constant-section-feature-zero-draft"] },- { "path": "PlasticShell/plastic-shell-rib-standoff-junction.firmament", "codes": ["plastic-shell-constant-section-feature-zero-draft"] }+ {+ "path": "PlasticShell/plastic-shell-autorib-materialized.firmament",+ "codes": [+ "plastic-shell-constant-section-feature-zero-draft"+ ]+ },+ {+ "path": "PlasticShell/plastic-shell-enclosure.firmament",+ "codes": [+ "plastic-shell-constant-section-feature-zero-draft"+ ]+ },+ {+ "path": "PlasticShell/plastic-shell-materialized-enclosure.firmament",+ "codes": [+ "plastic-shell-constant-section-feature-zero-draft"+ ]+ },+ {+ "path": "PlasticShell/plastic-shell-materialized-rib.firmament",+ "codes": [+ "plastic-shell-constant-section-feature-zero-draft"+ ]+ },+ {+ "path": "PlasticShell/plastic-shell-materialized-standoff.firmament",+ "codes": [+ "plastic-shell-constant-section-feature-zero-draft"+ ]+ },+ {+ "path": "PlasticShell/plastic-shell-rib-standoff-junction.firmament",+ "codes": [+ "plastic-shell-constant-section-feature-zero-draft"+ ]+ }],"actions": [- { "path": "Garment", "operation": "validate" },- { "path": "Assembly", "operation": "assembly-inspect" },- { "path": "AssemblyInterfaces", "operation": "assembly-inspect" },- { "path": "Drawings", "operation": "drawing-compile" },- { "path": "FEA", "operation": "fea-solve" },- { "path": "Materials", "operation": "fea-solve" },- { "path": "SheetMetal", "operation": "sheet-metal-flatten" },- { "path": "Sculpting", "operation": "build-step" },- { "path": "BodyState", "operation": "build-step" },- { "path": "SectionChain", "operation": "section-chain-build" },- { "path": "Structural", "operation": "build-step" },- { "path": "Piping", "operation": "build-step" },- { "path": "GearInterfaces", "operation": "validate" },- { "path": "Gears", "operation": "build-step" },- { "path": "WireForm", "operation": "build-step" },- { "path": "PlasticShell", "operation": "build-step" },- { "path": "Basics", "operation": "build-step" },- { "path": "Primitives", "operation": "build-step" },- { "path": "Profiles", "operation": "build-step" },- { "path": "Pipeline", "operation": "build-step" },- { "path": "Features", "operation": "build-step" },- { "path": "Feature", "operation": "build-step" },- { "path": "Schema", "operation": "build-step" },- { "path": "Patterns", "operation": "build-step" },- { "path": "Set", "operation": "build-step" },- { "path": "Span", "operation": "build-step" },- { "path": "Boundary2", "operation": "build-step" },- { "path": "Revolve", "operation": "build-step" },- { "path": "Symmetry", "operation": "build-step" },- { "path": "Offset", "operation": "build-step" },- { "path": "PMI", "operation": "build-step" },- { "path": "Templates", "operation": "build-step" },- { "path": "Integration", "operation": "build-step" }+ {+ "path": "AssemblyInterfaces/articulated-motion.firmament",+ "operation": "build-step"+ },+ {+ "path": "AssemblyInterfaces/IndustrialAtlas/upper-housing.firmament",+ "operation": "build-step"+ },+ {+ "path": "AssemblyInterfaces/IndustrialAtlas/fore-housing.firmament",+ "operation": "build-step"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/string-low-e.firmament",+ "operation": "build-step"+ },+ {+ "path": "AssemblyInterfaces/AuthoringFoundation/scalar-functions-part.firmament",+ "operation": "build-step"+ },+ {+ "path": "AssemblyInterfaces/AuthoringFoundation/concept-points-part.firmament",+ "operation": "build-step"+ },+ {+ "path": "WebSdk/shared-block-assembly.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "ThreeDm/lamp-visible-intent.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/WarmModernHouse/media.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/WarmModernHouse/living.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/WarmModernHouse/kitchen.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/WarmModernHouse/island.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/WarmModernHouse/entry.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/WarmModernHouse/dining.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/FactoryX0/robot-island.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/FactoryX0/production-line.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/FactoryX0/packout.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/FactoryX0/logistics.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/FactoryX0/hall-structure.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Scene/FactoryX0/cart.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "EditableV8/scene.firmament",+ "operation": "scene-inspect"+ },+ {+ "path": "DisplayProjection/scene.firmament",+ "operation": "scene-inspect"+ },+ {+ "path": "DisplayProjection/mixed.firmament",+ "operation": "assembly-inspect"+ },+ {+ "path": "Garment",+ "operation": "validate"+ },+ {+ "path": "Assembly",+ "operation": "assembly-inspect"+ },+ {+ "path": "AssemblyInterfaces",+ "operation": "assembly-inspect"+ },+ {+ "path": "Drawings",+ "operation": "drawing-compile"+ },+ {+ "path": "FEA",+ "operation": "fea-solve"+ },+ {+ "path": "Materials",+ "operation": "fea-solve"+ },+ {+ "path": "SheetMetal",+ "operation": "sheet-metal-flatten"+ },+ {+ "path": "Sculpting",+ "operation": "build-step"+ },+ {+ "path": "BodyState",+ "operation": "build-step"+ },+ {+ "path": "SectionChain",+ "operation": "section-chain-build"+ },+ {+ "path": "Structural",+ "operation": "build-step"+ },+ {+ "path": "Piping",+ "operation": "build-step"+ },+ {+ "path": "GearInterfaces",+ "operation": "inspect"+ },+ {+ "path": "Gears",+ "operation": "build-step"+ },+ {+ "path": "WireForm",+ "operation": "build-step"+ },+ {+ "path": "PlasticShell",+ "operation": "build-step"+ },+ {+ "path": "Basics",+ "operation": "build-step"+ },+ {+ "path": "Primitives",+ "operation": "build-step"+ },+ {+ "path": "Profiles",+ "operation": "build-step"+ },+ {+ "path": "Pipeline",+ "operation": "build-step"+ },+ {+ "path": "Features",+ "operation": "build-step"+ },+ {+ "path": "Feature",+ "operation": "build-step"+ },+ {+ "path": "Schema",+ "operation": "build-step"+ },+ {+ "path": "Patterns",+ "operation": "build-step"+ },+ {+ "path": "Set",+ "operation": "build-step"+ },+ {+ "path": "Span",+ "operation": "build-step"+ },+ {+ "path": "Boundary2",+ "operation": "build-step"+ },+ {+ "path": "Revolve",+ "operation": "build-step"+ },+ {+ "path": "Symmetry",+ "operation": "build-step"+ },+ {+ "path": "Offset",+ "operation": "build-step"+ },+ {+ "path": "PMI",+ "operation": "build-step"+ },+ {+ "path": "Templates",+ "operation": "build-step"+ },+ {+ "path": "Integration",+ "operation": "build-step"+ },+ {+ "path": "Concepts",+ "operation": "build-step"+ },+ {+ "path": "DisplayProjection",+ "operation": "build-step"+ },+ {+ "path": "EditableV8",+ "operation": "assembly-inspect"+ },+ {+ "path": "Perforation",+ "operation": "build-step"+ },+ {+ "path": "Presentation",+ "operation": "build-step"+ },+ {+ "path": "Scene",+ "operation": "scene-inspect"+ },+ {+ "path": "Surfacing",+ "operation": "build-step"+ },+ {+ "path": "ThreeDm",+ "operation": "build-step"+ },+ {+ "path": "WebSdk",+ "operation": "build-step"+ }+ ],+ "modules": [+ {+ "path": "AssemblyInterfaces/GuitarX0/CarvedMaple.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/IvoryBinding.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/MahoganyBack.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/Neck.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/body-assembly.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/body-outline.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/body-profile.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/bridge-assembly.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/electronics-assembly.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/hardware-definitions.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/hardware-layout.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/knob.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/materials.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/neck-assembly.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/neck-profile.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/pickup.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/pickups-assembly.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/selector.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/strings-assembly.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/tuner.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/GuitarX0/tuners-assembly.firmament",+ "consumer": "AssemblyInterfaces/GuitarX0/guitar-x0.firmament"+ },+ {+ "path": "AssemblyInterfaces/IndustrialAtlas/base.firmament",+ "consumer": "AssemblyInterfaces/IndustrialAtlas/atlas-industrial.firmament"+ },+ {+ "path": "AssemblyInterfaces/IndustrialAtlas/fore-arm.firmament",+ "consumer": "AssemblyInterfaces/IndustrialAtlas/atlas-industrial.firmament"+ },+ {+ "path": "AssemblyInterfaces/IndustrialAtlas/gripper.firmament",+ "consumer": "AssemblyInterfaces/IndustrialAtlas/atlas-industrial.firmament"+ },+ {+ "path": "AssemblyInterfaces/IndustrialAtlas/hardware.firmament",+ "consumer": "AssemblyInterfaces/IndustrialAtlas/atlas-industrial.firmament"+ },+ {+ "path": "AssemblyInterfaces/IndustrialAtlas/joint-covers.firmament",+ "consumer": "AssemblyInterfaces/IndustrialAtlas/atlas-industrial.firmament"+ },+ {+ "path": "AssemblyInterfaces/IndustrialAtlas/materials.firmament",+ "consumer": "AssemblyInterfaces/IndustrialAtlas/atlas-industrial.firmament"+ },+ {+ "path": "AssemblyInterfaces/IndustrialAtlas/upper-arm.firmament",+ "consumer": "AssemblyInterfaces/IndustrialAtlas/atlas-industrial.firmament"+ },+ {+ "path": "AssemblyInterfaces/digit-module.firmament",+ "consumer": "AssemblyInterfaces/machine.firmament"+ },+ {+ "path": "AssemblyInterfaces/executable-cell.firmament",+ "consumer": "AssemblyInterfaces/executable-machine.firmament"+ },+ {+ "path": "AssemblyInterfaces/register.firmament",+ "consumer": "AssemblyInterfaces/machine.firmament"+ },+ {+ "path": "EditableV8/assemblies/cam-left.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/assemblies/cam-right.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/assemblies/crankcase.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/assemblies/crankshaft.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/assemblies/cylinder.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/assemblies/stage-a.firmament",+ "consumer": "EditableV8/stage-a.firmasm"+ },+ {+ "path": "EditableV8/assemblies/stage-b.firmament",+ "consumer": "EditableV8/stage-b.firmasm"+ },+ {+ "path": "EditableV8/bank-rest-configurations.firmament",+ "consumer": "EditableV8/bank.firmasm"+ },+ {+ "path": "EditableV8/construction.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/cylinder-config.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/design.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/interfaces.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/Camshaft.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/ConnectingRod.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/CrankWeb.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/CrankcaseRail.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/Crankpin.firmament",+ "consumer": "EditableV8/stage-a.firmasm"+ },+ {+ "path": "EditableV8/parts/CylinderHead.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/CylinderSleeve.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/ExhaustValve.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/Flywheel.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/IntakeValve.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/LongMainJournal.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/MainJournal.firmament",+ "consumer": "EditableV8/stage-a.firmasm"+ },+ {+ "path": "EditableV8/parts/MainSupport.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/PairedCrankpin.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/ParameterizedValveSpring.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/PistonCrown.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/PistonLug.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/PistonSkirt.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/SpringRetainer.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/TimingLobe.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/ValveSpring.firmament",+ "consumer": "EditableV8/stage-b.firmasm"+ },+ {+ "path": "EditableV8/parts/ValveStem.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/parts/WristPin.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "EditableV8/rest-configurations.firmament",+ "consumer": "EditableV8/engine.firmasm"+ },+ {+ "path": "Scene/FactoryX0/kit.firmament",+ "consumer": "Scene/FactoryX0/factory.firmament"+ },+ {+ "path": "Scene/WarmModernHouse/components.firmament",+ "consumer": "Scene/WarmModernHouse/house.firmament"+ }+ ],+ "expectedRejections": [+ {+ "path": "Garment/garmentcode-dress-guided.firmament",+ "exitCode": 1,+ "codes": [+ "garment-fit-body-required"+ ],+ "level": "ExternalBodyRequired"+ },+ {+ "path": "Garment/tshirt-dress.firmament",+ "exitCode": 1,+ "codes": [+ "garment-fit-body-required"+ ],+ "level": "ExternalBodyRequired"+ },+ {+ "path": "Garment/sundress.firmament",+ "exitCode": 1,+ "codes": [+ "garment-fit-body-required"+ ],+ "level": "ExternalBodyRequired"+ },+ {+ "path": "Garment/sundress-posed.firmament",+ "exitCode": 1,+ "codes": [+ "garment-fit-body-required"+ ],+ "level": "ExternalBodyRequired"+ }]}diff --git a/fixtures/Compatibility/FirmamentV2/SheetMetal/README.md b/fixtures/Compatibility/FirmamentV2/SheetMetal/README.mdnew file mode 100644index 00000000..aab61aaf--- /dev/null+++ b/fixtures/Compatibility/FirmamentV2/SheetMetal/README.md@@ -0,0 +1,12 @@+# Implicit Base identity compatibility++These four original canonical sources predate the shared Profile migration.+Their `Base: Rectangle(width, depth)` field selects the implicit Base identity+family (`region-base`, edge-based flange/bend IDs). Their current counterparts+use `base: blankProfile` and the common rectangular Profile binder.++`SharedProfileOnImplicitBasePreservesLegacyGeometryAndIdentities` compares exact+formed STEP, region/bend/feature identities and flat-pattern hashes. The original+sources were preserved unchanged; do not rebaseline them to hide identity drift.+An explicitly named `Base deck { profile: blank }` retains its named identity+family and is a distinct public authoring choice.diff --git a/fixtures/Compatibility/FirmamentV2/SheetMetal/l-bracket-multiple-holes.firmament b/fixtures/Compatibility/FirmamentV2/SheetMetal/l-bracket-multiple-holes.firmamentnew file mode 100644index 00000000..b28ce530--- /dev/null+++ b/fixtures/Compatibility/FirmamentV2/SheetMetal/l-bracket-multiple-holes.firmament@@ -0,0 +1,27 @@+SheetMetal TwoHoleLBracket {+ Thickness: 1.5mm;+ Material: "5052-H32 Aluminum";+ KFactor: 0.42;++ Base: Rectangle(100mm, 60mm);++ Flange Upright {+ From: Base.Rear;+ Length: 35mm;+ Angle: 90deg;+ InsideRadius: 2mm;+ Direction: Up;+ }++ Hole MountLeft {+ On: Base;+ Center: (25mm, 25mm);+ Diameter: 8mm;+ }++ Hole MountRight {+ On: Base;+ Center: (75mm, 25mm);+ Diameter: 8mm;+ }+}diff --git a/fixtures/Compatibility/FirmamentV2/SheetMetal/l-bracket-with-hole.firmament b/fixtures/Compatibility/FirmamentV2/SheetMetal/l-bracket-with-hole.firmamentnew file mode 100644index 00000000..a81162b4--- /dev/null+++ b/fixtures/Compatibility/FirmamentV2/SheetMetal/l-bracket-with-hole.firmament@@ -0,0 +1,21 @@+SheetMetal MountingBracket {+ Thickness: 1.5mm;+ Material: "5052-H32 Aluminum";+ KFactor: 0.42;++ Base: Rectangle(80mm, 50mm);++ Flange Upright {+ From: Base.Rear;+ Length: 30mm;+ Angle: 90deg;+ InsideRadius: 2mm;+ Direction: Up;+ }++ Hole Mount {+ On: Base;+ Center: (40mm, 20mm);+ Diameter: 8mm;+ }+}diff --git a/fixtures/Compatibility/FirmamentV2/SheetMetal/sensor-bracket.firmament b/fixtures/Compatibility/FirmamentV2/SheetMetal/sensor-bracket.firmamentnew file mode 100644index 00000000..88443391--- /dev/null+++ b/fixtures/Compatibility/FirmamentV2/SheetMetal/sensor-bracket.firmament@@ -0,0 +1,18 @@+SheetMetal SensorBracket {+ Thickness: 1.5mm;+ Material: "5052-H32 Aluminum";+ KFactor: 0.42;+ Base: Rectangle(70mm, 45mm);+ Flange Upright {+ From: Base.Rear;+ Length: 25mm;+ Angle: 90deg;+ InsideRadius: 2mm;+ Direction: Up;+ }+ Hole Mount {+ On: Base;+ Center: (35mm, 18mm);+ Diameter: 6mm;+ }+}diff --git a/fixtures/Compatibility/FirmamentV2/SheetMetal/u-channel.firmament b/fixtures/Compatibility/FirmamentV2/SheetMetal/u-channel.firmamentnew file mode 100644index 00000000..5be2e8bc--- /dev/null+++ b/fixtures/Compatibility/FirmamentV2/SheetMetal/u-channel.firmament@@ -0,0 +1,36 @@+// Minimal two-bend channel.+SheetMetal SimpleUChannel {+ Thickness: 1.5mm;+ Material: "5052-H32 Aluminum";+ KFactor: 0.42;++ Base: Rectangle(100mm, 60mm);++ Flange LeftFlange {+ From: Base.Left;+ Length: 25mm;+ Angle: 90deg;+ InsideRadius: 2mm;+ Direction: Up;+ }++ Flange RightFlange {+ From: Base.Right;+ Length: 20mm;+ Angle: 90deg;+ InsideRadius: 2mm;+ Direction: Up;+ }++ Hole MountA {+ On: Base;+ Center: (25mm, 30mm);+ Diameter: 8mm;+ }++ Hole MountB {+ On: Base;+ Center: (75mm, 30mm);+ Diameter: 8mm;+ }+}diff --git a/fixtures/Invalid/Pipeline/traceloop-non-loop.firmament b/fixtures/Invalid/Pipeline/traceloop-non-loop.firmamentindex bf94d8b7..c2bb229d 100644--- a/fixtures/Invalid/Pipeline/traceloop-non-loop.firmament+++ b/fixtures/Invalid/Pipeline/traceloop-non-loop.firmament@@ -1,4 +1,5 @@schema Mechanical-Rect2 Stock { Center: [0mm, 0mm]; Size: [10mm, 4mm] }+// TraceLoop requires a closed boundary; an open Line2 is not one.+Line2 Stock { from: Point2(0mm, 0mm); to: Point2(10mm, 0mm) }Profile Plate { Loop Outer { Stock |> TraceLoop } }Extrude Solid { Profile: Plate; From: 0mm; To: 1mm }diff --git a/fixtures/Regression/FrontendX2/README.md b/fixtures/Regression/FrontendX2/README.mdindex d99721f9..64ed393a 100644--- a/fixtures/Regression/FrontendX2/README.md+++ b/fixtures/Regression/FrontendX2/README.md@@ -12,6 +12,9 @@| `scoped-table.firmament` | Accepted: local Table/schema/value names shadow outer declarations; a selected row produces 30 × 20 × 6 mm stock. || `sibling-data.invalid.firmament` | Rejected: the sibling Static secret is invisible; validate/build reject at its authored reference. || `panel-radians.firmament` | Existing radian-valued Panel arc admission retains exact sampled surface coordinates. Normal solid STEP export still reports its existing panel-only capability limitation. |+| `traceloop-rect2.firmament` | Accepted: original source formerly mislabeled as an invalid non-loop. A Rect2 is a closed boundary and TraceLoop is now supported. The Invalid/Pipeline witness now uses an actual open Line2. |+| `piping-field-casing.pending.firmament` | Known defect: validate/build accept, but inspection reports Generic for requested lowercase `connectionType: Weld`. Not qualified as correct behavior. |+| `piping-field-unknown.pending.firmament` | Known defect: an unknown optional Port field is ignored. It must reject after Piping's owning field reader migrates to AST consumption. |The component tests compare accepted geometry to concrete/renamed equivalents,check generated identities, and retain source-located private-name rejection explicitly.diff --git a/fixtures/Regression/FrontendX2/piping-field-casing.pending.firmament b/fixtures/Regression/FrontendX2/piping-field-casing.pending.firmamentnew file mode 100644index 00000000..e6484e53--- /dev/null+++ b/fixtures/Regression/FrontendX2/piping-field-casing.pending.firmament@@ -0,0 +1,11 @@+// Known defect: requested Weld becomes Generic. This is not an accepted recipe.+Model PipeSegmentWitness {+ units: mm+ PipingSystem SegmentWitness {+ PipePolicy Pipe25 { OuterDiameter: 25mm; WallThickness: 2mm; Material: "Standard.Materials.StainlessSteel.304_Annealed"; }+ Port Inlet { Position: [0mm,0mm,0mm]; Direction: [1,0,0]; PipePolicy: Pipe25; connectionType: Weld; }+ Port Outlet { Position: [500mm,0mm,0mm]; Direction: [-1,0,0]; PipePolicy: Pipe25; connectionType: Weld; }+ Connection Run { From: Inlet; To: Outlet; PipePolicy: Pipe25; Service: "CoolingWater"; }+ Route RunRoute { Connection: Run; Through: [[0mm,0mm,0mm],[500mm,0mm,0mm]]; BendRadius: 50mm; Provenance: Explicit; }+ }+}diff --git a/fixtures/Regression/FrontendX2/piping-field-unknown.pending.firmament b/fixtures/Regression/FrontendX2/piping-field-unknown.pending.firmamentnew file mode 100644index 00000000..612fb043--- /dev/null+++ b/fixtures/Regression/FrontendX2/piping-field-unknown.pending.firmament@@ -0,0 +1,11 @@+// Known defect: unexpectedIntent is ignored. Desired outcome is rejection.+Model PipeSegmentWitness {+ units: mm+ PipingSystem SegmentWitness {+ PipePolicy Pipe25 { OuterDiameter: 25mm; WallThickness: 2mm; Material: "Standard.Materials.StainlessSteel.304_Annealed"; }+ Port Inlet { Position: [0mm,0mm,0mm]; Direction: [1,0,0]; PipePolicy: Pipe25; ConnectionType: Weld; unexpectedIntent: Weld; }+ Port Outlet { Position: [500mm,0mm,0mm]; Direction: [-1,0,0]; PipePolicy: Pipe25; ConnectionType: Weld; }+ Connection Run { From: Inlet; To: Outlet; PipePolicy: Pipe25; Service: "CoolingWater"; }+ Route RunRoute { Connection: Run; Through: [[0mm,0mm,0mm],[500mm,0mm,0mm]]; BendRadius: 50mm; Provenance: Explicit; }+ }+}diff --git a/fixtures/Regression/FrontendX2/traceloop-rect2.firmament b/fixtures/Regression/FrontendX2/traceloop-rect2.firmamentnew file mode 100644index 00000000..bf94d8b7--- /dev/null+++ b/fixtures/Regression/FrontendX2/traceloop-rect2.firmament@@ -0,0 +1,4 @@+schema Mechanical+Rect2 Stock { Center: [0mm, 0mm]; Size: [10mm, 4mm] }+Profile Plate { Loop Outer { Stock |> TraceLoop } }+Extrude Solid { Profile: Plate; From: 0mm; To: 1mm }diff --git a/fixtures/Regression/WireFormSurfaceSupport/README.md b/fixtures/Regression/WireFormSurfaceSupport/README.mdnew file mode 100644index 00000000..e4962d91--- /dev/null+++ b/fixtures/Regression/WireFormSurfaceSupport/README.md@@ -0,0 +1,16 @@+# SurfaceCoil support admission boundary++These four original sources qualify the existing evaluable centerline law through+`WireFormAuthoring.Parse`. They are not complete buildable Model examples. The+normal frontend correctly refuses a Model containing support solids plus another+material operation; BlenderBall additionally contains two material solids.++The corpus modernization pass moved these sources here unchanged from Canonical.+`WireFormTests.CylinderSurfaceCoil_IsAxisCoilEquivalentAndSurfaceFamiliesRetainClearanceLaw`+retains the support clearance, sampled centerline equivalence, turn clearance and+approximation-error assertions. Do not interpret this internal parser evidence as+normal validate/build qualification.++Next prerequisite: define an explicit nonmaterial analytic support and bind its+reference through the owning AST scope, separately from material outputs. Do not+silently erase ordinary solids when a SurfaceCoil references them.diff --git a/fixtures/Canonical/WireForm/blender-ball-coil.firmament b/fixtures/Regression/WireFormSurfaceSupport/blender-ball-coil.firmamentsimilarity index 100%rename from fixtures/Canonical/WireForm/blender-ball-coil.firmamentrename to fixtures/Regression/WireFormSurfaceSupport/blender-ball-coil.firmamentdiff --git a/fixtures/Canonical/WireForm/cylinder-surface-coil.firmament b/fixtures/Regression/WireFormSurfaceSupport/cylinder-surface-coil.firmamentsimilarity index 100%rename from fixtures/Canonical/WireForm/cylinder-surface-coil.firmamentrename to fixtures/Regression/WireFormSurfaceSupport/cylinder-surface-coil.firmamentdiff --git a/fixtures/Canonical/WireForm/frustum-surface-coil.firmament b/fixtures/Regression/WireFormSurfaceSupport/frustum-surface-coil.firmamentsimilarity index 100%rename from fixtures/Canonical/WireForm/frustum-surface-coil.firmamentrename to fixtures/Regression/WireFormSurfaceSupport/frustum-surface-coil.firmamentdiff --git a/fixtures/Canonical/WireForm/sphere-surface-coil.firmament b/fixtures/Regression/WireFormSurfaceSupport/sphere-surface-coil.firmamentsimilarity index 100%rename from fixtures/Canonical/WireForm/sphere-surface-coil.firmamentrename to fixtures/Regression/WireFormSurfaceSupport/sphere-surface-coil.firmamentdiff --git a/scripts/Test-CanonicalFixtures.ps1 b/scripts/Test-CanonicalFixtures.ps1index b52b6e5c..c9e3a593 100644--- a/scripts/Test-CanonicalFixtures.ps1+++ b/scripts/Test-CanonicalFixtures.ps1@@ -1,17 +1,18 @@[CmdletBinding()]param([string]$RepositoryRoot = (Split-Path -Parent $PSScriptRoot),- [switch]$NoBuild+ [switch]$NoBuild,+ [string]$OutputDirectory = 'artifacts/local/canonical-qualification')$ErrorActionPreference = 'Stop'$canonicalRoot = Join-Path $RepositoryRoot 'fixtures/Canonical'-$artifactRoot = Join-Path $RepositoryRoot 'artifacts/local/canonical-qualification'+$artifactRoot = Join-Path $RepositoryRoot $OutputDirectory$manifest = Get-Content -Raw -LiteralPath (Join-Path $canonicalRoot 'qualification.json') | ConvertFrom-Json$coverage = Get-Content -Raw -LiteralPath (Join-Path $canonicalRoot 'coverage.json') | ConvertFrom-Jsonif (-not $NoBuild) {- & dotnet build (Join-Path $RepositoryRoot 'Aetheris.CLI/Aetheris.CLI.csproj') -c Release --nologo+ & dotnet build (Join-Path $RepositoryRoot 'Aetheris.CLI/Aetheris.CLI.csproj') -c Release --nologo -m:1 -nr:false -p:UseSharedCompilation=falseif ($LASTEXITCODE -ne 0) { throw 'Aetheris.CLI Release build failed.' }}@@ -20,7 +21,7 @@ if (-not (Test-Path -LiteralPath $cli)) { throw "CLI not found: $cli" }New-Item -ItemType Directory -Force -Path $artifactRoot | Out-Null$forbidden = @(- @{ Name = 'lowercase Firmament-owned declaration'; Pattern = '(?m)^\s*(model|units|solid|record|static|template|analysis|fixed|force|results|lattice)\b' },+ @{ Name = 'lowercase Firmament-owned declaration'; Pattern = '(?m)^\s*(model|units|solid|record|static|template|analysis|fixed|force|results|lattice)\b(?!\s*:)' },@{ Name = 'bare Template declaration'; Pattern = '(?m)^\s*Template\s+[A-Za-z_]' },@{ Name = 'legacy V1 header'; Pattern = '(?m)^\s*Firmament\s+1\b' },@{ Name = 'legacy arbitrary Boolean authoring'; Pattern = '\b(Union|Subtract|Intersect)\b' },@@ -35,7 +36,9 @@ foreach ($feature in $requiredFeatures) {if (-not (Test-Path -LiteralPath (Join-Path $canonicalRoot $entry) -PathType Leaf)) { $failures.Add("coverage: $feature points to missing $entry") }}$qualified = 0-foreach ($file in Get-ChildItem -LiteralPath $canonicalRoot -Recurse -Filter '*.firmament' | Sort-Object FullName) {+$records = [Collections.Generic.List[object]]::new()+$consumers = [Collections.Generic.HashSet[string]]::new([StringComparer]::Ordinal)+foreach ($file in Get-ChildItem -LiteralPath $canonicalRoot -Recurse -File | Where-Object { $_.Extension -in @('.firmament', '.firmasm') } | Sort-Object FullName) {$relative = [IO.Path]::GetRelativePath($canonicalRoot, $file.FullName).Replace('\', '/')if ($file.Name -match '^(?:a|m|edge-x)\d+[a-z]?-') {$failures.Add("${relative}: milestone-prefixed filename")@@ -45,7 +48,16 @@ foreach ($file in Get-ChildItem -LiteralPath $canonicalRoot -Recurse -Filter '*.if ($source -cmatch $rule.Pattern) { $failures.Add("${relative}: $($rule.Name)") }}- $action = $manifest.actions | Where-Object { $relative.StartsWith($_.path + '/', [StringComparison]::Ordinal) } | Select-Object -First 1+ $module = $manifest.modules | Where-Object { $_.path -eq $relative } | Select-Object -First 1+ if ($null -ne $module) {+ if (-not (Test-Path -LiteralPath (Join-Path $canonicalRoot $module.consumer) -PathType Leaf)) { $failures.Add("${relative}: missing module consumer $($module.consumer)"); continue }+ $consumers.Add($module.consumer) | Out-Null+ $records.Add([pscustomobject]@{ path = $relative; operation = 'module'; consumer = $module.consumer; level = 'QualifiedByConsumer' })+ Write-Host "MODULE $relative -> $($module.consumer)"+ continue+ }+ $action = $manifest.actions | Where-Object { $_.path -eq $relative } | Select-Object -First 1+ if ($null -eq $action) { $action = $manifest.actions | Where-Object { $relative.StartsWith($_.path + '/', [StringComparison]::Ordinal) } | Select-Object -First 1 }if ($null -eq $action) { $failures.Add("${relative}: no qualification action"); continue }$stem = [IO.Path]::GetFileNameWithoutExtension($file.Name)$outputDirectory = Join-Path $artifactRoot ($relative -replace '\.firmament$', '')@@ -56,13 +68,28 @@ foreach ($file in Get-ChildItem -LiteralPath $canonicalRoot -Recurse -Filter '*.'sheet-metal-flatten' { @('sheetmetal', 'flatten', $file.FullName, '--step', (Join-Path $outputDirectory "$stem-flat.step"), '--svg', (Join-Path $outputDirectory "$stem-flat.svg"), '--json') }'fea-solve' { @('fea', $file.FullName, '--out-dir', $outputDirectory, '--json') }'assembly-inspect' { @('asm', 'inspect', $file.FullName, '--json') }+ 'scene-inspect' { @('scene', 'inspect', $file.FullName, '--json') }+ 'inspect' { @('inspect', $file.FullName, '--json') }'drawing-compile' { @('drawing', 'compile', $file.FullName, '--out-dir', $outputDirectory, '--json') }'validate' { @('validate', $file.FullName, '--json') }default { $failures.Add("${relative}: unknown operation $($action.operation)"); continue }}$output = & dotnet $cli @arguments 2>&1 | Out-String- if ($LASTEXITCODE -ne 0) {- $failures.Add("${relative}: $($action.operation) exited $LASTEXITCODE`n$output")+ $exitCode = $LASTEXITCODE+ $boundary = $manifest.expectedRejections | Where-Object { $_.path -eq $relative } | Select-Object -First 1+ if ($null -ne $boundary) {+ $result = $output | ConvertFrom-Json+ $codes = @($result.diagnostics.code)+ if ($exitCode -ne $boundary.exitCode -or @($boundary.codes | Where-Object { $_ -notin $codes }).Count -gt 0 -or @($codes | Where-Object { $_ -notin $boundary.codes }).Count -gt 0) {+ $failures.Add("${relative}: expected rejection contract changed`n$output"); continue+ }+ [IO.File]::WriteAllText((Join-Path $outputDirectory 'result.json'), $output)+ $records.Add([pscustomobject]@{ path = $relative; operation = $action.operation; level = $boundary.level; codes = $codes })+ Write-Host "BOUNDARY $relative ($($boundary.level))"+ continue+ }+ if ($exitCode -ne 0) {+ $failures.Add("${relative}: $($action.operation) exited $exitCode`n$output")continue}try {@@ -72,6 +99,7 @@ foreach ($file in Get-ChildItem -LiteralPath $canonicalRoot -Recurse -Filter '*.$failures.Add("${relative}: qualification did not emit valid JSON`n$output")continue}+ [IO.File]::WriteAllText((Join-Path $outputDirectory 'result.json'), $output)$expectedEntry = $manifest.expectedDiagnostics | Where-Object { $_.path -eq $relative } | Select-Object -First 1$expectedCodes = @($expectedEntry.codes)$emitted = @($result.diagnostics | Where-Object { $_.severity -in @('warning', 'error', 'fatal') })@@ -84,12 +112,18 @@ foreach ($file in Get-ChildItem -LiteralPath $canonicalRoot -Recurse -Filter '*.continue}$qualified+++ $records.Add([pscustomobject]@{ path = $relative; operation = $action.operation; level = 'OwnerQualified' })Write-Host "PASS $($action.operation) $relative"}+foreach ($consumer in $consumers) {+ if (-not ($records | Where-Object { $_.path -eq $consumer -and $_.level -eq 'OwnerQualified' })) { $failures.Add("module consumer did not qualify: $consumer") }+}+$records | ConvertTo-Json -Depth 8 | Set-Content -LiteralPath (Join-Path $artifactRoot 'qualification.json') -Encoding utf8+if ($failures.Count -gt 0) {- $failures | ForEach-Object { Write-Error $_ }+ $failures | ForEach-Object { Write-Host "FAIL $_" }throw "Canonical qualification failed: $($failures.Count) failure(s), $qualified passed."}-Write-Host "Canonical qualification passed: $qualified fixture(s)."+Write-Host "Canonical qualification passed: $qualified owner operations, $(@($records | Where-Object operation -eq 'module').Count) consumed modules, $(@($records | Where-Object level -eq 'ExternalBodyRequired').Count) external-body boundaries."