From a8f69ca279539903fef4ca2095f896c118b5ba70 Mon Sep 17 00:00:00 2001
From: Wilson Hobbs <wilsonhobbs1@gmail.com>
Date: Fri, 10 Nov 2023 01:22:22 -0800
Subject: [PATCH] update marked

---
 package.json              |  2 +-
 src/Slugger.js            | 55 +++++++++++++++++++++++++++++++++++++++
 src/SvelteMarkdown.svelte |  7 ++---
 src/markdown-parser.js    |  3 ++-
 yarn.lock                 |  8 +++---
 5 files changed, 64 insertions(+), 11 deletions(-)
 create mode 100644 src/Slugger.js

diff --git a/package.json b/package.json
index fda9d18f..97ba4616 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@types/marked": "^5.0.1",
-    "marked": "^5.1.2"
+    "marked": "^9.1.6"
   },
   "peerDependencies": {
     "svelte": "^4.0.0"
diff --git a/src/Slugger.js b/src/Slugger.js
new file mode 100644
index 00000000..7249cc20
--- /dev/null
+++ b/src/Slugger.js
@@ -0,0 +1,55 @@
+/**
+ * Slugger generates header id
+ */
+export class Slugger {
+    constructor() {
+      this.seen = {};
+    }
+  
+    /**
+     * @param {string} value
+     */
+    serialize(value) {
+      return value
+        .toLowerCase()
+        .trim()
+        // remove html tags
+        .replace(/<[!\/a-z].*?>/ig, '')
+        // remove unwanted chars
+        .replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g, '')
+        .replace(/\s/g, '-');
+    }
+  
+    /**
+     * Finds the next safe (unique) slug to use
+     * @param {string} originalSlug
+     * @param {boolean} isDryRun
+     */
+    getNextSafeSlug(originalSlug, isDryRun) {
+      let slug = originalSlug;
+      let occurenceAccumulator = 0;
+      if (this.seen.hasOwnProperty(slug)) {
+        occurenceAccumulator = this.seen[originalSlug];
+        do {
+          occurenceAccumulator++;
+          slug = originalSlug + '-' + occurenceAccumulator;
+        } while (this.seen.hasOwnProperty(slug));
+      }
+      if (!isDryRun) {
+        this.seen[originalSlug] = occurenceAccumulator;
+        this.seen[slug] = 0;
+      }
+      return slug;
+    }
+  
+    /**
+     * Convert string to unique id
+     * @param {object} [options]
+     * @param {boolean} [options.dryrun] Generates the next unique slug without
+     * updating the internal accumulator.
+     */
+    slug(value, options = {}) {
+      const slug = this.serialize(value);
+      return this.getNextSafeSlug(slug, options.dryrun);
+    }
+  }
\ No newline at end of file
diff --git a/src/SvelteMarkdown.svelte b/src/SvelteMarkdown.svelte
index 845f6907..ccea9921 100644
--- a/src/SvelteMarkdown.svelte
+++ b/src/SvelteMarkdown.svelte
@@ -1,8 +1,8 @@
 <script>
   import { setContext, createEventDispatcher, onMount } from 'svelte'
   import Parser from './Parser.svelte'
-  import { Lexer, Slugger, defaultOptions, defaultRenderers } from './markdown-parser'
   import { key } from './context'
+  import { Slugger, defaultOptions, defaultRenderers, lexer, parseInline } from './markdown-parser'
 
   export let source = []
   export let renderers = {}
@@ -12,7 +12,6 @@
   const dispatch = createEventDispatcher();
 
   let tokens;
-  let lexer;
   let mounted;
 
   $: preprocessed = Array.isArray(source)
@@ -21,9 +20,7 @@
   $: if (preprocessed) {
     tokens = source
   } else {
-    lexer = new Lexer(combinedOptions)
-
-    tokens = isInline ? lexer.inlineTokens(source) : lexer.lex(source)
+    tokens = isInline ? parseInline(source) : lexer(source)
 
     dispatch('parsed', { tokens })
   }
diff --git a/src/markdown-parser.js b/src/markdown-parser.js
index ea12aede..afe1c01b 100644
--- a/src/markdown-parser.js
+++ b/src/markdown-parser.js
@@ -1,4 +1,5 @@
-export { Lexer, Slugger } from 'marked'
+export { lexer, parseInline } from 'marked'
+export { Slugger } from './Slugger'
 
 import {
   Heading,
diff --git a/yarn.lock b/yarn.lock
index 7f24f853..fb1632fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2155,10 +2155,10 @@ make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.0.3,
     socks-proxy-agent "^7.0.0"
     ssri "^10.0.0"
 
-marked@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-5.1.2.tgz#62b5ccfc75adf72ca3b64b2879b551d89e77677f"
-  integrity sha512-ahRPGXJpjMjwSOlBoTMZAK7ATXkli5qCPxZ21TG44rx1KEo44bii4ekgTDQPNRQ4Kh7JMb9Ub1PVk1NxRSsorg==
+marked@^9.1.6:
+  version "9.1.6"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-9.1.6.tgz#5d2a3f8180abfbc5d62e3258a38a1c19c0381695"
+  integrity sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==
 
 mdn-data@2.0.30:
   version "2.0.30"