n8n 1.73.1 → 1.74.1

package/dist/{environments → environments.ee}/source-control/source-control-git.service.ee.d.ts

@@ -1,6 +1,6 @@
+import { Logger } from 'n8n-core';
 import type { CommitResult, DiffResult, FetchResult, PullResult, PushResult, SimpleGit, StatusResult } from 'simple-git';
 import type { User } from '../../databases/entities/user';
-import { Logger } from '../../logging/logger.service';
 import { OwnershipService } from '../../services/ownership.service';
 import { SourceControlPreferencesService } from './source-control-preferences.service.ee';
 import type { SourceControlPreferences } from './types/source-control-preferences';

package/dist/{environments → environments.ee}/source-control/source-control-git.service.ee.js

@@ -46,11 +46,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceControlGitService = void 0;
+const di_1 = require("@n8n/di");
 const child_process_1 = require("child_process");
+const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const path_1 = __importDefault(require("path"));
-const typedi_1 = require("typedi");
-const logger_service_1 = require("../../logging/logger.service");
 const ownership_service_1 = require("../../services/ownership.service");
 const constants_1 = require("./constants");
 const source_control_helper_ee_1 = require("./source-control-helper.ee");
@@ -345,8 +345,8 @@ let SourceControlGitService = class SourceControlGitService {
 };
 exports.SourceControlGitService = SourceControlGitService;
 exports.SourceControlGitService = SourceControlGitService = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_service_1.Logger,
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
         ownership_service_1.OwnershipService,
         source_control_preferences_service_ee_1.SourceControlPreferencesService])
 ], SourceControlGitService);

package/dist/environments.ee/source-control/source-control-git.service.ee.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-control-git.service.ee.js","sourceRoot":"","sources":["../../../src/environments.ee/source-control/source-control-git.service.ee.ts"],"names":[],"mappings":"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"}

package/dist/{environments → environments.ee}/source-control/source-control-helper.ee.js

@@ -49,14 +49,14 @@ exports.getTrackingInformationFromPullResult = getTrackingInformationFromPullRes
 exports.getTrackingInformationFromPrePushResult = getTrackingInformationFromPrePushResult;
 exports.getTrackingInformationFromPostPushResult = getTrackingInformationFromPostPushResult;
 exports.normalizeAndValidateSourceControlledFilePath = normalizeAndValidateSourceControlledFilePath;
+const di_1 = require("@n8n/di");
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
+const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const strict_1 = require("node:assert/strict");
 const path_1 = __importDefault(require("path"));
-const typedi_1 = require("typedi");
 const license_1 = require("../../license");
-const logger_service_1 = require("../../logging/logger.service");
 const path_util_1 = require("../../utils/path-util");
 const constants_1 = require("./constants");
 function stringContainsExpression(testString) {
@@ -87,7 +87,7 @@ function sourceControlFoldersExistCheck(folders, createIfNotExists = true) {
                     (0, fs_1.mkdirSync)(folder, { recursive: true });
                 }
                 catch (error) {
-                    typedi_1.Container.get(logger_service_1.Logger).error(error.message);
+                    di_1.Container.get(n8n_core_1.Logger).error(error.message);
                 }
             }
         }
