nadesiko3 3.3.45 → 3.3.49

package/test/karma.config.js

@@ -1,91 +1,91 @@
-const path = require('path')
-
-module.exports = function(config) {
-  config.set({
-    basePath: '',
-    frameworks: ['mocha','webpack'],
-    files: [
-      'common/*.mjs'
-    ],
-    plugins: [
-      'karma-firefox-launcher',
-      'karma-mocha',
-      'karma-mocha-reporter',
-      'karma-webpack'
-    ],
-    customLaunchers: {
-        FirefoxCustom: {
-            base: 'Firefox',
-            prefs: {
-              'dom.w3c_touch_events.enabled': 1,
-              'dom.w3c_touch_events.legacy_apis.enabled': true
-            },
-            flags: [ '-width', 400, '-height', 400 ]
-        },
-        FirefoxCustomHeadless: {
-            base: 'FirefoxHeadless',
-            prefs: {
-              'dom.w3c_touch_events.enabled': 1,
-              'dom.w3c_touch_events.legacy_apis.enabled': true
-            },
-            flags: [ '-width', 400, '-height', 400 ]
-        }
-    },
-    preprocessors: {
-      'common/*.mjs': ['webpack']
-    },
-    // webpackの設定
-    webpack: {
-      mode: "development",
-      target: ["web", "es5"],
-      module: {
-        rules: [
-          {
-            test: /\.(js|mjs)$/,
-            exclude: /(node_modules|bower_components)/,
-            use: { loader: 'babel-loader' }
-          }
-        ]
-      },
-      resolve: {
-        mainFields: ["browser", "main", "module"],
-        alias: {
-          "assert": path.resolve(__dirname, '../utils/assert.js'),
-          "root": path.join(__dirname, ".."),
-          "nako3": path.join(__dirname, '../src'),
-          "utils" : path.join(__dirname, '../utils')
-        }
-      }
-    },
-    reporters: ['mocha'],
-    // reporter options
-    mochaReporter: {
-      showDiff: true,
-    },
-    coverageReporter: {
-      dir: '../coverage/common',
-      subdir: function(browser) {
-         return browser.toLowerCase().split(/[ /-]/)[0];
-      },
-      reporters: [
-        { type: 'text' },
-        { type: 'text-summary' },
-        { type: 'lcov' },
-        { type: 'text', file: 'text.txt' },
-        { type: 'json', file: 'text.json' },
-        { type: 'text-summary', file: 'text-summary.txt' },
-        { type: 'lcovonly', file: 'report-lcovonly.txt' },
-      ],
-      instrumenterOptions: {
-        istanbul: { noCompact: true }
-      }
-    },
-    port: 9876,  // karma web server port
-    colors: true,
-    logLevel: config.LOG_INFO,
-    browsers: ['Firefox', 'FirefoxHeadless', 'FirefoxCustom', 'FirefoxCustomHeadless' ],
-    autoWatch: false,
-    // singleRun: false, // Karma captures browsers, runs the tests and exits
-    concurrency: Infinity
-  })
-}
+const path = require('path')
+
+module.exports = function(config) {
+  config.set({
+    basePath: '',
+    frameworks: ['mocha','webpack'],
+    files: [
+      'common/*.mjs'
+    ],
+    plugins: [
+      'karma-firefox-launcher',
+      'karma-mocha',
+      'karma-mocha-reporter',
+      'karma-webpack'
+    ],
+    customLaunchers: {
+        FirefoxCustom: {
+            base: 'Firefox',
+            prefs: {
+              'dom.w3c_touch_events.enabled': 1,
+              'dom.w3c_touch_events.legacy_apis.enabled': true
+            },
+            flags: [ '-width', 400, '-height', 400 ]
+        },
+        FirefoxCustomHeadless: {
+            base: 'FirefoxHeadless',
+            prefs: {
+              'dom.w3c_touch_events.enabled': 1,
+              'dom.w3c_touch_events.legacy_apis.enabled': true
+            },
+            flags: [ '-width', 400, '-height', 400 ]
+        }
+    },
+    preprocessors: {
+      'common/*.mjs': ['webpack']
+    },
+    // webpackの設定
+    webpack: {
+      mode: "development",
+      target: ["web", "es5"],
+      module: {
+        rules: [
+          {
+            test: /\.(js|mjs)$/,
+            exclude: /(node_modules|bower_components)/,
+            use: { loader: 'babel-loader' }
+          }
+        ]
+      },
+      resolve: {
+        mainFields: ["browser", "main", "module"],
+        alias: {
+          "assert": path.resolve(__dirname, '../utils/assert.js'),
+          "root": path.join(__dirname, ".."),
+          "nako3": path.join(__dirname, '../src'),
+          "utils" : path.join(__dirname, '../utils')
+        }
+      }
+    },
+    reporters: ['mocha'],
+    // reporter options
+    mochaReporter: {
+      showDiff: true,
+    },
+    coverageReporter: {
+      dir: '../coverage/common',
+      subdir: function(browser) {
+         return browser.toLowerCase().split(/[ /-]/)[0];
+      },
+      reporters: [
+        { type: 'text' },
+        { type: 'text-summary' },
+        { type: 'lcov' },
+        { type: 'text', file: 'text.txt' },
+        { type: 'json', file: 'text.json' },
+        { type: 'text-summary', file: 'text-summary.txt' },
+        { type: 'lcovonly', file: 'report-lcovonly.txt' },
+      ],
+      instrumenterOptions: {
+        istanbul: { noCompact: true }
+      }
+    },
+    port: 9876,  // karma web server port
+    colors: true,
+    logLevel: config.LOG_INFO,
+    browsers: ['Firefox', 'FirefoxHeadless', 'FirefoxCustom', 'FirefoxCustomHeadless' ],
+    autoWatch: false,
+    // singleRun: false, // Karma captures browsers, runs the tests and exits
+    concurrency: Infinity
+  })
+}

