starlight-fsharp-oracle 0.1.1 → 0.2.0

package/dist/Extensions/TextNode.js

@@ -9,6 +9,10 @@ function escapeJsx(s) {
     return replace(replace(s, "{", "{"), "}", "}");
 }
 
+function escapeText(s) {
+    return replace(replace(replace(replace(replace(s, "&", "&amp;"), "<", "&lt;"), ">", "&gt;"), "{", "&#123;"), "}", "&#125;");
+}
+
 export function wrapWithClass(cls, text) {
     return `<span class="${cls}">${escapeJsx(text)}</span>`;
 }
@@ -36,7 +40,7 @@ export function FSharp_Oracle_Schema_TextNode__TextNode_get_Html(this$) {
         case 11:
             return wrapInKeyword(",");
         case 9:
-            return "&nbsp;";
+            return "&nbsp;&zwnj;";
         case 17:
             return wrapInKeyword("&gt;");
         case 16:
@@ -58,7 +62,7 @@ export function FSharp_Oracle_Schema_TextNode__TextNode_get_Html(this$) {
         case 3:
             return wrapInKeyword(this$.fields[0]);
         case 18:
-            return wrapInKeyword("*");
+            return wrapInKeyword("&#42;");
         case 1:
             return wrapWithClass("fsharp-doc-type", `<a href="${this$.fields[2]}">${this$.fields[0]}</a>`);
         case 2:
@@ -80,7 +84,7 @@ export function FSharp_Oracle_Schema_TextNode__TextNode_get_Html(this$) {
         case 10:
             return FSharp_Oracle_Schema_TextNode__TextNode_ToHtml_Static_5FC7EAAF(new TextNode(19, [toList(delay(() => collect((matchValue) => singleton(new TextNode(9, [])), rangeDouble(1, 1, this$.fields[0]))))]));
         default:
-            return escapeJsx(this$.fields[0]);
+            return escapeText(this$.fields[0]);
     }
 }
 

package/dist/Plugin.js

@@ -58,7 +58,8 @@ function starlightFSharpDoc(pluginOptions) {
                         });
                         return createRenderer({}).then((_arg) => {
                             let matchValue, matchValue_1, msg;
-                            const themesCss = generateCss(_arg);
+                            const layerOrder = "@layer starlight.base, starlight.reset, starlight.core, starlight.content, starlight.components, starlight.utils;\n";
+                            const themesCss = layerOrder + generateCss(_arg);
                             const outputBase = defaultArg(pluginOptions.output, "api");
                             const root = runExtractor(logger, outputBase, toList(pluginOptions.assemblies));
                             const modules = collect((_arg_1) => _arg_1.Modules, root.Assemblies);

package/dist/Render/Pages.js

@@ -1,6 +1,6 @@
 
 import { isEmpty } from "../fable_modules/fable-library-js.5.0.0-rc.7/List.js";
-import { tocH3, renderObsoleteBanner, escapeMdxText, obsoleteInlineHtml, h2 } from "./Primitives.js";
+import { tocH3, inlineSignatureHtml, renderObsoleteBanner, escapeMdxInline, obsoleteInlineHtml, h2 } from "./Primitives.js";
 import { System_Text_StringBuilder__StringBuilder_Write_Z721C83C5, System_Text_StringBuilder__StringBuilder_NewLine, System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5 } from "../Extensions/StringBuilder.js";
 import { disposeSafe, getEnumerator } from "../fable_modules/fable-library-js.5.0.0-rc.7/Util.js";
 import { concat } from "../fable_modules/fable-library-js.5.0.0-rc.7/String.js";
@@ -26,7 +26,7 @@ export function renderDeclaredModules(sb, toc, htmlLinkGen, modules) {
                 if (matchValue == null) {
                 }
                 else {
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxText(matchValue), ..."</dd>"));
+                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxInline(matchValue), ..."</dd>"));
                 }
             }
         }
