@famibee/skynovel 1.25.2 → 1.25.3

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [1.25.3](https://github.com/famibee/SKYNovel/compare/v1.25.2...v1.25.3) (2021-12-25)
+
+
+### Bug Fixes
+
+* 本文冒頭でリジューム（load＆save）するとエラーになる件 ([1f3f978](https://github.com/famibee/SKYNovel/commit/1f3f978b81c85b97fc4988a21599a57cae6e4de3))
+
+- fix: 本文冒頭でリジューム（load＆save）するとエラーになる件
+- docs: [event]にcall属性記述が抜けていたのを修正
+
+
 ## [1.25.2](https://github.com/famibee/SKYNovel/compare/v1.25.1...v1.25.2) (2021-12-24)
 
 

package/app.js

@@ -67578,7 +67578,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _EventMng_instances, _EventMng_elc, _EventMng_cvsHint, _EventMng_picHint_w, _EventMng_picHint_h, _EventMng_padHint, _EventMng_grpHint, _EventMng_gamepad, _EventMng_fcs, _EventMng_resvFlameEvent4Wheel, _EventMng_ev_keydown, _EventMng_ev_contextmenu, _EventMng_ev_wheel, _EventMng_wheeling, _EventMng_extend_wheel, _EventMng_ev_wheel_waitstop, _EventMng_hLocalEvt2Fnc, _EventMng_hGlobalEvt2Fnc, _EventMng_isDbgBreak, _EventMng_isWait, _EventMng_getEvt2Fnc, _EventMng_waitEventBase, _EventMng_firstWait, _EventMng_dispHint, _EventMng_dispHint_hArg, _EventMng_dispHint_ctnBtn, _EventMng_dispHint_masume, _EventMng_procWheel4wle, _EventMng_elcWLE, _EventMng_clear_event, _EventMng_clear_eventer, _EventMng_event, _EventMng_canFocus, _EventMng_getHtmlElmList, _EventMng_goTxt, _EventMng_l, _EventMng_p, _EventMng_fncCancelSkip, _EventMng_set_cancel_skip, _EventMng_unregisterClickEvts, _EventMng_set_focus, _EventMng_wait, _EventMng_waitclick, _EventMng_hDownKeys;
+var _EventMng_instances, _EventMng_elc, _EventMng_cvsHint, _EventMng_picHint_w, _EventMng_picHint_h, _EventMng_padHint, _EventMng_grpHint, _EventMng_gamepad, _EventMng_fcs, _EventMng_resvFlameEvent4Wheel, _EventMng_ev_keydown, _EventMng_ev_contextmenu, _EventMng_ev_wheel, _EventMng_wheeling, _EventMng_extend_wheel, _EventMng_ev_wheel_waitstop, _EventMng_hLocalEvt2Fnc, _EventMng_hGlobalEvt2Fnc, _EventMng_isDbgBreak, _EventMng_isWait, _EventMng_getEvt2Fnc, _EventMng_waitEventBase, _EventMng_firstWait, _EventMng_dispHint, _EventMng_dispHint_hArg, _EventMng_dispHint_ctnBtn, _EventMng_dispHint_masume, _EventMng_procWheel4wle, _EventMng_elcWLE, _EventMng_clear_event, _EventMng_clear_eventer, _EventMng_event, _EventMng_canFocus, _EventMng_getHtmlElmList, _EventMng_goTxt, _EventMng_l, _EventMng_p, _EventMng_fncCancelSkip, _EventMng_set_cancel_skip, _EventMng_set_focus, _EventMng_wait, _EventMng_waitclick, _EventMng_hDownKeys;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.EventMng = void 0;
 const CmnLib_1 = __webpack_require__(/*! ./CmnLib */ "./core/src/sn/CmnLib.ts");
@@ -68275,22 +68275,8 @@ _EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picH
         this.val.setVal_Nochk('tmp', 'sn.auto.enabled', false);
         this.layMng.setNormalWaitTxtLayer();
     }, "f");
-    __classPrivateFieldGet(this, _EventMng_instances, "m", _EventMng_unregisterClickEvts).call(this);
+    this.scrItr.unregisterClickEvts();
     return false;
-}, _EventMng_unregisterClickEvts = function _EventMng_unregisterClickEvts() {
-    const len = this.scrItr.lenCallStk;
-    for (let i = 0; i < len; ++i) {
-        const cs = this.scrItr.getCallStk(i);
-        if (!cs)
-            continue;
-        const hE1T = cs[':hEvt1Time'];
-        if (!hE1T)
-            continue;
-        delete hE1T['Click'];
-        delete hE1T['Enter'];
-        delete hE1T['ArrowDown'];
-        delete hE1T['wheel.y>0'];
-    }
 }, _EventMng_set_focus = function _EventMng_set_focus(hArg) {
     const add = hArg.add;
     if (add?.slice(0, 4) === 'dom=') {
@@ -71486,7 +71472,6 @@ class ScriptIterator {
         _ScriptIterator_lineNum.set(this, 0);
         this.addLineNum = (len) => __classPrivateFieldSet(this, _ScriptIterator_lineNum, __classPrivateFieldGet(this, _ScriptIterator_lineNum, "f") + len, "f");
         _ScriptIterator_aCallStk.set(this, []);
-        this.getCallStk = (idx) => __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[idx].csArg;
         _ScriptIterator_grm.set(this, new Grammar_1.Grammar);
         this.firstWait = () => { };
         _ScriptIterator_hHook.set(this, {
@@ -71538,7 +71523,7 @@ class ScriptIterator {
             stepout: o => {
                 if (__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_isIdxOverLast).call(this))
                     return;
-                if (this.lenCallStk > 0)
+                if (__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length > 0)
                     __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_go_stepout).call(this, true);
                 else
                     __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_go_stepover).call(this, o);
@@ -71641,7 +71626,7 @@ class ScriptIterator {
         hTag.record_place = () => __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_record_place).call(this);
         hTag.save = o => __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_save).call(this, o);
         if (cfg.oCfg.debug.token)
-            __classPrivateFieldSet(this, _ScriptIterator_dbgToken, token => console.log(`🌱 トークン fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idxToken:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} token【${token}】`), "f");
+            __classPrivateFieldSet(this, _ScriptIterator_dbgToken, token => console.log(`🌱 トークン fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idx:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} token【${token}】`), "f");
         val.defTmp('const.sn.vctCallStk.length', () => __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length);
         __classPrivateFieldGet(this, _ScriptIterator_grm, "f").setEscape(cfg.oCfg.init.escape);
         if (CmnLib_1.CmnLib.isDbg) {
@@ -71689,19 +71674,24 @@ class ScriptIterator {
         else
             this.recodeDesign = () => { };
         if (cfg.oCfg.debug.tag)
-            __classPrivateFieldSet(this, _ScriptIterator_procDebugtag, tag_name => console.log(`🌲 タグ解析 fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} lnum:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} [${tag_name} %o]`, this.alzTagArg.hPrm), "f");
+            __classPrivateFieldSet(this, _ScriptIterator_procDebugtag, tag_name => console.log(`🌲 タグ解析 fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idx:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} [${tag_name} %o]`, this.alzTagArg.hPrm), "f");
     }
     get scriptFn() { return __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"); }
     ;
     subIdxToken() { var _b; __classPrivateFieldSet(this, _ScriptIterator_idxToken, (_b = __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f"), --_b), "f"); }
     ;
     get lineNum() { return __classPrivateFieldGet(this, _ScriptIterator_lineNum, "f"); }
-    get lenCallStk() { return __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length; }
-    ;
-    get lastCSArg() { return __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[this.lenCallStk - 1].csArg; }
-    ;
     destroy() { this.isBreak = () => false; }
     ;
+    unregisterClickEvts() {
+        __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").forEach(cs => {
+            const hE1T = cs.csArg[':hEvt1Time'];
+            delete hE1T['Click'];
+            delete hE1T['Enter'];
+            delete hE1T['ArrowDown'];
+            delete hE1T['wheel.y>0'];
+        });
+    }
     タグ解析(tagToken) {
         const [tag_name, args] = (0, Grammar_1.tagToken2Name_Args)(tagToken);
         const tag_fnc = this.hTag[tag_name];
@@ -71721,19 +71711,20 @@ class ScriptIterator {
             if (!p)
                 return false;
         }
-        let hArg = { ':タグ名': tag_name };
-        const lenStk = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
+        let hArg = {};
+        const len = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
         if (this.alzTagArg.isKomeParam) {
-            if (lenStk === 0)
+            if (len === 0)
                 throw '属性「*」はマクロのみ有効です';
-            hArg = { ...hArg, ...this.lastCSArg };
+            hArg = { ...__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - 1].csArg };
         }
+        hArg[':タグ名'] = tag_name;
         for (const arg_nm in hPrm) {
             let v = hPrm[arg_nm].val;
             if (v?.charAt(0) === '%') {
-                if (lenStk === 0)
+                if (len === 0)
                     throw '属性「%」はマクロ定義内でのみ使用できます（そのマクロの引数を示す簡略文法であるため）';
-                const mac = this.lastCSArg[v.slice(1)];
+                const mac = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - 1].csArg[v.slice(1)];
                 if (mac) {
                     hArg[arg_nm] = mac;
                     continue;
@@ -71856,7 +71847,7 @@ class ScriptIterator {
         let idx = 0;
         const len = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
         if (hArg.design_unit && len > 0) {
-            const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[len - 1];
+            const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[0];
             fn = cs.fn;
             idx = cs.idx;
         }
@@ -71891,7 +71882,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     }
 }, _ScriptIterator_go_stepout = function _ScriptIterator_go_stepout(out) {
     this.sys.callHook(`stopOnStep${out ? 'Out' : ''}`, {});
-    __classPrivateFieldSet(this, _ScriptIterator_csDepth_macro_esc, this.lenCallStk - (out ? 1 : 0), "f");
+    __classPrivateFieldSet(this, _ScriptIterator_csDepth_macro_esc, __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - (out ? 1 : 0), "f");
     __classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
     __classPrivateFieldSet(this, _ScriptIterator_breakState, out ? BreakState.stepout : BreakState.stepouting, "f");
     this.main.setLoop(true);
@@ -71912,7 +71903,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
             __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.stepout, "f");
             break;
         case BreakState.stepout:
-            if (this.lenCallStk !== __classPrivateFieldGet(this, _ScriptIterator_csDepth_macro_esc, "f"))
+            if (__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length !== __classPrivateFieldGet(this, _ScriptIterator_csDepth_macro_esc, "f"))
                 break;
             __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.step, "f");
             this.main.setLoop(false, 'ステップ実行');
@@ -72029,8 +72020,8 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         console.info(now);
         for (let i = len - 1; i >= 0; --i) {
             const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[i];
-            const csa = cs.csArg[':hMp'];
-            const from_macro_nm = csa ? csa[':タグ名'] : null;
+            const hMp = cs.csArg[':hMp'];
+            const from_macro_nm = hMp ? hMp[':タグ名'] : null;
             const call_nm = cs.csArg[':タグ名'] ?? '';
             const lc = __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_cnvIdx2lineCol).call(this, __classPrivateFieldGet(this, _ScriptIterator_hScript, "f")[cs.fn], cs.idx);
             console.info(`${len - i}つ前のコール元 fn:${cs.fn} line:${lc.ln} col:${lc.col_s + 1}` + (from_macro_nm ? '（[' + from_macro_nm + ']マクロ内）' : ' ') +
@@ -72231,12 +72222,12 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").pop();
     if (!cs)
         throw '[return] スタックが空です';
-    const csArg = cs.csArg;
+    const csa = cs.csArg;
     __classPrivateFieldGet(this, _ScriptIterator_aIfStk, "f").shift();
-    const hMp = csArg[':hMp'];
+    const hMp = csa[':hMp'];
     if (hMp)
         this.val.setMp(hMp);
-    const after_token = csArg[':resvToken'];
+    const after_token = csa[':resvToken'];
     if (after_token)
         this.nextToken = () => {
             __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_clearResvToken).call(this);
@@ -72244,8 +72235,8 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         };
     else
         __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_clearResvToken).call(this);
-    if (csArg[':hEvt1Time'])
-        __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").pushLocalEvts(csArg[':hEvt1Time']);
+    if (csa[':hEvt1Time'])
+        __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").pushLocalEvts(csa[':hEvt1Time']);
     if (cs.fn in __classPrivateFieldGet(this, _ScriptIterator_hScript, "f")) {
         __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_jump_light).call(this, cs);
         return false;
@@ -72584,7 +72575,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
             fn: __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"),
             idx: __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f"),
         };
-    const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[len - 1];
+    const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[0];
     return {
         fn: cs.fn,
         idx: cs.idx,

package/core/lib/sn/EventMng.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventMng.d.ts","sourceRoot":"","sources":["../../src/sn/EventMng.ts"],"names":[],"mappings":"AAOA,OAAO,EAAe,OAAO,EAA6B,MAAM,UAAU,CAAC;AAC3E,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAY,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAOhD,OAAO,EAAC,SAAS,EAAE,WAAW,EAA6B,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAIlC,qBAAa,QAAS,YAAW,OAAO;;IAe3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,QAAQ,CAAC,OAAO,EAAE,WAAW;IAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAkB,QAAQ,CAAC,GAAG,EAAE,OAAO;IAR1S,UAAU,SAAU,MAAM,cAAc,MAAM,cAAc,MAAM,UAAO;gBAQ5C,GAAG,EAAE,MAAM,EAAmB,IAAI,EAAE,KAAK,EAAW,OAAO,EAAE,WAAW,EAAmB,IAAI,EAAE,KAAK,EAAmB,MAAM,EAAE,QAAQ,EAAmB,GAAG,EAAE,SAAS,EAAmB,MAAM,EAAE,QAAQ,EAAmB,MAAM,EAAE,cAAc,EAAW,GAAG,EAAE,OAAO;IAkL1S,cAAc,CAAC,GAAG,EAAE,MAAM;IAyD1B,OAAO;IASP,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK;IAqC1B,YAAY,IAAI,SAAS;IAKzB,aAAa,CAAC,CAAC,EAAE,SAAS;IAE1B,SAAS,CAAC,QAAQ,EAAE,MAAK,IAAI,EAAE,OAAO,UAAO,EAAE,MAAM,UAAQ,GAAG,OAAO;IA2DvE,QAAQ,CAAC,MAAM,EAAE,SAAS;IAC1B,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAK,IAAI,EAAE,KAAK,EAAE,MAAK,OAAO,EAAE,OAAO,EAAE,MAAK,IAAI;IA8GhG,SAAS;IA4CT,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAK,IAAI,GAAG,OAAO;IAkU1D,aAAa,IAAI,OAAO;CAkBxB"}
+{"version":3,"file":"EventMng.d.ts","sourceRoot":"","sources":["../../src/sn/EventMng.ts"],"names":[],"mappings":"AAOA,OAAO,EAAe,OAAO,EAA6B,MAAM,UAAU,CAAC;AAC3E,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAY,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAOhD,OAAO,EAAC,SAAS,EAAE,WAAW,EAA6B,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAIlC,qBAAa,QAAS,YAAW,OAAO;;IAe3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,QAAQ,CAAC,OAAO,EAAE,WAAW;IAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAkB,QAAQ,CAAC,GAAG,EAAE,OAAO;IAR1S,UAAU,SAAU,MAAM,cAAc,MAAM,cAAc,MAAM,UAAO;gBAQ5C,GAAG,EAAE,MAAM,EAAmB,IAAI,EAAE,KAAK,EAAW,OAAO,EAAE,WAAW,EAAmB,IAAI,EAAE,KAAK,EAAmB,MAAM,EAAE,QAAQ,EAAmB,GAAG,EAAE,SAAS,EAAmB,MAAM,EAAE,QAAQ,EAAmB,MAAM,EAAE,cAAc,EAAW,GAAG,EAAE,OAAO;IAkL1S,cAAc,CAAC,GAAG,EAAE,MAAM;IAyD1B,OAAO;IASP,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK;IAqC1B,YAAY,IAAI,SAAS;IAKzB,aAAa,CAAC,CAAC,EAAE,SAAS;IAE1B,SAAS,CAAC,QAAQ,EAAE,MAAK,IAAI,EAAE,OAAO,UAAO,EAAE,MAAM,UAAQ,GAAG,OAAO;IA2DvE,QAAQ,CAAC,MAAM,EAAE,SAAS;IAC1B,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAK,IAAI,EAAE,KAAK,EAAE,MAAK,OAAO,EAAE,OAAO,EAAE,MAAK,IAAI;IA8GhG,SAAS;IA4CT,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAK,IAAI,GAAG,OAAO;IAoT1D,aAAa,IAAI,OAAO;CAkBxB"}

package/core/lib/sn/ScriptIterator.d.ts

@@ -1,6 +1,5 @@
 import { IHTag, IMain, IVariable, HArg, IPropParser } from './CmnInterface';
 import { Config } from './Config';
-import { ICallStackArg } from './CallStack';
 import { AnalyzeTagArg } from './AnalyzeTagArg';
 import { EventMng } from './EventMng';
 import { LayerMng } from './LayerMng';
@@ -21,13 +20,11 @@ export declare class ScriptIterator {
     subIdxToken(): void;
     get lineNum(): number;
     readonly addLineNum: (len: number) => number;
-    get lenCallStk(): number;
-    private get lastCSArg();
-    readonly getCallStk: (idx: number) => ICallStackArg;
     constructor(cfg: Config, hTag: IHTag, main: IMain, val: IVariable, alzTagArg: AnalyzeTagArg, runAnalyze: () => void, prpPrs: IPropParser, sndMng: SoundMng, sys: SysBase);
     firstWait: () => void;
     destroy(): void;
     cnvPath4Dbg: (fn: string) => string;
+    unregisterClickEvts(): void;
     isBreak: (_token: string) => boolean;
     タグ解析(tagToken: string): boolean;
     setOtherObj(evtMng: EventMng, layMng: LayerMng): void;

package/core/lib/sn/ScriptIterator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScriptIterator.d.ts","sourceRoot":"","sources":["../../src/sn/ScriptIterator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAS,IAAI,EAAU,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACzF,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAY,aAAa,EAAC,MAAM,aAAa,CAAC;AAErD,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAsBlC,qBAAa,cAAc;;IAoBd,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAiB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAa,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAe,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,GAAG;IAhBvT,IAAI,QAAQ,WAA2B;IAEvC,WAAW;IAEX,IAAI,OAAO,WAA0B;IACrC,QAAQ,CAAC,UAAU,QAAS,MAAM,YAAyB;IAIzD,IAAI,UAAU,WAAkC;IAClD,OAAO,KAAK,SAAS,GAAqD;IAC1E,QAAQ,CAAC,UAAU,QAAS,MAAM,mBAA8B;gBAKnC,GAAG,EAAE,MAAM,EAAmB,IAAI,EAAE,KAAK,EAAmB,IAAI,EAAE,KAAK,EAAmB,GAAG,EAAE,SAAS,EAAmB,SAAS,EAAE,aAAa,EAAmB,UAAU,EAAE,MAAK,IAAI,EAAmB,MAAM,EAAE,WAAW,EAAmB,MAAM,EAAE,QAAQ,EAAmB,GAAG,EAAE,OAAO;IA0FhU,SAAS,aAAW;IAKpB,OAAO;IAgFP,WAAW,OAAQ,MAAM,YAAyE;IAoClG,OAAO,WAAY,MAAM,aAAU;IAmGnC,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAsD/B,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI;IAyHrD,WAAW,UAAW,OAAO,UAAM;IAInC,eAAe;IAkQf,OAAO,CAAC,WAAW;IAQnB,SAAS,eAAW;IA8NpB,IAAI,QAAQ,IAAI,OAAO,CAAyB;IAKhD,IAAI,YAAY,IAAI,OAAO,CAoB1B;IAGD,IAAI,UAAU,IAAI,MAAM,CAYvB;IAoID,IAAI,SAAS,YAA2B;IAoExC,UAAU;IA8BV,YAAY,CAAC,IAAI,EAAE,IAAI;IA0BvB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAEhC"}
+{"version":3,"file":"ScriptIterator.d.ts","sourceRoot":"","sources":["../../src/sn/ScriptIterator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAS,IAAI,EAAU,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACzF,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAGhC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAsBlC,qBAAa,cAAc;;IAiBd,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAiB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAa,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAe,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,GAAG;IAbvT,IAAI,QAAQ,WAA2B;IAEvC,WAAW;IAEX,IAAI,OAAO,WAA0B;IACrC,QAAQ,CAAC,UAAU,QAAS,MAAM,YAAyB;gBAQ9B,GAAG,EAAE,MAAM,EAAmB,IAAI,EAAE,KAAK,EAAmB,IAAI,EAAE,KAAK,EAAmB,GAAG,EAAE,SAAS,EAAmB,SAAS,EAAE,aAAa,EAAmB,UAAU,EAAE,MAAK,IAAI,EAAmB,MAAM,EAAE,WAAW,EAAmB,MAAM,EAAE,QAAQ,EAAmB,GAAG,EAAE,OAAO;IA0FhU,SAAS,aAAW;IAKpB,OAAO;IAgFP,WAAW,OAAQ,MAAM,YAAyE;IA+BlG,mBAAmB;IAenB,OAAO,WAAY,MAAM,aAAU;IAmGnC,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAuD/B,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI;IAyHrD,WAAW,UAAW,OAAO,UAAM;IAInC,eAAe;IAkQf,OAAO,CAAC,WAAW;IAQnB,SAAS,eAAW;IA8NpB,IAAI,QAAQ,IAAI,OAAO,CAAyB;IAKhD,IAAI,YAAY,IAAI,OAAO,CAoB1B;IAGD,IAAI,UAAU,IAAI,MAAM,CAYvB;IAoID,IAAI,SAAS,YAA2B;IAoExC,UAAU;IA8BV,YAAY,CAAC,IAAI,EAAE,IAAI;IA0BvB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAEhC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@famibee/skynovel",
-	"version": "1.25.2",
+	"version": "1.25.3",
 	"description": "webgl novelgame framework",
 	"main": "core/web.js",
 	"types": "core/lib/index.d.ts",

package/web.js

@@ -68926,7 +68926,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _EventMng_instances, _EventMng_elc, _EventMng_cvsHint, _EventMng_picHint_w, _EventMng_picHint_h, _EventMng_padHint, _EventMng_grpHint, _EventMng_gamepad, _EventMng_fcs, _EventMng_resvFlameEvent4Wheel, _EventMng_ev_keydown, _EventMng_ev_contextmenu, _EventMng_ev_wheel, _EventMng_wheeling, _EventMng_extend_wheel, _EventMng_ev_wheel_waitstop, _EventMng_hLocalEvt2Fnc, _EventMng_hGlobalEvt2Fnc, _EventMng_isDbgBreak, _EventMng_isWait, _EventMng_getEvt2Fnc, _EventMng_waitEventBase, _EventMng_firstWait, _EventMng_dispHint, _EventMng_dispHint_hArg, _EventMng_dispHint_ctnBtn, _EventMng_dispHint_masume, _EventMng_procWheel4wle, _EventMng_elcWLE, _EventMng_clear_event, _EventMng_clear_eventer, _EventMng_event, _EventMng_canFocus, _EventMng_getHtmlElmList, _EventMng_goTxt, _EventMng_l, _EventMng_p, _EventMng_fncCancelSkip, _EventMng_set_cancel_skip, _EventMng_unregisterClickEvts, _EventMng_set_focus, _EventMng_wait, _EventMng_waitclick, _EventMng_hDownKeys;
+var _EventMng_instances, _EventMng_elc, _EventMng_cvsHint, _EventMng_picHint_w, _EventMng_picHint_h, _EventMng_padHint, _EventMng_grpHint, _EventMng_gamepad, _EventMng_fcs, _EventMng_resvFlameEvent4Wheel, _EventMng_ev_keydown, _EventMng_ev_contextmenu, _EventMng_ev_wheel, _EventMng_wheeling, _EventMng_extend_wheel, _EventMng_ev_wheel_waitstop, _EventMng_hLocalEvt2Fnc, _EventMng_hGlobalEvt2Fnc, _EventMng_isDbgBreak, _EventMng_isWait, _EventMng_getEvt2Fnc, _EventMng_waitEventBase, _EventMng_firstWait, _EventMng_dispHint, _EventMng_dispHint_hArg, _EventMng_dispHint_ctnBtn, _EventMng_dispHint_masume, _EventMng_procWheel4wle, _EventMng_elcWLE, _EventMng_clear_event, _EventMng_clear_eventer, _EventMng_event, _EventMng_canFocus, _EventMng_getHtmlElmList, _EventMng_goTxt, _EventMng_l, _EventMng_p, _EventMng_fncCancelSkip, _EventMng_set_cancel_skip, _EventMng_set_focus, _EventMng_wait, _EventMng_waitclick, _EventMng_hDownKeys;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.EventMng = void 0;
 const CmnLib_1 = __webpack_require__(/*! ./CmnLib */ "./core/src/sn/CmnLib.ts");
@@ -69623,22 +69623,8 @@ _EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picH
         this.val.setVal_Nochk('tmp', 'sn.auto.enabled', false);
         this.layMng.setNormalWaitTxtLayer();
     }, "f");
-    __classPrivateFieldGet(this, _EventMng_instances, "m", _EventMng_unregisterClickEvts).call(this);
+    this.scrItr.unregisterClickEvts();
     return false;
-}, _EventMng_unregisterClickEvts = function _EventMng_unregisterClickEvts() {
-    const len = this.scrItr.lenCallStk;
-    for (let i = 0; i < len; ++i) {
-        const cs = this.scrItr.getCallStk(i);
-        if (!cs)
-            continue;
-        const hE1T = cs[':hEvt1Time'];
-        if (!hE1T)
-            continue;
-        delete hE1T['Click'];
-        delete hE1T['Enter'];
-        delete hE1T['ArrowDown'];
-        delete hE1T['wheel.y>0'];
-    }
 }, _EventMng_set_focus = function _EventMng_set_focus(hArg) {
     const add = hArg.add;
     if (add?.slice(0, 4) === 'dom=') {
@@ -72834,7 +72820,6 @@ class ScriptIterator {
         _ScriptIterator_lineNum.set(this, 0);
         this.addLineNum = (len) => __classPrivateFieldSet(this, _ScriptIterator_lineNum, __classPrivateFieldGet(this, _ScriptIterator_lineNum, "f") + len, "f");
         _ScriptIterator_aCallStk.set(this, []);
-        this.getCallStk = (idx) => __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[idx].csArg;
         _ScriptIterator_grm.set(this, new Grammar_1.Grammar);
         this.firstWait = () => { };
         _ScriptIterator_hHook.set(this, {
@@ -72886,7 +72871,7 @@ class ScriptIterator {
             stepout: o => {
                 if (__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_isIdxOverLast).call(this))
                     return;
-                if (this.lenCallStk > 0)
+                if (__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length > 0)
                     __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_go_stepout).call(this, true);
                 else
                     __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_go_stepover).call(this, o);
@@ -72989,7 +72974,7 @@ class ScriptIterator {
         hTag.record_place = () => __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_record_place).call(this);
         hTag.save = o => __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_save).call(this, o);
         if (cfg.oCfg.debug.token)
-            __classPrivateFieldSet(this, _ScriptIterator_dbgToken, token => console.log(`🌱 トークン fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idxToken:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} token【${token}】`), "f");
+            __classPrivateFieldSet(this, _ScriptIterator_dbgToken, token => console.log(`🌱 トークン fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idx:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} token【${token}】`), "f");
         val.defTmp('const.sn.vctCallStk.length', () => __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length);
         __classPrivateFieldGet(this, _ScriptIterator_grm, "f").setEscape(cfg.oCfg.init.escape);
         if (CmnLib_1.CmnLib.isDbg) {
@@ -73037,19 +73022,24 @@ class ScriptIterator {
         else
             this.recodeDesign = () => { };
         if (cfg.oCfg.debug.tag)
-            __classPrivateFieldSet(this, _ScriptIterator_procDebugtag, tag_name => console.log(`🌲 タグ解析 fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} lnum:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} [${tag_name} %o]`, this.alzTagArg.hPrm), "f");
+            __classPrivateFieldSet(this, _ScriptIterator_procDebugtag, tag_name => console.log(`🌲 タグ解析 fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idx:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} [${tag_name} %o]`, this.alzTagArg.hPrm), "f");
     }
     get scriptFn() { return __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"); }
     ;
     subIdxToken() { var _b; __classPrivateFieldSet(this, _ScriptIterator_idxToken, (_b = __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f"), --_b), "f"); }
     ;
     get lineNum() { return __classPrivateFieldGet(this, _ScriptIterator_lineNum, "f"); }
-    get lenCallStk() { return __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length; }
-    ;
-    get lastCSArg() { return __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[this.lenCallStk - 1].csArg; }
-    ;
     destroy() { this.isBreak = () => false; }
     ;
+    unregisterClickEvts() {
+        __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").forEach(cs => {
+            const hE1T = cs.csArg[':hEvt1Time'];
+            delete hE1T['Click'];
+            delete hE1T['Enter'];
+            delete hE1T['ArrowDown'];
+            delete hE1T['wheel.y>0'];
+        });
+    }
     タグ解析(tagToken) {
         const [tag_name, args] = (0, Grammar_1.tagToken2Name_Args)(tagToken);
         const tag_fnc = this.hTag[tag_name];
@@ -73069,19 +73059,20 @@ class ScriptIterator {
             if (!p)
                 return false;
         }
-        let hArg = { ':タグ名': tag_name };
-        const lenStk = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
+        let hArg = {};
+        const len = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
         if (this.alzTagArg.isKomeParam) {
-            if (lenStk === 0)
+            if (len === 0)
                 throw '属性「*」はマクロのみ有効です';
-            hArg = { ...hArg, ...this.lastCSArg };
+            hArg = { ...__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - 1].csArg };
         }
+        hArg[':タグ名'] = tag_name;
         for (const arg_nm in hPrm) {
             let v = hPrm[arg_nm].val;
             if (v?.charAt(0) === '%') {
-                if (lenStk === 0)
+                if (len === 0)
                     throw '属性「%」はマクロ定義内でのみ使用できます（そのマクロの引数を示す簡略文法であるため）';
-                const mac = this.lastCSArg[v.slice(1)];
+                const mac = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - 1].csArg[v.slice(1)];
                 if (mac) {
                     hArg[arg_nm] = mac;
                     continue;
@@ -73204,7 +73195,7 @@ class ScriptIterator {
         let idx = 0;
         const len = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
         if (hArg.design_unit && len > 0) {
-            const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[len - 1];
+            const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[0];
             fn = cs.fn;
             idx = cs.idx;
         }
@@ -73239,7 +73230,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     }
 }, _ScriptIterator_go_stepout = function _ScriptIterator_go_stepout(out) {
     this.sys.callHook(`stopOnStep${out ? 'Out' : ''}`, {});
-    __classPrivateFieldSet(this, _ScriptIterator_csDepth_macro_esc, this.lenCallStk - (out ? 1 : 0), "f");
+    __classPrivateFieldSet(this, _ScriptIterator_csDepth_macro_esc, __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - (out ? 1 : 0), "f");
     __classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
     __classPrivateFieldSet(this, _ScriptIterator_breakState, out ? BreakState.stepout : BreakState.stepouting, "f");
     this.main.setLoop(true);
@@ -73260,7 +73251,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
             __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.stepout, "f");
             break;
         case BreakState.stepout:
-            if (this.lenCallStk !== __classPrivateFieldGet(this, _ScriptIterator_csDepth_macro_esc, "f"))
+            if (__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length !== __classPrivateFieldGet(this, _ScriptIterator_csDepth_macro_esc, "f"))
                 break;
             __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.step, "f");
             this.main.setLoop(false, 'ステップ実行');
@@ -73377,8 +73368,8 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         console.info(now);
         for (let i = len - 1; i >= 0; --i) {
             const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[i];
-            const csa = cs.csArg[':hMp'];
-            const from_macro_nm = csa ? csa[':タグ名'] : null;
+            const hMp = cs.csArg[':hMp'];
+            const from_macro_nm = hMp ? hMp[':タグ名'] : null;
             const call_nm = cs.csArg[':タグ名'] ?? '';
             const lc = __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_cnvIdx2lineCol).call(this, __classPrivateFieldGet(this, _ScriptIterator_hScript, "f")[cs.fn], cs.idx);
             console.info(`${len - i}つ前のコール元 fn:${cs.fn} line:${lc.ln} col:${lc.col_s + 1}` + (from_macro_nm ? '（[' + from_macro_nm + ']マクロ内）' : ' ') +
@@ -73579,12 +73570,12 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").pop();
     if (!cs)
         throw '[return] スタックが空です';
-    const csArg = cs.csArg;
+    const csa = cs.csArg;
     __classPrivateFieldGet(this, _ScriptIterator_aIfStk, "f").shift();
-    const hMp = csArg[':hMp'];
+    const hMp = csa[':hMp'];
     if (hMp)
         this.val.setMp(hMp);
-    const after_token = csArg[':resvToken'];
+    const after_token = csa[':resvToken'];
     if (after_token)
         this.nextToken = () => {
             __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_clearResvToken).call(this);
@@ -73592,8 +73583,8 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         };
     else
         __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_clearResvToken).call(this);
-    if (csArg[':hEvt1Time'])
-        __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").pushLocalEvts(csArg[':hEvt1Time']);
+    if (csa[':hEvt1Time'])
+        __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").pushLocalEvts(csa[':hEvt1Time']);
     if (cs.fn in __classPrivateFieldGet(this, _ScriptIterator_hScript, "f")) {
         __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_jump_light).call(this, cs);
         return false;
@@ -73932,7 +73923,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
             fn: __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"),
             idx: __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f"),
         };
-    const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[len - 1];
+    const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[0];
     return {
         fn: cs.fn,
         idx: cs.idx,