maidraw 0.9.4 → 0.10.0

package/dist/mai/lib/{kamaiTachi → adapter/kamaiTachi}/index.js

@@ -4,11 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KamaiTachiBuilder = exports.KamaiTachi = void 0;
-const type_1 = require("../../type");
 const __1 = __importDefault(require(".."));
-const best50_1 = require("../../best50");
-const chart_1 = require("../../chart");
-const util_1 = require("../../../lib/util");
+const util_1 = require("../../util");
+const type_1 = require("../../../type");
+const database_1 = require("../../database");
 class KamaiTachi extends __1.default {
     currentVersion;
     currentRegion;
@@ -23,8 +22,11 @@ class KamaiTachi extends __1.default {
     async getPlayerPB(userId) {
         return this.get(`/api/v1/users/${userId}/games/maimaidx/Single/pbs/all`, undefined, 60 * 1000);
     }
+    async getScoreHistory(userId, chartId) {
+        return this.get(`/api/v1/users/${userId}/games/maimaidx/Single/scores/${chartId}`, undefined, 60 * 1000);
+    }
     toMaiDrawScore(score, chart, song) {
-        const localChart = chart_1.Chart.Database.getLocalChart(chart.data.inGameID, this.getDatabaseDifficulty(chart));
+        const localChart = database_1.Database.getLocalChart(chart.data.inGameID, this.getDatabaseDifficulty(chart));
         const internalLevel = localChart
             ? localChart.events
                 .filter((v) => v.type === "existence")
@@ -37,105 +39,111 @@ class KamaiTachi extends __1.default {
                     id: chart.data.inGameID,
                     name: song.title,
                     difficulty: (() => {
-                        switch (chart.difficulty) {
-                            case "Re:Master":
-                            case "DX Re:Master":
+                        switch (chart.difficulty.toUpperCase()) {
+                            case "RE:MASTER":
+                            case "DX RE:MASTER":
                                 return type_1.EDifficulty.REMASTER;
-                            case "Master":
-                            case "DX Master":
+                            case "MASTER":
+                            case "DX MASTER":
                                 return type_1.EDifficulty.MASTER;
-                            case "Expert":
-                            case "DX Expert":
+                            case "EXPERT":
+                            case "DX EXPERT":
                                 return type_1.EDifficulty.EXPERT;
-                            case "Advanced":
-                            case "DX Advanced":
+                            case "ADVANCED":
+                            case "DX ADVANCED":
                                 return type_1.EDifficulty.ADVANCED;
-                            case "Basic":
-                            case "DX Basic":
+                            case "BASIC":
+                            case "DX BASIC":
                             default:
                                 return type_1.EDifficulty.BASIC;
                         }
                     })(),
                     level: internalLevel || chart.levelNum,
-                    maxDxScore: (() => {
-                        return ((score.scoreData.judgements.pcrit || 0) +
-                            (score.scoreData.judgements.perfect || 0) +
-                            (score.scoreData.judgements.great || 0) +
-                            (score.scoreData.judgements.good || 0) +
-                            (score.scoreData.judgements.miss || 0) * 3);
-                    })(),
+                    maxDxScore: localChart?.meta.maxDXScore ||
+                        (() => {
+                            return ((score.scoreData.judgements.pcrit || 0) +
+                                (score.scoreData.judgements.perfect || 0) +
+                                (score.scoreData.judgements.great || 0) +
+                                (score.scoreData.judgements.good || 0) +
+                                (score.scoreData.judgements.miss || 0) * 3);
+                        })(),
                 };
             })(),
             combo: (() => {
                 switch (score.scoreData.lamp) {
                     case "FULL COMBO":
-                        return best50_1.Best50.EComboTypes.FULL_COMBO;
+                        return type_1.EComboTypes.FULL_COMBO;
                     case "FULL COMBO+":
-                        return best50_1.Best50.EComboTypes.FULL_COMBO_PLUS;
+                        return type_1.EComboTypes.FULL_COMBO_PLUS;
                     case "ALL PERFECT":
-                        return best50_1.Best50.EComboTypes.ALL_PERFECT;
+                        return type_1.EComboTypes.ALL_PERFECT;
                     case "ALL PERFECT+":
-                        return best50_1.Best50.EComboTypes.ALL_PERFECT_PLUS;
+                        return type_1.EComboTypes.ALL_PERFECT_PLUS;
                     default:
-                        return best50_1.Best50.EComboTypes.NONE;
+                        return type_1.EComboTypes.NONE;
                 }
             })(),
-            sync: best50_1.Best50.ESyncTypes.NONE,
+            sync: type_1.ESyncTypes.NONE,
             achievement: score.scoreData.percent,
             achievementRank: (() => {
                 switch (score.scoreData.grade) {
                     case "C":
-                        return best50_1.Best50.EAchievementTypes.C;
+                        return type_1.EAchievementTypes.C;
                     case "B":
-                        return best50_1.Best50.EAchievementTypes.B;
+                        return type_1.EAchievementTypes.B;
                     case "BB":
-                        return best50_1.Best50.EAchievementTypes.BB;
+                        return type_1.EAchievementTypes.BB;
                     case "BBB":
-                        return best50_1.Best50.EAchievementTypes.BBB;
+                        return type_1.EAchievementTypes.BBB;
                     case "A":
-                        return best50_1.Best50.EAchievementTypes.A;
+                        return type_1.EAchievementTypes.A;
                     case "AA":
-                        return best50_1.Best50.EAchievementTypes.AA;
+                        return type_1.EAchievementTypes.AA;
                     case "AAA":
-                        return best50_1.Best50.EAchievementTypes.AAA;
+                        return type_1.EAchievementTypes.AAA;
                     case "S":
-                        return best50_1.Best50.EAchievementTypes.S;
+                        return type_1.EAchievementTypes.S;
                     case "S+":
-                        return best50_1.Best50.EAchievementTypes.SP;
+                        return type_1.EAchievementTypes.SP;
                     case "SS":
-                        return best50_1.Best50.EAchievementTypes.SS;
+                        return type_1.EAchievementTypes.SS;
                     case "SS+":
-                        return best50_1.Best50.EAchievementTypes.SSP;
+                        return type_1.EAchievementTypes.SSP;
                     case "SSS":
-                        return best50_1.Best50.EAchievementTypes.SSS;
+                        return type_1.EAchievementTypes.SSS;
                     case "SSS+":
-                        return best50_1.Best50.EAchievementTypes.SSSP;
+                        return type_1.EAchievementTypes.SSSP;
                     case "D":
                     default:
-                        return best50_1.Best50.EAchievementTypes.D;
+                        return type_1.EAchievementTypes.D;
                 }
             })(),
             dxRating: internalLevel
-                ? util_1.Util.Maimai.calculateRating(internalLevel, score.scoreData.percent)
+                ? util_1.MaimaiUtil.calculateRating(internalLevel, score.scoreData.percent)
                 : score.calculatedData.rate,
             dxScore: (() => {
                 return ((score.scoreData.judgements.pcrit || 0) * 3 +
                     (score.scoreData.judgements.perfect || 0) * 2 +
                     (score.scoreData.judgements.great || 0));
             })(),
+            optionalData: {
+                kt: {
+                    chartId: chart.chartID,
+                },
+            },
         };
     }
     getDatabaseDifficulty(chart) {
         switch (true) {
-            case chart.difficulty.includes("RE:MASTER"):
+            case chart.difficulty.toUpperCase().includes("RE:MASTER"):
                 return type_1.EDifficulty.REMASTER;
-            case chart.difficulty.includes("MASTER"):
+            case chart.difficulty.toUpperCase().includes("MASTER"):
                 return type_1.EDifficulty.MASTER;
-            case chart.difficulty.includes("EXPERT"):
+            case chart.difficulty.toUpperCase().includes("EXPERT"):
                 return type_1.EDifficulty.EXPERT;
-            case chart.difficulty.includes("ADVANCED"):
+            case chart.difficulty.toUpperCase().includes("ADVANCED"):
                 return type_1.EDifficulty.ADVANCED;
-            case chart.difficulty.includes("BASIC"):
+            case chart.difficulty.toUpperCase().includes("BASIC"):
             default:
                 return type_1.EDifficulty.BASIC;
         }
@@ -161,11 +169,11 @@ class KamaiTachi extends __1.default {
             }
         }
         const filterIsLocalChartNewVersion = (score) => {
-            return (chart_1.Chart.Database.getLocalChart(score.chart.data.inGameID, this.getDatabaseDifficulty(score.chart))?.addVersion[this.currentRegion]?.name ==
+            return (database_1.Database.getLocalChart(score.chart.data.inGameID, this.getDatabaseDifficulty(score.chart))?.addVersion[this.currentRegion]?.name ==
                 this.currentVersion[this.currentRegion]);
         };
         const filterIsLocalChartOldVersion = (score) => {
-            const addVersion = chart_1.Chart.Database.getLocalChart(score.chart.data.inGameID, this.getDatabaseDifficulty(score.chart))?.addVersion[this.currentRegion]?.name;
+            const addVersion = database_1.Database.getLocalChart(score.chart.data.inGameID, this.getDatabaseDifficulty(score.chart))?.addVersion[this.currentRegion]?.name;
             if (!addVersion)
                 return false;
             return (KamaiTachi.compareGameVersions(this.currentVersion, KamaiTachi.getGameVersion(addVersion)) > 0);
@@ -182,7 +190,7 @@ class KamaiTachi extends __1.default {
             }
         }
         let newScores = [], oldScores = [];
-        if (chart_1.Chart.Database.hasLocalDatabase()) {
+        if (database_1.Database.hasLocalDatabase()) {
             newScores = pbs.filter(filterIsLocalChartNewVersion);
             oldScores = pbs.filter(filterIsLocalChartOldVersion);
         }
@@ -204,17 +212,17 @@ class KamaiTachi extends __1.default {
         oldScores = oldScores.filter(filterUseAchievementFilter);
         return {
             new: newScores
-                .sort((a, b) => b.pb.calculatedData.rate - a.pb.calculatedData.rate
-                ? b.pb.calculatedData.rate - a.pb.calculatedData.rate
-                : b.pb.scoreData.percent - a.pb.scoreData.percent)
-                .slice(0, 15)
-                .map((v) => this.toMaiDrawScore(v.pb, v.chart, v.song)),
+                .map((v) => this.toMaiDrawScore(v.pb, v.chart, v.song))
+                .sort((a, b) => b.dxRating - a.dxRating
+                ? b.dxRating - a.dxRating
+                : b.achievement - a.achievement)
+                .slice(0, 15),
             old: oldScores
-                .sort((a, b) => b.pb.calculatedData.rate - a.pb.calculatedData.rate
-                ? b.pb.calculatedData.rate - a.pb.calculatedData.rate
-                : b.pb.scoreData.percent - a.pb.scoreData.percent)
-                .slice(0, 35)
-                .map((v) => this.toMaiDrawScore(v.pb, v.chart, v.song)),
+                .map((v) => this.toMaiDrawScore(v.pb, v.chart, v.song))
+                .sort((a, b) => b.dxRating - a.dxRating
+                ? b.dxRating - a.dxRating
+                : b.achievement - a.achievement)
+                .slice(0, 35),
         };
     }
     async getPlayerInfo(userId, options = {

package/dist/mai/lib/adapter/kamaiTachi/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/mai/lib/adapter/kamaiTachi/index.ts"],"names":[],"mappings":";;;;;;AAEA,2CAAqC;AACrC,qCAAwC;AAExC,4CAM2B;AAC3B,wDAAqD;AAErD,MAAa,UAAW,SAAQ,WAAmB;IACvC,cAAc,CAA0B;IACxC,aAAa,CAAqB;IAC1C,YAAY,EACR,OAAO,GAAG,yBAAyB,EACnC,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,KAAK,EACvC,MAAM,GAAG,IAAI,MAKb,EAAE;QACF,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QACnB,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;QAC9B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;IAChC,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,iBAAiB,EAAE,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc;QAC5B,OAAO,IAAI,CAAC,GAAG,CAOX,iBAAiB,MAAM,gCAAgC,EACvD,SAAS,EACT,EAAE,GAAG,IAAI,CACZ,CAAC;IACN,CAAC;IACM,KAAK,CAAC,eAAe,CAAC,MAAc,EAAE,OAAe;QACxD,OAAO,IAAI,CAAC,GAAG,CACX,iBAAiB,MAAM,iCAAiC,OAAO,EAAE,EACjE,SAAS,EACT,EAAE,GAAG,IAAI,CACZ,CAAC;IACN,CAAC;IACO,cAAc,CAClB,KAAqB,EACrB,KAAwB,EACxB,IAAsB;QAEtB,MAAM,UAAU,GAAG,mBAAQ,CAAC,aAAa,CACrC,KAAK,CAAC,IAAI,CAAC,QAAQ,EACnB,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CACpC,CAAC;QACF,MAAM,aAAa,GAAG,UAAU;YAC5B,CAAC,CAAC,UAAU,CAAC,MAAM;iBACZ,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC;iBACrC,IAAI,CACD,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,CAAC,OAAO,CAAC,IAAI;gBACd,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAC9C,EAAE,IAAI,CAAC,KAAK;YACnB,CAAC,CAAC,SAAS,CAAC;QAChB,OAAO;YACH,KAAK,EAAE,CAAC,GAAG,EAAE;gBACT,OAAO;oBACH,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ;oBACvB,IAAI,EAAE,IAAI,CAAC,KAAK;oBAChB,UAAU,EAAE,CAAC,GAAG,EAAE;wBACd,QAAQ,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC;4BACrC,KAAK,WAAW,CAAC;4BACjB,KAAK,cAAc;gCACf,OAAO,kBAAW,CAAC,QAAQ,CAAC;4BAChC,KAAK,QAAQ,CAAC;4BACd,KAAK,WAAW;gCACZ,OAAO,kBAAW,CAAC,MAAM,CAAC;4BAC9B,KAAK,QAAQ,CAAC;4BACd,KAAK,WAAW;gCACZ,OAAO,kBAAW,CAAC,MAAM,CAAC;4BAC9B,KAAK,UAAU,CAAC;4BAChB,KAAK,aAAa;gCACd,OAAO,kBAAW,CAAC,QAAQ,CAAC;4BAChC,KAAK,OAAO,CAAC;4BACb,KAAK,UAAU,CAAC;4BAChB;gCACI,OAAO,kBAAW,CAAC,KAAK,CAAC;wBACjC,CAAC;oBACL,CAAC,CAAC,EAAE;oBACJ,KAAK,EAAE,aAAa,IAAI,KAAK,CAAC,QAAQ;oBACtC,UAAU,EACN,UAAU,EAAE,IAAI,CAAC,UAAU;wBAC3B,CAAC,GAAG,EAAE;4BACF,OAAO,CACH,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,CAAC;gCACvC,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;gCACzC,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,CAAC;gCACvC,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,CAAC;gCACtC,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAC7C,CAAC;wBACN,CAAC,CAAC,EAAE;iBACX,CAAC;YACN,CAAC,CAAC,EAAE;YACJ,KAAK,EAAE,CAAC,GAAG,EAAE;gBACT,QAAQ,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;oBAC3B,KAAK,YAAY;wBACb,OAAO,kBAAW,CAAC,UAAU,CAAC;oBAClC,KAAK,aAAa;wBACd,OAAO,kBAAW,CAAC,eAAe,CAAC;oBACvC,KAAK,aAAa;wBACd,OAAO,kBAAW,CAAC,WAAW,CAAC;oBACnC,KAAK,cAAc;wBACf,OAAO,kBAAW,CAAC,gBAAgB,CAAC;oBACxC;wBACI,OAAO,kBAAW,CAAC,IAAI,CAAC;gBAChC,CAAC;YACL,CAAC,CAAC,EAAE;YACJ,IAAI,EAAE,iBAAU,CAAC,IAAI;YACrB,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO;YACpC,eAAe,EAAE,CAAC,GAAG,EAAE;gBACnB,QAAQ,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;oBAC5B,KAAK,GAAG;wBACJ,OAAO,wBAAiB,CAAC,CAAC,CAAC;oBAC/B,KAAK,GAAG;wBACJ,OAAO,wBAAiB,CAAC,CAAC,CAAC;oBAC/B,KAAK,IAAI;wBACL,OAAO,wBAAiB,CAAC,EAAE,CAAC;oBAChC,KAAK,KAAK;wBACN,OAAO,wBAAiB,CAAC,GAAG,CAAC;oBACjC,KAAK,GAAG;wBACJ,OAAO,wBAAiB,CAAC,CAAC,CAAC;oBAC/B,KAAK,IAAI;wBACL,OAAO,wBAAiB,CAAC,EAAE,CAAC;oBAChC,KAAK,KAAK;wBACN,OAAO,wBAAiB,CAAC,GAAG,CAAC;oBACjC,KAAK,GAAG;wBACJ,OAAO,wBAAiB,CAAC,CAAC,CAAC;oBAC/B,KAAK,IAAI;wBACL,OAAO,wBAAiB,CAAC,EAAE,CAAC;oBAChC,KAAK,IAAI;wBACL,OAAO,wBAAiB,CAAC,EAAE,CAAC;oBAChC,KAAK,KAAK;wBACN,OAAO,wBAAiB,CAAC,GAAG,CAAC;oBACjC,KAAK,KAAK;wBACN,OAAO,wBAAiB,CAAC,GAAG,CAAC;oBACjC,KAAK,MAAM;wBACP,OAAO,wBAAiB,CAAC,IAAI,CAAC;oBAClC,KAAK,GAAG,CAAC;oBACT;wBACI,OAAO,wBAAiB,CAAC,CAAC,CAAC;gBACnC,CAAC;YACL,CAAC,CAAC,EAAE;YACJ,QAAQ,EAAE,aAAa;gBACnB,CAAC,CAAC,iBAAU,CAAC,eAAe,CACtB,aAAa,EACb,KAAK,CAAC,SAAS,CAAC,OAAO,CAC1B;gBACH,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI;YAC/B,OAAO,EAAE,CAAC,GAAG,EAAE;gBACX,OAAO,CACH,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC;oBAC3C,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC;oBAC7C,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,CAAC,CAC1C,CAAC;YACN,CAAC,CAAC,EAAE;YAEJ,YAAY,EAAE;gBACV,EAAE,EAAE;oBACA,OAAO,EAAE,KAAK,CAAC,OAAO;iBACzB;aACJ;SACJ,CAAC;IACN,CAAC;IACO,qBAAqB,CAAC,KAAwB;QAClD,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC;gBACrD,OAAO,kBAAW,CAAC,QAAQ,CAAC;YAChC,KAAK,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAClD,OAAO,kBAAW,CAAC,MAAM,CAAC;YAC9B,KAAK,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAClD,OAAO,kBAAW,CAAC,MAAM,CAAC;YAC9B,KAAK,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACpD,OAAO,kBAAW,CAAC,QAAQ,CAAC;YAChC,KAAK,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACtD;gBACI,OAAO,kBAAW,CAAC,KAAK,CAAC;QACjC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,eAAe,CACjB,MAAc,EACd,EACI,OAAO,GAAG,IAAI,EACd,GAAG,GAAG,KAAK,MAIX,EAAE;QAEN,SAAS,QAAQ,CAAC,KAIjB;YACG,OAAO,CACH,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,IAAI,aAAa;gBACxC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,IAAI,cAAc,CAC5C,CAAC;QACN,CAAC;QACD,SAAS,QAAQ,CAAC,KAIjB;YACG,OAAO,CACH,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,IAAI,YAAY;gBACvC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,IAAI,aAAa,CAC3C,CAAC;QACN,CAAC;QACD,SAAS,0BAA0B,CAAC,KAInC;YACG,QAAQ,GAAG,EAAE,CAAC;gBACV,KAAK,IAAI;oBACL,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAC3B,KAAK,IAAI;oBACL,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAC9C,KAAK,KAAK,CAAC;gBACX;oBACI,OAAO,IAAI,CAAC;YACpB,CAAC;QACL,CAAC;QACD,MAAM,4BAA4B,GAAG,CAAC,KAIrC,EAAE,EAAE;YACD,OAAO,CACH,mBAAQ,CAAC,aAAa,CAClB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EACzB,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,CAC1C,EAAE,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,IAAI;gBACvC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAC1C,CAAC;QACN,CAAC,CAAC;QACF,MAAM,4BAA4B,GAAG,CAAC,KAIrC,EAAE,EAAE;YACD,MAAM,UAAU,GAAG,mBAAQ,CAAC,aAAa,CACrC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EACzB,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,CAC1C,EAAE,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC;YACxC,IAAI,CAAC,UAAU;gBAAE,OAAO,KAAK,CAAC;YAC9B,OAAO,CACH,UAAU,CAAC,mBAAmB,CAC1B,IAAI,CAAC,cAAc,EACnB,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,CACxC,GAAG,CAAC,CACR,CAAC;QACN,CAAC,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,EAAE,IAAI;YAAE,OAAO,IAAI,CAAC;QAC/B,MAAM,GAAG,GAIH,EAAE,CAAC;QACT,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAC/B,IAAI,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;YACpE,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAChB,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QACD,IAAI,SAAS,GAIH,EAAE,EACR,SAAS,GAIH,EAAE,CAAC;QACb,IAAI,mBAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC;YAC9B,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC;YACrD,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACJ,SAAS,GAAG,GAAG,CAAC,MAAM,CAClB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,kDAAkD;aACrH,CAAC;YACF,SAAS,GAAG,GAAG,CAAC,MAAM,CAClB,CAAC,CAAC,EAAE,EAAE;YACF,eAAe;YACf,CAAC,CAAC,KAAK;gBACP,8CAA8C;gBAC9C,UAAU,CAAC,mBAAmB,CAC1B,IAAI,CAAC,cAAc,EACnB,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CACzD,GAAG,CAAC;gBACL,CAAC,OAAO,IAAI,+CAA+C;oBACvD,CAAC,CACG,CACI,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,+IAA+I;wBACxL,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACxC,CAAC,2HAA2H;qBAChI,CAAC,CAAC,oBAAoB;aAClC,CAAC;QACN,CAAC;QAED,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QACzD,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAEzD,OAAO;YACH,GAAG,EAAE,SAAS;iBACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;iBACtD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACX,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ;gBACnB,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ;gBACzB,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CACtC;iBACA,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;YACjB,GAAG,EAAE,SAAS;iBACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;iBACtD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACX,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ;gBACnB,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ;gBACzB,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CACtC;iBACA,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;SACpB,CAAC;IACN,CAAC;IACD,KAAK,CAAC,aAAa,CACf,MAAc,EACd,UAGI;QACA,OAAO,EAAE,IAAI;QACb,GAAG,EAAE,KAAK;KACb;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAC3C,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,CAAC,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxE,OAAO;YACH,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ;YAC5B,MAAM,EAAE,QAAQ;SACnB,CAAC;IACN,CAAC;IACO,KAAK,CAAC,mBAAmB,CAAC,MAAc;QAC5C,OAAO,IAAI,CAAC,GAAG,CAMb,iBAAiB,MAAM,EAAE,CAAC,CAAC;IACjC,CAAC;IACD,KAAK,CAAC,uBAAuB,CAAC,MAAc;QACxC,OAAO,CACH,CAAC,MAAM,IAAI,CAAC,GAAG,CACX,iBAAiB,MAAM,MAAM,EAC7B,SAAS,EACT,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAClB,EAAE,YAAY,EAAE,aAAa,EAAE,CAClC,CAAC,IAAI,IAAI,CACb,CAAC;IACN,CAAC;IACD,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,OAAe;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,EAAE,IAAI;YACb,OAAO;gBACH,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,IAAI;aACd,CAAC;QACN,MAAM,GAAG,GAIH,EAAE,CAAC;QACT,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAC/B,IAAI,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;YACpE,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAChB,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QACD,SAAS,iBAAiB,CAAC,OAA0B,EAAE,MAAc;YACjE,OAAO,CACH,OAAO,CAAC,UAAU;gBAClB,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,CAC9F,CAAC;QACN,CAAC;QACD,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAClB,CAAC,CAAC,EAAE,EAAE,CACF,iBAAiB,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC;YACnC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,OAAO,CACvC,CAAC;QACF,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CACrB,CAAC,CAAC,EAAE,EAAE,CACF,iBAAiB,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC;YACtC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,OAAO,CACvC,CAAC;QACF,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CACnB,CAAC,CAAC,EAAE,EAAE,CACF,iBAAiB,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC;YACpC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,OAAO,CACvC,CAAC;QACF,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CACnB,CAAC,CAAC,EAAE,EAAE,CACF,iBAAiB,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC;YACpC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,OAAO,CACvC,CAAC;QACF,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CACrB,CAAC,CAAC,EAAE,EAAE,CACF,iBAAiB,CAAC,CAAC,CAAC,KAAK,EAAE,WAAW,CAAC;YACvC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,OAAO,CACvC,CAAC;QACF,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAClB,CAAC,CAAC,EAAE,EAAE,CACF,iBAAiB,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC;YACnC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,OAAO,CACvC,CAAC;QACF,OAAO;YACH,KAAK,EAAE,KAAK;gBACR,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC;gBACxD,CAAC,CAAC,IAAI;YACV,QAAQ,EAAE,QAAQ;gBACd,CAAC,CAAC,IAAI,CAAC,cAAc,CACf,QAAQ,CAAC,EAAE,EACX,QAAQ,CAAC,KAAK,EACd,QAAQ,CAAC,IAAI,CAChB;gBACH,CAAC,CAAC,IAAI;YACV,MAAM,EAAE,MAAM;gBACV,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC;gBAC3D,CAAC,CAAC,IAAI;YACV,MAAM,EAAE,MAAM;gBACV,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC;gBAC3D,CAAC,CAAC,IAAI;YACV,QAAQ,EAAE,QAAQ;gBACd,CAAC,CAAC,IAAI,CAAC,cAAc,CACf,QAAQ,CAAC,EAAE,EACX,QAAQ,CAAC,KAAK,EACd,QAAQ,CAAC,IAAI,CAChB;gBACH,CAAC,CAAC,IAAI;YACV,KAAK,EAAE,KAAK;gBACR,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC;gBACxD,CAAC,CAAC,IAAI;SACb,CAAC;IACN,CAAC;IACM,KAAK,CAAC,gBAAgB,CACzB,QAAgB,EAChB,KAAa,EACb,IAAY,EACZ,UAAgC,EAAE,OAAO,EAAE,KAAK,EAAE;QAElD,IAAI,IAAI,GAAG,CAAC;YAAE,IAAI,GAAG,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,EAAE,IAAI;YAAE,OAAO,IAAI,CAAC;QAC/B,MAAM,GAAG,GAIH,EAAE,CAAC;QACT,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAC/B,IAAI,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;YACpE,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAChB,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QACD,OAAO,GAAG;aACL,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;aACtD,IAAI,CACD,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACL,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW;YAC7B,CAAC,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CACpC;aACA,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACV,OAAO,CAAC,OAAO;YACX,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK;YACxB,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CACxD;aACA,KAAK,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACtD,CAAC;IACO,iBAAiB,CAAC,OAAe,EAAE,MAAc,EAAE,MAAc;QACrE,IAAI,EAAE,GAAG,CAAC,EACN,EAAE,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;YAC9B,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACxB,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;QACjD,CAAC;aAAM,CAAC;YACJ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC;YACvC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC;QACjC,CAAC;QACD,OAAO,EAAE,IAAI,OAAO,IAAI,OAAO,IAAI,EAAE,CAAC;IAC1C,CAAC;CACJ;AAxfD,gCAwfC;AAED,MAAa,iBAAiB;IACnB,MAAM,CAAC,MAAoB;QAC9B,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,MAAM;YACvC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,UAAU,CAAC,MAAoB;QAClC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,WAAW;YAC5C,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,KAAK,CAAC,MAAoB;QAC7B,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,KAAK;YACtC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,SAAS,CAAC,MAAoB;QACjC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,UAAU;YAC3C,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,MAAM,CAAC,MAAoB;QAC9B,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,MAAM;YACvC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,UAAU,CAAC,MAAoB;QAClC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,WAAW;YAC5C,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,IAAI,CAAC,MAAoB;QAC5B,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,IAAI;YACrC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,QAAQ,CAAC,MAAoB;QAChC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,SAAS;YAC1C,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,QAAQ,CAAC,MAAoB;QAChC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,QAAQ;YACzC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,YAAY,CAAC,MAAoB;QACpC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,aAAa;YAC9C,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,IAAI,CAAC,MAAoB;QAC5B,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,IAAI;YACrC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,QAAQ,CAAC,MAAoB;QAChC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,SAAS;YAC1C,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,MAAM,CAAC,MAAoB;QAC9B,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,MAAM;YACvC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,EAAE,CAAC,MAAoB;QAC1B,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,EAAE;YACnC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,MAAM,CAAC,MAAoB;QAC9B,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,OAAO;YACxC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,MAAM,CAAC,MAAoB;QAC9B,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,MAAM;YACvC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,UAAU,CAAC,MAAoB;QAClC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,WAAW;YAC5C,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,QAAQ,CAAC,MAAoB;QAChC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,QAAQ;YACzC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,YAAY,CAAC,MAAoB;QACpC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,aAAa;YAC9C,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,QAAQ,CAAC,MAAoB;QAChC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,QAAQ;YACzC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,YAAY,CAAC,MAAoB;QACpC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,aAAa;YAC9C,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,OAAO,CAAC,MAAoB;QAC/B,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,OAAO;YACxC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,WAAW,CAAC,MAAoB;QACnC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,YAAY;YAC7C,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,KAAK,CAAC,MAAoB;QAC7B,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,KAAK;YACtC,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,SAAS,CAAC,MAAoB;QACjC,OAAO,IAAI,UAAU,CAAC;YAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,UAAU;YAC3C,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IACM,EAAE;QACL,OAAO;YACH,EAAE;gBACE,OAAO,IAAI,UAAU,CAAC;oBAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,EAAE;oBACnC,MAAM,EAAE,IAAI;iBACf,CAAC,CAAC;YACP,CAAC;YACD,MAAM;gBACF,OAAO,IAAI,UAAU,CAAC;oBAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,MAAM;oBACvC,MAAM,EAAE,IAAI;iBACf,CAAC,CAAC;YACP,CAAC;YACD,MAAM;gBACF,OAAO,IAAI,UAAU,CAAC;oBAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,QAAQ;oBACzC,MAAM,EAAE,IAAI;iBACf,CAAC,CAAC;YACP,CAAC;YACD,MAAM;gBACF,OAAO,IAAI,UAAU,CAAC;oBAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,QAAQ;oBACzC,MAAM,EAAE,IAAI;iBACf,CAAC,CAAC;YACP,CAAC;YACD,MAAM;gBACF,OAAO,IAAI,UAAU,CAAC;oBAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,OAAO;oBACxC,MAAM,EAAE,IAAI;iBACf,CAAC,CAAC;YACP,CAAC;YACD,MAAM;gBACF,OAAO,IAAI,UAAU,CAAC;oBAClB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,KAAK;oBACtC,MAAM,EAAE,IAAI;iBACf,CAAC,CAAC;YACP,CAAC;SACJ,CAAC;IACN,CAAC;CACJ;AA/LD,8CA+LC;AAED,WAAiB,UAAU;IA2HV,uBAAY,GAAG;QACxB,UAAU,EAAE;YACR,KAAK,EAAE,wBAAwB;YAC/B,EAAE,EAAE,yBAAyB;YAC7B,EAAE,EAAE,sBAAsB;YAC1B,EAAE,EAAE,EAAE;SACT;QACD,KAAK,EAAE;YACH,KAAK,EAAE,mBAAmB;YAC1B,EAAE,EAAE,oBAAoB;YACxB,EAAE,EAAE,iBAAiB;YACrB,EAAE,EAAE,WAAW;SAClB;QACD,YAAY,EAAE;YACV,KAAK,EAAE,0BAA0B;YACjC,EAAE,EAAE,2BAA2B;YAC/B,EAAE,EAAE,wBAAwB;YAC5B,EAAE,EAAE,EAAE;SACT;QACD,OAAO,EAAE;YACL,KAAK,EAAE,qBAAqB;YAC5B,EAAE,EAAE,sBAAsB;YAC1B,EAAE,EAAE,mBAAmB;YACvB,EAAE,EAAE,WAAW;SAClB;QACD,aAAa,EAAE;YACX,KAAK,EAAE,2BAA2B;YAClC,EAAE,EAAE,4BAA4B;YAChC,EAAE,EAAE,yBAAyB;YAC7B,EAAE,EAAE,EAAE;SACT;QACD,QAAQ,EAAE;YACN,KAAK,EAAE,sBAAsB;YAC7B,EAAE,EAAE,uBAAuB;YAC3B,EAAE,EAAE,oBAAoB;YACxB,EAAE,EAAE,WAAW;SAClB;QACD,aAAa,EAAE;YACX,KAAK,EAAE,2BAA2B;YAClC,EAAE,EAAE,4BAA4B;YAChC,EAAE,EAAE,yBAAyB;YAC7B,EAAE,EAAE,EAAE;SACT;QACD,QAAQ,EAAE;YACN,KAAK,EAAE,sBAAsB;YAC7B,EAAE,EAAE,uBAAuB;YAC3B,EAAE,EAAE,oBAAoB;YACxB,EAAE,EAAE,WAAW;SAClB;QACD,WAAW,EAAE;YACT,KAAK,EAAE,yBAAyB;YAChC,EAAE,EAAE,0BAA0B;YAC9B,EAAE,EAAE,uBAAuB;YAC3B,EAAE,EAAE,EAAE;SACT;QACD,MAAM,EAAE;YACJ,KAAK,EAAE,oBAAoB;YAC3B,EAAE,EAAE,qBAAqB;YACzB,EAAE,EAAE,kBAAkB;YACtB,EAAE,EAAE,WAAW;SAClB;QACD,OAAO,EAAE;YACL,KAAK,EAAE,kBAAkB;YACzB,EAAE,EAAE,mBAAmB;YACvB,EAAE,EAAE,gBAAgB;YACpB,EAAE,EAAE,EAAE;SACT;QACD,EAAE,EAAE;YACA,KAAK,EAAE,aAAa;YACpB,EAAE,EAAE,cAAc;YAClB,EAAE,EAAE,WAAW;YACf,EAAE,EAAE,MAAM;SACb;QACD,MAAM,EAAE;YACJ,KAAK,EAAE,eAAe;YACtB,EAAE,EAAE,eAAe;YACnB,EAAE,EAAE,eAAe;YACnB,EAAE,EAAE,eAAe;SACtB;QACD,SAAS,EAAE;YACP,KAAK,EAAE,kBAAkB;YACzB,EAAE,EAAE,kBAAkB;YACtB,EAAE,EAAE,kBAAkB;YACtB,EAAE,EAAE,kBAAkB;SACzB;QACD,IAAI,EAAE;YACF,KAAK,EAAE,aAAa;YACpB,EAAE,EAAE,aAAa;YACjB,EAAE,EAAE,aAAa;YACjB,EAAE,EAAE,aAAa;SACpB;QACD,aAAa,EAAE;YACX,KAAK,EAAE,sBAAsB;YAC7B,EAAE,EAAE,sBAAsB;YAC1B,EAAE,EAAE,sBAAsB;YAC1B,EAAE,EAAE,sBAAsB;SAC7B;QACD,QAAQ,EAAE;YACN,KAAK,EAAE,iBAAiB;YACxB,EAAE,EAAE,iBAAiB;YACrB,EAAE,EAAE,iBAAiB;YACrB,EAAE,EAAE,iBAAiB;SACxB;QACD,SAAS,EAAE;YACP,KAAK,EAAE,kBAAkB;YACzB,EAAE,EAAE,kBAAkB;YACtB,EAAE,EAAE,kBAAkB;YACtB,EAAE,EAAE,kBAAkB;SACzB;QACD,IAAI,EAAE;YACF,KAAK,EAAE,aAAa;YACpB,EAAE,EAAE,aAAa;YACjB,EAAE,EAAE,aAAa;YACjB,EAAE,EAAE,aAAa;SACpB;QACD,WAAW,EAAE;YACT,KAAK,EAAE,oBAAoB;YAC3B,EAAE,EAAE,oBAAoB;YACxB,EAAE,EAAE,oBAAoB;YACxB,EAAE,EAAE,oBAAoB;SAC3B;QACD,MAAM,EAAE;YACJ,KAAK,EAAE,eAAe;YACtB,EAAE,EAAE,eAAe;YACnB,EAAE,EAAE,eAAe;YACnB,EAAE,EAAE,eAAe;SACtB;QACD,UAAU,EAAE;YACR,KAAK,EAAE,mBAAmB;YAC1B,EAAE,EAAE,mBAAmB;YACvB,EAAE,EAAE,mBAAmB;YACvB,EAAE,EAAE,mBAAmB;SAC1B;QACD,KAAK,EAAE;YACH,KAAK,EAAE,cAAc;YACrB,EAAE,EAAE,cAAc;YAClB,EAAE,EAAE,cAAc;YAClB,EAAE,EAAE,cAAc;SACrB;QACD,WAAW,EAAE;YACT,KAAK,EAAE,aAAa;YACpB,EAAE,EAAE,aAAa;YACjB,EAAE,EAAE,aAAa;YACjB,EAAE,EAAE,aAAa;SACpB;QACD,MAAM,EAAE;YACJ,KAAK,EAAE,QAAQ;YACf,EAAE,EAAE,QAAQ;YACZ,EAAE,EAAE,QAAQ;YACZ,EAAE,EAAE,QAAQ;SACf;KACK,CAAC;IAMX,MAAM,gBAAgB,GAAG;QACrB,WAAA,YAAY,CAAC,MAAM;QACnB,WAAA,YAAY,CAAC,WAAW;QACxB,WAAA,YAAY,CAAC,KAAK;QAClB,WAAA,YAAY,CAAC,UAAU;QACvB,WAAA,YAAY,CAAC,MAAM;QACnB,WAAA,YAAY,CAAC,WAAW;QACxB,WAAA,YAAY,CAAC,IAAI;QACjB,WAAA,YAAY,CAAC,SAAS;QACtB,WAAA,YAAY,CAAC,QAAQ;QACrB,WAAA,YAAY,CAAC,aAAa;QAC1B,WAAA,YAAY,CAAC,IAAI;QACjB,WAAA,YAAY,CAAC,SAAS;QACtB,WAAA,YAAY,CAAC,MAAM;QACnB,WAAA,YAAY,CAAC,EAAE;QACf,WAAA,YAAY,CAAC,OAAO;QACpB,WAAA,YAAY,CAAC,MAAM;QACnB,WAAA,YAAY,CAAC,WAAW;QACxB,WAAA,YAAY,CAAC,QAAQ;QACrB,WAAA,YAAY,CAAC,aAAa;QAC1B,WAAA,YAAY,CAAC,QAAQ;QACrB,WAAA,YAAY,CAAC,aAAa;QAC1B,WAAA,YAAY,CAAC,OAAO;QACpB,WAAA,YAAY,CAAC,YAAY;QACzB,WAAA,YAAY,CAAC,KAAK;QAClB,WAAA,YAAY,CAAC,UAAU;KACjB,CAAC;IAEX,SAAgB,cAAc,CAAC,OAAe;QAC1C,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,WAAA,YAAY,CAAC,EAAE,CAAC;YAChD,IACI,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE;gBACrD,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE;gBAClD,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE;gBAClD,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,EACpD,CAAC;gBACC,OAAO,OAAO,CAAC;YACnB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAZe,yBAAc,iBAY7B,CAAA;IAED;;;;;;OAMG;IACH,SAAgB,mBAAmB,CAC/B,CAAyB,EACzB,CAAyB;QAEzB,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;QACvB,IAAI,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa;QAChC,IAAI,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC,CAAC,aAAa;QAC/B,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;IARe,8BAAmB,sBAQlC,CAAA;AACL,CAAC,EAlVgB,UAAU,0BAAV,UAAU,QAkV1B"}

package/dist/mai/lib/{lxns → adapter/lxns}/index.d.ts

@@ -1,5 +1,5 @@
 import ScoreTrackerAdapter from "..";
-import { Best50 } from "../../best50";
+import { IScore, IChart } from "../../../type";
 export declare class LXNS extends ScoreTrackerAdapter {
     constructor({ auth, baseURL, }: {
         auth: string;
@@ -7,29 +7,29 @@ export declare class LXNS extends ScoreTrackerAdapter {
     });
     private getChartList;
     getPlayerBest50(username: string): Promise<{
-        new: Best50.IScore[];
-        old: Best50.IScore[];
+        new: IScore[];
+        old: IScore[];
     } | null>;
     getPlayerInfo(username: string): Promise<{
         name: string;
         rating: number;
     } | null>;
-    getPlayerRawBest50(friendCode: string): Promise<Best50.LXNS.IAPIResponse<Best50.LXNS.IBest50Response> | undefined>;
-    getPlayerRawProfile(friendCode: string): Promise<Best50.LXNS.IAPIResponse<Best50.LXNS.IPlayer> | undefined>;
+    getPlayerRawBest50(friendCode: string): Promise<LXNS.IAPIResponse<LXNS.IBest50Response> | undefined>;
+    getPlayerRawProfile(friendCode: string): Promise<LXNS.IAPIResponse<LXNS.IPlayer> | undefined>;
     getSong(songId: number): Promise<LXNS.ISong>;
     getSongList(): Promise<LXNS.ISongListResponse>;
-    getMaiDrawChartList(): Promise<Best50.IChart[]>;
+    getMaiDrawChartList(): Promise<IChart[]>;
     private toMaiDrawScore;
     getPlayerProfilePicture(username: string): Promise<Buffer | null>;
     getPlayerScore(username: string, chartId: number): Promise<{
-        basic: Best50.IScore | null;
-        advanced: Best50.IScore | null;
-        expert: Best50.IScore | null;
-        master: Best50.IScore | null;
-        remaster: Best50.IScore | null;
+        basic: IScore | null;
+        advanced: IScore | null;
+        expert: IScore | null;
+        master: IScore | null;
+        remaster: IScore | null;
         utage: null;
     } | {
-        utage: Best50.IScore | null;
+        utage: IScore | null;
         basic: null;
         advanced: null;
         expert: null;

package/dist/mai/lib/{lxns → adapter/lxns}/index.js

@@ -4,10 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LXNS = void 0;
-const type_1 = require("../../type");
 const __1 = __importDefault(require(".."));
-const chart_1 = require("../../chart");
-const best50_1 = require("../../best50");
+const type_1 = require("../../../type");
+const database_1 = require("../../database");
 class LXNS extends __1.default {
     constructor({ auth, baseURL = "https://maimai.lxns.net/api/v0/maimai", }) {
         super({ baseURL });
@@ -15,10 +14,10 @@ class LXNS extends __1.default {
     }
     async getChartList(targets) {
         let chartList;
-        if (chart_1.Chart.Database.hasLocalDatabase()) {
+        if (database_1.Database.hasLocalDatabase()) {
             chartList = targets
                 .map((chart) => {
-                return chart_1.Chart.Database.getLocalChart(chart.id +
+                return database_1.Database.getLocalChart(chart.id +
                     (chart.type == LXNS.ESongTypes.DX ? 10000 : 0), chart.level_index);
             })
                 .filter((v) => v !== null)
@@ -160,63 +159,63 @@ class LXNS extends __1.default {
                 achievementRank: (() => {
                     switch (chart.rate) {
                         case LXNS.ERateTypes.C:
-                            return best50_1.Best50.EAchievementTypes.C;
+                            return type_1.EAchievementTypes.C;
                         case LXNS.ERateTypes.B:
-                            return best50_1.Best50.EAchievementTypes.B;
+                            return type_1.EAchievementTypes.B;
                         case LXNS.ERateTypes.BB:
-                            return best50_1.Best50.EAchievementTypes.BB;
+                            return type_1.EAchievementTypes.BB;
                         case LXNS.ERateTypes.BBB:
-                            return best50_1.Best50.EAchievementTypes.BBB;
+                            return type_1.EAchievementTypes.BBB;
                         case LXNS.ERateTypes.A:
-                            return best50_1.Best50.EAchievementTypes.A;
+                            return type_1.EAchievementTypes.A;
                         case LXNS.ERateTypes.AA:
-                            return best50_1.Best50.EAchievementTypes.AA;
+                            return type_1.EAchievementTypes.AA;
                         case LXNS.ERateTypes.AAA:
-                            return best50_1.Best50.EAchievementTypes.AAA;
+                            return type_1.EAchievementTypes.AAA;
                         case LXNS.ERateTypes.S:
-                            return best50_1.Best50.EAchievementTypes.S;
+                            return type_1.EAchievementTypes.S;
                         case LXNS.ERateTypes.SP:
-                            return best50_1.Best50.EAchievementTypes.SP;
+                            return type_1.EAchievementTypes.SP;
                         case LXNS.ERateTypes.SS:
-                            return best50_1.Best50.EAchievementTypes.SS;
+                            return type_1.EAchievementTypes.SS;
                         case LXNS.ERateTypes.SSP:
-                            return best50_1.Best50.EAchievementTypes.SSP;
+                            return type_1.EAchievementTypes.SSP;
                         case LXNS.ERateTypes.SSS:
-                            return best50_1.Best50.EAchievementTypes.SSS;
+                            return type_1.EAchievementTypes.SSS;
                         case LXNS.ERateTypes.SSSP:
-                            return best50_1.Best50.EAchievementTypes.SSSP;
+                            return type_1.EAchievementTypes.SSSP;
                         default:
-                            return best50_1.Best50.EAchievementTypes.D;
+                            return type_1.EAchievementTypes.D;
                     }
                 })(),
                 combo: (() => {
                     switch (chart.fc) {
                         case LXNS.EFCTypes.FULL_COMBO:
-                            return best50_1.Best50.EComboTypes.FULL_COMBO;
+                            return type_1.EComboTypes.FULL_COMBO;
                         case LXNS.EFCTypes.FULL_COMBO_PLUS:
-                            return best50_1.Best50.EComboTypes.FULL_COMBO_PLUS;
+                            return type_1.EComboTypes.FULL_COMBO_PLUS;
                         case LXNS.EFCTypes.ALL_PERFECT:
-                            return best50_1.Best50.EComboTypes.ALL_PERFECT;
+                            return type_1.EComboTypes.ALL_PERFECT;
                         case LXNS.EFCTypes.ALL_PERFECT_PLUS:
-                            return best50_1.Best50.EComboTypes.ALL_PERFECT_PLUS;
+                            return type_1.EComboTypes.ALL_PERFECT_PLUS;
                         default:
-                            return best50_1.Best50.EComboTypes.NONE;
+                            return type_1.EComboTypes.NONE;
                     }
                 })(),
                 sync: (() => {
                     switch (chart.fs) {
                         case LXNS.EFSTypes.SYNC:
-                            return best50_1.Best50.ESyncTypes.SYNC_PLAY;
+                            return type_1.ESyncTypes.SYNC_PLAY;
                         case LXNS.EFSTypes.FULL_SYNC:
-                            return best50_1.Best50.ESyncTypes.FULL_SYNC;
+                            return type_1.ESyncTypes.FULL_SYNC;
                         case LXNS.EFSTypes.FULL_SYNC_PLUS:
-                            return best50_1.Best50.ESyncTypes.FULL_SYNC_PLUS;
+                            return type_1.ESyncTypes.FULL_SYNC_PLUS;
                         case LXNS.EFSTypes.FULL_SYNC_DX:
-                            return best50_1.Best50.ESyncTypes.FULL_SYNC_DX;
+                            return type_1.ESyncTypes.FULL_SYNC_DX;
                         case LXNS.EFSTypes.FULL_SYNC_DX_PLUS:
-                            return best50_1.Best50.ESyncTypes.FULL_SYNC_DX_PLUS;
+                            return type_1.ESyncTypes.FULL_SYNC_DX_PLUS;
                         default:
-                            return best50_1.Best50.ESyncTypes.NONE;
+                            return type_1.ESyncTypes.NONE;
                     }
                 })(),
                 dxRating: chart.dx_rating,

package/dist/mai/lib/adapter/lxns/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/mai/lib/adapter/lxns/index.ts"],"names":[],"mappings":"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"}

package/dist/mai/lib/{maishift → adapter/maishift}/index.d.ts

@@ -1,5 +1,5 @@
-import { Best50 } from "../../best50";
 import ScoreTrackerAdapter from "..";
+import { IScore } from "../../../type";
 export declare class Maishift extends ScoreTrackerAdapter {
     constructor();
     private pageScraper;
@@ -9,8 +9,8 @@ export declare class Maishift extends ScoreTrackerAdapter {
     } | null>;
     getPlayerProfilePicture(username: string): Promise<Buffer | null>;
     getPlayerBest50(username: string): Promise<{
-        new: Best50.IScore[];
-        old: Best50.IScore[];
+        new: IScore[];
+        old: IScore[];
     } | null>;
     getPlayerScore(username: string, chartId: number): Promise<{
         basic: null;
@@ -27,7 +27,7 @@ export declare class Maishift extends ScoreTrackerAdapter {
         name: string;
         rate: number;
         isDX: boolean;
-    }): Promise<Best50.IScore | null>;
+    }): Promise<IScore | null>;
     getPlayerLevel50(username: string, level: number, page: number, options: {
         percise: boolean;
     }): Promise<null>;

package/dist/mai/lib/{maishift → adapter/maishift}/index.js

@@ -27,10 +27,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Maishift = void 0;
-const best50_1 = require("../../best50");
-const __1 = __importDefault(require(".."));
 const Cheerio = __importStar(require("cheerio"));
-const chart_1 = require("../../chart");
+const __1 = __importDefault(require(".."));
+const type_1 = require("../../../type");
+const database_1 = require("../../database");
 class Maishift extends __1.default {
     constructor() {
         super({
@@ -123,7 +123,7 @@ class Maishift extends __1.default {
         };
     }
     async toMaiDrawScore(score) {
-        const chart = await chart_1.Chart.Database.findLocalChartWithNameAndLevel(score.name, score.level, score.isDX);
+        const chart = await database_1.Database.findLocalChartWithNameAndLevel(score.name, score.level, score.isDX);
         if (!chart)
             return null;
         return {
@@ -134,40 +134,40 @@ class Maishift extends __1.default {
                 level: chart.level,
                 maxDxScore: chart.meta.maxDXScore,
             },
-            combo: best50_1.Best50.EComboTypes.NONE,
-            sync: best50_1.Best50.ESyncTypes.NONE,
+            combo: type_1.EComboTypes.NONE,
+            sync: type_1.ESyncTypes.NONE,
             achievement: score.rate,
             achievementRank: (() => {
                 switch (score.rank) {
                     case "SSS+":
-                        return best50_1.Best50.EAchievementTypes.SSSP;
+                        return type_1.EAchievementTypes.SSSP;
                     case "SSS":
-                        return best50_1.Best50.EAchievementTypes.SSS;
+                        return type_1.EAchievementTypes.SSS;
                     case "SS+":
-                        return best50_1.Best50.EAchievementTypes.SSP;
+                        return type_1.EAchievementTypes.SSP;
                     case "SS":
-                        return best50_1.Best50.EAchievementTypes.SS;
+                        return type_1.EAchievementTypes.SS;
                     case "S+":
-                        return best50_1.Best50.EAchievementTypes.S;
+                        return type_1.EAchievementTypes.S;
                     case "S":
-                        return best50_1.Best50.EAchievementTypes.S;
+                        return type_1.EAchievementTypes.S;
                     case "AAA":
-                        return best50_1.Best50.EAchievementTypes.AAA;
+                        return type_1.EAchievementTypes.AAA;
                     case "AA":
-                        return best50_1.Best50.EAchievementTypes.AA;
+                        return type_1.EAchievementTypes.AA;
                     case "A":
-                        return best50_1.Best50.EAchievementTypes.A;
+                        return type_1.EAchievementTypes.A;
                     case "BBB":
-                        return best50_1.Best50.EAchievementTypes.BBB;
+                        return type_1.EAchievementTypes.BBB;
                     case "BB":
-                        return best50_1.Best50.EAchievementTypes.BB;
+                        return type_1.EAchievementTypes.BB;
                     case "B":
-                        return best50_1.Best50.EAchievementTypes.B;
+                        return type_1.EAchievementTypes.B;
                     case "C":
-                        return best50_1.Best50.EAchievementTypes.C;
+                        return type_1.EAchievementTypes.C;
                     case "D":
                     default:
-                        return best50_1.Best50.EAchievementTypes.D;
+                        return type_1.EAchievementTypes.D;
                 }
             })(),
             dxRating: score.rating,

package/dist/mai/lib/adapter/maishift/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/mai/lib/adapter/maishift/index.ts"],"names":[],"mappings":"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"}

package/dist/mai/{chart → lib}/database.d.ts

@@ -6,7 +6,7 @@ export declare class Database {
     static hasLocalDatabase(): boolean;
     private static cache;
     static cacheJackets(ids: number[]): Promise<void>;
-    static fecthJacket(id: number, 
+    static fetchJacket(id: number, 
     /**
      * Explicit variant will NOT fallback to generic jacket.
      * In practice `DX` variant will almost never return a jacket.
@@ -19,8 +19,8 @@ export declare class Database {
      */
     variant?: "DX" | "EX" | "CN"): Promise<Buffer | null>;
     static getLocalChart(id: number, difficulty: EDifficulty): Database.IChart | null;
-    static getAllSongs(): Promise<Maimai.Chart.Database.IChart[]>;
-    static findLocalChartWithNameAndLevel(name: string, level: number, isDX: boolean): Promise<Maimai.Chart.Database.IChart | null>;
+    static getAllSongs(): Promise<Maimai.Database.IChart[]>;
+    static findLocalChartWithNameAndLevel(name: string, level: number, isDX: boolean): Promise<Maimai.Database.IChart | null>;
 }
 export declare namespace Database {
     interface IChart {