@forsakringskassan/docs-generator 3.1.2 → 3.3.0

package/dist/index.mjs

@@ -3,12 +3,12 @@ import { createRequire as $createRequire } from "node:module";
 const require = $createRequire(import.meta.url);
 
 import { ApiItemKind, ApiModel } from '@microsoft/api-extractor-model';
-import { t as ts, Z as Ze, M as MarkdownIt, d as dedent, g as closest, h as distance, i as fm, j as isCI, m as moduleImporter, k as cliProgress, l as tinylr, w as watch, n as createInstance, o as fse, p as inter } from './vendor-DWCXj2K2.mjs';
+import { t as ts, Z as Ze, M as MarkdownIt, d as dedent, g as closest, h as distance, i as fm, j as isCI, m as moduleImporter, k as cliProgress, l as tinylr, w as watch, n as createInstance, o as fse, p as inter } from './vendor-DR1Vkbzf.mjs';
 import path__default from 'node:path';
 import crypto from 'node:crypto';
 import path from 'node:path/posix';
 import { exec, execSync } from 'node:child_process';
-import { g as generateId, f as formatCode, p as parseInfostring, i as isDocumentPage, n as normalizePath, a as getFingerprint, h as hasTag, b as parseImport, d as findTag, e as getOutputFilePath, j as htmlencode, k as filePath, c as createMarkdownRenderer, l as generateExample } from './create-markdown-renderer-fg4eQJx_.mjs';
+import { g as generateId, f as formatCode, p as parseInfostring, i as isDocumentPage, n as normalizePath, a as getFingerprint, h as hasTag, b as parseImport, d as findTag, e as getOutputFilePath, j as htmlencode, k as filePath, c as createMarkdownRenderer, l as generateExample } from './create-markdown-renderer-DLvvsGCZ.mjs';
 import { DocExcerpt } from '@microsoft/tsdoc';
 import fs from 'node:fs/promises';
 import util, { promisify, styleText } from 'node:util';
