@forsakringskassan/docs-generator 3.18.0 → 3.19.1

package/dist/{format-code.worker-CFQ372Nb.mjs → format-code.worker-DR9lHLhH.mjs}

@@ -2,7 +2,7 @@ import { createRequire as $createRequire } from "node:module";
 
 const require = $createRequire(import.meta.url);
 
-import { r as runAsWorker, f as format2, a as resolveConfig } from './vendor-i-8GIz5x.mjs';
+import { r as runAsWorker, f as format2, a as resolveConfig } from './vendor-CLyw83WG.mjs';
 import 'node:url';
 import 'node:path';
 import 'fs';
@@ -54,4 +54,4 @@ async function formatCode(source, filepath) {
 runAsWorker(formatCode);
 
 export { formatCode };
-//# sourceMappingURL=format-code.worker-CFQ372Nb.mjs.map
+//# sourceMappingURL=format-code.worker-DR9lHLhH.mjs.map

package/dist/{format-code.worker-CFQ372Nb.mjs.map → format-code.worker-DR9lHLhH.mjs.map}

@@ -1 +1 @@
-{"version":3,"file":"format-code.worker-CFQ372Nb.mjs","sources":["../src/utils/format-code.worker.ts"],"sourcesContent":["import { type Options, format as prettier, resolveConfig } from \"prettier\";\nimport { runAsWorker } from \"synckit\";\n\nconst configCache = new Map<string, Options | null>();\n\nasync function getConfig(filepath: string): Promise<Options | null> {\n    const cached = configCache.get(filepath);\n    if (cached !== undefined) {\n        return cached;\n    }\n    const options = await resolveConfig(filepath);\n    configCache.set(filepath, options);\n    return options;\n}\n\n/**\n * @internal\n */\nexport async function formatCode(\n    source: string,\n    filepath: string,\n): Promise<string> {\n    const options = await getConfig(filepath);\n    const formatted = await prettier(source, { ...options, filepath });\n    return formatted.trim();\n}\n\n/* eslint-disable-next-line unicorn/no-top-level-side-effects -- required for worker to function */\nrunAsWorker(formatCode);\n"],"names":["prettier"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,MAAM,WAAA,uBAAkB,GAAA,EAA4B;AAEpD,eAAe,UAAU,QAAA,EAA2C;AAChE,EAAA,MAAM,MAAA,GAAS,WAAA,CAAY,GAAA,CAAI,QAAQ,CAAA;AACvC,EAAA,IAAI,WAAW,MAAA,EAAW;AACtB,IAAA,OAAO,MAAA;AAAA,EACX;AACA,EAAA,MAAM,OAAA,GAAU,MAAM,aAAA,CAAc,QAAQ,CAAA;AAC5C,EAAA,WAAA,CAAY,GAAA,CAAI,UAAU,OAAO,CAAA;AACjC,EAAA,OAAO,OAAA;AACX;AAKA,eAAsB,UAAA,CAClB,QACA,QAAA,EACe;AACf,EAAA,MAAM,OAAA,GAAU,MAAM,SAAA,CAAU,QAAQ,CAAA;AACxC,EAAA,MAAM,SAAA,GAAY,MAAMA,OAAA,CAAS,MAAA,EAAQ,EAAE,GAAG,OAAA,EAAS,UAAU,CAAA;AACjE,EAAA,OAAO,UAAU,IAAA,EAAK;AAC1B;AAGA,WAAA,CAAY,UAAU,CAAA;;"}
+{"version":3,"file":"format-code.worker-DR9lHLhH.mjs","sources":["../src/utils/format-code.worker.ts"],"sourcesContent":["import { type Options, format as prettier, resolveConfig } from \"prettier\";\nimport { runAsWorker } from \"synckit\";\n\nconst configCache = new Map<string, Options | null>();\n\nasync function getConfig(filepath: string): Promise<Options | null> {\n    const cached = configCache.get(filepath);\n    if (cached !== undefined) {\n        return cached;\n    }\n    const options = await resolveConfig(filepath);\n    configCache.set(filepath, options);\n    return options;\n}\n\n/**\n * @internal\n */\nexport async function formatCode(\n    source: string,\n    filepath: string,\n): Promise<string> {\n    const options = await getConfig(filepath);\n    const formatted = await prettier(source, { ...options, filepath });\n    return formatted.trim();\n}\n\n/* eslint-disable-next-line unicorn/no-top-level-side-effects -- required for worker to function */\nrunAsWorker(formatCode);\n"],"names":["prettier"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,MAAM,WAAA,uBAAkB,GAAA,EAA4B;AAEpD,eAAe,UAAU,QAAA,EAA2C;AAChE,EAAA,MAAM,MAAA,GAAS,WAAA,CAAY,GAAA,CAAI,QAAQ,CAAA;AACvC,EAAA,IAAI,WAAW,MAAA,EAAW;AACtB,IAAA,OAAO,MAAA;AAAA,EACX;AACA,EAAA,MAAM,OAAA,GAAU,MAAM,aAAA,CAAc,QAAQ,CAAA;AAC5C,EAAA,WAAA,CAAY,GAAA,CAAI,UAAU,OAAO,CAAA;AACjC,EAAA,OAAO,OAAA;AACX;AAKA,eAAsB,UAAA,CAClB,QACA,QAAA,EACe;AACf,EAAA,MAAM,OAAA,GAAU,MAAM,SAAA,CAAU,QAAQ,CAAA;AACxC,EAAA,MAAM,SAAA,GAAY,MAAMA,OAAA,CAAS,MAAA,EAAQ,EAAE,GAAG,OAAA,EAAS,UAAU,CAAA;AACjE,EAAA,OAAO,UAAU,IAAA,EAAK;AAC1B;AAGA,WAAA,CAAY,UAAU,CAAA;;"}

package/dist/index.d.mts

@@ -1019,7 +1019,7 @@ export declare interface SourceUrlProcessorOptions extends ProcessorOptions {
     readonly sourceFiles?: string[];
     readonly urlFormat: string;
     /** File extension used for finding component by name */
-    readonly componentFileExtension?: string;
+    readonly componentFileExtension?: string | string[];
 }
 
 /**

package/dist/index.mjs

@@ -3,13 +3,13 @@ import { createRequire as $createRequire } from "node:module";
 const require = $createRequire(import.meta.url);
 
 import { ApiItemKind, ApiModel } from '@microsoft/api-extractor-model';
-import { Z as Ze, M as MarkdownItCallable, g as fm, s as strToU8, z as zlibSync, h as strFromU8, d as dedent, i as closest, j as distance, k as isCI, m as moduleImporter, l as cliProgress, t as tinylr, w as watch, n as createInstance, o as fse, p as inter } from './vendor-i-8GIz5x.mjs';
+import { Z as Ze, M as MarkdownItCallable, g as fm, s as strToU8, z as zlibSync, h as strFromU8, d as dedent, i as closest, j as distance, k as isCI, m as moduleImporter, l as cliProgress, t as tinylr, w as watch, n as createInstance, o as fse, p as inter } from './vendor-CLyw83WG.mjs';
 import path__default from 'node:path';
 import fs from 'node:fs/promises';
 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 parseImport, a as getFingerprint, b as parseInfostring, h as hasTag, d as findTag, e as getOutputFilePath, i as isDocumentPage, j as findDocument, k as getDocumentBody, n as normalizePath, l as htmlencode, c as createMarkdownRenderer } from './create-markdown-renderer-DrDHT9bZ.mjs';
+import { g as generateId, f as formatCode, p as parseInfostring, a as getFingerprint, h as hasTag, b as parseImport, d as findTag, e as getOutputFilePath, i as isDocumentPage, j as findDocument, k as getDocumentBody, n as normalizePath, l as htmlencode, c as createMarkdownRenderer } from './create-markdown-renderer-DSov_Gkx.mjs';
 import { DocExcerpt } from '@microsoft/tsdoc';
 import pkg from '../package.json' with { type: "json" };
 import fs__default, { existsSync, readFileSync, copyFileSync } from 'node:fs';
@@ -640,108 +640,6 @@ function isDocumentPartial(doc) {
   return doc.kind === "partial";
 }
 
-function getExampleName(filename) {
-  return path__default.parse(filename).name;
-}
-
-const vueMajor = Number(version.split(".", 2)[0]);
-function vueGenerator() {
-  switch (vueMajor) {
-    case 2:
-      throw new Error(
-        "Vue 2 is no longer supported, upgrade to Vue 3 or downgrade docs-generator"
-      );
-    case 3:
-      return generateCode;
-  }
-}
-function generateExample(options) {
-  const { language, fileMatcher } = options;
-  if (language === "import") {
-    const parsed = parseImport(options.source);
-    const filename = fileMatcher(parsed.filename, "when importing example");
-    const language2 = parsed.extension;
-    const comments = parsed.comments;
-    const content = fs__default.readFileSync(filename, "utf8");
-    const example = generateExample({
-      ...options,
-      source: content,
-      language: language2,
-      filename
-    });
-    return { ...example, comments };
-  }
-  switch (language) {
-    case "vue":
-      return generateVueExample(options);
-    case "html":
-      return generateStaticExample(options);
-    default:
-      return generateStaticExample(options);
-  }
-}
-function generateVueExample(options) {
-  const { filename, source, parent, setupPath, tags } = options;
-  const fn = vueGenerator();
-  const slug = getExampleName(filename);
-  const fingerprint = getFingerprint(source);
-  const { markup, sourcecode, output } = fn({
-    filename,
-    slug,
-    fingerprint,
-    code: source,
-    setupPath
-  });
-  if (output) {
-    return {
-      source,
-      language: options.language,
-      comments: [],
-      tags,
-      markup,
-      output,
-      runtime: true,
-      task: {
-        outputFile: output,
-        sourcecode,
-        sourceFile: filename,
-        parent
-      }
-    };
-  }
-  return {
-    source: sourcecode,
-    language: "plaintext",
-    comments: [],
-    tags,
-    markup,
-    output: null,
-    runtime: true,
-    task: null
-  };
-}
-function generateStaticExample(options) {
-  const { filename, source, language, tags } = options;
-  const slug = getExampleName(filename);
-  const fingerprint = getFingerprint(source);
-  const asset = `${slug}-${fingerprint}.${language}`;
-  const runtimeLanguages = ["html"];
-  const runtime = runtimeLanguages.includes(language);
-  return {
-    source,
-    language: options.language,
-    comments: [],
-    tags,
-    markup: source,
-    output: runtime ? asset : null,
-    runtime,
-    task: null
-  };
-}
-
-const url = new URL("./worker--TrTGmqL.mjs", import.meta.url);
-const filePath = fileURLToPath(url);
-
 const md$6 = MarkdownItCallable();
 md$6.renderer.rules.fence = (tokens, idx, _options, env) => {
   const { collected, exampleFileMatcher } = env;
@@ -929,39 +827,46 @@ ${JSON.stringify(attributes)}
 function cmp(a, b) {
   return a[0].localeCompare(b[0]);
 }
-async function extractDocument(doc, docs, partials, options) {
-  const { outputFolder } = options;
-  const markdown = doc.body.replaceAll(
-    /^:::\s*api(.*)\n([\s\S]+?):::/gm,
-    (match, info, content2) => {
-      const needle = content2.trim();
-      const trimmedInfo = info.trim();
-      const tags = trimmedInfo ? trimmedInfo.split(/\s+/) : [];
-      const result = findDocument(docs, needle);
-      if (!result.document) {
-        return match;
-      }
-      const { document, kind, reference } = result;
-      if (!isDocumentPartial(document)) {
-        return match;
-      }
-      const body = getDocumentBody(document, tags, {
-        kind,
-        reference
-      });
-      const fingerprint = getFingerprint(body);
-      const id = `partial:${document.format}:${fingerprint}`;
-      partials.set(id, {
-        id,
-        format: document.format,
-        body
-      });
-      return `:::api
+function findApiContainer(text, cb) {
+  const regex = /^:::\s*api(.*)\n([\s\S]+?):::\n/gm;
+  return text.replaceAll(regex, (match, info, rawContent) => {
+    const content = rawContent.trim();
+    const trimmedInfo = info.trim();
+    const tags = trimmedInfo ? trimmedInfo.split(/\s+/) : [];
+    return cb({ match, tags, content });
+  });
+}
+function onApiContainer(docs, partials, container) {
+  const { match, tags, content } = container;
+  const result = findDocument(docs, content);
+  if (!result.document) {
+    return match;
+  }
+  const { document, kind, reference } = result;
+  if (!isDocumentPartial(document)) {
+    return match;
+  }
+  const body = getDocumentBody(document, tags, {
+    kind,
+    reference
+  });
+  const fingerprint = getFingerprint(body);
+  const id = `partial:${document.format}:${fingerprint}`;
+  partials.set(id, {
+    id,
+    format: document.format,
+    body
+  });
+  return `:::api
 ${id}
 :::
 `;
-    }
-  );
+}
+async function extractDocument(doc, docs, partials, options) {
+  const { outputFolder } = options;
+  const markdown = findApiContainer(doc.body, (container) => {
+    return onApiContainer(docs, partials, container);
+  });
   const src = doc.fileInfo.fullPath;
   const dst = path__default.join(outputFolder, "files", doc.fileInfo.fullPath);
   const fm2 = await getFrontMatter(src);
@@ -1089,6 +994,108 @@ function extractMarkdownProcessor(options) {
   };
 }
 
+function getExampleName(filename) {
+  return path__default.parse(filename).name;
+}
+
+const vueMajor = Number(version.split(".", 2)[0]);
+function vueGenerator() {
+  switch (vueMajor) {
+    case 2:
+      throw new Error(
+        "Vue 2 is no longer supported, upgrade to Vue 3 or downgrade docs-generator"
+      );
+    case 3:
+      return generateCode;
+  }
+}
+function generateExample(options) {
+  const { language, fileMatcher } = options;
+  if (language === "import") {
+    const parsed = parseImport(options.source);
+    const filename = fileMatcher(parsed.filename, "when importing example");
+    const language2 = parsed.extension;
+    const comments = parsed.comments;
+    const content = fs__default.readFileSync(filename, "utf8");
+    const example = generateExample({
+      ...options,
+      source: content,
+      language: language2,
+      filename
+    });
+    return { ...example, comments };
+  }
+  switch (language) {
+    case "vue":
+      return generateVueExample(options);
+    case "html":
+      return generateStaticExample(options);
+    default:
+      return generateStaticExample(options);
+  }
+}
+function generateVueExample(options) {
+  const { filename, source, parent, setupPath, tags } = options;
+  const fn = vueGenerator();
+  const slug = getExampleName(filename);
+  const fingerprint = getFingerprint(source);
+  const { markup, sourcecode, output } = fn({
+    filename,
+    slug,
+    fingerprint,
+    code: source,
+    setupPath
+  });
+  if (output) {
+    return {
+      source,
+      language: options.language,
+      comments: [],
+      tags,
+      markup,
+      output,
+      runtime: true,
+      task: {
+        outputFile: output,
+        sourcecode,
+        sourceFile: filename,
+        parent
+      }
+    };
+  }
+  return {
+    source: sourcecode,
+    language: "plaintext",
+    comments: [],
+    tags,
+    markup,
+    output: null,
+    runtime: true,
+    task: null
+  };
+}
+function generateStaticExample(options) {
+  const { filename, source, language, tags } = options;
+  const slug = getExampleName(filename);
+  const fingerprint = getFingerprint(source);
+  const asset = `${slug}-${fingerprint}.${language}`;
+  const runtimeLanguages = ["html"];
+  const runtime = runtimeLanguages.includes(language);
+  return {
+    source,
+    language: options.language,
+    comments: [],
+    tags,
+    markup: source,
+    output: runtime ? asset : null,
+    runtime,
+    task: null
+  };
+}
+
+const url = new URL("./worker-DfUDllYf.mjs", import.meta.url);
+const filePath = fileURLToPath(url);
+
 const md$5 = MarkdownItCallable();
 md$5.renderer.rules.fence = (tokens, idx, _options, rawEnv) => {
   const { collected } = rawEnv;
@@ -1505,6 +1512,19 @@ function selectableVersionProcessor(pkg, container, options) {
   };
 }
 
+function filenamePattern(base, extensions) {
+  if (typeof extensions === "string") {
+    extensions = [extensions];
+  }
+  switch (extensions.length) {
+    case 0:
+      return base;
+    case 1:
+      return `${base}.${extensions[0]}`;
+    default:
+      return `${base}.{${extensions.join(",")}}`;
+  }
+}
 function sourceUrlProcessor(...args) {
   const pkg = args.length === 2 ? args[0] : {};
   const options = args.length === 2 ? args[1] : args[0];
@@ -1512,7 +1532,7 @@ function sourceUrlProcessor(...args) {
     enabled = true,
     sourceFiles = ["**/*"],
     urlFormat,
-    componentFileExtension = "vue"
+    componentFileExtension = ["vue"]
   } = options;
   const repository = getRepositoryUrl(pkg) ?? "";
   return {
@@ -1529,7 +1549,7 @@ function sourceUrlProcessor(...args) {
       const short = await gitCommitHash("short") ?? "";
       function componentSourceUrl(component) {
         const { source, name } = component;
-        const filename = source ?? `${name}.${componentFileExtension}`;
+        const filename = source ?? filenamePattern(name, componentFileExtension);
         const path = matcher(filename, "when generating source url");
         return interpolate(urlFormat, {
           path,
@@ -2125,6 +2145,13 @@ function getComponent(attrs) {
   }
   return toArray$1(attrs.component).map(normalizeComponent);
 }
+function normalizeBody(text) {
+  text = text.replaceAll("\r\n", "\n");
+  if (!text.endsWith("\n")) {
+    text += "\n";
+  }
+  return text;
+}
 function parseFile$2(filePath, basePath, content) {
   const relative = basePath ? path__default.relative(basePath, normalizePath(filePath)) : normalizePath(filePath);
   const parsed = path__default.parse(relative);
@@ -2156,7 +2183,7 @@ function parseFile$2(filePath, basePath, content) {
       },
       sortorder: attributes.sortorder ?? Infinity
     },
-    body: blocks.body,
+    body: normalizeBody(blocks.body),
     outline,
     format: "markdown",
     tags: [],
@@ -4474,6 +4501,9 @@ class Generator {
     context.addTemplateBlock("footer:right", "footer:right", {
       filename: "partials/footer-right.html"
     });
+    context.addTemplateBlock("component:aside", "component:aside", {
+      filename: "partials/component-aside.html"
+    });
     const generatedFiles = [
       await stage("generate-docs", context, processors),
       await stage("generate-nav", context, processors),