@kobalab/liulian 0.8.0 → 0.9.1

package/ChangeLog.md

@@ -1,3 +1,18 @@
+### v0.9.1 / 2022-04-06
+
+ - paiga モジュールに空文字列を指定した場合に異常終了するバグを修正
+
+## v0.9.0 / 2022-04-03
+
+ - import モジュールで外部モジュールをインポートできるようにした
+ - pinyin モジュール(中国語のピンインを表示する)を追加
+ - paiga モジュール(麻雀の牌画像を表示する)を追加
+ - 脆弱性警告に対処(minimist 1.2.5 → 1.2.6)
+
+### v0.8.1 / 2022-01-24
+
+ - 脆弱性警告に対処(mocha 9.1.3 → 9.2.0)
+
 ## v0.8.0 / 2021-12-30
 
  - #4 自動バックアップの機能を追加

package/lib/module/index.js

@@ -15,16 +15,16 @@ module.exports = class Module {
         this.import('core');
     }
 
-    require(path) {
-        try        { return require(path) }
-        catch(err) { console.log(err) }
-    }
-
     import(module) {
-        if (! modules[module]) modules[module] = this.require('./' + module);
-        if (modules[module]) this._modules.push(
-                                        new modules[module](this._parser));
-        return modules[module];
+        try {
+            if (! modules[module]) modules[module] = require('./' + module);
+            this._modules.push(new modules[module](this._parser));
+            return modules[module];
+        }
+        catch(err) {
+            if (err.code) console.log(module, err.code);
+            else          console.log(err);
+        }
     }
 
     callInlineModule(str, name, param, value) {

package/lib/module/paiga.js

@@ -0,0 +1,124 @@
+/*
+ *  module/paiga
+ */
+"use strict";
+
+const imgbase = '//kobalab.github.io/paiga/';
+const img = {
+    _:  'ura.gif',
+
+    m0: 'man5red.gif',
+    m1: 'man1.gif', m2: 'man2.gif', m3: 'man3.gif',
+    m4: 'man4.gif', m5: 'man5.gif', m6: 'man6.gif',
+    m7: 'man7.gif', m8: 'man8.gif', m9: 'man9.gif',
+
+    p0: 'pin5red.gif',
+    p1: 'pin1.gif', p2: 'pin2.gif', p3: 'pin3.gif',
+    p4: 'pin4.gif', p5: 'pin5.gif', p6: 'pin6.gif',
+    p7: 'pin7.gif', p8: 'pin8.gif', p9: 'pin9.gif',
+
+    s0: 'sou5red.gif',
+    s1: 'sou1.gif', s2: 'sou2.gif', s3: 'sou3.gif',
+    s4: 'sou4.gif', s5: 'sou5.gif', s6: 'sou6.gif',
+    s7: 'sou7.gif', s8: 'sou8.gif', s9: 'sou9.gif',
+
+    z1: 'ton.gif',  z2: 'nan.gif',  z3: 'sha.gif',  z4: 'pei.gif',
+    z5: 'haku.gif', z6: 'hatu.gif', z7: 'tyun.gif',
+
+    m0_: 'yman5red.gif',
+    m1_: 'yman1.gif', m2_: 'yman2.gif', m3_: 'yman3.gif',
+    m4_: 'yman4.gif', m5_: 'yman5.gif', m6_: 'yman6.gif',
+    m7_: 'yman7.gif', m8_: 'yman8.gif', m9_: 'yman9.gif',
+
+    p0_: 'ypin5red.gif',
+    p1_: 'ypin1.gif', p2_: 'ypin2.gif', p3_: 'ypin3.gif',
+    p4_: 'ypin4.gif', p5_: 'ypin5.gif', p6_: 'ypin6.gif',
+    p7_: 'ypin7.gif', p8_: 'ypin8.gif', p9_: 'ypin9.gif',
+
+    s0_: 'ysou5red.gif',
+    s1_: 'ysou1.gif', s2_: 'ysou2.gif', s3_: 'ysou3.gif',
+    s4_: 'ysou4.gif', s5_: 'ysou5.gif', s6_: 'ysou6.gif',
+    s7_: 'ysou7.gif', s8_: 'ysou8.gif', s9_: 'ysou9.gif',
+
+    z1_: 'yton.gif',  z2_: 'ynan.gif',  z3_: 'ysha.gif',  z4_: 'ypei.gif',
+    z5_: 'yhaku.gif', z6_: 'yhatu.gif', z7_: 'ytyun.gif'
+};
+
+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)||[]) {
+
+        if (pai == ' ') {
+            html += ' ';
+        }
+        else if (pai == '_') {
+            url = imgbase + img._;
+            html += `<img src="${url}" width="${w}" height="${h}"`
+                  + ` alt="${pai}">`;
+        }
+        else if (pai.match(/^[mpsz](?:\d+[\-\=]?)+/)) {
+            let s = pai[0];
+            for (let n of pai.match(/\d[\-\=]?/g)) {
+                let d = n[1]||''; n = n[0];
+                if (d == '=' && ! v) {
+                    html += `<span style="display:inline-block;width:${h}px">`;
+                    v = 1;
+                }
+                if (d || v) {
+                    url = imgbase + img[s+n+'_'];
+                    if (d == '=') {
+                        html += `<img src="${url}" width="${h}" height="${w}"`
+                              + ` style="vertical-align:bottom;display:block"`
+                              + ` alt="${s+n+'='}">`;
+                    }
+                    else {
+                        html += `<img src="${url}" width="${h}" height="${w}"`
+                              + ` alt="${s+n+'-'}">`;
+                    }
+                }
+                else {
+                    url = imgbase + img[s+n];
+                    html += `<img src="${url}" width="${w}" height="${h}"`
+                          + ` alt="${s+n}">`;
+                }
+                if (d != '=') {
+                    if (v) html += '</span>';
+                    v = 0;
+                }
+            }
+        }
+        else {
+            html += `<span style="color:red;">${pai}</span>`;
+        }
+    }
+    if (v) html += '</span>';
+    html += '</span>';
+    return html;
+}
+
+module.exports = class Paiga {
+
+    constructor(parser) {
+        this._parser = parser;
+        this._r      = parser._r;
+        this._req    = parser._r._req;
+        this._inline = ['paiga'];
+        this._block  = [];
+        this._np     = [];
+    }
+
+    paiga(type, param, value) {
+        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 == 'S') { w = 16; h = 23 }
+        else if (param.match(/^\d+x\d+$/)) {
+            [ w, h ] = param.split(/x/);
+        }
+        return markup(value, w, h);
+    }
+}

