@forsakringskassan/docs-generator 1.30.0 → 1.30.2

package/dist/index.js

@@ -1240,6 +1240,11 @@ async function render(doc, docs, nav, vendors, options) {
     site: options.site,
     doc,
     topnav,
+    rootUrl(doc2) {
+      const { fileInfo: fileInfo2 } = doc2;
+      const relative = path$1.relative(fileInfo2.path, ".");
+      return relative !== "" ? relative : ".";
+    },
     sidenav,
     vendors
   };
@@ -2063,8 +2068,18 @@ function themeSelectProcessor() {
     name: "theme-select-processor",
     after: "generate-docs",
     handler(context) {
+      const sessionKey = "fkds-theme";
+      const data = {
+        defaultTheme: "exp",
+        sessionKey
+      };
+      context.addTemplateBlock("head", "theme-render-blocker", {
+        filename: "partials/theme-render-blocker.html",
+        data
+      });
       context.addTemplateBlock("toolbar", "theme-select", {
-        filename: "partials/theme-select.html"
+        filename: "partials/theme-select.html",
+        data
       });
     }
   };
@@ -2144,7 +2159,12 @@ async function getGitBranch() {
   }
 }
 function getPullRequestID() {
-  return process.env.JOB_BASE_NAME;
+  if (process.env.JOB_BASE_NAME) {
+    const name = process.env.JOB_BASE_NAME;
+    const match = name.match(/PR-(\d+)/);
+    return match ? match[1] : void 0;
+  }
+  return void 0;
 }
 async function getSCMData(pkg, options) {
   const commitHash = await run(`git rev-parse HEAD`);
@@ -2277,14 +2297,7 @@ function searchProcessor() {
         }
       });
       context.addTemplateBlock("toolbar", "search-toolbar", {
-        filename: "partials/search-toolbar.html",
-        data: {
-          rootUrl(doc) {
-            const { fileInfo } = doc;
-            const relative = path$1.relative(fileInfo.path, ".");
-            return relative !== "" ? relative : ".";
-          }
-        }
+        filename: "partials/search-toolbar.html"
       });
       context.addTemplateBlock("body:end", "search-dialog", {
         filename: "partials/search-dialog.html"

package/dist/runtime.js

@@ -203810,6 +203810,7 @@ async function replaceContent(href) {
   const body = await response.text();
   const doc = parser20.parseFromString(body, "text/html");
   const sidenav = doc.querySelector("#sidenav");
+  const rootUrl = doc.documentElement.dataset.rootUrl;
   const selector = response.ok && sidenav ? "main" : "body";
   const header2 = doc.querySelector("header");
   const headerTarget = document.querySelector("header");
@@ -203822,6 +203823,17 @@ async function replaceContent(href) {
     cloneScripts(importedHeader, href);
     headerTarget.replaceWith(importedHeader);
   }
+  const anchorSelector = "#sidenav li.link a";
+  const anchorLinks = document.querySelectorAll(anchorSelector);
+  for (const link2 of anchorLinks) {
+    const { rel: rel2 } = link2;
+    if (rel2 !== "external") {
+      continue;
+    }
+    const path4 = link2.dataset.path ?? ".";
+    link2.setAttribute("href", [rootUrl, path4].join("/"));
+  }
+  document.documentElement.dataset.rootUrl = rootUrl;
   document.title = doc.title;
   target.replaceWith(element2);
 }
@@ -204678,7 +204690,6 @@ var results = document.querySelector("#search-results");
 var index2 = null;
 var searchTerm = "";
 var active = 0;
-var rootUrl = button.dataset.rootUrl;
 var uf = new uFuzzy({
   intraIns: Infinity
 });
@@ -204695,6 +204706,7 @@ function updateResults() {
   const info3 = uf.info(idxs, index2.terms, searchTerm);
   const order2 = uf.sort(info3, index2.terms, searchTerm);
   active = 0;
+  const rootUrl = document.documentElement.dataset.rootUrl ?? ".";
   const ul = document.createElement("ul");
   ul.classList.add("list");
   for (let i2 = 0; i2 < order2.length; i2++) {

package/dist/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.44.1"
+      "packageVersion": "7.47.0"
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forsakringskassan/docs-generator",
-  "version": "1.30.0",
+  "version": "1.30.2",
   "description": "Documentation generator",
   "keywords": [
     "documentation"

package/templates/base.template.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="{{ site.lang }}" class="layout--{{ doc.template }}">
+<html lang="{{ site.lang }}" class="layout--{{ doc.template }}" data-root-url="{{ rootUrl(doc) }}">
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />

package/templates/macro/menu.html

@@ -21,7 +21,15 @@
     {# leaf node #}
     {%- if not item.children -%}
     <li class="link {% if item.active %}active{% endif %}">
-        <a href="{{ item.path | relative(doc) }}" {% if item.external %} target="_blank" rel="external" {% endif %}>
+        <!-- prettier-ignore -->
+        <a
+            href="{{ item.path | relative(doc) }}"
+            {% if item.external %}
+            target="_blank"
+            rel="external"
+            data-path="{{ item.path.startsWith('/') and item.path.slice(1) or item.path }}"
+            {% endif %}
+        >
             {{ item.title }}
         </a>
     </li>

package/templates/macro/scm-info.njk.html

@@ -0,0 +1,5 @@
+{%- macro scmInfo(build, scm) -%}
+        {{ scm.branch }} (<a href="{{ scm.commitUrl }}">{{ scm.commitShort }}</a>)<br />
+        {% if scm.pr %}<a href="{{ scm.prUrl }}">PR {{ scm.pr }}</a><br />{% endif %}
+        {{ build.date }} {{ build.time }}
+{%- endmacro -%}

package/templates/partials/search-toolbar.html

@@ -1,5 +1,5 @@
 <div class="toolbar__item">
-    <form id="search" role="search" data-root-url="{{ rootUrl(doc) }}">
+    <form id="search" role="search">
         <button class="text-field__input" type="submit">
             <svg focusable="false" class="icon button__icon">
                 <use xlink:href="#docs-icon-search"></use></svg

package/templates/partials/theme-render-blocker.html

@@ -0,0 +1,11 @@
+<script>
+    function themeRenderBlocker() {
+        const theme = window.localStorage.getItem("{{ sessionKey }}") ?? "{{ defaultTheme }}";
+        const style = Array.from(document.querySelectorAll("[data-theme]"));
+        for (const el of style) {
+            el.disabled = el.dataset.theme !== theme;
+        }
+    }
+
+    themeRenderBlocker();
+</script>

package/templates/partials/theme-select.html

@@ -1,5 +1,5 @@
 <div class="toolbar__item">
-    <div class="select-field" hidden>
+    <div class="select-field" style="visibility: hidden">
         <label for="fkds-theme-select" class="label sr-only"> Tema </label>
         <div class="select-field__icon-wrapper">
             <select id="fkds-theme-select" class="select-field__select">
@@ -14,20 +14,12 @@
 
     <script>
         function themeSelector() {
-            const cookieName = "fkds-theme";
-
-            function getCookie(key) {
-                const cookie = document.cookie.split("; ").find((item) => item.trim().startsWith(`${key}=`));
-                if (cookie) {
-                    const [, value] = cookie.split("=", 2);
-                    return value;
-                } else {
-                    return null;
-                }
+            function getSelectedTheme(key) {
+                return window.localStorage.getItem(key) ?? "{{ defaultTheme }}";
             }
 
-            function setCookie(key, value) {
-                document.cookie = `${key}=${value}; expires=Fri, 31 Dec 9999 23:59:59 GMT; SameSite=strict`;
+            function saveSelectedTheme(key, value) {
+                window.localStorage.setItem(key, value);
             }
 
             function enableTheme(theme) {
@@ -38,31 +30,20 @@
             }
 
             const el = document.querySelector("#fkds-theme-select");
-            const wrapper = el.closest(".select-field");
+            const wrapper = /** @type {HTMLElement} */ (el.closest(".select-field"));
             el.addEventListener("change", () => {
                 const theme = el.value;
-                setCookie(cookieName, theme);
+                saveSelectedTheme("{{ sessionKey }}", theme);
                 enableTheme(theme);
             });
 
-            const selected = getCookie(cookieName) || "exp";
+            const selected = getSelectedTheme("{{ sessionKey }}");
             enableTheme(selected);
             el.value = selected;
 
-            wrapper.hidden = false;
-        }
-
-        /* technical debt, this entire script should be moved to src/runtime and
-         * import this function instead */
-        function onContentReady(callback) {
-            const { readyState } = document;
-            if (readyState === "complete" || readyState === "interactive") {
-                setTimeout(callback, 0);
-            } else {
-                document.addEventListener("DOMContentLoaded", callback);
-            }
+            wrapper.style.visibility = null;
         }
 
-        onContentReady(themeSelector);
+        themeSelector();
     </script>
 </div>

package/templates/partials/version.njk.html

@@ -1,13 +1,9 @@
-{%- macro scmInfo(scm) -%}
-        {% if scm.pr %}<a href="{{ scm.prUrl }}">PR {{ scm.pr }}</a>{% endif %}
-        {{ scm.branch }} (<a href="{{ scm.commitUrl }}">{{ scm.commitShort }}</a>)<br />
-        {{ build.date }} {{ build.time }}
-{%- endmacro -%}
+{% from "macro/scm-info.njk.html" import scmInfo -%}
 
 <div class="toolbar__item">
     <span class="version">
         {% if scm -%}
-            {{ scmInfo(scm) }}
+            {{ scmInfo(build, scm) }}
         {%- else -%}
             {{ pkg.version }}
         {%- endif %}