nadesiko3 3.2.51 → 3.3.2

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
+
+

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

@@ -1,13 +1,13 @@
 // @ts-nocheck
 // nadesiko for web browser
 // wnako3.js
-require('whatwg-fetch') // IE11サポートが不要になったら外す
 
-const NakoCompiler = require('./nako3')
-const { NakoImportError } = require('./nako_errors')
+import { NakoCompiler } from './nako3.mjs'
+import { NakoImportError } from './nako_errors.mjs'
+import { setupEditor } from './wnako3_editor.mjs'
+import PluginBrowser from './plugin_browser.mjs'
+
 const NAKO_SCRIPT_RE = /^(なでしこ|nako|nadesiko)3?$/
-const { setupEditor } = require('./wnako3_editor')
-const PluginBrowser = require('./plugin_browser')
 
 class WebNakoCompiler extends NakoCompiler {
   constructor () {

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

@@ -2,11 +2,17 @@
 /* eslint-disable no-template-curly-in-string */
 /** なでしこのtokenのtypeをscope（CSSのクラス名）に変換する。 */
 
-const { OffsetToLineColumn } = require('./nako_source_mapping')
-const { NakoError } = require('./nako_errors')
-const { getBlockStructure, getIndent, countIndent, isIndentSyntaxEnabled } = require('./nako_indent')
-const NakoPrepare = require('./nako_prepare')
-const NakoLogger = require('./nako_logger')
+import { OffsetToLineColumn } from './nako_source_mapping.mjs'
+import { NakoError } from './nako_errors.mjs'
+import NakoIndent from './nako_indent.mjs'
+import { NakoPrepare } from './nako_prepare.mjs'
+import { NakoLogger } from './nako_logger.mjs'
+
+// alias
+const getBlockStructure = NakoIndent.getBlockStructure
+const getIndent = NakoIndent.getIndent
+const countIndent = NakoIndent.countIndent
+const isIndentSyntaxEnabled = NakoIndent.isIndentSyntaxEnabled
 
 /**
  * @typedef {import('./nako3')} NakoCompiler
@@ -69,7 +75,7 @@ const NakoLogger = require('./nako_logger')
  * @param {TokenWithSourceMap} token
  * @returns {TokenType}
  */
-function getScope (token) {
+export function getScope (token) {
   switch (token.type) {
     case 'line_comment': return 'comment.line'
     case 'range_comment': return 'comment.block'
@@ -154,7 +160,7 @@ function getScope (token) {
  * @param {boolean} includesLastCharacter
  * @param {boolean} underlineJosi
  */
-function getEditorTokens (compilerToken, nako3, value, includesLastCharacter, underlineJosi) {
+export function getEditorTokens (compilerToken, nako3, value, includesLastCharacter, underlineJosi) {
   const type = getScope(compilerToken)
   const docHTML = getDocumentationHTML(compilerToken, nako3)
 
@@ -177,7 +183,7 @@ function getEditorTokens (compilerToken, nako3, value, includesLastCharacter, un
  * @param {NakoCompiler} nako3
  * @returns {string | null}
  */
-function findPluginName (name, nako3) {
+export function findPluginName (name, nako3) {
   for (const pluginName of Object.keys(nako3.__module)) {
     if (Object.keys(nako3.__module[pluginName]).includes(name)) {
       return pluginName
@@ -191,7 +197,7 @@ function findPluginName (name, nako3) {
  * @param {number} i
  * @returns {string}
  */
-function createParameterName (i) {
+export function createParameterName (i) {
   const alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('')
   return i.toString(26).split('').map((v) => alphabet[parseInt(v, 26)]).join('')
 }
@@ -201,7 +207,7 @@ function createParameterName (i) {
  * @param {string[][]} josi
  * @retunrs {string}
  */
-function createParameterDeclaration (josi) {
+export function createParameterDeclaration (josi) {
   const args = josi.map((union, i) => union.map((v) => `${createParameterName(i)}${v}`).join('|')).join('、')
   if (args !== '') {
     return `（${args}）`
@@ -212,7 +218,7 @@ function createParameterDeclaration (josi) {
 
 // https://stackoverflow.com/a/6234804
 /** @param {string} t */
-function escapeHTML (t) {
+export function escapeHTML (t) {
   return t
     .replace(/&/g, '&')
     .replace(/</g, '&lt;')
@@ -227,7 +233,7 @@ function escapeHTML (t) {
  * @param {NakoCompiler} nako3
  * @returns {string | null}
  */
-function getDocumentationHTML (token, nako3) {
+export function getDocumentationHTML (token, nako3) {
   /** @param {string} text */
   const meta = (text) => `<span class="tooltip-plugin-name">${escapeHTML(text)}</span>`
   if (token.type === 'func') {
@@ -277,7 +283,7 @@ const withoutLogger = (nako3, f) => {
  * @param {NakoCompiler} nako3
  * @param {boolean} underlineJosi
  */
-function tokenize (lines, nako3, underlineJosi) {
+export function tokenize (lines, nako3, underlineJosi) {
   const code = lines.join('\n')
 
   // 取り込み文を含めてしまうと依存ファイルが大きい時に時間がかかってしまうため、
@@ -399,7 +405,7 @@ function tokenize (lines, nako3, underlineJosi) {
 /**
  * エディタ上にエラーメッセージの波線とgutterの赤いマークとエラーメッセージのポップアップを設定するためのクラス。
  */
-class EditorMarkers {
+export class EditorMarkers {
   /**
      * @param {any} session
      * @param {AceDocument} doc
@@ -521,7 +527,7 @@ class EditorMarkers {
  * ace editor ではシンタックスハイライトのために正規表現ベースのBackgroundTokenizerクラスを用意し定期的にトークン化を
  * 行っているが、正規表現ではなくなでしこのコンパイラの出力を使うためにはそれを上書きする必要がある。
  */
-class BackgroundTokenizer {
+export class BackgroundTokenizer {
   /**
      * @param {AceDocument} doc
      * @param {NakoCompiler} nako3
@@ -699,7 +705,7 @@ class BackgroundTokenizer {
 /**
  * シンタックスハイライト以外のエディタの挙動の定義。
  */
-class LanguageFeatures {
+export class LanguageFeatures {
   /**
      * @param {TypeofAceRange} AceRange
      * @param {NakoCompiler} nako3
@@ -1287,7 +1293,7 @@ let editorIdCounter = 0
  * @param {import('./wnako3')} nako3
  * @param {any} ace
  */
-function setupEditor (idOrElement, nako3, ace) {
+export function setupEditor (idOrElement, nako3, ace) {
   /** @type {AceEditor} */
   const editor = ace.edit(idOrElement)
   const element = typeof idOrElement === 'string' ? document.getElementById(idOrElement) : idOrElement
@@ -1636,7 +1642,7 @@ function setupEditor (idOrElement, nako3, ace) {
   return { editor, editorMarkers, editorTabs, retokenize, run, codeLensListeners }
 }
 
-module.exports = {
+export default {
   tokenize,
   setupEditor,
   LanguageFeatures,

package/test/async/{async_basic_test.js → async_basic_test.mjs}

@@ -1,11 +1,10 @@
-const assert = require('assert')
-const NakoCompiler = require('../../src/nako3.js')
-const NakoGenAsync = require('../../src/nako_gen_async.js')
+import assert from 'assert'
+import { NakoCompiler }  from '../../src/nako3.mjs'
+import { NakoGenASync } from '../../src/nako_gen_async.mjs'
 
 describe('aysnc_basic_test', () => {
   // @ts-ignore
   const nako = new NakoCompiler()
-  nako.addCodeGenerator('非同期モード', NakoGenAsync)
   const cmp = (/** @type {string} */code, /** @type {string} */res) => {
     code = '!非同期モード\n' + code
     nako.logger.debug('code=' + code)

package/test/browser/karma.config.js

@@ -1,3 +1,12 @@
+/*
+import express from 'express'
+import path from 'path'
+import multer from 'multer'
+import bodyParserRaw from 'body-parser/lib/types/raw.js'
+import bodyParserText from 'body-parser/lib/types/text.js'
+import bodyParserUrlencoded =from 'body-parser/lib/types/urlencoded.js'
+*/
+
 const multer =  require('multer')
 const bodyParserRaw = require('body-parser/lib/types/raw')
 const bodyParserText = require('body-parser/lib/types/text')

package/test/browser/test/plugin_browser_test.js

@@ -1,6 +1,6 @@
 import 'whatwg-fetch'
-import NakoCompiler from 'nako3/nako3.js'
-import PluginBrowser from 'nako3/plugin_browser.js'
+import { NakoCompiler } from 'nako3/nako3.mjs'
+import PluginBrowser from 'nako3/plugin_browser.mjs'
 
 import browserTestColor from './plugin_browser_test_color.js'
 import browserTestSystem from './plugin_browser_test_system.js'

package/test/browser/test/plugin_turtle_test.js

@@ -1,8 +1,8 @@
 /* global __html__ */
 import { assert } from 'chai'
-import NakoCompiler from 'nako3/nako3.js'
+import { NakoCompiler } from 'nako3/nako3.mjs'
 import { importStatus } from './import_plugin_checker.js'
-import PluginTurtle from 'nako3/plugin_turtle'
+import PluginTurtle from 'nako3/plugin_turtle.mjs'
 
 const htmlPath = 'test/html/'
 const imagePath = '/test/image/'

package/test/browser/test/plugin_webworker_test.js

@@ -1,9 +1,9 @@
 import 'whatwg-fetch'
 import { assert } from 'chai'
-import NakoCompiler from 'nako3/nako3.js'
-import PluginBrowser from 'nako3/plugin_browser'
+import { NakoCompiler } from 'nako3/nako3.mjs'
+import PluginBrowser from 'nako3/plugin_browser.mjs'
 import { importStatus } from './import_plugin_checker.js'
-import PluginWebWorker from 'nako3/plugin_webworker'
+import PluginWebWorker from 'nako3/plugin_webworker.mjs'
 import { retry } from './compare_util'
 
 describe('plugin_webworker_test', () => {

package/test/browser/test/require_test.js

@@ -1,8 +1,8 @@
 import { assert } from 'chai'
-import { NakoImportError } from 'nako3/nako_errors'
+import { NakoImportError } from 'nako3/nako_errors.mjs'
 
 navigator.exportWNako3 = true
-const WebNakoCompiler = require('nako3/wnako3')
+const WebNakoCompiler = require('nako3/wnako3.mjs')
 navigator.exportWNako3 = false
 
 /**

package/test/common/{array_test.js → array_test.mjs}

@@ -1,6 +1,6 @@
-const assert = require('assert')
-const NakoCompiler = require('../../src/nako3')
-const { expect } = require('chai')
+import assert from 'assert'
+import { NakoCompiler } from '../../src/nako3.mjs'
+import { expect } from 'chai'
 
 describe('array_test', () => {
   const nako = new NakoCompiler()

package/test/common/{basic_test.js → basic_test.mjs}

@@ -1,6 +1,6 @@
-const assert = require('assert')
-const NakoCompiler = require('../../src/nako3')
-const { expect } = require('chai')
+import assert from 'assert'
+import { NakoCompiler } from '../../src/nako3.mjs'
+import { expect } from 'chai'
 
 describe('basic', () => {
   const nako = new NakoCompiler()
@@ -255,16 +255,6 @@ describe('basic', () => {
       , 'main.nako3')
     assert.strictEqual(log, '')
   })
-  it('単独で実行できるプログラムの出力', function (done) {
-    if (typeof process === 'undefined' || process.env.NODE_ENV === 'test') {return this.skip()}
-    const code = nako.compileStandalone('1+2を表示', 'main.nako3', false)    
-    Function('const console = { log: this.callback };\n' + code).apply({
-      callback: (/** @type {any} */text) => {
-        assert.strictEqual(text, '3')
-        done()
-      },
-    })
-  })
   it('resetされた後に関数名を取得できない問題の修正 #849', (done) => {
     const nako = new NakoCompiler()
     nako.logger.addListener('stdout', ({ noColor }) => {