Updating from source commit 013de403673a15a7cccbb5f60add13845df1f77e on 2025-08-01T13:22:55-07:00

Author: ljcollins25

Codex.xln

@@ -3,7 +3,7 @@
     <!-- Allow all projects -->
     <SolutionSaveLocation>$(MSBuildThisFileDirectory)\src\Codex.sln</SolutionSaveLocation>
     <ProjectFilterLocal>$(ProjectFilter)</ProjectFilterLocal>
-    <DisplayName>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildThisFileFullPath)))))</DisplayName>
+    <SolutionDisplayName>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildThisFileFullPath)))))</SolutionDisplayName>
   </PropertyGroup>
 
   <ItemDefinitionGroup>

README.md

@@ -24,17 +24,17 @@ http://ref12.github.io/Codex
 
 3. Deploy the wasm binaries
 
-    ` ./deploywasm.ps1 ` - deploys static site to `bin\wasm` folder by default
+    ` ./deploywasm.ps1 ` - deploys static site to `bin/web` folder by default
 
 4. Build repo and generate binlog: ` ./build.ps1 `
 
 5. Analyze repo and binlogs to produce analysis outputs: ` ./analyze.ps1 `
 
-6. Create or update index ` ./ingest.ps1 `
+6. Create or update index ` ./ingest.ps1 -OutputDir bin/web/index`
 
 7. Test locally using ` dotnet serve `
 
-    `dotnet serve --directory bin/wasm`
+    `dotnet serve -p 58226 -S --directory bin/web`
 
 ## Features
 * Semantic analysis of C#, VB, and MSBuild

deploywasm.ps1

@@ -7,4 +7,4 @@ param(
     [string[]]$RemainingArgs
 )
 
-& "$CodexExeDir/Codex.exe" deployweb -s "$WasmPublishDir/wwwroot" -t "$OutputDir" -h pages -m wasm -i index @RemainingArgs
+& "$CodexExeDir/Codex.exe" deployweb -s "$WasmPublishDir/wwwroot" -t "$OutputDir" -h pages -m wasm -i "index" @RemainingArgs

src/Codex.Application/Verbs/DeployWebOperation.cs

@@ -117,24 +117,33 @@ protected void CopyFile(string source, string? target = null, Func<string, strin
 
         var targetFile = Path.Combine(TargetDirectory, target);
 
-        Logger.WriteLine($"Copying '{source}' to '{target}'...");
+        Logger.WriteLine($"Copying '{source}' to '{targetFile}'...");
         if (transformText != null)
         {
             var text = SourceFs.FS.OpenFile(source).ReadAllText();
             text = transformText.Invoke(text);
             File.WriteAllText(targetFile, text);
         }
+        else
+        {
+            using var sourceStream = SourceFs.FS.OpenFile(source);
+            using var targetStream = File.OpenWrite(targetFile);
+            sourceStream.CopyTo(targetStream, 1 << 16);
+        }
 
-        Logger.WriteLine($"Copied '{source}' to '{target}'.");
+        Logger.WriteLine($"Copied '{source}' to '{targetFile}'.");
 
         if (generateCompressionVariants)
         {
             void compress(Func<Stream, Stream> getCompressionStream, string ext)
             {
+                var cmpTargetFile = $"{targetFile}.{ext}";
                 using var sourceStream = File.OpenRead(targetFile);
-                using var targetStream = getCompressionStream(File.OpenWrite($"{targetFile}.{ext}"));
+                using var targetStream = getCompressionStream(File.OpenWrite(cmpTargetFile));
 
                 sourceStream.CopyTo(targetStream, 1 << 16);
+
+                Logger.WriteLine($"Created compressed file: '{cmpTargetFile}'.");
             }
 
             compress(s => new BrotliStream(s, CompressionLevel.Optimal), "br");

src/Codex.Integration.Tests/AnalyzeTestProjectBase.cs

@@ -80,12 +80,18 @@ public Task<IngestOperation> RunAnalyzeTestProject(bool searchOnly, bool cleanIn
         });
     }
 
+    protected virtual void PreconfigureOptions(AnalyzeTestProjectOptions options)
+    {
+
+    }
+
     public async Task<AnalyzeOperation> RunAnalyzeTestProjectAnalysis(
         Func<AnalyzeTestProjectOptions, AnalyzeTestProjectOptions> configureOptions = null,
         AsyncOut<AnalyzeTestProjectOptions> optionsOut = null,
         [CallerMemberName] string caller = null)
     {
         var options = new AnalyzeTestProjectOptions();
+        PreconfigureOptions(options);
         options = configureOptions?.Invoke(options) ?? options;
         optionsOut?.Set(options);
 

src/Codex.Integration.Tests/CodexTestBase.cs

@@ -180,21 +180,16 @@ public CodexPage CreateCodexApp(string indexDirectory,
         var options = new CodexAppOptions();
         options = updateOptions?.Invoke(options) ?? options;
 
-        if (indexDirectory.StartsWith("https://"))
+        if (PathUtilities.ToUriOrPath(indexDirectory, out var uri, out var path))
         {
+            // For uri's we need to use paging logic
             options.UsePaging = true;
             options.ConfigurePaging = options.ConfigurePaging.ApplyBefore(pc => pc with
             {
                 CacheLimit = 100_000,
             });
         }
 
-        if (PathUtilities.ToUriOrPath(indexDirectory, out var uri, out var path))
-        {
-            // For uri's we need to use paging logic
-            options.UsePaging = true;
-        }
-
         ICodex getCodex()
         {
             {

src/Codex.Lucene/Paging/PagingHelpers.cs

@@ -154,7 +154,7 @@ IHttpClient getClient(string directoryOrUrl, HttpClientKind kind)
 
         private static Url GetAddress(Uri uri)
         {
-            Url result = uri;
+            Url result = uri.EnsureTrailingSlash();
             return result;
         }
 

src/Codex.Web.Wasm/wwwroot/styles.css …x.Web.Wasm/wwwroot/content/home.html.csssrc/Codex.Web.Wasm/wwwroot/styles.css renamed to src/Codex.Web.Wasm/wwwroot/content/home.html.css src/Codex.Web.Wasm/wwwroot/styles.css renamed to src/Codex.Web.Wasm/wwwroot/content/home.html.css

@@ -1,6 +1,5 @@
 <div style="pointer-events: all; overflow: auto; height: 100%">
-        <link rel="stylesheet" href="/styles.css" />
-        <!--<link rel="stylesheet" href="./content/styles.css" />-->
+        <link rel="stylesheet" href="content/home.html.css" />
         <link href="content/dark.css" rel="stylesheet" media="(prefers-color-scheme: dark)" />
 
         <div class="homeRoot">

src/Codex.Web.Wasm/wwwroot/home.html

@@ -37,9 +37,9 @@
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
 
   <link rel="icon" href="content/images/icon16.png" type="image/png" />
-  <link href="/css/bootstrap/bootstrap.min.css" rel="stylesheet" />
+  <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
 
-  <link href="/css/app.css" rel="stylesheet" />
+  <link href="css/app.css" rel="stylesheet" />
 
   <link href="content/body.css" rel="stylesheet" />
   <link href="content/results.css" rel="stylesheet" />