nadesiko3 3.7.2 → 3.7.4

package/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3core",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "description": "Japanese Programming Language Nadesiko v3 core",
   "main": "index.mjs",
   "type": "module",
@@ -38,15 +38,14 @@
     "sample"
   ],
   "devDependencies": {
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.3.1",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^20.17.46",
+    "@typescript-eslint/eslint-plugin": "^5.60.0",
     "chai": "^5.0.0",
     "eslint": "^8.43.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "eslint-config-standard-with-typescript": "^35.0.0",
     "mocha": "^10.2.0",
     "typescript": "^5.5.3"
   },

package/core/src/nako3.mjs

@@ -135,7 +135,7 @@ export class NakoCompiler {
                 continue;
             }
             // 取り込むライブラリ
-            let filename = tokens[i + 1].value + '';
+            let filename = String(tokens[i + 1].value) + '';
             // 『取り込む』文で「拡張プラグイン:」機構を追加する #139
             // (ex) !『貯蔵庫:ojyo-sama.nako3』を取り込む → https://n3s.nadesi.com/plain/ojyo-sama.nako3
             if (filename.startsWith('貯蔵庫:')) {
@@ -257,7 +257,7 @@ export class NakoCompiler {
                     loadNako3(item, tasks);
                 }
                 else {
-                    throw new NakoImportError(`ファイル『${item.value}』を読み込めません。ファイルが存在しないか未対応の拡張子です。`, item.firstToken.file, item.firstToken.line);
+                    throw new NakoImportError(`ファイル『${String(item.value)}』を読み込めません。ファイルが存在しないか未対応の拡張子です。`, item.firstToken.file, item.firstToken.line);
                 }
             }
             if (tasks.length > 0) {
@@ -282,7 +282,7 @@ export class NakoCompiler {
         }
         catch (err) {
             // 同期処理では素直に例外を投げる
-            this.logger.error('' + err);
+            this.logger.error(String(err));
             throw err;
         }
     }