@@ -45,9 +45,8 @@ export function renderEntityPage(htmlLinkGen, entity, parentModule) {
     System_Text_StringBuilder__StringBuilder_NewLine(sb);
     renderObsoleteBanner(sb, Entity__get_ObsoleteInfo(entity));
     System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "<div class=\"not-content\">");
-    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "<div class=\"fsharp-doc-sig\">");
-    System_Text_StringBuilder__StringBuilder_Write_Z721C83C5(sb, FSharp_Oracle_Schema_TextNode__TextNode_get_Html(Entity__get_Declaration(entity)));
-    System_Text_StringBuilder__StringBuilder_NewLine(sb);
+    System_Text_StringBuilder__StringBuilder_Write_Z721C83C5(sb, "<div class=\"fsharp-doc-sig\">");
+    System_Text_StringBuilder__StringBuilder_Write_Z721C83C5(sb, inlineSignatureHtml(FSharp_Oracle_Schema_TextNode__TextNode_get_Html(Entity__get_Declaration(entity))));
     System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "</div>");
     System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "</div>");
     System_Text_StringBuilder__StringBuilder_NewLine(sb);
@@ -159,7 +158,7 @@ export function renderNamespacePage(htmlLinkGen, ns, subNamespaces, entities, mo
                 if (matchValue == null) {
                 }
                 else {
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxText(matchValue), ..."</dd>"));
+                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxInline(matchValue), ..."</dd>"));
                 }
             }
         }
@@ -190,7 +189,7 @@ export function renderModulePage(htmlLinkGen, m, subModules) {
                 if (matchValue == null) {
                 }
                 else {
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxText(matchValue), ..."</dd>"));
+                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxInline(matchValue), ..."</dd>"));
                 }
             }
         }
@@ -252,7 +251,7 @@ export function renderRootIndexPage(htmlLinkGen, assemblies, globalModules) {
                 if (matchValue == null) {
                 }
                 else {
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxText(matchValue), ..."</dd>"));
+                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxInline(matchValue), ..."</dd>"));
                 }
             }
         }

package/dist/Render/Primitives.js

@@ -1,5 +1,6 @@
 
 import { concat, replace } from "../fable_modules/fable-library-js.5.0.0-rc.7/String.js";
+import { replace as replace_1 } from "../fable_modules/fable-library-js.5.0.0-rc.7/RegExp.js";
 import { TocEntry } from "./Types.js";
 import { System_Text_StringBuilder__StringBuilder_Write_Z721C83C5, System_Text_StringBuilder__StringBuilder_NewLine, System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5 } from "../Extensions/StringBuilder.js";
 import { indexed, head, tail, isEmpty } from "../fable_modules/fable-library-js.5.0.0-rc.7/List.js";
@@ -13,6 +14,22 @@ export function escapeMdxText(text) {
     return replace(replace(replace(replace(replace(text, "&", "&amp;"), "<", "&lt;"), ">", "&gt;"), "{", "&#123;"), "}", "&#125;");
 }
 
+/**
+ * Collapse whitespace runs before escaping, so a blank line can't be read as
+ * a paragraph break that closes an inline element like `<dd>` early.
+ */
+export function escapeMdxInline(text) {
+    return escapeMdxText(replace_1(text, "\\s+", " ").trim());
+}
+
+/**
+ * MDX reflows multi-line raw HTML as a markdown paragraph, collapsing layout.
+ * Convert newlines to <br/> so the signature block renders verbatim.
+ */
+export function inlineSignatureHtml(html) {
+    return replace(html, "\n", "<br/>");
+}
+
 export function h2(sb, toc, slug, text) {
     void (toc.push(new TocEntry(2, slug, text)));
     System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, `<h2 id="${slug}">${text}</h2>`);
