@famibee/skynovel 1.27.1 → 1.27.2

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [1.27.2](https://github.com/famibee/SKYNovel/compare/v1.27.1...v1.27.2) (2022-01-13)
+
+
+### Bug Fixes
+
+* [r]を挟むと[span]色変更がキャンセルされる件 ([88224d3](https://github.com/famibee/SKYNovel/commit/88224d3f5c59a0d1501fc94b125fdad6e004a3e5))
+
+- fix: [r]を挟むと[span]色変更がキャンセルされる件
+- fix: [tcy]で[tcy t='Day 1']と半角を入れると表示が変になる件
+- fix: （問題ないか確認しつつ）Promise.all を Promise.allSettled に
+
 ## [1.27.1](https://github.com/famibee/SKYNovel/compare/v1.27.0...v1.27.1) (2022-01-12)
 
 

package/app.js

@@ -70216,7 +70216,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
         }));
     else
         __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this, hArg.layer).forEach(v => a.push(new Promise(re => __classPrivateFieldGet(this, _LayerMng_hPages, "f")[v][pg].snapshot(rnd, () => re()))));
-    Promise.all(a).then(async () => {
+    Promise.allSettled(a).then(async () => {
         const renTx = pixi_js_1.RenderTexture.create({ width: rnd.width, height: rnd.height, transform: true });
         rnd.render(__classPrivateFieldGet(this, _LayerMng_stage, "f"), { renderTexture: renTx });
         await this.sys.savePic(fn, rnd.plugins.extract.base64(pixi_js_1.Sprite.from(renTx)));
@@ -70630,7 +70630,6 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
         hArg.wait = 0;
     else if ('wait' in hArg)
         (0, CmnLib_1.argChk_Num)(hArg, 'wait', NaN);
-    __classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, 'add｜' + JSON.stringify(hArg), tl);
     const record = (0, CmnLib_1.argChk_Boolean)(hArg, 'record', true);
     const doRecLog = this.val.doRecLog();
     if (!record)
@@ -70638,7 +70637,6 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
     tl.tagCh(txt.replaceAll('[r]', '\n'));
     if (!record)
         this.val.setVal_Nochk('save', 'sn.doRecLog', doRecLog);
-    __classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, `add_close｜`, tl);
     return false;
 }, _LayerMng_$getTxtLayer = function _LayerMng_$getTxtLayer(hArg) {
     const layer = __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_argChk_layer).call(this, hArg, __classPrivateFieldGet(this, _LayerMng_curTxtlay, "f"));
@@ -70722,7 +70720,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
 }, _LayerMng_tcy = function _LayerMng_tcy(hArg) {
     if (!hArg.t)
         throw '[tcy] tは必須です';
-    hArg.text = '｜　｜《tcy｜' + hArg.t + '｜' + (hArg.r ?? '') + '》';
+    hArg.text = '｜　《tcy｜' + hArg.t + '｜' + (hArg.r ?? '') + '》';
     return __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_ch).call(this, hArg);
 }, _LayerMng_dump_lay = function _LayerMng_dump_lay(hArg) {
     console.group('🥟 [dump_lay]');
@@ -70921,7 +70919,7 @@ _Main_cfg = new WeakMap(), _Main_appPixi = new WeakMap(), _Main_hTag = new WeakM
     }
     __classPrivateFieldSet(this, _Main_val, new Variable_1.Variable(__classPrivateFieldGet(this, _Main_cfg, "f"), __classPrivateFieldGet(this, _Main_hTag, "f")), "f");
     __classPrivateFieldSet(this, _Main_prpPrs, new PropParser_1.PropParser(__classPrivateFieldGet(this, _Main_val, "f"), __classPrivateFieldGet(this, _Main_cfg, "f").oCfg.init.escape ?? '\\'), "f");
