Merge branch 'mh/dev'

# Conflicts:
#	SharpLib.csproj
#	exp/Exp.cs
#	imm/FSM.cs
#	imm/Imm.cs
#	imm/List.cs
#	imm/Util.cs
#	imm/io.cs
#	lib/XmlFormatter2.cs
#	logging/Log.cs
#	res/Resource.cs

SharpLib.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net10.0</TargetFrameworks>
     <RootNamespace>lib</RootNamespace>
     <AssemblyVersion>0.0.1.0</AssemblyVersion>
     <FileVersion>0.0.1.0</FileVersion>

exp/Exp.cs

@@ -1,7 +1,6 @@
 using System.Collections.Immutable;
 using System.Runtime.CompilerServices;
 
-
 namespace exp;
 
 

imm/FSM.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 
 using System;
 using System.Runtime.CompilerServices;
@@ -78,7 +78,7 @@ public abstract record class FsmBase<TSelf, TState, TCtx> : io.Recorded<TSelf>
 
     /// <summary>
     /// Transitions the FSM. It automatically uses the 'Process'
-    /// method appropriate for io.ecorded or Timed, thanks to virtual overrides.
+    /// method appropriate for io.Recorded or Timed, thanks to virtual overrides.
     /// </summary>
     public TSelf Transition(
         TState newState,

imm/Imm.cs

@@ -1,9 +1,8 @@
-//#nullable enable
+//#nullable enable
 
 using System;
 using System.Runtime.CompilerServices;
 
-
 /// <summary>
 /// Helper static class for processing immutable objects using a 'ref' pattern.
 /// Provides different levels of processing based on the type.
@@ -16,8 +15,8 @@ public static class imm
     public static T LightProcess<T>(
         ref T obj,
         Func<T, T> fn,
-        string reason = "Processed" // TODO Replace the string with a $"" that cinludes some info
+        string reason = "Processed" )
-        ) where T : io.Versioned<T>
+        where T : io.Versioned<T>
     {
         obj = obj.Process( fn, reason );
         return obj;

imm/List.cs

@@ -11,7 +11,7 @@ namespace io;
 /// <summary>
 /// An immutable list implementation that tracks history, metadata, and time.
 /// </summary>
-public record class List<T> : io.Timed<List<T>>, IImmutableList<T>
+public record class List<T> : Timed<List<T>>, IImmutableList<T>
 {
     static public List<T> Empty { get; } = new();
 
@@ -19,7 +19,7 @@ public record class List<T> : io.Timed<List<T>>, IImmutableList<T>
 
     public List() { }
     // Required for 'with' expressions to work with the base class hierarchy
-    protected List( io.Timed<List<T>> original ) : base( original ) { }
+    protected List(Timed<List<T>> original) : base(original) { }
 
     // Helper to apply changes using the Process method
     private List<T> Change(

imm/Util.cs

@@ -1,3 +1,2 @@
 using System;
 using System.Collections.Generic;
-

imm/io.cs

@@ -23,7 +23,7 @@ public interface Obj
     /// Gets the previous version as a base object, if available.
     /// Returns null if this is the first version or if history is not tracked.
     /// </summary>
-    Obj? DebugOld { get; }
+    Obj? Old { get; }
 
     /// <summary>
     /// Creates a new version without functional change.
@@ -174,11 +174,11 @@ public record class Versioned<T> : Obj<T> where T : Versioned<T>
     [JsonIgnore]
     public ChangeDelegate<T> OnChange { get; set; } = ( o, n ) => { };
 
-    public virtual Obj? DebugOld => null;
+    public virtual Obj? Old => null;
 
     Metadata_Versioned Obj.Meta => this.Meta;
     [JsonIgnore]
-    Obj? Obj.DebugOld => this.DebugOld;
+    Obj? Obj.Old => this.Old;
 
     public Versioned() { }
     protected Versioned( Versioned<T> original )
@@ -239,9 +239,9 @@ public record class Recorded<T> : Versioned<T> where T : Recorded<T>
     new public Metadata_Recorded Meta { get; init; } = new();
 
     [JsonIgnore]
-    new public T? DebugOld => Meta.OldObject as T;
+    new public T? Old => Meta.OldObject as T;
 
-    //public override Obj? DebugOld => this.DebugOld;
+    //public override Obj? Old => this.Old;
     //Metadata_Versioned Obj.Meta => this.Meta;
 
     public Recorded() { }
@@ -261,8 +261,7 @@ public record class Recorded<T> : Versioned<T> where T : Recorded<T>
         if( ReferenceEquals( current, next ) )
             return current;
 
-        var newMeta = current.Meta with
+        var newMeta = current.Meta with {
-        {
             Version = current.Meta.Version + 1,
             Reason = reason,
             MemberName = dbgName,
@@ -295,7 +294,7 @@ public record class Timed<T> : Recorded<T> where T : Timed<T>
 {
     new public Metadata_Timed Meta { get; init; } = new();
     //Metadata_Versioned Obj.Meta => this.Meta;
-    public TimeSpan SinceLastTouch => Meta.TouchedAt - ( DebugOld?.Meta as Metadata_Timed )?.TouchedAt ?? TimeSpan.Zero;
+    public TimeSpan SinceLastTouch => Meta.TouchedAt - ( Old?.Meta as Metadata_Timed )?.TouchedAt ?? TimeSpan.Zero;
     public TimeSpan TotalAge => Meta.TouchedAt - Meta.CreatedAt;
 
     public Timed() { }

lib/XmlFormatter2.cs

@@ -186,8 +186,7 @@ namespace lib
 
 			doc.Load( reader );
 
-			if( doc.DocumentElement == null )
+			if( doc.DocumentElement == null ) return null;
-				return null;
 
 			if( t == null )
 				return Deserialize( doc.DocumentElement );
@@ -257,8 +256,7 @@ namespace lib
 			{
 				TypeCode typeCode = Type.GetTypeCode( type );
 
-				if( _cfg.VerboseLogging )
+				if( _cfg.VerboseLogging ) log.info( $"{type.FriendlyName()}.{name} {existing} {mi?.Name}" );
-					log.info( $"{type.FriendlyName()}.{name} {existing} {mi?.Name}" );
 
 				if( typeCode != TypeCode.Object )
 				{
@@ -278,8 +276,7 @@ namespace lib
 
 							if( obj is ser.I_Serialize iser )
 							{
-								if( _cfg.VerboseLogging )
+								if( _cfg.VerboseLogging ) log.info( $"" );
-									log.info( $"" );
 								obj = iser.OnDeserialize( null );
 							}
 
@@ -317,8 +314,7 @@ namespace lib
 
 		private object DeserializeConcrete( XmlElement elem, MemberInfo mi, string name, Type type )
 		{
-			if( _cfg.VerboseLogging )
+			if( _cfg.VerboseLogging ) log.info( $"" );
-				log.info( $"" );
 
 			string val = "";
 
@@ -402,8 +398,7 @@ namespace lib
 
 		private object HydrateObject( XmlElement elem, MemberInfo mi, Type finalType, object obj )
 		{
-			if( _cfg.VerboseLogging )
+			if( _cfg.VerboseLogging ) log.info( $"" );
-				log.info( $"" );
 
 			if( obj is IList )
 			{
@@ -493,8 +488,7 @@ namespace lib
 
 		private object HydrateObjectOfNarrowType( XmlElement elem, MemberInfo mi, Type narrowType, object obj )
 		{
-			if( _cfg.VerboseLogging )
+			if( _cfg.VerboseLogging ) log.info( $"" );
-				log.info( $"" );
 
 			var isImm = typeof(io.Obj).IsAssignableFrom( narrowType );
 
@@ -654,8 +648,8 @@ namespace lib
 			}
 			else
 			{
-				var imm = obj as io.Obj;
+				var immObj = obj as io.Obj;
-				var newObj = imm.Record( $"From XML {fromStr}:{elem.ParentNode?.Name}{elem.Name}" );
+				var newObj = immObj.Record( $"From XML {fromStr}:{elem.ParentNode?.Name}{elem.Name}" );
 				return newObj;
 			}
 
@@ -692,8 +686,7 @@ namespace lib
 
 			int refInt = refString.Length > 0 ? Convert.ToInt32( refString ) : -1;
 
-			if( _cfg.VerboseLogging )
+			if( _cfg.VerboseLogging ) log.info( $"{finalType?.FriendlyName()}({type?.FriendlyName()}) refInt {refInt} exitingObj = {obj?.ToString()}" );
-				log.info( $"{finalType?.FriendlyName()}({type?.FriendlyName()}) refInt {refInt} exitingObj = {obj?.ToString()}" );
 
 			obj = createObject( elem, finalType, refInt, obj );
 
@@ -702,8 +695,7 @@ namespace lib
 
 		private object DeserializeList( XmlElement elem, MemberInfo mi, Type type, IList list )
 		{
-			if( _cfg.VerboseLogging )
+			if( _cfg.VerboseLogging ) log.info( $"" );
-				log.info( $"" );
 
 			XmlNodeList arrNodeList = elem.ChildNodes;
 
@@ -739,8 +731,7 @@ namespace lib
 				typeElem = typeof( KeyValuePair<,> ).MakeGenericType( type.GenericTypeArguments );
 			}
 
-			if( _cfg.VerboseLogging )
+			if( _cfg.VerboseLogging ) log.info( $"DserCol {type.GetType().FriendlyName()} {typeElem.Name} into reflT {mi.ReflectedType.FriendlyName()} declT {mi.DeclaringType.FriendlyName()} {mi.Name}" );
-				log.info( $"DserCol {type.GetType().FriendlyName()} {typeElem.Name} into reflT {mi.ReflectedType.FriendlyName()} declT {mi.DeclaringType.FriendlyName()} {mi.Name}" );
 
 			string refString = elem.GetAttribute( "ref" );
 			int refInt = refString.Length > 0 ? Convert.ToInt32( refString ) : -1;
@@ -785,8 +776,7 @@ namespace lib
 
 			var typeGen = Type.MakeGenericSignatureType( type );
 
-			if( _cfg.VerboseLogging )
+			if( _cfg.VerboseLogging ) log.info( $"TypeGen: {typeGen.FriendlyName()}" );
-				log.info( $"TypeGen: {typeGen.FriendlyName()}" );
 
 			if( type == typeof( ImmutableArray<> ).MakeGenericType( typeElem ) )
 			{
@@ -843,8 +833,7 @@ namespace lib
 
 		private object DeserializeArray( XmlElement elem, MemberInfo mi, Type type )
 		{
-			if( _cfg.VerboseLogging )
+			if( _cfg.VerboseLogging ) log.info( $"" );
-				log.info( $"" );
 
 			Type typeElem = type.GetElementType();
 
@@ -894,8 +883,7 @@ namespace lib
 
 			if( _cfg.datastructure == Datastructure.Graph && refInt > 0 && m_alreadySerialized.ContainsKey( refInt ) )
 			{
-				if( _cfg.VerboseLogging )
+				if( _cfg.VerboseLogging ) log.info( $"Reuse object" );
-					log.info( $"Reuse object" );
 				return m_alreadySerialized[refInt];
 			}
 
@@ -905,8 +893,7 @@ namespace lib
 
 			if( isProxy )
 			{
-				if( _cfg.VerboseLogging )
+				if( _cfg.VerboseLogging ) log.info( $"use Proxy" );
-					log.info( $"use Proxy" );
 				object obj = null;
 
 				var tryType = type;
@@ -950,8 +937,7 @@ namespace lib
 
 				if( isSubclass )
 				{
-					if( _cfg.VerboseLogging )
+					if( _cfg.VerboseLogging ) log.info( $"Using existing obj {existingObj?.ToString()}" );
-						log.info( $"Using existing obj {existingObj?.ToString()}" );
 					return existingObj;
 				}
 
@@ -967,14 +953,12 @@ namespace lib
 
 				try
 				{
-					if( _cfg.VerboseLogging )
+					if( _cfg.VerboseLogging ) log.info( $"For {type.FriendlyName()} check for constructors" );
-						log.info( $"For {type.FriendlyName()} check for constructors" );
 
 					var cons = type.GetConstructor( Type.EmptyTypes );
 					if( cons != null)
 					{
-						if( _cfg.VerboseLogging )
+						if( _cfg.VerboseLogging ) log.info( $"Activator.CreateInstance" );
-							log.info( $"Activator.CreateInstance" );
 						obj = Activator.CreateInstance( type );
 					}
 					else
@@ -983,18 +967,15 @@ namespace lib
 						obj = System.Runtime.Serialization.FormatterServices.GetUninitializedObject( type );
 					}
 
-					if( _cfg.VerboseLogging )
+					if( _cfg.VerboseLogging ) log.info( $"Got obj {obj?.ToString()}" );
-						log.info( $"Got obj {obj?.ToString()}" );
 				}
 				catch( Exception )
 				{
 					try
 					{
-						if( _cfg.VerboseLogging )
+						if( _cfg.VerboseLogging ) log.info( $"GetUninitializedObject" );
-							log.info( $"GetUninitializedObject" );
 						obj = System.Runtime.Serialization.FormatterServices.GetUninitializedObject( type );
-						if( _cfg.VerboseLogging )
+						if( _cfg.VerboseLogging ) log.info( $"Got obj {obj?.ToString()}" );
-							log.info( $"Got obj {obj?.ToString()}" );
 					}
 					catch( Exception exInner )
 					{
@@ -1342,10 +1323,8 @@ namespace lib
 
 					if( isImm )
 					{
-						if( name == "MetaStorage" )
+						if( name == "MetaStorage" ) continue;
-							continue;
+						if( name == "Fn" ) continue;
-						if( name == "Fn" )
-							continue;
 					}
 
 					if( !doAtt.Any() && FilterField( filterFields, doImpls, whitelistFields, childFi as MemberInfo, name ) )
@@ -1386,10 +1365,8 @@ namespace lib
 
 					if( isImm )
 					{
-						if( name == "MetaStorage" )
+						if( name == "MetaStorage" ) continue;
-							continue;
+						if( name == "Fn" ) continue;
-						if( name == "Fn" )
-							continue;
 					}
 
 					if( FilterField( filterProps, doImpls, whitelistProps, childPi as MemberInfo, name ) )
@@ -1436,10 +1413,8 @@ namespace lib
 			Type type = root.GetType();
 
 			Type typeOfMember = typeof( object );
-			if( mi is FieldInfo fi )
+			if( mi is FieldInfo fi ) typeOfMember = fi.FieldType;
-				typeOfMember = fi.FieldType;
+			if( mi is PropertyInfo pi ) typeOfMember = pi.PropertyType;
-			if( mi is PropertyInfo pi )
-				typeOfMember = pi.PropertyType;
 			if( typeOfMember != type )
 			{
 				log.info( $"SerArr {typeOfMember.FriendlyName()} {mi?.Name} != {type.FriendlyName()}" );

logging/Log.cs

@@ -18,10 +18,10 @@ using System.Text;
 /*
 
 T O D O :
+x) Hook the C# prints from glue.
+x) Fix
 x) Refactor various logs in order to do automagic structured logging
 ref: https://learn.microsoft.com/en-us/dotnet/csharp/whats-new/tutorials/interpolated-string-handler
-x) Add support for structured logging (e.g., JSON, XML)
-x) Implement a centralized logger that can be used across the application
 
 
 D O N E:
@@ -32,63 +32,7 @@ N O T  D O I N G :
 
 */
 
-
+#region Helpers
-/*
-// L L M
-# Context: Logging Infrastructure (`log` static class)
-**Strict Rule:** DO NOT use `Console.WriteLine`, `Debug.WriteLine`, or standard `ILogger`. Use the static `log` class for all diagnostics.
-
-## Core Design Pattern
-The logging system uses **Caller Info Attributes** (`[CallerMemberName]`, `[CallerFilePath]`, etc.) to automatically capture context. Do not manually format method names or file paths in messages.
-
-## API Surface
-### 1. Standard Levels. Standard goto loggin
-* `log.trace(msg)`, `log.debug(msg)`, `log.info(msg)`
-* `log.warn(msg)`, `log.high(msg)`
-* `log.error(msg)`, `log.fatal(msg)`
-* **Signature:** `(string msg, string cat = "", SourceLoc? loc = null)`
-* *Note:* `cat` (Category) and `loc` (SourceLocation) are optional; the system auto-resolves `cat` based on directory structure if omitted.
-
-### 2. Functional Pass-Throughs If necessary
-Use these to log data flow without breaking the statement chain.
-* `T log.var<T>(T val)`: Logs `name_of_var = value` and returns `val`.
-* `T log.call<T>(Func<T> func)`: Logs entry, executes `func`, logs exit + result, returns result.
-* `void log.call(Action func)`: Logs entry, executes `action`, logs exit.
-* `log.operations(Action/Func)`: Wraps execution with info logs.
-
-### 3. Special Types
-* `Value<T>`: A struct wrapper to capture variable expressions alongside values. Use `log.Value(var)` when you need explicit expression capturing in custom constructs.
-* `log.exception(Exception ex, string msg)`: specialized dump for exceptions.
-* `log.logProps(object obj, string header)`: Reflection-based dump of all properties on an object.
-
-## Idiomatic Usage Examples
-**Good:**
-```csharp
-// Variable inspection (Pass-through)
-int x = log.var(Calculate());
-
-// Function tracing
-var result = log.call(() => ComplexCalculation(input));
-
-// Exception handling
-try { ... }
-catch (Exception ex) { log.exception(ex, "Calculation failed"); }
-
-// Object Dump
-log.logProps(userConfig, "Current Config State");
-```
-
-**Bad:**
-```csharp
-int x = Calculate();
-Console.WriteLine("x is " + x); // Forbidden
-log.info($"x = {x}"); // Redundant manual formatting
-```
-
-
-*/
-
-
 public record struct Value<T>( T _val, string _exp = "" )
 {
 	public static T Default = default!;
@@ -144,13 +88,10 @@ public struct SourceLoc
 
 
 }
-
+#endregion // Helpers
 
 static public class log
 {
-
-	//static
-
 	#region CLR Logging
 
 
@@ -212,14 +153,6 @@ static public class log
 
 	#endregion // CLR Logging
 
-	static public Value<T> Value<T>( T val,
-			[CallerArgumentExpression("val")]
-						string dbgExp = ""
-)
-	{
-		return new( val, dbgExp );
-	}
-
 	[Flags]
 	public enum LogType
 	{
@@ -247,7 +180,9 @@ static public class log
 		All = File | Console,
 	}
 
+
 #region LogEvent
+
 	public struct LogEvent
 	{
 		public DateTime Time;
@@ -311,7 +246,6 @@ static public class log
 
 		return logEvent;
 	}
-	#endregion // LogEvent
 
 	public delegate void Log_delegate( LogEvent evt );
 
@@ -322,7 +256,7 @@ static public class log
 		ImmutableInterlocked.AddOrUpdate( ref s_logEPforCat, cat, ep, ( k, v ) => ep );
 	}
 
-
+#endregion // LogEvent
 
 	static public void shutdown()
 	{
@@ -1078,4 +1012,13 @@ static public class log
 
 	private static ArrayList s_delegates = new ArrayList();
 
+	static public Value<T> Value<T>( T val,
+			[CallerArgumentExpression("val")]
+						string dbgExp = ""
+)
+	{
+		return new( val, dbgExp );
 	}
+
+
+} // end static class log