@@ -27,7 +44,7 @@ export function renderDocEntry(sb, name, signatureHtml, obsoleteInfo, renderDocu
     const patternInput = (obsoleteInfo.tag === 1) ? [" obsolete", ""] : ((obsoleteInfo.tag === 2) ? [" obsolete", concat(" obsoleteMessage=\"", replace(obsoleteInfo.fields[0], "\"", "&quot;"), ..."\"")] : ["", ""]);
     System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, `<DocEntry name="${name}"${patternInput[0]}${patternInput[1]}>`);
     System_Text_StringBuilder__StringBuilder_Write_Z721C83C5(sb, "<div class=\"fsharp-doc-sig\" slot=\"signature\">");
-    System_Text_StringBuilder__StringBuilder_Write_Z721C83C5(sb, signatureHtml);
+    System_Text_StringBuilder__StringBuilder_Write_Z721C83C5(sb, inlineSignatureHtml(signatureHtml));
     System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "</div>");
     System_Text_StringBuilder__StringBuilder_NewLine(sb);
     renderDocumentation();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starlight-fsharp-oracle",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "type": "module",
   "exports": {
     ".": "./dist/Plugin.js",
@@ -21,18 +21,17 @@
     "Directory.Build.props",
     "Directory.Packages.props"
   ],
-  "scripts": {
-    "postinstall": "dotnet publish packages/FSharp.Oracle/FSharp.Oracle.fsproj -c Release --nologo -o oracle-bin",
-    "prepack": "dotnet fable packages/Starlight.FSharp.Oracle/ --outDir dist --noCache && rm dist/fable_modules/.gitignore"
-  },
   "peerDependencies": {
     "@astrojs/starlight": ">= 0.38.0",
     "astro-expressive-code": ">= 0.38.0"
   },
   "devDependencies": {
     "@hideoo/tsconfig": "^2.0.3",
-    "@types/node": "^25.6.0",
-    "astro-expressive-code": "^0.41.7",
-    "typescript": "^5.8.0"
+    "@types/node": "^26.1.1",
+    "astro-expressive-code": "^0.44.1",
+    "typescript": "^7.0.2"
+  },
+  "scripts": {
+    "postinstall": "dotnet publish packages/FSharp.Oracle/FSharp.Oracle.fsproj -c Release --nologo -o oracle-bin"
   }
 }

package/packages/FSharp.Oracle/XmlDoc.fs

@@ -417,7 +417,18 @@ let loadXmlDocFile (dllPath: string) : Map<string, string> =
     if not (System.IO.File.Exists xmlPath) then
         Map.empty
     else
-        let xmlText = System.IO.File.ReadAllText(xmlPath)
+        let rawXmlText = System.IO.File.ReadAllText(xmlPath)
+
+        // The F# compiler can emit unescaped `<`/`>` in member IDs (e.g. `<>f__AnonymousType...`),
+        // breaking XML parsing. Escape them inside `name="..."`; XDocument decodes them back unchanged.
+        let xmlText =
+            System.Text.RegularExpressions.Regex.Replace(
+                rawXmlText,
+                "name=\"([^\"]*)\"",
+                fun m ->
+                    let escaped = m.Groups.[1].Value.Replace("<", "&lt;").Replace(">", "&gt;")
+                    $"name=\"{escaped}\""
+            )
 
         let doc =
             try

package/packages/FSharp.Oracle/obj/Debug/net10.0/.NETCoreApp,Version=v10.0.AssemblyAttributes.fs

