npm - wikity - Versions diffs - 1.3.6 → 1.3.8 - Mend

wikity 1.3.6 → 1.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/dist/cli.js CHANGED Viewed

@@ -30,15 +30,22 @@ else if (arg(1).includes('c')) {
     // Run compilation
     const configArgs = args.slice(2);
     const argsList = configArgs.join(' ');
-    // retrieve item from arguments list
-    const getArgContent = (arg) => arg.test(argsList) && configArgs.filter((_, i) => arg.test(configArgs[i - 1])).join(' ') || undefined;
+    // Retrieve item from arguments list
+    const getArgContent = (match) => {
+        var _a;
+        const matchIndex = configArgs.findIndex((arg) => match.test(arg));
+        if (matchIndex === -1) {
+            return undefined;
+        }
+        return (_a = configArgs[matchIndex + 1]) !== null && _a !== void 0 ? _a : '';
+    };
     // Fetch user-supplied arguments
     const folder = arg(2) || '.';
     const outputFolder = getArgContent(/^-+o/);
     const templatesFolder = getArgContent(/^-+t/);
     const imagesFolder = getArgContent(/^-+i/);
-    const eleventy = /^-+e/.test(argsList);
-    const defaultStyles = /^-+d/.test(argsList);
+    const eleventy = getArgContent(/^-+e/) !== undefined;
+    const defaultStyles = getArgContent(/^-+d/) !== undefined;
     index_1.default.compile(folder, { outputFolder, templatesFolder, imagesFolder, eleventy, defaultStyles });
 }
 else if (arg(1).includes('p')) {

package/dist/compile.js CHANGED Viewed

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compile = exports.eleventyCompile = void 0;
+const dedent_1 = __importDefault(require("dedent"));
 const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 const glob_1 = __importDefault(require("glob"));
-const dedent_1 = __importDefault(require("dedent"));
+const path_1 = __importDefault(require("path"));
 const parse_1 = require("./parse");
 const wiki_css_1 = __importDefault(require("./wiki.css"));
 function eleventyCompile(dir = '.', config = {}) {
@@ -83,7 +83,11 @@ function compile(dir = '.', config = {}) {
         // Create plaintext of HTML for use as description/metadata property.
         const plaintextData = parsedContent.replace(/<.+?>/gs, '');
         // Create HTML
-        const folderUpCount = file.split(/[\/\\]/).length - dir.split(/[\/\\]/).length; // number of folders to go up by to get to root
+        let folderUpCount = file.split(/[\/\\]/).length - dir.split(/[\/\\]/).length; // number of folders to go up by to get to root
+        if (!config.eleventy) {
+            // Regular mode puts both wiki.css and the root files in the root folder
+            folderUpCount--;
+        }
         const html = (0, dedent_1.default) `
             <html>
                 <head>
@@ -91,7 +95,9 @@ function compile(dir = '.', config = {}) {
                     <meta name="viewport" content="initial-scale=1.0, width=device-width">
                     <meta name="description" content="${plaintextData.substring(0, 256)}...">
                     <title>${displayTitle}</title>
+                    ${config.defaultStyles ? `
                     <link id="default-styles" rel="stylesheet" href="${'../'.repeat(folderUpCount)}./wiki.css">
+                    ` : ''}
                 </head>
                 <body>
                     <header>
@@ -108,9 +114,7 @@ function compile(dir = '.', config = {}) {
             </html>
         `;
         // Write to file
-        if (!fs_1.default.existsSync(path_1.default.dirname(outFilePath))) {
-            fs_1.default.mkdirSync(path_1.default.dirname(outFilePath));
-        }
+        fs_1.default.mkdirSync(path_1.default.dirname(outFilePath), { recursive: true });
         const formattedHtml = html.replace(/\n[\n\s]+/g, '\n');
         fs_1.default.writeFileSync(outFilePath, frontMatter + '\n' + formattedHtml, 'utf8');
         // Move images
@@ -118,16 +122,14 @@ function compile(dir = '.', config = {}) {
             if (err) {
                 console.warn(err);
             }
-            if (!fs_1.default.existsSync(outputImagesFolder)) {
-                fs_1.default.mkdirSync(outputImagesFolder);
-            }
+            fs_1.default.mkdirSync(outputImagesFolder, { recursive: true });
             for (const file of files) {
                 fs_1.default.copyFileSync(file, path_1.default.join(outputImagesFolder, path_1.default.basename(file)));
             }
             ;
         });
         // Create site styles
-        if (!stylesCreated) {
+        if (!stylesCreated && (config.defaultStyles !== false || config.customStyles)) {
             stylesCreated = true;
             let styles = '';
             if (config.defaultStyles !== false) {

package/dist/parse.js CHANGED Viewed

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = exports.rawParse = void 0;
+const dateformat_1 = __importDefault(require("dateformat"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const dateformat_1 = __importDefault(require("dateformat"));
 const common_1 = require("./common");
 const r = String.raw;
 const MAX_RECURSION = 20;
@@ -36,11 +36,10 @@ function rawParse(data, config = {}) {
 }
 exports.rawParse = rawParse;
 function parse(data, config = {}) {
-    var _a, _b, _c;
+    var _a, _b;
     const KEY = Math.random().toString().slice(2); // key used to allow certain disallowed HTML elements
     const templatesFolder = (_a = config.templatesFolder) !== null && _a !== void 0 ? _a : 'templates';
     const imagesFolder = (_b = config.imagesFolder) !== null && _b !== void 0 ? _b : 'images';
-    const outputFolder = (_c = config.outputFolder) !== null && _c !== void 0 ? _c : 'wikity-out';
     const vars = {};
     const metadata = {};
     const nowikis = [];
@@ -53,8 +52,11 @@ function parse(data, config = {}) {
             break;
         last = outText;
         outText = outText
+            // Passthrough unparsed content
             // Nowiki: <nowiki></nowiki>
             .replace((0, common_1.RegExpBuilder)(r `<nowiki> ([^]+?) </nowiki>`), (_, m) => (nowikis.push(m), escaper('NOWIKI', nowikiCount++)))
+            // Pre: <pre></pre>
+            .replace((0, common_1.RegExpBuilder)(r `<pre> ([^]+?) </pre>`), (_, m) => (nowikis.push(m), escaper('PRE', nowikiCount++)))
             // Sanitise unacceptable HTML
             .replace((0, common_1.RegExpBuilder)(r `< \s* (?= (?: script|link|meta|iframe|frameset|object|embed|applet|form|input|button|textarea ) (?! \s* key.{0,10}${KEY}) )`), '&lt;')
             .replace((0, common_1.RegExpBuilder)(r `(?<= <[^>]+ ) (\bon(\w+))`), 'data-$2')
@@ -382,7 +384,9 @@ function parse(data, config = {}) {
     for (let i = 0; i < nowikis.length; i++) {
         outText = outText
             // Restore nowiki contents
-            .replace(escaper('NOWIKI', i), nowikis[i]);
+            .replace(escaper('NOWIKI', i), nowikis[i])
+            // Restore pre contents
+            .replace(escaper('PRE', i), '<pre>' + nowikis[i] + '</pre>');
     }
     outText = outText
         // References: <references />

package/dist/src/cli.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/dist/src/cli.js ADDED Viewed

@@ -0,0 +1,64 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const VERSION = require('../package.json').version;
+const index_1 = __importDefault(require("./index"));
+// Helper functions
+const indent = (n) => ' '.repeat(n * 4);
+const usage = (command, ...desc) => {
+    console.log('\n' + indent(2) + command);
+    desc.forEach((msg) => console.log(indent(2.5) + msg));
+};
+const arg = (n) => process.argv[n + 1] || '';
+const args = process.argv.slice(1);
+// Run CLI
+if (!arg(1)) {
+    // No arguments
+    console.log('Type `wikity help` for a list of commands.');
+}
+else if (arg(1).includes('h')) {
+    // Show help message
+    console.log(`\n${indent(1)}Wikity CLI commands:`);
+    usage(`wikity (help|-h)`, `Display this help message.`);
+    usage(`wikity compile [<folder>] [-o <folder>] [-t <folder>] -i <folder>] [-e] [-d]`, `Compile wikitext files from a given folder.`, `  [<folder>]\n${indent(3.5)}Input folder ('.' (current folder) if unset).`, `  (-o|--outputFolder) <folder>\n${indent(3.5)}Folder that compiled HTML files are placed in ('wikity-out' if unset).`, `  (-t|--templatesFolder) <folder>\n${indent(3.5)}Where to place wiki templates ('templates' if unset).`, `  (-i|--imagesFolder) <folder>\n${indent(3.5)}Where to place wiki images ('images' if unset).`, `  (-e|--eleventy)\n${indent(3.5)}Compiles files with Eleventy front matter (false if unset).`, `  (-d|--defaultStyles)\n${indent(3.5)}Add default wiki styling to all pages (true if unset).`);
+    usage(`wikity (parse|-p) "<input>"`, `Parse raw wikitext from the command line.`);
+    usage(`wikity (version|-v)`, `Display the current version of Wikity.`);
+}
+else if (arg(1).includes('c')) {
+    // Run compilation
+    const configArgs = args.slice(2);
+    const argsList = configArgs.join(' ');
+    // Retrieve item from arguments list
+    const getArgContent = (match) => {
+        const matchIndex = configArgs.findIndex((arg) => match.test(arg));
+        if (matchIndex === -1) {
+            return undefined;
+        }
+        return configArgs[matchIndex + 1];
+    };
+    // Fetch user-supplied arguments
+    const folder = arg(2) || '.';
+    const outputFolder = getArgContent(/^-+o/);
+    const templatesFolder = getArgContent(/^-+t/);
+    const imagesFolder = getArgContent(/^-+i/);
+    const eleventy = /^-+e/.test(argsList);
+    const defaultStyles = /^-+d/.test(argsList);
+    index_1.default.compile(folder, { outputFolder, templatesFolder, imagesFolder, eleventy, defaultStyles });
+}
+else if (arg(1).includes('p')) {
+    // Run parsing
+    // second argument is inputted text
+    const input = arg(2);
+    const output = index_1.default.parse(input);
+    console.log(output);
+}
+else if (arg(1).includes('v')) {
+    // Show version
+    console.log('The current version of Wikity is ' + VERSION);
+}
+else {
+    // Unknown command
+    console.log('Unknown command; type `wikity help` for help');
+}

package/dist/src/common.d.ts ADDED Viewed

@@ -0,0 +1,20 @@
+export type Metadata = Record<string, any>;
+export interface Config {
+    /** The folder that Wikity's compiled HTML files are outputted to (defaults to 'wikity-out') */
+    outputFolder?: string;
+    /** The folder that wiki templates are to be stored in relative to the root folder */
+    templatesFolder?: string;
+    /** The folder that images are to be stored in relative to the root folder */
+    imagesFolder?: string;
+    /** Whether to be set up for Eleventy integration (defaults to false) */
+    eleventy?: boolean;
+    /** Whether to use default wiki styling (defaults to true) */
+    defaultStyles?: boolean;
+    /** Custom CSS styles to add to the wiki pages */
+    customStyles?: string;
+}
+export interface Result {
+    data: string;
+    metadata: Metadata;
+}
+export declare function RegExpBuilder(regex: string, flag?: string): RegExp;

package/dist/src/common.js ADDED Viewed

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RegExpBuilder = RegExpBuilder;
+function RegExpBuilder(regex, flag = 'mgi') {
+    return RegExp(regex.replace(/ /g, '').replace(/\|\|.+?\|\|/g, ''), flag);
+}

package/dist/src/compile.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import { Config } from './common';
+export declare function eleventyCompile(dir?: string, config?: Config): void;
+export declare function compile(dir?: string, config?: Config): void;

package/dist/src/compile.js ADDED Viewed

@@ -0,0 +1,140 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.eleventyCompile = eleventyCompile;
+exports.compile = compile;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const glob_1 = __importDefault(require("glob"));
+const dedent_1 = __importDefault(require("dedent"));
+const parse_1 = require("./parse");
+const wiki_css_1 = __importDefault(require("./wiki.css"));
+function eleventyCompile(dir = '.', config = {}) {
+    compile(dir, { eleventy: true, ...config });
+}
+function compile(dir = '.', config = {}) {
+    var _a, _b, _c;
+    // set defaults
+    (_a = config.templatesFolder) !== null && _a !== void 0 ? _a : (config.templatesFolder = 'templates');
+    (_b = config.imagesFolder) !== null && _b !== void 0 ? _b : (config.imagesFolder = 'images');
+    (_c = config.outputFolder) !== null && _c !== void 0 ? _c : (config.outputFolder = 'wikity-out');
+    // directory variables (absolute paths)
+    const baseDir = path_1.default.resolve(dir);
+    const templatesFolder = path_1.default.join(baseDir, config.templatesFolder);
+    const imagesFolder = path_1.default.join(baseDir, config.imagesFolder);
+    const outputFolder = path_1.default.join(baseDir, config.outputFolder);
+    const outputImagesFolder = path_1.default.join(baseDir, config.outputFolder, config.imagesFolder);
+    const newConfig = { ...config, templatesFolder, imagesFolder, outputFolder };
+    let stylesCreated = false;
+    // Write wikitext files
+    const files = glob_1.default.sync(dir + "/**/*.wiki", {});
+    files.forEach((file) => {
+        var _a;
+        const fileData = fs_1.default.readFileSync(file, { encoding: 'utf8' });
+        const { data: parsedContent, metadata } = (0, parse_1.parse)(fileData, newConfig);
+        let outText = parsedContent;
+        const filename = file.replace(dir, '').replace(/^[\/\\]/, '');
+        const outFilename = filename.replace(/ /g, '_').replace('.wiki', '.html');
+        const outFilePath = path_1.default.join(outputFolder, outFilename);
+        const urlPath = outFilename.replace(/(?<=^|\/)\w/g, m => m.toUpperCase()); // capitalise first letters
+        const displayTitle = metadata.displayTitle || urlPath.replace('.html', '').replace(/_/g, ' ');
+        // Eleventy configuration
+        const frontMatter = config.eleventy ? (0, dedent_1.default) `
+                ---
+                permalink: /wiki/${urlPath}
+                ---
+            ` : '';
+        // Create TOC
+        if (!metadata.notoc && (metadata.toc || (((_a = outText.match(/<h\d[^>]*>/g)) === null || _a === void 0 ? void 0 : _a.length) || 0) > 3)) {
+            let toc = '';
+            let headings = Array.from(parsedContent.match(/<h\d auto[^>]*>.+?<\/h\d>/gs) || []);
+            headings.forEach(match => {
+                var _a;
+                const headingInner = match.replace(/\s*<\/?h\d[^>]*>\s*/g, '');
+                const text = headingInner.replace(/<.+?>/g, ''); // remove tags from inner
+                const lvl = +(((_a = match.match(/\d/g)) === null || _a === void 0 ? void 0 : _a[0]) || -1);
+                toc += `${`<ol>`.repeat(lvl - 1)} <li> <a href="#${encodeURI(text.replace(/ /g, '_'))}">${text}</a> </li> ${`</ol>`.repeat(lvl - 1)}`;
+            });
+            toc = toc.replace(/<\/ol>\s*<ol>/g, '');
+            const tocElem = (0, dedent_1.default) `
+                <div id="page_toc">
+                    <span id="page_toc_heading">
+                        <strong>Contents</strong>
+                        [<a href="javascript:void(0)" onclick="
+                            document.getElementById('page_toc_contents').setAttribute('style', this.innerText === 'hide' ? 'display: none;' : '');
+                            this.innerText = this.innerText === 'hide' ? 'show' : 'hide';
+                        ">hide</a>]
+                    </span>
+                    <ol id="page_toc_contents">${toc}</ol>
+                </div>
+            `;
+            // Set TOC on page
+            if (outText.includes('<toc></toc>')) {
+                // put TOC where explicitly declared
+                outText = outText.replace('<toc></toc>', tocElem);
+            }
+            else {
+                // put TOC above first auto heading
+                outText = outText.replace(/<h[1-6] auto/, tocElem + '$&');
+            }
+        }
+        // Create plaintext of HTML for use as description/metadata property.
+        const plaintextData = parsedContent.replace(/<.+?>/gs, '');
+        // Create HTML
+        const folderUpCount = file.split(/[\/\\]/).length - dir.split(/[\/\\]/).length; // number of folders to go up by to get to root
+        const html = (0, dedent_1.default) `
+            <html>
+                <head>
+                    <meta charset="utf-8">
+                    <meta name="viewport" content="initial-scale=1.0, width=device-width">
+                    <meta name="description" content="${plaintextData.substring(0, 256)}...">
+                    <title>${displayTitle}</title>
+                    <link id="default-styles" rel="stylesheet" href="${'../'.repeat(folderUpCount)}./wiki.css">
+                </head>
+                <body>
+                    <header>
+                        <h1 id="page-title">${displayTitle}</h1>
+                    </header>
+                    <main>
+                        <p>\n${outText}
+                        </p>
+                    </main>
+                    <footer>
+                        <p id="credit_wikity">Created using <a href="https://github.com/Nixinova/Wikity">Wikity</a></p>
+                    </footer>
+                </body>
+            </html>
+        `;
+        // Write to file
+        fs_1.default.mkdirSync(path_1.default.dirname(outFilePath), { recursive: true });
+        const formattedHtml = html.replace(/\n[\n\s]+/g, '\n');
+        fs_1.default.writeFileSync(outFilePath, frontMatter + '\n' + formattedHtml, 'utf8');
+        // Move images
+        (0, glob_1.default)(imagesFolder + '/*', {}, (err, files) => {
+            if (err) {
+                console.warn(err);
+            }
+            fs_1.default.mkdirSync(outputImagesFolder, { recursive: true });
+            for (const file of files) {
+                fs_1.default.copyFileSync(file, path_1.default.join(outputImagesFolder, path_1.default.basename(file)));
+            }
+            ;
+        });
+        // Create site styles
+        if (!stylesCreated) {
+            stylesCreated = true;
+            let styles = '';
+            if (config.defaultStyles !== false) {
+                styles += wiki_css_1.default;
+            }
+            if (config.customStyles) {
+                styles += config.customStyles;
+            }
+            const cssOutput = config.eleventy ? ['---', 'permalink: /wiki.css', '---', styles].join('\n') : styles;
+            const cssOutFilename = config.eleventy ? 'wiki.css.njk' : 'wiki.css';
+            fs_1.default.writeFileSync(path_1.default.join(outputFolder, cssOutFilename), cssOutput);
+        }
+    });
+}

package/dist/src/index.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+import { compile, eleventyCompile } from './compile';
+import { rawParse } from './parse';
+declare const _default: {
+    /** Parse wikitext from a string */
+    parse: typeof rawParse;
+    /** Compile a folder of wikitext files */
+    compile: typeof compile;
+    /** Compile a folder of wikitext files for output in Eleventy @deprecated */
+    eleventyPlugin: typeof eleventyCompile;
+};
+export = _default;

package/dist/src/index.js ADDED Viewed

@@ -0,0 +1,11 @@
+"use strict";
+const compile_1 = require("./compile");
+const parse_1 = require("./parse");
+module.exports = {
+    /** Parse wikitext from a string */
+    parse: parse_1.rawParse,
+    /** Compile a folder of wikitext files */
+    compile: compile_1.compile,
+    /** Compile a folder of wikitext files for output in Eleventy @deprecated */
+    eleventyPlugin: compile_1.eleventyCompile,
+};

package/dist/src/parse.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import { Config, Result } from './common';
+export declare function rawParse(data: string, config?: Config): string;
+export declare function parse(data: string, config?: Config): Result;

package/dist/src/parse.js ADDED Viewed

@@ -0,0 +1,416 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rawParse = rawParse;
+exports.parse = parse;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const dateformat_1 = __importDefault(require("dateformat"));
+const common_1 = require("./common");
+const r = String.raw;
+const MAX_RECURSION = 20;
+const arg = r `\s*([^|}]+?)\s*`;
+function toLinkText(link) {
+    const cleanedLink = encodeURI(link.trim().replace(/ /g, '_'));
+    return cleanedLink[0].toUpperCase() + cleanedLink.slice(1);
+}
+function toFileText(link) {
+    const cleanedLink = link.trim().replace(/ /g, '_');
+    return cleanedLink[0].toUpperCase() + cleanedLink.slice(1);
+}
+function parseDimensions(dimStr) {
+    const regex = /(\d*)(?:x(\d*))?px/;
+    const match = dimStr.match(regex);
+    if (!match)
+        return { width: 'auto', height: 'auto' };
+    const [, width, height] = match;
+    return {
+        width: width || 'auto',
+        height: height || 'auto',
+    };
+}
+const escaper = (text, n = 0) => `%${text}#${n}`;
+function rawParse(data, config = {}) {
+    return parse(data, config).data;
+}
+function parse(data, config = {}) {
+    var _a, _b, _c;
+    const KEY = Math.random().toString().slice(2); // key used to allow certain disallowed HTML elements
+    const templatesFolder = (_a = config.templatesFolder) !== null && _a !== void 0 ? _a : 'templates';
+    const imagesFolder = (_b = config.imagesFolder) !== null && _b !== void 0 ? _b : 'images';
+    const outputFolder = (_c = config.outputFolder) !== null && _c !== void 0 ? _c : 'wikity-out';
+    const vars = {};
+    const metadata = {};
+    const nowikis = [];
+    const refs = [];
+    let nowikiCount = 0;
+    let rawExtLinkCount = 0;
+    let outText = data;
+    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) => (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 ) (?! \s* key.{0,10}${KEY}) )`), '&lt;')
+            .replace((0, common_1.RegExpBuilder)(r `(?<= <[^>]+ ) (\bon(\w+))`), 'data-$2')
+            // Comments: <!-- -->
+            .replace(/<!--[^]+?-->/g, '')
+            // Lines: ----
+            .replace(/^-{4,}/gm, '<hr>')
+            // Images: [[File:Image.png|options|caption]]
+            .replace((0, common_1.RegExpBuilder)(r `\[\[ (?:File|Image): (.*?) (\|.+?)? \]\]`), (_, file, params = '') => {
+            var _a;
+            if (params.includes('{{'))
+                return _;
+            if (params.includes('[['))
+                return _;
+            if (!file)
+                return '';
+            const path = path_1.default.join(imagesFolder, file.trim().replace(/ /g, '_'));
+            let caption = '';
+            let imageData = {};
+            let imageArgs = params.split('|').map((arg) => arg.replace(/"/g, '&quot;'));
+            for (const param of imageArgs) {
+                if (['left', 'right', 'center', 'none'].includes(param)) {
+                    imageData.float = param;
+                }
+                if (['baseline', 'sub', 'super', 'top', 'text-bottom', 'middle', 'bottom', 'text-bottom'].includes(param)) {
+                    imageData.align = param;
+                }
+                else if (['border', 'frameless', 'frame', 'framed', 'thumb', 'thumbnail'].includes(param)) {
+                    imageData.type = { framed: 'frame', thumbnail: 'thumb' }[param] || param;
+                    if (imageData.type === 'thumb') {
+                        imageData.hasCaption = true;
+                        (_a = imageData.float) !== null && _a !== void 0 ? _a : (imageData.float = 'right');
+                    }
+                }
+                else if (param.endsWith('px')) {
+                    const { width, height } = parseDimensions(param);
+                    imageData.width = width;
+                    imageData.height = height;
+                }
+                else if (param.startsWith('upright=')) {
+                    imageData.width = +param.replace('upright=', '') * 300;
+                }
+                else if (param.startsWith('link=')) {
+                    imageData.link = param.replace('link=', '');
+                }
+                else if (param.startsWith('alt=')) {
+                    imageData.alt = param.replace('alt=', '');
+                }
+                else if (param.startsWith('style=')) {
+                    imageData.style = param.replace('style=', '');
+                }
+                else if (param.startsWith('class=')) {
+                    imageData.class = param.replace('class=', '');
+                }
+                else {
+                    caption = param;
+                }
+            }
+            let content = `
+                    <figure
+                        class="
+                            ${imageData.class || ''}
+                            image-container
+                            image-${imageData.type || 'default'}
+                        "
+                        style="
+                            margin: 8px;
+                            float: ${imageData.float || 'none'};
+                            clear: ${imageData.float || 'none'};
+                            vertical-align: ${imageData.align || 'unset'};
+                            background: #fff;
+                            ${imageData.style || ''}
+                        "
+                    >
+                        <img
+                            src="${path_1.default.basename(imagesFolder)}/${path_1.default.relative(imagesFolder, path)}"
+                            alt="${imageData.alt || file}"
+                            width="${imageData.width || 300}"
+                            height="${imageData.height || ''}"
+                        >
+                        ${imageData.hasCaption ? `<figcaption>${caption}</figcaption>` : ''}
+                    </figure>
+                `;
+            const imageLink = imageData.link;
+            if (imageLink) {
+                content = `<a href="${toLinkText(imageLink)}" title="${imageLink}">${content}</a>`;
+            }
+            return content;
+        })
+            // Internal links
+            // [[Page]]
+            .replace((0, common_1.RegExpBuilder)(r `\[\[ ([^\]|]+?) \]\]`), (_, link) => {
+            if (_.includes('{{'))
+                return _;
+            if (/(?:File|Image):/.test(link))
+                return _;
+            const content = `<a class="internal-link" title="${link}" href="./${toLinkText(link)}">${link}</a>`;
+            return content;
+        })
+            // [[Page|Text]]
+            .replace((0, common_1.RegExpBuilder)(r `\[\[ ([^\]|]+?) \| ([^\]]+?) \]\]`), (_, link, text) => {
+            if (link.includes('{{'))
+                return _;
+            if (/(?:File|Image):/.test(link))
+                return _;
+            const content = `<a class="internal-link" title="${link}" href="./${toLinkText(link)}">${text}</a>`;
+            return content;
+        })
+            .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) => {
+            if (_.includes('{{'))
+                return _;
+            const content = `<a class="external-link" href="${href}">${txt || '[' + (++rawExtLinkCount) + ']'}</a>`;
+            return content;
+        })
+            // Magic words: {{!}}, {{reflist}}, etc
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* ! \s* }}`), escaper('VERT'))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* !! \s* }}`), escaper('VERT').repeat(2))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* = \s* }}`), escaper('EQUALS'))
+            .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>`))
+            // 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))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? lc: ${arg} }}`), (_, m) => m.toLowerCase())
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? uc: ${arg} }}`), (_, m) => m.toUpperCase())
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? lcfirst: ${arg} }}`), (_, m) => m[0].toLowerCase() + m.substr(1))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? ucfirst: ${arg} }}`), (_, m) => m[0].toUpperCase() + m.substr(1))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? len: ${arg} }}`), (_, m) => m.length)
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? pos: ${arg} \|${arg} (?: \s*\|${arg} )? }}`), (_, find, str, n = 0) => find.substr(n).indexOf(str))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? sub: ${arg} \|${arg} (?:\|${arg})? }}`), (_, str, from, len) => str.substr(+from - 1, +len))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? padleft: ${arg} \|${arg} \|${arg} }}`), (_, str, n, char) => str.padStart(+n, char))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? padright: ${arg} \|${arg} \|${arg} }}`), (_, str, n, char) => str.padEnd(+n, char))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? replace: ${arg} \|${arg} \|${arg} }}`), (_, str, find, rep) => str.split(find).join(rep))
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? explode: ${arg} \|${arg} \|${arg} }}`), (_, str, delim, pos) => str.split(delim)[+pos])
+            // Magic functions: {{#ev:youtube}}, etc
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* #? ev: \s* (\w+) \s* \| \s* ( [^{}]+ ) \s* }} ( ?!} )`), (_, platform, args) => {
+            var _a;
+            // See mediawiki.org/wiki/Extension:EmbedVideo_(fork) for docs
+            const params = args.split('|');
+            for (let i = 0; i < 10; i++)
+                (_a = params[i]) !== null && _a !== void 0 ? _a : (params[i] = ''); // fill up with empty strings
+            const [id, dimensions, alignment, description, container, urlargs, autoresize] = params;
+            const { width, height } = parseDimensions(dimensions);
+            const source = {
+                // Add platforms
+                'youtube': `//www.youtube.com/embed/${id}`,
+                'vimeo': `//player.vimeo.com/video/${id}`,
+            }[platform];
+            if (!source)
+                return `<code>Failed to load video ${id} from ${platform}.</code>`;
+            return `
+                    <iframe key="${KEY}"
+                        src="${source}"
+                        width="${width}"
+                        height="${height}"
+                        frameborder="0"
+                        allowfullscreen="true"
+                        loading="lazy"
+                        title="${description !== null && description !== void 0 ? description : 'Play video'}"
+                        ${alignment ? `style="float: ${alignment};"` : ''}
+                    >
+                    </iframe>
+                    ${description ? `<figcaption>${description}</figcaption>` : ''}
+                `;
+        })
+            // Parser functions: {{#if:}}, {{#switch:}}, etc
+            .replace((0, common_1.RegExpBuilder)(r `{{ \s* (#\w+) \s* : \s* ( [^{}]+ ) \s* }} ( ?!} )`), (_, name, content) => {
+            if (content.includes('{{'))
+                return _;
+            const args = content.trim().split(/\s*\|\s*/);
+            switch (name) {
+                case '#if':
+                    return (args[0] ? args[1] : args[2]) || '';
+                case '#ifeq':
+                    return (args[0] === args[1] ? args[2] : args[3]) || '';
+                case '#vardefine':
+                    vars[args[0]] = args[1] || '';
+                    return '';
+                case '#var':
+                    if ((0, common_1.RegExpBuilder)(r `{{ \s* #vardefine \s* : \s* ${args[0]}`).test(outText))
+                        return _; // wait until var is set
+                    return vars[args[0]] || args[1] || '';
+                case '#switch':
+                    return args.slice(1)
+                        .map(arg => arg.split(/\s*=\s*/))
+                        .filter(duo => args[0] === duo[0].replace('#default', args[0]))[0][1];
+                case '#time':
+                case '#date':
+                case '#datetime':
+                    // make sure the characters are not inside a string
+                    let parsedMatch = args[0].replace(/".+?"/g, '').replace(/'.+?'/g, '');
+                    if (/[abcefgijkqruvx]/i.test(parsedMatch)) {
+                        const errMsg = `Wikity does not use Wikipedia's #time function syntax. Use repetition-based formatting (e.g. yyyy-mm-dd) instead.`;
+                        console.warn(`<Wikity> [WARN] ${errMsg}`);
+                    }
+                    try {
+                        return (0, dateformat_1.default)(args[1] ? new Date(args[1]) : new Date(), args[0]);
+                    }
+                    catch {
+                        return args[1] || args[0];
+                    }
+            }
+        })
+            // Templates: {{template}}
+            .replace((0, common_1.RegExpBuilder)(r `(?<!{) {{ \s* ([^#{}|]+?) \s* (\|[^{}]+)? }} (?!})`), (_, title, params = '') => {
+            if (params.includes('{{'))
+                return _;
+            const templateFile = toFileText(title);
+            const page = path_1.default.join(templatesFolder, templateFile);
+            let content = '';
+            // Try retrieve template content
+            try {
+                content = fs_1.default.readFileSync(page + '.wiki', { encoding: 'utf8' });
+            }
+            catch {
+                // Return redlink if template doesn't exist
+                const relPage = path_1.default.basename(templatesFolder) + '/' + path_1.default.relative(templatesFolder, page);
+                return `<a class="internal-link redlink" title="${title}" href="${relPage}">${title}</a>`;
+            }
+            // Remove non-template sections
+            content = content.trim()
+                .replace(/<noinclude>.*?<\/noinclude>/gs, '')
+                .replace(/.*<(includeonly|onlyinclude)>|<\/(includeonly|onlyinclude)>.*/gs, '');
+            // Substitute arguments
+            const argMatch = (arg) => (0, common_1.RegExpBuilder)(r `{{{ \s* ${arg} (?:\|([^}]*))? \s* }}}`);
+            const args = params.split('|');
+            // parse provided key=value template arguments
+            for (let i = 1; i < args.length; i++) {
+                const data = args[i];
+                const parts = data.split('=');
+                const isNamed = parts.length > 1;
+                const arg = isNamed ? parts[0] : i.toString();
+                const val = isNamed ? parts.slice(1).join('=') : data;
+                content = content.replace(argMatch(arg), (_, defaultVal) => (val || defaultVal || '').trim());
+            }
+            return content;
+        })
+            // Unparsed arguments
+            .replace((0, common_1.RegExpBuilder)(r `{{{ \s* [^{}|]+? (?:\|([^}]*))? \s* }}}`), (_, defaultVal) => {
+            return defaultVal !== null && defaultVal !== void 0 ? defaultVal : '';
+        })
+            // Markup: '''bold''' and '''italic'''
+            .replace((0, common_1.RegExpBuilder)(r `''' ([^']+?) '''`), '<b>$1</b>')
+            .replace((0, common_1.RegExpBuilder)(r `''  ([^']+?)  ''`), '<i>$1</i>')
+            // Headings: ==heading==
+            .replace((0, common_1.RegExpBuilder)(r `^ (=+) \s* (.+?) \s* \1 \s* $`), (_, lvl, txt) => {
+            const linkForm = encodeURI(txt.replace(/ /g, '_').replace(/<.+?>/g, ''));
+            return `<h${lvl.length} auto id="${linkForm}">${txt}</h${lvl.length}>`;
+        })
+            // Bulleted list: *item
+            .replace((0, common_1.RegExpBuilder)(r `^ (\*+) (.+?) $`), (_, lvl, content) => {
+            if (content.includes('{{'))
+                return _;
+            const depth = lvl.length;
+            return `${'<ul>'.repeat(depth)}<li>${content}</li>${'</ul>'.repeat(depth)}`;
+        })
+            .replace((0, common_1.RegExpBuilder)(r `</ul> (\s*?) <ul>`), '$1')
+            // Numbered list: #item
+            .replace((0, common_1.RegExpBuilder)(r `^ (#+) (.+?) $`), (_, lvl, content) => {
+            if (content.includes('{{'))
+                return _;
+            const depth = lvl.length;
+            return `${'<ol>'.repeat(depth)}<li>${content}</li>${'</ol>'.repeat(depth)}`;
+        })
+            .replace((0, common_1.RegExpBuilder)(r `</ol> (\s*?) <ol>`), '$1')
+            // Definition list: ;head, :item
+            .replace((0, common_1.RegExpBuilder)(r `^ ; (.+?) : (.+?) $`), `<dl><dt>$1</td><dd>$2</dd></dl>`)
+            .replace((0, common_1.RegExpBuilder)(r `^ (:+) (.+?) $`), (_, lvl, content) => {
+            if (content.includes('{{'))
+                return _;
+            const depth = lvl.length;
+            return `${'<dl>'.repeat(depth)}<dd>${content}</dd>${'</dl>'.repeat(depth)}`;
+        })
+            .replace((0, common_1.RegExpBuilder)(r `^ ; (.+) $`), '<dl><dt>$1</dt></dl>')
+            .replace((0, common_1.RegExpBuilder)(r `</dl> (\s*?) <dl>`), '$1')
+            // Tables: {|, |+, !, |-, |, |}
+            .replace(/\{\|.+\|\}/gs, (tableInner) => {
+            if (tableInner.includes('{{'))
+                return tableInner;
+            return tableInner
+                // {| data (open table)
+                .replace((0, common_1.RegExpBuilder)(r `^ \{\| (.*?) $`), (_, attrs) => `<table ${attrs}><tr>`)
+                // |+ data
+                .replace((0, common_1.RegExpBuilder)(r `^ \|\+ (.*?) $`), (_, content) => `<caption>${content}</caption>`)
+                // |- (new row)
+                .replace((0, common_1.RegExpBuilder)(r `^ \|- (.*?) $`), (_, attrs) => `</tr><tr ${attrs}>`)
+                // |} (close)
+                .replace((0, common_1.RegExpBuilder)(r `^ \|\}`), `</tr></table>`)
+                // content: !head, !data|head, |text, |data|text, !!head, ||data
+                .replace((0, common_1.RegExpBuilder)(r `( ^! | ^\| | !! | \|\| ) (?: ( [^|\n]+? ) \|)? ( [^|\n]*? ) (?= $ | !! | \|\| )`), (_, type, data, content) => {
+                const elem = /!/.test(type) ? 'th' : 'td';
+                return `<${elem} ${data !== null && data !== void 0 ? data : ''}>${content}</${elem}>`;
+            });
+        })
+            // References: <ref></ref>
+            .replace((0, common_1.RegExpBuilder)(r `< ref \s* (?: name \s* = \s* ["']? ([^>'"]+) ["']? [^>]* )?> (.+?) </ ref >`), (_, refname, text) => {
+            if (_.includes('{{'))
+                return _;
+            const refData = { ref: text, id: refs.length + 1, name: refname, i: 0 };
+            refs.push(refData);
+            return `<sup class="refnote"><a id="cite-${refData.id}" class="ref" href="#ref-${refData.id}">[${refData.id}]</a></sup>`;
+        })
+            .replace((0, common_1.RegExpBuilder)(r `< ref \s* name \s* = \s* ["']? ( [^>"']+ ) ["']? \s* (?: /> | > .*? </ref> )`), (_, refname) => {
+            const ref = refs.find(ref => ref.name === refname);
+            if (!ref)
+                return _;
+            ref.i++;
+            const citeId = `cite-${ref.id}${ref.i > 0 ? `_${ref.i}` : ''}`;
+            return `<sup class="refnote"><a id="${citeId}" class="ref" href="#ref-${ref.id}">[${ref.id}]</a></sup>`;
+        })
+            // Nonstandard: ``code`` and ```code blocks```
+            .replace((0, common_1.RegExpBuilder)(r ` \`\`\` ([^\`]+?) \`\`\` `), '<pre>$1</pre>')
+            .replace((0, common_1.RegExpBuilder)(r ` \`\` ([^\`]+?) \`\` `), '<code>$1</code>')
+            // Spacing
+            .replace(/(\r?\n){2}/g, '\n</p><p>\n');
+    }
+    // Final (one-time) substitutions
+    for (let i = 0; i < nowikis.length; i++) {
+        outText = outText
+            // Restore nowiki contents
+            .replace(escaper('NOWIKI', i), nowikis[i]);
+    }
+    outText = outText
+        // References: <references />
+        .replace((0, common_1.RegExpBuilder)(r `<references \s* /?>`), () => {
+        const references = refs.map((refdata) => {
+            let multiRefContent = '';
+            if (refdata.i > 0) {
+                for (let i = 0; i <= refdata.i; i++) {
+                    multiRefContent += `<sup><a href="#cite-${refdata.id}${i > 0 ? `_${i}` : ''}">${i + 1}</a></sup>&nbsp;`;
+                }
+            }
+            const refline = `
+                    <li id="ref-${refdata.id}">
+                        ${refdata.i > 0 ? '&uarr;' : `<a href="#cite-${refdata.id}">&uarr;</a>`}
+                        ${multiRefContent}
+                        ${refdata.ref}
+                    </li>
+                `;
+            return refline;
+        }).join('\n');
+        return `<ol>${references}</ol>`;
+    })
+        // Magic word functions
+        .replaceAll(escaper('VERT'), '|')
+        .replaceAll(escaper('EQUALS'), '=');
+    // Escape all {{ to avoid crashes
+    outText = outText
+        .replaceAll('{{', '&#123;&#123;');
+    const result = { data: outText, metadata: metadata };
+    return result;
+}

