nadesiko3 3.2.52 → 3.3.3

package/src/{plugin_datetime.js → plugin_datetime.mjs}

@@ -1,5 +1,10 @@
 // @ts-nocheck
 // file: plugin_datetime.js
+import dayjs from 'dayjs'
+import _ja from 'dayjs/locale/ja.js'
+
+import era from './era.mjs'
+
 const PluginDateTime = {
   '初期化': {
     type: 'func',
@@ -9,13 +14,12 @@ const PluginDateTime = {
     }
   },
   // @日時処理
-  '元号データ': { type: 'const', value: require('./era.json') }, // @げんごうでーた
+  '元号データ': { type: 'const', value: era }, // @げんごうでーた
   '今': { // @現在時刻を「HH:mm:ss」の形式で返す // @いま
     type: 'func',
     josi: [],
     pure: true,
     fn: function () {
-      const dayjs = require('dayjs')
       return dayjs().format('HH:mm:ss')
     }
   },
@@ -24,7 +28,6 @@ const PluginDateTime = {
     josi: [],
     pure: true,
     fn: function () {
-      const dayjs = require('dayjs')
       return dayjs().unix()
     }
   },
@@ -33,7 +36,6 @@ const PluginDateTime = {
     josi: [],
     pure: true,
     fn: function () {
-      const dayjs = require('dayjs')
       return dayjs().format('YYYY/MM/DD')
     }
   },
@@ -42,7 +44,6 @@ const PluginDateTime = {
     josi: [],
     pure: true,
     fn: function () {
-      const dayjs = require('dayjs')
       return dayjs().add(1, 'days').format('YYYY/MM/DD')
     }
   },
@@ -51,7 +52,6 @@ const PluginDateTime = {
     josi: [],
     pure: true,
     fn: function () {
-      const dayjs = require('dayjs')
       return dayjs().subtract(1, 'days').format('YYYY/MM/DD')
     }
   },
@@ -60,7 +60,6 @@ const PluginDateTime = {
     josi: [],
     pure: true,
     fn: function () {
-      const dayjs = require('dayjs')
       return dayjs().year()
     }
   },
@@ -69,7 +68,7 @@ const PluginDateTime = {
     josi: [],
     pure: true,
     fn: function () {
-      const dayjs = require('dayjs')
+      
       return dayjs().add(1, 'years').year()
     }
   },
@@ -78,7 +77,7 @@ const PluginDateTime = {
     josi: [],
     pure: true,
     fn: function () {
-      const dayjs = require('dayjs')
+      
       return dayjs().subtract(1, 'years').year()
     }
   },
@@ -87,7 +86,7 @@ const PluginDateTime = {
     josi: [],
     pure: true,
     fn: function () {
-      const dayjs = require('dayjs')
+      
       return dayjs().month() + 1
     }
   },
@@ -96,7 +95,7 @@ const PluginDateTime = {
     josi: [],
     pure: true,
     fn: function () {
-      const dayjs = require('dayjs')
+      
       return dayjs().add(1, 'months').month() + 1
     }
   },
@@ -105,7 +104,7 @@ const PluginDateTime = {
     josi: [],
     pure: true,
     fn: function () {
-      const dayjs = require('dayjs')
+      
       return dayjs().subtract(1, 'months').month() + 1
     }
   },
@@ -114,8 +113,6 @@ const PluginDateTime = {
     josi: [['の']],
     pure: true,
     fn: function (s) {
-      const dayjs = require('dayjs')
-      require('dayjs/locale/ja')
       return dayjs(s, 'YYYY/MM/DD').locale('ja').format('ddd')
     }
   },
@@ -124,11 +121,7 @@ const PluginDateTime = {
     josi: [['の']],
     pure: true,
     fn: function (s) {
-      const dayjs = require('dayjs')
-      require('dayjs/locale/ja')
-
       let t = dayjs(s, 'YYYY/MM/DD')
-
       if (!t.isValid()) {
         t = dayjs()
       }
@@ -149,7 +142,7 @@ const PluginDateTime = {
     josi: [['の', 'を', 'から']],
     pure: true,
     fn: function (s) {
-      const dayjs = require('dayjs')
+      
       return dayjs(s, 'YYYY/MM/DD HH:mm:ss').unix()
     }
   },
@@ -158,7 +151,7 @@ const PluginDateTime = {
     josi: [['を', 'から']],
     pure: true,
     fn: function (tm) {
-      const dayjs = require('dayjs')
+      
       return dayjs.unix(tm).format('YYYY/MM/DD HH:mm:ss')
     }
   },
@@ -167,7 +160,7 @@ const PluginDateTime = {
     josi: [['を']],
     pure: true,
     fn: function (s, sys) {
-      const dayjs = require('dayjs')
+      
       const date = dayjs(s, 'YYYY/MM/DD')
 
       for (const era of sys.__v0['元号データ']) {
@@ -215,7 +208,7 @@ const PluginDateTime = {
     josi: [['と', 'から'], ['の', 'までの'], ['による']],
     pure: true,
     fn: function (a, b, unit) {
-      const dayjs = require('dayjs')
+      
 
       switch (unit) {
         case '年':
@@ -339,10 +332,7 @@ const PluginDateTime = {
     josi: [['に'], ['を']],
     pure: true,
     fn: function (s, a) {
-      const dayjs = require('dayjs')
-
       let unit
-
       switch (a.match(/(年|ヶ月|日|時間|分|秒)$/)[0]) {
         case '年':
           unit = 'years'
@@ -408,7 +398,10 @@ const PluginDateTime = {
   }
 }
 
-module.exports = PluginDateTime
+export default PluginDateTime
+
 // scriptタグで取り込んだ時、自動で登録する
 /* istanbul ignore else */
 if (typeof (navigator) === 'object' && typeof (navigator.nako3) === 'object') { navigator.nako3.addPluginObject('PluginDateTime', PluginDateTime) }
+
+

package/src/{plugin_express.js → plugin_express.mjs}

@@ -3,8 +3,8 @@
  * file: plugin_express.js
  * Webサーバのためのプラグイン (expressをラップしたもの)
  */
-const express = require('express')
-const bodyParser = require('body-parser')
+import express from 'express'
+import bodyParser from 'body-parser'
 
 // 定数・変数
 let WEBSERVER_NAME = 'WEBサーバ(なでしこ+Express)'
@@ -209,4 +209,5 @@ function callbackServerFunc (callback, req, res, sys) {
   callback(req, res)
 }
 
-module.exports = PluginExpress
+// module.exports = PluginExpress
+export default PluginExpress

package/src/{plugin_kansuji.js → plugin_kansuji.mjs}

@@ -218,7 +218,7 @@ const 軸数字 = [
 const 基本算用数字 = '0123456789'.split('')
 const 基本漢数字 = '〇一二三四五六七八九'.split('')
 
-module.exports = PluginKansuji
+export default PluginKansuji
 
 // scriptタグで取り込んだ時、自動で登録する
 if (typeof (navigator) === 'object' && typeof (navigator.nako3) === 'object') { navigator.nako3.addPluginObject('PluginKansuji', PluginKansuji) }

package/src/{plugin_keigo.js → plugin_keigo.mjs}

@@ -52,4 +52,4 @@ const PluginKeigo = {
 
 }
 
-module.exports = PluginKeigo
+export default PluginKeigo

package/src/{plugin_markup.js → plugin_markup.mjs}

@@ -3,6 +3,10 @@
  * file: plugin_markup.js
  * マークアップ言語関連のプラグイン
  */
+
+import { parse as parseMD } from 'marked'
+import html from 'html'
+
 const PluginMarkup = {
   // @マークアップ
   'マークダウンHTML変換': { // @マークダウン形式で記述された文字列SをHTML形式に変換する // @まーくだうんHTMLへんかん
@@ -10,8 +14,7 @@ const PluginMarkup = {
     josi: [['を']],
     pure: true,
     fn: function (s) {
-      const marked = require('marked')
-      const html = marked.parse(s)
+      const html = parseMD(s)
       return html
     }
   },
@@ -20,13 +23,10 @@ const PluginMarkup = {
     josi: [['を']],
     pure: true,
     fn: function (s) {
-      const html = require('html')
       return html.prettyPrint(s, { indent_size: 2 })
     }
   }
 }
-
-module.exports = PluginMarkup
-
+export default PluginMarkup
 // scriptタグで取り込んだ時、自動で登録する
 if (typeof (navigator) === 'object') { navigator.nako3.addPluginObject('PluginMarkup', PluginMarkup) }

package/src/{plugin_math.js → plugin_math.mjs}

@@ -1,5 +1,5 @@
 // @ts-nocheck
-const PluginMath = {
+export default {
   '初期化': {
     type: 'func',
     josi: [],
@@ -321,7 +321,4 @@ const PluginMath = {
       return Math.floor(v)
     }
   }
-
 }
-
-module.exports = PluginMath

package/src/{plugin_node.js → plugin_node.mjs}

@@ -1,46 +1,30 @@
-// @ts-nocheck
 /**
  * file: plugin_node.js
  * node.js のためのプラグイン
  */
-const fs = require('fs')
-const fse = require('fs-extra')
-const fetch = require('node-fetch')
-const childProcess = require('child_process')
-const execSync = childProcess.execSync
-const exec = childProcess.exec
-const path = require('path')
+import fs from 'fs'
+import fse from 'fs-extra'
+import fetch from 'node-fetch'
+import { exec, execSync } from 'child_process'
+import path from 'path'
+import iconv from 'iconv-lite'
+import opener from 'opener'
+import clipboardy from 'clipboardy'
+import assert from 'assert'
+// 「標準入力取得時」で利用
+import * as readline from 'readline'
+import { stdin as input, stdout as output } from 'process'
+// ハッシュ関数で利用
+import crypto from 'crypto'
+import os from 'os'
+import sendkeysJS from 'sendkeys-js'
 
-const PluginNode = {
+export default {
   '初期化': {
     type: 'func',
     josi: [],
     pure: true,
     fn: function (sys) {
-      // ランタイム環境無しで実行する場合
-      if (typeof path === 'undefined') {
-        /** @param {string} name @param {string} id */
-        const tryRequire = (name, id) => {
-          try {
-            // @ts-ignore
-            global[name] = require(id)
-          } catch (e) {
-            console.warn(e.message)
-          }
-        }
-        tryRequire('fs', 'fs')
-        tryRequire('fse', 'fs-extra')
-        tryRequire('fetch', 'node-fetch')
-        tryRequire('childProcess', 'child_process')
-        tryRequire('path', 'path')
-        if (typeof childProcess !== 'undefined') {
-          // @ts-ignore
-          global.execSync = childProcess.execSync
-          // @ts-ignore
-          global.exec = childProcess.exec
-        }
-      }
-
       sys.__getBinPath = (tool) => {
         let fpath = tool
         if (process.platform === 'win32') {
@@ -109,7 +93,6 @@ const PluginNode = {
     josi: [['を', 'から']],
     pure: true,
     fn: function (s, sys) {
-      const iconv = require('iconv-lite')
       iconv.skipDecodeWarning = true
       const buf = fs.readFileSync(s)
       const text = iconv.decode(Buffer.from(buf), 'sjis')
@@ -121,7 +104,6 @@ const PluginNode = {
     josi: [['を'], ['へ', 'に']],
     pure: true,
     fn: function (s, f, sys) {
-      const iconv = require('iconv-lite')
       iconv.skipDecodeWarning = true
       const buf = iconv.encode(s, 'Shift_JIS')
       fs.writeFileSync(f, buf)
@@ -163,7 +145,6 @@ const PluginNode = {
     josi: [['を']],
     pure: true,
     fn: function (url) {
-      const opener = require('opener')
       opener(url)
     }
   },
@@ -575,7 +556,6 @@ const PluginNode = {
     josi: [['を']],
     pure: true,
     fn: function (v, sys) {
-      const clipboardy = require('clipboardy')
       // copy
       if (sys && sys.isSetter) { return clipboardy.writeSync(v) }
       // paste
@@ -591,7 +571,7 @@ const PluginNode = {
     josi: [['を']],
     pure: true,
     fn: function (callback) {
-      const reader = require('readline').createInterface({
+      const reader = readline.createInterface({
         input: process.stdin,
         output: process.stdout
       })
@@ -604,9 +584,10 @@ const PluginNode = {
     type: 'func',
     josi: [['と', 'を']],
     pure: true,
-    fn: function (msg, sys) {
-      const readlineSync = require('readline-sync')
-      const res = readlineSync.question(msg)
+    asyncFn: true,
+    fn: async function (msg, sys) {
+      const rl = readline.createInterface({ input, output });
+      const res = await rl.question(msg)
       if (res.match(/^[0-9.]+$/)) { return parseFloat(res) }
       return res
     }
@@ -617,7 +598,7 @@ const PluginNode = {
     josi: [['と'], ['が']],
     pure: true,
     fn: function (a, b, sys) {
-      const assert = require('assert')
+      
       assert.strictEqual(a, b)
     }
   },
@@ -627,7 +608,6 @@ const PluginNode = {
     josi: [],
     pure: true,
     fn: function (sys) {
-      const os = require('os')
       const nif = os.networkInterfaces()
       /**
        * @type {string[]}
@@ -647,7 +627,6 @@ const PluginNode = {
     josi: [],
     pure: true,
     fn: function (sys) {
-      const os = require('os')
       const nif = os.networkInterfaces()
       const result = []
       for (const dev in nif) {
@@ -925,7 +904,6 @@ const PluginNode = {
     josi: [['の', 'を']],
     pure: true,
     fn: function (code, sys) {
-      const iconv = require('iconv-lite')
       return iconv.encodingExists(code)
     }
   },
@@ -934,7 +912,6 @@ const PluginNode = {
     josi: [['に', 'へ', 'を']],
     pure: true,
     fn: function (str, sys) {
-      const iconv = require('iconv-lite')
       iconv.skipDecodeWarning = true
       return iconv.encode(str, 'Shift_JIS')
     }
@@ -944,7 +921,6 @@ const PluginNode = {
     josi: [['から', 'を', 'で']],
     pure: true,
     fn: function (buf, sys) {
-      const iconv = require('iconv-lite')
       iconv.skipDecodeWarning = true
       return iconv.decode(Buffer.from(buf), 'sjis')
     }
@@ -954,7 +930,6 @@ const PluginNode = {
     josi: [['を'], ['へ', 'で']],
     pure: true,
     fn: function (s, code, sys) {
-      const iconv = require('iconv-lite')
       iconv.skipDecodeWarning = true
       return iconv.encode(s, code)
     }
@@ -964,7 +939,6 @@ const PluginNode = {
     josi: [['を'], ['から', 'で']],
     pure: true,
     fn: function (buf, code, sys) {
-      const iconv = require('iconv-lite')
       iconv.skipDecodeWarning = true
       return iconv.decode(Buffer.from(buf), code)
     }
@@ -975,8 +949,7 @@ const PluginNode = {
     josi: [['を', 'の']],
     pure: true,
     fn: function (s, sys) {
-      const keys = require('sendkeys-js')
-      keys.sendKeys(s)
+      sendkeysJS.sendKeys(s)
     },
     return_none: true
   },
@@ -985,8 +958,7 @@ const PluginNode = {
     josi: [['を', 'の']],
     pure: true,
     fn: function (s, sys) {
-      const keys = require('sendkeys-js')
-      keys.activate(s)
+      sendkeysJS.activate(s)
     },
     return_none: true
   },
@@ -996,7 +968,6 @@ const PluginNode = {
     josi: [],
     pure: true,
     fn: function (sys) {
-      const crypto = require('crypto')
       return crypto.getHashes()
     }
   },
@@ -1005,7 +976,6 @@ const PluginNode = {
     josi: [['を'], ['の'], ['で']],
     pure: true,
     fn: function (s, alg, enc, sys) {
-      const crypto = require('crypto')
       const hashsum = crypto.createHash(alg)
       hashsum.update(s)
       return hashsum.digest(enc)
@@ -1031,5 +1001,3 @@ function isDir (f) {
     return false
   }
 }
-
-module.exports = PluginNode

package/src/{plugin_promise.js → plugin_promise.mjs}

@@ -1,5 +1,5 @@
 // @ts-nocheck
-const PluginPromise = {
+export default {
   '初期化': {
     type: 'func',
     josi: [],
@@ -90,5 +90,3 @@ const PluginPromise = {
     return_none: false
   }
 }
-
-module.exports = PluginPromise

package/src/{plugin_system.js → plugin_system.mjs}

@@ -1,8 +1,8 @@
 // @ts-nocheck
-const { NakoRuntimeError } = require('./nako_errors')
-const NakoVersion = require('./nako_version')
+import { NakoRuntimeError } from './nako_errors.mjs'
+import NakoVersion from './nako_version.mjs'
 
-const PluginSystem = {
+export default {
   'meta': {
     type: 'const',
     value: {
@@ -2526,22 +2526,41 @@ const PluginSystem = {
     type: 'func',
     josi: [],
     pure: true,
+    asyncFn: true,
     fn: function () {
-      const josi = require('./nako_josi_list.js')
-      return josi.josiList
+      return new Promise((resolve, reject) => {
+        import('./nako_josi_list.mjs')
+        .then((mod) => {
+          const obj = Object.assign({}, mod)
+          resolve(obj.josiList)
+        })
+        .catch((err) => {
+          reject(err)
+        })
+      })
     }
   },
   '予約語一覧取得': { // @文法として定義されている予約語の一覧を取得する // @よやくごいちらんしゅとく
     type: 'func',
     josi: [],
     pure: true,
+    asyncFn: true,
     fn: function () {
-      const words = require('./nako_reserved_words.js')
-      const w = []
-      for (const key in words) {
-        w.push(key)
-      }
-      return w
+      // const words = require('./nako_reserved_words.mjs')
+      return new Promise((resolve, reject) => {
+        import('./nako_reserved_words.mjs')
+        .then((mod) => {
+          const obj = Object.assign({}, mod)
+          const w = []
+          for (const key in obj.default) {
+            w.push(key)
+          }
+          resolve(w)
+        })
+        .catch((err) => {
+          reject(err)
+        })
+      })
     }
   },
   // @プラグイン管理
@@ -2603,7 +2622,7 @@ const PluginSystem = {
     pure: true,
     fn: function (text) {
       // browser?
-      if (window.btoa) {
+      if (typeof(window) !== 'undefined' && window.btoa) {
         const utf8str = String.fromCharCode.apply(null, new TextEncoder('UTF-8').encode(text))
         return btoa(utf8str)
       } else {
@@ -2616,7 +2635,7 @@ const PluginSystem = {
     josi: [['を', 'へ', 'に']],
     pure: true,
     fn: function (text) {
-      if (window.atob) {
+      if (typeof(window) !== 'undefined' && window.atob) {
         const decodedUtf8str = atob(text)
         const decodedArray = new Uint8Array(Array.prototype.map.call(decodedUtf8str, c => c.charCodeAt()))
         return new TextDecoder('UTF-8').decode(decodedArray)
@@ -2626,5 +2645,3 @@ const PluginSystem = {
     }
   }
 }
-
-module.exports = PluginSystem

package/src/{plugin_test.js → plugin_test.mjs}

@@ -3,7 +3,7 @@
  * file: plugin_test.js
  * テスト実行用プラグイン
  */
-const PluginTest = {
+export default {
   // @テスト
   'ASSERT等': { // @ テストで、ASSERTでAとBが正しいことを報告する // @ASSERTひとしい
     type: 'func',
@@ -34,5 +34,3 @@ const PluginTest = {
   }
 
 }
-
-module.exports = PluginTest

package/src/{plugin_turtle.js → plugin_turtle.mjs}

@@ -4,9 +4,9 @@
  * plugin_turtle.js
  */
 
-const turtleImage = require('./turtle64.png').default
-const elephantImage = require('./turtle-elephant.png').default
-const pandaImage = require('./turtle-panda.png').default
+import turtleImage from './image_turtle64.mjs'
+import elephantImage from './image_turtle-elephant.mjs'
+import pandaImage from './image_turtle-panda.mjs'
 
 const PluginTurtle = {
   '初期化': {
@@ -639,7 +639,8 @@ const PluginTurtle = {
   }
 }
 
-module.exports = PluginTurtle
+// module.exports = PluginTurtle
+export default PluginTurtle
 
 // scriptタグで取り込んだ時、自動で登録する
 /* istanbul ignore else */

package/src/{plugin_webworker.js → plugin_webworker.mjs}

@@ -326,9 +326,9 @@ const PluginWebWorker = {
   }
 }
 
+export default PluginWebWorker
+
 if (typeof (navigator) === 'object' && typeof (navigator.nako3) === 'object') {
   navigator.nako3.addPluginObject('PluginWebWorker', PluginWebWorker)
 }
-if (typeof (module) === 'object') {
-  module.exports = PluginWebWorker
-}
+

package/src/{plugin_weykturtle3d.js → plugin_weykturtle3d.mjs}

@@ -1206,9 +1206,7 @@ const PluginWeykTurtle3D = {
   }
 }
 
-if (typeof (global) === 'object' && typeof (global.process) === 'object') {
-  module.exports = PluginWeykTurtle3D
-}
+export default PluginWeykTurtle3D
 
 // ブラウザからscriptタグで取り込んだ時、自動で登録する
 if (typeof (navigator) === 'object') {

package/src/{plugin_worker.js → plugin_worker.mjs}

@@ -89,4 +89,7 @@ const PluginWorker = {
   }
 }
 
-module.exports = PluginWorker
+// module.exports = PluginWorker
+export default PluginWorker
+
+