add gitea actions

.gitea/workflows/build-and-pubilsh.yaml

@@ -0,0 +1,36 @@
+
+name: Build and publish
+
+on:
+# - workflow_dispatch
+  push:
+    branches:
+    - master
+
+jobs:
+  build-and-publish:
+    runs-on: ubuntu-latest
+    env:
+      NPM_PUBLISH_TOKEN: ${{ secrets.NPM_TOKEN }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Use Node.js 20
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Login to package registry
+        run: |
+          npm config set @doc-utils:registry https://gitea.jbrumond.me/api/packages/doc-utils/npm/
+          npm config set -- '//gitea.jbrumond.me/api/packages/doc-utils/npm/:_authToken' "$NPM_PUBLISH_TOKEN"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Compile TypeScript
+        run: npm run tsc
+
+      - name: Publish package
+        run: npm publish

.gitea/workflows/build-and-test.yaml

@@ -0,0 +1,40 @@
+
+name: Build and test
+
+on:
+  # push:
+  #   branches:
+  #   - master
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x, 20.x]
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Login to package registry
+        run: |
+          npm config set @doc-utils:registry https://gitea.jbrumond.me/api/packages/doc-utils/npm/
+          npm config set -- '//gitea.jbrumond.me/api/packages/doc-utils/npm/:_authToken' "$NPM_PUBLISH_TOKEN"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Compile TypeScript
+        run: npm run tsc
+
+      # todo: tests
+      - name: Run tests
+        run: exit 0

package-lock.json

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

package.json

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

src/description-list.ts

@@ -116,7 +116,6 @@ export function description_list_ext(renderer: marked.Renderer, opts: MarkdownOp
 			render_current();
 
 			if (token.items.length) {
-				console.log(token);
 				return token;
 			}
 		},

src/embed.ts

@@ -0,0 +1,33 @@
+
+import type { marked } from 'marked';
+import { MarkdownOptions } from './render';
+
+export interface EmbedToken extends marked.Tokens.Generic {
+	media_type: string;
+	href: string;
+}
+
+export function embed_ext(renderer: marked.Renderer, opts: MarkdownOptions) : marked.TokenizerExtension & marked.RendererExtension {
+	return {
+		name: 'embed',
+		level: 'inline',
+		start: (src) => src.match(/\{&/)?.index,
+		tokenizer(src, tokens) {
+			const rule = /^\{&\s+([^\s]+):\s*([^\s]+)\s+&\}/;
+			const match = rule.exec(src);
+
+			if (match) {
+				return {
+					type: 'embed',
+					raw: match[0],
+					media_type: match[1],
+					href: match[2],
+					tokens: [ ]
+				};
+			}
+		},
+		renderer(token: EmbedToken) {
+			return `<embed type="${token.media_type}" src="${token.href}"></embed>`;
+		}
+	};
+}

src/footnotes.ts

@@ -23,7 +23,7 @@ export function footnote_ref_ext(renderer: marked.Renderer, opts: MarkdownOption
 		level: 'inline',
 		start: (src) => src.match(/\[\^/)?.index,
 		tokenizer(src, tokens) {
-			const rule = /^\[\^([a-zA-Z0-9-._§]+)]/;
+			const rule = /^\[\^([a-zA-Z0-9-\._, §]+)]/;
 			const match = rule.exec(src);
 
 			if (match) {
@@ -68,7 +68,7 @@ export function footnote_list_ext(renderer: marked.Renderer, opts: MarkdownOptio
 			};
 
 			let remaining = src;
-			const prefix_rule = /^\[\^([a-zA-Z0-9\._§-]+)]:/;
+			const prefix_rule = /^\[\^([a-zA-Z0-9\., _§-]+)]:/;
 			const whitespace_rule = /^\s*(?:\n|$)/;
 
 			if (! prefix_rule.test(src)) {

src/html-sanitize.ts

@@ -9,5 +9,6 @@ export function sanitize_html(html: string, custom_elements?: CustomElementHandl
 	const dom_purify = createDOMPurify(window as any as Window);
 	return dom_purify.sanitize(html, {
 		CUSTOM_ELEMENT_HANDLING: custom_elements,
+		ADD_TAGS: [ 'embed', 'object', 'video', 'audio', 'iframe' ],
 	});
 }

src/prism/http.ts

@@ -0,0 +1,4 @@
+
+import { languages } from 'prismjs';
+
+languages.http['request-line'].pattern = /^(?:CONNECT|DELETE|GET|HEAD|QUERY|OPTIONS|PATCH|POST|PRI|PUT|SEARCH|TRACE)\s(?:https?:\/\/|\/)\S*\sHTTP\/[\d.]+/m;

src/prism/index.ts

@@ -4,6 +4,7 @@ import load_languages = require('prismjs/components/index');
 
 load_languages();
 require('./wasm');
+require('./http');
 
 // hooks.add('after-tokenize', (env) => {
 // 	// 

src/render.ts

@@ -10,6 +10,7 @@ import { footnote_list_ext, footnote_ref_ext } from './footnotes';
 import { description_list_ext } from './description-list';
 import { resolve_async_bindings } from './async-steps';
 import { base_url_walk_tokens } from './base-url';
+import { embed_ext } from './embed';
 
 export interface MarkdownOptions {
 	base_url?: string;
@@ -64,6 +65,7 @@ function setup_marked(options: MarkdownOptions, marked_options: marked.MarkedOpt
 			description_list_ext(marked_options.renderer, options),
 			section_ext(marked_options.renderer, options),
 			icon_ext(marked_options.renderer, options),
+			embed_ext(marked_options.renderer, options),
 			...(options.extensions || [ ]).map((ext) => {
 				return ext(marked_options.renderer, options);
 			}),

src/renderer.ts

@@ -29,15 +29,15 @@ export function create_renderer(opts: MarkdownOptions) {
 
 function heading(renderer: marked.Renderer, opts: MarkdownOptions) {
 	return function(orig_text: string, level: 1 | 2 | 3 | 4 | 5 | 6, raw: string) {
-		let { text, id, html_attrs } = parse_attributes(raw);
+		let { text, id, html_attrs } = parse_attributes(orig_text);
 		if (id) {
 			text += `\n<a class="heading-anchor" href="#${id}">`
 				+ `\n\t\t${icons.link}`
 				+ `\n\t\t<span style="display: none">Section titled ${text}</span>`
 				+ `\n\t</a>`;
 		}
-		
-		return `\n<h${level} ${html_attrs.join(' ')}>\n\t${text}\n</h${level}>`;
+
+		return `\n<h${level} ${html_attrs.join(' ')}>\n\t${text}\n</h${level}>\n`;
 	};
 }