-    await Promise.all(this.sys.init(__classPrivateFieldGet(this, _Main_hTag, "f"), __classPrivateFieldGet(this, _Main_appPixi, "f"), __classPrivateFieldGet(this, _Main_val, "f"), this));
+    await Promise.allSettled(this.sys.init(__classPrivateFieldGet(this, _Main_hTag, "f"), __classPrivateFieldGet(this, _Main_appPixi, "f"), __classPrivateFieldGet(this, _Main_val, "f"), this));
     __classPrivateFieldGet(this, _Main_hTag, "f").title({ text: __classPrivateFieldGet(this, _Main_cfg, "f").oCfg.book.title || 'SKYNovel' });
     __classPrivateFieldSet(this, _Main_sndMng, new SoundMng_1.SoundMng(__classPrivateFieldGet(this, _Main_cfg, "f"), __classPrivateFieldGet(this, _Main_hTag, "f"), __classPrivateFieldGet(this, _Main_val, "f"), this, this.sys), "f");
     __classPrivateFieldSet(this, _Main_scrItr, new ScriptIterator_1.ScriptIterator(__classPrivateFieldGet(this, _Main_cfg, "f"), __classPrivateFieldGet(this, _Main_hTag, "f"), this, __classPrivateFieldGet(this, _Main_val, "f"), __classPrivateFieldGet(this, _Main_alzTagArg, "f"), () => __classPrivateFieldGet(this, _Main_instances, "m", _Main_runAnalyze).call(this), __classPrivateFieldGet(this, _Main_prpPrs, "f"), __classPrivateFieldGet(this, _Main_sndMng, "f"), this.sys), "f");
