Sync back lector

LoneWandererProductions · LoneWandererProductions · commit e90149834120 · 2026-01-06T13:04:13.000+01:00
Fix apiexplore
Improve Dataformater Comments
diff --git a/CoreBuilder/Development/ApiExplorerCommand.cs b/CoreBuilder/Development/ApiExplorerCommand.cs
@@ -47,7 +47,7 @@ public sealed class ApiExplorerCommand : ICommand
         /// <summary>
         ///  folder + optional outputMode
         /// </summary>
-        public int ParameterCount => 2;
+        public int ParameterCount => 1;
 
         /// <summary>
         /// The output
diff --git a/CoreBuilder/Extensions/WhoAmIExtension.cs b/CoreBuilder/Extensions/WhoAmIExtension.cs
@@ -31,9 +31,9 @@ public sealed class WhoAmIExtension : ICommandExtension
         public string Namespace => "System";
 
         /// <inheritdoc />
-        public CommandResult Invoke(ICommand command, string[] args, Func<string[], CommandResult> executor)
+        public CommandResult Invoke(ICommand command, string[] extensionArgs, Func<string[], CommandResult> executor, string[] commandArgs)
         {
-            if (args.Length == 0)
+            if (extensionArgs.Length == 0)
             {
                 return CommandResult.Fail(
                     "No parameter specified. Example: whoami().who(ip,hostname) or whoami().who(ip)");
@@ -57,7 +57,7 @@ public CommandResult Invoke(ICommand command, string[] args, Func<string[], Comm
                 string ipsJoined = ips.Any() ? string.Join(", ", ips) : "None";
 
                 // Build a list of lines for requested fields
-                var lines = args.Select(arg => arg.ToLowerInvariant())
+                var lines = extensionArgs.Select(arg => arg.ToLowerInvariant())
                     .Select(field =>
                     {
                         return field switch
diff --git a/DataFormatter/CsvColumnAttribute.cs b/DataFormatter/CsvColumnAttribute.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     DataFormatter
- * FILE:        DataFormatter/CsvColumnAttribute.cs
+ * FILE:        CsvColumnAttribute.cs
  * PURPOSE:     Helper for csv, Helps converter
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/DataFormatter/CsvHandler.cs b/DataFormatter/CsvHandler.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     DataFormatter
- * FILE:        DataFormatter/CsvHandler.cs
+ * FILE:        CsvHandler.cs
  * PURPOSE:     Simple Csv reader/writer
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/DataFormatter/CsvHelper.cs b/DataFormatter/CsvHelper.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     DataFormatter
- * FILE:        DataFormatter/CsvHelper.cs
+ * FILE:        CsvHelper.cs
  * PURPOSE:     Shared Helper functions that will be inlined anyways
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/DataFormatter/DataFormatterResources.cs b/DataFormatter/DataFormatterResources.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     DataFormatter
- * FILE:        DataFormatter/DataFormatterResources.cs
+ * FILE:        DataFormatterResources.cs
  * PURPOSE:     Basic string Resources
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/DataFormatter/DataHelper.cs b/DataFormatter/DataHelper.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     DataFormatter
- * FILE:        DataFormatter/DataHelper.cs
+ * FILE:        DataHelper.cs
  * PURPOSE:     Basic stuff shared over all operations
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/DataFormatter/ObjFile.cs b/DataFormatter/ObjFile.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     DataFormatter
- * FILE:        DataFormatter/ObjFile.cs
+ * FILE:        ObjFile.cs
  * PURPOSE:     Basic Object for Blender File
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  * NOTE:        Blender Files don't start counting at 0! So add +1 offset.
diff --git a/DataFormatter/ReadText.cs b/DataFormatter/ReadText.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     DataFormatter
- * FILE:        DataFormatter/ReadTxtFile.cs
+ * FILE:        ReadTxtFile.cs
  * PURPOSE:     Read txt Files
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/DataFormatter/ReaderObj.cs b/DataFormatter/ReaderObj.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     DataFormatter
- * FILE:        DataFormatter/ReaderObj.cs
+ * FILE:        ReaderObj.cs
  * PURPOSE:     A really basic obj File reader, does the basic stuff nothing more!
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/DataFormatter/SegmentedCsvHandler.cs b/DataFormatter/SegmentedCsvHandler.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     DataFormatter
- * FILE:        DataFormatter/SegmentedCsvHandler.cs
+ * FILE:        SegmentedCsvHandler.cs
  * PURPOSE:     My custom format, it is a collection of csv files separated with an keyword.
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/DataFormatter/TertiaryFace.cs b/DataFormatter/TertiaryFace.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     DataFormatter
- * FILE:        DataFormatter/TertiaryFace.cs
+ * FILE:        TertiaryFace.cs
  * PURPOSE:     Basic Object that holds three int values, used for obj File
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/DataFormatter/TertiaryVector.cs b/DataFormatter/TertiaryVector.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     DataFormatter
- * FILE:        DataFormatter/TertiaryVector.cs
+ * FILE:        TertiaryVector.cs
  * PURPOSE:     A really basic obj that holds three double values, needed for obj Files
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/Lector/Program.cs b/Lector/Program.cs
@@ -1,4 +1,4 @@
-﻿/*
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     Lector
  * FILE:        Program.cs
diff --git a/Lector/SampleCommand.cs b/Lector/SampleCommand.cs
@@ -1,4 +1,4 @@
-﻿/*
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     Lector
  * FILE:        SampleCommand.cs
@@ -8,6 +8,7 @@
 
 // ReSharper disable UnusedType.Global
 
+#nullable enable
 using Weaver;
 using Weaver.Interfaces;
 using Weaver.Messages;
diff --git a/Lector/SampleExtension.cs b/Lector/SampleExtension.cs
@@ -1,4 +1,4 @@
-﻿/*
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     Lector
  * FILE:        SampleExtension.cs
@@ -8,6 +8,7 @@
 
 // ReSharper disable UnusedType.Global
 
+#nullable enable
 using Weaver.Interfaces;
 using Weaver.Messages;
 
@@ -33,13 +34,13 @@ public sealed class SampleExtension : ICommandExtension
         /// <summary>
         /// Wraps the execution of the command. Can run before/after logic or inject feedback.
         /// </summary>
-        public CommandResult Invoke(ICommand command, string[] args, Func<string[], CommandResult> executor)
+        public CommandResult Invoke(ICommand command, string[] extensionArgs, Func<string[], CommandResult> executor, string[] commandArgs)
         {
             // Before hook
-            BeforeExecute(command, args);
+            BeforeExecute(command, commandArgs);
 
             // Optionally, preview or manipulate the execution
-            var result = executor(args);
+            var result = executor(commandArgs);
 
             // After hook
             AfterExecute(command, result);
diff --git a/Weaver/ScriptEngine/Lowering.cs b/Weaver/ScriptEngine/Lowering.cs
@@ -0,0 +1,81 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     Weaver.ScriptEngine
+ * FILE:        Lowering.cs
+ * PURPOSE:     Converts the ScriptNode tree into a linear sequence for execution
+ * PROGRAMMER:  Peter Geinitz (Wayfarer)
+ */
+
+namespace Weaver.ScriptEngine
+{
+    /// <summary>
+    /// Script lowerer that flattens ScriptNode trees into linear sequences.
+    /// </summary>
+    internal static class Lowering
+    {
+        /// <summary>
+        /// Flattens the ScriptNode tree into a linear sequence with debug categories.
+        /// Includes pseudo-categories like Do_Open, Do_End, If_Open, If_End, Else_Open, Else_End.
+        /// </summary>
+        public static IEnumerable<(string Category, string? Statement)> ScriptLowerer(IEnumerable<ScriptNode> nodes)
+        {
+            foreach (var node in nodes)
+            {
+                switch (node)
+                {
+                    case LabelNode ln:
+                        yield return ("Label", ln.Name);
+
+                        break;
+
+                    case GotoNode gn:
+                        yield return ("Goto", gn.Target);
+
+                        break;
+
+                    case CommandNode cn:
+                        yield return ("Command", cn.Command);
+
+                        break;
+
+                    case AssignmentNode an:
+                        yield return ("Assignment", $"{an.Variable} = {an.Expression}");
+
+                        break;
+
+                    case IfNode ifn:
+                        yield return ("If_Condition", ifn.Condition);
+                        yield return ("If_Open", null); // debug open
+
+                        foreach (var child in ScriptLowerer(ifn.TrueBranch))
+                            yield return child;
+
+                        yield return ("If_End", null); // debug end
+
+                        if (ifn.FalseBranch != null)
+                        {
+                            yield return ("Else_Open", null);
+
+                            foreach (var child in ScriptLowerer(ifn.FalseBranch))
+                                yield return child;
+
+                            yield return ("Else_End", null);
+                        }
+
+                        break;
+
+                    case DoWhileNode dw:
+                        yield return ("Do_Open", null);
+
+                        foreach (var child in ScriptLowerer(dw.Body))
+                            yield return child;
+
+                        yield return ("Do_End", null);
+                        yield return ("While_Condition", dw.Condition);
+
+                        break;
+                }
+            }
+        }
+    }
+}
diff --git a/Weaver/ScriptEngine/Parser.cs b/Weaver/ScriptEngine/Parser.cs
diff --git a/Weaver/ScriptEngine/ScriptExecutor.cs b/Weaver/ScriptEngine/ScriptExecutor.cs
diff --git a/Weaver/ScriptEngine/ScriptNode.cs b/Weaver/ScriptEngine/ScriptNode.cs
diff --git a/Weaver/ScriptEngine/VariableRegistry.cs b/Weaver/ScriptEngine/VariableRegistry.cs
diff --git a/Weaver/ScriptEngine/WeaverProgram.cs b/Weaver/ScriptEngine/WeaverProgram.cs

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public sealed class WhoAmIExtension : ICommandExtension`
`31`	`31`	`public string Namespace => "System";`
`32`	`32`
`33`	`33`	`/// <inheritdoc />`
`34`		`- public CommandResult Invoke(ICommand command, string[] args, Func<string[], CommandResult> executor)`
	`34`	`+ public CommandResult Invoke(ICommand command, string[] extensionArgs, Func<string[], CommandResult> executor, string[] commandArgs)`
`35`	`35`	`{`
`36`		`- if (args.Length == 0)`
	`36`	`+ if (extensionArgs.Length == 0)`
`37`	`37`	`{`
`38`	`38`	`return CommandResult.Fail(`
`39`	`39`	`"No parameter specified. Example: whoami().who(ip,hostname) or whoami().who(ip)");`
`@@ -57,7 +57,7 @@ public CommandResult Invoke(ICommand command, string[] args, Func<string[], Comm`
`57`	`57`	`string ipsJoined = ips.Any() ? string.Join(", ", ips) : "None";`
`58`	`58`
`59`	`59`	`// Build a list of lines for requested fields`
`60`		`- var lines = args.Select(arg => arg.ToLowerInvariant())`
	`60`	`+ var lines = extensionArgs.Select(arg => arg.ToLowerInvariant())`
`61`	`61`	`.Select(field =>`
`62`	`62`	`{`
`63`	`63`	`return field switch`