@@ -0,0 +1,3 @@
+namespace Microsoft.BuildSettings
+                [<System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v10.0", FrameworkDisplayName=".NET 10.0")>]
+                do ()

package/packages/FSharp.Oracle/obj/Debug/net10.0/FSharp.Oracle.AssemblyInfo.fs

@@ -0,0 +1,17 @@
+// <auto-generated>
+//     Generated by the FSharp WriteCodeFragment class.
+// </auto-generated>
+namespace FSharp
+
+open System
+open System.Reflection
+
+
+[<assembly: System.Reflection.AssemblyCompanyAttribute("Maxime Mangel")>]
+[<assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")>]
+[<assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")>]
+[<assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9cf322dca5c1f2a47e07d303280038721094e741")>]
+[<assembly: System.Reflection.AssemblyProductAttribute("Oracle")>]
+[<assembly: System.Reflection.AssemblyTitleAttribute("Oracle")>]
+[<assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")>]
+do()

package/packages/FSharp.Oracle/obj/Release/net10.0/.NETCoreApp,Version=v10.0.AssemblyAttributes.fs

@@ -0,0 +1,3 @@
+namespace Microsoft.BuildSettings
+                [<System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v10.0", FrameworkDisplayName=".NET 10.0")>]
+                do ()

package/packages/FSharp.Oracle/obj/Release/net10.0/FSharp.Oracle.AssemblyInfo.fs

@@ -0,0 +1,17 @@
+// <auto-generated>
+//     Generated by the FSharp WriteCodeFragment class.
+// </auto-generated>
+namespace FSharp
+
+open System
+open System.Reflection
+
+
+[<assembly: System.Reflection.AssemblyCompanyAttribute("Maxime Mangel")>]
+[<assembly: System.Reflection.AssemblyConfigurationAttribute("Release")>]
+[<assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")>]
+[<assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7bfb354a69169aaa8967d3a82c2709db0ffc2d75")>]
+[<assembly: System.Reflection.AssemblyProductAttribute("Oracle")>]
+[<assembly: System.Reflection.AssemblyTitleAttribute("Oracle")>]
+[<assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")>]
+do()

package/packages/FSharp.Oracle.Schema/obj/Debug/net10.0/.NETCoreApp,Version=v10.0.AssemblyAttributes.fs

@@ -0,0 +1,3 @@
+namespace Microsoft.BuildSettings
+                [<System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v10.0", FrameworkDisplayName=".NET 10.0")>]
+                do ()

package/packages/FSharp.Oracle.Schema/obj/Debug/net10.0/FSharp.Oracle.Schema.AssemblyInfo.fs

@@ -0,0 +1,17 @@
+// <auto-generated>
+//     Generated by the FSharp WriteCodeFragment class.
+// </auto-generated>
+namespace FSharp
+
+open System
+open System.Reflection
+
+
+[<assembly: System.Reflection.AssemblyCompanyAttribute("Maxime Mangel")>]
+[<assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")>]
+[<assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")>]
+[<assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7bfb354a69169aaa8967d3a82c2709db0ffc2d75")>]
+[<assembly: System.Reflection.AssemblyProductAttribute("FSharp.Oracle.Schema")>]
+[<assembly: System.Reflection.AssemblyTitleAttribute("FSharp.Oracle.Schema")>]
+[<assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")>]
+do()

package/packages/FSharp.Oracle.Schema/obj/Release/net10.0/.NETCoreApp,Version=v10.0.AssemblyAttributes.fs

@@ -0,0 +1,3 @@
+namespace Microsoft.BuildSettings
+                [<System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v10.0", FrameworkDisplayName=".NET 10.0")>]
+                do ()

package/packages/FSharp.Oracle.Schema/obj/Release/net10.0/FSharp.Oracle.Schema.AssemblyInfo.fs

@@ -0,0 +1,17 @@
+// <auto-generated>
+//     Generated by the FSharp WriteCodeFragment class.
+// </auto-generated>
+namespace FSharp
+
+open System
+open System.Reflection
+
+
+[<assembly: System.Reflection.AssemblyCompanyAttribute("Maxime Mangel")>]
+[<assembly: System.Reflection.AssemblyConfigurationAttribute("Release")>]
+[<assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")>]
+[<assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7bfb354a69169aaa8967d3a82c2709db0ffc2d75")>]
+[<assembly: System.Reflection.AssemblyProductAttribute("FSharp.Oracle.Schema")>]
+[<assembly: System.Reflection.AssemblyTitleAttribute("FSharp.Oracle.Schema")>]
+[<assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")>]
+do()