@@ -73387,7 +73385,7 @@ class SysApp extends SysNode_1.SysNode {
                         const di = await to_app.showMessageBox(mbo);
                         if (di.response > 0)
                             return;
-                        await Promise.all(aApp.map(ap => __classPrivateFieldGet(this, _SysApp_instances, "m", _SysApp_dl_app).call(this, ap.url, ap.urlApp, ap.fn)));
+                        await Promise.allSettled(aApp.map(ap => __classPrivateFieldGet(this, _SysApp_instances, "m", _SysApp_dl_app).call(this, ap.url, ap.urlApp, ap.fn)));
                     }
                 }
                 else {
@@ -75427,7 +75425,7 @@ _a = TxtStage, _TxtStage_htmTxt = new WeakMap(), _TxtStage_cntTxt = new WeakMap(
         };
         function resolveAll() {
             return readAll()
-                .then(webFonts => Promise.all(webFonts.map((webFont) => webFont.resolve())))
+                .then(webFonts => Promise.allSettled(webFonts.map((webFont) => webFont.resolve())))
                 .then(cssStrings => cssStrings.join('\n'));
         }
         function readAll() {

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

@@ -1 +1 @@
-{"version":3,"file":"LayerMng.d.ts","sourceRoot":"","sources":["../../src/sn/LayerMng.ts"],"names":[],"mappings":"AAOA,OAAO,EAA2B,OAAO,EAAsF,MAAM,UAAU,CAAC;AAEhJ,OAAO,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAQ,OAAO,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAGpC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAGxC,OAAO,EAAY,WAAW,EAAsF,MAAM,SAAS,CAAC;AAEpI,MAAM,WAAW,eAAe;IAAG,CAAC,GAAG,EAAG,UAAU,GAAG,IAAI,CAAC;CAAE;AAE9D,MAAM,WAAW,KAAK;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAA;CAAC;AAE9C,qBAAa,QAAS,YAAW,OAAO;;IAO3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAe,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAkB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAW,QAAQ,CAAC,MAAM,EAAE,QAAQ;IAAE,QAAQ,CAAC,SAAS,EAAE,aAAa;IAAE,QAAQ,CAAC,MAAM,EAAE,WAAW;gBAAnT,GAAG,EAAE,MAAM,EAAmB,IAAI,EAAE,KAAK,EAAmB,OAAO,EAAE,WAAW,EAAmB,GAAG,EAAE,SAAS,EAAmB,IAAI,EAAE,KAAK,EAAmB,MAAM,EAAE,cAAc,EAAmB,GAAG,EAAE,OAAO,EAAW,MAAM,EAAE,QAAQ,EAAW,SAAS,EAAE,aAAa,EAAW,MAAM,EAAE,WAAW;IA0JhV,OAAO,CAAC,eAAe;IAoCvB,cAAc,OAAQ,MAAM,aAAoC;IAGhE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,SAAM;IAgBtC,SAAS,CAAC,MAAM,EAAE,OAAO;IAMzB,cAAc;IACd,OAAO;IAYP,SAAS;IAgBT,KAAK,aAAW;IAChB,SAAS,aAAW;IACpB,SAAS,aAAW;IACpB,UAAU;IAOV,WAAW;IAwlBX,MAAM,KAAK,UAAU,WAAiC;IACtD,MAAM,KAAK,UAAU,CAAC,CAAC,QAAA,EAA6B;IAiCpD,eAAe,IAAI,IAAI;IAwBvB,IAAI,wBAAwB,IAAI,QAAQ,CAGvC;IACD,IAAI,iBAAiB,IAAI,QAAQ,GAAG,SAAS,CAI5C;IAeD,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,UAAQ;IA8JtC,MAAM,IAAI,GAAG;IAYb,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAK,IAAI,GAAG,IAAI;CAmCnD"}
+{"version":3,"file":"LayerMng.d.ts","sourceRoot":"","sources":["../../src/sn/LayerMng.ts"],"names":[],"mappings":"AAOA,OAAO,EAA2B,OAAO,EAAsF,MAAM,UAAU,CAAC;AAEhJ,OAAO,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAQ,OAAO,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAGpC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAGxC,OAAO,EAAY,WAAW,EAAsF,MAAM,SAAS,CAAC;AAEpI,MAAM,WAAW,eAAe;IAAG,CAAC,GAAG,EAAG,UAAU,GAAG,IAAI,CAAC;CAAE;AAE9D,MAAM,WAAW,KAAK;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAA;CAAC;AAE9C,qBAAa,QAAS,YAAW,OAAO;;IAO3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAe,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAkB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAW,QAAQ,CAAC,MAAM,EAAE,QAAQ;IAAE,QAAQ,CAAC,SAAS,EAAE,aAAa;IAAE,QAAQ,CAAC,MAAM,EAAE,WAAW;gBAAnT,GAAG,EAAE,MAAM,EAAmB,IAAI,EAAE,KAAK,EAAmB,OAAO,EAAE,WAAW,EAAmB,GAAG,EAAE,SAAS,EAAmB,IAAI,EAAE,KAAK,EAAmB,MAAM,EAAE,cAAc,EAAmB,GAAG,EAAE,OAAO,EAAW,MAAM,EAAE,QAAQ,EAAW,SAAS,EAAE,aAAa,EAAW,MAAM,EAAE,WAAW;IA0JhV,OAAO,CAAC,eAAe;IAoCvB,cAAc,OAAQ,MAAM,aAAoC;IAGhE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,SAAM;IAgBtC,SAAS,CAAC,MAAM,EAAE,OAAO;IAMzB,cAAc;IACd,OAAO;IAYP,SAAS;IAgBT,KAAK,aAAW;IAChB,SAAS,aAAW;IACpB,SAAS,aAAW;IACpB,UAAU;IAOV,WAAW;IAwlBX,MAAM,KAAK,UAAU,WAAiC;IACtD,MAAM,KAAK,UAAU,CAAC,CAAC,QAAA,EAA6B;IAkCpD,eAAe,IAAI,IAAI;IAwBvB,IAAI,wBAAwB,IAAI,QAAQ,CAGvC;IACD,IAAI,iBAAiB,IAAI,QAAQ,GAAG,SAAS,CAI5C;IAeD,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,UAAQ;IA8JtC,MAAM,IAAI,GAAG;IAYb,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAK,IAAI,GAAG,IAAI;CAmCnD"}

package/package.json

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

package/web.js

@@ -71564,7 +71564,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
         }));
     else
         __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this, hArg.layer).forEach(v => a.push(new Promise(re => __classPrivateFieldGet(this, _LayerMng_hPages, "f")[v][pg].snapshot(rnd, () => re()))));
