Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update marked to latest v9 #81

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@
},
"dependencies": {
"@types/marked": "^5.0.1",
"marked": "^5.1.2"
"marked": "^9.1.6"
},
"peerDependencies": {
"svelte": "^4.0.0"
55 changes: 55 additions & 0 deletions src/Slugger.js
Original file line number Diff line number Diff line change
@@ -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);
}
}
7 changes: 2 additions & 5 deletions src/SvelteMarkdown.svelte
Original file line number Diff line number Diff line change
@@ -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 })
}
3 changes: 2 additions & 1 deletion src/markdown-parser.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export { Lexer, Slugger } from 'marked'
export { lexer, parseInline } from 'marked'
export { Slugger } from './Slugger'

import {
Heading,
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -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==

[email protected]:
version "2.0.30"