package/test/node/async_test.mjs

@@ -1,82 +1,96 @@
-// @ts-nocheck
-/* eslint-disable no-undef */
-import assert from 'assert'
-import { Nako3Assert } from 'nadesiko3core/src/nako3_assert.mjs'
-
-// eslint-disable-next-line no-undef
-describe('async_test', () => {
-  const debug = false
-  const nako3 = new Nako3Assert()
-  const cmp = (/** @type {string} */ code, /** @type {string} */ exRes) => {
-    const result = nako3.run(code).log
-    assert.strictEqual(result, exRes)
-  }
-  const exe = (/** @type {string} */ code) => {
-    nako3.run(code)
-  }
-
-  // assert test
-  it('アサート自体のテスト', () => {
-    exe('3と3でテスト。')
-    cmp('3を表示', '3')
-  })
-
-  // --- async ---
-  it('async_simple', (done) => {
-    global.done = done
-    exe(
-      '逐次実行\n' +
-      '先に、1と表示\n' +
-      '次に、2と表示\n' +
-      '次に、表示ログと「1\n2\n」でテスト。\n' +
-      '次に、「global.done()」をJS実行。' +
-      'ここまで。\n'
-    )
-  })
-  it('async_multiple', (done) => {
-    global.done = done
-    exe(
-      '逐次実行\n' +
-      '先に\n' +
-      '  1と表示\n' +
-      '  2と表示\n' +
-      'ここまで\n' +
-      '次に、3と表示\n' +
-      '次に、表示ログと「1\n2\n3\n」でテスト。\n' +
-      '次に、「global.done()」をJS実行。' +
-      'ここまで。\n'
-    )
-  })
-  it('戻り値を使う', (done) => {
-    global.done = done
-    exe(
-      '逐次実行\n' +
-      '先に、それは30\n' +
-      '次に、それを表示\n' +
-      '次に、表示ログと「30\n」でテスト。\n' +
-      '次に、「global.done()」をJS実行。' +
-      'ここまで。\n'
-    )
-  })
-  it('同期タイマー', (done) => {
-    global.done = done
-    exe(
-      '逐次実行\n' +
-      '先に、0.01秒待機\n' +
-      '次に、30を表示\n' +
-      '次に、表示ログと「30\n」でテスト。\n' +
-      '次に、「global.done()」をJS実行。\n' +
-      'ここまで。\n'
-    )
-  })
-  it('連文 #373', (done) => {
-    global.done = done
-    exe(
-      '逐次実行\n' +
-      '先に、30に5を足して表示\n' +
-      '次に、表示ログと「35\n」でテスト。\n' +
-      '次に、「global.done()」をJS実行。\n' +
-      'ここまで。\n'
-    )
-  })
-})
+// @ts-nocheck
+/* eslint-disable no-undef */
+import assert from 'assert'
+import { NakoCompiler } from '../../core/src/nako3.mjs'
+
+const PluginMyTest = {
+  'テスト': {
+    type: 'func',
+    josi: [['と'], ['で']],
+    fn: (a, b) => {
+      assert.strictEqual(a, b)
+    }
+  }
+}
+
+// eslint-disable-next-line no-undef
+describe('async_test', async () => {
+  const debug = false
+  const cmp = async (/** @type {string} */ code, /** @type {string} */ exRes) => {
+    const nako3 = new NakoCompiler()
+    nako3.addPluginObject('PluginMyTest', PluginMyTest)
+    const result = await nako3.runAsync(code)
+    assert.strictEqual(result.log, exRes)
+  }
+  const exe = (/** @type {string} */ code) => {
+    const nako3 = new NakoCompiler()
+    nako3.addPluginObject('PluginMyTest', PluginMyTest)
+    nako3.runSync(code)
+  }
+
+  // assert test
+  it('アサート自体のテスト', async () => {
+    exe('3と3でテスト。')
+    await cmp('3を表示', '3')
+  })
+
+  // --- async ---
+  it('async_simple', (done) => {
+    global.done = done
+    exe(
+      '逐次実行\n' +
+      '先に、1と表示\n' +
+      '次に、2と表示\n' +
+      '次に、表示ログと「1\n2\n」でテスト。\n' +
+      '次に、「global.done()」をJS実行。' +
+      'ここまで。\n'
+    )
+  })
+  it('async_multiple', (done) => {
+    global.done = done
+    exe(
+      '逐次実行\n' +
+      '先に\n' +
+      '  1と表示\n' +
+      '  2と表示\n' +
+      'ここまで\n' +
+      '次に、3と表示\n' +
+      '次に、表示ログと「1\n2\n3\n」でテスト。\n' +
+      '次に、「global.done()」をJS実行。' +
+      'ここまで。\n'
+    )
+  })
+  it('戻り値を使う', (done) => {
+    global.done = done
+    exe(
+      '逐次実行\n' +
+      '先に、それは30\n' +
+      '次に、それを表示\n' +
+      '次に、表示ログと「30\n」でテスト。\n' +
+      '次に、「global.done()」をJS実行。' +
+      'ここまで。\n'
+    )
+  })
+  it('同期タイマー', (done) => {
+    global.done = done
+    exe(
+      '逐次実行\n' +
+      '先に、0.01秒待機\n' +
+      '次に、30を表示\n' +
+      '次に、表示ログと「30\n」でテスト。\n' +
+      '次に、「global.done()」をJS実行。\n' +
+      'ここまで。\n'
+    )
+  })
+  it('連文 #373', (done) => {
+    global.done = done
+    exe(
+      '逐次実行\n' +
+      '先に、30に5を足して表示\n' +
+      '次に、表示ログと「35\n」でテスト。\n' +
+      '次に、「global.done()」をJS実行。\n' +
+      'ここまで。\n'
+    )
+  })
+})
+

