markstream-angular 2.0.19 → 2.0.20

package/dist/fesm2022/markstream-angular.mjs

@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 import * as i0 from '@angular/core';
 import { Input, ChangeDetectionStrategy, Component, forwardRef, inject, ChangeDetectorRef, ViewChild, ViewContainerRef, ElementRef, Renderer2, Directive, HostListener, Injectable, InjectionToken, EventEmitter, Output } from '@angular/core';
 import { normalizeCustomHtmlTags, normalizeCustomHtmlTagName, parseMarkdownToStructure, mergeCustomHtmlTags, getMarkdown, sanitizeHtmlAttrs, VOID_HTML_TAGS, BLOCKED_HTML_TAGS, isHtmlTagHardBlocked, isHtmlTagBlocked, isUnsafeHtmlUrl, shouldOpenLinkInNewTab, sanitizeImageSrc, NON_STRUCTURING_HTML_TAGS, toSafeMermaidSvgMarkup, getHtmlTagFromContent, stripCustomHtmlWrapper, STANDARD_HTML_TAGS, hasCompleteHtmlTagContent } from 'stream-markdown-parser';
-import { createPanGesture, createSmoothMarkdownStream } from 'markstream-core';
+import { createPanGesture, applyMermaidThemeDirective, createSmoothMarkdownStream } from 'markstream-core';
 import { computePosition, offset, flip, shift, autoUpdate } from '@floating-ui/dom';
 
 const TAG_TOKEN_RE = /<\/?([A-Z][\w:-]*)(?:\s[^<>]*)?>/gi;
@@ -7390,11 +7390,8 @@ class MermaidBlockNodeComponent {
         return this.getSafePrefixCandidate(source);
     }
     applyThemeTo(source, theme) {
-        const trimmed = source.trimStart();
-        if (trimmed.startsWith('%%{'))
-            return source;
         const themeValue = theme === 'dark' ? 'dark' : 'default';
-        return `%%{init: {"theme": "${themeValue}"}}%%\n${source}`;
+        return applyMermaidThemeDirective(source, `%%{init: {"theme": "${themeValue}"}}%%\n`);
     }
     getMermaidDiagramKind(source) {
         for (const rawLine of source.split(/\r?\n/)) {
@@ -9302,11 +9299,8 @@ async function renderMermaid(root, cleanupFns, options, isActive) {
     }
 }
 function applyMermaidThemeTo(source, theme) {
-    const trimmed = source.trimStart();
-    if (trimmed.startsWith('%%{'))
-        return source;
     const themeValue = theme === 'dark' ? 'dark' : 'default';
-    return `%%{init: {"theme": "${themeValue}"}}%%\n${source}`;
+    return applyMermaidThemeDirective(source, `%%{init: {"theme": "${themeValue}"}}%%\n`);
 }
 async function canParseMermaidWithFallback(source, theme, mermaid, options) {
     const workerTimeout = Number(options.mermaidProps?.workerTimeoutMs ?? 1400);
@@ -11210,6 +11204,8 @@ let DEBUG = false
 let mermaid = null
 let mermaidLoadError = null
 
+const applyMermaidThemeDirective = ${applyMermaidThemeDirective.toString()}
+
 function normalizeMermaidModule(mod) {
   if (!mod)
     return mod
@@ -11237,16 +11233,19 @@ function normalizeMermaidModule(mod) {
 function applyThemeTo(code, theme) {
   const themeValue = theme === 'dark' ? 'dark' : 'default'
   const themeConfig = \`%%{init: {"theme": "\${themeValue}"}}%%\\n\`
-  const trimmed = String(code || '').trimStart()
-  if (trimmed.startsWith('%%{'))
-    return code
-  return themeConfig + code
+  return applyMermaidThemeDirective(code || '', themeConfig)
 }
 
 function findHeaderIndex(lines) {
   const headerRe = /^(?:graph|flowchart|flowchart\\s+tb|flowchart\\s+lr|sequenceDiagram|gantt|classDiagram|stateDiagram(?:-v2)?|erDiagram|journey|pie|quadrantChart|timeline|xychart(?:-beta)?)\\b/
+  let inFrontmatter = lines[0]?.trimEnd() === '---'
   for (let i = 0; i < lines.length; i++) {
     const line = (lines[i] || '').trim()
+    if (inFrontmatter) {
+      if (i > 0 && lines[i].trimEnd() === '---')
+        inFrontmatter = false
+      continue
+    }
     if (!line || line.startsWith('%%'))
       continue
     if (headerRe.test(line))
@@ -11265,7 +11264,7 @@ async function canParse(code, theme) {
 }
 
 async function findLastRenderablePrefix(baseCode, theme) {
-  const lines = String(baseCode || '').split('\\n')
+  const lines = String(baseCode || '').split(/\\r\\n?|\\n/)
   const headerIndex = findHeaderIndex(lines)
   if (headerIndex === -1)
     return null