package/lib/module/pinyin.js

@@ -0,0 +1,51 @@
+/*
+ *  module/pinyin
+ */
+"use strict";
+
+const tone_letter = {
+    a: ['ā','á','ǎ','à'],
+    e: ['ē','é','ě','è'],
+    o: ['ō','ó','ǒ','ò'],
+    i: ['ī','í','ǐ','ì'],
+    u: ['ū','ú','ǔ','ù'],
+    v: ['ǖ','ǘ','ǚ','ǜ'],
+    n: ['n̄','ń','ň','ǹ'],
+    A: ['Ā','Á','Ǎ','À'],
+    E: ['Ē','É','Ě','È'],
+    O: ['Ō','Ó','Ǒ','Ò'],
+    I: ['Ī','Í','Ǐ','Ì'],
+    U: ['Ū','Ú','Ǔ','Ù'],
+    V: ['Ǖ','Ǘ','Ǚ','Ǜ'],
+    N: ['N̄','Ń','Ň','Ǹ'],
+};
+
+function mark(str) {
+    const code = (c)=>tone_letter[c][n-1];
+    let [ , s, n ] = str.match(/^(.*?)(\d)$/);
+    if (s.match(/[aeo]/i))  return s.replace(/[aeo]/i,  code);
+    if (s.match(/[iu]$/i))  return s.replace(/[iu]$/i,  code);
+    if (s.match(/^[iuv]/i)) return s.replace(/^[iuv]/i, code);
+    else                    return s.replace(/n/i,      code);
+}
+
+module.exports = class Pinyin {
+
+    constructor(parser) {
+        this._parser = parser;
+        this._r      = parser._r;
+        this._req    = parser._r._req;
+        this._inline = ['pinyin'];
+        this._block  = ['pinyin'];
+        this._np     = [];
+    }
+
+    pinyin(type, param, value) {
+        value = value.replace(/([aeouiv][1234])([aeo])/ig, '$1-$2');
+        value = value.replace(/[iuv]?[aeo]?(?:i|u|o|n|ng)?[1234]/ig, mark);
+        value = value.replace(/v/g, 'ü').replace(/V/g, 'Ü');
+        return type == '#'
+                    ? `<div class="l-mod-pinyin">${value}</div>`
+                    : `<span class="l-mod-pinyin">${value}</span>`;
+    }
+}

package/lib/text/liulian.js

@@ -381,6 +381,7 @@ class LiuLian {
         let [ , name, param, eod ]
                 = line.match(/^#(\w+)(?:\((.*?)\))?(?:<<(\S+))?$/);
         if (name == '_') return await this.tag(line, param, eod);
+        if (name == 'import') return this.import(line, param);
 
         return await this._module.callBlockModule(line, name, param, eod);
     }
@@ -402,6 +403,11 @@ class LiuLian {
         }
     }
 
+    import(line, param) {
+        if (this._module.import(param)) return '';
+        return '<div style="color:red">' + cdata(line) + '</div>\n\n';
+    }
+
     inlineModule(str, name, param, value) {
         return this._module.callInlineModule(str, name, param, value);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kobalab/liulian",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "Node.jsで動作するWebサイト作成ツール",
   "publishConfig": {
     "access": "public"
@@ -27,7 +27,7 @@
   },
   "homepage": "https://kobalab.net/liulian/",
   "devDependencies": {
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.0",
     "nyc": "^15.1.0"
   },
   "dependencies": {