-    Promise.all(a).then(async () => {
+    Promise.allSettled(a).then(async () => {
         const renTx = pixi_js_1.RenderTexture.create({ width: rnd.width, height: rnd.height, transform: true });
         rnd.render(__classPrivateFieldGet(this, _LayerMng_stage, "f"), { renderTexture: renTx });
         await this.sys.savePic(fn, rnd.plugins.extract.base64(pixi_js_1.Sprite.from(renTx)));
@@ -71978,7 +71978,6 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
         hArg.wait = 0;
     else if ('wait' in hArg)
         (0, CmnLib_1.argChk_Num)(hArg, 'wait', NaN);
-    __classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, 'add｜' + JSON.stringify(hArg), tl);
     const record = (0, CmnLib_1.argChk_Boolean)(hArg, 'record', true);
     const doRecLog = this.val.doRecLog();
     if (!record)
@@ -71986,7 +71985,6 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
     tl.tagCh(txt.replaceAll('[r]', '\n'));
     if (!record)
         this.val.setVal_Nochk('save', 'sn.doRecLog', doRecLog);
-    __classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, `add_close｜`, tl);
     return false;
 }, _LayerMng_$getTxtLayer = function _LayerMng_$getTxtLayer(hArg) {
     const layer = __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_argChk_layer).call(this, hArg, __classPrivateFieldGet(this, _LayerMng_curTxtlay, "f"));
@@ -72070,7 +72068,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
 }, _LayerMng_tcy = function _LayerMng_tcy(hArg) {
     if (!hArg.t)
         throw '[tcy] tは必須です';
-    hArg.text = '｜　｜《tcy｜' + hArg.t + '｜' + (hArg.r ?? '') + '》';
+    hArg.text = '｜　《tcy｜' + hArg.t + '｜' + (hArg.r ?? '') + '》';
     return __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_ch).call(this, hArg);
 }, _LayerMng_dump_lay = function _LayerMng_dump_lay(hArg) {
     console.group('🥟 [dump_lay]');
@@ -72269,7 +72267,7 @@ _Main_cfg = new WeakMap(), _Main_appPixi = new WeakMap(), _Main_hTag = new WeakM
     }
     __classPrivateFieldSet(this, _Main_val, new Variable_1.Variable(__classPrivateFieldGet(this, _Main_cfg, "f"), __classPrivateFieldGet(this, _Main_hTag, "f")), "f");
     __classPrivateFieldSet(this, _Main_prpPrs, new PropParser_1.PropParser(__classPrivateFieldGet(this, _Main_val, "f"), __classPrivateFieldGet(this, _Main_cfg, "f").oCfg.init.escape ?? '\\'), "f");
-    await Promise.all(this.sys.init(__classPrivateFieldGet(this, _Main_hTag, "f"), __classPrivateFieldGet(this, _Main_appPixi, "f"), __classPrivateFieldGet(this, _Main_val, "f"), this));
+    await Promise.allSettled(this.sys.init(__classPrivateFieldGet(this, _Main_hTag, "f"), __classPrivateFieldGet(this, _Main_appPixi, "f"), __classPrivateFieldGet(this, _Main_val, "f"), this));
     __classPrivateFieldGet(this, _Main_hTag, "f").title({ text: __classPrivateFieldGet(this, _Main_cfg, "f").oCfg.book.title || 'SKYNovel' });
     __classPrivateFieldSet(this, _Main_sndMng, new SoundMng_1.SoundMng(__classPrivateFieldGet(this, _Main_cfg, "f"), __classPrivateFieldGet(this, _Main_hTag, "f"), __classPrivateFieldGet(this, _Main_val, "f"), this, this.sys), "f");
     __classPrivateFieldSet(this, _Main_scrItr, new ScriptIterator_1.ScriptIterator(__classPrivateFieldGet(this, _Main_cfg, "f"), __classPrivateFieldGet(this, _Main_hTag, "f"), this, __classPrivateFieldGet(this, _Main_val, "f"), __classPrivateFieldGet(this, _Main_alzTagArg, "f"), () => __classPrivateFieldGet(this, _Main_instances, "m", _Main_runAnalyze).call(this), __classPrivateFieldGet(this, _Main_prpPrs, "f"), __classPrivateFieldGet(this, _Main_sndMng, "f"), this.sys), "f");
@@ -76648,7 +76646,7 @@ _a = TxtStage, _TxtStage_htmTxt = new WeakMap(), _TxtStage_cntTxt = new WeakMap(
         };
         function resolveAll() {
             return readAll()
-                .then(webFonts => Promise.all(webFonts.map((webFont) => webFont.resolve())))
+                .then(webFonts => Promise.allSettled(webFonts.map((webFont) => webFont.resolve())))
                 .then(cssStrings => cssStrings.join('\n'));
         }
         function readAll() {