wikity 1.3.2 → 1.3.3

package/dist/compile.js

@@ -106,7 +106,7 @@ function compile(dir = '.', config = {}) {
         if (!fs_1.default.existsSync(path_1.default.dirname(outFilePath))) {
             fs_1.default.mkdirSync(path_1.default.dirname(outFilePath));
         }
-        const renderedHtml = formatter.render(html).replace(/(<\/\w+>)(\S)/g, '$1 $2');
+        const renderedHtml = formatter.render(html.replace(/(<\/\w+>) +(\S)/g, '$1&#32;$2'));
         fs_1.default.writeFileSync(outFilePath, frontMatter + '\n' + renderedHtml, 'utf8');
         // Move images
         (0, glob_1.default)(imagesFolder + '/*', {}, (err, files) => {

package/dist/parse.js

@@ -33,13 +33,14 @@ function parse(data, config = {}) {
     let rawExtLinkCount = 0;
     let refCount = 0;
     let outText = data;
+    const escaper = (text, n) => `%${text}#${n}`;
     for (let l = 0, last = ''; l < MAX_RECURSION; l++) {
         if (last === outText)
             break;
         last = outText;
         outText = outText
             // Nowiki: <nowiki></nowiki>
-            .replace((0, common_1.RegExpBuilder)(r `<nowiki> ([^]+?) </nowiki>`), (_, m) => `%NOWIKI#${nowikis.push(m), nowikiCount++}%`)
+            .replace((0, common_1.RegExpBuilder)(r `<nowiki> ([^]+?) </nowiki>`), (_, m) => (nowikis.push(m), escaper('NOWIKI', nowikiCount++)))
             // Sanitise unacceptable HTML
             .replace((0, common_1.RegExpBuilder)(r `<(/?) \s* (?= script|link|meta|iframe|frameset|object|embed|applet|form|input|button|textarea )`), '&lt;$1')
             .replace((0, common_1.RegExpBuilder)(r `(?<= <[^>]+ ) (\bon(\w+))`), 'data-$2')
@@ -47,16 +48,22 @@ function parse(data, config = {}) {
             .replace(/<!--[^]+?-->/g, '')
             // Lines: ----
             .replace(/^-{4,}/gm, '<hr>')
+            // Internal links: [[Page]] and [[Page|Text]]
+            .replace((0, common_1.RegExpBuilder)(r `\[\[ ([^\]|]+?) \]\]`), `<a class{{=}}"internal-link" title{{=}}"$1" href{{=}}"$1">$1</a>`)
+            .replace((0, common_1.RegExpBuilder)(r `\[\[ ([^\]|]+?) \| ([^\]]+?) \]\]`), `<a class{{=}}"internal-link" title{{=}}"$1" href{{=}}"/$1">$2</a>`)
+            .replace((0, common_1.RegExpBuilder)(r `(</a>)([a-z]+)`), '$2$1')
+            // External links: [href Page] and just [href]
+            .replace((0, common_1.RegExpBuilder)(r `\[ ((?:\w+:)?\/\/ [^\s\]]+) (\s [^\]]+?)? \]`), (_, href, txt) => `<a class{{=}}"external-link" href{{=}}"${href}">${txt || '[' + (++rawExtLinkCount) + ']'}</a>`)
+            // Magic words: {{!}}, {{reflist}}, etc
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* ! \s* }}`), escaper('VERT', 0))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* = \s* }}`), escaper('EQUALS', 0))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* [Rr]eflist \s* }}`), '<references/>')
             // Metadata: displayTitle, __NOTOC__, etc
             .replace((0, common_1.RegExpBuilder)(r `{{ \s* displayTitle: ([^}]+) }}`), (_, title) => (metadata.displayTitle = title, ''))
             .replace((0, common_1.RegExpBuilder)(r `__NOINDEX__`), () => (metadata.noindex = true, ''))
             .replace((0, common_1.RegExpBuilder)(r `__NOTOC__`), () => (metadata.notoc = true, ''))
             .replace((0, common_1.RegExpBuilder)(r `__FORCETOC__`), () => (metadata.toc = true, ''))
             .replace((0, common_1.RegExpBuilder)(r `__TOC__`), () => (metadata.toc = true, `<toc></toc>`))
-            // Magic words: {{!}}, {{reflist}}, etc
-            .replace((0, common_1.RegExpBuilder)(r `{{ \s* ! \s* }}`), '&vert;')
-            .replace((0, common_1.RegExpBuilder)(r `{{ \s* = \s* }}`), '&equals;')
-            .replace((0, common_1.RegExpBuilder)(r `{{ \s* [Rr]eflist \s* }}`), '<references/>')
             // String functions: {{lc:}}, {{ucfirst:}}, {{len:}}, etc
             .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? urlencode: ${arg} }}`), (_, m) => encodeURI(m))
             .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? urldecode: ${arg} }}`), (_, m) => decodeURI(m))
@@ -128,7 +135,7 @@ function parse(data, config = {}) {
             for (let i = 1; i < args.length; i++) {
                 const parts = args[i].split('=');
                 const [arg, val] = parts[1]
-                    ? [parts[0], ...parts.slice(1)]
+                    ? [parts[0], parts.slice(1).join('=')]
                     : [i.toString(), parts[0]];
                 content = content.replace(argMatch(arg), (_, defaultVal) => val || defaultVal || '');
             }
@@ -224,12 +231,6 @@ function parse(data, config = {}) {
             .replace((0, common_1.RegExpBuilder)(r `''  ([^']+?)  ''`), '<i>$1</i>')
             // Headings: ==heading==
             .replace((0, common_1.RegExpBuilder)(r `^ (=+) \s* (.+?) \s* \1 \s* $`), (_, lvl, txt) => `<h${lvl.length} id="${encodeURI(txt.replace(/ /g, '_'))}">${txt}</h${lvl.length}>`)
-            // Internal links: [[Page]] and [[Page|Text]]
-            .replace((0, common_1.RegExpBuilder)(r `\[\[ ([^\]|]+?) \]\]`), `<a class="internal-link" title="$1" href="$1">$1</a>`)
-            .replace((0, common_1.RegExpBuilder)(r `\[\[ ([^\]|]+?) \| ([^\]]+?) \]\]`), `<a class="internal-link" title="$1" href="/$1">$2</a>`)
-            .replace((0, common_1.RegExpBuilder)(r `(</a>)([a-z]+)`), '$2$1')
-            // External links: [href Page] and just [href]
-            .replace((0, common_1.RegExpBuilder)(r `\[ ((?:\w+:)?\/\/ [^\s\]]+) (\s [^\]]+?)? \]`), (_, href, txt) => `<a class="external-link" href="${href}">${txt || '[' + (++rawExtLinkCount) + ']'}</a>`)
             // Bulleted list: *item
             .replace((0, common_1.RegExpBuilder)(r `^ (\*+) (.+?) $`), (_, lvl, txt) => `${'<ul>'.repeat(lvl.length)}<li>${txt}</li>${'</ul>'.repeat(lvl.length)}`)
             .replace((0, common_1.RegExpBuilder)(r `</ul> (\s*?) <ul>`), '$1')
@@ -237,8 +238,9 @@ function parse(data, config = {}) {
             .replace((0, common_1.RegExpBuilder)(r `^ (#+) (.+?) $`), (_, lvl, txt) => `${'<ol>'.repeat(lvl.length)}<li>${txt}</li>${'</ol>'.repeat(lvl.length)}`)
             .replace((0, common_1.RegExpBuilder)(r `</ol> (\s*?) <ol>`), '$1')
             // Definition list: ;head, :item
-            .replace((0, common_1.RegExpBuilder)(r `^ ; (.+) $`), '<dl><dt>$1</dt></dl>')
+            .replace((0, common_1.RegExpBuilder)(r `^ ; (.+?) : (.+?) $`), `<dl><dt>$1</td><dd>$2</dd></dl>`)
             .replace((0, common_1.RegExpBuilder)(r `^ (:+) (.+?) $`), (_, lvl, txt) => `${'<dl>'.repeat(lvl.length)}<dd>${txt}</dd>${'</dl>'.repeat(lvl.length)}`)
+            .replace((0, common_1.RegExpBuilder)(r `^ ; (.+) $`), '<dl><dt>$1</dt></dl>')
             .replace((0, common_1.RegExpBuilder)(r `</dl> (\s*?) <dl>`), '$1')
             // Tables: {|, |+, !, |-, |, |}
             .replace((0, common_1.RegExpBuilder)(r `^ \{\| (.*?) $`), (_, attrs) => `<table ${attrs}><tr>`)
@@ -261,10 +263,15 @@ function parse(data, config = {}) {
             // Spacing
             .replace(/(\r?\n){2}/g, '\n</p><p>\n');
     }
-    // Final changes (run only once)
+    // Restore nowiki contents
+    for (let i = 0; i < nowikis.length; i++) {
+        outText = outText
+            .replace(escaper('NOWIKI', i), (_, n) => fullyEscape(nowikis[n]));
+    }
+    // Substitute magic word functions
     outText = outText
-        // Restore nowiki contents
-        .replace(/%NOWIKI#(\d+)%/g, (_, n) => fullyEscape(nowikis[n]));
+        .replaceAll(escaper('VERT', 0), '|')
+        .replaceAll(escaper('EQUALS', 0), '=');
     const result = { data: outText, metadata: metadata };
     return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikity",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Compile wikitext to HTML: wikitext as a templating language.",
   "main": "dist/index.js",
   "scripts": {