@@ -464,9 +464,9 @@ export class NakoCompiler {
             const filePath = Object.keys(this.dependencies).find((key) => this.dependencies[key].alias.has(r.value));
             if (filePath === undefined) {
                 if (!r.firstToken) {
-                    throw new Error(`ファイル『${r.value}』が読み込まれていません。`);
+                    throw new Error(`ファイル『${String(r.value)}』が読み込まれていません。`);
                 }
-                throw new NakoLexerError(`ファイル『${r.value}』が読み込まれていません。`, r.firstToken.startOffset || 0, r.firstToken.endOffset || 0, r.firstToken.line, r.firstToken.file);
+                throw new NakoLexerError(`ファイル『${String(r.value)}』が読み込まれていません。`, (r.firstToken).startOffset || 0, (r.firstToken).endOffset || 0, (r.firstToken).line, (r.firstToken).file);
             }
             this.dependencies[filePath].addPluginFile();
             const children = cloneAsJSON(this.dependencies[filePath].tokens);
@@ -669,6 +669,7 @@ export class NakoCompiler {
      * @param [preCode]
      * @deprecated 代わりにrunAsyncメソッドを使ってください。(core #52)
      */
+    // eslint-disable-next-line @typescript-eslint/require-await
     async _run(code, fname, isReset, isTest, preCode = '') {
         const opts = newCompilerOptions({
             resetEnv: isReset,
@@ -702,7 +703,7 @@ export class NakoCompiler {
         // 実行前に環境を初期化するイベントを実行(beforeRun)
         this.eventList.filter(o => o.eventName === 'beforeRun').map(e => e.callback(nakoGlobal));
         try {
-            // eslint-disable-next-line no-new-func
+            // eslint-disable-next-line no-new-func, @typescript-eslint/no-implied-eval
             const f = new Function(nakoGlobal.lastJSCode);
             f.apply(nakoGlobal);
         }
@@ -740,6 +741,7 @@ export class NakoCompiler {
      * @param options オプション
      * @returns 実行に利用したグローバルオブジェクト
      */
+    // eslint-disable-next-line @typescript-eslint/require-await
     async runAsync(code, filename, options = undefined) {
         // コンパイル
         options = newCompilerOptions(options);

package/core/src/nako3.mts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // deno-lint-ignore-file no-explicit-any
 /**
@@ -9,7 +11,7 @@ import { Ast, AstBlocks } from './nako_ast.mjs'
 // parser / lexer
 import { NakoParser } from './nako_parser3.mjs'
 import { NakoLexer } from './nako_lexer.mjs'
-import { NakoPrepare, ConvertResult } from './nako_prepare.mjs'
+import { NakoPrepare } from './nako_prepare.mjs'
 import { NakoGen, generateJS, NakoGenOptions, NakoGenResult } from './nako_gen.mjs'
 import { convertInlineIndent, convertIndentSyntax } from './nako_indent_inline.mjs'
 import { convertDNCL } from './nako_from_dncl.mjs'
@@ -67,14 +69,14 @@ export interface NakoResetOption {
 }
 
 /** コンパイラ実行オプションを生成 */
-export function newCompilerOptions (initObj: any = {}): CompilerOptions {
+export function newCompilerOptions (initObj: Partial<CompilerOptions> = {}): CompilerOptions {
   if (typeof initObj !== 'object') { initObj = {} }
   initObj.testOnly = initObj.testOnly || false
   initObj.resetEnv = initObj.resetEnv || false
   initObj.resetAll = initObj.resetAll || false
   initObj.preCode = initObj.preCode || ''
   initObj.nakoGlobal = initObj.nakoGlobal || null
-  return initObj
+  return initObj as CompilerOptions
 }
 
 /** なでしこコンパイラ */
@@ -222,7 +224,7 @@ export class NakoCompiler {
         continue
       }
       // 取り込むライブラリ
-      let filename = tokens[i + 1].value + ''
+      let filename = String(tokens[i + 1].value) + ''
       // 『取り込む』文で「拡張プラグイン:」機構を追加する #139
       // (ex) !『貯蔵庫:ojyo-sama.nako3』を取り込む → https://n3s.nadesi.com/plain/ojyo-sama.nako3
       if (filename.startsWith('貯蔵庫:')) {
@@ -342,7 +344,7 @@ export class NakoCompiler {
         } else if (item.type === 'nako3') {
           loadNako3(item, tasks)
         } else {
-          throw new NakoImportError(`ファイル『${item.value}』を読み込めません。ファイルが存在しないか未対応の拡張子です。`,
+          throw new NakoImportError(`ファイル『${String(item.value)}』を読み込めません。ファイルが存在しないか未対応の拡張子です。`,
             (item.firstToken as Token).file, (item.firstToken as Token).line)
         }
       }
@@ -370,7 +372,7 @@ export class NakoCompiler {
       return result
     } catch (err) {
       // 同期処理では素直に例外を投げる
-      this.logger.error('' + err)
+      this.logger.error(String(err))
       throw err
     }
   }
@@ -562,11 +564,11 @@ export class NakoCompiler {
       }
       const filePath = Object.keys(this.dependencies).find((key) => this.dependencies[key].alias.has(r.value))
       if (filePath === undefined) {
-        if (!r.firstToken) { throw new Error(`ファイル『${r.value}』が読み込まれていません。`) }
-        throw new NakoLexerError(`ファイル『${r.value}』が読み込まれていません。`,
-          (r.firstToken as Token).startOffset || 0,
-          (r.firstToken as Token).endOffset || 0,
-          (r.firstToken as Token).line, (r.firstToken as Token).file)
+        if (!r.firstToken) { throw new Error(`ファイル『${String(r.value)}』が読み込まれていません。`) }
+        throw new NakoLexerError(`ファイル『${String(r.value)}』が読み込まれていません。`,
+          (r.firstToken).startOffset || 0,
+          (r.firstToken).endOffset || 0,
+          (r.firstToken).line, (r.firstToken).file)
       }
       this.dependencies[filePath].addPluginFile()
       const children = cloneAsJSON(this.dependencies[filePath].tokens)
@@ -681,10 +683,9 @@ export class NakoCompiler {
 
   _getUsedFuncs (ast: Ast): void {
     if (!ast) { return }
-    if ((ast.type === 'func' || ast.type === 'func_pointer')&& ast.name) {
+    if ((ast.type === 'func' || ast.type === 'func_pointer') && ast.name) {
       this.usedFuncs.add(ast.name as string)
-    }
-    else if ((ast as AstBlocks).blocks) { // プロパティにblocksを含んでいる？
+    } else if ((ast as AstBlocks).blocks) { // プロパティにblocksを含んでいる？
       for (const a of (ast as AstBlocks).blocks) {
         this._getUsedFuncs(a)
       }
@@ -745,7 +746,7 @@ export class NakoCompiler {
    * @param opt テストかどうか
    * @param mode 一般的に 'sync' を指定
    */
-  generateCode (ast: Ast, opt: NakoGenOptions, mode: string = 'sync'): NakoGenResult {
+  generateCode (ast: Ast, opt: NakoGenOptions, mode = 'sync'): NakoGenResult {
     // Select Code Generator #637
     // normal mode
     if (mode === 'sync') {
@@ -776,6 +777,7 @@ export class NakoCompiler {
    * @param [preCode]
    * @deprecated 代わりにrunAsyncメソッドを使ってください。(core #52)
    */
+  // eslint-disable-next-line @typescript-eslint/require-await
   async _run (code: string, fname: string, isReset: boolean, isTest: boolean, preCode = ''): Promise<NakoGlobal> {
     const opts: CompilerOptions = newCompilerOptions({
       resetEnv: isReset,
@@ -809,7 +811,7 @@ export class NakoCompiler {
     // 実行前に環境を初期化するイベントを実行(beforeRun)
     this.eventList.filter(o => o.eventName === 'beforeRun').map(e => e.callback(nakoGlobal))
     try {
-      // eslint-disable-next-line no-new-func
+      // eslint-disable-next-line no-new-func, @typescript-eslint/no-implied-eval
       const f = new Function(nakoGlobal.lastJSCode)
       f.apply(nakoGlobal)
     } catch (err: any) {
@@ -848,6 +850,7 @@ export class NakoCompiler {
    * @param options オプション
    * @returns 実行に利用したグローバルオブジェクト
    */
+  // eslint-disable-next-line @typescript-eslint/require-await
   public async runAsync (code: string, filename: string, options: CompilerOptions|undefined = undefined): Promise<NakoGlobal> {
     // コンパイル
     options = newCompilerOptions(options)

package/core/src/nako_ast.mts

@@ -57,7 +57,6 @@ export type NodeType = 'nop'
   | 'speed_mode'
   | 'run_mode'
 
-
 /** 基本的なASTの構造 */
 export interface Ast {
   type: NodeType;
@@ -156,8 +155,8 @@ export interface AstFor extends AstBlocks {
   // blocks[1] ... valueTo
   // blocks[2] ... valueInc
   // blocks[3] ... loop block
-  flagDown: boolean; // 
-  flagUp: boolean; // 
+  flagDown: boolean; //
+  flagUp: boolean; //
   loopDirection: null | 'up' | 'down'; // ループの方向
 }
 

package/core/src/nako_core_version.mjs

@@ -1,8 +1,8 @@
 // 実際のバージョン定義 (自動生成されるので以下を編集しない)
 const coreVersion = {
-    version: '3.7.2',
+    version: '3.7.4',
     major: 3,
     minor: 7,
-    patch: 2
+    patch: 4
 };
 export default coreVersion;

package/core/src/nako_core_version.mts

@@ -11,9 +11,9 @@ export interface NakoCoreVersion {
 }
 // 実際のバージョン定義 (自動生成されるので以下を編集しない)
 const coreVersion: NakoCoreVersion = {
-  version: '3.7.2',
+  version: '3.7.4',
   major: 3,
   minor: 7,
-  patch: 2
+  patch: 4
 }
 export default coreVersion

package/core/src/nako_csv.mjs

@@ -9,6 +9,7 @@ export function resetEnv() {
     options.auto_convert_number = true;
 }
 /// 文字列が数値化どうか判定する関数
+// eslint-disable-next-line camelcase
 function is_numeric(str) {
     return /^-?\d+(\.\d+)?([eE][-+]?\d+)?$/.test(str);
 }

package/core/src/nako_csv.mts

@@ -18,8 +18,9 @@ export function resetEnv (): void {
 }
 
 /// 文字列が数値化どうか判定する関数
-function is_numeric(str: string): boolean {
-  return /^-?\d+(\.\d+)?([eE][-+]?\d+)?$/.test(str);
+// eslint-disable-next-line camelcase
+function is_numeric (str: string): boolean {
+  return /^-?\d+(\.\d+)?([eE][-+]?\d+)?$/.test(str)
 }
 
 export function parse (txt: string, delimiter: string|undefined = undefined): (string|number)[][] {

package/core/src/nako_from_dncl.mjs

@@ -201,7 +201,7 @@ export function convertDNCL(tokens) {
     // 最後に単純な置換を行う
     for (let i = 0; i < tokens.length; i++) {
         const t = tokens[i];
-        const a = DNCL_SIMPLES[t.type + ':' + t.value];
+        const a = DNCL_SIMPLES[String(t.type) + ':' + String(t.value)];
         if (a !== undefined) {
             t.type = a[0];
             t.value = a[1];

package/core/src/nako_from_dncl.mts

@@ -182,7 +182,7 @@ export function convertDNCL (tokens: Token[]): Token[] {
   // 最後に単純な置換を行う
   for (let i = 0; i < tokens.length; i++) {
     const t = tokens[i]
-    const a = DNCL_SIMPLES[t.type + ':' + t.value]
+    const a = DNCL_SIMPLES[String(t.type) + ':' + String(t.value)]
     if (a !== undefined) {
       t.type = a[0] as TokenType
       t.value = a[1]

package/core/src/nako_from_dncl2.mjs

@@ -247,7 +247,7 @@ export function convertDNCL2(tokens) {
     // 最後に単純な置換を行う
     for (let i = 0; i < tokens.length; i++) {
         const t = tokens[i];
-        const a = DNCL_SIMPLES[t.type + ':' + t.value];
+        const a = DNCL_SIMPLES[String(t.type) + ':' + String(t.value)];
         if (a !== undefined) {
             t.type = a[0];
             t.value = a[1];

package/core/src/nako_from_dncl2.mts

@@ -250,7 +250,7 @@ export function convertDNCL2 (tokens: Token[]): Token[] {
   // 最後に単純な置換を行う
   for (let i = 0; i < tokens.length; i++) {
     const t = tokens[i]
-    const a = DNCL_SIMPLES[t.type + ':' + t.value]
+    const a = DNCL_SIMPLES[String(t.type) + ':' + String(t.value)]
     if (a !== undefined) {
       t.type = a[0] as TokenType
       t.value = a[1]
@@ -273,7 +273,7 @@ export function convertDNCL2 (tokens: Token[]): Token[] {
  * @returns 合致したかどうか
  */
 function tokenEq (typeValues: any[], lines: Token[], fromIndex: number): boolean {
-  const check = (pattern: string|Array<string>, t: Token): boolean => {
+  const check = (pattern: string|Array<string>, t: { type: string, value: string }): boolean => {
     if (pattern instanceof Array) {
       for (let i = 0; i < pattern.length; i++) {
         if (check(pattern[i], t)) { return true }

package/core/src/nako_gen.mjs

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * パーサーが生成した中間オブジェクトを実際のJavaScriptのコードに変換する。
@@ -224,6 +225,7 @@ export class NakoGen {
     }
     /** @param {Ast} node */
     static convPrint(node) {
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         return `__print(${node});`;
     }
     /** @param {AstStrValue} node */
@@ -254,7 +256,7 @@ export class NakoGen {
         code += 'const __line = (lineno) => { __self.__v0.set(\'__line\', lineno); }\n';
         code += '__v0.set(\'__line\', \'l0:__getDefFuncCode\');\n';
         code += '__v0.set(\'__forceClose\', false);\n';
-        code += `__v0.set('__useDebug', ${this.debugOption.useDebug});\n`;
+        code += `__v0.set('__useDebug', ${String(this.debugOption.useDebug)});\n`;
         // 定数を埋め込む
         code += '__self.constPools = ' + JSON.stringify(this.constPools) + ';\n';
         code += '__self.constPoolsTemplate = ' + JSON.stringify(this.constPoolsTemplate) + ';\n';
@@ -278,7 +280,7 @@ export class NakoGen {
             let testCode = 'const __tests = [];\n';
             this.nakoTestFuncs.forEach((value) => {
                 const f = value.fn;
-                testCode += `${f};\n`;
+                testCode += `${String(f)};\n`;
             });
             if (testCode !== '') {
                 code += '__v0.set(\'__line\', \'テストの定義\');\n';
@@ -357,7 +359,7 @@ export class NakoGen {
                 // eslint-disable-next-line @typescript-eslint/no-empty-function
                 fn: () => { },
                 type: 'func',
-                asyncFn: t.asyncFn ? true : false,
+                asyncFn: !!t.asyncFn,
                 isExport: t.isExport
             });
             funcList.push({ name, node: t });
@@ -367,7 +369,7 @@ export class NakoGen {
             if (ast.blocks) {
                 // 各ブロックをくまなく巡回チェック
                 for (const t of ast.blocks) {
-                    if (t.type == 'def_func') { // 関数定義
+                    if (t.type === 'def_func') { // 関数定義
                         registFunc(t);
                     }
                     else {
@@ -423,7 +425,7 @@ export class NakoGen {
             return 'undefined';
         }
         if (typeof (node) !== 'object') {
-            return '' + node;
+            return '' + String(node);
         }
         // switch
         switch (node.type) {
@@ -584,7 +586,7 @@ export class NakoGen {
                     name,
                     isTop: false,
                     js: `__self.__varslist[${i}].get(${JSON.stringify(name)})`,
-                    js_set: `__self.__varslist[${i}].set(${JSON.stringify(name)}, ${jsvalue})`
+                    js_set: `__self.__varslist[${i}].set(${JSON.stringify(name)}, ${jsvalue ?? 'undefined'})`
                 };
             }
         }
@@ -621,7 +623,7 @@ export class NakoGen {
         if (i === 0) {
             const pv = this.__self.getNakoFunc(name);
             if (!pv) {
-                return `${res.js}/*[link_error]l${lno}:${position.file}*/`;
+                return `${res.js}/*[link_error]l${lno}:${position.file ?? 'unknown'}*/`;
             }
             if (pv.type === 'const' || pv.type === 'var') {
                 return res.js;
@@ -714,15 +716,15 @@ export class NakoGen {
     }
     addConstPool(msg, args, file, line) {
         // file
-        file = '' + file;
+        file = String(file);
         const fileNo = this.getConstPoolsTemplateId(file);
         // msg
         const msgNo = this.getConstPoolsTemplateId(msg);
         // args
         const args2 = [];
-        for (const i in args) {
-            const arg = '' + args[i];
-            const argNo = this.getConstPoolsTemplateId(arg);
+        for (const arg of args) {
+            const argStr = '' + String(arg);
+            const argNo = this.getConstPoolsTemplateId(argStr);
             args2.push(argNo);
         }
         const poolIndex = this.constPools.length;
@@ -1103,7 +1105,7 @@ export class NakoGen {
             `const ${varFrom} = ${kara};\n` +
             `const ${varTo} = ${made};\n` +
             `if (${varFrom} <= ${varTo}) { // up\n` +
-            `  if (${flagUp}) {` +
+            `  if (${String(flagUp)}) {` +
             `    for (let ${varI} = ${varFrom}; ${varI} <= ${varTo}; ${varI}+= ${inc}) {\n` +
             `      ${sorePrefex};${loopVarSetter}\n` +
             '      // for block begin\n' +
@@ -1112,7 +1114,7 @@ export class NakoGen {
             '    };\n' +
             '  };\n' +
             '} else { // down\n' +
-            `  if (${flagDown}) {` +
+            `  if (${String(flagDown)}) {` +
             `    for (let ${varI} = ${varFrom}; ${varI} >= ${varTo}; ${varI}-= ${inc}) {\n` +
             `      ${sorePrefex};${loopVarSetter}\n` +
             '      // for block begin\n' +
@@ -1362,11 +1364,11 @@ export class NakoGen {
             }
             else {
                 let argCode = this._convGen(arg, true);
-                if (argCode === "") {
+                if (argCode === '') {
                     argCode = 'undefined';
                 }
                 if (typeof argCode !== 'string') {
-                    argCode = "undefined";
+                    argCode = 'undefined';
                 }
                 args.push(`/*arg${i}*/${argCode}`);
             }
@@ -1407,7 +1409,7 @@ export class NakoGen {
             func = this.nakoFuncList.get(funcName);
             // 無名関数の可能性
             if (func === undefined) {
-                func = { return_none: false, asyncFn: node.asyncFn ? true : false };
+                func = { return_none: false, asyncFn: !!node.asyncFn };
             }
         }
         // 関数の参照渡しか？
@@ -1652,7 +1654,7 @@ export class NakoGen {
         let right = this._convGen(node.blocks[1], true);
         let left = this._convGen(node.blocks[0], true);
         if (op === '+' && this.speedMode.implicitTypeCasting === 0) {
-            if (node.blocks[0] && (node.blocks[0]).type !== 'number' && node.blocks[0].type !== 'bigint') {
+            if (node.blocks[0] && (node.blocks[0]).type !== 'number' && (node.blocks[0]).type !== 'bigint') {
                 left = `self.__parseFloatOrBigint(${left})`;
             }
             if (node.blocks[1] && (node.blocks[1]).type !== 'number' && (node.blocks[1]).type !== 'bigint') {
@@ -1768,10 +1770,10 @@ export class NakoGen {
     }
     // プロパティへの代入式 (#1793)
     convLetProp(node) {
-        if (!node.index || node.index.length == 0) {
+        if (!node.index || node.index.length === 0) {
             throw NakoSyntaxError.fromNode('代入する先のプロパティ名がありません。', node);
         }
-        if (!node.blocks || node.blocks.length == 0) {
+        if (!node.blocks || node.blocks.length === 0) {
             throw NakoSyntaxError.fromNode('代入する値がありません。', node);
         }
         const propList = node.index;
@@ -1827,13 +1829,13 @@ export class NakoGen {
         const propList = list;
         if (propList.length <= 1) {
             const propKey = propList[0].value;
-            const code_call = `${name}.__getProp('${propKey}', __self)`;
-            const code_prop = `${name}['${propKey}']`;
-            const code_checkAccessor = `__self.__checkPropAccessor('get', ${name});\n` +
-                `if (typeof ${name}.__getProp === 'function') { return ${code_call} }\n` +
-                `return ${code_prop}\n`;
-            const code_if = `if (${name}.__getProp) { return ${code_call} } else { ${code_checkAccessor} }`;
-            code = `( (()=>{ ${code_if} })() )`;
+            const codeCall = `${name}.__getProp('${propKey}', __self)`;
+            const codeProp = `${name}['${propKey}']`;
+            const codeCheckAccessor = `__self.__checkPropAccessor('get', ${name});\n` +
+                `if (typeof ${name}.__getProp === 'function') { return ${codeCall} }\n` +
+                `return ${codeProp}\n`;
+            const codeIf = `if (${name}.__getProp) { return ${codeCall} } else { ${codeCheckAccessor} }`;
+            code = `( (()=>{ ${codeIf} })() )`;
         }
         else {
             const arrs = [];
@@ -1845,13 +1847,13 @@ export class NakoGen {
             }
             const keyStr = keys.join('');
             const arrStr = '[' + arrs.join(',') + ']';
-            const code_call = `${name}.__getProp(${arrStr}, __self)`;
-            const code_prop = `${name}${keyStr}`;
-            const code_checkAccessor = `__self.__checkPropAccessor('get', ${name});\n` +
-                `if (${name}.__getProp) { return ${code_call} }\n` +
-                `return ${code_prop}\n`;
-            const code_if = `if (${name}.__getProp) { return ${code_call} } else { ${code_checkAccessor} }`;
-            code = `( (()=>{ ${code_if} })() )`;
+            const codeCall = `${name}.__getProp(${arrStr}, __self)`;
+            const codeProp = `${name}${keyStr}`;
+            const codeCheckAccessor = `__self.__checkPropAccessor('get', ${name});\n` +
+                `if (${name}.__getProp) { return ${codeCall} }\n` +
+                `return ${codeProp}\n`;
+            const codeIf = `if (${name}.__getProp) { return ${codeCall} } else { ${codeCheckAccessor} }`;
+            code = `( (()=>{ ${codeIf} })() )`;
         }
         return code;
     }
@@ -1913,7 +1915,7 @@ export class NakoGen {
             '/*[/convDefLocalVarlist]*/\n';
     }
     convString(node) {
-        let value = '' + node.value;
+        let value = String(node.value);
         value = value.replace(/\\/g, '\\\\');
         value = value.replace(/"/g, '\\"');
         value = value.replace(/\r/g, '\\r');
@@ -2055,7 +2057,7 @@ export function generateJS(com, ast, opt) {
     // (3) JSコードを実行するための事前ヘッダ部分の生成
     const jsInit = gen.getDefFuncCode(com, opt);
     // ランダムな関数名を生成
-    const funcID = '' + (new Date()).getTime() + '_' + Math.floor(0xFFFFFFFF * Math.random());
+    const funcID = String((new Date()).getTime()) + '_' + Math.floor(0xFFFFFFFF * Math.random()).toString();
     // テストの実行
     if (js && opt.isTest) {
         js += '\n__self._runTests(__tests);\n';