@kobalab/liulian 1.0.2 → 1.1.2

package/ChangeLog.md

@@ -1,3 +1,17 @@
+### v1.1.2 / 2022-06-29
+
+ - 脆弱性警告に対処(multer 1.4.2 → 1.4.5-lts.1)
+
+### v1.1.1 / 2022-04-21
+
+ - contents モジュールに目次の範囲と表示方法を変更する機能を追加
+ - nav モジュールが参照する目次ページでコメントアウトが使えるよう修正
+ - nav モジュールにパラメータが指定されていない場合に異常終了するバグを修正
+
+## v1.1.0 / 2022-04-15
+
+ - #7 nav モジュール(ナビゲーション用のリンクを生成する)を追加
+
 ### v1.0.2 / 2022-04-11
 
  - iPhone で form がリサイズしないよう修正

package/README.md

@@ -33,6 +33,7 @@ $ liulian ~/Documents/LiuLian
  - [コンテンツ作成](https://kobalab.net/liulian/man/contents)
  - [LiuLian記法](https://kobalab.net/liulian/man/text-liulian)
  - [モジュール](https://kobalab.net/liulian/man/module)
+ - [外部モジュール](https://kobalab.net/liulian/man/modules/)
  - [README と index](https://kobalab.net/liulian/man/readme&index)
  - [HEAD と TAIL](https://kobalab.net/liulian/man/head&tail)
  - [リバースプロキシを使う](https://kobalab.net/liulian/man/proxy-setting)

package/css/liulian.css

@@ -1,14 +1,14 @@
 @charset "UTF-8";
 
 html {
-    margin: 0 10px 10px;
+    margin: 0 10px;
 }
 body {
     font-family: "Century Gothic", sans-serif;
     font-size: 14px;
     color: #333;
     -webkit-text-size-adjust: 100%;
-    margin: 0 auto;
+    margin: 0 auto 10px;
     overflow-wrap: break-word;
 }
 
@@ -55,9 +55,11 @@ h4 {
 }
 h5 {
     font-size: 110%;
+    margin: 1em auto;
 }
 h6 {
     font-size: 100%;
+    margin: 1em auto;
 }
 
 @media screen and (max-width: 480px) {
@@ -343,6 +345,68 @@ input[type="submit"] {
     color: red;
 }
 
+.l-nav {
+    margin: 1.5em auto 0.5em;
+}
+.l-nav a {
+    text-decoration: none;
+}
+.l-nav::after {
+    display: block;
+    content: '';
+    clear: both;
+}
+.l-nav-prev {
+    text-align: left;
+    float: left;
+    width: 35%;
+}
+.l-nav-prev::before {
+    content: '≪ ';
+}
+.l-nav-next {
+    text-align: right;
+    float: right;
+    width: 35%;
+}
+.l-nav-next::after {
+    content: ' ≫';
+}
+.l-nav-top {
+    text-align: center;
+    margin: 0 35%;
+}
+@media screen and (max-width: 480px) {
+    .l-nav-prev {
+        text-align: left;
+        float: none;
+        width: auto;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+    .l-nav-next {
+        text-align: left;
+        float: none;
+        width: auto;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+    .l-nav-top {
+        margin: auto;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+    .l-nav-next::before {
+        content: '≫ ';
+    }
+    .l-nav-next::after {
+        content: none;
+    }
+}
+
 .footnotes {
     font-size: 90%;
 }

package/lib/module/core.js

@@ -5,6 +5,23 @@
 
 const { cdata, cref, fixpath } = require('../util/html-escape');
 
+function stripComment(text) {
+    let rv = '', comment;
+    for (let line of text.replace(/\r?\n$/,'').split(/\r?\n/)) {
+        if (comment) {
+            if (line == '*/') comment = false;
+            continue;
+        }
+        if (line.match(/^\/\//)) continue;
+        if (line.match(/^\/\*/)) {
+            comment = true;
+            continue;
+        }
+        rv += line + '\n';
+    }
+    return rv;
+}
+
 module.exports = class Core {
 
     constructor(parser) {
@@ -12,8 +29,9 @@ module.exports = class Core {
         this._r      = parser._r;
         this._req    = parser._r._req;
         this._inline = ['img','color','size','br','clear','class','lang'];
-        this._block  = ['title','contents','footnote','include','img','clear',
-                        'class','style','icon','lang','redirect','script'];
+        this._block  = ['title','contents','nav','footnote','include','img',
+                        'clear','class','style','icon','lang','redirect',
+                        'script'];
         this._np     = ['style','script'];
     }
 
@@ -24,19 +42,84 @@ module.exports = class Core {
         return value;
     }
 
-    async contents(type, param) {
+    async contents(type, param = '') {
+        let [ s, e, c ] = param.split(/,\s*/);
+        s = s || 1;
+        let style;
+        if (c && e) {
+            c = c.replace(/\\/g,'\\\\');
+            style = '.l-contents' + ' li'.repeat(e-s+1)
+                        + ' { display: inline-block; }\n'
+                  + '.l-contents' + ' li'.repeat(e-s+1) + ' + li:before'
+                        + ` { content: ' ${c} '; }\n`;
+        }
+        s = new RegExp(`^\-{${+s-1}}`);
+        e = new RegExp(`^\-{${+e+1}}`);
         const base = this._parser.get('toc').length;
         const value = await this._parser.block();
         this._parser.insertText(
-            this._parser.get('toc').slice(base).join('\n'),
+            this._parser.get('toc').slice(base)
+                                   .filter(line=>! line.match(e))
+                                   .map(line=>line.replace(s,''))
+                                   .filter(line=>line.match(/^\-/))
+                                   .join('\n'),
             true
         );
+        if (style) this._r.style(style);
         return '<div class="l-contents">\n'
              + (await this._parser.block()).replace(/\n$/,'')
              + '</div>\n\n'
              + value;
     }
 
+    async nav(type, param) {
+        const location = async(href)=>{
+            try {
+                let r = await this._r.openFile(this._req, href);
+                r = await r.open();
+                return r.location;
+            }
+            catch(code) { return '' }
+        };
+        if (! param) return '<div style="color:red">#nav()</div>\n\n';
+        const err = `<div style="color:red">#nav(${cdata(param)})</div>\n\n`;
+        let [ url, title, top ] = param.split(/,\s*/);
+        try {
+            let r = await this._r.openFile(this._req, url);
+            r = await r.open();
+            if (r.type != 'text/x-liulian') return err;
+            let toc = stripComment(r.text).match(/\[\[.*?\]\]/g) || [];
+            let index = -1;
+            for (let i = 0; i < toc.length; i++) {
+                let loc = await location(
+                                    toc[i].replace(/^\[\[(.*)\]\]$/, '$1')
+                                          .match(/[^|]*$/)[0]);
+                if (loc == this._r.location) index = i;
+            }
+            if (index < 0) return '';
+            let html = '<div class="l-nav">\n'
+            if (index > 0) {
+                html += '<div class="l-nav-prev">'
+                      + this._parser.inline(toc[index - 1])
+                      + '</div>\n';
+            }
+            if (index < toc.length - 1) {
+                html += '<div class="l-nav-next">'
+                      + this._parser.inline(toc[index + 1])
+                      + '</div>\n';
+            }
+            if (title) {
+                html += '<div class="l-nav-top">'
+                      + this._parser.inline(`[[${title}|${top||url}]]`)
+                      + '</div>\n';
+            }
+            return html + '</div>\n\n';
+        }
+        catch(code) {
+            return err;
+        }
+    }
+
     footnote(type, param) {
         const html = this._parser.footnote();
         this._parser.nextNote();

package/lib/resource/folder.js

@@ -34,7 +34,8 @@ module.exports = class Folder extends File {
             this._files = [];
             for (let file of await fs.readdir(this._path)) {
                 try {
-                    let r = await this.openFile(this._req, file);
+                    let r = await this.openFile(this._req,
+                                                this._location + file);
                     this._files.push(r);
                 }
                 catch(err) {}

package/lib/resource/index.js

@@ -18,7 +18,7 @@ async function resource(req, file) {
     if (file) {
         if (file.match(/^\/\//)) throw 404;
         if (file.match(/^\//))
-                location = file;
+                location = decodeURIComponent(file);
         else    location = decodeURIComponent(urljoin(req.pathDir, file));
     }
     else        location = decodeURIComponent(req.path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kobalab/liulian",
-  "version": "1.0.2",
+  "version": "1.1.2",
   "description": "Node.jsで動作するWebサイト作成ツール",
   "publishConfig": {
     "access": "public"
@@ -37,7 +37,7 @@
     "markdown-it": "^12.3.2",
     "markdown-it-footnote": "^3.0.3",
     "mime": "^2.4.6",
-    "multer": "^1.4.2",
+    "multer": "^1.4.5-lts.1",
     "passport": "^0.4.1",
     "passport-local": "^1.0.0",
     "session-file-store": "^1.4.0",