package/test/node/commander_ja_test.mjs

@@ -1,89 +1,89 @@
-/* eslint-disable no-undef */
-import assert from 'assert'
-import app from '../../src/commander_ja.mjs'
-
-// eslint-disable-next-line no-undef
-describe('commnder_ja', () => {
-  it('version', () => {
-    app.reset()
-    const c1 = app
-      .version('1.1.1', '-v,--version')
-      .option('-a,--aaa')
-      .parseStr(['node.js', 'cnako3.js', '-v'])
-    assert.strictEqual(c1, '1.1.1')
-
-    app.reset()
-    const c2 = app
-      .version('1.2.3', '-v,--version')
-      .option('-a,--aaa')
-      .parseStr(['node.js', 'cnako3.js', '--version'])
-    assert.strictEqual(c2, '1.2.3')
-  })
-  it('help', () => {
-    app.reset()
-    app.version('1.2.3', '-v,--version')
-      .usage('[opt] test')
-      .option('-a,--aaa', 'hoge')
-    const helpStr = app.getHelp()
-    const c1 = app.parseStr(['node.js', 'cnako3.js', '-h'])
-    const a = helpStr.replace(/\s$/g, '')
-    const b = c1.replace(/\s$/g, '')
-    assert.strictEqual(a, b)
-  })
-  it('args no params', () => {
-    app.reset()
-    app.version('1.2.3', '-v,--version')
-      .title('hoge')
-      .usage('[opt] test')
-      .option('-a,--aaa')
-    app.parseStr(['node.js', 'cnako3.js', 'aaa', 'bbb'])
-    assert.strictEqual(app.args[0], 'aaa')
-    assert.strictEqual(app.args[1], 'bbb')
-  })
-  it('args has params1', () => {
-    app.reset()
-    app.version('1.2.3', '-v,--version')
-      .title('hoge')
-      .usage('[opt] test')
-      .option('-a,--aaa')
-    app.parseStr(['node.js', 'cnako3.js', '-a'])
-    assert.strictEqual(app.aaa, true)
-  })
-  it('args has params2', () => {
-    app.reset()
-    app.version('1.2.3', '-v,--version')
-      .title('hoge')
-      .usage('[opt] test')
-      .option('-a, --aaa')
-    app.parseStr(['node.js', 'cnako3.js', '-a', 'bbb'])
-    assert.strictEqual(app.aaa, true)
-    assert.strictEqual(app.args[0], 'bbb')
-  })
-  it('args has params3', () => {
-    app.reset()
-    app.version('1.2.3', '-v,--version')
-      .title('hoge')
-      .usage('[opt] test')
-      .option('-e, --eval [source]', 'eval source')
-    app.parseStr(['node.js', 'cnako3.js', '-e', 'hoge'])
-    assert.strictEqual(app.eval, 'hoge')
-  })
-  it('args has params4', () => {
-    app.reset()
-    app.version('1.2.3', '-v,--version')
-      .usage('[opt] test')
-      .option('-e, --eval [source]', 'eval source')
-    app.parseStr(['node.js', 'cnako3.js', '-e'])
-    assert.strictEqual(app.eval, '')
-  })
-  it('args has params5', () => {
-    app.reset()
-    app.version('1.2.3', '-v,--version')
-      .usage('[opt] test')
-      .option('-e, --eval [source]', 'eval source')
-      .option('-E, --Eval [source]', 'Eval source')
-    app.parseStr(['node.js', 'cnako3.js', '-E', '-e', '-d', 'hoge', 'fuga'])
-    assert.strictEqual(app.eval, 'hoge')
-    assert.strictEqual(app.Eval, 'fuga')
-  })
-})
+/* eslint-disable no-undef */
+import assert from 'assert'
+import app from '../../src/commander_ja.mjs'
+
+// eslint-disable-next-line no-undef
+describe('commnder_ja', () => {
+  it('version', () => {
+    app.reset()
+    const c1 = app
+      .version('1.1.1', '-v,--version')
+      .option('-a,--aaa')
+      .parseStr(['node.js', 'cnako3.js', '-v'])
+    assert.strictEqual(c1, '1.1.1')
+
+    app.reset()
+    const c2 = app
+      .version('1.2.3', '-v,--version')
+      .option('-a,--aaa')
+      .parseStr(['node.js', 'cnako3.js', '--version'])
+    assert.strictEqual(c2, '1.2.3')
+  })
+  it('help', () => {
+    app.reset()
+    app.version('1.2.3', '-v,--version')
+      .usage('[opt] test')
+      .option('-a,--aaa', 'hoge')
+    const helpStr = app.getHelp()
+    const c1 = app.parseStr(['node.js', 'cnako3.js', '-h'])
+    const a = helpStr.replace(/\s$/g, '')
+    const b = c1.replace(/\s$/g, '')
+    assert.strictEqual(a, b)
+  })
+  it('args no params', () => {
+    app.reset()
+    app.version('1.2.3', '-v,--version')
+      .title('hoge')
+      .usage('[opt] test')
+      .option('-a,--aaa')
+    app.parseStr(['node.js', 'cnako3.js', 'aaa', 'bbb'])
+    assert.strictEqual(app.args[0], 'aaa')
+    assert.strictEqual(app.args[1], 'bbb')
+  })
+  it('args has params1', () => {
+    app.reset()
+    app.version('1.2.3', '-v,--version')
+      .title('hoge')
+      .usage('[opt] test')
+      .option('-a,--aaa')
+    app.parseStr(['node.js', 'cnako3.js', '-a'])
+    assert.strictEqual(app.aaa, true)
+  })
+  it('args has params2', () => {
+    app.reset()
+    app.version('1.2.3', '-v,--version')
+      .title('hoge')
+      .usage('[opt] test')
+      .option('-a, --aaa')
+    app.parseStr(['node.js', 'cnako3.js', '-a', 'bbb'])
+    assert.strictEqual(app.aaa, true)
+    assert.strictEqual(app.args[0], 'bbb')
+  })
+  it('args has params3', () => {
+    app.reset()
+    app.version('1.2.3', '-v,--version')
+      .title('hoge')
+      .usage('[opt] test')
+      .option('-e, --eval [source]', 'eval source')
+    app.parseStr(['node.js', 'cnako3.js', '-e', 'hoge'])
+    assert.strictEqual(app.eval, 'hoge')
+  })
+  it('args has params4', () => {
+    app.reset()
+    app.version('1.2.3', '-v,--version')
+      .usage('[opt] test')
+      .option('-e, --eval [source]', 'eval source')
+    app.parseStr(['node.js', 'cnako3.js', '-e'])
+    assert.strictEqual(app.eval, '')
+  })
+  it('args has params5', () => {
+    app.reset()
+    app.version('1.2.3', '-v,--version')
+      .usage('[opt] test')
+      .option('-e, --eval [source]', 'eval source')
+      .option('-E, --Eval [source]', 'Eval source')
+    app.parseStr(['node.js', 'cnako3.js', '-E', '-e', '-d', 'hoge', 'fuga'])
+    assert.strictEqual(app.eval, 'hoge')
+    assert.strictEqual(app.Eval, 'fuga')
+  })
+})