nadesiko3 3.7.2 → 3.7.4

package/src/plugin_browser_dom_parts.mjs

@@ -296,6 +296,7 @@ export default {
                 rows = s;
             }
             // 入力項目に合わせて行を追加
+            // eslint-disable-next-line @typescript-eslint/no-for-in-array
             for (const rowIndex in rows) {
                 const row = rows[rowIndex];
                 let cols;
@@ -421,8 +422,7 @@ export default {
                         lbl2.innerHTML = ' ' + sys.__tohtmlQ(opt2);
                         lbl2.htmlFor = inp.id;
                     }
-                    // v3.2.33での拡張
-                    else if (val === '?送信' || val === '?submit') {
+                    else if (val === '?送信' || val === '?submit') { // v3.2.33での拡張
                         inp.type = 'submit';
                         inp.value = val.substring(1);
                         if (key !== '') {
@@ -533,43 +533,58 @@ export default {
                 const rr = [];
                 const rows = aa.split('\n');
                 for (const row of rows) {
-                    rr.push(row.split(","));
+                    rr.push(row.split(','));
                 }
                 aa = rr;
             }
-            const domOption = sys.__getSysVar("DOM部品オプション");
-            const bgColor = JSON.parse(JSON.stringify(domOption["テーブル背景色"])); // 複製して使う
-            const hasHeader = domOption["テーブルヘッダ"];
-            const isNumRight = domOption["テーブル数値右寄せ"];
+            const table = tbl;
+            // テーブル作成/テーブル更新の設定を読み取る
+            const domOption = sys.__getSysVar('DOM部品オプション');
+            // 背景色は複製して使う
+            const bgColor = JSON.parse(JSON.stringify(domOption['テーブル背景色']));
             for (let i = 0; i < 3; i++) {
-                bgColor.push("");
+                bgColor.push('');
             }
-            const bgHead = bgColor.shift() || "";
-            const table = tbl;
+            const bgHead = bgColor.shift() || '';
+            let hasHeader = domOption['テーブルヘッダ'];
+            let isNumRight = domOption['テーブル数値右寄せ'];
+            if (table.dataset.nakoTags) {
+                // 既存DOMから設定を読む
+                hasHeader = table.dataset.nakoTags.hasHeader;
+                isNumRight = table.dataset.nakoTags.isNumRight;
+            }
+            else {
+                // 設定をDOMに保存する
+                table.dataset.nakoTags = {
+                    hasHeader,
+                    isNumRight
+                };
+            }
+            // テーブルにデータを追加していく
             for (let i = 0; i < aa.length; i++) {
                 const rowNo = i;
                 const row = aa[rowNo];
-                const tr = document.createElement("tr");
+                const tr = document.createElement('tr');
                 // 色指定
-                if (bgHead !== "") {
+                if (bgHead !== '') {
                     const no = hasHeader ? rowNo : rowNo + 1;
                     tr.style.backgroundColor = no === 0 ? bgHead : bgColor[no % 2];
-                    tr.style.color = no === 0 ? "white" : "black";
+                    tr.style.color = no === 0 ? 'white' : 'black';
                 }
                 for (let col of row) {
-                    col = "" + col;
-                    const td = document.createElement(rowNo === 0 && hasHeader ? "th" : "td");
+                    col = '' + col;
+                    const td = document.createElement(rowNo === 0 && hasHeader ? 'th' : 'td');
                     td.innerHTML = sys.__tohtml(col);
                     if (isNumRight && col.match(/^(\+|-)?\d+(\.\d+)?$/)) {
                         // number?
-                        td.style.textAlign = "right";
+                        td.style.textAlign = 'right';
                     }
                     tr.appendChild(td);
                 }
                 table.appendChild(tr);
             }
             return table;
-        },
+        }
     },
     'テーブルセル変更': {
         type: 'func',
@@ -595,7 +610,7 @@ export default {
             const bgColor = JSON.parse(JSON.stringify(domOption['テーブル背景色'])); // 複製して使う
             const isNumRight = domOption['テーブル数値右寄せ'];
             while (bgColor.length < 3) { // オプションが壊れていた時のための補完
-                bgColor.push("white");
+                bgColor.push('white');
             }
             // 複数の範囲を一気に変更
             for (let y = 0; y < v.length; y++) {

package/src/plugin_browser_dom_parts.mts

@@ -32,7 +32,7 @@ export default {
     fn: function (skin: any, sys: any) {
       sys.__setSysVar('DOMスキン', skin)
     },
-    
+
     return_none: true
   },
   'DOM部品作成': { // @elmの要素を作成して『DOM親要素設定』で指定した要素に追加して、DOMオブジェクトを返す。(elmがDOM要素なら追加する) // @DOMぶひんさくせい
@@ -284,6 +284,7 @@ export default {
         rows = s
       }
       // 入力項目に合わせて行を追加
+      // eslint-disable-next-line @typescript-eslint/no-for-in-array
       for (const rowIndex in rows) {
         const row: Array<string>|string = rows[rowIndex]
         let cols: Array<string>
@@ -338,76 +339,62 @@ export default {
             inp.value = opt1
             inp.placeholder = opt2
             inp.name = key
-          }
-          else if (val === '?password') {
+          } else if (val === '?password') {
             inp.type = 'password'
             inp.value = opt1
             inp.placeholder = opt2
             inp.name = key
-          }
-          else if (val === '?number') {
+          } else if (val === '?number') {
             inp.type = 'number'
             inp.value = opt1
             inp.placeholder = opt2
             inp.name = key
-          }
-          else if (val === '?email') {
+          } else if (val === '?email') {
             inp.type = 'email'
             inp.value = opt1
             inp.placeholder = opt2
             inp.name = key
-          }
-          else if (val === '?tel') {
+          } else if (val === '?tel') {
             inp.type = 'tel'
             inp.value = opt1
             inp.placeholder = opt2
             inp.name = key
-          }
-          else if (val === '?file') {
+          } else if (val === '?file') {
             inp.type = 'file'
             inp.name = key
-          }
-          else if (val === '?date') {
+          } else if (val === '?date') {
             inp.type = 'date'
             inp.value = opt1.replace(/\//g, '-')
             inp.name = key
-          }
-          else if (val === '?month') {
+          } else if (val === '?month') {
             inp.type = 'month'
             inp.value = opt1.replace(/\//g, '-')
             inp.name = key
-          }
-          else if (val === '?time') {
+          } else if (val === '?time') {
             inp.type = 'time'
             inp.value = opt1
             inp.name = key
-          }
-          else if (val === '?color') {
+          } else if (val === '?color') {
             inp.type = 'color'
             inp.value = opt1
             inp.name = key
-          }
-          else if (val === '?hidden') {
+          } else if (val === '?hidden') {
             inp.type = 'hidden'
             inp.value = opt1
             inp.name = key
             isHidden = true
             frm.appendChild(inp)
-          }
-          else if (val === '?checkbox') {
+          } else if (val === '?checkbox') {
             inp.type = 'checkbox'
             inp.value = opt1
             inp.name = key
             lbl2.innerHTML = ' ' + sys.__tohtmlQ(opt2)
             lbl2.htmlFor = inp.id
-          }
-          // v3.2.33での拡張
-          else if (val === '?送信' || val === '?submit') {
+          } else if (val === '?送信' || val === '?submit') { // v3.2.33での拡張
             inp.type = 'submit'
             inp.value = val.substring(1)
             if (key !== '') { inp.name = key }
-          }
-          else if (val.substring(0, 3) === '?c#') {
+          } else if (val.substring(0, 3) === '?c#') {
             inp.type = 'color'
             inp.value = val.substring(2)
             inp.name = key
@@ -491,55 +478,69 @@ export default {
     fn: function (tbl: any, aa: any, sys: any) {
       // 既存のテーブルを取得
       if (typeof tbl === 'string') {
-        tbl = sys.__query(tbl, 'テーブル更新', false);
+        tbl = sys.__query(tbl, 'テーブル更新', false)
       }
-      tbl.innerHTML = ''; // 初期化
+      tbl.innerHTML = '' // 初期化
       // テーブルに差し込むデータを確認
       if (typeof aa === 'string') {
-        const rr = [];
-        const rows = aa.split('\n');
+        const rr = []
+        const rows = aa.split('\n')
         for (const row of rows) {
-          rr.push(row.split(","));
+          rr.push(row.split(','))
         }
-        aa = rr;
+        aa = rr
       }
-      const domOption = sys.__getSysVar("DOM部品オプション");
+      const table = tbl
+      // テーブル作成/テーブル更新の設定を読み取る
+      const domOption = sys.__getSysVar('DOM部品オプション')
+      // 背景色は複製して使う
       const bgColor: Array<string> = JSON.parse(
-        JSON.stringify(domOption["テーブル背景色"]),
-      ); // 複製して使う
-      const hasHeader: boolean = domOption["テーブルヘッダ"];
-      const isNumRight: boolean = domOption["テーブル数値右寄せ"];
+        JSON.stringify(domOption['テーブル背景色'])
+      )
       for (let i = 0; i < 3; i++) {
-        bgColor.push("");
+        bgColor.push('')
       }
-      const bgHead = bgColor.shift() || "";
-      const table = tbl
+      const bgHead = bgColor.shift() || ''
+      let hasHeader: boolean = domOption['テーブルヘッダ']
+      let isNumRight: boolean = domOption['テーブル数値右寄せ']
+      if (table.dataset.nakoTags) {
+        // 既存DOMから設定を読む
+        hasHeader = table.dataset.nakoTags.hasHeader
+        isNumRight = table.dataset.nakoTags.isNumRight
+      } else {
+        // 設定をDOMに保存する
+        table.dataset.nakoTags = {
+          hasHeader,
+          isNumRight
+        }
+      }
+      // テーブルにデータを追加していく
       for (let i = 0; i < aa.length; i++) {
-        const rowNo = i;
-        const row = aa[rowNo];
-        const tr = document.createElement("tr");
+        const rowNo = i
+        const row = aa[rowNo]
+        const tr = document.createElement('tr')
         // 色指定
-        if (bgHead !== "") {
-          const no = hasHeader ? rowNo : rowNo + 1;
-          tr.style.backgroundColor = no === 0 ? bgHead : bgColor[no % 2];
-          tr.style.color = no === 0 ? "white" : "black";
+        if (bgHead !== '') {
+          const no = hasHeader ? rowNo : rowNo + 1
+          tr.style.backgroundColor = no === 0 ? bgHead : bgColor[no % 2]
+          tr.style.color = no === 0 ? 'white' : 'black'
         }
         for (let col of row) {
-          col = "" + col;
+          col = '' + col
           const td = document.createElement(
-            rowNo === 0 && hasHeader ? "th" : "td",
-          );
-          td.innerHTML = sys.__tohtml(col);
+            rowNo === 0 && hasHeader ? 'th' : 'td'
+          )
+          td.innerHTML = sys.__tohtml(col)
           if (isNumRight && col.match(/^(\+|-)?\d+(\.\d+)?$/)) {
             // number?
-            td.style.textAlign = "right";
+            td.style.textAlign = 'right'
           }
-          tr.appendChild(td);
+          tr.appendChild(td)
         }
-        table.appendChild(tr);
+        table.appendChild(tr)
       }
-      return table;
-    },
+      return table
+    }
   },
   'テーブルセル変更': { // @TABLE要素のセル[行,列]をVへ変更する。Vが二次元配列変数であれば複数のセルを一括変更する // @てーぶるせるへんこう
     type: 'func',
@@ -561,7 +562,7 @@ export default {
       const bgColor = JSON.parse(JSON.stringify(domOption['テーブル背景色'])) // 複製して使う
       const isNumRight: boolean = domOption['テーブル数値右寄せ']
       while (bgColor.length < 3) { // オプションが壊れていた時のための補完
-        bgColor.push("white")
+        bgColor.push('white')
       }
       // 複数の範囲を一気に変更
       for (let y = 0; y < v.length; y++) {

package/src/plugin_browser_speech.mjs

@@ -26,7 +26,7 @@ export default {
                     console.log('#話す:', s);
                 }
                 catch (err) {
-                    reject(err);
+                    reject(err instanceof Error ? err : new Error(String(err)));
                 }
             });
         }

package/src/plugin_browser_speech.mts

@@ -25,7 +25,7 @@ export default {
           window.speechSynthesis.speak(msg)
           console.log('#話す:', s)
         } catch (err) {
-          reject(err)
+          reject(err instanceof Error ? err : new Error(String(err)))
         }
       })
     }

package/src/plugin_node.mjs

@@ -753,7 +753,7 @@ export default {
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             exec(cmd, (err, stdout, stderr) => {
                 if (err) {
-                    throw new Error('[エラー]『圧縮時』' + err);
+                    throw new Error('[エラー]『圧縮時』' + (err.message || JSON.stringify(err)));
                 }
                 callback(stdout);
             });
@@ -998,6 +998,7 @@ export default {
         pure: true,
         fn: function (callback, url, params, sys) {
             const flist = [];
+            // eslint-disable-next-line @typescript-eslint/no-for-in-array
             for (const key in params) {
                 const v = params[key];
                 const kv = encodeURIComponent(key) + '=' + encodeURIComponent(v);
@@ -1103,6 +1104,7 @@ export default {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         fn: function (url, params, sys) {
             const flist = [];
+            // eslint-disable-next-line @typescript-eslint/no-for-in-array
             for (const key in params) {
                 const v = params[key];
                 const kv = encodeURIComponent(key) + '=' + encodeURIComponent(v);
@@ -1224,7 +1226,7 @@ export default {
                 }).then(text => {
                     resolve(text);
                 }).catch(err => {
-                    reject(err.message);
+                    reject(new Error(err.message));
                 });
             });
         }
@@ -1250,7 +1252,7 @@ export default {
                 }).then(text => {
                     resolve(text);
                 }).catch(err => {
-                    reject(err.message);
+                    reject(new Error(err.message));
                 });
             });
         }

package/src/plugin_node.mts

@@ -683,7 +683,7 @@ export default {
       const cmd = `${tpath} x ${a} -o${b} -y`
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       exec(cmd, (err, stdout, stderr) => {
-        if (err) { throw new Error('[エラー]『解凍時』' + err) }
+        if (err) { throw new Error('[エラー]『解凍時』' + (err as unknown as string)) }
         callback(stdout)
       })
     },
@@ -713,7 +713,7 @@ export default {
       const cmd = `${tpath} a -r ${b} ${a} -y`
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       exec(cmd, (err, stdout, stderr) => {
-        if (err) { throw new Error('[エラー]『圧縮時』' + err) }
+        if (err) { throw new Error('[エラー]『圧縮時』' + (err.message || JSON.stringify(err))) }
         callback(stdout)
       })
     },
@@ -942,6 +942,7 @@ export default {
     pure: true,
     fn: function (callback: any, url: string, params: [key: string], sys: NakoSystem) {
       const flist: Array<string> = []
+      // eslint-disable-next-line @typescript-eslint/no-for-in-array
       for (const key in params) {
         const v: string = params[key]
         const kv: string = encodeURIComponent(key) + '=' + encodeURIComponent(v)
@@ -1044,6 +1045,7 @@ export default {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     fn: function (url: string, params: [key: string], sys: NakoSystem) {
       const flist: Array<string> = []
+      // eslint-disable-next-line @typescript-eslint/no-for-in-array
       for (const key in params) {
         const v: string = params[key]
         const kv: string = encodeURIComponent(key) + '=' + encodeURIComponent(v)
@@ -1161,7 +1163,7 @@ export default {
         }).then(text => {
           resolve(text)
         }).catch(err => {
-          reject(err.message)
+          reject(new Error(err.message))
         })
       })
     }
@@ -1185,7 +1187,7 @@ export default {
         }).then(text => {
           resolve(text)
         }).catch(err => {
-          reject(err.message)
+          reject(new Error(err.message))
         })
       })
     }

package/src/plugin_weykturtle3d.mjs

@@ -2,7 +2,7 @@
  * PluginWeykTurtle3D
  * 3d turtle graphics plugin
  */
-import { ThreeUtil } from './plugin_three.mjs';
+import { ThreeUtil } from './plugin_weykturtle3d_threeutil.mjs';
 class DrawLineEventArgs {
     constructor(v1, v2, width, color) {
         this.v1 = v1;
@@ -11,6 +11,8 @@ class DrawLineEventArgs {
         this.color = color;
     }
 }
+class Command {
+}
 class CommandPromise {
     constructor(command, resolve, reject) {
         this.command = command;
@@ -18,8 +20,6 @@ class CommandPromise {
         this.reject = reject;
     }
 }
-class Command {
-}
 class CommandHome extends Command {
     constructor(mode) {
         super();
@@ -112,7 +112,8 @@ class CommandModel extends Command {
         this.model = model;
     }
 }
-class Turtle3D extends EventTarget {
+const TypedTurtle3DEventTarget = EventTarget;
+class Turtle3D extends TypedTurtle3DEventTarget {
     constructor(three, id) {
         super();
         this.three = three;
@@ -395,6 +396,10 @@ class WeykTurtle3DSystem {
         if (WeykTurtle3DSystem.instance === undefined) {
             WeykTurtle3DSystem.instance = new WeykTurtle3DSystem(sys);
         }
+        else if (WeykTurtle3DSystem.instance.sys !== sys) {
+            console.log('T3D: difference sys instance');
+            WeykTurtle3DSystem.instance.sys = sys;
+        }
         const i = WeykTurtle3DSystem.instance;
         i.instanceCount += 1;
         return WeykTurtle3DSystem.instance;
@@ -434,7 +439,6 @@ class WeykTurtle3DSystem {
                 scene.remove(this._axishelper);
                 scene.add(this._axishelper);
             }
-            this.initTurtle();
         }
     }
     disposeAllTurtle() {
@@ -659,22 +663,22 @@ class WeykTurtle3DSystem {
         else if (to instanceof HTMLCanvasElement) {
             renderer = new three.WebGLRenderer({ antialias: false, alpha: true, canvas: to });
             if (renderer === null) {
-                throw new Error('レンダラを作成できません');
+                throw new Error('レンダラを作成できません。指定したCanvas要素は使用できません');
             }
             renderer.setSize(to.width, to.height);
         }
         else if (to instanceof Element) {
             renderer = new three.WebGLRenderer({ antialias: false, alpha: true });
             if (renderer === null) {
-                throw new Error('レンダラを作成できません');
+                throw new Error('レンダラを作成できません。指定したDOM要素は使用できません');
             }
             renderer.setSize(to.clientWidth, to.clientHeight);
             to.appendChild(renderer.domElement);
         }
-        else
-            [
+        else {
             // never
-            ];
+            throw new Error('レンダラを作成できません。それは作成先に指定できません');
+        }
         renderer.setPixelRatio(window.devicePixelRatio);
         this._renderer = renderer;
         return this._renderer;
@@ -722,7 +726,7 @@ class WeykTurtle3DSystem {
         const geometry = new three.BufferGeometry();
         const vertices = new three.Float32BufferAttribute(6, 3);
         vertices.copyArray([v1.x, v1.y, v1.z, v2.x, v2.y, v2.z]);
-        const material = new three.LineBasicMaterial({ color: color, linewidth: width });
+        const material = new three.LineBasicMaterial({ color, linewidth: width });
         geometry.setAttribute('position', vertices);
         const line = new three.Line(geometry, material);
         if (this._lines) {
@@ -858,6 +862,17 @@ const PluginWeykTurtle3D = {
             sys.__setSysVar('THREE', null);
         }
     },
+    '!クリア': {
+        type: 'func',
+        josi: [],
+        pure: true,
+        fn: function (sys) {
+            if (sys.tags.weykturtle3d) {
+                sys.tags.weykturtle3d.clearAll();
+                sys.tags.weykturtle3d.clearRenderer();
+            }
+        }
+    },
     // @3Dタートルグラフィックス・ライブラリとプラグイン
     'THREE': { type: 'const', value: '' }, // @THREE
     'T3DベースURL': { type: 'var', value: 'https://cdn.jsdelivr.net/npm/three@0.127.0' }, // @T3DべーすURL
@@ -878,6 +893,8 @@ const PluginWeykTurtle3D = {
                     return true;
                 });
                 promise.catch(err => {
+                    console.error('T3D:ThreeJSのライブラリの読み込みに失敗しました');
+                    console.error(err);
                     return false;
                 });
                 return await promise;
@@ -902,15 +919,17 @@ const PluginWeykTurtle3D = {
                 promise.then(module => {
                     turtle3d.three = Object.assign({}, module);
                     turtle3d.ck();
-                    callback(true);
+                    callback(turtle3d.three !== null);
                 });
                 promise.catch(err => {
-                    callback(false);
+                    console.error('T3D:ThreeJSのライブラリの読み込みに失敗しました');
+                    console.error(err);
+                    callback(turtle3d.three !== null);
                 });
             }
             else {
                 turtle3d.ck();
-                callback(true);
+                callback(turtle3d.three !== null);
             }
         },
         return_none: true
@@ -941,7 +960,7 @@ const PluginWeykTurtle3D = {
                                 resolve();
                             }
                             else {
-                                reject();
+                                reject(new Error('読み込みに失敗したプラグインがあります'));
                             }
                         }
                     };
@@ -954,6 +973,8 @@ const PluginWeykTurtle3D = {
                         callbacks(true);
                     });
                     promise.catch(err => {
+                        console.error('T3D:ThreeJSのプラグインの読み込みに失敗しました');
+                        console.error(err);
                         callbacks(false);
                     });
                 }
@@ -992,6 +1013,8 @@ const PluginWeykTurtle3D = {
                     callbacks(true);
                 });
                 promise.catch(err => {
+                    console.error('T3D:ThreeJSのプラグインの読み込みに失敗しました');
+                    console.error(err);
                     callbacks(false);
                 });
             }