nadesiko3 3.2.52 → 3.3.3

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 () {
@@ -18,7 +18,7 @@ class WebNakoCompiler extends NakoCompiler {
   /**
    * ブラウザでtype="なでしこ"というスクリプトを得て実行する
    */
-  runNakoScript () {
+  async runNakoScript () {
     // スクリプトタグの中身を得る
     let nakoScriptCount = 0
     const scripts = document.querySelectorAll('script')
@@ -26,7 +26,14 @@ class WebNakoCompiler extends NakoCompiler {
       const script = scripts[i]
       if (script.type.match(NAKO_SCRIPT_RE)) {
         nakoScriptCount++
-        this.run(script.text, `script${i}.nako3`)
+        // URLからスクリプト名を見つける
+        const url = (typeof(window.location) == 'object') ? window.location.href : 'url_unknown'
+        const fname = `${url}#script${nakoScriptCount}.nako3`
+        const code = script.text
+        // 依存するライブラリをロード
+        await this.loadDependencies(code, fname)
+        // プログラムを実行
+        this.run(script.text, fname)
       }
     }
     console.log('実行したなでしこの個数=', nakoScriptCount)
@@ -59,11 +66,11 @@ class WebNakoCompiler extends NakoCompiler {
           value: (async () => {
             const res = await fetch(filePath)
             if (!res.ok) {
-              throw new NakoImportError(`ファイル ${filePath} のダウンロードに失敗しました: ${res.status} ${res.statusText}`, token.line, token.file)
+              throw new NakoImportError(`ファイル『${filePath}』のダウンロードに失敗しました: ${res.status} ${res.statusText}`, token.file, token.line)
             }
             const text = await res.text()
             if (!text.includes('navigator.nako3.addPluginObject')) {
-              throw new NakoImportError(`ファイル ${filePath} の中に文字列 "navigator.nako3.addPluginObject" が存在しません。現在、ブラウザ版のなでしこ言語v3は自動登録するプラグインのみをサポートしています。`, token.line, token.file)
+              throw new NakoImportError(`ファイル ${filePath} の中に文字列 "navigator.nako3.addPluginObject" が存在しません。現在、ブラウザ版のなでしこ言語v3は自動登録するプラグインのみをサポートしています。`, token.file, token.line)
             }
             // textの例: `navigator.nako3.addPluginObject('PluginRequireTest', { requiretest: { type: 'var', value: 100 } })`
             return () => {
@@ -74,7 +81,7 @@ class WebNakoCompiler extends NakoCompiler {
                 // eslint-disable-next-line no-new-func
                 Function(text)()
               } catch (err) {
-                throw new NakoImportError(`プラグイン ${filePath} の取り込みに失敗: ${err instanceof Error ? err.message : err + ''}`, token.line, token.file)
+                throw new NakoImportError(`プラグイン ${filePath} の取り込みに失敗: ${err instanceof Error ? err.message : err + ''}`, token.file, token.line)
               } finally {
                 navigator.nako3 = globalNako3
               }
@@ -93,7 +100,7 @@ class WebNakoCompiler extends NakoCompiler {
           value: (async () => {
             const res = await fetch(filePath)
             if (!res.ok) {
-              throw new NakoImportError(`ファイル ${filePath} のダウンロードに失敗しました: ${res.status} ${res.statusText}`, token.line, token.file)
+              throw new NakoImportError(`ファイル ${filePath} のダウンロードに失敗しました: ${res.status} ${res.statusText}`, token.file, token.line)
             }
             return await res.text()
           })()
@@ -114,17 +121,20 @@ class WebNakoCompiler extends NakoCompiler {
               const href = href_dir + '/' + name
               pathname = new URL(href).pathname
             } catch (e) {
-              throw new NakoImportError(`取り込み文の引数でパスが解決できません。https:// か http:// で始まるアドレスを指定してください。\n${e}`, token.line, token.file)
+              throw new NakoImportError(`取り込み文の引数でパスが解決できません。https:// か http:// で始まるアドレスを指定してください。\n${e}`, token.file, token.line)
             }
           }
         }
-        if (pathname.endsWith('.js') || pathname.endsWith('.js.txt')) {
+        // .js および .mjs なら JSプラグイン
+        if (pathname.endsWith('.js') || pathname.endsWith('.js.txt') || pathname.endsWith('.mjs') || pathname.endsWith('.mjs.txt')) {
           return { filePath: name, type: 'js' }
         }
+        // .nako3 なら なでしこ3プラグイン
         if (pathname.endsWith('.nako3') || pathname.endsWith('.nako3.txt')) {
           return { filePath: name, type: 'nako3' }
         }
-        return { filePath: name, type: 'invalid' }
+        // ファイル拡張子が未指定の場合
+        throw new NakoImportError(`ファイル『${name}』は拡張子が(.nako3|.js|.js.txt|.mjs|.mjs.txt)以外なので取り込めません。`, token.file, token.line)
       }
     })
   }

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
@@ -717,7 +723,7 @@ class LanguageFeatures {
      * @param {number} endRow
      */
   static toggleCommentLines (state, { doc }, startRow, endRow) {
-    const prepare = new NakoPrepare(new NakoLogger())
+    const prepare = NakoPrepare.getInstance(new NakoLogger())
     /**
          * @param {string} line
          * @returns {{ type: 'blank' | 'code' } | { type: 'comment', start: number, len: number }}
@@ -728,11 +734,11 @@ class LanguageFeatures {
       if (indent === line) {
         return { type: 'blank' }
       }
-      line = line.substr(indent.length)
+      line = line.substring(indent.length)
 
       // 先頭がコメントの開始文字かどうか確認する
-      const ch2 = line.substr(0, 2).split('').map((c) => prepare.convert1ch(c)).join('')
-      if (ch2.substr(0, 1) === '#') {
+      const ch2 = line.substring(0, 2).split('').map((c) => prepare.convert1ch(c)).join('')
+      if (ch2.substring(0, 1) === '#') {
         return { type: 'comment', start: indent.length, len: 1 + (line.charAt(1) === ' ' ? 1 : 0) }
       }
       if (ch2 === '//') {
@@ -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 }) => {

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

@@ -1,5 +1,5 @@
-const assert = require('assert')
-const NakoCompiler = require('../../src/nako3')
+import assert from 'assert'
+import { NakoCompiler } from '../../src/nako3.mjs'
 
 describe('calc_test.js', () => {
   const nako = new NakoCompiler()

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

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

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

@@ -1,6 +1,6 @@
-const assert = require('assert')
-const NakoDncl = require('../../src/nako_from_dncl')
-const NakoCompiler = require('../../src/nako3')
+import assert from 'assert'
+import { NakoCompiler } from '../../src/nako3.mjs'
+import { NakoDncl } from '../../src/nako_from_dncl.mjs'
 
 describe('dncl (#1140)', () => {
     const cmp = (src, expected) => {

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

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

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

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

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

@@ -1,6 +1,6 @@
-const assert = require('assert')
-const NakoCompiler = require('../../src/nako3')
-const NakoSyntaxError = require('../../src/nako_parser_base').NakoSyntaxError
+import assert from 'assert'
+import { NakoCompiler } from '../../src/nako3.mjs'
+import { NakoSyntaxError } from '../../src/nako_errors.mjs'
 
 describe('関数呼び出しテスト', () => {
   const nako = new NakoCompiler()

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

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

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

@@ -1,5 +1,6 @@
-const assert = require('assert')
-const NakoIndent = require('../../src/nako_indent')
+import assert from 'assert'
+import { NakoCompiler } from '../../src/nako3.mjs'
+import NakoIndent from '../../src/nako_indent.mjs'
 
 describe('indent', () => {
     const cmp = (src, expected) => {

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

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

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

@@ -1,5 +1,6 @@
-const assert = require('assert')
-const NakoCompiler = require('../../src/nako3')
+import assert from 'assert'
+import { NakoCompiler } from '../../src/nako3.mjs'
+
 describe('literal_test', () => {
   const nako = new NakoCompiler()
   // nako.logger.addListener('trace', ({ browserConsole }) => { console.log(...browserConsole) })

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

@@ -1,6 +1,6 @@
-const NakoColors = require('../../src/nako_colors')
-const assert = require('assert')
-const NakoLogger = require('root/src/nako_logger')
+import assert from 'assert'
+import { NakoColors } from '../../src/nako_colors.mjs'
+import { NakoLogger } from '../../src/nako_logger.mjs'
 
 describe('nako_logger_test', () => {
     it('色付けのテスト', () => {

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

@@ -1,9 +1,9 @@
-const assert = require('assert')
-const NakoCompiler = require('../../src/nako3')
-const PluginBrowser = require('../../src/plugin_browser')
+import assert from 'assert'
+import { NakoCompiler } from '../../src/nako3.mjs'
+import PluginBrowser from '../../src/plugin_browser.mjs'
 
 describe('plugin_browser_test', () => {
-  const nako = new NakoCompiler()
+  const nako = new NakoCompiler({useBasicPlugin: true})
   // nako.logger.addListener('trace', ({ browserConsole }) => { console.log(...browserConsole) })
   nako.addPluginFile('PluginBrowser', 'plugin_browser.js', PluginBrowser)
   const cmp = (code, res) => {

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

@@ -1,7 +1,7 @@
-const td = require('testdouble')
-const assert = require('assert').strict
-const PluginBrowser = require('../../src/plugin_browser')
-const { PluginUtHelper } = require('../../utils/plugin_ut_helper')
+import * as td from 'testdouble'
+import assert from 'assert'
+import PluginBrowser from '../../src/plugin_browser.mjs'
+import { PluginUtHelper } from '../../utils/plugin_ut_helper.js'
 
 class StubAudio {
   contructor () {

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

@@ -1,5 +1,5 @@
-const PluginBrowser = require('../../src/plugin_browser')
-const { PluginUtHelper } = require('../../utils/plugin_ut_helper')
+import PluginBrowser from '../../src/plugin_browser.mjs'
+import { PluginUtHelper } from '../../utils/plugin_ut_helper.js'
 
 describe('plugin_browser_color', () => {
   const cu = new PluginUtHelper(PluginBrowser)

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

@@ -1,6 +1,6 @@
-const td = require('testdouble')
-const assert = require('assert').strict
-const PluginBrowser = require('../../src/plugin_browser')
+import * as td from 'testdouble'
+import PluginBrowser from '../../src/plugin_browser.mjs'
+import assert from 'assert'
 
 describe('plugin_browser_dialog', () => {
   describe('言う', () => {

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

@@ -1,5 +1,5 @@
-const PluginBrowser = require('../../src/plugin_browser')
-const { PluginUtHelper } = require('../../utils/plugin_ut_helper')
+import PluginBrowser from '../../src/plugin_browser.mjs'
+import { PluginUtHelper } from '../../utils/plugin_ut_helper.js'
 
 describe('plugin_browser_html', () => {
   const cu = new PluginUtHelper(PluginBrowser)

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

@@ -1,5 +1,5 @@
-const PluginBrowser = require('../../src/plugin_browser')
-const { PluginUtHelper } = require('../../utils/plugin_ut_helper')
+import PluginBrowser from '../../src/plugin_browser.mjs'
+import { PluginUtHelper } from '../../utils/plugin_ut_helper.js'
 
 describe('plugin_browser_system', () => {
   const cu = new PluginUtHelper(PluginBrowser)

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

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

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

@@ -1,7 +1,7 @@
-const assert = require('assert')
-const NakoCompiler = require('../../src/nako3')
-const {NakoRuntimeError} = require('../../src/nako_errors')
-const PluginDateTime = require('../../src/plugin_datetime')
+import assert from 'assert'
+import { NakoCompiler } from '../../src/nako3.mjs'
+import {NakoRuntimeError} from '../../src/nako_errors.mjs'
+import PluginDateTime from '../../src/plugin_datetime.mjs'
 
 describe('plugin_datetime_test', () => {
   const nako = new NakoCompiler()

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

@@ -1,6 +1,6 @@
-const assert = require('assert')
-const NakoCompiler = require('../../src/nako3')
-const PluginKansuji = require('../../src/plugin_kansuji.js')
+import assert from 'assert'
+import { NakoCompiler } from '../../src/nako3.mjs'
+import PluginKansuji from '../../src/plugin_kansuji.mjs'
 
 describe('plugin_kansuji_test', () => {
   const nako = new NakoCompiler()

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

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

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

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

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

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