nadesiko3 3.6.12 → 3.6.13

package/core/command/plugin_snako.mjs

@@ -0,0 +1,112 @@
+/**
+ * file: plugin_snako.js
+ * 簡単なファイル読み書きのプラグイン
+ */
+import fs from 'node:fs';
+import { execSync } from 'node:child_process';
+import path from 'node:path';
+export default {
+    'meta': {
+        type: 'const',
+        value: {
+            pluginName: 'plugin_snako', // プラグインの名前
+            description: '最小の機能を提供するプラグイン', // プラグインの説明
+            pluginVersion: '3.6.3', // プラグインのバージョン
+            nakoRuntime: ['cnako'], // 対象ランタイム
+            nakoVersion: '3.6.3' // 要求なでしこバージョン
+        }
+    },
+    '初期化': {
+        type: 'func',
+        josi: [],
+        pure: true,
+        fn: function (sys) {
+            sys.__getBokanPath = () => {
+                let nakofile;
+                const cmd = path.basename(process.argv[1]);
+                if (cmd.indexOf('snako') < 0) {
+                    nakofile = process.argv[1];
+                }
+                else {
+                    nakofile = process.argv[2];
+                }
+                return path.dirname(path.resolve(nakofile));
+            };
+            sys.__setSysVar('コマンドライン', process.argv);
+            sys.__setSysVar('ナデシコランタイムパス', process.argv[0]);
+            sys.__setSysVar('ナデシコランタイム', path.basename(process.argv[0]));
+            sys.__setSysVar('母艦パス', sys.__getBokanPath());
+        }
+    },
+    // @SNAKO
+    'コマンドライン': { type: 'const', value: '' },
+    'ナデシコランタイムパス': { type: 'const', value: '' },
+    'ナデシコランタイム': { type: 'const', value: '' },
+    '母艦パス': { type: 'const', value: '' },
+    '読': {
+        type: 'func',
+        josi: [['を', 'から']],
+        pure: true,
+        fn: function (f) {
+            return '' + fs.readFileSync(f);
+        }
+    },
+    '開': {
+        type: 'func',
+        josi: [['を', 'から']],
+        pure: true,
+        fn: function (f) {
+            return '' + fs.readFileSync(f);
+        }
+    },
+    '保存': {
+        type: 'func',
+        josi: [['を'], ['に', 'へ']],
+        pure: true,
+        fn: function (s, f) {
+            fs.writeFileSync(f, s, 'utf-8');
+        },
+        return_none: true
+    },
+    '起動待機': {
+        type: 'func',
+        josi: [['を']],
+        pure: true,
+        fn: function (s) {
+            const r = execSync(s);
+            return r.toString();
+        }
+    },
+    'ファイル名抽出': {
+        type: 'func',
+        josi: [['から', 'の']],
+        pure: true,
+        fn: function (s) {
+            return path.basename(s);
+        }
+    },
+    'パス抽出': {
+        type: 'func',
+        josi: [['から', 'の']],
+        pure: true,
+        fn: function (s) {
+            return path.dirname(s);
+        }
+    },
+    '絶対パス変換': {
+        type: 'func',
+        josi: [['を', 'の']],
+        pure: true,
+        fn: function (a) {
+            return path.resolve(a);
+        }
+    },
+    '相対パス展開': {
+        type: 'func',
+        josi: [['を'], ['で']],
+        pure: true,
+        fn: function (a, b) {
+            return path.resolve(path.join(a, b));
+        }
+    }
+};

package/core/command/snako.mjs

