14 Commits

Author SHA1 Message Date
e184b6f8b4 0.1.21 2023-05-13 22:12:04 -07:00
e601f45836 update bin scripts to work as symlinks 2023-05-13 22:11:59 -07:00
8203bbe763 0.1.20 2023-05-13 20:13:50 -07:00
2bd98c788d export 2023-05-13 20:13:49 -07:00
96f468c4f8 0.1.19 2023-05-13 20:12:44 -07:00
c06c01823b add sync inline renderer 2023-05-13 20:12:39 -07:00
8afb5423e3 0.1.18 2023-05-12 15:07:47 -07:00
0f83a56299 cleanup 2023-05-12 15:07:43 -07:00
ae7b491107 0.1.17 2023-05-12 14:59:49 -07:00
8599460702 whitelist rdfa tags/attrs in html sanitizer 2023-05-12 14:59:45 -07:00
fb52d31090 0.1.16 2023-05-12 14:54:12 -07:00
859064f00b add rdfa for breadcrumbs 2023-05-12 14:54:05 -07:00
7803b495c2 0.1.15 2023-05-12 14:43:14 -07:00
f48c0c6b75 fixing bug 2023-05-12 14:42:57 -07:00
9 changed files with 50 additions and 11 deletions

View File

@@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
node $(dirname $0)/markdown2html.js $* node $(dirname "$(readlink -f "$0")")/markdown2html.js $*

View File

@@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
node $(dirname $0)/strip-frontmatter.js $* node $(dirname "$(readlink -f "$0")")/strip-frontmatter.js $*

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "@doc-utils/markdown2html", "name": "@doc-utils/markdown2html",
"version": "0.1.14", "version": "0.1.21",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@doc-utils/markdown2html", "name": "@doc-utils/markdown2html",
"version": "0.1.14", "version": "0.1.21",
"dependencies": { "dependencies": {
"bytefield-svg": "^1.6.1", "bytefield-svg": "^1.6.1",
"dompurify": "^2.3.6", "dompurify": "^2.3.6",

View File

@@ -1,6 +1,6 @@
{ {
"name": "@doc-utils/markdown2html", "name": "@doc-utils/markdown2html",
"version": "0.1.14", "version": "0.1.21",
"publishConfig": { "publishConfig": {
"registry": "https://gitea.home.jbrumond.me/api/packages/doc-utils/npm/" "registry": "https://gitea.home.jbrumond.me/api/packages/doc-utils/npm/"
}, },

View File

@@ -3,6 +3,8 @@ import { marked } from 'marked';
import { ParsedAttributes, parse_attributes } from './attrs'; import { ParsedAttributes, parse_attributes } from './attrs';
import { MarkdownOptions } from './render'; import { MarkdownOptions } from './render';
// todo: deprecate this
export interface BreadcrumbNavToken extends marked.Tokens.Generic { export interface BreadcrumbNavToken extends marked.Tokens.Generic {
text: string; text: string;
attrs: ParsedAttributes; attrs: ParsedAttributes;
@@ -44,13 +46,15 @@ export function breadcrumb_nav_ext(renderer: marked.Renderer, opts: MarkdownOpti
+ `\t<ol>\n` + `\t<ol>\n`
+ '\t\t' + '\t\t'
+ token.items.map((tokens, index) =>{ + token.items.map((tokens, index) =>{
let item = '<li>'; let item = '<li>\n';
if (index) { if (index) {
item += '<span class="separator" aria-hidden="true">/</span> '; item += '\t\t\t<span class="separator" aria-hidden="true">/</span>\n';
} }
return item + this.parser.parseInline(tokens, renderer) + '</li>'; item += `\t\t\t${this.parser.parseInline(tokens, renderer)}\n`;
return item + '\t\t</li>';
}).join('\n\t\t') }).join('\n\t\t')
+ '\n' + '\n'
+ `\t</ol>\n` + `\t</ol>\n`

View File

@@ -8,6 +8,6 @@ export function sanitize_html(html: string, custom_elements?: CustomElementHandl
const { window } = new JSDOM(''); const { window } = new JSDOM('');
const dom_purify = createDOMPurify(window as any as Window); const dom_purify = createDOMPurify(window as any as Window);
return dom_purify.sanitize(html, { return dom_purify.sanitize(html, {
CUSTOM_ELEMENT_HANDLING: custom_elements CUSTOM_ELEMENT_HANDLING: custom_elements,
}); });
} }

View File

@@ -1,3 +1,3 @@
export { process_frontmatter } from './frontmatter'; export { process_frontmatter } from './frontmatter';
export { render_markdown_to_html, MarkdownExtension, MarkdownOptions } from './render'; export { render_markdown_to_html, render_markdown_to_html_inline_sync, MarkdownExtension, MarkdownOptions } from './render';

View File

@@ -69,3 +69,38 @@ export async function render_markdown_to_html(markdown: string, options: Markdow
return sanitize_html(unsafe_html, options.custom_elements); return sanitize_html(unsafe_html, options.custom_elements);
} }
export function render_markdown_to_html_inline_sync(markdown: string, options: MarkdownOptions = { }) {
const marked_options: marked.MarkedOptions = {
baseUrl: options.base_url,
breaks: options.breaks || false,
renderer: create_renderer(options),
};
marked.use({
extensions: [
katex_block_ext(marked_options.renderer, options),
katex_inline_ext(marked_options.renderer, options),
footnote_ref_ext(marked_options.renderer, options),
footnote_list_ext(marked_options.renderer, options),
mark_ext(marked_options.renderer, options),
description_list_ext(marked_options.renderer, options),
section_ext(marked_options.renderer, options),
icon_ext(marked_options.renderer, options),
breadcrumb_nav_ext(marked_options.renderer, options),
...(options.extensions || [ ]).map((ext) => {
return ext(marked_options.renderer, options);
}),
],
tokenizer: {
url(src) {
// disable auto-linking; more can be added here to auto-link only sometimes
// see: https://github.com/markedjs/marked/issues/882#issuecomment-781628889
return null;
}
},
});
const unsafe_html = marked.parseInline(markdown, marked_options);
return sanitize_html(unsafe_html, options.custom_elements);
}

View File

@@ -197,7 +197,7 @@ function code(renderer: marked.Renderer, opts: MarkdownOptions) {
const arg_pattern = /^(?:[a-zA-Z0-9_:-]+|"(?:[^"\n]|(?<=\\)")*")/; const arg_pattern = /^(?:[a-zA-Z0-9_:-]+|"(?:[^"\n]|(?<=\\)")*")/;
function parse_code_args(text: string) { function parse_code_args(text = '') {
const args: string[] = [ ]; const args: string[] = [ ];
text = text.trim(); text = text.trim();