@@ -95,7 +95,7 @@ function sourceControlFoldersExistCheck(folders, createIfNotExists = true) {
     return existed;
 }
 function isSourceControlLicensed() {
-    const license = typedi_1.Container.get(license_1.License);
+    const license = di_1.Container.get(license_1.License);
     return license.isSourceControlLicensed();
 }
 async function generateSshKeyPair(keyType) {

package/dist/environments.ee/source-control/source-control-helper.ee.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-control-helper.ee.js","sourceRoot":"","sources":["../../../src/environments.ee/source-control/source-control-helper.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoBA,4DAEC;AAED,sDAEC;AAED,0DAKC;AAED,4CAEC;AAED,kCAEC;AAED,wEAqBC;AAED,0DAGC;AAED,gDAsCC;AAED,kCAOC;AAUD,oFAYC;AAED,0FAaC;AAED,4FAUC;AAQD,oGAaC;AA5LD,gCAAoC;AACpC,mCAA6C;AAC7C,2BAAqE;AACrE,uCAAkC;AAClC,+CAAgD;AAChD,+CAAwC;AACxC,gDAAwB;AAExB,uCAAoC;AACpC,iDAAsD;AAEtD,2CAIqB;AAKrB,SAAgB,wBAAwB,CAAC,UAAkB;IAC1D,OAAO,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC1C,CAAC;AAED,SAAgB,qBAAqB,CAAC,UAAkB,EAAE,oBAA4B;IACrF,OAAO,cAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,UAAU,OAAO,CAAC,CAAC;AAC9D,CAAC;AAED,SAAgB,uBAAuB,CACtC,YAAoB,EACpB,sBAA8B;IAE9B,OAAO,cAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,YAAY,OAAO,CAAC,CAAC;AAClE,CAAC;AAED,SAAgB,gBAAgB,CAAC,SAAiB;IACjD,OAAO,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gDAAoC,CAAC,CAAC;AACnE,CAAC;AAED,SAAgB,WAAW,CAAC,SAAiB;IAC5C,OAAO,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,2CAA+B,CAAC,CAAC;AAC9D,CAAC;AAED,SAAgB,8BAA8B,CAC7C,OAAiB,EACjB,iBAAiB,GAAG,IAAI;IAGxB,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC1B,IAAI,CAAC;YACJ,IAAA,eAAU,EAAC,MAAM,EAAE,cAAW,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,GAAG,KAAK,CAAC;YAChB,IAAI,iBAAiB,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACJ,IAAA,cAAS,EAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBACxC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,cAAS,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAC,KAAK,CAAE,KAAe,CAAC,OAAO,CAAC,CAAC;gBACvD,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAgB,uBAAuB;IACtC,MAAM,OAAO,GAAG,cAAS,CAAC,GAAG,CAAC,iBAAO,CAAC,CAAC;IACvC,OAAO,OAAO,CAAC,uBAAuB,EAAE,CAAC;AAC1C,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,OAAoB;IAC5D,MAAM,KAAK,GAAG,wDAAa,OAAO,GAAC,CAAC;IACpC,MAAM,OAAO,GAAY;QACxB,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,EAAE;KACd,CAAC;IACF,IAAI,gBAAyB,CAAC;IAC9B,QAAQ,OAAO,EAAE,CAAC;QACjB,KAAK,SAAS;YACb,gBAAgB,GAAG,IAAA,4BAAmB,EAAC,SAAS,EAAE;gBACjD,kBAAkB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE;gBACpD,iBAAiB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE;aAClD,CAAC,CAAC;YACH,MAAM;QACP,KAAK,KAAK;YACT,gBAAgB,GAAG,IAAA,4BAAmB,EAAC,KAAK,EAAE;gBAC7C,aAAa,EAAE,IAAI;gBACnB,iBAAiB,EAAE;oBAClB,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,KAAK;iBACb;gBACD,kBAAkB,EAAE;oBACnB,IAAI,EAAE,OAAO;oBACb,MAAM,EAAE,KAAK;iBACb;aACD,CAAC,CAAC;YACH,MAAM;IACR,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACpE,SAAS,CAAC,OAAO,GAAG,0CAA8B,CAAC;IACnD,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC7E,UAAU,CAAC,OAAO,GAAG,0CAA8B,CAAC;IACpD,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACxD,OAAO;QACN,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;KAC5B,CAAC;AACH,CAAC;AAED,SAAgB,WAAW,CAAC,OAAe;IAC1C,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACpC,OAAO,QAAQ,CAAC;IACjB,CAAC;SAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,OAAO,QAAQ,CAAC;IACjB,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,oCAAoC,CAAC,KAA6B;IAC1E,OAAO,CACN,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAClC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC;IAC1D,CAAC,CAAC,IAAI,EAAE,CACR,CAAC;AACH,CAAC;AAED,SAAgB,oCAAoC,CAAC,MAA8B;IAClF,MAAM,OAAO,GAAG,oCAAoC,CAAC,MAAM,CAAC,CAAC;IAC7D,OAAO;QACN,aAAa,EAAE,OAAO,CAAC,MAAM,CAC5B,CAAC,IAAI,EAAE,EAAE,CACR,IAAI,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,IAAI,IAAI,CAAC,QAAQ,KAAK,OAAO,CACtF,CAAC,MAAM;QACR,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAChC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,IAAI,IAAI,CAAC,QAAQ,KAAK,OAAO,CAC7F,CAAC,MAAM;QACR,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,MAAM;KAC1E,CAAC;AACH,CAAC;AAED,SAAgB,uCAAuC,CAAC,MAA8B;IACrF,MAAM,OAAO,GAAG,oCAAoC,CAAC,MAAM,CAAC,CAAC;IAC7D,OAAO;QACN,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,MAAM;QAC5E,8BAA8B,EAAE,OAAO,CAAC,MAAM,CAC7C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,QAAQ,CACnD,CAAC,MAAM;QACR,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,MAAM;QAC1E,0BAA0B,EAAE,OAAO,CAAC,MAAM,CACzC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,QAAQ,CACrD,CAAC,MAAM;QACR,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,MAAM;KAC7E,CAAC;AACH,CAAC;AAED,SAAgB,wCAAwC,CAAC,MAA8B;IACtF,MAAM,OAAO,GAAG,oCAAoC,CAAC,MAAM,CAAC,CAAC;IAC7D,OAAO;QACN,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,MAAM,IAAI,CAAC;QAC9F,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,MAAM,IAAI,CAAC;QACjF,WAAW,EACV,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC;QAC9F,eAAe,EACd,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC;KAC5F,CAAC;AACH,CAAC;AAQD,SAAgB,4CAA4C,CAC3D,aAAqB,EACrB,QAAgB;IAEhB,IAAA,WAAE,EAAC,cAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,oCAAoC,CAAC,CAAC;IAEzE,MAAM,cAAc,GAAG,cAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAEjG,IAAI,CAAC,IAAA,6BAAiB,EAAC,aAAa,EAAE,QAAQ,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,+BAAgB,CAAC,aAAa,QAAQ,aAAa,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,cAAc,CAAC;AACvB,CAAC"}

package/dist/{environments → environments.ee}/source-control/source-control-import.service.ee.d.ts

@@ -1,10 +1,9 @@
-import { ErrorReporter, InstanceSettings } from 'n8n-core';
+import { ErrorReporter, InstanceSettings, Logger } from 'n8n-core';
 import { ActiveWorkflowManager } from '../../active-workflow-manager';
 import type { TagEntity } from '../../databases/entities/tag-entity';
 import type { Variables } from '../../databases/entities/variables';
 import type { WorkflowTagMapping } from '../../databases/entities/workflow-tag-mapping';
 import { TagRepository } from '../../databases/repositories/tag.repository';
-import { Logger } from '../../logging/logger.service';
 import type { ExportableCredential } from './types/exportable-credential';
 import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id';
 import type { SourceControlledFile } from './types/source-controlled-file';

package/dist/{environments → environments.ee}/source-control/source-control-import.service.ee.js

@@ -13,13 +13,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceControlImportService = void 0;
+const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const promises_1 = require("node:fs/promises");
 const path_1 = __importDefault(require("path"));
-const typedi_1 = require("typedi");
 const active_workflow_manager_1 = require("../../active-workflow-manager");
 const shared_credentials_1 = require("../../databases/entities/shared-credentials");
 const credentials_repository_1 = require("../../databases/repositories/credentials.repository");
@@ -31,7 +31,6 @@ const user_repository_1 = require("../../databases/repositories/user.repository"
 const variables_repository_1 = require("../../databases/repositories/variables.repository");
 const workflow_tag_mapping_repository_1 = require("../../databases/repositories/workflow-tag-mapping.repository");
 const workflow_repository_1 = require("../../databases/repositories/workflow.repository");
-const logger_service_1 = require("../../logging/logger.service");
 const response_helper_1 = require("../../response-helper");
 const utils_1 = require("../../utils");
 const constants_1 = require("./constants");
@@ -70,7 +69,7 @@ let SourceControlImportService = class SourceControlImportService {
         return remoteWorkflowFilesParsed.filter((e) => e !== undefined);
     }
     async getLocalVersionIdsFromDb() {
-        const localWorkflows = await typedi_1.Container.get(workflow_repository_1.WorkflowRepository).find({
+        const localWorkflows = await di_1.Container.get(workflow_repository_1.WorkflowRepository).find({
             select: ['id', 'name', 'versionId', 'updatedAt'],
         });
         return localWorkflows.map((local) => {
@@ -116,7 +115,7 @@ let SourceControlImportService = class SourceControlImportService {
         return remoteCredentialFilesParsed.filter((e) => e !== undefined);
     }
     async getLocalCredentialsFromDb() {
-        const localCredentials = await typedi_1.Container.get(credentials_repository_1.CredentialsRepository).find({
+        const localCredentials = await di_1.Container.get(credentials_repository_1.CredentialsRepository).find({
             select: ['id', 'name', 'type'],
         });
         return localCredentials.map((local) => ({
@@ -158,19 +157,19 @@ let SourceControlImportService = class SourceControlImportService {
         const localTags = await this.tagRepository.find({
             select: ['id', 'name'],
         });
-        const localMappings = await typedi_1.Container.get(workflow_tag_mapping_repository_1.WorkflowTagMappingRepository).find({
+        const localMappings = await di_1.Container.get(workflow_tag_mapping_repository_1.WorkflowTagMappingRepository).find({
             select: ['workflowId', 'tagId'],
         });
         return { tags: localTags, mappings: localMappings };
     }
     async importWorkflowFromWorkFolder(candidates, userId) {
-        const personalProject = await typedi_1.Container.get(project_repository_1.ProjectRepository).getPersonalProjectForUserOrFail(userId);
+        const personalProject = await di_1.Container.get(project_repository_1.ProjectRepository).getPersonalProjectForUserOrFail(userId);
         const workflowManager = this.activeWorkflowManager;
         const candidateIds = candidates.map((c) => c.id);
-        const existingWorkflows = await typedi_1.Container.get(workflow_repository_1.WorkflowRepository).findByIds(candidateIds, {
+        const existingWorkflows = await di_1.Container.get(workflow_repository_1.WorkflowRepository).findByIds(candidateIds, {
             fields: ['id', 'name', 'versionId', 'active'],
         });
-        const allSharedWorkflows = await typedi_1.Container.get(shared_workflow_repository_1.SharedWorkflowRepository).findWithFields(candidateIds, { select: ['workflowId', 'role', 'projectId'] });
+        const allSharedWorkflows = await di_1.Container.get(shared_workflow_repository_1.SharedWorkflowRepository).findWithFields(candidateIds, { select: ['workflowId', 'role', 'projectId'] });
         const importWorkflowsResult = [];
         for (const candidate of candidates) {
             this.logger.debug(`Parsing workflow file ${candidate.file}`);
@@ -181,7 +180,7 @@ let SourceControlImportService = class SourceControlImportService {
             const existingWorkflow = existingWorkflows.find((e) => e.id === importedWorkflow.id);
             importedWorkflow.active = existingWorkflow?.active ?? false;
             this.logger.debug(`Updating workflow id ${importedWorkflow.id ?? 'new'}`);
-            const upsertResult = await typedi_1.Container.get(workflow_repository_1.WorkflowRepository).upsert({ ...importedWorkflow }, [
+            const upsertResult = await di_1.Container.get(workflow_repository_1.WorkflowRepository).upsert({ ...importedWorkflow }, [
                 'id',
             ]);
             if (upsertResult?.identifiers?.length !== 1) {
@@ -194,7 +193,7 @@ let SourceControlImportService = class SourceControlImportService {
                 const remoteOwnerProject = importedWorkflow.owner
                     ? await this.findOrCreateOwnerProject(importedWorkflow.owner)
                     : null;
-                await typedi_1.Container.get(shared_workflow_repository_1.SharedWorkflowRepository).upsert({
+                await di_1.Container.get(shared_workflow_repository_1.SharedWorkflowRepository).upsert({
                     workflowId: importedWorkflow.id,
                     projectId: remoteOwnerProject?.id ?? personalProject.id,
                     role: 'workflow:owner',
@@ -212,7 +211,7 @@ let SourceControlImportService = class SourceControlImportService {
                     this.logger.error(`Failed to activate workflow ${existingWorkflow.id}`, { error });
                 }
                 finally {
-                    await typedi_1.Container.get(workflow_repository_1.WorkflowRepository).update({ id: existingWorkflow.id }, { versionId: importedWorkflow.versionId });
+                    await di_1.Container.get(workflow_repository_1.WorkflowRepository).update({ id: existingWorkflow.id }, { versionId: importedWorkflow.versionId });
                 }
             }
             importWorkflowsResult.push({
@@ -223,15 +222,15 @@ let SourceControlImportService = class SourceControlImportService {
         return importWorkflowsResult.filter((e) => e !== undefined);
     }
     async importCredentialsFromWorkFolder(candidates, userId) {
-        const personalProject = await typedi_1.Container.get(project_repository_1.ProjectRepository).getPersonalProjectForUserOrFail(userId);
+        const personalProject = await di_1.Container.get(project_repository_1.ProjectRepository).getPersonalProjectForUserOrFail(userId);
         const candidateIds = candidates.map((c) => c.id);
-        const existingCredentials = await typedi_1.Container.get(credentials_repository_1.CredentialsRepository).find({
+        const existingCredentials = await di_1.Container.get(credentials_repository_1.CredentialsRepository).find({
             where: {
                 id: (0, typeorm_1.In)(candidateIds),
             },
             select: ['id', 'name', 'type', 'data'],
         });
-        const existingSharedCredentials = await typedi_1.Container.get(shared_credentials_repository_1.SharedCredentialsRepository).find({
+        const existingSharedCredentials = await di_1.Container.get(shared_credentials_repository_1.SharedCredentialsRepository).find({
             select: ['credentialsId', 'role'],
             where: {
                 credentialsId: (0, typeorm_1.In)(candidateIds),
@@ -253,7 +252,7 @@ let SourceControlImportService = class SourceControlImportService {
                 newCredentialObject.setData(rest);
             }
             this.logger.debug(`Updating credential id ${newCredentialObject.id}`);
-            await typedi_1.Container.get(credentials_repository_1.CredentialsRepository).upsert(newCredentialObject, ['id']);
+            await di_1.Container.get(credentials_repository_1.CredentialsRepository).upsert(newCredentialObject, ['id']);
             const isOwnedLocally = existingSharedCredentials.some((c) => c.credentialsId === credential.id && c.role === 'credential:owner');
             if (!isOwnedLocally) {
                 const remoteOwnerProject = credential.ownedBy
@@ -263,7 +262,7 @@ let SourceControlImportService = class SourceControlImportService {
                 newSharedCredential.credentialsId = newCredentialObject.id;
                 newSharedCredential.projectId = remoteOwnerProject?.id ?? personalProject.id;
                 newSharedCredential.role = 'credential:owner';
-                await typedi_1.Container.get(shared_credentials_repository_1.SharedCredentialsRepository).upsert({ ...newSharedCredential }, [
+                await di_1.Container.get(shared_credentials_repository_1.SharedCredentialsRepository).upsert({ ...newSharedCredential }, [
                     'credentialsId',
                     'projectId',
                 ]);
@@ -290,7 +289,7 @@ let SourceControlImportService = class SourceControlImportService {
         if (mappedTags.mappings.length === 0 && mappedTags.tags.length === 0) {
             return;
         }
-        const existingWorkflowIds = new Set((await typedi_1.Container.get(workflow_repository_1.WorkflowRepository).find({
+        const existingWorkflowIds = new Set((await di_1.Container.get(workflow_repository_1.WorkflowRepository).find({
             select: ['id'],
         })).map((e) => e.id));
         await Promise.all(mappedTags.tags.map(async (tag) => {
@@ -310,7 +309,7 @@ let SourceControlImportService = class SourceControlImportService {
         await Promise.all(mappedTags.mappings.map(async (mapping) => {
             if (!existingWorkflowIds.has(String(mapping.workflowId)))
                 return;
-            await typedi_1.Container.get(workflow_tag_mapping_repository_1.WorkflowTagMappingRepository).upsert({ tagId: String(mapping.tagId), workflowId: String(mapping.workflowId) }, {
+            await di_1.Container.get(workflow_tag_mapping_repository_1.WorkflowTagMappingRepository).upsert({ tagId: String(mapping.tagId), workflowId: String(mapping.workflowId) }, {
                 skipUpdateIfNoValuesChanged: true,
                 conflictPaths: { tagId: true, workflowId: true },
             });
@@ -341,13 +340,13 @@ let SourceControlImportService = class SourceControlImportService {
                 overriddenKeys.splice(overriddenKeys.indexOf(variable.key), 1);
             }
             try {
-                await typedi_1.Container.get(variables_repository_1.VariablesRepository).upsert({ ...variable }, ['id']);
+                await di_1.Container.get(variables_repository_1.VariablesRepository).upsert({ ...variable }, ['id']);
             }
             catch (errorUpsert) {
                 if ((0, response_helper_1.isUniqueConstraintError)(errorUpsert)) {
                     this.logger.debug(`Variable ${variable.key} already exists, updating instead`);
                     try {
-                        await typedi_1.Container.get(variables_repository_1.VariablesRepository).update({ key: variable.key }, { ...variable });
+                        await di_1.Container.get(variables_repository_1.VariablesRepository).update({ key: variable.key }, { ...variable });
                     }
                     catch (errorUpdate) {
                         this.logger.debug(`Failed to update variable ${variable.key}, skipping`);
@@ -362,19 +361,19 @@ let SourceControlImportService = class SourceControlImportService {
         if (overriddenKeys.length > 0 && valueOverrides) {
             for (const key of overriddenKeys) {
                 result.imported.push(key);
-                const newVariable = typedi_1.Container.get(variables_repository_1.VariablesRepository).create({
+                const newVariable = di_1.Container.get(variables_repository_1.VariablesRepository).create({
                     key,
                     value: valueOverrides[key],
                 });
-                await typedi_1.Container.get(variables_repository_1.VariablesRepository).save(newVariable, { transaction: false });
+                await di_1.Container.get(variables_repository_1.VariablesRepository).save(newVariable, { transaction: false });
             }
         }
         await this.variablesService.updateCache();
         return result;
     }
     async findOrCreateOwnerProject(owner) {
-        const projectRepository = typedi_1.Container.get(project_repository_1.ProjectRepository);
-        const userRepository = typedi_1.Container.get(user_repository_1.UserRepository);
+        const projectRepository = di_1.Container.get(project_repository_1.ProjectRepository);
+        const userRepository = di_1.Container.get(user_repository_1.UserRepository);
         if (typeof owner === 'string' || owner.type === 'personal') {
             const email = typeof owner === 'string' ? owner : owner.personalEmail;
             const user = await userRepository.findOne({
@@ -415,8 +414,8 @@ let SourceControlImportService = class SourceControlImportService {
 };
 exports.SourceControlImportService = SourceControlImportService;
 exports.SourceControlImportService = SourceControlImportService = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_service_1.Logger,
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
         n8n_core_1.ErrorReporter,
         variables_service_ee_1.VariablesService,
         active_workflow_manager_1.ActiveWorkflowManager,

package/dist/environments.ee/source-control/source-control-import.service.ee.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-control-import.service.ee.js","sourceRoot":"","sources":["../../../src/environments.ee/source-control/source-control-import.service.ee.ts"],"names":[],"mappings":"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"}

package/dist/{environments → environments.ee}/source-control/source-control-preferences.service.ee.d.ts

@@ -1,6 +1,5 @@
 import type { ValidationError } from 'class-validator';
-import { Cipher, InstanceSettings } from 'n8n-core';
-import { Logger } from '../../logging/logger.service';
+import { Cipher, InstanceSettings, Logger } from 'n8n-core';
 import type { KeyPairType } from './types/key-pair-type';
 import { SourceControlPreferences } from './types/source-control-preferences';
 export declare class SourceControlPreferencesService {

package/dist/{environments → environments.ee}/source-control/source-control-preferences.service.ee.js

@@ -1,43 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -46,16 +13,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceControlPreferencesService = void 0;
+const di_1 = require("@n8n/di");
 const class_validator_1 = require("class-validator");
 const promises_1 = require("fs/promises");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const promises_2 = require("node:fs/promises");
 const path_1 = __importDefault(require("path"));
-const typedi_1 = __importStar(require("typedi"));
 const config_1 = __importDefault(require("../../config"));
 const settings_repository_1 = require("../../databases/repositories/settings.repository");
-const logger_service_1 = require("../../logging/logger.service");
 const constants_1 = require("./constants");
 const source_control_helper_ee_1 = require("./source-control-helper.ee");
 const source_control_preferences_1 = require("./types/source-control-preferences");
@@ -84,7 +50,7 @@ let SourceControlPreferencesService = class SourceControlPreferencesService {
             this.getPreferences().branchName);
     }
     async getKeyPairFromDatabase() {
-        const dbSetting = await typedi_1.default.get(settings_repository_1.SettingsRepository).findByKey('features.sourceControl.sshKeys');
+        const dbSetting = await di_1.Container.get(settings_repository_1.SettingsRepository).findByKey('features.sourceControl.sshKeys');
         if (!dbSetting?.value)
             return null;
         return (0, n8n_workflow_1.jsonParse)(dbSetting.value, { fallbackValue: null });
@@ -124,7 +90,7 @@ let SourceControlPreferencesService = class SourceControlPreferencesService {
     async deleteKeyPair() {
         try {
             await (0, promises_1.rm)(this.sshFolder, { recursive: true });
-            await typedi_1.default.get(settings_repository_1.SettingsRepository).delete({ key: 'features.sourceControl.sshKeys' });
+            await di_1.Container.get(settings_repository_1.SettingsRepository).delete({ key: 'features.sourceControl.sshKeys' });
         }
         catch (e) {
             const error = e instanceof Error ? e : new Error(`${e}`);
@@ -140,7 +106,7 @@ let SourceControlPreferencesService = class SourceControlPreferencesService {
         }
         const keyPair = await (0, source_control_helper_ee_1.generateSshKeyPair)(keyPairType);
         try {
-            await typedi_1.default.get(settings_repository_1.SettingsRepository).save({
+            await di_1.Container.get(settings_repository_1.SettingsRepository).save({
                 key: 'features.sourceControl.sshKeys',
                 value: JSON.stringify({
                     encryptedPrivateKey: this.cipher.encrypt(keyPair.privateKey),
@@ -195,7 +161,7 @@ let SourceControlPreferencesService = class SourceControlPreferencesService {
         if (saveToDb) {
             const settingsValue = JSON.stringify(this._sourceControlPreferences);
             try {
-                await typedi_1.default.get(settings_repository_1.SettingsRepository).save({
+                await di_1.Container.get(settings_repository_1.SettingsRepository).save({
                     key: constants_1.SOURCE_CONTROL_PREFERENCES_DB_KEY,
                     value: settingsValue,
                     loadOnStartup: true,
@@ -208,7 +174,7 @@ let SourceControlPreferencesService = class SourceControlPreferencesService {
         return this.sourceControlPreferences;
     }
     async loadFromDbAndApplySourceControlPreferences() {
-        const loadedPreferences = await typedi_1.default.get(settings_repository_1.SettingsRepository).findOne({
+        const loadedPreferences = await di_1.Container.get(settings_repository_1.SettingsRepository).findOne({
             where: { key: constants_1.SOURCE_CONTROL_PREFERENCES_DB_KEY },
         });
         if (loadedPreferences) {
@@ -229,9 +195,9 @@ let SourceControlPreferencesService = class SourceControlPreferencesService {
 };
 exports.SourceControlPreferencesService = SourceControlPreferencesService;
 exports.SourceControlPreferencesService = SourceControlPreferencesService = __decorate([
-    (0, typedi_1.Service)(),
+    (0, di_1.Service)(),
     __metadata("design:paramtypes", [n8n_core_1.InstanceSettings,
-        logger_service_1.Logger,
+        n8n_core_1.Logger,
         n8n_core_1.Cipher])
 ], SourceControlPreferencesService);
 //# sourceMappingURL=source-control-preferences.service.ee.js.map

package/dist/environments.ee/source-control/source-control-preferences.service.ee.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-control-preferences.service.ee.js","sourceRoot":"","sources":["../../../src/environments.ee/source-control/source-control-preferences.service.ee.ts"],"names":[],"mappings":"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"}

package/dist/environments.ee/source-control/source-control.controller.ee.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-control.controller.ee.js","sourceRoot":"","sources":["../../../src/environments.ee/source-control/source-control.controller.ee.ts"],"names":[],"mappings":"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"}

package/dist/{environments → environments.ee}/source-control/source-control.service.ee.d.ts

@@ -1,10 +1,10 @@
+import { Logger } from 'n8n-core';
 import type { PushResult } from 'simple-git';
 import type { TagEntity } from '../../databases/entities/tag-entity';
 import type { User } from '../../databases/entities/user';
 import type { Variables } from '../../databases/entities/variables';
 import { TagRepository } from '../../databases/repositories/tag.repository';
 import { EventService } from '../../events/event.service';
-import { Logger } from '../../logging/logger.service';
 import { SourceControlExportService } from './source-control-export.service.ee';
 import { SourceControlGitService } from './source-control-git.service.ee';
 import { SourceControlImportService } from './source-control-import.service.ee';

package/dist/{environments → environments.ee}/source-control/source-control.service.ee.js

@@ -13,14 +13,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceControlService = void 0;
+const di_1 = require("@n8n/di");
 const fs_1 = require("fs");
+const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const path_1 = __importDefault(require("path"));
-const typedi_1 = require("typedi");
 const tag_repository_1 = require("../../databases/repositories/tag.repository");
 const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
 const event_service_1 = require("../../events/event.service");
-const logger_service_1 = require("../../logging/logger.service");
 const constants_1 = require("./constants");
 const source_control_export_service_ee_1 = require("./source-control-export.service.ee");
 const source_control_git_service_ee_1 = require("./source-control-git.service.ee");
@@ -550,8 +550,8 @@ let SourceControlService = class SourceControlService {
 };
 exports.SourceControlService = SourceControlService;
 exports.SourceControlService = SourceControlService = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_service_1.Logger,
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
         source_control_git_service_ee_1.SourceControlGitService,
         source_control_preferences_service_ee_1.SourceControlPreferencesService,
         source_control_export_service_ee_1.SourceControlExportService,

package/dist/environments.ee/source-control/source-control.service.ee.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-control.service.ee.js","sourceRoot":"","sources":["../../../src/environments.ee/source-control/source-control.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gCAAkC;AAClC,2BAAmC;AACnC,uCAAkC;AAClC,+CAAgD;AAChD,gDAAwB;AAMxB,4EAAwE;AACxE,kFAA6E;AAC7E,0DAAsD;AAEtD,2CAIqB;AACrB,yFAAgF;AAChF,mFAA0E;AAC1E,yEAQoC;AACpC,yFAAgF;AAChF,mGAA0F;AAWnF,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAQhC,YACkB,MAAc,EACvB,UAAmC,EACnC,+BAAgE,EAChE,0BAAsD,EACtD,0BAAsD,EACtD,aAA4B,EACnB,YAA0B;QAN1B,WAAM,GAAN,MAAM,CAAQ;QACvB,eAAU,GAAV,UAAU,CAAyB;QACnC,oCAA+B,GAA/B,+BAA+B,CAAiC;QAChE,+BAA0B,GAA1B,0BAA0B,CAA4B;QACtD,+BAA0B,GAA1B,0BAA0B,CAA4B;QACtD,kBAAa,GAAb,aAAa,CAAe;QACnB,iBAAY,GAAZ,YAAY,CAAc;QAE3C,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,+BAA+B,CAAC;QAC7E,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI;QACT,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;QAC/B,IAAA,yDAA8B,EAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACjE,MAAM,IAAI,CAAC,+BAA+B,CAAC,0CAA0C,EAAE,CAAC;QACxF,IAAI,IAAI,CAAC,+BAA+B,CAAC,iCAAiC,EAAE,EAAE,CAAC;YAC9E,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7B,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,cAAc;QAC3B,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YACjC,wBAAwB,EAAE,IAAI,CAAC,+BAA+B,CAAC,cAAc,EAAE;YAC/E,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;SACzB,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW;QAChB,IAAI,CAAC;YACJ,MAAM,cAAc,GAAG,IAAA,yDAA8B,EACpD,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAChC,KAAK,CACL,CAAC;YACF,IAAI,CAAC,cAAc,EAAE,CAAC;gBACrB,MAAM,IAAI,+BAAgB,CAAC,kBAAkB,CAAC,CAAC;YAChD,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;gBAC1B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC7B,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;YAC1D,IACC,QAAQ,CAAC,OAAO,KAAK,EAAE;gBACvB,QAAQ,CAAC,OAAO;oBACf,IAAI,CAAC,+BAA+B,CAAC,wBAAwB,CAAC,UAAU,EACxE,CAAC;gBACF,MAAM,IAAI,+BAAgB,CAAC,gCAAgC,CAAC,CAAC;YAC9D,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,mCAAe,CACxB,yEAAyE,CACzE,CAAC;QACH,CAAC;IACF,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,UAAqC,EAAE;QACvD,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,+BAA+B,CAAC,cAAc,CAAC;gBACzD,SAAS,EAAE,KAAK;gBAChB,UAAU,EAAE,EAAE;aACd,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,0BAA0B,CAAC,sBAAsB,EAAE,CAAC;YAC/D,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;gBAC1B,MAAM,IAAI,CAAC,+BAA+B,CAAC,aAAa,EAAE,CAAC;YAC5D,CAAC;YACD,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,+BAA+B,CAAC,wBAAwB,CAAC;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,+BAAgB,CAAC,0CAA0C,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1F,CAAC;IACF,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,WAAqC,EAAE,IAAU;QAC3E,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7B,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAChD,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACxD,IAAI,iBAAiB,CAAC;QACtB,IAAI,CAAC;YACJ,iBAAiB,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAK,KAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAC,EAAE,CAAC;gBACrE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+DAA+D,CAAC,CAAC;gBACnF,iBAAiB,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACP,MAAM,KAAK,CAAC;YACb,CAAC;QACF,CAAC;QACD,IAAI,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;YACjE,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACP,IAAI,iBAAiB,CAAC,QAAQ,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9C,IAAI,CAAC;oBACJ,IAAA,kBAAa,EAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,iCAAqB,CAAC,CAAC;oBAE9E,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,GAAG,CAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC5D,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;oBAC/C,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;wBAC1B,MAAM,EAAE,WAAW,CAAC,UAAU;wBAC9B,KAAK,EAAE,IAAI;qBACX,CAAC,CAAC;oBACH,iBAAiB,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;oBAC7C,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;gBACzD,CAAC;gBAAC,OAAO,SAAS,EAAE,CAAC;oBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAqC,SAAmB,CAAC,OAAO,EAAE,CAAC,CAAC;gBACvF,CAAC;YACF,CAAC;QACF,CAAC;QACD,MAAM,IAAI,CAAC,+BAA+B,CAAC,cAAc,CAAC;YACzD,UAAU,EAAE,iBAAiB,CAAC,aAAa;YAC3C,SAAS,EAAE,IAAI;SACf,CAAC,CAAC;QACH,OAAO,iBAAiB,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,WAAW;QAEhB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7B,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAC9B,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAc;QAC7B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7B,CAAC;QACD,MAAM,IAAI,CAAC,+BAA+B,CAAC,cAAc,CAAC;YACzD,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;SAC7B,CAAC,CAAC;QACH,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAID,KAAK,CAAC,eAAe;QACpB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7B,CAAC;QACD,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YACpC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAAgC,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YAC7E,MAAM,IAAI,+BAAgB,CACzB,8HAA8H,CAC9H,CAAC;QACH,CAAC;QACD,OAAO;IACR,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAoC;QAKxD,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,IAAI,IAAI,CAAC,+BAA+B,CAAC,gBAAgB,EAAE,EAAE,CAAC;YAC7D,MAAM,IAAI,mCAAe,CAAC,oCAAoC,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAClD,MAAM,cAAc,GAAG,IAAA,uEAA4C,EAClE,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,IAAI,CACT,CAAC;YAEF,OAAO;gBACN,GAAG,IAAI;gBACP,IAAI,EAAE,cAAc;aACpB,CAAC;QACH,CAAC,CAAC,CAAC;QAGH,IAAI,YAAY,GAA2B,WAAW,CAAC;QACvD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,YAAY,GAAG,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC;gBACpC,SAAS,EAAE,MAAM;gBACjB,OAAO,EAAE,KAAK;gBACd,kBAAkB,EAAE,IAAI;aACxB,CAAC,CAA2B,CAAC;QAC/B,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACpB,MAAM,iBAAiB,GAAG,YAAY,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxE,IAAI,iBAAiB,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;gBACnC,OAAO;oBACN,UAAU,EAAE,GAAG;oBACf,UAAU,EAAE,SAAS;oBACrB,YAAY;iBACZ,CAAC;YACH,CAAC;QACF,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC3C,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACzB,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC5B,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACP,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,0BAA0B,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;QAE1E,MAAM,qBAAqB,GAAG,WAAW,CAAC,MAAM,CAC/C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,CACtD,CAAC;QACF,MAAM,IAAI,CAAC,0BAA0B,CAAC,2BAA2B,CAAC,qBAAqB,CAAC,CAAC;QAEzF,MAAM,uBAAuB,GAAG,WAAW,CAAC,MAAM,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,CACxD,CAAC;QACF,MAAM,sBAAsB,GAC3B,MAAM,IAAI,CAAC,0BAA0B,CAAC,6BAA6B,CAAC,uBAAuB,CAAC,CAAC;QAC9F,IAAI,sBAAsB,CAAC,UAAU,IAAI,sBAAsB,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvF,sBAAsB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBAChD,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC/E,YAAY,GAAG,YAAY,CAAC,MAAM,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,0BAA0B,CAAC,kBAAkB,CAAC,EAAE,CAAC,CACxE,CAAC;YACH,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,CAAC,0BAA0B,CAAC,sBAAsB,EAAE,CAAC;QAChE,CAAC;QAED,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,CAAC,0BAA0B,CAAC,2BAA2B,EAAE,CAAC;QACrE,CAAC;QAED,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;QAE/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAE9C,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpE,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC;YAC/B,CAAC;QACF,CAAC;QAED,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,oBAAoB,CAAC,CAAC;QAEtE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAC7C,MAAM,EAAE,IAAI,CAAC,+BAA+B,CAAC,aAAa,EAAE;YAC5D,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK;SAC7B,CAAC,CAAC;QAGH,IAAI,CAAC,YAAY,CAAC,IAAI,CACrB,sCAAsC,EACtC,IAAA,mEAAwC,EAAC,YAAY,CAAC,CACtD,CAAC;QAGF,OAAO;YACN,UAAU,EAAE,GAAG;YACf,UAAU;YACV,YAAY;SACZ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CACnB,OAAkC;QAElC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,MAAM,YAAY,GAAG,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC;YAC1C,SAAS,EAAE,MAAM;YACjB,OAAO,EAAE,KAAK;YACd,kBAAkB,EAAE,KAAK;SACzB,CAAC,CAA2B,CAAC;QAI9B,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YAEhD,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACtD,OAAO,KAAK,CAAC;YACd,CAAC;YAED,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBACvD,OAAO,KAAK,CAAC;YACd,CAAC;YACD,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YAC5B,MAAM,iBAAiB,GAAG,cAAc,EAAE,MAAM,CAC/C,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CACnF,CAAC;YACF,IAAI,iBAAiB,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;gBACnC,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;gBACpC,OAAO;oBACN,UAAU,EAAE,GAAG;oBACf,YAAY,EAAE,cAAc;iBAC5B,CAAC;YACH,CAAC;QACF,CAAC;QAED,MAAM,qBAAqB,GAAG,YAAY,CAAC,MAAM,CAChD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,CACtD,CAAC;QACF,MAAM,IAAI,CAAC,0BAA0B,CAAC,4BAA4B,CACjE,qBAAqB,EACrB,OAAO,CAAC,MAAM,CACd,CAAC;QAEF,MAAM,uBAAuB,GAAG,YAAY,CAAC,MAAM,CAClD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,CACxD,CAAC;QACF,MAAM,IAAI,CAAC,0BAA0B,CAAC,+BAA+B,CACpE,uBAAuB,EACvB,OAAO,CAAC,MAAM,CACd,CAAC;QAEF,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;QACrE,IAAI,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,CAAC,0BAA0B,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;QAClF,CAAC;QAED,MAAM,qBAAqB,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;QAC/E,IAAI,qBAAqB,EAAE,CAAC;YAC3B,MAAM,IAAI,CAAC,0BAA0B,CAAC,6BAA6B,CAAC,qBAAqB,CAAC,CAAC;QAC5F,CAAC;QAGD,IAAI,CAAC,YAAY,CAAC,IAAI,CACrB,sCAAsC,EACtC,IAAA,+DAAoC,EAAC,YAAY,CAAC,CAClD,CAAC;QAGF,OAAO;YACN,UAAU,EAAE,GAAG;YACf,YAAY,EAAE,cAAc;SAC5B,CAAC;IACH,CAAC;IAYD,KAAK,CAAC,SAAS,CAAC,OAA+B;QAC9C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,MAAM,qBAAqB,GAA2B,EAAE,CAAC;QAGzD,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE7B,MAAM,EACL,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,GAClB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;QAElE,MAAM,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,GACtE,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;QAEjE,MAAM,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,GACnE,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;QAE/D,MAAM,EACL,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,GACvB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;QAGrE,IAAI,OAAO,CAAC,SAAS,KAAK,MAAM,EAAE,CAAC;YAClC,IAAI,CAAC,YAAY,CAAC,IAAI,CACrB,qCAAqC,EACrC,IAAA,kEAAuC,EAAC,qBAAqB,CAAC,CAC9D,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,CAAC,SAAS,KAAK,MAAM,EAAE,CAAC;YACzC,IAAI,CAAC,YAAY,CAAC,IAAI,CACrB,qCAAqC,EACrC,IAAA,+DAAoC,EAAC,qBAAqB,CAAC,CAC3D,CAAC;QACH,CAAC;QAGD,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;YACtB,OAAO;gBACN,kBAAkB;gBAClB,iBAAiB;gBACjB,gBAAgB;gBAChB,iBAAiB;gBACjB,kBAAkB;gBAClB,kBAAkB;gBAClB,mBAAmB;gBACnB,oBAAoB;gBACpB,iBAAiB;gBACjB,kBAAkB;gBAClB,mBAAmB;gBACnB,kBAAkB;gBAClB,mBAAmB;gBACnB,oBAAoB;gBACpB,sBAAsB;gBACtB,uBAAuB;gBACvB,qBAAqB;aACrB,CAAC;QACH,CAAC;aAAM,CAAC;YACP,OAAO,qBAAqB,CAAC;QAC9B,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC/B,OAA+B,EAC/B,qBAA6C;QAE7C,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,4BAA4B,EAAE,CAAC;QAChG,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,wBAAwB,EAAE,CAAC;QAE3F,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,MAAM,CACjD,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CACjF,CAAC;QAEF,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,MAAM,CACjD,CAAC,KAAK,EAAE,EAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAClF,CAAC;QAEF,MAAM,kBAAkB,GAAqC,EAAE,CAAC;QAChE,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACnC,MAAM,cAAc,GAAG,kBAAkB,CAAC,IAAI,CAC7C,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,IAAI,MAAM,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,CAC1E,CAAC;YACF,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,UAAU,CAAC;YAC5F,IAAI,KAAK,CAAC,IAAI,IAAI,cAAc,EAAE,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,IAAI,EAAE,CAAC;gBAC9E,IAAI,GAAG,OAAO,EAAE,kBAAkB;oBACjC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,aAAa,cAAc,CAAC,IAAI,GAAG;oBAClD,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,cAAc,CAAC,IAAI,YAAY,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;YAC7D,CAAC;YACD,IAAI,cAAc,EAAE,CAAC;gBACpB,kBAAkB,CAAC,IAAI,CAAC;oBACvB,GAAG,KAAK;oBACR,IAAI;oBACJ,SAAS,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,SAAS;oBAClF,OAAO,EAAE,KAAK,CAAC,SAAS;oBACxB,QAAQ,EAAE,cAAc,CAAC,SAAS;iBAClC,CAAC,CAAC;YACJ,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACjC,qBAAqB,CAAC,IAAI,CAAC;gBAC1B,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,UAAU;gBAC7B,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBAC5D,QAAQ,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;gBAC3D,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,IAAI,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACrD,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAClC,qBAAqB,CAAC,IAAI,CAAC;gBAC1B,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,UAAU;gBAC7B,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBAC5D,QAAQ,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;gBAC3D,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,IAAI,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACrD,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,kBAAkB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACnC,qBAAqB,CAAC,IAAI,CAAC;gBAC1B,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,UAAU;gBAC7B,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,UAAU;gBAClB,QAAQ,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;gBAC3D,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,IAAI,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACrD,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO;YACN,kBAAkB;YAClB,iBAAiB;YACjB,gBAAgB;YAChB,iBAAiB;YACjB,kBAAkB;SAClB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,oBAAoB,CACjC,OAA+B,EAC/B,qBAA6C;QAE7C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,6BAA6B,EAAE,CAAC;QAC5F,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,yBAAyB,EAAE,CAAC;QAEvF,MAAM,kBAAkB,GAAG,aAAa,CAAC,MAAM,CAC9C,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAC5E,CAAC;QAEF,MAAM,mBAAmB,GAAG,YAAY,CAAC,MAAM,CAC9C,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAC7E,CAAC;QAGF,MAAM,oBAAoB,GAItB,EAAE,CAAC;QACP,YAAY,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC9B,MAAM,gBAAgB,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBACtD,OAAO,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;YAC7F,CAAC,CAAC,CAAC;YACH,IAAI,gBAAgB,EAAE,CAAC;gBACtB,oBAAoB,CAAC,IAAI,CAAC;oBACzB,GAAG,KAAK;oBACR,IAAI,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI;iBACtE,CAAC,CAAC;YACJ,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,kBAAkB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACnC,qBAAqB,CAAC,IAAI,CAAC;gBAC1B,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,YAAY;gBAC/B,IAAI,EAAE,YAAY;gBAClB,MAAM,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBAC5D,QAAQ,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;gBAC3D,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,IAAI,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACnC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,mBAAmB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACpC,qBAAqB,CAAC,IAAI,CAAC;gBAC1B,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,YAAY;gBAC/B,IAAI,EAAE,YAAY;gBAClB,MAAM,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBAC5D,QAAQ,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;gBAC3D,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,IAAI,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACnC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,oBAAoB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrC,qBAAqB,CAAC,IAAI,CAAC;gBAC1B,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,YAAY;gBAC/B,IAAI,EAAE,YAAY;gBAClB,MAAM,EAAE,UAAU;gBAClB,QAAQ,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;gBAC3D,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,IAAI,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACnC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO;YACN,kBAAkB;YAClB,mBAAmB;YACnB,oBAAoB;SACpB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC/B,OAA+B,EAC/B,qBAA6C;QAE7C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,0BAA0B,EAAE,CAAC;QACxF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,uBAAuB,EAAE,CAAC;QAEpF,MAAM,iBAAiB,GAAG,YAAY,CAAC,MAAM,CAC5C,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAC3E,CAAC;QAEF,MAAM,kBAAkB,GAAG,WAAW,CAAC,MAAM,CAC5C,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAC5E,CAAC;QAEF,MAAM,mBAAmB,GAAgB,EAAE,CAAC;QAC5C,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC7B,MAAM,cAAc,GAAG,YAAY,CAAC,IAAI,CACvC,CAAC,MAAM,EAAE,EAAE,CACV,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,IAAI,MAAM,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC;gBACpD,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,IAAI,MAAM,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,CACrD,CAAC;YACF,IAAI,cAAc,EAAE,CAAC;gBACpB,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;YAC/E,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,IACC,iBAAiB,CAAC,MAAM,GAAG,CAAC;YAC5B,kBAAkB,CAAC,MAAM,GAAG,CAAC;YAC7B,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAC7B,CAAC;YACF,IAAI,OAAO,CAAC,SAAS,KAAK,MAAM,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAEhE,CAAC;iBAAM,CAAC;gBACP,qBAAqB,CAAC,IAAI,CAAC;oBAC1B,EAAE,EAAE,WAAW;oBACf,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,WAAW;oBACjB,MAAM,EAAE,UAAU;oBAClB,QAAQ,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;oBAC3D,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,IAAA,2CAAgB,EAAC,IAAI,CAAC,SAAS,CAAC;oBACtC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACnC,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QACD,OAAO;YACN,iBAAiB;YACjB,kBAAkB;YAClB,mBAAmB;SACnB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAClC,OAA+B,EAC/B,qBAA6C;QAE7C,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACpD,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;YAC5B,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,CAAC,WAAW,CAAC;SACrB,CAAC,CAAC;QAEH,MAAM,iBAAiB,GACtB,MAAM,IAAI,CAAC,0BAA0B,CAAC,gCAAgC,EAAE,CAAC;QAC1E,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,6BAA6B,EAAE,CAAC;QAE/F,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CACvD,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CACrF,CAAC;QAEF,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,IAAI,CAAC,MAAM,CACvD,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CACtF,CAAC;QAEF,MAAM,oBAAoB,GAAgB,EAAE,CAAC;QAC7C,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvC,MAAM,cAAc,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CACjD,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAChE,CAAC;YACF,IAAI,CAAC,cAAc,EAAE,CAAC;gBACrB,OAAO;YACR,CAAC;YACD,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAC/D,CAAC,MAAM,EAAE,EAAE,CACV,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAClC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU,CACjF,KAAK,CAAC,CAAC,CACT,CAAC;QAEF,MAAM,uBAAuB,GAAG,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAC/D,CAAC,KAAK,EAAE,EAAE,CACT,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CACnC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU,CACnF,KAAK,CAAC,CAAC,CACT,CAAC;QAEF,IACC,kBAAkB,CAAC,MAAM,GAAG,CAAC;YAC7B,mBAAmB,CAAC,MAAM,GAAG,CAAC;YAC9B,oBAAoB,CAAC,MAAM,GAAG,CAAC;YAC/B,sBAAsB,CAAC,MAAM,GAAG,CAAC;YACjC,uBAAuB,CAAC,MAAM,GAAG,CAAC,EACjC,CAAC;YACF,IACC,OAAO,CAAC,SAAS,KAAK,MAAM;gBAC5B,iBAAiB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;gBACnC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EACtC,CAAC;YAEH,CAAC;iBAAM,CAAC;gBACP,qBAAqB,CAAC,IAAI,CAAC;oBAC1B,EAAE,EAAE,UAAU;oBACd,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,UAAU;oBAClB,QAAQ,EAAE,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;oBAC3D,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,IAAA,sCAAW,EAAC,IAAI,CAAC,SAAS,CAAC;oBACjC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,WAAW,EAAE;iBACrD,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QACD,OAAO;YACN,kBAAkB;YAClB,mBAAmB;YACnB,oBAAoB;YACpB,sBAAsB;YACtB,uBAAuB;SACvB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CACtB,IAAI,GAAG,uCAA2B,EAClC,KAAK,GAAG,wCAA4B;QAEpC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;CACD,CAAA;AAtuBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,YAAO,GAAE;qCAUiB,iBAAM;QACX,uDAAuB;QACF,uEAA+B;QACpC,6DAA0B;QAC1B,6DAA0B;QACvC,8BAAa;QACL,4BAAY;GAfhC,oBAAoB,CAsuBhC"}