nadesiko3 3.7.13 → 3.7.14

package/src/cnako3.mts

@@ -5,7 +5,7 @@
 import { CNako3 } from './cnako3mod.mjs'
 
 // メイン
-(async () => {
+(async() => {
   const cnako3: CNako3 = new CNako3()
   try {
     await cnako3.execCommand()

package/src/cnako3mod.mjs

@@ -1,24 +1,22 @@
-/* eslint-disable @typescript-eslint/no-redundant-type-constituents */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 // deno-lint-ignore-file no-explicit-any
 /**
  * コマンドライン版のなでしこ3をモジュールとして定義
  * 実際には cnako3.mjs から読み込まれる
  */
 import fs from 'node:fs';
-import fse from 'fs-extra';
 import { exec } from 'node:child_process';
 import path from 'node:path';
+import url from 'node:url';
+import fse from 'fs-extra';
+import fetch from 'node-fetch';
 import { NakoCompiler, newCompilerOptions } from '../core/src/nako3.mjs';
 import { NakoImportError } from '../core/src/nako_errors.mjs';
+import { NakoGenOptions } from '../core/src/nako_gen.mjs';
 import nakoVersion from './nako_version.mjs';
 import PluginNode from './plugin_node.mjs';
 import app from './commander_ja.mjs';
-import fetch from 'node-fetch';
-import { NakoGenOptions } from '../core/src/nako_gen.mjs';
 import { getEnv, isWindows, getCommandLineArgs, exit } from './deno_wrapper.mjs';
 // __dirname のために
-import url from 'node:url';
 const __filename = url.fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 /** CNako3 */
@@ -569,7 +567,6 @@ export class CNako3 extends NakoCompiler {
                 const b = !!(stat && stat.isFile());
                 cachePath[f] = b;
                 return b;
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
             }
             catch (_) {
                 return false;

package/src/cnako3mod.mts

@@ -1,32 +1,32 @@
-/* eslint-disable @typescript-eslint/no-redundant-type-constituents */
-/* eslint-disable @typescript-eslint/no-explicit-any */
+ 
+ 
 // deno-lint-ignore-file no-explicit-any
 /**
  * コマンドライン版のなでしこ3をモジュールとして定義
  * 実際には cnako3.mjs から読み込まれる
  */
 import fs from 'node:fs'
-import fse from 'fs-extra'
 import { exec } from 'node:child_process'
 import path from 'node:path'
+import url from 'node:url'
+import fse from 'fs-extra'
 
+import fetch from 'node-fetch'
 import { NakoCompiler, LoaderTool, newCompilerOptions } from '../core/src/nako3.mjs'
 import { NakoImportError } from '../core/src/nako_errors.mjs'
 
 import { Ast, CompilerOptions } from '../core/src/nako_types.mjs'
 import { NakoGlobal } from '../core/src/nako_global.mjs'
+import { NakoGenOptions } from '../core/src/nako_gen.mjs'
 import nakoVersion from './nako_version.mjs'
 
 import PluginNode from './plugin_node.mjs'
 import app from './commander_ja.mjs'
-import fetch from 'node-fetch'
 
-import { NakoGenOptions } from '../core/src/nako_gen.mjs'
 
 import { getEnv, isWindows, getCommandLineArgs, exit } from './deno_wrapper.mjs'
 
 // __dirname のために
-import url from 'node:url'
 const __filename = url.fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 
@@ -57,7 +57,7 @@ export class CNako3 extends NakoCompiler {
   debug: boolean
   version: string
 
-  constructor (opts:CNako3Options = { nostd: false }) {
+  constructor(opts:CNako3Options = { nostd: false }) {
     super({ useBasicPlugin: !opts.nostd })
     this.debug = false
     this.filename = 'main.nako3'
@@ -73,7 +73,7 @@ export class CNako3 extends NakoCompiler {
   }
 
   // CNAKO3で使えるコマンドを登録する
-  registerCommands () {
+  registerCommands() {
     // コマンドライン引数を得る
     const args: string[] = getCommandLineArgs()
     // コマンド引数がないならば、ヘルプを表示(-hはcommandarにデフォルト用意されている)
@@ -108,7 +108,7 @@ export class CNako3 extends NakoCompiler {
   }
 
   /** コマンドライン引数を解析 */
-  checkArguments (): CNako3ArgOptions {
+  checkArguments(): CNako3ArgOptions {
     const app: any = this.registerCommands()
 
     let logLevel = 'error'
@@ -166,7 +166,7 @@ export class CNako3 extends NakoCompiler {
   }
 
   // 実行する
-  async execCommand () {
+  async execCommand() {
     // コマンドを解析
     const opt: CNako3ArgOptions = this.checkArguments()
     // 使い方の表示か？
@@ -247,7 +247,7 @@ export class CNako3 extends NakoCompiler {
   /**
    * コンパイルモードの場合
    */
-  async nakoCompile (opt: any, src: string, isTest: boolean) {
+  async nakoCompile(opt: any, src: string, isTest: boolean) {
     // 依存ライブラリなどを読み込む
     await this.loadDependencies(src, this.filename, '')
     // JSにコンパイル
@@ -300,7 +300,7 @@ export class CNako3 extends NakoCompiler {
     }
 
     if (opt.run) {
-      exec(`node ${opt.output}`, function (err, stdout, stderr) {
+      exec(`node ${opt.output}`, function(err, stdout, stderr) {
         if (err) { console.log('[ERROR]', stderr) }
         console.log(stdout)
       })
@@ -308,7 +308,7 @@ export class CNako3 extends NakoCompiler {
   }
 
   // ワンライナーの場合
-  async cnakoOneLiner (opt: any) {
+  async cnakoOneLiner(opt: any) {
     const org = opt.source
     try {
       if (opt.source.indexOf('表示') < 0) {
@@ -336,7 +336,7 @@ export class CNako3 extends NakoCompiler {
   /**
    * JSONを出力
    */
-  outputJSON (ast: any, level: number): string {
+  outputJSON(ast: any, level: number): string {
     const makeIndent = (level: number) => {
       let s = ''
       for (let i = 0; i < level; i++) { s += '  ' }
@@ -374,20 +374,20 @@ export class CNako3 extends NakoCompiler {
   /**
    * ASTを出力
    */
-  outputAST (opt: any, src: string) {
+  outputAST(opt: any, src: string) {
     const ast = this.parse(src, opt.mainfile)
     console.log(this.outputJSON(ast, 0))
   }
 
   // REPL(対話実行環境)の場合
-  async cnakoRepl () {
+  async cnakoRepl() {
     const fname = path.join(__dirname, 'repl.nako3')
     const src = fs.readFileSync(fname, 'utf-8')
     await this.runAsync(src, 'main.nako3')
   }
 
   // マニュアルを表示する
-  cnakoMan (command: string) {
+  cnakoMan(command: string) {
     try {
       const pathCommands = path.join(__dirname, '../release/command_cnako3.json')
       const commands = JSON.parse(fs.readFileSync(pathCommands, 'utf-8'))
@@ -405,13 +405,13 @@ export class CNako3 extends NakoCompiler {
   }
 
   // 対応機器/Webブラウザを表示する
-  cnakoBrowsers () {
+  cnakoBrowsers() {
     const fileMD = path.resolve(__dirname, '../doc', 'browsers.md')
     console.log(fs.readFileSync(fileMD, 'utf-8'))
   }
 
   // (js|nako3) loader
-  getLoaderTools () {
+  getLoaderTools() {
     /** @type {string[]} */
     const log: string[] = []
     const tools: LoaderTool = {
@@ -452,7 +452,7 @@ export class CNako3 extends NakoCompiler {
         // ファイルかHTTPか
         if (name.startsWith('http://') || name.startsWith('https://')) {
           // Webのファイルを非同期で読み込む
-          loader.task = (async () => {
+          loader.task = (async() => {
             const res = await fetch(name)
             if (!res.ok) {
               throw new NakoImportError(`『${name}』からのダウンロードに失敗しました: ${res.status} ${res.statusText}`, token.file, token.line)
@@ -561,7 +561,7 @@ export class CNako3 extends NakoCompiler {
   }
 
   /** 『!「xxx」を取込』の処理 */
-  async loadDependencies (code: string, filename: string, preCode: string) {
+  async loadDependencies(code: string, filename: string, preCode: string) {
     const tools = this.getLoaderTools()
     await super._loadDependencies(code, filename, preCode, tools)
   }
@@ -569,7 +569,7 @@ export class CNako3 extends NakoCompiler {
   /**
    * 非同期でなでしこのコードを実行する
    */
-  async runAsync (code: string, fname: string, options: CompilerOptions|undefined = undefined): Promise<NakoGlobal> {
+  async runAsync(code: string, fname: string, options: CompilerOptions|undefined = undefined): Promise<NakoGlobal> {
     // オプション
     const opt = newCompilerOptions(options)
     // 取り込む文
@@ -586,7 +586,7 @@ export class CNako3 extends NakoCompiler {
    * @param log
    * @return フルパス、失敗した時は、''を返す
    */
-  static findJSPluginFile (pname: string, filename: string, srcDir: string, log: string[] = []): string {
+  static findJSPluginFile(pname: string, filename: string, srcDir: string, log: string[] = []): string {
     log.length = 0
     const cachePath: {[key: string]: boolean} = {}
     /** キャッシュ付きでファイルがあるか検索 */
@@ -599,7 +599,7 @@ export class CNako3 extends NakoCompiler {
         const b = !!(stat && stat.isFile())
         cachePath[f] = b
         return b
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+       
       } catch (_: any) {
         return false
       }

package/src/commander_ja.mts

@@ -7,7 +7,7 @@ const CommanderJa: {[key: string]: any} = {
   _usage: '',
   _version: '1.0.0',
   _title: '',
-  reset: function () {
+  reset: function() {
     this.args = []
     this._alias = {}
     this._hasarg = {}
@@ -22,7 +22,7 @@ const CommanderJa: {[key: string]: any} = {
      * @param {*} ver version info
      * @param {*} cmd -v, --version
      */
-  version (ver: string, cmd: string) {
+  version(ver: string, cmd: string) {
     this.option(cmd, 'バージョン情報を表示')
     this._version = ver
     return this
@@ -30,14 +30,14 @@ const CommanderJa: {[key: string]: any} = {
   /**
      * @param {string} title
      */
-  title (title: string) {
+  title(title: string) {
     this._title = title
     return this
   },
   /**
      * @param {string} usage
      */
-  usage (usage: string) {
+  usage(usage: string) {
     this._usage = usage
     return this
   },
@@ -45,7 +45,7 @@ const CommanderJa: {[key: string]: any} = {
      * @param {string} cmd
      * @param {string} desc
      */
-  option (cmd: string, desc: string) {
+  option(cmd: string, desc: string) {
     this._help.push([cmd, desc])
     let name1 = ''
     const name2: any = /** @type {string[]} */([])
@@ -80,7 +80,7 @@ const CommanderJa: {[key: string]: any} = {
      * @param {string[]} argv
      * @return {string}
      */
-  parseStr (argv: string[]): string {
+  parseStr(argv: string[]): string {
     this.args = []
     const paramStack: string[] = []
     let lastOpt = ''
@@ -133,7 +133,7 @@ const CommanderJa: {[key: string]: any} = {
      * parse
      * @param {*} argv
      */
-  parse (argv: any) {
+  parse(argv: any) {
     const s = this.parseStr(argv)
     if (s === '') {
       return this
@@ -147,7 +147,7 @@ const CommanderJa: {[key: string]: any} = {
     }
   },
 
-  getHelp () {
+  getHelp() {
     let ss = ''
     if (this._title) {
       ss += this._title + '\n'

package/src/deno_wrapper.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /** get environment name */
 export function getEnv(name) {
     if (typeof globalThis.process !== 'undefined' && globalThis.process.env !== undefined) {

package/src/deno_wrapper.mts

@@ -1,7 +1,7 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+ 
 
 /** get environment name */
-export function getEnv (name: string): string | undefined {
+export function getEnv(name: string): string | undefined {
   if (typeof (globalThis as any).process !== 'undefined' && (globalThis as any).process.env !== undefined) {
     return (globalThis as any).process.env[name]
   }
@@ -12,7 +12,7 @@ export function getEnv (name: string): string | undefined {
 }
 
 /** check is windows */
-export function isWindows (): boolean {
+export function isWindows(): boolean {
   if (typeof (globalThis as any).process !== 'undefined' && (globalThis as any).process.platform) {
     return (globalThis as any).process.platform === 'win32'
   }
@@ -23,7 +23,7 @@ export function isWindows (): boolean {
 }
 
 /** get command line arguments */
-export function getCommandLineArgs (): string[] {
+export function getCommandLineArgs(): string[] {
   // Node.js
   if (typeof (globalThis as any).process !== 'undefined' && (globalThis as any).process.argv) {
     return (globalThis as any).process.argv
@@ -40,7 +40,7 @@ export function getCommandLineArgs (): string[] {
 }
 
 /** Exit */
-export function exit (code: number): void {
+export function exit(code: number): void {
   if (typeof (globalThis as any).process !== 'undefined') {
     (globalThis as any).process.exit(code)
   }

package/src/nako_version.mjs

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

package/src/nako_version.mts

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

package/src/plugin_browser.mjs

@@ -226,7 +226,6 @@ const PluginBrowser = {
                 }
             };
             // DOMに動的プロパティの取得と設定を追加する
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             sys.__addPropMethod = (obj) => {
                 if (!obj) {
                     return;
@@ -238,38 +237,32 @@ const PluginBrowser = {
                         configurable: false,
                         value: true
                     });
-                    // 和スタイル・和属性の適用
+                    // DOM和スタイル・DOM和属性・DOMプロパティ情報の適用
                     const waStyle = sys.__getSysVar('DOM和スタイル');
                     const waAttr = sys.__getSysVar('DOM和属性');
+                    const waPriority = sys.__getSysVar('DOMプロパティ情報');
+                    const propsToDefine = [];
+                    if (waPriority) {
+                        propsToDefine.push(...Object.keys(waPriority));
+                    }
                     if (waStyle) {
-                        // 和スタイルを適用する
-                        for (const key of Object.keys(waStyle)) {
-                            Object.defineProperty(obj, key, {
-                                enumerable: false,
-                                configurable: true,
-                                get: function () {
-                                    return sys.__exec('DOM設定取得', [obj, key, sys]);
-                                },
-                                set: function (value) {
-                                    sys.__exec('DOM設定変更', [obj, key, value, sys]);
-                                }
-                            });
-                        }
+                        propsToDefine.push(...Object.keys(waStyle));
                     }
                     if (waAttr) {
-                        // 和属性を適用する
-                        for (const key of Object.keys(waAttr)) {
-                            Object.defineProperty(obj, key, {
-                                enumerable: false,
-                                configurable: true,
-                                get: function () {
-                                    return sys.__exec('DOM設定取得', [obj, key, sys]);
-                                },
-                                set: function (value) {
-                                    sys.__exec('DOM設定変更', [obj, key, value, sys]);
-                                }
-                            });
-                        }
+                        propsToDefine.push(...Object.keys(waAttr));
+                    }
+                    // プロパティを適用する
+                    for (const key of propsToDefine) {
+                        Object.defineProperty(obj, key, {
+                            enumerable: false,
+                            configurable: true,
+                            get: function () {
+                                return sys.__exec('DOM設定取得', [obj, key, sys]);
+                            },
+                            set: function (value) {
+                                sys.__exec('DOM設定変更', [obj, key, value, sys]);
+                            }
+                        });
                     }
                 }
             };
@@ -348,7 +341,6 @@ const PluginBrowser = {
     }
 };
 BrowserParts.forEach((a) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const b = {};
     Object.assign(b, a);
     // 各モジュールでの初期化処理は認めない

package/src/plugin_browser.mts

@@ -2,8 +2,8 @@
  * @fileOverview ブラウザプラグイン
  */
 import { NakoValue, NakoCallback, NakoCallbackEvent, NakoSystem } from '../core/src/plugin_api.mjs'
-import { NakoBrowsesrSystem, IBrowserDocument, IBrowserWindow, IBrowserLocation } from './plugin_browser_api.mjs'
 import { parsePosition } from '../core/src/nako_logger.mjs'
+import { NakoBrowsesrSystem, IBrowserDocument, IBrowserWindow, IBrowserLocation } from './plugin_browser_api.mjs'
 
 import PartBrowserColor from './plugin_browser_color.mjs'
 import PartBrowserSystem from './plugin_browser_system.mjs'
@@ -24,7 +24,6 @@ import PartBrowserHotkey from './plugin_browser_hotkey.mjs'
 import PartBrowserChart from './plugin_browser_chart.mjs'
 import PartBrowserCrypto from './plugin_browser_crypto.mjs'
 import PartBrowserCamera from './plugin_browser_camera.mjs'
-import { NakoRuntimeError } from '../core/src/nako_errors.mjs'
 
 const BrowserParts = [
   PartBrowserColor,
@@ -63,7 +62,7 @@ const PluginBrowser = {
     type: 'func',
     josi: [],
     pure: true,
-    fn: function (sys: NakoBrowsesrSystem) {
+    fn: function(sys: NakoBrowsesrSystem) {
       sys.engine = 'wnako'
       /* eslint no-global-assign: 0 */
       const doc: IBrowserDocument = (typeof document === 'undefined') ? { 'body': {}, 'querySelector': () => null } : document
@@ -222,7 +221,7 @@ const PluginBrowser = {
         }
       }
       // DOMに動的プロパティの取得と設定を追加する
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+       
       sys.__addPropMethod = (obj: any) => {
         if (!obj) { return }
         if (!obj.__nako3) {
@@ -232,38 +231,34 @@ const PluginBrowser = {
             configurable: false,
             value: true
           })
-          // 和スタイル・和属性の適用
+          // DOM和スタイル・DOM和属性・DOMプロパティ情報の適用
           const waStyle = sys.__getSysVar('DOM和スタイル')
           const waAttr = sys.__getSysVar('DOM和属性')
+          const waPriority = sys.__getSysVar('DOMプロパティ情報')        
+          
+          const propsToDefine: string[] = []
+          if (waPriority) {
+            propsToDefine.push(...Object.keys(waPriority))
+          }
           if (waStyle) {
-            // 和スタイルを適用する
-            for (const key of Object.keys(waStyle)) {
-              Object.defineProperty(obj, key, {
-                enumerable: false,
-                configurable: true,
-                get: function () {
-                  return sys.__exec('DOM設定取得', [obj, key, sys])
-                },
-                set: function (value: object) {
-                  sys.__exec('DOM設定変更', [obj, key, value, sys])
-                }
-              })
-            }
+            propsToDefine.push(...Object.keys(waStyle))
           }
           if (waAttr) {
-            // 和属性を適用する
-            for (const key of Object.keys(waAttr)) {
-              Object.defineProperty(obj, key, {
-                enumerable: false,
-                configurable: true,
-                get: function () {
-                  return sys.__exec('DOM設定取得', [obj, key, sys])
-                },
-                set: function (value: object) {
-                  sys.__exec('DOM設定変更', [obj, key, value, sys])
-                }
-              })
-            }
+            propsToDefine.push(...Object.keys(waAttr))
+          }
+          
+          // プロパティを適用する
+          for (const key of propsToDefine) {
+            Object.defineProperty(obj, key, {
+              enumerable: false,
+              configurable: true,
+              get: function() {
+                return sys.__exec('DOM設定取得', [obj, key, sys])
+              },
+              set: function(value: object) {
+                sys.__exec('DOM設定変更', [obj, key, value, sys])
+              }
+            })
           }
         }
       }
@@ -271,11 +266,11 @@ const PluginBrowser = {
       if (sys.__registPropAccessor && globalThis.Element) {
         sys.__registPropAccessor(
           Element,
-          function (prop: string|string[], sys: NakoSystem): unknown {
+          function(prop: string|string[], sys: NakoSystem): unknown {
             // @ts-expect-error: use this
             return sys.__exec('DOM設定取得', [(this as Element), prop, sys as NakoBrowsesrSystem])
           },
-          function (prop: string|string[], value: object, sys: NakoSystem): void {
+          function(prop: string|string[], value: object, sys: NakoSystem): void {
             // @ts-expect-error: use this
             sys.__exec('DOM設定変更', [(this as Element), prop, value, sys as NakoBrowsesrSystem])
           }
@@ -326,7 +321,7 @@ const PluginBrowser = {
     type: 'func',
     josi: [],
     pure: true,
-    fn: function (sys: NakoBrowsesrSystem) {
+    fn: function(sys: NakoBrowsesrSystem) {
       // chart.jsを破棄
       if (sys.__chartjs) {
         const chartjs = sys.__chartjs as { destroy: () => void }
@@ -345,7 +340,7 @@ const PluginBrowser = {
 }
 
 BrowserParts.forEach((a) => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+   
   const b: any = {}
   Object.assign(b, a)
   // 各モジュールでの初期化処理は認めない