@@ -0,0 +1,114 @@
+#!/usr/bin/env node --no-warnings=ExperimentalWarning --loader ts-node/esm
+import fs from 'node:fs';
+import path from 'node:path';
+import com from '../index.mjs';
+import { argv as nodejs_argv } from 'node:process';
+import * as url from 'node:url';
+import { NakoGenOptions } from '../src/nako_gen.mjs';
+import PluginSnako from './plugin_snako.mjs';
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+/** コマンドラインオプション */
+class CommandOptions {
+    isDebug;
+    filename;
+    nodePath;
+    scriptPath;
+    evalStr;
+    flagConvert;
+    constructor() {
+        this.nodePath = '';
+        this.scriptPath = '';
+        this.filename = '';
+        this.evalStr = '';
+        this.isDebug = false;
+        this.flagConvert = false;
+    }
+}
+/** メイン処理 */
+async function main(argvOrg) {
+    // コマンドラインオプションを確認
+    const argv = [...argvOrg];
+    const opt = new CommandOptions();
+    opt.nodePath = argv.shift() || '';
+    opt.scriptPath = argv.shift() || '';
+    while (argv.length > 0) {
+        const arg = argv.shift() || '';
+        if (arg === '-d' || arg === '--debug') {
+            opt.isDebug = true;
+            continue;
+        }
+        if (arg === '-e' || arg === '--eval') {
+            opt.evalStr = argv.shift() || '';
+            continue;
+        }
+        if (arg === '-c' || arg === '--convert') {
+            opt.flagConvert = true;
+            continue;
+        }
+        if (opt.filename === '') {
+            opt.filename = arg;
+        }
+    }
+    // なでしこのコンパイラを生成
+    const nako = new com.NakoCompiler();
+    nako.addPluginObject('PluginSnako', PluginSnako);
+    // 実行前にイベントを挟みたいとき
+    nako.addListener('beforeRun', (g) => {
+        g.__varslist[0].set('ナデシコ種類', 'snako');
+    });
+    // logger を設定 --- リスナーを登録することでデバッグレベルを指定
+    const logger = nako.getLogger();
+    if (opt.isDebug) {
+        logger.addListener('trace', (data) => {
+            console.log(data.nodeConsole);
+        });
+    }
+    logger.addListener('stdout', (data) => {
+        console.log(data.noColor);
+    });
+    // -e オプションを実行したとき
+    if (opt.evalStr) {
+        await nako.runAsync(opt.evalStr, 'main.nako3');
+        return;
+    }
+    // パラメータが空だったとき
+    if (opt.filename === '') {
+        showHelp();
+        return;
+    }
+    // ソースコードをファイルから読み込む
+    const code = fs.readFileSync(opt.filename, 'utf-8');
+    // -c オプションが指定されたとき
+    if (opt.flagConvert) {
+        convert(nako, code, opt);
+    }
+    // 実行
+    await nako.runAsync(code, opt.filename);
+}
+// -c オプションを指定したとき
+function convert(nako, code, opt) {
+    // オプションを指定
+    const genOpt = new NakoGenOptions(false, ['nako_errors.mjs', 'nako_core_version.mjs', 'plugin_system.mjs'], '__self.__varslist[0].set(\'ナデシコ種類\', \'snako\')');
+    // スタンドアロンコードを生成
+    const js = nako.compileStandalone(code, opt.filename, genOpt);
+    const jsFilename = opt.filename + '.js';
+    fs.writeFileSync(jsFilename, js, { encoding: 'utf-8' });
+    // 必要なライブラリをコピー
+    const runtimeDir = path.join(path.dirname(jsFilename), 'nako3runtime');
+    const srcDir = path.join(__dirname, '..', 'src');
+    if (!fs.existsSync(runtimeDir)) {
+        fs.mkdirSync(runtimeDir);
+    }
+    for (const f of genOpt.importFiles) {
+        fs.copyFileSync(path.join(srcDir, f), path.join(runtimeDir, f));
+    }
+}
+/** 使い方を表示 */
+function showHelp() {
+    console.log('●なでしこ(簡易版) # v.' + com.version.version);
+    console.log('[使い方] node snako.mjs [--debug|-d] (filename)');
+    console.log('[使い方] node snako.mjs [--eval|-e] (source)');
+    console.log('[使い方] node snako.mjs [-c] (source) ... convert');
+}
+/** メイン処理を実行 */
+main(nodejs_argv);

package/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3core",
-  "version": "3.6.12",
+  "version": "3.6.13",
   "description": "Japanese Programming Language Nadesiko v3 core",
   "main": "index.mjs",
   "type": "module",

package/core/sample/hoge.mjs

@@ -0,0 +1,7 @@
+import core from '../index.mjs';
+const main = async () => {
+    const com = new core.NakoCompiler();
+    const g = await com.runAsync('1 + 2 * 3を表示', 'main.nako3');
+    console.log(g.log);
+};
+await main();

package/core/src/nako_gen.mjs