@@ -97,7 +97,7 @@ function fileMatcher(patterns) {
   });
   return memoize((filename, context) => {
     const matches = fileList.filter((file) => {
-      const stem = file.replace(/^(\.\.\/)+/, "");
+      const stem = file.replace(/^(?:\.\.\/)+/, "");
       return path__default.matchesGlob(stem, `**/${filename}`);
     });
     if (matches.length === 0) {
@@ -129,7 +129,7 @@ function formatSize(value) {
   return `${String(value)} GB`;
 }
 
-const matchHeading = /^(#+)(.*)$/gm;
+const matchHeading = /^(#+)([^#].*)$/gm;
 function getHeadings(text) {
   return Array.from(text.matchAll(matchHeading), parseHeading);
 }
@@ -186,7 +186,7 @@ function getPullRequestID(env) {
   return void 0;
 }
 
-const RE_MATCH_SSH = /^(ssh:\/\/)?(?<user>[^@]+)@(?<host>[^:]+):(?<path>.*)$/;
+const RE_MATCH_SSH = /^[^@]+@(?<host>[^:]+):(?<path>.*)$/;
 function getRepositoryUrl(value) {
   if (typeof value !== "string") {
     const url = value.repository?.url;
@@ -232,7 +232,7 @@ function haveOutput(doc) {
 }
 
 function interpolate(value, data) {
-  return value.replaceAll(/{{([^{}]+)}}/g, (match, raw) => {
+  return value.replaceAll(/\{\{([^{}]+)\}\}/g, (match, raw) => {
     const key = raw.trim();
     const value2 = data[key];
     return value2 ?? match;
@@ -286,7 +286,7 @@ function difference(a, b) {
 }
 
 function slugify(value) {
-  return value.toLowerCase().replaceAll("/", "--").replaceAll(/[^a-z]+/g, "-").replace(/(^-+|-+$)/, "");
+  return value.toLowerCase().replaceAll("/", "--").replaceAll(/[^a-z]+/g, "-").replace(/^-+|-+$/, "");
 }
 
 function isRelease() {
@@ -1426,8 +1426,8 @@ function findLocation(content, attr) {
   }
   const blockBegin = 2;
   return {
-    start: { line: index + blockBegin, column: 1 },
-    end: { line: index + blockBegin, column: 1 + attr.length }
+    start: { line: index + blockBegin, column: 0 },
+    end: { line: index + blockBegin, column: attr.length }
   };
 }
 function getSuggestion(attribute) {
@@ -1682,8 +1682,8 @@ function findDocComment(path, node) {
       return doc;
     }
   }
-  const grandparent = path.parentPath?.parent;
-  if (parent.type === "VariableDeclarator" && grandparent?.leadingComments) {
+  const grandparent = path.parentPath.parent;
+  if (parent.type === "VariableDeclarator" && grandparent.leadingComments) {
     const doc = grandparent.leadingComments.find(isDocComment);
     if (doc) {
       return doc;
@@ -2858,7 +2858,7 @@ Make sure the name is correct and the template file exists in one of the listed
   }
 }
 
-const messageRegex = /^\([^)]+\) \[Line \d+, Column \d+]\n\s+Error: (.*)$/;
+const messageRegex = /^\([^)]+\) \[Line \d+, Column \d+\]\n\s+Error: (.*)$/;
 function getActualMessage(message) {
   const match = messageRegex.exec(message);
   if (match) {
@@ -3002,7 +3002,7 @@ function createTemplateLoader(folders) {
   return loader;
 }
 function stripPrettierComments(content) {
-  return content.replaceAll(/\s*<!-- prettier-ignore -->\s*/gm, "");
+  return content.replaceAll(/\s*<!-- prettier-ignore -->\s*/g, "");
 }
 async function render(doc, docs, options) {
   const { fileInfo } = doc;
@@ -3013,7 +3013,8 @@ async function render(doc, docs, options) {
     exampleFileMatcher,
     nav,
     templateFolders,
-    vendors
+    vendors,
+    linkResolvers
   } = options;
   if (!haveOutputFile(fileInfo)) {
     return null;
@@ -3110,7 +3111,8 @@ async function render(doc, docs, options) {
     handleSoftError(error) {
       throw error;
     },
-    messagebox: options.markdown.messagebox
+    messagebox: options.markdown.messagebox,
+    linkResolvers
   });
   njk.addFilter("marked", (content2) => {
     return markdownRenderer.render(doc, content2);
@@ -3162,7 +3164,7 @@ async function render(doc, docs, options) {
     const message = err instanceof Error ? err.message : String(err);
     throw new Error(`${prefix}: ${message}`, { cause: err });
   }
-  const expandedDst = dst.replaceAll(/\[([^]+)]/g, (match, key) => {
+  const expandedDst = dst.replaceAll(/\[([\s\S]+)\]/g, (match, key) => {
     if (key === "hash") {
       return getFingerprint(doc.body);
     } else {
@@ -3229,6 +3231,7 @@ function nunjucksProcessor(options) {
           templateBlocks: context.getAllTemplateBlocks(),
           templateData: context.getAllTemplateData(),
           vendors: context.vendors,
+          linkResolvers: options.linkResolvers,
           addResource(dst, src) {
             context.addResource(dst, src);
           }
@@ -3787,6 +3790,7 @@ class Generator {
     await i18n.init();
     await this._prepareFolders();
     await this._copyFonts();
+    const linkResolvers = this.processors.map((it) => it.enabled !== false ? it.resolveLink : void 0).filter((it) => Boolean(it));
     const processors = [
       fileReaderProcessor(sourceFiles),
       redirectProcessor(),
@@ -3806,6 +3810,7 @@ class Generator {
         exampleFolders,
         templateFolders,
         setupPath,
+        linkResolvers,
         markdown: markdownOptions ?? {}
       }),
       ...this.processors