Filter out unnecessary input files on 'make' command

Adapt the 'make' command to discard 'elm-stuff' and '.git' directories when loading from a local file system.

implement/elm-time/Pine/LoadFromLocalFilesystem.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Linq;
 
 namespace Pine;
 
@@ -16,4 +17,35 @@ public static class LoadFromLocalFilesystem
 
         return PineValueComposition.SortedTreeFromSetOfBlobsWithStringPath(blobs);
     }
+
+    public static TreeNodeWithStringPath RemoveNoiseFromTree(
+        TreeNodeWithStringPath originalTree,
+        bool discardGitDirectory)
+    {
+        if (originalTree is not TreeNodeWithStringPath.TreeNode tree)
+            return originalTree;
+
+        TreeNodeWithStringPath? getValueFromStringName(string name) =>
+            tree.Elements.FirstOrDefault(c => c.name == name).component;
+
+        var elmJson = getValueFromStringName("elm.json");
+
+        bool keepNode((string name, TreeNodeWithStringPath component) node)
+        {
+            if (elmJson != null && node.name is "elm-stuff")
+                return false;
+
+            if (discardGitDirectory && node.component is TreeNodeWithStringPath.TreeNode && node.name is ".git")
+                return false;
+
+            return true;
+        }
+
+        return TreeNodeWithStringPath.SortedTree(
+            treeContent:
+                [.. tree.Elements
+                .Where(keepNode)
+                .Select(child => (child.name, RemoveNoiseFromTree(child.component, discardGitDirectory)))
+                ]);
+    }
 }

implement/elm-time/Platform/WebService/BuildConfigurationFromArguments.cs

@@ -1,6 +1,5 @@
 using Pine;
 using System;
-using System.Collections.Immutable;
 using System.Linq;
 
 namespace ElmTime.Platform.WebService;
@@ -26,7 +25,7 @@ public static
         var filteredSourceTree =
             loadCompositionResult.origin is LoadCompositionOrigin.FromLocalFileSystem
             ?
-            RemoveNoiseFromTreeComingFromLocalFileSystem(sourceTree)
+            LoadFromLocalFilesystem.RemoveNoiseFromTree(sourceTree, discardGitDirectory: true)
             :
             sourceTree;
 
@@ -42,32 +41,6 @@ loadCompositionResult.origin is LoadCompositionOrigin.FromLocalFileSystem
         return (sourceTree, filteredSourceCompositionId, configZipArchive);
     }
 
-    public static TreeNodeWithStringPath RemoveNoiseFromTreeComingFromLocalFileSystem(
-        TreeNodeWithStringPath originalTree)
-    {
-        if (originalTree is not TreeNodeWithStringPath.TreeNode tree)
-            return originalTree;
-
-        TreeNodeWithStringPath? getValueFromStringName(string name) =>
-            tree.Elements.FirstOrDefault(c => c.name == name).component;
-
-        var elmJson = getValueFromStringName("elm.json");
-
-        bool keepNode((string name, TreeNodeWithStringPath component) node)
-        {
-            if (elmJson != null && node.name == "elm-stuff")
-                return false;
-
-            return true;
-        }
-
-        return TreeNodeWithStringPath.SortedTree(
-            treeContent:
-                tree.Elements
-                .Where(keepNode)
-                .Select(child => (child.name, RemoveNoiseFromTreeComingFromLocalFileSystem(child.component))).ToImmutableList());
-    }
-
     public static byte[] BuildConfigurationZipArchive(PineValue sourceComposition)
     {
         var parseSourceAsTree =

implement/elm-time/Program.cs

@@ -18,7 +18,7 @@ namespace ElmTime;
 
 public class Program
 {
-    public static string AppVersionId => "2023-12-04";
+    public static string AppVersionId => "2023-12-05";
 
     private static int AdminInterfaceDefaultPort => 4000;
 
@@ -1392,7 +1392,26 @@ private static CommandLineApplication AddMakeCommand(CommandLineApplication app)
                 loadInputDirectoryResult
                     .AndThen(loadInputDirectoryOk =>
                     {
-                        if (loadInputDirectoryOk.tree.GetNodeAtPath(ImmutableList.Create("elm.json")) is not
+                        var filteredSourceTree =
+                            loadInputDirectoryOk.origin is LoadCompositionOrigin.FromLocalFileSystem
+                            ?
+                            LoadFromLocalFilesystem.RemoveNoiseFromTree(
+                                loadInputDirectoryOk.tree, discardGitDirectory: true)
+                            :
+                            loadInputDirectoryOk.tree;
+
+                        var discardedBlobs =
+                        loadInputDirectoryOk.tree
+                        .EnumerateBlobsTransitive()
+                        .Where(originalBlob => filteredSourceTree.GetNodeAtPath(originalBlob.path) is not TreeNodeWithStringPath.BlobNode)
+                        .ToImmutableArray();
+
+                        if (0 < discardedBlobs.Length)
+                        {
+                            Console.WriteLine("Discarded " + discardedBlobs.Length + " blobs from the input directory.");
+                        }
+
+                        if (filteredSourceTree.GetNodeAtPath(ImmutableList.Create("elm.json")) is not
                             TreeNodeWithStringPath.BlobNode elmJsonFile)
                             return Result<string, LoadForMakeResult>.err(
                                 "Did not find elm.json file in that directory.");
@@ -1416,7 +1435,7 @@ private static CommandLineApplication AddMakeCommand(CommandLineApplication app)
                         {
                             return
                                 Result<string, LoadForMakeResult>.ok(
-                                    new LoadForMakeResult(loadInputDirectoryOk.tree,
+                                    new LoadForMakeResult(filteredSourceTree,
                                         [],
                                         pathToElmFile.Replace('\\', '/').Split('/')));
                         }
@@ -1485,8 +1504,7 @@ IReadOnlyList<string> pathRelativeToCommonParentFromAbsolute(string absolutePath
                                             .Aggregate(
                                                 seed:
                                                 TreeNodeWithStringPath.EmptyTree
-                                                    .SetNodeAtPathSorted(workingDirectoryRelative,
-                                                        loadInputDirectoryOk.tree),
+                                                    .SetNodeAtPathSorted(workingDirectoryRelative, filteredSourceTree),
                                                 func:
                                                 (aggregate, nextSourceDir) =>
                                                     aggregate.SetNodeAtPathSorted(nextSourceDir.relativePath,

implement/elm-time/elm-time.csproj

@@ -5,8 +5,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>ElmTime</RootNamespace>
     <AssemblyName>elm-time</AssemblyName>
-    <AssemblyVersion>2023.1204.0.0</AssemblyVersion>
-    <FileVersion>2023.1204.0.0</FileVersion>
+    <AssemblyVersion>2023.1205.0.0</AssemblyVersion>
+    <FileVersion>2023.1205.0.0</FileVersion>
     <Nullable>enable</Nullable>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>