npm - @kobalab/liulian - Versions diffs - 0.9.0 → 1.0.1 - Mend

@kobalab/liulian 0.9.0 → 1.0.1

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 (13) hide show

package/ChangeLog.md CHANGED Viewed

@@ -1,3 +1,17 @@
+### v1.0.1 / 2022-04-10
+ - paiga モジュールのMサイズの指定の誤りを修正
+# v1.0.0 / 2022-04-09
+ - 正式バージョンリリース
+ - #6 Markdown記法に対応した
+ - JavaScriptを編集可能にした
+### v0.9.1 / 2022-04-06
+ - paiga モジュールに空文字列を指定した場合に異常終了するバグを修正
 ## v0.9.0 / 2022-04-03
  - import モジュールで外部モジュールをインポートできるようにした

package/css/liulian.css CHANGED Viewed

@@ -333,6 +333,13 @@ input[type="submit"] {
     color: red;
 }
+.footnotes {
+    font-size: 90%;
+}
+.footnotes li p {
+    margin: 0.2em auto;
+}
 .hljs-comment,
 .hljs-quote {
   color: #a0a1a7;

package/lib/html/folder.js CHANGED Viewed

@@ -97,7 +97,7 @@ module.exports = class Folder extends File {
         for (let file of this._r.files.sort(cmp(s))) {
             if (req.cmd != 'edit'
-                && file.name.match(/^(?:README|HEAD|TAIL)$/)) continue;
+                && file.name.match(/^(?:README|HEAD|TAIL)(?:\.md)?$/)) continue;
             let name = file.name + (file.type ? '' : '/');
             let link = encodeURIComponent(file.name) + (file.type ? '' : '/')

package/lib/html/index.js CHANGED Viewed

@@ -30,8 +30,8 @@ module.exports = class HTML {
     }
     title(title) {
-        if (title) this._.title = title;
-        else      return this._.title;
+        if (title != null) this._.title = title;
+        else               return this._.title;
         return this;
     }
@@ -68,8 +68,6 @@ module.exports = class HTML {
     _head() {
         const req = this._req;
-        if (! this._.stylesheet.length)
-                            this._.stylesheet.push({url: DEFAULT_STYLE});
         const stylesheet = this._.stylesheet.map(opt=>
             '<link rel="stylesheet" type="text/css" '
                     + `href="${cdata(fixpath(opt.url, req.baseUrl))}"`
@@ -151,7 +149,8 @@ module.exports = class HTML {
              + `</div>\n`;
     }
-    stringify(content = '') {
+    stringify(content = '', needDefaultStyle = ! this._.stylesheet.length) {
+        if (needDefaultStyle) this._.stylesheet.push({url: DEFAULT_STYLE});
         return '<!DOCTYPE html>\n'
              + `<html lang="${cdata(this.lang())}">\n`
              + this._head()

package/lib/module/paiga.js CHANGED Viewed

@@ -49,7 +49,7 @@ function markup(paistr, w, h) {
     let url, v = 0;
     let html = '<span class="l-mod-paiga" style="white-space:pre;">';
-    for (let pai of paistr.match(/[mpsz](?:\d+[\-\=]?)+|[ _]|.+/g)) {
+    for (let pai of paistr.match(/[mpsz](?:\d+[\-\=]?)+|[ _]|.+/g)||[]) {
         if (pai == ' ') {
             html += ' ';
@@ -114,7 +114,7 @@ module.exports = class Paiga {
         let w = 24, h = 34;
         if      (! param)      { w = 24; h = 34 }
         else if (param == 'L') { w = 24; h = 34 }
-        else if (param == 'M') { w = 19; h = 24 }
+        else if (param == 'M') { w = 19; h = 26 }
         else if (param == 'S') { w = 16; h = 23 }
         else if (param.match(/^\d+x\d+$/)) {
             [ w, h ] = param.split(/x/);

package/lib/resource/folder.js CHANGED Viewed

@@ -7,6 +7,7 @@ const fs = require('fs').promises;
 const { join } = require('path');
 const HTML = require('../html/folder');
 const parse = require('../text/liulian');
+const md    = require('../text/markdown');
 const File = require('./file');
@@ -39,7 +40,7 @@ module.exports = class Folder extends File {
                 catch(err) {}
             }
             if (this._req.cmd != 'edit') {
-                for (let ext of ['', '.html', '.htm']) {
+                for (let ext of ['', '.md', '.html', '.htm']) {
                     let index = this._files.find(f=>f.name == 'index' + ext);
                     if (index) return index.open();
                 }
@@ -99,11 +100,19 @@ module.exports = class Folder extends File {
             res.sendText(new HTML(this).edit());
         }
         else {
-            let readme = this._files.find(f=>f.name == 'README');
+            let readme;
+            for (let file of ['README','README.md']) {
+                readme = this._files.find(f=>f.name == file);
+                if (readme) break;
+            }
             if (readme) {
                 await readme.open();
                 readme._html = new HTML(this);
-                res.sendText(readme._html.folder(await parse(readme)));
+                res.sendText(readme._html.folder(
+                    readme.type == 'text/x-liulian'
+                        ? await parse(readme)
+                        : md.render(readme._text)
+                ));
             }
             else if (this._req.user) {
                 res.sendText(new HTML(this).folder());

package/lib/resource/index.js CHANGED Viewed

@@ -11,6 +11,7 @@ const File    = require('./file');
 const Folder  = require('./folder');
 const Text    = require('./text');
 const LiuLian = require('./liulian');
+const Markdown = require('./markdown');
 async function resource(req, file) {
     let location;
@@ -35,6 +36,12 @@ async function resource(req, file) {
         else if (! basename(path).match(/\./))
                                     return new LiuLian(req, path, stat,
                                                        location, resource);
+        else if (mime.getType(path) == 'text/markdown')
+                                    return new Markdown (req, path, stat,
+                                                         location, resource);
+        else if (mime.getType(path) == 'application/javascript')
+                                    return new Text (req, path, stat,
+                                                     location, resource);
         else if ((mime.getType(path)||'').match(/^text\//))
                                     return new Text(req, path, stat,
                                                     location, resource);

package/lib/resource/liulian.js CHANGED Viewed

@@ -18,44 +18,18 @@ module.exports = class LiuLian extends Text {
     script(script) { this._html.script(script) }
     meta(attr) { this._html.meta(attr) }
-    async _seekToParent(filename) {
-        let pathDir = this._req.pathDir;
-        while (pathDir) {
-            try {
-                const r = await this.openFile(this._req, pathDir + filename);
-                await r.open();
-                return r.text;
-            }
-            catch(e) {
-                pathDir = pathDir.replace(/[^\/]*\/$/,'');
-            }
-        }
-        return '';
-    }
     async update() {
         await super.update();
         if (this._req.param('text')) this._redirect = [303, this.name];
     }
-    async send(res) {
-        if (this._req.cmd == 'edit') {
-            res.sendText(new HTML(this).edit());
-        }
-        else if (this._req.cmd == 'log') {
-            res.sendText(new HTML(this).log());
-        }
-        else if (this._req.cmd == 'diff') {
-            res.sendText(new HTML(this).diff());
-        }
-        else {
-            this._text = (this.name != 'HEAD'
-                            ? await this._seekToParent('HEAD') + '\n' : '')
-                       + this._text                       + '\n'
-                       + (this.name != 'TAIL'
-                            ? await this._seekToParent('TAIL') : '');
-            this._html = new HTML(this);
-            res.sendText(this._html.stringify(await parse(this)));
-        }
+    async _send(res) {
+        this._text = (this.name != 'HEAD'
+                        ? await this._seekToParent('HEAD') + '\n' : '')
+                   + this._text                            + '\n'
+                   + (this.name != 'TAIL'
+                        ? await this._seekToParent('TAIL') : '');
+        this._html = new HTML(this);
+        res.sendText(this._html.stringify(await parse(this)));
     }
 }

package/lib/resource/markdown.js ADDED Viewed

@@ -0,0 +1,33 @@
+/*
+ *  resource/markdown
+ */
+"use strict";
+const { strip } = require('../util/html-escape');
+const HTML = require('../html/text');
+const Text = require('./text');
+const md   = require('../text/markdown');
+module.exports = class Markdown extends Text {
+    async update() {
+        await super.update();
+        if (this._req.param('text')) this._redirect = [303, this.name];
+    }
+    async _send(res) {
+        this._text = (this.name != 'HEAD.md'
+                        ? await this._seekToParent('HEAD.md') + '\n' : '')
+                   + this._text                               + '\n'
+                   + (this.name != 'TAIL.md'
+                        ? await this._seekToParent('TAIL.md') : '');
+        let html = md.render(this._text);
+        let title = strip((html.match(/<title>(.*?)<\/title>/i)||
+                           html.match(/<h1>(.*?)<\/h1>/i)||[])[1]);
+        let style = (html.match(/<link\s?.*?>/ig)||[])
+                        .filter(tag=>tag.match(/\srel="stylesheet"/i));
+        this._html = new HTML(this);
+        res.sendText(this._html.title(title).stringify(html, ! style.length));
+    }
+}

package/lib/resource/text.js CHANGED Viewed

@@ -13,6 +13,21 @@ module.exports = class Text extends File {
     get text() { return this._text }
     get diff() { return this._diff }
+    async _seekToParent(filename) {
+        let pathDir = this._req.pathDir;
+        while (pathDir) {
+            try {
+                const r = await this.openFile(this._req, pathDir + filename);
+                await r.open();
+                return r.text;
+            }
+            catch(e) {
+                pathDir = pathDir.replace(/[^\/]*\/$/,'');
+            }
+        }
+        return '';
+    }
     async open() {
         await super.open();
         if (this._backup && this._req.cmd == 'diff') {
@@ -57,6 +72,10 @@ module.exports = class Text extends File {
         if      (this._req.cmd == 'edit') res.sendText(new HTML(this).edit());
         else if (this._req.cmd == 'log')  res.sendText(new HTML(this).log());
         else if (this._req.cmd == 'diff') res.sendText(new HTML(this).diff());
-        else                              res.sendFile(this._path, this.type);
+        else                              this._send(res);
+    }
+    _send(res) {
+        res.sendFile(this._path, this.type);
     }
 }

package/lib/text/markdown.js ADDED Viewed

@@ -0,0 +1,25 @@
+/*
+ *  text/markdown
+ */
+"use strict";
+const hljs = require('highlight.js');
+module.exports = require('markdown-it')({
+    html: true,
+    linkify: true,
+    highlight: function(str, lang) {
+        const error = console.error; console.error = ()=>{};
+        let html = '';
+        if (lang) {
+            try {
+                html = hljs.highlight(lang, str).value;
+            }
+            catch(err) {
+                html = hljs.highlightAuto(str).value;
+            }
+        }
+        console.error = error;
+        return html;
+    }
+}).use(require('markdown-it-footnote'));

package/lib/util/html-escape.js CHANGED Viewed

@@ -15,8 +15,13 @@ function cdata(str = '') {
 const cref = replacer(cref_pt, null, cdata);
+function getAlt(img) {
+    return cref((img.match(/\salt="(.*?)"/)||[])[1]);
+}
 function strip(html = '') {
-    return html.replace(/<.*?>/g, '')
+    return html.replace(/<img\s?.*?>/g, getAlt)
+               .replace(/<.*?>/g, '')
                .replace(/&gt;/g,  '>')
                .replace(/&lt;/g,  '<')
                .replace(/&quot;/g,'"')

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@kobalab/liulian",
-  "version": "0.9.0",
+  "version": "1.0.1",
   "description": "Node.jsで動作するWebサイト作成ツール",
   "publishConfig": {
     "access": "public"
@@ -34,6 +34,8 @@
     "express": "^4.17.1",
     "express-session": "^1.17.1",
     "highlight.js": "^10.4.1",
+    "markdown-it": "^12.3.2",
+    "markdown-it-footnote": "^3.0.3",
     "mime": "^2.4.6",
     "multer": "^1.4.2",
     "passport": "^0.4.1",