starlight-fsharp-oracle 0.1.0 → 0.1.2

package/dist/Generate.js

@@ -1,9 +1,9 @@
 
-import { join, concat, split, substring, replace } from "./fable_modules/fable-library-js.5.0.0-rc.7/String.js";
+import { join, split, concat, substring, replace } from "./fable_modules/fable-library-js.5.0.0-rc.7/String.js";
 import { cons, append, toArray, exists, isEmpty, map, filter, ofArray, collect, sort } from "./fable_modules/fable-library-js.5.0.0-rc.7/List.js";
 import { List_distinct } from "./fable_modules/fable-library-js.5.0.0-rc.7/Seq2.js";
 import { scan, tail } from "./fable_modules/fable-library-js.5.0.0-rc.7/Array.js";
-import { curry2, comparePrimitives, stringHash } from "./fable_modules/fable-library-js.5.0.0-rc.7/Util.js";
+import { comparePrimitives, stringHash } from "./fable_modules/fable-library-js.5.0.0-rc.7/Util.js";
 import { renderRootIndexPage, renderEntityPage, renderModulePage, renderNamespacePage } from "./Render.js";
 import { singleton, append as append_1, map as map_1, collect as collect_1, delay, toList } from "./fable_modules/fable-library-js.5.0.0-rc.7/Seq.js";
 import { Entity__get_Name, Entity__get_FullName } from "./FSharp.Oracle.Schema/Schema.js";