@@ -191,11 +191,11 @@ export class NakoGen {
     varname_set(name, jsvalue) {
         if (this.varslistSet.length === 3) {
             // グローバル
-            return `__self.__varslist[${2}].set(${JSON.stringify(name)}, ${jsvalue})`;
+            return `__self.__varslist[${2}].set(${JSON.stringify(name)}, (${jsvalue}))`;
         }
         else {
             // ローカル
-            return `__self.__vars.set(${JSON.stringify(name)}, ${jsvalue})`;
+            return `__self.__vars.set(${JSON.stringify(name)}, (${jsvalue}))`;
         }
     }
     /**
@@ -1638,9 +1638,18 @@ export class NakoGen {
         if (this.speedMode.invalidSore === 0) {
             value = this.varname_get('それ');
         }
+        // 値のプログラムを生成
         if (node.value) {
+            const ast = node.value;
+            if (ast.type === 'func' && ast.name !== undefined) {
+                const func = this.__self.getFunc(ast.name);
+                if (func && func.return_none) {
+                    throw NakoSyntaxError.fromNode(`関数『${ast.name}』は戻り値がないので結果を代入できません。`, node);
+                }
+            }
             value = this._convGen(node.value, true);
         }
+        // 戻り値の検証
         if (value == null) {
             throw NakoSyntaxError.fromNode('代入する先の変数名がありません。', node);
         }

package/core/src/nako_gen.mts

@@ -269,10 +269,10 @@ export class NakoGen {
   varname_set (name: string, jsvalue: string): string {
     if (this.varslistSet.length === 3) {
       // グローバル
-      return `__self.__varslist[${2}].set(${JSON.stringify(name)}, ${jsvalue})`
+      return `__self.__varslist[${2}].set(${JSON.stringify(name)}, (${jsvalue}))`
     } else {
       // ローカル
-      return `__self.__vars.set(${JSON.stringify(name)}, ${jsvalue})`
+      return `__self.__vars.set(${JSON.stringify(name)}, (${jsvalue}))`
     }
   }
 
@@ -1693,10 +1693,22 @@ export class NakoGen {
     // もし値が省略されていたら、変数「それ」に代入する
     let value = null
     if (this.speedMode.invalidSore === 0) { value = this.varname_get('それ') }
-    if (node.value) { value = this._convGen(node.value, true) }
+    // 値のプログラムを生成
+    if (node.value) {
+      const ast = node.value
+      if (ast.type === 'func' && ast.name !== undefined) {
+        const func = this.__self.getFunc(ast.name)
+        if (func && func.return_none) {
+          throw NakoSyntaxError.fromNode(`関数『${ast.name}』は戻り値がないので結果を代入できません。`, node)
+        }
+      }
+      value = this._convGen(node.value, true)
+    }
+    // 戻り値の検証
     if (value == null) {
       throw NakoSyntaxError.fromNode('代入する先の変数名がありません。', node)
     }
+
     // 変数名
     const name: string = (node.name as Ast).value
     const res = this.findVar(name, value)
@@ -1712,7 +1724,6 @@ export class NakoGen {
       }
       code = `${res.js_set};`
     }
-
     return ';' + this.convLineno(node, false) + code + '\n'
   }
 

package/core/test/error_message_test.mjs

@@ -207,4 +207,19 @@ describe('error_message', () => {
       assert.strictEqual(log, '')
     })
   })
+  it('戻り値のない関数を代入文の結果に使おうとする #175', async () => {
+    const compiler = new NakoCompiler()
+    const logger = compiler.getLogger()
+    logger.addListener('error', ({ level, noColor }) => {
+      const s = (noColor + '\n').split('\n')[0].replace('[エラー]', '')
+      assert.strictEqual(level, 'error')
+      assert.strictEqual(s, '[文法エラー]main.nako3(1行目): 関数『表示』は戻り値がないので結果を代入できません。')
+      return true
+    })
+    try {
+      await compiler.runAsync('A=「あ」を表示', 'main.nako3')
+    } catch (_) {
+      // pass
+    }
+  })
 })

package/core/tsconfig.json

@@ -30,14 +30,14 @@
     // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
 
     /* Modules */
-    "module": "NodeNext",                                  /* Specify what module code is generated. */
+    "module": "NodeNext",                                /* Specify what module code is generated. */
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "NodeNext",                          /* Specify how TypeScript looks up a file from a given module specifier. */
-    "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+    "moduleResolution": "NodeNext",                      /* Specify how TypeScript looks up a file from a given module specifier. */
+    "baseUrl": "./",                                     /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     "typeRoots": ["src/@types", "node_modules/@types"],  /* Specify multiple folders that act like `./node_modules/@types`. */
-    "types": ["node", "mocha"],                          /* Specify type package names to be included without being referenced in a source file. */
+    "types": ["node"],                                   /* Specify type package names to be included without being referenced in a source file. */
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     // "resolveJsonModule": true,                        /* Enable importing .json files */
     // "noResolve": true,                                /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3",
-  "version": "3.6.12",
+  "version": "3.6.13",
   "description": "Japanese Programming Language",
   "type": "module",
   "main": "src/index.mjs",
@@ -29,6 +29,7 @@
     "build:nako_version": "node src/cnako3.mjs batch/build_nako_version.nako3",
     "build:tsc": "tsc",
     "build": "npm run build:tsc && npm run build:nako_version && npm run build:tsc && npm run build:command && npm run build:esbuild && node src/cnako3.mjs batch/calc_hash.nako3",
+    "build:watch": "node bundle_esbuild.js --watch",
     "clean": "npm run build:tsc && node src/cnako3.mjs batch/clean.nako3",
     "tsc": "tsc --watch",
     "build:esbuild": "tsc && node bundle_esbuild.js",

package/release/_hash.txt

@@ -18,11 +18,21 @@ edit_main.js:
   sha256(hex): d6a8060e3d48b1a54f2c463d5279407b4c59e0a8ca823912a52b723e7184352c
   sha256(base64): 1qgGDj1IsaVPLEY9UnlAe0xZ4KjKgjkSpStyPnGENSw=
   sha512(base64): chJSrv6X4XeV+t0MehOr1mrmsz4ZTNJUA0wfSu99I0A7EvRPX9MgR3LXeOMcTHWyuLj7htmRhCch6j0zXjTYRQ==
+edit_main.js:
+  md5(hex): b21c330f008df8c5d9d2a63c206e2235
+  sha256(hex): d6a8060e3d48b1a54f2c463d5279407b4c59e0a8ca823912a52b723e7184352c
+  sha256(base64): 1qgGDj1IsaVPLEY9UnlAe0xZ4KjKgjkSpStyPnGENSw=
+  sha512(base64): chJSrv6X4XeV+t0MehOr1mrmsz4ZTNJUA0wfSu99I0A7EvRPX9MgR3LXeOMcTHWyuLj7htmRhCch6j0zXjTYRQ==
+version_main.js:
+  md5(hex): 2d14cb91d486038e934b6afd1d275259
+  sha256(hex): b2c3a51c08fdbfeaf8c79676b354f519807cfc0ce8e38237bc1df7e27370bb1b
+  sha256(base64): ssOlHAj9v+r4x5Z2s1T1GYB8/Azo44I3vB334nNwuxs=
+  sha512(base64): OWs22aZ0QaDY3L3J4Be4/hWf/0iSWXuMVY1vvl6wynYrem4fe1Sh3CIclOWdQnolRzTFXHGMnBp9FUv8NcQsQA==
 editor.js:
-  md5(hex): 02ee12ca00319afcdf21ab7d2b618ceb
-  sha256(hex): b4333db1608d7a87a2c4f733ac5fe29d98ec3ccdc89494d8575cdd0c337b0ba7
-  sha256(base64): tDM9sWCNeoeixPczrF/inZjsPM3IlJTYV1zdDDN7C6c=
-  sha512(base64): 60RfvbeW58u/tKFDLZxjYlxeMCCqE2vx+zp969gt/Ed9gvyUQnNb2o8jR5ePaW253JI+WlJy2uaC2kpAqfq59A==
+  md5(hex): b21c330f008df8c5d9d2a63c206e2235
+  sha256(hex): d6a8060e3d48b1a54f2c463d5279407b4c59e0a8ca823912a52b723e7184352c
+  sha256(base64): 1qgGDj1IsaVPLEY9UnlAe0xZ4KjKgjkSpStyPnGENSw=
+  sha512(base64): chJSrv6X4XeV+t0MehOr1mrmsz4ZTNJUA0wfSu99I0A7EvRPX9MgR3LXeOMcTHWyuLj7htmRhCch6j0zXjTYRQ==
 nako_gen_async.js:
   md5(hex): 42d5fed01039474ff197d449c27c84ad
   sha256(hex): d78d516b32b551c4a51ceef529568760783c84f6c5d90029fa9b38922d5b4430
@@ -78,21 +88,76 @@ plugin_weykturtle3d.js:
   sha256(hex): e74ba47893348954dd3ea94eee8517427c9ac70395f6984ac07241245112538d
   sha256(base64): 50ukeJM0iVTdPqlO7oUXQnyaxwOV9phKwHJBJFESU40=
   sha512(base64): ONFdombPCdgdnXs7VMUAHpe8IBvTuLzSgzmERf1jEhHo4l06wDpkpRRCk3/9a1hiXRHQ+le2LZBT7XH4VA27sQ==
+plugin_caniuse.js:
+  md5(hex): 7aa93b13b4ab775d7bc5a0fb99d4df93
+  sha256(hex): 3a47ea016531a8e78a13599d27a4303964ba878d9d10f36a3634645ffa159705
+  sha256(base64): OkfqAWUxqOeKE1mdJ6QwOWS6h42dEPNqNjRkX/oVlwU=
+  sha512(base64): V6nOBHnhxPChu+S/LfB7elCeBk985ukLmBmkCyPk4ai5VfoJZuOIttg72PbZSxWfP5eQTrlLNajsorfwNw/vcA==
+plugin_datetime.js:
+  md5(hex): 90a1fcbe222cd79351faedf1c6a62c47
+  sha256(hex): d8c7be82e986e2d223f51b1b4202d63bc322ad575460766ec7efb22ab75b3eb4
+  sha256(base64): 2Me+gumG4tIj9RsbQgLWO8MirVdUYHZux++yKrdbPrQ=
+  sha512(base64): ofb5jVaHjjTRoCAmHnbewc2fS8vr1oEkX/B3WoOCjYpDnZ3nnl3EDz6fdAS8CFFzGvuekCk2RFN5BuM9kX6FAg==
+plugin_kansuji.js:
+  md5(hex): 06fb701ed190ab224f60260858fccdfd
+  sha256(hex): a73466d59fd94e4e6fdfe54daafdff92bc7050c33488acc3f660d5534595129c
+  sha256(base64): pzRm1Z/ZTk5v3+VNqv3/krxwUMM0iKzD9mDVU0WVEpw=
+  sha512(base64): N+S8Th1yCiQy3q5jh0TFvlTOtrWNE82a4UJZ9O3ml3BGBYA141bpWlJR5c34dObTe1prbLJZ7v5WvV0vnDnr9A==
+plugin_keigo.js:
+  md5(hex): 17c9d515a107feeb621e59e635e6d92c
+  sha256(hex): d4866cde44e4da71e5f74377172ab5b85afc1295a60c081f6d7c24525f403e0d
+  sha256(base64): 1IZs3kTk2nHl90N3Fyq1uFr8EpWmDAgfbXwkUl9APg0=
+  sha512(base64): u067+CeBvMb6+oINFY9Wz77GBk4NSxS2+k35GJ3RsFFmphJliwzwmV2ceID0gZ4mbjJ0xJHQX9WIypiyI6yfdA==
+plugin_markup.js:
+  md5(hex): c67475a1be3fb260086ffb9782ce0b08
+  sha256(hex): 6f8edea132abefa955b8431707633a5f48dd40b04b76693245411e21c17e1ecb
+  sha256(base64): b47eoTKr76lVuEMXB2M6X0jdQLBLdmkyRUEeIcF+Hss=
+  sha512(base64): O5gWVMkfYr1neke9fSBDOa3BmSQDWUwGBh8VxPtHW2AEJYvaGyuER9lmPwOTP+WtMB/kc4K9DM/OvNsCWfvL7Q==
+plugin_three.js:
+  md5(hex): 5fa1fba6c48576ba6046e9302b3bcf89
+  sha256(hex): e2b2c54d9674837d51cc91d032e3aa9f2a1cc8fbc11b6be503649a1cccfe08cb
+  sha256(base64): 4rLFTZZ0g31RzJHQMuOqnyocyPvBG2vlA2SaHMz+CMs=
+  sha512(base64): 4loRkhlxZ9A9v5t3sk5VECW7T33axIVbBQgwkNdgcjk03yRqAvxut5OS4n3BBS4jnWWHOE3i0vj9qxOOp4uV3Q==
+plugin_turtle.js:
+  md5(hex): 544cfa3bd85bad6e968cf90250799f45
+  sha256(hex): 90a4a5f26ea1a362dac7fe7a272c4e167a76f749265b88961d3053f64c576209
+  sha256(base64): kKSl8m6ho2Lax/56JyxOFnp290kmW4iWHTBT9kxXYgk=
+  sha512(base64): ce8etr+HoC+UjUyXSgxJzy3+pOYhsBdt9jDzhks2H/eEPQ1gIz7M8hoeyP0223zLLZHBBzlHiL/a6mmJdoKQ+w==
+plugin_webworker.js:
+  md5(hex): ae0adac0834f5e6032708a5c7672b817
+  sha256(hex): 46a0bb24c1d8f1d0652057e9348eaca1b26a857f0ffc993e9070ae683609c045
+  sha256(base64): RqC7JMHY8dBlIFfpNI6sobJqhX8P/Jk+kHCuaDYJwEU=
+  sha512(base64): 6UHX2dgMPRY4BuIxLXaERKaA8Wg5eK2pWy+OysU0/+gt2E15M7K5Vr8+4CQt6hylWnmzmJQJfgObIr+yjW5kPw==
+plugin_weykturtle3d.js:
+  md5(hex): fb981a85ea64ff05f29fb05c99294e94
+  sha256(hex): e74ba47893348954dd3ea94eee8517427c9ac70395f6984ac07241245112538d
+  sha256(base64): 50ukeJM0iVTdPqlO7oUXQnyaxwOV9phKwHJBJFESU40=
+  sha512(base64): ONFdombPCdgdnXs7VMUAHpe8IBvTuLzSgzmERf1jEhHo4l06wDpkpRRCk3/9a1hiXRHQ+le2LZBT7XH4VA27sQ==
+wnako3.js:
+  md5(hex): c75e89be9d951df1ed05e0d7d6571175
+  sha256(hex): a351605c360072aa2d0c109666c58b9e8e82b2efacc21390909b2c0fa4f0469b
+  sha256(base64): o1FgXDYAcqotDBCWZsWLno6Csu+swhOQkJssD6TwRps=
+  sha512(base64): OynXQRRt0dv7GIW23ZlWFVfqqXpg8ZqUDpcv8kqDiNCkRTzLW41PS9aEHdOieLI7Twwu9f6r5+4MlxvE3UYqVw==
+wnako3webworker.js:
+  md5(hex): bca0766f8a4b9510fc4b87409e297880
+  sha256(hex): 9dbfbeb5f4922ab54ebedca251298c701b3c09b5ba57e6eae048ec2e2e2128ad
+  sha256(base64): nb++tfSSKrVOvtyiUSmMcBs8CbW6V+bq4EjsLi4hKK0=
+  sha512(base64): 97yLnnWQfc6SSs51PMT93W5ROTIFqO01Ox7ic2hZGlrw4dzPehJG02J99n8Iv3k6sy9m3Eg74QdACYVwIr4oSg==
 version.js:
-  md5(hex): fc7153033fef5c2ba396c83704f8d452
-  sha256(hex): 43b8963338c0b323cb966109c6dcdbd75d91fb6821bc160b304ca72ef902a456
-  sha256(base64): Q7iWMzjAsyPLlmEJxtzb112R+2ghvBYLMEynLvkCpFY=
-  sha512(base64): Xy8RMyAkohHiIXAKfISKFZTnAAHK1dLZWOV2kU15Hx/r6fpZOtHt7j4okKPgKOZoGs/BLozy8YS5nIU/Sfk/2g==
+  md5(hex): fadb4046dc4fc1c9fe87e6802e40a546
+  sha256(hex): a7607bf33d941d7d39f06688245ad96ebcdfe6925c0c057b5df71ea740e4dec1
+  sha256(base64): p2B78z2UHX058GaIJFrZbrzf5pJcDAV7Xfcep0Dk3sE=
+  sha512(base64): 5I8dZgHE9dwZN3wYyZRlTwLIjYKhwbyFHSfxJS6qysZyb+JKOrmeUsHQywYrgAfmeboMiUMboLlovx8l1IX76g==
 version_main.js:
   md5(hex): fadb4046dc4fc1c9fe87e6802e40a546
   sha256(hex): a7607bf33d941d7d39f06688245ad96ebcdfe6925c0c057b5df71ea740e4dec1
   sha256(base64): p2B78z2UHX058GaIJFrZbrzf5pJcDAV7Xfcep0Dk3sE=
   sha512(base64): 5I8dZgHE9dwZN3wYyZRlTwLIjYKhwbyFHSfxJS6qysZyb+JKOrmeUsHQywYrgAfmeboMiUMboLlovx8l1IX76g==
 wnako3.js:
-  md5(hex): 708c077919252b07a86f745b52a75804
-  sha256(hex): 2ff3bf73da684da5f1907e926b3d8fe4c3dc788028a9fd2c47bdebeb2570c2be
-  sha256(base64): L/O/c9poTaXxkH6Saz2P5MPceIAoqf0sR73r6yVwwr4=
-  sha512(base64): oNx6op64NBndIKb0lfaFerJoX+HB237R+wTkFMHNIZfACT3OBOGGwcnEJsX3IAr7A6g+AxdecuPb5SnXicfLxw==
+  md5(hex): 1fcbc67fb6d0b75a8db5e0e2075627d2
+  sha256(hex): f9d35aff98f4f59509a4f73aa92c3d69ed761f90c2f7c14b268b8b479aa069e0
+  sha256(base64): +dNa/5j09ZUJpPc6qSw9ae12H5DC98FLJouLR5qgaeA=
+  sha512(base64): 7WovIXqX2HnkOVAag2xaf1PY8Pf1wiVbQrSlY9DEyY/CrekxnwytZQposyQp8vFSXw5JHbK61J45+a1pV/pn1Q==
 wnako3webworker.js:
   md5(hex): 0fa4059c0f5f4fff126480dd7662ebd5
   sha256(hex): fc7a53d66e54e74e78b677c73feab18b99139ddaaf45fbde9e6e2aef0d9aaaeb

package/release/_script-tags.txt

@@ -1,20 +1,33 @@
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/command.json.js" integrity="sha512-cM2Az1P66nPoDyzHmyJ08fgslW0MGQx9sB8ChXiywo7vqlRoqsCYi+YmVyiMHsWuEewYXPTlrMFriKaey2C9tA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/core_src_nako_josi_list_mjs.js" integrity="sha512-0+LAeEfPy2Lrl+DeJMjbBIUda9Y5ttpLGy3/FW8rjSW8bN3udrALJa5V/bhjxU7mYouumV/QGN2wt3oxMCKy9g==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/core_src_nako_reserved_words_mjs.js" integrity="sha512-UzZigh2tIhgBO3+Sp1wnqKMvAGfhqSRdH2+ffmRy4+8CVNEeepddaDV0oKJ+vyvi28zQLmXeMsjRu+Frj3YlTg==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/edit_main.js" integrity="sha512-chJSrv6X4XeV+t0MehOr1mrmsz4ZTNJUA0wfSu99I0A7EvRPX9MgR3LXeOMcTHWyuLj7htmRhCch6j0zXjTYRQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/editor.js" integrity="sha512-60RfvbeW58u/tKFDLZxjYlxeMCCqE2vx+zp969gt/Ed9gvyUQnNb2o8jR5ePaW253JI+WlJy2uaC2kpAqfq59A==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/nako_gen_async.js" integrity="sha512-/73lycspxJ921s+NmqaOKF58X9rCsgEZrZT4O4sW1aCe5CSXtQevIasAoGgIoL3a5RmlaghbaIVASwAgmoE3+g==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/plugin_caniuse.js" integrity="sha512-V6nOBHnhxPChu+S/LfB7elCeBk985ukLmBmkCyPk4ai5VfoJZuOIttg72PbZSxWfP5eQTrlLNajsorfwNw/vcA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/plugin_datetime.js" integrity="sha512-ofb5jVaHjjTRoCAmHnbewc2fS8vr1oEkX/B3WoOCjYpDnZ3nnl3EDz6fdAS8CFFzGvuekCk2RFN5BuM9kX6FAg==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/plugin_kansuji.js" integrity="sha512-N+S8Th1yCiQy3q5jh0TFvlTOtrWNE82a4UJZ9O3ml3BGBYA141bpWlJR5c34dObTe1prbLJZ7v5WvV0vnDnr9A==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/plugin_keigo.js" integrity="sha512-u067+CeBvMb6+oINFY9Wz77GBk4NSxS2+k35GJ3RsFFmphJliwzwmV2ceID0gZ4mbjJ0xJHQX9WIypiyI6yfdA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/plugin_markup.js" integrity="sha512-O5gWVMkfYr1neke9fSBDOa3BmSQDWUwGBh8VxPtHW2AEJYvaGyuER9lmPwOTP+WtMB/kc4K9DM/OvNsCWfvL7Q==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/plugin_three.js" integrity="sha512-4loRkhlxZ9A9v5t3sk5VECW7T33axIVbBQgwkNdgcjk03yRqAvxut5OS4n3BBS4jnWWHOE3i0vj9qxOOp4uV3Q==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/plugin_toml.js" integrity="sha512-Z4JmOCY66VuyoD8m4dCzKttEbCTEUfqyuqlmcOhs69m/88skKcPYWXi+4W+Td5LdI3xqezn4BkN32F9ZkPzUpQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/plugin_turtle.js" integrity="sha512-ce8etr+HoC+UjUyXSgxJzy3+pOYhsBdt9jDzhks2H/eEPQ1gIz7M8hoeyP0223zLLZHBBzlHiL/a6mmJdoKQ+w==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/plugin_webworker.js" integrity="sha512-6UHX2dgMPRY4BuIxLXaERKaA8Wg5eK2pWy+OysU0/+gt2E15M7K5Vr8+4CQt6hylWnmzmJQJfgObIr+yjW5kPw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/plugin_weykturtle3d.js" integrity="sha512-ONFdombPCdgdnXs7VMUAHpe8IBvTuLzSgzmERf1jEhHo4l06wDpkpRRCk3/9a1hiXRHQ+le2LZBT7XH4VA27sQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/version.js" integrity="sha512-Xy8RMyAkohHiIXAKfISKFZTnAAHK1dLZWOV2kU15Hx/r6fpZOtHt7j4okKPgKOZoGs/BLozy8YS5nIU/Sfk/2g==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/version_main.js" integrity="sha512-5I8dZgHE9dwZN3wYyZRlTwLIjYKhwbyFHSfxJS6qysZyb+JKOrmeUsHQywYrgAfmeboMiUMboLlovx8l1IX76g==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/wnako3.js" integrity="sha512-oNx6op64NBndIKb0lfaFerJoX+HB237R+wTkFMHNIZfACT3OBOGGwcnEJsX3IAr7A6g+AxdecuPb5SnXicfLxw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.12&f=release/wnako3webworker.js" integrity="sha512-n6GS1iHW9cBD/5ucIxWXAnY/QaFuitBY3LSPHQpyKFHlsTpE45q9awHDch0JiyrwI3JVtroFqz/ECcQMLHNphA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/command.json.js" integrity="sha512-cM2Az1P66nPoDyzHmyJ08fgslW0MGQx9sB8ChXiywo7vqlRoqsCYi+YmVyiMHsWuEewYXPTlrMFriKaey2C9tA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/core_src_nako_josi_list_mjs.js" integrity="sha512-0+LAeEfPy2Lrl+DeJMjbBIUda9Y5ttpLGy3/FW8rjSW8bN3udrALJa5V/bhjxU7mYouumV/QGN2wt3oxMCKy9g==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/core_src_nako_reserved_words_mjs.js" integrity="sha512-UzZigh2tIhgBO3+Sp1wnqKMvAGfhqSRdH2+ffmRy4+8CVNEeepddaDV0oKJ+vyvi28zQLmXeMsjRu+Frj3YlTg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/edit_main.js" integrity="sha512-chJSrv6X4XeV+t0MehOr1mrmsz4ZTNJUA0wfSu99I0A7EvRPX9MgR3LXeOMcTHWyuLj7htmRhCch6j0zXjTYRQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/edit_main.js" integrity="sha512-chJSrv6X4XeV+t0MehOr1mrmsz4ZTNJUA0wfSu99I0A7EvRPX9MgR3LXeOMcTHWyuLj7htmRhCch6j0zXjTYRQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/version_main.js" integrity="sha512-OWs22aZ0QaDY3L3J4Be4/hWf/0iSWXuMVY1vvl6wynYrem4fe1Sh3CIclOWdQnolRzTFXHGMnBp9FUv8NcQsQA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/editor.js" integrity="sha512-chJSrv6X4XeV+t0MehOr1mrmsz4ZTNJUA0wfSu99I0A7EvRPX9MgR3LXeOMcTHWyuLj7htmRhCch6j0zXjTYRQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/nako_gen_async.js" integrity="sha512-/73lycspxJ921s+NmqaOKF58X9rCsgEZrZT4O4sW1aCe5CSXtQevIasAoGgIoL3a5RmlaghbaIVASwAgmoE3+g==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_caniuse.js" integrity="sha512-V6nOBHnhxPChu+S/LfB7elCeBk985ukLmBmkCyPk4ai5VfoJZuOIttg72PbZSxWfP5eQTrlLNajsorfwNw/vcA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_datetime.js" integrity="sha512-ofb5jVaHjjTRoCAmHnbewc2fS8vr1oEkX/B3WoOCjYpDnZ3nnl3EDz6fdAS8CFFzGvuekCk2RFN5BuM9kX6FAg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_kansuji.js" integrity="sha512-N+S8Th1yCiQy3q5jh0TFvlTOtrWNE82a4UJZ9O3ml3BGBYA141bpWlJR5c34dObTe1prbLJZ7v5WvV0vnDnr9A==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_keigo.js" integrity="sha512-u067+CeBvMb6+oINFY9Wz77GBk4NSxS2+k35GJ3RsFFmphJliwzwmV2ceID0gZ4mbjJ0xJHQX9WIypiyI6yfdA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_markup.js" integrity="sha512-O5gWVMkfYr1neke9fSBDOa3BmSQDWUwGBh8VxPtHW2AEJYvaGyuER9lmPwOTP+WtMB/kc4K9DM/OvNsCWfvL7Q==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_three.js" integrity="sha512-4loRkhlxZ9A9v5t3sk5VECW7T33axIVbBQgwkNdgcjk03yRqAvxut5OS4n3BBS4jnWWHOE3i0vj9qxOOp4uV3Q==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_toml.js" integrity="sha512-Z4JmOCY66VuyoD8m4dCzKttEbCTEUfqyuqlmcOhs69m/88skKcPYWXi+4W+Td5LdI3xqezn4BkN32F9ZkPzUpQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_turtle.js" integrity="sha512-ce8etr+HoC+UjUyXSgxJzy3+pOYhsBdt9jDzhks2H/eEPQ1gIz7M8hoeyP0223zLLZHBBzlHiL/a6mmJdoKQ+w==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_webworker.js" integrity="sha512-6UHX2dgMPRY4BuIxLXaERKaA8Wg5eK2pWy+OysU0/+gt2E15M7K5Vr8+4CQt6hylWnmzmJQJfgObIr+yjW5kPw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_weykturtle3d.js" integrity="sha512-ONFdombPCdgdnXs7VMUAHpe8IBvTuLzSgzmERf1jEhHo4l06wDpkpRRCk3/9a1hiXRHQ+le2LZBT7XH4VA27sQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_caniuse.js" integrity="sha512-V6nOBHnhxPChu+S/LfB7elCeBk985ukLmBmkCyPk4ai5VfoJZuOIttg72PbZSxWfP5eQTrlLNajsorfwNw/vcA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_datetime.js" integrity="sha512-ofb5jVaHjjTRoCAmHnbewc2fS8vr1oEkX/B3WoOCjYpDnZ3nnl3EDz6fdAS8CFFzGvuekCk2RFN5BuM9kX6FAg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_kansuji.js" integrity="sha512-N+S8Th1yCiQy3q5jh0TFvlTOtrWNE82a4UJZ9O3ml3BGBYA141bpWlJR5c34dObTe1prbLJZ7v5WvV0vnDnr9A==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_keigo.js" integrity="sha512-u067+CeBvMb6+oINFY9Wz77GBk4NSxS2+k35GJ3RsFFmphJliwzwmV2ceID0gZ4mbjJ0xJHQX9WIypiyI6yfdA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_markup.js" integrity="sha512-O5gWVMkfYr1neke9fSBDOa3BmSQDWUwGBh8VxPtHW2AEJYvaGyuER9lmPwOTP+WtMB/kc4K9DM/OvNsCWfvL7Q==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_three.js" integrity="sha512-4loRkhlxZ9A9v5t3sk5VECW7T33axIVbBQgwkNdgcjk03yRqAvxut5OS4n3BBS4jnWWHOE3i0vj9qxOOp4uV3Q==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_turtle.js" integrity="sha512-ce8etr+HoC+UjUyXSgxJzy3+pOYhsBdt9jDzhks2H/eEPQ1gIz7M8hoeyP0223zLLZHBBzlHiL/a6mmJdoKQ+w==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_webworker.js" integrity="sha512-6UHX2dgMPRY4BuIxLXaERKaA8Wg5eK2pWy+OysU0/+gt2E15M7K5Vr8+4CQt6hylWnmzmJQJfgObIr+yjW5kPw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/plugin_weykturtle3d.js" integrity="sha512-ONFdombPCdgdnXs7VMUAHpe8IBvTuLzSgzmERf1jEhHo4l06wDpkpRRCk3/9a1hiXRHQ+le2LZBT7XH4VA27sQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/wnako3.js" integrity="sha512-OynXQRRt0dv7GIW23ZlWFVfqqXpg8ZqUDpcv8kqDiNCkRTzLW41PS9aEHdOieLI7Twwu9f6r5+4MlxvE3UYqVw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/wnako3webworker.js" integrity="sha512-97yLnnWQfc6SSs51PMT93W5ROTIFqO01Ox7ic2hZGlrw4dzPehJG02J99n8Iv3k6sy9m3Eg74QdACYVwIr4oSg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/version.js" integrity="sha512-5I8dZgHE9dwZN3wYyZRlTwLIjYKhwbyFHSfxJS6qysZyb+JKOrmeUsHQywYrgAfmeboMiUMboLlovx8l1IX76g==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/version_main.js" integrity="sha512-5I8dZgHE9dwZN3wYyZRlTwLIjYKhwbyFHSfxJS6qysZyb+JKOrmeUsHQywYrgAfmeboMiUMboLlovx8l1IX76g==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/wnako3.js" integrity="sha512-7WovIXqX2HnkOVAag2xaf1PY8Pf1wiVbQrSlY9DEyY/CrekxnwytZQposyQp8vFSXw5JHbK61J45+a1pV/pn1Q==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.13&f=release/wnako3webworker.js" integrity="sha512-n6GS1iHW9cBD/5ucIxWXAnY/QaFuitBY3LSPHQpyKFHlsTpE45q9awHDch0JiyrwI3JVtroFqz/ECcQMLHNphA==" crossorigin="anonymous"></script>