Merge pull request #73 from Ted-Jin-Lab/development

Release

Author: Ted-Jin-Lab

Directory.Build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>2025.11.24.3</Version>
+    <Version>2025.11.25.0</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>

Tests/TedToolkit.Console/Absorptance.cs

@@ -1,5 +1,6 @@
 namespace TedToolkit.Quantities;
 
+[QuantityDisplayUnit<AbsorbedDoseUnit>(AbsorbedDoseUnit.Centigray)]
 [QuantityImplicitFromValueType]
 [QuantityImplicitToValueType]
 [QuantityOperator<AbsorbedDose, AbsorbedDose, double>(Operator.Divide)]

src/analyzers/TedToolkit.Quantities.Analyzer/QuantitiesAttributeGenerator.cs

@@ -20,6 +20,7 @@ public readonly record struct QuantityUnit(Quantity Quantity, string Unit)
         var unit = q.Units
             .Select(u => data.Units[u])
             .OrderBy(u => u.DistanceToDefault)
+            .ThenByDescending(u => u.ApplicableSystem)
             .First().GetUnitName(data.Units.Values);
         return new QuantityUnit(q, unit);
     });

src/analyzers/TedToolkit.Quantities.Analyzer/QuantityStructGenerator.cs

@@ -329,7 +329,7 @@ public void GenerateCode(SourceProductionContext context)
                                 ReturnStatement(BinaryExpression(SyntaxKind.AddExpression, BinaryExpression(
                                         SyntaxKind.AddExpression, InvocationExpression(MemberAccessExpression(
                                                 SyntaxKind.SimpleMemberAccessExpression,
-                                                IdentifierName("Value"),
+                                                IdentifierName(UnitString is {} argText ? $"As({argText})" :  "Value"),
                                                 IdentifierName("ToString")))
                                             .WithArgumentList(ArgumentList(
                                             [
@@ -950,6 +950,23 @@ MemberDeclarationSyntax CreateEnumerableMethod(string methodName, string xml)
         }
     }
 
+    private string? UnitString
+    {
+        get
+        {
+            if (quantitySymbol?.GetAttributes().FirstOrDefault(a =>
+                    a.AttributeClass is { IsGenericType: true } attributeClass
+                    && attributeClass.ConstructUnboundGenericType().GetName().FullName is
+                        "global::TedToolkit.Quantities.QuantityDisplayUnitAttribute<>") is not
+                { } displayUnitAttribute) return null;
+            
+            var syntax = displayUnitAttribute.ApplicationSyntaxReference?.GetSyntax()
+                as AttributeSyntax;
+            var argSyntax = syntax?.ArgumentList?.Arguments[0].Expression;
+            return argSyntax?.ToString();
+        }
+    }
+
     private ExpressionSyntax GetSystemUnitName()
     {
         var allUnits = quantity.Units
@@ -963,32 +980,25 @@ private ExpressionSyntax GetSystemUnitName()
                 Literal(quantity.Name));
         }
 
-        if (quantitySymbol?.GetAttributes().FirstOrDefault(a =>
-                a.AttributeClass is { IsGenericType: true } attributeClass
-                && attributeClass.ConstructUnboundGenericType().GetName().FullName is
-                    "global::TedToolkit.Quantities.QuantityDisplayUnitAttribute<>") is { } displayUnitAttribute)
+        if (UnitString is { } argText)
         {
-            var syntax = displayUnitAttribute.ApplicationSyntaxReference?.GetSyntax()
-                as AttributeSyntax;
-            var argSyntax = syntax?.ArgumentList?.Arguments[0].Expression;
-            var argText = argSyntax?.ToString();
-            if (argText is not null)
-                return InvocationExpression(
-                        MemberAccessExpression(
-                            SyntaxKind.SimpleMemberAccessExpression,
-                            IdentifierName(argText),
-                            IdentifierName("ToString")))
-                    .WithArgumentList(ArgumentList(
-                    [
-                        Argument(IdentifierName("index")),
-                        Argument(IdentifierName("formatProvider"))
-                    ]));
+            return InvocationExpression(
+                    MemberAccessExpression(
+                        SyntaxKind.SimpleMemberAccessExpression,
+                        IdentifierName(argText),
+                        IdentifierName("ToString")))
+                .WithArgumentList(ArgumentList(
+                [
+                    Argument(IdentifierName("index")),
+                    Argument(IdentifierName("formatProvider"))
+                ]));
         }
 
         if (quantity.IsNoDimensions)
         {
             var memberName = allUnits
                 .OrderBy(u => u.DistanceToDefault)
+                .ThenByDescending(u => u.ApplicableSystem)
                 .First().GetUnitName(data.Units.Values);
             return FromMember(quantity.UnitName, memberName);
         }
@@ -1010,6 +1020,7 @@ private ExpressionSyntax GetSystemUnitName()
                     return true;
                 })
                 .OrderBy(u => u.DistanceToDefault)
+                .ThenByDescending(u => u.ApplicableSystem)
                 .FirstOrDefault();
 
             if (!string.IsNullOrEmpty(choiceUnit.Name))

src/analyzers/TedToolkit.Quantities.Analyzer/UnitSystem.cs

@@ -26,6 +26,7 @@ public Unit GetUnit(string key)
 
         return quantityUnits
             .OrderBy(i => i.DistanceToDefault)
+            .ThenByDescending(i => i.ApplicableSystem)
             .First();
     }
 }

src/libraries/TedToolkit.Quantities.Data/Unit.cs

@@ -35,6 +35,8 @@ static string MakeSafe(string value)
     }
 
     [JsonIgnore] public Conversion Conversion => new(EDecimal.FromString(Multiplier), EDecimal.FromString(Offset));
+
+    
     [JsonIgnore]
     public double DistanceToDefault
     {
@@ -65,7 +67,7 @@ public double DistanceToDefault
                 }
             }
 
-            return result - ApplicableSystem;
+            return result;
         }
     }
 }