@fdm-monster/server 1.6.0 → 1.6.2

package/dist/services/core/server-release.service.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "ServerReleaseService", {
     }
 });
 const _semver = _interop_require_default(require("semver"));
-const _logger = require("../../handlers/logger");
 const _serverconstants = require("../../server.constants");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -24,18 +23,19 @@ class ServerReleaseService {
     updateAvailable = null;
     latestRelease = null;
     installedRelease = null;
-    #logger = new _logger.LoggerService(ServerReleaseService.name);
-    #serverVersion;
-    constructor({ serverVersion, githubService }){
-        this.#serverVersion = serverVersion;
+    logger;
+    serverVersion;
+    constructor({ serverVersion, githubService, loggerFactory }){
+        this.serverVersion = serverVersion;
         this.githubService = githubService;
+        this.logger = loggerFactory(ServerReleaseService.name);
     }
     getState() {
         return {
             airGapped: this.airGapped,
             latestRelease: this.latestRelease,
             installedRelease: this.installedRelease,
-            serverVersion: this.#serverVersion,
+            serverVersion: this.serverVersion,
             installedReleaseFound: this.installedReleaseFound,
             updateAvailable: this.updateAvailable,
             synced: this.synced
@@ -54,10 +54,10 @@ class ServerReleaseService {
         const latestRelease = latestResponse.data;
         this.airGapped = !releases?.length;
         if (!releases?.length) {
-            this.#logger.warn("Latest release check failed because releases from github empty");
+            this.logger.warn("Latest release check failed because releases from github empty");
             return;
         }
-        const currentlyInstalledRelease = this.#serverVersion;
+        const currentlyInstalledRelease = this.serverVersion;
         this.installedRelease = {
             tag_name: currentlyInstalledRelease
         };
@@ -77,29 +77,29 @@ class ServerReleaseService {
         if (!latestReleaseTag) {
             return;
         }
-        const packageVersion = this.#serverVersion;
+        const packageVersion = this.serverVersion;
         if (!this.installedReleaseFound) {
-            this.#logger.log(`\x1b[36mCurrent release tag not found in github releases.\x1b[0m
+            this.logger.log(`\x1b[36mCurrent release tag not found in github releases.\x1b[0m
     Here's github's latest released: \x1b[32m${latestReleaseTag}\x1b[0m
     Here's your release tag: \x1b[32m${packageVersion}\x1b[0m
     Thanks for using FDM Monster!`);
             return;
         } else {
-            this.#logger.log(`\x1b[36mCurrent release was found in github releases.\x1b[0m
+            this.logger.log(`\x1b[36mCurrent release was found in github releases.\x1b[0m
     Here's github's latest released: \x1b[32m${latestReleaseTag}\x1b[0m
     Here's your release tag: \x1b[32m${packageVersion}\x1b[0m
     Thanks for using FDM Monster!`);
         }
         if (!!packageVersion && latestReleaseState.updateAvailable) {
             if (!!this.airGapped) {
-                this.#logger.warn(`Installed release: ${packageVersion}. Skipping update check (air-gapped/disconnected from internet)`);
+                this.logger.warn(`Installed release: ${packageVersion}. Skipping update check (air-gapped/disconnected from internet)`);
             } else {
-                this.#logger.log(`Update available! New version: ${latestReleaseTag} (prerelease: ${latestRelease.prerelease})`);
+                this.logger.log(`Update available! New version: ${latestReleaseTag} (prerelease: ${latestRelease.prerelease})`);
             }
         } else if (!packageVersion) {
-            return this.#logger.error("Cant check release as package.json version environment variable is not set. Make sure FDM Server is run from a 'package.json' or NPM context.");
+            return this.logger.error("Cant check release as package.json version environment variable is not set. Make sure FDM Server is run from a 'package.json' or NPM context.");
         } else {
-            return this.#logger.log(`Installed release: ${packageVersion}. You are up to date!`);
+            return this.logger.log(`Installed release: ${packageVersion}. You are up to date!`);
         }
     }
 }

package/dist/services/core/server-release.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/server-release.service.ts"],"names":["ServerReleaseService","airGapped","githubService","synced","installedReleaseFound","updateAvailable","latestRelease","installedRelease","logger","LoggerService","name","serverVersion","constructor","getState","syncLatestRelease","wasAuthenticated","owner","AppConstants","orgName","repo","serverRepoName","response","getReleases","latestResponse","getLatestRelease","releases","data","length","warn","currentlyInstalledRelease","tag_name","lastTagIsNewer","semver","gt","logServerVersionState","latestReleaseState","latestReleaseTag","packageVersion","log","prerelease","error"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/server-release.service.ts"],"names":["ServerReleaseService","airGapped","githubService","synced","installedReleaseFound","updateAvailable","latestRelease","installedRelease","logger","serverVersion","constructor","loggerFactory","name","getState","syncLatestRelease","wasAuthenticated","owner","AppConstants","orgName","repo","serverRepoName","response","getReleases","latestResponse","getLatestRelease","releases","data","length","warn","currentlyInstalledRelease","tag_name","lastTagIsNewer","semver","gt","logServerVersionState","latestReleaseState","latestReleaseTag","packageVersion","log","prerelease","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/dist/services/core/server-update.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/server-update.service.ts"],"names":["ServerUpdateService","simpleGitService","logger","constructor","loggerFactory","name","restartServer","isPm2","isNodemon","InternalServerException","execSync","AppConstants","pm2ServiceName","timeout","checkGitUpdates","isValidGitRepo","checkIsRepo","ValidationException","fetch","localRepoStatus","status","result","gitFolderFound","updateCheckSuccess","commitsBehind","behind","commitsAhead","ahead","filesModified","modified","length","pullStatus","warn","pullDetails","pull"],"mappings":";;;;+BAQaA;;;eAAAA;;;0BARoB;iCACJ;+BACJ;mCACoC;AAKtD,MAAMA;IACHC,iBAA4B;IAC5BC,OAAsB;IAE9BC,YAAY,EAAEF,gBAAgB,EAAEG,aAAa,EAAkE,CAAE;QAC/G,IAAI,CAACH,gBAAgB,GAAGA;QACxB,IAAI,CAACC,MAAM,GAAGE,cAAcJ,oBAAoBK,IAAI;IACtD;IAEA,MAAMC,gBAAgB;QACpB,IAAI,CAACC,IAAAA,eAAK,OAAM,CAACC,IAAAA,mBAAS,KAAI;YAE5B,MAAM,IAAIC,0CAAuB,CAAC;QACpC;QAEA,IAAIF,IAAAA,eAAK,KAAI;YACXG,IAAAA,uBAAQ,EAAC,CAAC,YAAY,EAAEC,6BAAY,CAACC,cAAc,CAAC,CAAC,EAAE;gBAAEC,SAAS;YAAK;YACvE,OAAO;QACT,OAAO,IAAIL,IAAAA,mBAAS,KAAI;YACtBE,IAAAA,uBAAQ,EAAC,qEAAqE;gBAC5EG,SAAS;YACX;YACA,OAAO;QACT;IACF;IAEA,MAAMC,kBAAkB;QACtB,IAAIC,iBAAiB,IAAI,CAACd,gBAAgB,CAACe,WAAW;QACtD,IAAI,CAACD,gBAAgB;YACnB,MAAM,IAAIE,sCAAmB,CAAC;QAChC;QAEA,MAAM,IAAI,CAAChB,gBAAgB,CAACiB,KAAK;QACjC,MAAMC,kBAAkB,MAAM,IAAI,CAAClB,gBAAgB,CAACmB,MAAM;QAE1D,IAAI,CAACD,iBAAiB;QAEtB,MAAME,SAAS;YACbC,gBAAgB;YAChBC,oBAAoB;YACpBC,eAAeL,gBAAgBM,MAAM;YACrCC,cAAcP,gBAAgBQ,KAAK;YACnCC,eAAeT,gBAAgBU,QAAQ,EAAEC;YACzCV,QAAQ;YACRW,YAAY;QACd;QAEA,IAAIZ,iBAAiBM,WAAW,GAAG;YACjCJ,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAGA,IAAIF,iBAAiBU,UAAUC,SAAS,KAAKX,gBAAgBQ,KAAK,KAAK,GAAG;YACxEN,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAEA,IAAI,CAACnB,MAAM,CAAC8B,IAAI,CAAC;QAEjB,MAAMC,cAAc,MAAM,IAAI,CAAChC,gBAAgB,CAACiC,IAAI;QACpDb,OAAOD,MAAM,GAAG;QAChBC,OAAOU,UAAU,GAAGE;QACpB,OAAOZ;IACT;AACF"}
+{"version":3,"sources":["../../../src/services/core/server-update.service.ts"],"names":["ServerUpdateService","simpleGitService","logger","constructor","loggerFactory","name","restartServer","isPm2","isNodemon","InternalServerException","execSync","AppConstants","pm2ServiceName","timeout","checkGitUpdates","isValidGitRepo","checkIsRepo","ValidationException","fetch","localRepoStatus","status","result","gitFolderFound","updateCheckSuccess","commitsBehind","behind","commitsAhead","ahead","filesModified","modified","length","pullStatus","warn","pullDetails","pull"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAQaA;;;eAAAA;;;0BARoB;iCACJ;+BACJ;mCACoC;AAKtD,MAAMA;IACHC,iBAA4B;IAC5BC,OAAsB;IAE9BC,YAAY,EAAEF,gBAAgB,EAAEG,aAAa,EAAkE,CAAE;QAC/G,IAAI,CAACH,gBAAgB,GAAGA;QACxB,IAAI,CAACC,MAAM,GAAGE,cAAcJ,oBAAoBK,IAAI;IACtD;IAEA,MAAMC,gBAAgB;QACpB,IAAI,CAACC,IAAAA,eAAK,OAAM,CAACC,IAAAA,mBAAS,KAAI;YAE5B,MAAM,IAAIC,0CAAuB,CAAC;QACpC;QAEA,IAAIF,IAAAA,eAAK,KAAI;YACXG,IAAAA,uBAAQ,EAAC,CAAC,YAAY,EAAEC,6BAAY,CAACC,cAAc,CAAC,CAAC,EAAE;gBAAEC,SAAS;YAAK;YACvE,OAAO;QACT,OAAO,IAAIL,IAAAA,mBAAS,KAAI;YACtBE,IAAAA,uBAAQ,EAAC,qEAAqE;gBAC5EG,SAAS;YACX;YACA,OAAO;QACT;IACF;IAEA,MAAMC,kBAAkB;QACtB,IAAIC,iBAAiB,IAAI,CAACd,gBAAgB,CAACe,WAAW;QACtD,IAAI,CAACD,gBAAgB;YACnB,MAAM,IAAIE,sCAAmB,CAAC;QAChC;QAEA,MAAM,IAAI,CAAChB,gBAAgB,CAACiB,KAAK;QACjC,MAAMC,kBAAkB,MAAM,IAAI,CAAClB,gBAAgB,CAACmB,MAAM;QAE1D,IAAI,CAACD,iBAAiB;QAEtB,MAAME,SAAS;YACbC,gBAAgB;YAChBC,oBAAoB;YACpBC,eAAeL,gBAAgBM,MAAM;YACrCC,cAAcP,gBAAgBQ,KAAK;YACnCC,eAAeT,gBAAgBU,QAAQ,EAAEC;YACzCV,QAAQ;YACRW,YAAY;QACd;QAEA,IAAIZ,iBAAiBM,WAAW,GAAG;YACjCJ,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAGA,IAAIF,iBAAiBU,UAAUC,SAAS,KAAKX,gBAAgBQ,KAAK,KAAK,GAAG;YACxEN,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAEA,IAAI,CAACnB,MAAM,CAAC8B,IAAI,CAAC;QAEjB,MAAMC,cAAc,MAAM,IAAI,CAAChC,gBAAgB,CAACiC,IAAI;QACpDb,OAAOD,MAAM,GAAG;QAChBC,OAAOU,UAAU,GAAGE;QACpB,OAAOZ;IACT;AACF"}

package/dist/services/core/task-manager.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/task-manager.service.ts"],"names":["TaskManagerService","jobScheduler","taskStates","cradle","logger","constructor","container","DITokens","loggerFactory","name","toadScheduler","validateInput","taskId","workload","schedulerOptions","JobValidationException","prefix","resolvedService","e","AwilixResolutionError","stack","run","periodic","runOnce","runDelayed","disabled","milliseconds","seconds","minutes","hours","days","registerJobOrTask","id","task","asyncTaskCallbackOrToken","preset","error","timedTask","getSafeTimedTask","options","execute","delay","runTimeoutTaskInstance","scheduleEnabledPeriodicJob","scheduleDisabledJob","failIfEnabled","taskState","getTaskState","disableJob","failIfDisabled","isTaskDisabled","job","stop","deregisterTask","removeById","timeoutMs","log","setTimeout","handler","asyncHandler","timeTask","AsyncTask","getErrorHandler","started","Date","now","taskService","duration","logFirstCompletion","firstCompletion","registration","lastError","erroredlastError","time","stopSchedulerTasks","runImmediately","SimpleIntervalJob","addSimpleIntervalJob"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/task-manager.service.ts"],"names":["TaskManagerService","jobScheduler","taskStates","cradle","logger","constructor","container","DITokens","loggerFactory","name","toadScheduler","validateInput","taskId","workload","schedulerOptions","JobValidationException","prefix","resolvedService","e","AwilixResolutionError","stack","run","periodic","runOnce","runDelayed","disabled","milliseconds","seconds","minutes","hours","days","registerJobOrTask","id","task","asyncTaskCallbackOrToken","preset","error","timedTask","getSafeTimedTask","options","execute","delay","runTimeoutTaskInstance","scheduleEnabledPeriodicJob","scheduleDisabledJob","failIfEnabled","taskState","getTaskState","disableJob","failIfDisabled","isTaskDisabled","job","stop","deregisterTask","removeById","timeoutMs","log","setTimeout","handler","asyncHandler","timeTask","AsyncTask","getErrorHandler","started","Date","now","taskService","duration","logFirstCompletion","firstCompletion","registration","lastError","erroredlastError","time","stopSchedulerTasks","runImmediately","SimpleIntervalJob","addSimpleIntervalJob"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BASaA;;;eAAAA;;;+BAT+C;wBACtB;+BACC;iCACd;AAMlB,MAAMA;IACXC,aAA4B;IAC5BC,aAAkC,CAAC,EAAE;IAE7BC,OAAY;IACZC,OAAsB;IAE9BC,YAAYC,SAAc,CAAE;QAC1B,IAAI,CAACH,MAAM,GAAGG;QACd,IAAI,CAACF,MAAM,GAAGE,SAAS,CAACC,yBAAQ,CAACC,aAAa,CAAC,CAACR,mBAAmBS,IAAI;QACvE,IAAI,CAACR,YAAY,GAAGK,SAAS,CAACC,yBAAQ,CAACG,aAAa,CAAC;IACvD;IAEAC,cAAcC,MAAc,EAAEC,QAAQ,EAAEC,gBAAgB,EAAE;QACxD,IAAI,CAACF,QAAQ;YACX,MAAM,IAAIG,qCAAsB,CAAC,iEAAiEH;QACpG;QACA,MAAMI,SAAS,CAAC,KAAK,EAAEH,UAAUJ,QAAQ,YAAY,WAAW,EAAEG,OAAO,CAAC,CAAC;QAC3E,IAAI,CAAC,CAAC,IAAI,CAACV,UAAU,CAACU,OAAO,EAAE;YAC7B,MAAM,IAAIG,qCAAsB,CAAC,CAAC,EAAEC,OAAO,mDAAmD,CAAC,EAAEJ;QACnG;QAEA,IAAI,OAAOC,aAAa,YAAY;YAClC,IAAI,OAAOA,aAAa,UAAU;gBAChC,MAAM,IAAIE,qCAAsB,CAC9B,CAAC,EAAEC,OAAO,4EAA4E,CAAC,EACvFJ;YAEJ;YAEA,IAAIK;YACJ,IAAI;gBACFA,kBAAkB,IAAI,CAACd,MAAM,CAACU,SAAS;YACzC,EAAE,OAAOK,GAAG;gBACV,IAAIA,aAAaC,6BAAqB,EAAE;oBACtC,MAAM,IAAIJ,qCAAsB,CAC9B,CAAC,EAAEC,OAAO,6GAA6G,CAAC,GACtHE,EAAEE,KAAK,EACTR;gBAEJ,OAAO;oBACL,MAAM,IAAIG,qCAAsB,CAC9B,CAAC,EAAEC,OAAO,uEAAuE,CAAC,GAAGE,EAAEE,KAAK,EAC5FR;gBAEJ;YACF;YAEA,IAAI,OAAOK,iBAAiBI,QAAQ,YAAY;gBAC9C,MAAM,IAAIN,qCAAsB,CAAC,CAAC,EAAEC,OAAO,6DAA6D,CAAC,EAAEJ;YAC7G;QACF;QAEA,IAAI,CAACE,kBAAkBQ,YAAY,CAACR,kBAAkBS,WAAW,CAACT,kBAAkBU,YAAY;YAC9F,MAAM,IAAIT,qCAAsB,CAAC,CAAC,wDAAwD,CAAC,EAAEH;QAC/F;QACA,IAAI,CAACE,kBAAkBQ,YAAY,CAAC,CAACR,iBAAiBW,QAAQ,EAAE;YAC9D,MAAM,IAAIV,qCAAsB,CAAC,CAAC,sDAAsD,CAAC,EAAEH;QAC7F;QACA,IAAIE,kBAAkBU,cAAc,CAACV,iBAAiBY,YAAY,IAAI,CAACZ,iBAAiBa,OAAO,EAAE;YAE/F,MAAM,IAAIZ,qCAAsB,CAAC,CAAC,0DAA0D,CAAC,EAAEH;QACjG;QACA,IACEE,kBAAkBQ,YAClB,CAACR,iBAAiBY,YAAY,IAC9B,CAACZ,iBAAiBa,OAAO,IACzB,CAACb,iBAAiBc,OAAO,IACzB,CAACd,iBAAiBe,KAAK,IACvB,CAACf,iBAAiBgB,IAAI,EACtB;YAEA,MAAM,IAAIf,qCAAsB,CAAC,CAAC,8EAA8E,CAAC,EAAEH;QACrH;IACF;IAMAmB,kBAAkB,EAChBC,IAAIpB,MAAM,EACVqB,MAAMC,wBAAwB,EAC9BC,QAAQrB,gBAAgB,EAKzB,EAAE;QACD,IAAI;YACF,IAAI,CAACH,aAAa,CAACC,QAAQsB,0BAA0BpB;QACvD,EAAE,OAAOI,GAAG;YACV,IAAI,CAACd,MAAM,CAACgC,KAAK,CAAClB,EAAEE,KAAK,EAAEN;YAC3B;QACF;QAEA,MAAMuB,YAAY,IAAI,CAACC,gBAAgB,CAAC1B,QAAQsB;QAEhD,IAAI,CAAChC,UAAU,CAACU,OAAO,GAAG;YACxB2B,SAASzB;YACTuB;QACF;QAEA,IAAIvB,iBAAiBS,OAAO,EAAE;YAC5Bc,UAAUG,OAAO;QACnB,OAAO,IAAI1B,iBAAiBU,UAAU,EAAE;YACtC,MAAMiB,QAAQ,AAAC3B,CAAAA,iBAAiBY,YAAY,IAAI,CAAA,IAAK,AAACZ,CAAAA,iBAAiBa,OAAO,IAAI,CAAA,IAAK;YACvF,IAAI,CAACe,sBAAsB,CAAC9B,QAAQ6B;QACtC,OAAO;YAEL,IAAI,CAAC,CAACE,0BAA0B,CAAC/B;QACnC;IACF;IAOAgC,oBAAoBhC,MAAc,EAAEiC,gBAAgB,IAAI,EAAE;QACxD,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACnC;QACpC,MAAME,mBAAmBgC,WAAWP;QACpC,IAAIzB,kBAAkBW,aAAa,MAAM;YACvC,IAAIoB,eAAe;gBACjB,MAAM,IAAI9B,qCAAsB,CAC9B,CAAC,2BAA2B,EAAEH,OAAO,yDAAyD,CAAC,EAC/FA;YAEJ;YACA;QACF;QAEAkC,UAAUP,OAAO,CAACd,QAAQ,GAAG;QAE7B,IAAI,CAAC,CAACkB,0BAA0B,CAAC/B;IACnC;IAEAoC,WAAWpC,MAAc,EAAEqC,iBAAiB,IAAI,EAAE;QAChD,IAAI,IAAI,CAACC,cAAc,CAACtC,SAAS;YAC/B,IAAIqC,gBAAgB;gBAClB,MAAM,IAAIlC,qCAAsB,CAAC,gDAAgDH;YACnF;YACA;QACF;QAEA,MAAMkC,YAAY,IAAI,CAACC,YAAY,CAACnC;QACpCkC,UAAUP,OAAO,CAACd,QAAQ,GAAG;QAE7BqB,UAAUK,GAAG,CAACC,IAAI;IACpB;IAEAF,eAAetC,MAAc,EAAE;QAC7B,OAAO,CAAC,CAAC,IAAI,CAACmC,YAAY,CAACnC,QAAQ2B,OAAO,CAACd,QAAQ;IACrD;IAEA4B,eAAezC,MAAc,EAAE;QAC7B,IAAI,CAACmC,YAAY,CAACnC;QAElB,OAAO,IAAI,CAACV,UAAU,CAACU,OAAO;QAC9B,IAAI,CAACX,YAAY,CAACqD,UAAU,CAAC1C;IAC/B;IAEAmC,aAAanC,MAAc,EAAE;QAC3B,MAAMkC,YAAY,IAAI,CAAC5C,UAAU,CAACU,OAAO;QACzC,IAAI,CAACkC,WAAW;YACd,MAAM,IAAI/B,qCAAsB,CAAC,CAAC,2BAA2B,EAAEH,OAAO,mBAAmB,CAAC,EAAEA;QAC9F;QACA,OAAOkC;IACT;IAEAJ,uBAAuB9B,MAAc,EAAE2C,SAAiB,EAAE;QACxD,MAAMT,YAAY,IAAI,CAACC,YAAY,CAACnC;QACpC,IAAI,CAACR,MAAM,CAACoD,GAAG,CAAC,CAAC,sBAAsB,EAAE5C,OAAO,KAAK,EAAE2C,UAAU,EAAE,CAAC;QACpEE,WAAW,IAAMX,UAAUT,SAAS,CAACG,OAAO,IAAIe,WAAW3C;IAC7D;IAEA0B,iBAAiB1B,MAAc,EAAE8C,OAAO,EAAE;QACxC,MAAMC,eAAe;YACnB,MAAM,IAAI,CAACC,QAAQ,CAAChD,QAAQ8C;QAC9B;QAEA,OAAO,IAAIG,wBAAS,CAACjD,QAAQ+C,cAAc,IAAI,CAACG,eAAe,CAAClD;IAClE;IAEA,MAAMgD,SAAShD,MAAc,EAAE8C,OAAO,EAAE;QACtC,IAAIZ,YAAY,IAAI,CAAC5C,UAAU,CAACU,OAAO;QACvCkC,UAAUiB,OAAO,GAAGC,KAAKC,GAAG;QAC5B,IAAI,OAAOP,YAAY,UAAU;YAC/B,MAAMQ,cAAc,IAAI,CAAC/D,MAAM,CAACuD,QAAQ;YACxC,MAAMQ,YAAY7C,GAAG;QACvB,OAAO;YACL,MAAMqC;QACR;QACAZ,UAAUqB,QAAQ,GAAGH,KAAKC,GAAG,KAAKnB,UAAUiB,OAAO;QAEnD,IAAIjB,UAAUP,OAAO,EAAE6B,uBAAuB,SAAS,CAACtB,WAAWuB,iBAAiB;YAClF,IAAI,CAACjE,MAAM,CAACoD,GAAG,CAAC,CAAC,MAAM,EAAE5C,OAAO,6BAA6B,EAAEkC,UAAUqB,QAAQ,CAAC,EAAE,CAAC;YACrFrB,UAAUuB,eAAe,GAAGL,KAAKC,GAAG;QACtC;IACF;IAEAH,gBAAgBlD,MAAc,EAAE;QAC9B,OAAO,CAACwB;YACN,MAAMkC,eAAe,IAAI,CAACpE,UAAU,CAACU,OAAO;YAE5C,IAAI,CAAC0D,aAAaC,SAAS,EACzBD,aAAaE,gBAAgB,GAAG;gBAC9BC,MAAMT,KAAKC,GAAG;gBACd7B;YACF;YAEF,IAAI,CAAChC,MAAM,CAACgC,KAAK,CAAC,CAAC,MAAM,EAAExB,OAAO,qBAAqB,CAAC,GAAGwB,MAAMhB,KAAK;QACxE;IACF;IAKAsD,qBAAqB;QACnB,IAAI,CAACzE,YAAY,CAACmD,IAAI;IACxB;IAEA,CAACT,0BAA0B,CAAC/B,MAAc;QACxC,MAAMkC,YAAY,IAAI,CAACC,YAAY,CAACnC;QACpC,IAAI,CAACkC,WAAWT,aAAa,CAACS,WAAWP,SAAS;YAChD,MAAM,IAAIxB,qCAAsB,CAC9B,CAAC,2BAA2B,EAAEH,OAAO,gEAAgE,CAAC,EACtGA;QAEJ;QACA,MAAME,mBAAmBgC,WAAWP;QACpC,MAAMF,YAAYS,UAAUT,SAAS;QACrC,IAAI,CAACvB,kBAAkBQ,UAAU;YAC/B,MAAM,IAAIP,qCAAsB,CAAC,CAAC,2BAA2B,EAAEH,OAAO,uCAAuC,CAAC,EAAEA;QAClH;QACA,IAAI,CAACE,iBAAiBW,QAAQ,EAAE;YAC9B,IAAI,CAACrB,MAAM,CAACoD,GAAG,CAAC,CAAC,MAAM,EAAE5C,OAAO,iCAAiC,EAAE,CAAC,CAACE,iBAAiB6D,cAAc,CAAC,EAAE,CAAC;YACxG,MAAMxB,MAAM,IAAIyB,gCAAiB,CAAC9D,kBAAkBuB;YACpDS,UAAUK,GAAG,GAAGA;YAChB,IAAI,CAAClD,YAAY,CAAC4E,oBAAoB,CAAC1B;QACzC,OAAO;YACL,IAAI,CAAC/C,MAAM,CAACoD,GAAG,CAAC,CAAC,MAAM,EAAE5C,OAAO,8CAA8C,CAAC;QACjF;IACF;AACF"}

package/dist/services/core/yaml.service.js

@@ -12,6 +12,7 @@ const _validators = require("../../handlers/validators");
 const _yamlservicevalidation = require("../validators/yaml-service.validation");
 const _jsyaml = require("js-yaml");
 class YamlService {
+    printerGroupService;
     floorStore;
     floorService;
     printerService;
@@ -19,7 +20,8 @@ class YamlService {
     serverVersion;
     logger;
     isTypeormMode;
-    constructor({ printerService, printerCache, floorStore, floorService, loggerFactory, serverVersion, isTypeormMode }){
+    constructor({ printerGroupService, printerService, printerCache, floorStore, floorService, loggerFactory, serverVersion, isTypeormMode }){
+        this.printerGroupService = printerGroupService;
         this.floorStore = floorStore;
         this.printerService = printerService;
         this.printerCache = printerCache;
@@ -30,7 +32,8 @@ class YamlService {
     }
     async importPrintersAndFloors(yamlBuffer) {
         const importSpec = await (0, _jsyaml.load)(yamlBuffer);
-        const { exportPrinters, exportFloorGrid, exportFloors } = importSpec?.config;
+        const databaseTypeSqlite = importSpec.databaseType === "sqlite";
+        const { exportPrinters, exportFloorGrid, exportFloors, exportGroups } = importSpec?.config;
         for (const printer of importSpec.printers){
             if (!printer.name && printer.printerName) {
                 printer.name = printer.printerName;
@@ -40,75 +43,141 @@ class YamlService {
                 printer.name = printer.settingsAppearance?.name;
                 delete printer.settingsAppearance?.name;
             }
-            if (this.isTypeormMode && typeof printer.id === "string") {
-                delete printer.id;
-            } else if (!this.isTypeormMode && typeof printer.id === "number") {
-                delete printer.id;
+            if (databaseTypeSqlite && typeof printer.id === "string") {
+                printer.id = parseInt(printer.id);
             }
         }
-        for (const floor of importSpec.floors){
-            if (this.isTypeormMode && typeof floor.id === "string") {
-                delete floor.id;
-            } else if (!this.isTypeormMode && typeof floor.id === "number") {
-                delete floor.id;
+        if (databaseTypeSqlite) {
+            for (const floor of importSpec.floors){
+                if (typeof floor.id === "string") {
+                    floor.id = parseInt(floor.id);
+                }
+                for (const printer of floor.printers){
+                    if (typeof printer.printerId === "string") {
+                        printer.printerId = parseInt(printer.printerId);
+                    }
+                }
             }
         }
-        const importData = await (0, _validators.validateInput)(importSpec, (0, _yamlservicevalidation.importPrintersFloorsYamlRules)(exportPrinters, exportFloorGrid, exportFloors, this.isTypeormMode));
+        const importData = await (0, _validators.validateInput)(importSpec, (0, _yamlservicevalidation.importPrintersFloorsYamlRules)(exportPrinters, exportFloorGrid, exportFloors, exportGroups, this.isTypeormMode));
         if (!!exportFloorGrid) {
-            for (let floor of importData.floors){
-                await (0, _validators.validateInput)(floor, _yamlservicevalidation.importPrinterPositionsRules);
+            for (const floor of importData.floors){
+                await (0, _validators.validateInput)(floor, (0, _yamlservicevalidation.importPrinterPositionsRules)(this.isTypeormMode));
             }
         }
         this.logger.log("Analysing printers for import");
         const { updateByPropertyPrinters, insertPrinters } = await this.analysePrintersUpsert(importData.printers, importData.config.printerComparisonStrategiesByPriority);
         this.logger.log("Analysing floors for import");
         const { updateByPropertyFloors, insertFloors } = await this.analyseFloorsUpsert(importData.floors, importData.config.floorComparisonStrategiesByPriority);
+        this.logger.log("Analysing groups for import");
+        const { updateByNameGroups, insertGroups } = await this.analyseUpsertGroups(importData.groups);
         this.logger.log(`Performing pure insert printers (${insertPrinters.length} printers)`);
         const printerIdMap = {};
         for (const newPrinter of insertPrinters){
-            const state = await this.printerService.create(newPrinter);
+            const state = await this.printerService.create({
+                ...newPrinter
+            });
+            if (!newPrinter.id) {
+                throw new Error(`Saved ID was empty ${JSON.stringify(newPrinter)}`);
+            }
             printerIdMap[newPrinter.id] = state.id;
         }
         this.logger.log(`Performing update import printers (${updateByPropertyPrinters.length} printers)`);
         for (const updatePrinterSpec of updateByPropertyPrinters){
             const updateId = updatePrinterSpec.printerId;
-            const state = await this.printerService.update(updateId, updatePrinterSpec.value);
-            printerIdMap[updatePrinterSpec.printerId] = state.id;
+            const updatedPrinter = updatePrinterSpec.value;
+            if (typeof updateId === "string" && this.isTypeormMode) {
+                throw new Error("Cannot update a printer by string id in SQLite mode");
+            } else if (typeof updateId === "number" && !this.isTypeormMode) {
+                throw new Error("Cannot update a printer by number id in MongoDB mode");
+            }
+            const originalPrinterId = updatedPrinter.id;
+            delete updatePrinterSpec.value.id;
+            updatedPrinter.id = updateId;
+            const state = await this.printerService.update(updateId, updatedPrinter);
+            if (!updatePrinterSpec.printerId) {
+                throw new Error("Saved ID was empty");
+            }
+            printerIdMap[originalPrinterId] = state.id;
         }
         this.logger.log(`Performing pure create floors (${insertFloors.length} floors)`);
         const floorIdMap = {};
         for (const newFloor of insertFloors){
-            const knownPrinters = [];
+            const originalFloorId = newFloor.id;
+            delete newFloor.id;
+            const knownPrinterPositions = [];
             if (exportFloorGrid && exportPrinters) {
                 for (const floorPosition of newFloor.printers){
                     const knownPrinterId = printerIdMap[floorPosition.printerId];
-                    if (!knownPrinterId) continue;
+                    if (!knownPrinterId) {
+                        continue;
+                    }
+                    delete floorPosition.id;
+                    delete floorPosition.floorId;
                     floorPosition.printerId = knownPrinterId;
-                    knownPrinters.push(floorPosition);
+                    knownPrinterPositions.push(floorPosition);
                 }
-                newFloor.printers = knownPrinters;
+                newFloor.printers = knownPrinterPositions;
             }
-            const state = await this.floorStore.create(newFloor, false);
-            floorIdMap[newFloor.id] = state.id;
+            const createdFloor = await this.floorStore.create({
+                ...newFloor
+            });
+            floorIdMap[originalFloorId] = createdFloor.id;
         }
         this.logger.log(`Performing update of floors (${updateByPropertyFloors.length} floors)`);
         for (const updateFloorSpec of updateByPropertyFloors){
             const updateId = updateFloorSpec.floorId;
+            if (typeof updateId === "string" && this.isTypeormMode) {
+                throw new Error("Cannot update a floor by string id in SQLite mode");
+            } else if (typeof updateId === "number" && !this.isTypeormMode) {
+                throw new Error("Cannot update a floor by number id in MongoDB mode");
+            }
             const updatedFloor = updateFloorSpec.value;
+            const originalFloorId = updatedFloor.id;
+            delete updatedFloor.id;
             const knownPrinters = [];
             if (exportFloorGrid && exportPrinters) {
                 for (const floorPosition of updatedFloor?.printers){
                     const knownPrinterId = printerIdMap[floorPosition.printerId];
-                    if (!knownPrinterId) continue;
+                    if (!knownPrinterId) {
+                        continue;
+                    }
+                    delete floorPosition.id;
+                    delete floorPosition.floorId;
                     floorPosition.printerId = knownPrinterId;
                     knownPrinters.push(floorPosition);
                 }
+                updatedFloor.id = updateId;
                 updatedFloor.printers = knownPrinters;
             }
-            const state = await this.floorStore.update(updateId, updatedFloor);
-            floorIdMap[updateId] = state.id;
+            const newFloor = await this.floorStore.update(updateId, updatedFloor);
+            console.log(JSON.stringify(newFloor, null, 2));
+            floorIdMap[originalFloorId] = newFloor.id;
         }
         await this.floorStore.loadStore();
+        this.logger.log(`Performing pure create groups (${insertGroups.length} groups)`);
+        for (const group of insertGroups){
+            const createdGroup = await this.printerGroupService.createGroup({
+                name: group.name
+            });
+            for (const printer of group.printers){
+                const knownPrinterId = printerIdMap[printer.printerId];
+                if (!knownPrinterId) continue;
+                await this.printerGroupService.addPrinterToGroup(createdGroup.id, knownPrinterId);
+            }
+        }
+        this.logger.log(`Performing update of grouped printer links (${updateByNameGroups.length} groups)`);
+        for (const updateGroupSpec of updateByNameGroups){
+            const existingGroup = await this.printerGroupService.getGroupWithPrinters(updateGroupSpec.groupId);
+            const existingPrinterIds = existingGroup.printers.map((p)=>p.printerId);
+            const wantedTargetPrinterIds = updateGroupSpec.value.printers.filter((p)=>!!printerIdMap[p.printerId]).map((p)=>printerIdMap[p.printerId]);
+            for (const unwantedId of existingPrinterIds.filter((eid)=>!wantedTargetPrinterIds.includes(eid))){
+                await this.printerGroupService.removePrinterFromGroup(existingGroup.id, unwantedId);
+            }
+            for (const nonExistingNewId of wantedTargetPrinterIds.filter((eid)=>!existingPrinterIds.includes(eid))){
+                await this.printerGroupService.addPrinterToGroup(existingGroup.id, nonExistingNewId);
+            }
+        }
         return {
             updateByPropertyPrinters,
             updateByPropertyFloors,
@@ -134,9 +203,12 @@ class YamlService {
                     const comparedName = printer.name.toLowerCase();
                     const foundIndex = names.findIndex((n)=>n === comparedName);
                     if (foundIndex !== -1) {
+                        if (!ids[foundIndex]) {
+                            throw new Error("Update ID is undefined");
+                        }
                         updateByPropertyPrinters.push({
                             strategy: "name",
-                            printerId: ids[foundIndex],
+                            printerId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
                             value: printer
                         });
                         break;
@@ -145,9 +217,12 @@ class YamlService {
                     const comparedName = printer.printerURL.toLowerCase();
                     const foundIndex = urls.findIndex((n)=>n === comparedName);
                     if (foundIndex !== -1) {
+                        if (!ids[foundIndex]) {
+                            throw new Error("Update ID is undefined");
+                        }
                         updateByPropertyPrinters.push({
                             strategy: "url",
-                            printerId: ids[foundIndex],
+                            printerId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
                             value: printer
                         });
                         break;
@@ -156,14 +231,20 @@ class YamlService {
                     const comparedName = printer.id.toLowerCase();
                     const foundIndex = ids.findIndex((n)=>n === comparedName);
                     if (foundIndex !== -1) {
+                        if (!ids[foundIndex]) {
+                            throw new Error("Update ID is undefined");
+                        }
                         updateByPropertyPrinters.push({
                             strategy: "id",
-                            printerId: ids[foundIndex],
+                            printerId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
                             value: printer
                         });
                         break;
                     }
                 } else if (strategy === "new") {
+                    if (!printer.id) {
+                        throw new Error(JSON.stringify(printer));
+                    }
                     insertPrinters.push(printer);
                     break;
                 }
@@ -190,9 +271,12 @@ class YamlService {
                     const comparedProperty = floor.name.toLowerCase();
                     const foundIndex = names.findIndex((n)=>n === comparedProperty);
                     if (foundIndex !== -1) {
+                        if (!ids[foundIndex]) {
+                            throw new Error("IDS not found, floor name");
+                        }
                         updateByPropertyFloors.push({
                             strategy: "name",
-                            floorId: ids[foundIndex],
+                            floorId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
                             value: floor
                         });
                         break;
@@ -201,9 +285,12 @@ class YamlService {
                     const comparedProperty = floor.floor;
                     const foundIndex = floorLevels.findIndex((n)=>n === comparedProperty);
                     if (foundIndex !== -1) {
+                        if (!ids[foundIndex]) {
+                            throw new Error("IDS not found, floor level");
+                        }
                         updateByPropertyFloors.push({
                             strategy: "floor",
-                            floorId: ids[foundIndex],
+                            floorId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
                             value: floor
                         });
                         break;
@@ -212,9 +299,12 @@ class YamlService {
                     const comparedProperty = floor.id.toLowerCase();
                     const foundIndex = ids.findIndex((n)=>n === comparedProperty);
                     if (foundIndex !== -1) {
+                        if (!ids[foundIndex]) {
+                            throw new Error("IDS not found, floor id");
+                        }
                         updateByPropertyFloors.push({
                             strategy: "id",
-                            floorId: ids[foundIndex],
+                            floorId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
                             value: floor
                         });
                         break;
@@ -230,14 +320,54 @@ class YamlService {
             insertFloors
         };
     }
+    async analyseUpsertGroups(upsertGroups) {
+        if (!this.isTypeormMode || !upsertGroups?.length) {
+            return {
+                updateByNameGroups: [],
+                insertGroups: []
+            };
+        }
+        const existingGroups = await this.printerGroupService.listGroups();
+        const names = existingGroups.map((p)=>p.name.toLowerCase());
+        const ids = existingGroups.map((p)=>p.id.toString());
+        const insertGroups = [];
+        const updateByNameGroups = [];
+        for (const group of upsertGroups){
+            const comparedProperty = group.name.toLowerCase();
+            const foundIndex = names.findIndex((n)=>n === comparedProperty);
+            if (foundIndex !== -1) {
+                if (!ids[foundIndex]) {
+                    throw new Error("IDS not found, group name");
+                }
+                updateByNameGroups.push({
+                    strategy: "name",
+                    groupId: parseInt(ids[foundIndex]),
+                    value: group
+                });
+                break;
+            } else {
+                insertGroups.push(group);
+            }
+        }
+        return {
+            insertGroups,
+            updateByNameGroups
+        };
+    }
     async exportPrintersAndFloors(options) {
         const input = await (0, _validators.validateInput)(options, _yamlservicevalidation.exportPrintersFloorsYamlRules);
-        const { exportFloors, exportPrinters, exportFloorGrid } = input;
+        const { exportFloors, exportPrinters, exportFloorGrid, exportGroups } = input;
+        if (!this.isTypeormMode) {
+            input.exportGroups = false;
+        }
         const dumpedObject = {
             version: process.env.npm_package_version,
             exportedAt: new Date(),
             databaseType: this.isTypeormMode ? "sqlite" : "mongo",
-            config: input
+            config: input,
+            printers: undefined,
+            floors: undefined,
+            groups: undefined
         };
         if (exportPrinters) {
             const printers = await this.printerService.list();
@@ -246,7 +376,6 @@ class YamlService {
                 const { apiKey } = this.printerCache.getLoginDto(printerId);
                 return {
                     id: printerId,
-                    stepSize: p.stepSize,
                     disabledReason: p.disabledReason,
                     enabled: p.enabled,
                     dateAdded: p.dateAdded,
@@ -262,11 +391,12 @@ class YamlService {
                 const dumpedFloor = {
                     id: f.id,
                     floor: f.floor,
-                    name: f.name
+                    name: f.name,
+                    printers: undefined
                 };
                 if (exportFloorGrid) {
                     dumpedFloor.printers = f.printers.map((p)=>{
-                        const fPrinterId = p.printerId.toString();
+                        const fPrinterId = p.printerId;
                         return {
                             printerId: fPrinterId,
                             x: p.x,
@@ -277,6 +407,20 @@ class YamlService {
                 return dumpedFloor;
             });
         }
+        if (exportGroups && this.isTypeormMode) {
+            const groups = await this.printerGroupService.listGroups();
+            dumpedObject.groups = groups.map((g)=>{
+                return {
+                    name: g.name,
+                    id: g.id,
+                    printers: g.printers.map((p)=>{
+                        return {
+                            printerId: p.printerId
+                        };
+                    })
+                };
+            });
+        }
         return (0, _jsyaml.dump)(dumpedObject, {});
     }
 }

package/dist/services/core/yaml.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","floorStore","floorService","printerService","printerCache","serverVersion","logger","isTypeormMode","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","exportPrinters","exportFloorGrid","exportFloors","config","printer","printers","printerName","settingsAppearance","id","floor","floors","importData","validateInput","importPrintersFloorsYamlRules","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","length","printerIdMap","newPrinter","state","create","updatePrinterSpec","updateId","printerId","update","value","floorIdMap","newFloor","knownPrinters","floorPosition","knownPrinterId","push","updateFloorSpec","floorId","updatedFloor","loadStore","upsertPrinters","comparisonStrategies","existingPrinters","list","names","map","p","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","databaseType","apiKey","getLoginDto","stepSize","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","dump"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","printerGroupService","floorStore","floorService","printerService","printerCache","serverVersion","logger","isTypeormMode","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","databaseTypeSqlite","databaseType","exportPrinters","exportFloorGrid","exportFloors","exportGroups","config","printer","printers","printerName","settingsAppearance","id","parseInt","floor","floors","printerId","importData","validateInput","importPrintersFloorsYamlRules","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","updateByNameGroups","insertGroups","analyseUpsertGroups","groups","length","printerIdMap","newPrinter","state","create","Error","JSON","stringify","updatePrinterSpec","updateId","updatedPrinter","value","originalPrinterId","update","floorIdMap","newFloor","originalFloorId","knownPrinterPositions","floorPosition","knownPrinterId","floorId","push","createdFloor","updateFloorSpec","updatedFloor","knownPrinters","console","loadStore","group","createdGroup","createGroup","addPrinterToGroup","updateGroupSpec","existingGroup","getGroupWithPrinters","groupId","existingPrinterIds","map","p","wantedTargetPrinterIds","filter","unwantedId","eid","includes","removePrinterFromGroup","nonExistingNewId","upsertPrinters","comparisonStrategies","existingPrinters","list","names","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","upsertGroups","existingGroups","listGroups","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","apiKey","getLoginDto","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","g","dump"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAgBaA;;;eAAAA;;;4BAhBiB;uCAKvB;wBACoB;AAUpB,MAAMA;IACXC,oBAAwD;IACxDC,WAAuB;IACvBC,aAA4B;IAC5BC,eAAgC;IAChCC,aAA2B;IAC3BC,cAAsB;IACdC,OAAsB;IACbC,cAAuB;IAExCC,YAAY,EACVR,mBAAmB,EACnBG,cAAc,EACdC,YAAY,EACZH,UAAU,EACVC,YAAY,EACZO,aAAa,EACbJ,aAAa,EACbE,aAAa,EAUd,CAAE;QACD,IAAI,CAACP,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,UAAU,GAAGA;QAClB,IAAI,CAACE,cAAc,GAAGA;QACtB,IAAI,CAACC,YAAY,GAAGA;QACpB,IAAI,CAACF,YAAY,GAAGA;QACpB,IAAI,CAACG,aAAa,GAAGA;QACrB,IAAI,CAACC,MAAM,GAAGG,cAAcV,YAAYW,IAAI;QAC5C,IAAI,CAACH,aAAa,GAAGA;IACvB;IAEA,MAAMI,wBAAwBC,UAAkB,EAAE;QAChD,MAAMC,aAAa,MAAMC,IAAAA,YAAI,EAACF;QAC9B,MAAMG,qBAAqBF,WAAWG,YAAY,KAAK;QACvD,MAAM,EAAEC,cAAc,EAAEC,eAAe,EAAEC,YAAY,EAAEC,YAAY,EAAE,GAAGP,YAAYQ;QAEpF,KAAK,MAAMC,WAAWT,WAAWU,QAAQ,CAAE;YAEzC,IAAI,CAACD,QAAQZ,IAAI,IAAIY,QAAQE,WAAW,EAAE;gBACxCF,QAAQZ,IAAI,GAAGY,QAAQE,WAAW;gBAClC,OAAOF,QAAQE,WAAW;YAC5B;YAEA,IAAIF,QAAQG,kBAAkB,EAAEf,MAAM;gBACpCY,QAAQZ,IAAI,GAAGY,QAAQG,kBAAkB,EAAEf;gBAC3C,OAAOY,QAAQG,kBAAkB,EAAEf;YACrC;YAEA,IAAIK,sBAAsB,OAAOO,QAAQI,EAAE,KAAK,UAAU;gBACxDJ,QAAQI,EAAE,GAAGC,SAASL,QAAQI,EAAE;YAClC;QACF;QAEA,IAAIX,oBAAoB;YAEtB,KAAK,MAAMa,SAASf,WAAWgB,MAAM,CAAE;gBACrC,IAAI,OAAOD,MAAMF,EAAE,KAAK,UAAU;oBAChCE,MAAMF,EAAE,GAAGC,SAASC,MAAMF,EAAE;gBAC9B;gBAEA,KAAK,MAAMJ,WAAWM,MAAML,QAAQ,CAAE;oBACpC,IAAI,OAAOD,QAAQQ,SAAS,KAAK,UAAU;wBACzCR,QAAQQ,SAAS,GAAGH,SAASL,QAAQQ,SAAS;oBAChD;gBACF;YACF;QACF;QAEA,MAAMC,aAAa,MAAMC,IAAAA,yBAAa,EACpCnB,YACAoB,IAAAA,oDAA6B,EAAChB,gBAAgBC,iBAAiBC,cAAcC,cAAc,IAAI,CAACb,aAAa;QAI/G,IAAI,CAAC,CAACW,iBAAiB;YACrB,KAAK,MAAMU,SAASG,WAAWF,MAAM,CAAE;gBACrC,MAAMG,IAAAA,yBAAa,EAACJ,OAAOM,IAAAA,kDAA2B,EAAC,IAAI,CAAC3B,aAAa;YAC3E;QACF;QAEA,IAAI,CAACD,MAAM,CAAC6B,GAAG,CAAC;QAChB,MAAM,EAAEC,wBAAwB,EAAEC,cAAc,EAAE,GAAG,MAAM,IAAI,CAACC,qBAAqB,CACnFP,WAAWR,QAAQ,EACnBQ,WAAWV,MAAM,CAACkB,qCAAqC;QAGzD,IAAI,CAACjC,MAAM,CAAC6B,GAAG,CAAC;QAChB,MAAM,EAAEK,sBAAsB,EAAEC,YAAY,EAAE,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAC7EX,WAAWF,MAAM,EACjBE,WAAWV,MAAM,CAACsB,mCAAmC;QAGvD,IAAI,CAACrC,MAAM,CAAC6B,GAAG,CAAC;QAChB,MAAM,EAAES,kBAAkB,EAAEC,YAAY,EAAE,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAACf,WAAWgB,MAAM;QAE7F,IAAI,CAACzC,MAAM,CAAC6B,GAAG,CAAC,CAAC,iCAAiC,EAAEE,eAAeW,MAAM,CAAC,UAAU,CAAC;QACrF,MAAMC,eAAe,CAAC;QACtB,KAAK,MAAMC,cAAcb,eAAgB;YACvC,MAAMc,QAAQ,MAAM,IAAI,CAAChD,cAAc,CAACiD,MAAM,CAAC;gBAAE,GAAGF,UAAU;YAAC;YAC/D,IAAI,CAACA,WAAWxB,EAAE,EAAE;gBAClB,MAAM,IAAI2B,MAAM,CAAC,mBAAmB,EAAEC,KAAKC,SAAS,CAACL,YAAY,CAAC;YACpE;YACAD,YAAY,CAACC,WAAWxB,EAAE,CAAC,GAAGyB,MAAMzB,EAAE;QACxC;QAEA,IAAI,CAACpB,MAAM,CAAC6B,GAAG,CAAC,CAAC,mCAAmC,EAAEC,yBAAyBY,MAAM,CAAC,UAAU,CAAC;QACjG,KAAK,MAAMQ,qBAAqBpB,yBAA0B;YACxD,MAAMqB,WAAWD,kBAAkB1B,SAAS;YAC5C,MAAM4B,iBAAiBF,kBAAkBG,KAAK;YAC9C,IAAI,OAAOF,aAAa,YAAY,IAAI,CAAClD,aAAa,EAAE;gBACtD,MAAM,IAAI8C,MAAM;YAClB,OAAO,IAAI,OAAOI,aAAa,YAAY,CAAC,IAAI,CAAClD,aAAa,EAAE;gBAC9D,MAAM,IAAI8C,MAAM;YAClB;YAEA,MAAMO,oBAAoBF,eAAehC,EAAE;YAC3C,OAAO8B,kBAAkBG,KAAK,CAACjC,EAAE;YAEjCgC,eAAehC,EAAE,GAAG+B;YACpB,MAAMN,QAAQ,MAAM,IAAI,CAAChD,cAAc,CAAC0D,MAAM,CAACJ,UAAUC;YACzD,IAAI,CAACF,kBAAkB1B,SAAS,EAAE;gBAChC,MAAM,IAAIuB,MAAM;YAClB;YAEAJ,YAAY,CAACW,kBAAkB,GAAGT,MAAMzB,EAAE;QAC5C;QAEA,IAAI,CAACpB,MAAM,CAAC6B,GAAG,CAAC,CAAC,+BAA+B,EAAEM,aAAaO,MAAM,CAAC,QAAQ,CAAC;QAC/E,MAAMc,aAAa,CAAC;QACpB,KAAK,MAAMC,YAAYtB,aAAc;YACnC,MAAMuB,kBAAkBD,SAASrC,EAAE;YACnC,OAAOqC,SAASrC,EAAE;YAGlB,MAAMuC,wBAAwB,EAAE;YAEhC,IAAI/C,mBAAmBD,gBAAgB;gBACrC,KAAK,MAAMiD,iBAAiBH,SAASxC,QAAQ,CAAE;oBAC7C,MAAM4C,iBAAiBlB,YAAY,CAACiB,cAAcpC,SAAS,CAAC;oBAE5D,IAAI,CAACqC,gBAAgB;wBACnB;oBACF;oBAEA,OAAOD,cAAcxC,EAAE;oBACvB,OAAOwC,cAAcE,OAAO;oBAC5BF,cAAcpC,SAAS,GAAGqC;oBAC1BF,sBAAsBI,IAAI,CAACH;gBAC7B;gBACAH,SAASxC,QAAQ,GAAG0C;YACtB;YAEA,MAAMK,eAAe,MAAM,IAAI,CAACrE,UAAU,CAACmD,MAAM,CAAC;gBAAE,GAAGW,QAAQ;YAAC;YAChED,UAAU,CAACE,gBAAgB,GAAGM,aAAa5C,EAAE;QAC/C;QAEA,IAAI,CAACpB,MAAM,CAAC6B,GAAG,CAAC,CAAC,6BAA6B,EAAEK,uBAAuBQ,MAAM,CAAC,QAAQ,CAAC;QACvF,KAAK,MAAMuB,mBAAmB/B,uBAAwB;YACpD,MAAMiB,WAAWc,gBAAgBH,OAAO;YAExC,IAAI,OAAOX,aAAa,YAAY,IAAI,CAAClD,aAAa,EAAE;gBACtD,MAAM,IAAI8C,MAAM;YAClB,OAAO,IAAI,OAAOI,aAAa,YAAY,CAAC,IAAI,CAAClD,aAAa,EAAE;gBAC9D,MAAM,IAAI8C,MAAM;YAClB;YAEA,MAAMmB,eAAeD,gBAAgBZ,KAAK;YAC1C,MAAMK,kBAAkBQ,aAAa9C,EAAE;YACvC,OAAO8C,aAAa9C,EAAE;YAEtB,MAAM+C,gBAAgB,EAAE;YACxB,IAAIvD,mBAAmBD,gBAAgB;gBACrC,KAAK,MAAMiD,iBAAiBM,cAAcjD,SAAU;oBAClD,MAAM4C,iBAAiBlB,YAAY,CAACiB,cAAcpC,SAAS,CAAC;oBAE5D,IAAI,CAACqC,gBAAgB;wBACnB;oBACF;oBAGA,OAAOD,cAAcxC,EAAE;oBACvB,OAAOwC,cAAcE,OAAO;oBAC5BF,cAAcpC,SAAS,GAAGqC;oBAC1BM,cAAcJ,IAAI,CAACH;gBACrB;gBACAM,aAAa9C,EAAE,GAAG+B;gBAClBe,aAAajD,QAAQ,GAAGkD;YAC1B;YACA,MAAMV,WAAW,MAAM,IAAI,CAAC9D,UAAU,CAAC4D,MAAM,CAACJ,UAAUe;YACxDE,QAAQvC,GAAG,CAACmB,KAAKC,SAAS,CAACQ,UAAU,MAAM;YAC3CD,UAAU,CAACE,gBAAgB,GAAGD,SAASrC,EAAE;QAC3C;QAEA,MAAM,IAAI,CAACzB,UAAU,CAAC0E,SAAS;QAE/B,IAAI,CAACrE,MAAM,CAAC6B,GAAG,CAAC,CAAC,+BAA+B,EAAEU,aAAaG,MAAM,CAAC,QAAQ,CAAC;QAC/E,KAAK,MAAM4B,SAAS/B,aAAc;YAChC,MAAMgC,eAAe,MAAM,IAAI,CAAC7E,mBAAmB,CAAC8E,WAAW,CAAC;gBAC9DpE,MAAMkE,MAAMlE,IAAI;YAClB;YACA,KAAK,MAAMY,WAAWsD,MAAMrD,QAAQ,CAAE;gBACpC,MAAM4C,iBAAiBlB,YAAY,CAAC3B,QAAQQ,SAAS,CAAC;gBAEtD,IAAI,CAACqC,gBAAgB;gBACrB,MAAM,IAAI,CAACnE,mBAAmB,CAAC+E,iBAAiB,CAACF,aAAanD,EAAE,EAAEyC;YACpE;QACF;QAEA,IAAI,CAAC7D,MAAM,CAAC6B,GAAG,CAAC,CAAC,4CAA4C,EAAES,mBAAmBI,MAAM,CAAC,QAAQ,CAAC;QAClG,KAAK,MAAMgC,mBAAmBpC,mBAAoB;YAChD,MAAMqC,gBAAgB,MAAM,IAAI,CAACjF,mBAAmB,CAACkF,oBAAoB,CAACF,gBAAgBG,OAAO;YACjG,MAAMC,qBAAqBH,cAAc1D,QAAQ,CAAC8D,GAAG,CAAC,CAACC,IAAMA,EAAExD,SAAS;YACxE,MAAMyD,yBAAyB,AAACP,gBAAgBrB,KAAK,CAACpC,QAAQ,CAC3DiE,MAAM,CAAC,CAACF,IAAM,CAAC,CAACrC,YAAY,CAACqC,EAAExD,SAAS,CAAC,EACzCuD,GAAG,CAAC,CAACC,IAAMrC,YAAY,CAACqC,EAAExD,SAAS,CAAC;YAEvC,KAAK,MAAM2D,cAAcL,mBAAmBI,MAAM,CAAC,CAACE,MAAQ,CAACH,uBAAuBI,QAAQ,CAACD,MAAO;gBAClG,MAAM,IAAI,CAAC1F,mBAAmB,CAAC4F,sBAAsB,CAACX,cAAcvD,EAAE,EAAE+D;YAC1E;YACA,KAAK,MAAMI,oBAAoBN,uBAAuBC,MAAM,CAAC,CAACE,MAAQ,CAACN,mBAAmBO,QAAQ,CAACD,MAAO;gBACxG,MAAM,IAAI,CAAC1F,mBAAmB,CAAC+E,iBAAiB,CAACE,cAAcvD,EAAE,EAAEmE;YACrE;QACF;QAEA,OAAO;YACLzD;YACAI;YACAH;YACAI;YACAQ;YACAa;QACF;IACF;IAEA,MAAMxB,sBAAsBwD,cAAc,EAAEC,oBAA8B,EAAE;QAC1E,MAAMC,mBAAmB,MAAM,IAAI,CAAC7F,cAAc,CAAC8F,IAAI;QAEvD,MAAMC,QAAQF,iBAAiBX,GAAG,CAAC,CAACC,IAAMA,EAAE5E,IAAI,CAACyF,WAAW;QAC5D,MAAMC,OAAOJ,iBAAiBX,GAAG,CAAC,CAACC,IAAMA,EAAEe,UAAU;QACrD,MAAMC,MAAMN,iBAAiBX,GAAG,CAAC,CAACC,IAAMA,EAAE5D,EAAE,CAAC6E,QAAQ;QAErD,MAAMlE,iBAAiB,EAAE;QACzB,MAAMD,2BAA2B,EAAE;QACnC,KAAK,MAAMd,WAAWwE,eAAgB;YACpC,KAAK,MAAMU,YAAY;mBAAIT;gBAAsB;aAAM,CAAE;gBACvD,IAAIS,aAAa,QAAQ;oBACvB,MAAMC,eAAenF,QAAQZ,IAAI,CAACyF,WAAW;oBAC7C,MAAMO,aAAaR,MAAMS,SAAS,CAAC,CAACC,IAAMA,MAAMH;oBAChD,IAAIC,eAAe,CAAC,GAAG;wBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;4BACpB,MAAM,IAAIrD,MAAM;wBAClB;wBACAjB,yBAAyBiC,IAAI,CAAC;4BAC5BmC,UAAU;4BACV1E,WAAW,IAAI,CAACvB,aAAa,GAAGoB,SAAS2E,GAAG,CAACI,WAAW,IAAIJ,GAAG,CAACI,WAAW;4BAC3E/C,OAAOrC;wBACT;wBACA;oBACF;gBACF,OAAO,IAAIkF,aAAa,OAAO;oBAC7B,MAAMC,eAAenF,QAAQ+E,UAAU,CAACF,WAAW;oBACnD,MAAMO,aAAaN,KAAKO,SAAS,CAAC,CAACC,IAAMA,MAAMH;oBAC/C,IAAIC,eAAe,CAAC,GAAG;wBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;4BACpB,MAAM,IAAIrD,MAAM;wBAClB;wBACAjB,yBAAyBiC,IAAI,CAAC;4BAC5BmC,UAAU;4BACV1E,WAAW,IAAI,CAACvB,aAAa,GAAGoB,SAAS2E,GAAG,CAACI,WAAW,IAAIJ,GAAG,CAACI,WAAW;4BAC3E/C,OAAOrC;wBACT;wBACA;oBACF;gBACF,OAAO,IAAIkF,aAAa,MAAM;oBAC5B,MAAMC,eAAenF,QAAQI,EAAE,CAACyE,WAAW;oBAC3C,MAAMO,aAAaJ,IAAIK,SAAS,CAAC,CAACC,IAAMA,MAAMH;oBAC9C,IAAIC,eAAe,CAAC,GAAG;wBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;4BACpB,MAAM,IAAIrD,MAAM;wBAClB;wBACAjB,yBAAyBiC,IAAI,CAAC;4BAC5BmC,UAAU;4BACV1E,WAAW,IAAI,CAACvB,aAAa,GAAGoB,SAAS2E,GAAG,CAACI,WAAW,IAAIJ,GAAG,CAACI,WAAW;4BAC3E/C,OAAOrC;wBACT;wBACA;oBACF;gBACF,OAAO,IAAIkF,aAAa,OAAO;oBAC7B,IAAI,CAAClF,QAAQI,EAAE,EAAE;wBACf,MAAM,IAAI2B,MAAMC,KAAKC,SAAS,CAACjC;oBACjC;oBACAe,eAAegC,IAAI,CAAC/C;oBACpB;gBACF;YACF;QACF;QAEA,OAAO;YACLc;YACAC;QACF;IACF;IAEA,MAAMK,oBAAoBmE,YAAY,EAAEC,kBAA0B,EAAE;QAClE,MAAMC,iBAAiB,MAAM,IAAI,CAAC7G,YAAY,CAAC+F,IAAI;QACnD,MAAMC,QAAQa,eAAe1B,GAAG,CAAC,CAACC,IAAMA,EAAE5E,IAAI,CAACyF,WAAW;QAC1D,MAAMa,cAAcD,eAAe1B,GAAG,CAAC,CAACC,IAAMA,EAAE1D,KAAK;QACrD,MAAM0E,MAAMS,eAAe1B,GAAG,CAAC,CAACC,IAAMA,EAAE5D,EAAE,CAAC6E,QAAQ;QAEnD,MAAM9D,eAAe,EAAE;QACvB,MAAMD,yBAAyB,EAAE;QACjC,KAAK,MAAMZ,SAASiF,aAAc;YAChC,KAAK,MAAML,YAAY;gBAACM;gBAAoB;aAAM,CAAE;gBAClD,IAAIN,aAAa,QAAQ;oBACvB,MAAMS,mBAAmBrF,MAAMlB,IAAI,CAACyF,WAAW;oBAC/C,MAAMO,aAAaR,MAAMS,SAAS,CAAC,CAACC,IAAMA,MAAMK;oBAChD,IAAIP,eAAe,CAAC,GAAG;wBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;4BACpB,MAAM,IAAIrD,MAAM;wBAClB;wBACAb,uBAAuB6B,IAAI,CAAC;4BAC1BmC,UAAU;4BACVpC,SAAS,IAAI,CAAC7D,aAAa,GAAGoB,SAAS2E,GAAG,CAACI,WAAW,IAAIJ,GAAG,CAACI,WAAW;4BACzE/C,OAAO/B;wBACT;wBACA;oBACF;gBACF,OAAO,IAAI4E,aAAa,SAAS;oBAC/B,MAAMS,mBAAmBrF,MAAMA,KAAK;oBACpC,MAAM8E,aAAaM,YAAYL,SAAS,CAAC,CAACC,IAAMA,MAAMK;oBACtD,IAAIP,eAAe,CAAC,GAAG;wBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;4BACpB,MAAM,IAAIrD,MAAM;wBAClB;wBACAb,uBAAuB6B,IAAI,CAAC;4BAC1BmC,UAAU;4BACVpC,SAAS,IAAI,CAAC7D,aAAa,GAAGoB,SAAS2E,GAAG,CAACI,WAAW,IAAIJ,GAAG,CAACI,WAAW;4BACzE/C,OAAO/B;wBACT;wBACA;oBACF;gBACF,OAAO,IAAI4E,aAAa,MAAM;oBAC5B,MAAMS,mBAAmBrF,MAAMF,EAAE,CAACyE,WAAW;oBAC7C,MAAMO,aAAaJ,IAAIK,SAAS,CAAC,CAACC,IAAMA,MAAMK;oBAC9C,IAAIP,eAAe,CAAC,GAAG;wBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;4BACpB,MAAM,IAAIrD,MAAM;wBAClB;wBACAb,uBAAuB6B,IAAI,CAAC;4BAC1BmC,UAAU;4BACVpC,SAAS,IAAI,CAAC7D,aAAa,GAAGoB,SAAS2E,GAAG,CAACI,WAAW,IAAIJ,GAAG,CAACI,WAAW;4BACzE/C,OAAO/B;wBACT;wBACA;oBACF;gBACF,OAAO,IAAI4E,aAAa,OAAO;oBAC7B/D,aAAa4B,IAAI,CAACzC;oBAClB;gBACF;YACF;QACF;QAEA,OAAO;YACLY;YACAC;QACF;IACF;IAEA,MAAMK,oBAAoBoE,YAAmB,EAAE;QAC7C,IAAI,CAAC,IAAI,CAAC3G,aAAa,IAAI,CAAC2G,cAAclE,QAAQ;YAChD,OAAO;gBACLJ,oBAAoB,EAAE;gBACtBC,cAAc,EAAE;YAClB;QACF;QAEA,MAAMsE,iBAAiB,MAAM,IAAI,CAACnH,mBAAmB,CAACoH,UAAU;QAChE,MAAMlB,QAAQiB,eAAe9B,GAAG,CAAC,CAACC,IAAMA,EAAE5E,IAAI,CAACyF,WAAW;QAC1D,MAAMG,MAAMa,eAAe9B,GAAG,CAAC,CAACC,IAAMA,EAAE5D,EAAE,CAAC6E,QAAQ;QAEnD,MAAM1D,eAAe,EAAE;QACvB,MAAMD,qBAAqB,EAAE;QAC7B,KAAK,MAAMgC,SAASsC,aAAc;YAChC,MAAMD,mBAAmBrC,MAAMlE,IAAI,CAACyF,WAAW;YAC/C,MAAMO,aAAaR,MAAMS,SAAS,CAAC,CAACC,IAAMA,MAAMK;YAChD,IAAIP,eAAe,CAAC,GAAG;gBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;oBACpB,MAAM,IAAIrD,MAAM;gBAClB;gBACAT,mBAAmByB,IAAI,CAAC;oBACtBmC,UAAU;oBACVrB,SAASxD,SAAS2E,GAAG,CAACI,WAAW;oBACjC/C,OAAOiB;gBACT;gBACA;YACF,OAAO;gBACL/B,aAAawB,IAAI,CAACO;YACpB;QACF;QAEA,OAAO;YACL/B;YACAD;QACF;IACF;IAEA,MAAMyE,wBAAwBC,OAAO,EAAE;QACrC,MAAMC,QAAQ,MAAMvF,IAAAA,yBAAa,EAACsF,SAASE,oDAA6B;QACxE,MAAM,EACJrG,YAAY,EACZF,cAAc,EACdC,eAAe,EACfE,YAAY,EAMb,GAAGmG;QAEJ,IAAI,CAAC,IAAI,CAAChH,aAAa,EAAE;YACvBgH,MAAMnG,YAAY,GAAG;QACvB;QAEA,MAAMqG,eAAe;YACnBC,SAASC,QAAQC,GAAG,CAACC,mBAAmB;YACxCC,YAAY,IAAIC;YAChB/G,cAAc,IAAI,CAACT,aAAa,GAAG,WAAW;YAC9Cc,QAAQkG;YACRhG,UAAUyG;YACVnG,QAAQmG;YACRjF,QAAQiF;QACV;QAEA,IAAI/G,gBAAgB;YAClB,MAAMM,WAAW,MAAM,IAAI,CAACpB,cAAc,CAAC8F,IAAI;YAC/CwB,aAAalG,QAAQ,GAAGA,SAAS8D,GAAG,CAAC,CAACC;gBACpC,MAAMxD,YAAYwD,EAAE5D,EAAE;gBACtB,MAAM,EAAEuG,MAAM,EAAE,GAAG,IAAI,CAAC7H,YAAY,CAAC8H,WAAW,CAACpG;gBACjD,OAAO;oBACLJ,IAAII;oBACJqG,gBAAgB7C,EAAE6C,cAAc;oBAChCC,SAAS9C,EAAE8C,OAAO;oBAClBC,WAAW/C,EAAE+C,SAAS;oBACtB3H,MAAM4E,EAAE5E,IAAI;oBACZ2F,YAAYf,EAAEe,UAAU;oBACxB4B;gBACF;YACF;QACF;QAEA,IAAI9G,cAAc;YAChB,MAAMU,SAAS,MAAM,IAAI,CAAC5B,UAAU,CAACqI,SAAS;YAC9Cb,aAAa5F,MAAM,GAAGA,OAAOwD,GAAG,CAAC,CAACkD;gBAChC,MAAMC,cAAc;oBAClB9G,IAAI6G,EAAE7G,EAAE;oBACRE,OAAO2G,EAAE3G,KAAK;oBACdlB,MAAM6H,EAAE7H,IAAI;oBACZa,UAAUyG;gBACZ;gBAEA,IAAI9G,iBAAiB;oBACnBsH,YAAYjH,QAAQ,GAAGgH,EAAEhH,QAAQ,CAAC8D,GAAG,CAAC,CAACC;wBACrC,MAAMmD,aAAanD,EAAExD,SAAS;wBAC9B,OAAO;4BACLA,WAAW2G;4BACXC,GAAGpD,EAAEoD,CAAC;4BACNC,GAAGrD,EAAEqD,CAAC;wBACR;oBACF;gBACF;gBAEA,OAAOH;YACT;QACF;QAEA,IAAIpH,gBAAgB,IAAI,CAACb,aAAa,EAAE;YACtC,MAAMwC,SAAS,MAAM,IAAI,CAAC/C,mBAAmB,CAACoH,UAAU;YACxDK,aAAa1E,MAAM,GAAGA,OAAOsC,GAAG,CAAC,CAACuD;gBAChC,OAAO;oBACLlI,MAAMkI,EAAElI,IAAI;oBACZgB,IAAIkH,EAAElH,EAAE;oBACRH,UAAUqH,EAAErH,QAAQ,CAAC8D,GAAG,CAAC,CAACC;wBACxB,OAAO;4BACLxD,WAAWwD,EAAExD,SAAS;wBACxB;oBACF;gBACF;YACF;QACF;QAEA,OAAO+G,IAAAA,YAAI,EAACpB,cAAc,CAAC;IAC7B;AACF"}

package/dist/services/custom-gcode.service.js

@@ -23,7 +23,7 @@ class CustomGcodeService {
     }
     async get(gcodeScriptId) {
         const document = await _models.CustomGcode.findById(gcodeScriptId);
-        if (!document) throw new _runtimeexceptions.NotFoundException(`Custom GCode script with id ${gcodeScriptId} does not exist.`);
+        if (!document) throw new _runtimeexceptions.NotFoundException(`Custom GCode script with provided id does not exist`);
         return document;
     }
     async list() {

package/dist/services/custom-gcode.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/custom-gcode.service.ts"],"names":["CustomGcodeService","toDto","document","id","name","description","gcode","get","gcodeScriptId","CustomGcode","findById","NotFoundException","list","find","create","gcodeScript","delete","throwIfNotFound","findByIdAndDelete","update","updatedData","customGcode","save"],"mappings":";;;;+BAOaA;;;eAAAA;;;wBAPe;mCACM;AAM3B,MAAMA;IACXC,MAAMC,QAAsB,EAAkB;QAC5C,OAAO;YACLC,IAAID,SAASC,EAAE;YACfC,MAAMF,SAASE,IAAI;YACnBC,aAAaH,SAASG,WAAW;YACjCC,OAAO;mBAAIJ,SAASI,KAAK;aAAC;QAC5B;IACF;IACA,MAAMC,IAAIC,aAA0B,EAAE;QACpC,MAAMN,WAAW,MAAMO,mBAAW,CAACC,QAAQ,CAACF;QAC5C,IAAI,CAACN,UAAU,MAAM,IAAIS,oCAAiB,CAAC,CAAC,4BAA4B,EAAEH,cAAc,gBAAgB,CAAC;QAEzG,OAAON;IACT;IAEA,MAAMU,OAAO;QACX,OAAOH,mBAAW,CAACI,IAAI;IACzB;IAEA,MAAMC,OAAOC,WAA2B,EAAE;QACxC,OAAON,mBAAW,CAACK,MAAM,CAACC;IAC5B;IAEA,MAAMC,OAAOR,aAA0B,EAAES,eAAyB,EAAE;QAClE,MAAMX,QAAQ,MAAM,IAAI,CAACC,GAAG,CAACC;QAC7B,MAAMC,mBAAW,CAACS,iBAAiB,CAACZ,MAAMH,EAAE;IAC9C;IAEA,MAAMgB,OAAOX,aAA0B,EAAEY,WAA2B,EAAE;QACpE,MAAMC,cAAc,MAAM,IAAI,CAACd,GAAG,CAACC;QACnCa,YAAYjB,IAAI,GAAGgB,YAAYhB,IAAI;QACnCiB,YAAYhB,WAAW,GAAGe,YAAYf,WAAW;QACjDgB,YAAYf,KAAK,GAAGc,YAAYd,KAAK;QACrC,OAAO,MAAMe,YAAYC,IAAI;IAC/B;AACF"}
+{"version":3,"sources":["../../src/services/custom-gcode.service.ts"],"names":["CustomGcodeService","toDto","document","id","name","description","gcode","get","gcodeScriptId","CustomGcode","findById","NotFoundException","list","find","create","gcodeScript","delete","throwIfNotFound","findByIdAndDelete","update","updatedData","customGcode","save"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAOaA;;;eAAAA;;;wBAPe;mCACM;AAM3B,MAAMA;IACXC,MAAMC,QAAsB,EAAkB;QAC5C,OAAO;YACLC,IAAID,SAASC,EAAE;YACfC,MAAMF,SAASE,IAAI;YACnBC,aAAaH,SAASG,WAAW;YACjCC,OAAO;mBAAIJ,SAASI,KAAK;aAAC;QAC5B;IACF;IACA,MAAMC,IAAIC,aAA0B,EAAE;QACpC,MAAMN,WAAW,MAAMO,mBAAW,CAACC,QAAQ,CAACF;QAC5C,IAAI,CAACN,UAAU,MAAM,IAAIS,oCAAiB,CAAC,CAAC,mDAAmD,CAAC;QAEhG,OAAOT;IACT;IAEA,MAAMU,OAAO;QACX,OAAOH,mBAAW,CAACI,IAAI;IACzB;IAEA,MAAMC,OAAOC,WAA2B,EAAE;QACxC,OAAON,mBAAW,CAACK,MAAM,CAACC;IAC5B;IAEA,MAAMC,OAAOR,aAA0B,EAAES,eAAyB,EAAE;QAClE,MAAMX,QAAQ,MAAM,IAAI,CAACC,GAAG,CAACC;QAC7B,MAAMC,mBAAW,CAACS,iBAAiB,CAACZ,MAAMH,EAAE;IAC9C;IAEA,MAAMgB,OAAOX,aAA0B,EAAEY,WAA2B,EAAE;QACpE,MAAMC,cAAc,MAAM,IAAI,CAACd,GAAG,CAACC;QACnCa,YAAYjB,IAAI,GAAGgB,YAAYhB,IAAI;QACnCiB,YAAYhB,WAAW,GAAGe,YAAYf,WAAW;QACjDgB,YAAYf,KAAK,GAAGc,YAAYd,KAAK;QACrC,OAAO,MAAMe,YAAYC,IAAI;IAC/B;AACF"}