@@ -20,17 +20,14 @@ function toSlug(name) {
 }
 
 function expandNamespaces(namespaces) {
-    return sort(List_distinct(collect((ns) => {
-        const parts = split(ns, ["."], undefined, 0);
-        return ofArray(tail(scan((acc, part) => {
-            if (acc === "") {
-                return part;
-            }
-            else {
-                return concat(acc, ".", ...part);
-            }
-        }, "", parts)));
-    }, namespaces), {
+    return sort(List_distinct(collect((ns) => ofArray(tail(scan((acc, part) => {
+        if (acc === "") {
+            return part;
+        }
+        else {
+            return concat(acc, ".", ...part);
+        }
+    }, "", split(ns, ["."], undefined, 0)))), namespaces), {
         Equals: (x, y) => (x === y),
         GetHashCode: (x) => (stringHash(x) | 0),
     }), {
@@ -50,16 +47,9 @@ function escapeYaml(s) {
 }
 
 function toMdxPage(page) {
-    let headingsSection;
-    if (isEmpty(page.TocEntries)) {
-        headingsSection = "headings: []";
-    }
-    else {
-        const entries = join("\n", map((e) => (`  - depth: ${e.Depth}
+    const headingsSection = isEmpty(page.TocEntries) ? "headings: []" : ("headings:\n" + join("\n", map((e) => (`  - depth: ${e.Depth}
     slug: "${escapeYaml(e.Slug)}"
-    text: "${escapeYaml(e.Text)}"`), page.TocEntries));
-        headingsSection = ("headings:\n" + entries);
-    }
+    text: "${escapeYaml(e.Text)}"`), page.TocEntries)));
     return `---
 layout: 'starlight-fsharp-oracle/layouts/FSharpDocLayout.astro'
 title: "${escapeYaml(page.Title)}"
@@ -75,41 +65,38 @@ ${page.TemplateBody}`;
 export function namespacePages(outputBase, modules) {
     const realModules = filter((m) => !m.IsSynthetic, modules);
     const allNamespaces = namespacesOf(modules);
-    const htmlLinkGen = (name, fullName) => (`<a href="/${outputBase}/${toSlug(fullName)}">${name}</a>`);
-    const directChildNamespaces = (ns) => filter((other) => {
-        if (other.startsWith(ns + ".") && !(other.slice(ns.length + 1, other.length).indexOf(".") >= 0)) {
-            return !exists((m_1) => (m_1.FullName === other), realModules);
-        }
-        else {
-            return false;
-        }
-    }, allNamespaces);
     const syntheticModules = filter((m_2) => m_2.IsSynthetic, modules);
     return map((ns_1) => {
         const slug = toSlug(ns_1);
         const modulesInNs = filter((m_3) => (m_3.Namespace === ns_1), realModules);
-        const subNamespaces = directChildNamespaces(ns_1);
+        let subNamespaces;
+        const ns = ns_1;
+        subNamespaces = filter((other) => {
+            if (other.startsWith(ns + ".") && !(other.slice(ns.length + 1, other.length).indexOf(".") >= 0)) {
+                return !exists((m_1) => (m_1.FullName === other), realModules);
+            }
+            else {
+                return false;
+            }
+        }, allNamespaces);
         const entitiesInNs = collect((m_5) => m_5.Entities, filter((m_4) => (m_4.Namespace === ns_1), syntheticModules));
-        return [slug, toMdxPage(renderNamespacePage(curry2(htmlLinkGen))(ns_1)(subNamespaces)(entitiesInNs)(modulesInNs))];
+        return [slug, toMdxPage(renderNamespacePage((name) => ((fullName) => (`<a href="/${outputBase}/${toSlug(fullName)}">${name}</a>`)))(ns_1)(subNamespaces)(entitiesInNs)(modulesInNs))];
     }, allNamespaces);
 }
 
 export function modulePages(outputBase, modules) {
     const realModules = filter((m) => !m.IsSynthetic, modules);
-    const htmlLinkGen = (name, fullName) => (`<a href="/${outputBase}/${toSlug(fullName)}">${name}</a>`);
     return map((m_1) => {
         const subModules = filter((other) => (other.Namespace === m_1.FullName), realModules);
-        return [toSlug(m_1.FullName), toMdxPage(renderModulePage(curry2(htmlLinkGen))(m_1)(subModules))];
+        return [toSlug(m_1.FullName), toMdxPage(renderModulePage((name) => ((fullName) => (`<a href="/${outputBase}/${toSlug(fullName)}">${name}</a>`)))(m_1)(subModules))];
     }, realModules);
 }
 
 export function entityPages(outputBase, modules) {
-    const htmlLinkGen = (name, fullName) => (`<a href="/${outputBase}/${toSlug(fullName)}">${name}</a>`);
-    return toList(delay(() => collect_1((m) => map_1((e) => [toSlug(Entity__get_FullName(e)), toMdxPage(renderEntityPage(curry2(htmlLinkGen))(e)(m))], m.Entities), modules)));
+    return toList(delay(() => collect_1((m) => map_1((e) => [toSlug(Entity__get_FullName(e)), toMdxPage(renderEntityPage((name) => ((fullName) => (`<a href="/${outputBase}/${toSlug(fullName)}">${name}</a>`)))(e)(m))], m.Entities), modules)));
 }
 
 export function rootIndexPage(outputBase, assemblies, modules) {
-    const htmlLinkGen = (name, fullName) => (`<a href="/${outputBase}/${toSlug(fullName)}">${name}</a>`);
     const globalModules = filter((m) => {
         if (!m.IsSynthetic) {
             return m.Namespace === "";
@@ -118,7 +105,7 @@ export function rootIndexPage(outputBase, assemblies, modules) {
             return false;
         }
     }, modules);
-    return ["index", toMdxPage(renderRootIndexPage(curry2(htmlLinkGen))(assemblies)(globalModules))];
+    return ["index", toMdxPage(renderRootIndexPage((name) => ((fullName) => (`<a href="/${outputBase}/${toSlug(fullName)}">${name}</a>`)))(assemblies)(globalModules))];
 }
 
 function sidebarLink(outputBase, label, fullName, letter, kind) {
@@ -161,8 +148,6 @@ function entityLetterAndKind(entity) {
 
 function entitySidebarItem(outputBase, entity) {
     const patternInput = entityLetterAndKind(entity);
-    const letter = patternInput[0];
-    const kind = patternInput[1];
     return {
         label: Entity__get_Name(entity),
         link: concat("/", outputBase, "/", ...toSlug(Entity__get_FullName(entity))),
@@ -184,16 +169,10 @@ export function sidebarTree(outputBase, label, modules) {
     });
     const moduleSidebarItem = (m_3) => {
         const subModules = filter((other) => (other.Namespace === m_3.FullName), realModules);
-        const overviewLink = {
+        return sidebarGroup(m_3.Name, "M", "module", append(cons({
             label: "Overview",
             link: moduleHref(m_3),
-        };
-        const entityItems = map((entity) => entitySidebarItem(outputBase, entity), m_3.Entities);
-        const functionItems = map((f) => anchorLink(f.Name, concat(moduleHref(m_3), "#", ...f.Name)), m_3.Functions);
-        const valueItems = map((v) => anchorLink(v.Name, concat(moduleHref(m_3), "#", ...v.Name)), m_3.Values);
-        const subModuleItems = map(moduleSidebarItem, subModules);
-        const children = append(cons(overviewLink, entityItems), append(functionItems, append(valueItems, subModuleItems)));
-        return sidebarGroup(m_3.Name, "M", "module", children);
+        }, map((entity) => entitySidebarItem(outputBase, entity), m_3.Entities)), append(map((f) => anchorLink(f.Name, concat(moduleHref(m_3), "#", ...f.Name)), m_3.Functions), append(map((v) => anchorLink(v.Name, concat(moduleHref(m_3), "#", ...v.Name)), m_3.Values), map(moduleSidebarItem, subModules)))));
     };
     const buildNsGroup = (ns) => {
         let shortName;
@@ -209,18 +188,10 @@ export function sidebarTree(outputBase, label, modules) {
         }, allNamespaces);
         const modulesInNs = filter((m_5) => (m_5.Namespace === ns), realModules);
         const syntheticInNs = filter((m_6) => (m_6.Namespace === ns), syntheticModules);
-        const items = toList(delay(() => append_1(map(moduleSidebarItem, modulesInNs), delay(() => append_1(collect_1((sm) => {
-            if (sm.Name === "global") {
-                return map((entity_1) => entitySidebarItem(outputBase, entity_1), sm.Entities);
-            }
-            else {
-                let smShortName;
-                const lastDot_1 = sm.FullName.lastIndexOf(".") | 0;
-                smShortName = ((lastDot_1 < 0) ? sm.FullName : sm.FullName.slice(lastDot_1 + 1, sm.FullName.length));
-                return singleton(sidebarGroup(smShortName, "N", "namespace", map((entity_2) => entitySidebarItem(outputBase, entity_2), sm.Entities)));
-            }
-        }, syntheticInNs), delay(() => map(buildNsGroup, directChildNs)))))));
-        return sidebarGroup(shortName, "N", "namespace", items);
+        return sidebarGroup(shortName, "N", "namespace", toList(delay(() => append_1(map(moduleSidebarItem, modulesInNs), delay(() => append_1(collect_1((sm) => {
+            let lastDot_1;
+            return (sm.Name === "global") ? map((entity_1) => entitySidebarItem(outputBase, entity_1), sm.Entities) : singleton(sidebarGroup((lastDot_1 = (sm.FullName.lastIndexOf(".") | 0), (lastDot_1 < 0) ? sm.FullName : sm.FullName.slice(lastDot_1 + 1, sm.FullName.length)), "N", "namespace", map((entity_2) => entitySidebarItem(outputBase, entity_2), sm.Entities)));
+        }, syntheticInNs), delay(() => map(buildNsGroup, directChildNs))))))));
     };
     const topLevelNs = filter((ns_1) => {
         if (!exists((other_2) => ns_1.startsWith(other_2 + "."), allNamespaces)) {
@@ -248,7 +219,6 @@ export function sidebarTree(outputBase, label, modules) {
  * needing any F#-generated JS logic.
  */
 export function sidebarLabelInitScript(sidebarLabel) {
-    const escaped = replace(replace(sidebarLabel, "\\", "\\\\"), "\'", "\\\'");
-    return concat("window.__fsharpSidebarLabel = \'", escaped, ..."\';");
+    return concat("window.__fsharpSidebarLabel = \'", replace(replace(sidebarLabel, "\\", "\\\\"), "\'", "\\\'"), ..."\';");
 }
 

package/dist/Helpers.js

@@ -61,8 +61,7 @@ export function collectErrors(results) {
             return undefined;
         }
         else {
-            const msg = _arg.fields[0];
-            return msg;
+            return _arg.fields[0];
         }
     }, results);
 }

package/dist/Plugin.js

@@ -6,22 +6,22 @@ import * as child_process from "child_process";
 import { map, defaultArg, some } from "./fable_modules/fable-library-js.5.0.0-rc.7/Option.js";
 import { stringHash, Exception } from "./fable_modules/fable-library-js.5.0.0-rc.7/Util.js";
 import { join, concat, interpolate } from "./fable_modules/fable-library-js.5.0.0-rc.7/String.js";
+import { unsafeFromString } from "./fable_modules/Thoth.Json.JavaScript.0.5.0/Decode.fs.js";
+import { generateDecoder } from "./fable_modules/Thoth.Json.Core.Auto.0.1.0/Decode.fs.js";
 import { Extra_empty } from "./fable_modules/Thoth.Json.Core.Auto.0.1.0/Domain.fs.js";
 import { Root_$reflection } from "./FSharp.Oracle.Schema/Schema.js";
-import { generateDecoder } from "./fable_modules/Thoth.Json.Core.Auto.0.1.0/Decode.fs.js";
-import { unsafeFromString } from "./fable_modules/Thoth.Json.JavaScript.0.5.0/Decode.fs.js";
 import { PromiseBuilder__Delay_62FBFDE1, PromiseBuilder__Run_212F1D4B } from "./fable_modules/Fable.Promise.3.2.0/Promise.fs.js";
 import { promise } from "./fable_modules/Fable.Promise.3.2.0/PromiseImpl.fs.js";
 import { createRenderer } from "astro-expressive-code";
 import { generateCss } from "./Themes.js";
 import { length, isEmpty, contains, filter, map as map_1, collect } from "./fable_modules/fable-library-js.5.0.0-rc.7/List.js";
 import { entityPages, rootIndexPage, namespacePages as namespacePages_1, modulePages as modulePages_1, sidebarTree, sidebarLabelInitScript } from "./Generate.js";
-import { collectErrors, FileOperationResult$1, writeSync, mkdirSync } from "./Helpers.js";
+import { FileOperationResult$1, collectErrors, writeSync, mkdirSync } from "./Helpers.js";
 
 function runExtractor(logger, outputBase, dllPaths) {
     const maxBuffer = ((50 * 1024) * 1024) | 0;
-    const oracleProject = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "packages", "FSharp.Oracle");
-    const args = toList(delay(() => append(singleton("run"), delay(() => append(singleton("--project"), delay(() => append(singleton(oracleProject), delay(() => append(singleton("--"), delay(() => append(singleton("--output-base"), delay(() => append(singleton(outputBase), delay(() => dllPaths))))))))))))));
+    const oracleDll = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "oracle-bin", "Oracle.dll");
+    const args = toList(delay(() => append(singleton(oracleDll), delay(() => append(singleton("--output-base"), delay(() => append(singleton(outputBase), delay(() => dllPaths))))))));
     const result = child_process.spawnSync("dotnet", Array.from(args), some({
         encoding: "utf-8",
         maxBuffer: maxBuffer,
@@ -35,13 +35,7 @@ ${interpolate("%A%P()", [result.stderr])}`);
     }
     else {
         const json = result.stdout;
-        let decoder_1;
-        const extra_1 = Extra_empty;
-        const losslessOption_1 = true;
-        const ty = Root_$reflection();
-        const decoder = generateDecoder(undefined, extra_1.DecoderOverrides, false, losslessOption_1, ty);
-        decoder_1 = decoder;
-        return unsafeFromString(decoder_1, json);
+        return unsafeFromString(generateDecoder(undefined, Extra_empty.DecoderOverrides, false, true, Root_$reflection()), json);
     }
 }
 
@@ -63,9 +57,8 @@ function starlightFSharpDoc(pluginOptions) {
                             clo(arg);
                         });
                         return createRenderer({}).then((_arg) => {
-                            let matchValue, matchValue_1, msg_1, msg;
-                            const ecRenderer = _arg;
-                            const themesCss = generateCss(ecRenderer);
+                            let matchValue, matchValue_1, msg;
+                            const themesCss = 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);
@@ -82,25 +75,19 @@ function starlightFSharpDoc(pluginOptions) {
                                 sidebar: toArray(delay(() => append(existingSidebar, delay(() => singleton(sidebarTree(outputBase, sidebarLabel, modules)))))),
                             });
                             const outputDir = path.join(astroConfig.root.pathname, "src", "pages", outputBase);
-                            return ((matchValue = mkdirSync(outputDir), (matchValue.tag === 0) ? ((matchValue_1 = writeSync(path.join(outputDir, ".gitignore"), "# Autogenerated by starlight-fsharp-oracle\n**/*\n"), (matchValue_1.tag === 0) ? (Promise.resolve()) : ((msg_1 = matchValue_1.fields[0], (logger.warn(concat("Failed to write .gitignore: ", ...msg_1)), Promise.resolve()))))) : ((msg = matchValue.fields[0], (logger.error(msg), ((() => {
+                            return ((matchValue = mkdirSync(outputDir), (matchValue.tag === 0) ? ((matchValue_1 = writeSync(path.join(outputDir, ".gitignore"), "# Autogenerated by starlight-fsharp-oracle\n**/*\n"), (matchValue_1.tag === 0) ? (Promise.resolve()) : ((logger.warn(concat("Failed to write .gitignore: ", ...matchValue_1.fields[0])), Promise.resolve())))) : ((msg = matchValue.fields[0], (logger.error(msg), ((() => {
                                 throw new Exception(msg);
                             })(), Promise.resolve())))))).then(() => PromiseBuilder__Delay_62FBFDE1(promise, () => {
                                 const modulePages = modulePages_1(outputBase, modules);
                                 const namespacePages = namespacePages_1(outputBase, modules);
                                 const moduleSlugs = map_1((tuple) => tuple[0], modulePages);
-                                const dedupedNamespacePages = filter((tupledArg) => {
-                                    const slug = tupledArg[0];
-                                    return !contains(slug, moduleSlugs, {
-                                        Equals: (x, y) => (x === y),
-                                        GetHashCode: (x) => (stringHash(x) | 0),
-                                    });
-                                }, namespacePages);
-                                const pages = toList(delay(() => append(singleton(rootIndexPage(outputBase, root.Assemblies, modules)), delay(() => append(dedupedNamespacePages, delay(() => append(modulePages, delay(() => entityPages(outputBase, modules)))))))));
-                                const writeResults = map_1((tupledArg_1) => {
-                                    const slug_1 = tupledArg_1[0];
-                                    const content = tupledArg_1[1];
-                                    const filePath = path.join(outputDir, slug_1 + ".mdx");
-                                    const matchValue_2 = writeSync(filePath, content);
+                                const dedupedNamespacePages = filter((tupledArg) => !contains(tupledArg[0], moduleSlugs, {
+                                    Equals: (x, y) => (x === y),
+                                    GetHashCode: (x) => (stringHash(x) | 0),
+                                }), namespacePages);
+                                const errors = collectErrors(map_1((tupledArg_1) => {
+                                    const filePath = path.join(outputDir, tupledArg_1[0] + ".mdx");
+                                    const matchValue_2 = writeSync(filePath, tupledArg_1[1]);
                                     if (matchValue_2.tag === 0) {
                                         logger.info(concat("  wrote ", ...filePath));
                                         return new FileOperationResult$1(0, [undefined]);
@@ -110,8 +97,7 @@ function starlightFSharpDoc(pluginOptions) {
                                         logger.error(msg_2);
                                         return new FileOperationResult$1(1, [msg_2]);
                                     }
-                                }, pages);
-                                const errors = collectErrors(writeResults);
+                                }, toList(delay(() => append(singleton(rootIndexPage(outputBase, root.Assemblies, modules)), delay(() => append(dedupedNamespacePages, delay(() => append(modulePages, delay(() => entityPages(outputBase, modules)))))))))));
                                 if (!isEmpty(errors)) {
                                     const errorMsg = (`Failed to write ${length(errors)} file(s):
 `) + join("\n", errors);

package/dist/Render/Documentation.js

@@ -13,8 +13,7 @@ export function renderSummary(sb, xmlDoc) {
     if (matchValue == null) {
     }
     else {
-        const summary = matchValue;
-        System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, escapeMdxText(summary));
+        System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, escapeMdxText(matchValue));
         System_Text_StringBuilder__StringBuilder_NewLine(sb);
     }
 }

package/dist/Render/Entries.js

@@ -1,50 +1,46 @@
 
+import { tocH3, h2, escapeMdxText, renderDocEntry } from "./Primitives.js";
+import { FSharp_Oracle_Schema_TextNode__TextNode_ToHtml_Static_Z3A0E64B3, FSharp_Oracle_Schema_TextNode__TextNode_get_Html } from "../Extensions/TextNode.js";
+import { MemberKind, TextNode, ObsoleteInfo } from "../FSharp.Oracle.Schema/Schema.js";
+import { renderXmlDocBody, renderDocumentationBlock } from "./Documentation.js";
 import { collect, map, ofArray, isEmpty, filter } from "../fable_modules/fable-library-js.5.0.0-rc.7/List.js";
 import { System_Text_StringBuilder__StringBuilder_NewLine, System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5 } from "../Extensions/StringBuilder.js";
 import { equals, disposeSafe, getEnumerator } from "../fable_modules/fable-library-js.5.0.0-rc.7/Util.js";
-import { FSharp_Oracle_Schema_TextNode__TextNode_get_Html, FSharp_Oracle_Schema_TextNode__TextNode_ToHtml_Static_Z3A0E64B3 } from "../Extensions/TextNode.js";
-import { MemberKind, ObsoleteInfo, TextNode } from "../FSharp.Oracle.Schema/Schema.js";
-import { tocH3, h2, renderDocEntry, escapeMdxText } from "./Primitives.js";
 import { value as value_1 } from "../fable_modules/fable-library-js.5.0.0-rc.7/Option.js";
-import { renderXmlDocBody, renderDocumentationBlock } from "./Documentation.js";
 import { join } from "../fable_modules/fable-library-js.5.0.0-rc.7/String.js";
 import { map as map_1, singleton, append, delay, toList } from "../fable_modules/fable-library-js.5.0.0-rc.7/Seq.js";
 
 export function renderUnionCaseEntry(sb, case$) {
-    const renderFields = () => {
-        const documentedFields = filter((f) => (f.XmlDoc.Summary != null), case$.Fields);
-        if (!isEmpty(documentedFields)) {
-            System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "<strong>Fields</strong>");
-            const enumerator = getEnumerator(documentedFields);
-            try {
-                while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
-                    const f_1 = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
-                    const fieldDeclaration = FSharp_Oracle_Schema_TextNode__TextNode_ToHtml_Static_Z3A0E64B3(ofArray([new TextNode(23, ["div", "fs-parameter__signature"]), new TextNode(20, []), new TextNode(0, [f_1.Name]), new TextNode(9, []), new TextNode(12, []), new TextNode(9, []), f_1.Type, new TextNode(20, []), new TextNode(22, ["div"]), new TextNode(20, [])]));
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, fieldDeclaration);
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "<div class=\'fs-parameter__documentation\'>");
-                    System_Text_StringBuilder__StringBuilder_NewLine(sb);
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, escapeMdxText(value_1(f_1.XmlDoc.Summary)));
-                    System_Text_StringBuilder__StringBuilder_NewLine(sb);
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "</div>");
+    renderDocEntry(sb, case$.Name, FSharp_Oracle_Schema_TextNode__TextNode_get_Html(case$.Declaration), new ObsoleteInfo(0, []), () => {
+        renderDocumentationBlock(sb, case$.XmlDoc, () => {
+            const documentedFields = filter((f) => (f.XmlDoc.Summary != null), case$.Fields);
+            if (!isEmpty(documentedFields)) {
+                System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "<strong>Fields</strong>");
+                const enumerator = getEnumerator(documentedFields);
+                try {
+                    while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
+                        const f_1 = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
+                        System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, FSharp_Oracle_Schema_TextNode__TextNode_ToHtml_Static_Z3A0E64B3(ofArray([new TextNode(23, ["div", "fs-parameter__signature"]), new TextNode(20, []), new TextNode(0, [f_1.Name]), new TextNode(9, []), new TextNode(12, []), new TextNode(9, []), f_1.Type, new TextNode(20, []), new TextNode(22, ["div"]), new TextNode(20, [])])));
+                        System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "<div class=\'fs-parameter__documentation\'>");
+                        System_Text_StringBuilder__StringBuilder_NewLine(sb);
+                        System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, escapeMdxText(value_1(f_1.XmlDoc.Summary)));
+                        System_Text_StringBuilder__StringBuilder_NewLine(sb);
+                        System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "</div>");
+                    }
+                }
+                finally {
+                    disposeSafe(enumerator);
                 }
             }
-            finally {
-                disposeSafe(enumerator);
-            }
-        }
-    };
-    const renderDocumentation = () => {
-        renderDocumentationBlock(sb, case$.XmlDoc, renderFields);
-    };
-    renderDocEntry(sb, case$.Name, FSharp_Oracle_Schema_TextNode__TextNode_get_Html(case$.Declaration), new ObsoleteInfo(0, []), renderDocumentation);
+        });
+    });
 }
 
 export function renderRecordField(sb, field) {
-    const renderDocumentation = () => {
+    renderDocEntry(sb, field.Name, FSharp_Oracle_Schema_TextNode__TextNode_get_Html(field.Declaration), new ObsoleteInfo(0, []), () => {
         renderDocumentationBlock(sb, field.XmlDoc, () => {
         });
-    };
-    renderDocEntry(sb, field.Name, FSharp_Oracle_Schema_TextNode__TextNode_get_Html(field.Declaration), new ObsoleteInfo(0, []), renderDocumentation);
+    });
 }
 
 export function renderMemberEntry(sb, m) {
@@ -139,10 +135,9 @@ export function renderFunctionEntry(sb, f) {
 }
 
 export function renderValueEntry(sb, v) {
-    const renderDocumentation = () => {
+    renderDocEntry(sb, v.Name, FSharp_Oracle_Schema_TextNode__TextNode_get_Html(v.Declaration), v.ObsoleteInfo, () => {
         renderDocumentationBlock(sb, v.XmlDoc, () => {
         });
-    };
-    renderDocEntry(sb, v.Name, FSharp_Oracle_Schema_TextNode__TextNode_get_Html(v.Declaration), v.ObsoleteInfo, renderDocumentation);
+    });
 }
 

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, 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,8 +26,7 @@ export function renderDeclaredModules(sb, toc, htmlLinkGen, modules) {
                 if (matchValue == null) {
                 }
                 else {
-                    const doc = matchValue;
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxText(doc), ..."</dd>"));
+                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxInline(matchValue), ..."</dd>"));
                 }
             }
         }
@@ -55,9 +54,8 @@ export function renderEntityPage(htmlLinkGen, entity, parentModule) {
     renderXmlDocSummaryAndRemarks(sb, toc, Entity__get_XmlDoc(entity));
     switch (entity.tag) {
         case 1: {
-            const e = entity.fields[0];
             System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "<div class=\"collapsible-group\">");
-            const enumerator = getEnumerator(e.Cases);
+            const enumerator = getEnumerator(entity.fields[0].Cases);
             try {
                 while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                     const c = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -95,13 +93,11 @@ export function renderEntityPage(htmlLinkGen, entity, parentModule) {
             break;
         }
         case 3: {
-            const e_1 = entity.fields[0];
-            renderMemberSections(sb, toc, e_1.Members);
+            renderMemberSections(sb, toc, entity.fields[0].Members);
             break;
         }
         case 4: {
-            const e_2 = entity.fields[0];
-            renderMemberSections(sb, toc, e_2.Members);
+            renderMemberSections(sb, toc, entity.fields[0].Members);
             break;
         }
         case 7: {
@@ -140,11 +136,9 @@ export function renderNamespacePage(htmlLinkGen, ns, subNamespaces, entities, mo
         const enumerator = getEnumerator(subNamespaces);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
+                let lastDot;
                 const subNs = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
-                let shortName;
-                const lastDot = subNs.lastIndexOf(".") | 0;
-                shortName = ((lastDot < 0) ? subNs : subNs.slice(lastDot + 1, subNs.length));
-                System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dt>", htmlLinkGen(shortName, subNs), ..."</dt>"));
+                System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dt>", htmlLinkGen((lastDot = (subNs.lastIndexOf(".") | 0), (lastDot < 0) ? subNs : subNs.slice(lastDot + 1, subNs.length)), subNs), ..."</dt>"));
             }
         }
         finally {
@@ -165,8 +159,7 @@ export function renderNamespacePage(htmlLinkGen, ns, subNamespaces, entities, mo
                 if (matchValue == null) {
                 }
                 else {
-                    const summary = matchValue;
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxText(summary), ..."</dd>"));
+                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxInline(matchValue), ..."</dd>"));
                 }
             }
         }
@@ -197,8 +190,7 @@ export function renderModulePage(htmlLinkGen, m, subModules) {
                 if (matchValue == null) {
                 }
                 else {
-                    const summary = matchValue;
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxText(summary), ..."</dd>"));
+                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxInline(matchValue), ..."</dd>"));
                 }
             }
         }
@@ -260,8 +252,7 @@ export function renderRootIndexPage(htmlLinkGen, assemblies, globalModules) {
                 if (matchValue == null) {
                 }
                 else {
-                    const doc = matchValue;
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<dd>", escapeMdxText(doc), ..."</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,15 @@ export function escapeMdxText(text) {
     return replace(replace(replace(replace(replace(text, "&", "&amp;"), "<", "&lt;"), ">", "&gt;"), "{", "&#123;"), "}", "&#125;");
 }
 
+/**
+ * Escape text destined for an inline element such as `<dd>`. A blank line in
+ * the source would be parsed by MDX as a paragraph break and close the
+ * element early, so all whitespace runs are collapsed to single spaces first.
+ */
+export function escapeMdxInline(text) {
+    return escapeMdxText(replace_1(text, "\\s+", " ").trim());
+}
+
 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>`);
@@ -24,24 +34,8 @@ export function tocH3(toc, slug, text) {
 }
 
 export function renderDocEntry(sb, name, signatureHtml, obsoleteInfo, renderDocumentation) {
-    let patternInput;
-    switch (obsoleteInfo.tag) {
-        case 1: {
-            patternInput = [" obsolete", ""];
-            break;
-        }
-        case 2: {
-            const msg = obsoleteInfo.fields[0];
-            const escaped = replace(msg, "\"", "&quot;");
-            patternInput = [" obsolete", concat(" obsoleteMessage=\"", escaped, ..."\"")];
-            break;
-        }
-        default:
-            patternInput = ["", ""];
-    }
-    const obsoleteMessageAttr = patternInput[1];
-    const obsoleteAttr = patternInput[0];
-    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, `<DocEntry name="${name}"${obsoleteAttr}${obsoleteMessageAttr}>`);
+    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_WriteLine_Z721C83C5(sb, "</div>");
@@ -59,8 +53,7 @@ export function renderObsoleteBanner(sb, obsoleteInfo) {
             break;
         }
         case 2: {
-            const msg = obsoleteInfo.fields[0];
-            System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<Aside type=\"caution\" title=\"Deprecated\">", escapeMdxText(msg), ..."</Aside>"));
+            System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, concat("<Aside type=\"caution\" title=\"Deprecated\">", escapeMdxText(obsoleteInfo.fields[0]), ..."</Aside>"));
             System_Text_StringBuilder__StringBuilder_NewLine(sb);
             break;
         }
@@ -73,10 +66,8 @@ export function obsoleteInlineHtml(obsoleteInfo) {
     switch (obsoleteInfo.tag) {
         case 1:
             return " <span class=\"fsharp-doc-obsolete-inline\">Deprecated</span>";
-        case 2: {
-            const msg = obsoleteInfo.fields[0];
-            return concat(" <span class=\"fsharp-doc-obsolete-inline\" title=\"", msg, ..."\">Deprecated</span>");
-        }
+        case 2:
+            return concat(" <span class=\"fsharp-doc-obsolete-inline\" title=\"", obsoleteInfo.fields[0], ..."\">Deprecated</span>");
         default:
             return "";
     }
@@ -85,23 +76,19 @@ export function obsoleteInlineHtml(obsoleteInfo) {
 export function renderExamples(sb, examples) {
     if (!isEmpty(examples)) {
         if (isEmpty(tail(examples))) {
-            const single = head(examples);
             System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, "<strong>Example</strong>");
             System_Text_StringBuilder__StringBuilder_NewLine(sb);
-            System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, escapeMdxText(single));
+            System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, escapeMdxText(head(examples)));
             System_Text_StringBuilder__StringBuilder_NewLine(sb);
         }
         else {
-            const multiple = examples;
-            const enumerator = getEnumerator(indexed(multiple));
+            const enumerator = getEnumerator(indexed(examples));
             try {
                 while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                     const forLoopVar = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
-                    const i = forLoopVar[0] | 0;
-                    const example = forLoopVar[1];
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, `<strong>Example ${i + 1}</strong>`);
+                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, `<strong>Example ${forLoopVar[0] + 1}</strong>`);
                     System_Text_StringBuilder__StringBuilder_NewLine(sb);
-                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, escapeMdxText(example));
+                    System_Text_StringBuilder__StringBuilder_WriteLine_Z721C83C5(sb, escapeMdxText(forLoopVar[1]));
                     System_Text_StringBuilder__StringBuilder_NewLine(sb);
                 }
             }

package/dist/Themes.js

@@ -26,15 +26,14 @@ function colorFor(theme, targetScopes) {
     const fg = theme.fg;
     return defaultArg(tryPick((rule) => {
         const ruleScopes = scopesOf(rule);
-        const matches = exists((target) => ruleScopes.some((rs) => {
+        if (!exists((target) => ruleScopes.some((rs) => {
             if (target === rs) {
                 return true;
             }
             else {
                 return target.startsWith(rs + ".");
             }
-        }), targetScopes);
-        if (!matches) {
+        }), targetScopes)) {
             return undefined;
         }
         else {
@@ -60,8 +59,7 @@ export function generateCss(ecRenderer) {
     const sb = StringBuilder_$ctor();
     for (let idx = 0; idx <= (themes.length - 1); idx++) {
         const theme = item(idx, themes);
-        const themeType = theme.type;
-        const selector = (themeType === "dark") ? ":root[data-theme=\'dark\']" : ":root";
+        const selector = (theme.type === "dark") ? ":root[data-theme=\'dark\']" : ":root";
         const kw = colorFor(theme, ofArray(["keyword", "storage.type", "keyword.operator"]));
         const fn_ = colorFor(theme, ofArray(["variable", "entity.name.function"]));
         const type_ = colorFor(theme, ofArray(["entity", "entity.name"]));