nadesiko3 3.7.13 → 3.7.14

package/core/src/plugin_math.mts

@@ -16,7 +16,7 @@ export default {
     type: 'func',
     josi: [],
     pure: true,
-    fn: function (): void {
+    fn: function(): void {
       // 初期化不要
     }
   },
@@ -25,7 +25,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.sin(v)
     }
   },
@@ -33,7 +33,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.cos(v)
     }
   },
@@ -41,7 +41,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.tan(v)
     }
   },
@@ -49,7 +49,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.asin(v)
     }
   },
@@ -57,7 +57,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.acos(v)
     }
   },
@@ -65,7 +65,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.atan(v)
     }
   },
@@ -73,7 +73,7 @@ export default {
     type: 'func',
     josi: [['と'], ['の']],
     pure: true,
-    fn: function (y: number, x: number): number {
+    fn: function(y: number, x: number): number {
       return Math.atan2(y, x)
     }
   },
@@ -81,7 +81,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (XY: number[]): number {
+    fn: function(XY: number[]): number {
       return Math.atan2(XY[1], XY[0]) / Math.PI * 180
     }
   },
@@ -89,7 +89,7 @@ export default {
     type: 'func',
     josi: [['を']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return v / Math.PI * 180
     }
   },
@@ -97,7 +97,7 @@ export default {
     type: 'func',
     josi: [['を']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return (v / 180) * Math.PI
     }
   },
@@ -105,7 +105,7 @@ export default {
     type: 'func',
     josi: [['を']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return v / Math.PI * 180
     }
   },
@@ -113,7 +113,7 @@ export default {
     type: 'func',
     josi: [['を']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return (v / 180) * Math.PI
     }
   },
@@ -123,7 +123,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (v: any): number {
+    fn: function(v: any): number {
       return (parseFloat(v) === 0) ? 0 : (v > 0) ? 1 : -1
     }
   },
@@ -131,8 +131,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: false,
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    fn: function (v: number, sys: NakoSystem): number {
+    fn: function(v: number, sys: NakoSystem): number {
       return sys.__exec('SIGN', [v])
     }
   },
@@ -140,7 +139,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (a: number): number {
+    fn: function(a: number): number {
       return Math.abs(a)
     }
   },
@@ -148,7 +147,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (a: number): number {
+    fn: function(a: number): number {
       return Math.abs(a)
     }
   },
@@ -156,7 +155,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (a: number): number {
+    fn: function(a: number): number {
       return Math.exp(a)
     }
   },
@@ -164,7 +163,7 @@ export default {
     type: 'func',
     josi: [['と'], ['の']],
     pure: true,
-    fn: function (a: number, b: number): number {
+    fn: function(a: number, b: number): number {
       return Math.hypot(a, b)
     }
   },
@@ -172,7 +171,7 @@ export default {
     type: 'func',
     josi: [['と'], ['の']],
     pure: true,
-    fn: function (a: number, b: number): number {
+    fn: function(a: number, b: number): number {
       return Math.hypot(a, b)
     }
   },
@@ -180,7 +179,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (a: number): number {
+    fn: function(a: number): number {
       return Math.log(a)
     }
   },
@@ -188,7 +187,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (a: number): number {
+    fn: function(a: number): number {
       return Math.log(a)
     }
   },
@@ -196,7 +195,7 @@ export default {
     type: 'func',
     josi: [['で'], ['の']],
     pure: true,
-    fn: function (a: number, b: number): number {
+    fn: function(a: number, b: number): number {
       if (a === 2) { return Math.LOG2E * Math.log(b) }
       if (a === 10) { return Math.LOG10E * Math.log(b) }
       return Math.log(b) / Math.log(a)
@@ -206,7 +205,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (a: number): number {
+    fn: function(a: number): number {
       return a % 1
     }
   },
@@ -214,7 +213,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (a: number): number {
+    fn: function(a: number): number {
       return a % 1
     }
   },
@@ -222,7 +221,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (a: number): number {
+    fn: function(a: number): number {
       return Math.trunc(a)
     }
   },
@@ -230,7 +229,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (a: any): number | undefined {
+    fn: function(a: any): number | undefined {
       // numberの場合
       if (typeof a === 'number') {
         return Math.floor(Math.random() * a)
@@ -254,7 +253,7 @@ export default {
     type: 'func',
     josi: [['から'], ['までの', 'の']],
     pure: true,
-    fn: function (a: number, b: number): number {
+    fn: function(a: number, b: number): number {
       return (Math.floor(Math.random() * (b - a + 1)) + a)
     }
   },
@@ -262,7 +261,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (a: number): number {
+    fn: function(a: number): number {
       return Math.sqrt(a)
     }
   },
@@ -270,7 +269,7 @@ export default {
     type: 'func',
     josi: [['の']],
     pure: true,
-    fn: function (a: number): number {
+    fn: function(a: number): number {
       return Math.sqrt(a)
     }
   },
@@ -280,7 +279,7 @@ export default {
     type: 'func',
     josi: [['を']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.round(v)
     }
   },
@@ -288,7 +287,7 @@ export default {
     type: 'func',
     josi: [['を', 'の']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.round(v)
     }
   },
@@ -296,7 +295,7 @@ export default {
     type: 'func',
     josi: [['を'], ['で']],
     pure: true,
-    fn: function (a: number, b: number): number {
+    fn: function(a: number, b: number): number {
       const base = Math.pow(10, b)
       return Math.ceil(a * base) / base
     }
@@ -305,7 +304,7 @@ export default {
     type: 'func',
     josi: [['を'], ['で']],
     pure: true,
-    fn: function (a: number, b: number): number {
+    fn: function(a: number, b: number): number {
       const base = Math.pow(10, b)
       return Math.floor(a * base) / base
     }
@@ -314,7 +313,7 @@ export default {
     type: 'func',
     josi: [['を'], ['で']],
     pure: true,
-    fn: function (a: number, b: number): number {
+    fn: function(a: number, b: number): number {
       const base = Math.pow(10, b)
       return Math.round(a * base) / base
     }
@@ -323,7 +322,7 @@ export default {
     type: 'func',
     josi: [['を']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.ceil(v)
     }
   },
@@ -331,7 +330,7 @@ export default {
     type: 'func',
     josi: [['を']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.ceil(v)
     }
   },
@@ -339,7 +338,7 @@ export default {
     type: 'func',
     josi: [['を']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.floor(v)
     }
   },
@@ -347,7 +346,7 @@ export default {
     type: 'func',
     josi: [['を']],
     pure: true,
-    fn: function (v: number): number {
+    fn: function(v: number): number {
       return Math.floor(v)
     }
   }

package/core/src/plugin_promise.mjs

@@ -14,7 +14,7 @@ export default {
         josi: [],
         pure: true,
         fn: function (sys) {
-            if (sys.__promise == null) {
+            if (sys.__promise === null || sys.__promise === undefined) {
                 sys.__promise = {
                     setLastPromise: function (promise) {
                         sys.__setSysVar('そ', promise);

package/core/src/plugin_promise.mts

@@ -15,10 +15,10 @@ export default {
     type: 'func',
     josi: [],
     pure: true,
-    fn: function (sys: NakoSystem) {
-      if ((sys as any).__promise == null) {
+    fn: function(sys: NakoSystem) {
+      if ((sys as any).__promise === null || (sys as any).__promise === undefined) {
         (sys as any).__promise = {
-          setLastPromise: function (promise: any) {
+          setLastPromise: function(promise: any) {
             sys.__setSysVar('そ', promise)
             return promise
           }
@@ -33,7 +33,7 @@ export default {
     type: 'func',
     josi: [['を', 'で']],
     pure: true,
-    fn: function (callback: any, sys: NakoSystem) {
+    fn: function(callback: any, sys: NakoSystem) {
       return (sys as any).__promise.setLastPromise(new Promise((resolve, reject) => {
         return callback(resolve, reject)
       }))
@@ -44,7 +44,7 @@ export default {
     type: 'func',
     josi: [['を'], ['の', 'が', 'に']],
     pure: true,
-    fn: function (callback: any, promise: any, sys: NakoSystem) {
+    fn: function(callback: any, promise: any, sys: NakoSystem) {
       return (sys as any).__promise.setLastPromise(promise.then((result:any) => {
         sys.__setSysVar('対象', result)
         return callback(result)
@@ -56,7 +56,7 @@ export default {
     type: 'func',
     josi: [['を'], ['の', 'が', 'に']],
     pure: true,
-    fn: function (cbFunc: any, promise: any, sys: NakoSystem): any {
+    fn: function(cbFunc: any, promise: any, sys: NakoSystem): any {
       return (sys as any).__promise.setLastPromise(promise.then((result: any) => {
         sys.__setSysVar('対象', result)
         return cbFunc(true, result, sys)
@@ -71,7 +71,7 @@ export default {
     type: 'func',
     josi: [['を'], ['の', 'が', 'に']],
     pure: true,
-    fn: function (callback: any, promise: any, sys: NakoSystem): any {
+    fn: function(callback: any, promise: any, sys: NakoSystem): any {
       return (sys as any).__promise.setLastPromise(promise.catch((err: any) => {
         sys.__setSysVar('対象', err)
         return callback(err)
@@ -83,7 +83,7 @@ export default {
     type: 'func',
     josi: [['を'], ['の', 'が', 'に']],
     pure: true,
-    fn: function (callback: any, promise: any, sys: NakoSystem): any {
+    fn: function(callback: any, promise: any, sys: NakoSystem): any {
       return (sys as any).__promise.setLastPromise(promise.finally(() => {
         return callback()
       }))
@@ -95,7 +95,7 @@ export default {
     josi: [['と', 'を']],
     isVariableJosi: true,
     pure: true,
-    fn: function (...args:any): any {
+    fn: function(...args:any): any {
       const sys = args.pop()
       return (sys).__promise.setLastPromise(Promise.all(args))
     },

package/core/src/plugin_system.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { NakoRuntimeError } from './nako_errors.mjs';
 export default {
     'meta': {
@@ -176,7 +175,6 @@ export default {
             sys.__evalSafe = (src) => {
                 // evalのスコープを変えるためのテクニック
                 // https://esbuild.github.io/content-types/#direct-eval
-                // eslint-disable-next-line no-eval
                 const _eval = eval;
                 try {
                     return _eval(src);
@@ -187,10 +185,8 @@ export default {
                 }
             };
             // eval function #1733 - 互換性を優先するため、direct evalを使うことに
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
             sys.__evalJS = (src, sys) => {
                 try {
-                    // eslint-disable-next-line no-eval
                     return eval(src);
                 }
                 catch (e) {
@@ -199,7 +195,6 @@ export default {
                 }
             };
             // Propアクセス支援
-            // eslint-disable-next-line @typescript-eslint/ban-types
             sys.__registPropAccessor = (f, getProp, setProp) => {
                 system.__propAccessor.push({
                     target: f,
@@ -637,7 +632,6 @@ export default {
         fn: function (b, ...a) {
             a.pop(); // 必ず末尾に sys があるので、末尾のシステム変数を除外
             a.push(b);
-            // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
             return a.reduce((p, c) => p + c);
         }
     },
@@ -779,7 +773,6 @@ export default {
         josi: [['を'], ['で']],
         fn: function (name, args, sys) {
             // nameが文字列ならevalして関数を得る
-            // eslint-disable-next-line no-eval
             if (typeof name === 'string') {
                 name = sys.__evalJS(name, sys);
             }
@@ -827,7 +820,6 @@ export default {
         josi: [['の'], ['を'], ['で']],
         fn: function (obj, m, args, sys) {
             // objが文字列ならevalして関数を得る
-            // eslint-disable-next-line no-eval
             if (typeof obj === 'string') {
                 obj = sys.__evalJS(obj, sys);
             }
@@ -2251,7 +2243,6 @@ export default {
         type: 'func',
         josi: [['から', 'の'], ['を']],
         pure: true,
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         fn: function (a, i, sys) {
             // 文字列のとき
             if (typeof a === 'string') {
@@ -3724,5 +3715,5 @@ export default {
             parts.pop();
             return parts.join(sep);
         }
-    },
+    }
 };