package/dist/src/wiki.css.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ declare const _default: string;
2	+ export default _default;

package/dist/src/wiki.css.js ADDED Viewed

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = String.raw `
+body {font-family: sans-serif; margin: auto; max-width: 1000px; background: #eee;}
+main {margin: 3em -1em; background: #fff; padding: 1em;}
+h1, h2 {margin-bottom: 0.6em; font-weight: normal; border-bottom: 1px solid #a2a9b1;}
+ul, ol {margin: 0.3em 0 0 1.6em; padding: 0;}
+dt {font-weight: bold;}
+dd, dl dl {margin-block: 0; margin-inline-start: 30px;}
+figure {margin: 1em; width: 300px;}
+.image-thumb, .image-frame {padding: 6px; border: 1px solid gray;}
+.image-default {margin: 0;}
+figcaption {padding-top: 6px;}
+table.wikitable {border-collapse: collapse;}
+table.wikitable, table.wikitable th, table.wikitable td {border: 1px solid gray; padding: 6px;}
+table.wikitable th {background-color: #eaecf0; text-align: center;}
+a:not(:hover) {text-decoration: none;}
+a.internal-link {color: #04a;}
+a.internal-link:visited {color: #26d;}
+a.external-link {color: #36b;}
+a.external-link:visited {color: #58d;}
+a.external-link::after {content: '\1f855';}
+a.redlink {color: #d33;}
+a.redlink:visited {color: #b44;}
+#page_toc {border: 1px solid #aab; padding: 8px; width: fit-content; background-color: #f8f8f8; font-size: 95%;}
+#page_toc_heading {display: block; text-align: center;}
+#page_toc ol {margin: 0 0 0 1.3em;}
+#infobox {float: right; clear: right; margin: 0 0 1em 1em; width: 300px; padding: 2px; border: 1px solid #CCC; overflow: auto; font-size: 90%;}
+#infobox tr:first-child :first-child {padding: 10px; text-align: center; font-weight: bold; font-size: 120%;}
+#infobox th {padding-left: 10px; text-align: left;}
+`;

package/license.md CHANGED Viewed

@@ -1,6 +1,6 @@
 # ISC License
-Copyright &copy; 2021&ndash;2024 Nixinova
+Copyright &copy; 2021&ndash;2026 Nixinova
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

package/package.json CHANGED Viewed

@@ -1,9 +1,10 @@
 {
   "name": "wikity",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "Compile wikitext to HTML! Supporst use of wikitext as a templating language.",
   "main": "dist/index.js",
   "scripts": {
+    "compile": "tsc",
     "test": "tsc && cd test && eleventy"
   },
   "bin": {
@@ -39,7 +40,7 @@
   "license": "ISC",
   "dependencies": {
     "dateformat": "^4.6.3",
-    "dedent": "^1.5.3",
+    "dedent": "^1.7.2",
     "escape-html": "^1.0.3",
     "glob": "^8.1.0"
   },
@@ -48,7 +49,7 @@
     "@types/dedent": "^0.7.2",
     "@types/escape-html": "^1.0.4",
     "@types/glob": "^8.1.0",
-    "@types/node": "ts5.0",
+    "@types/node": "^12.20.55",
     "typescript": "~5.0.4 <5.1"
   }
 }