n8n 1.122.4 → 2.0.0-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/n8n +1 -1
- package/dist/abstract-server.js +2 -2
- package/dist/abstract-server.js.map +1 -1
- package/dist/active-workflow-manager.d.ts +4 -9
- package/dist/active-workflow-manager.js +2 -2
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/binary-data/database.manager.d.ts +26 -0
- package/dist/binary-data/database.manager.js +153 -0
- package/dist/binary-data/database.manager.js.map +1 -0
- package/dist/build.tsbuildinfo +1 -1
- package/dist/command-registry.d.ts +1 -0
- package/dist/command-registry.js +38 -5
- package/dist/command-registry.js.map +1 -1
- package/dist/commands/base-command.d.ts +0 -1
- package/dist/commands/base-command.js +22 -29
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/publish/workflow.d.ts +20 -0
- package/dist/commands/publish/workflow.js +58 -0
- package/dist/commands/publish/workflow.js.map +1 -0
- package/dist/commands/start.js +1 -19
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/unpublish/workflow.d.ts +17 -0
- package/dist/commands/unpublish/workflow.js +60 -0
- package/dist/commands/unpublish/workflow.js.map +1 -0
- package/dist/commands/update/workflow.js +31 -9
- package/dist/commands/update/workflow.js.map +1 -1
- package/dist/commands/worker.js +0 -1
- package/dist/commands/worker.js.map +1 -1
- package/dist/config/index.js +0 -32
- package/dist/config/index.js.map +1 -1
- package/dist/controllers/ai.controller.js +2 -1
- package/dist/controllers/ai.controller.js.map +1 -1
- package/dist/controllers/oauth/abstract-oauth.controller.js +1 -1
- package/dist/controllers/oauth/abstract-oauth.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.d.ts +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js +19 -7
- package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-dynamic-client-registration.schema.d.ts +14 -0
- package/dist/controllers/oauth/oauth2-dynamic-client-registration.schema.js +18 -0
- package/dist/controllers/oauth/oauth2-dynamic-client-registration.schema.js.map +1 -0
- package/dist/controllers/posthog.controller.d.ts +1 -0
- package/dist/controllers/posthog.controller.js +13 -0
- package/dist/controllers/posthog.controller.js.map +1 -1
- package/dist/controllers/users.controller.js +1 -1
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +4 -1
- package/dist/credentials/credentials.service.js +16 -2
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-import.service.ee.d.ts +4 -3
- package/dist/environments.ee/source-control/source-control-import.service.ee.js +26 -6
- package/dist/environments.ee/source-control/source-control-import.service.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +2 -2
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/eventbus/message-event-bus/message-event-bus.js +12 -3
- package/dist/eventbus/message-event-bus/message-event-bus.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +7 -3
- package/dist/events/relays/telemetry.event-relay.d.ts +1 -0
- package/dist/events/relays/telemetry.event-relay.js +10 -3
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/executions/execution-data.service.js +4 -1
- package/dist/executions/execution-data.service.js.map +1 -1
- package/dist/executions/execution-recovery.service.d.ts +13 -3
- package/dist/executions/execution-recovery.service.js +68 -2
- package/dist/executions/execution-recovery.service.js.map +1 -1
- package/dist/executions/legacy-sqlite-execution-recovery.service.js.map +1 -1
- package/dist/load-nodes-and-credentials.d.ts +4 -2
- package/dist/load-nodes-and-credentials.js +98 -2
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/manual-execution.service.js +4 -4
- package/dist/manual-execution.service.js.map +1 -1
- package/dist/modules/breaking-changes/rules/index.d.ts +1 -1
- package/dist/modules/breaking-changes/rules/v2/{cli-activate-all-workflows.rule.js → cli-replace-update-workflow-command.rule.js} +6 -6
- package/dist/modules/breaking-changes/rules/v2/cli-replace-update-workflow-command.rule.js.map +1 -0
- package/dist/modules/breaking-changes/rules/v2/index.d.ts +1 -1
- package/dist/modules/breaking-changes/rules/v2/index.js +4 -2
- package/dist/modules/breaking-changes/rules/v2/index.js.map +1 -1
- package/dist/modules/breaking-changes/rules/v2/wait-node-subworkflow.rule.d.ts +2 -1
- package/dist/modules/breaking-changes/rules/v2/wait-node-subworkflow.rule.js +7 -4
- package/dist/modules/breaking-changes/rules/v2/wait-node-subworkflow.rule.js.map +1 -1
- package/dist/modules/breaking-changes/rules/v2/workflow-hooks-deprecated.rule.d.ts +6 -0
- package/dist/modules/breaking-changes/rules/v2/workflow-hooks-deprecated.rule.js +57 -0
- package/dist/modules/breaking-changes/rules/v2/workflow-hooks-deprecated.rule.js.map +1 -0
- package/dist/modules/chat-hub/chat-hub-agent.service.d.ts +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.service.js +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-credentials.service.d.ts +19 -9
- package/dist/modules/chat-hub/chat-hub-credentials.service.js +41 -12
- package/dist/modules/chat-hub/chat-hub-credentials.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-session.entity.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.js +2 -0
- package/dist/modules/chat-hub/chat-hub-workflow.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.attachment.service.js +5 -1
- package/dist/modules/chat-hub/chat-hub.attachment.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.constants.d.ts +1 -1
- package/dist/modules/chat-hub/chat-hub.constants.js +1 -1
- package/dist/modules/chat-hub/chat-hub.service.d.ts +15 -19
- package/dist/modules/chat-hub/chat-hub.service.js +74 -81
- package/dist/modules/chat-hub/chat-hub.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.types.d.ts +1 -0
- package/dist/modules/chat-hub/chat-hub.types.js.map +1 -1
- package/dist/modules/chat-hub/chat-message.repository.d.ts +3 -2
- package/dist/modules/chat-hub/chat-message.repository.js +6 -1
- package/dist/modules/chat-hub/chat-message.repository.js.map +1 -1
- package/dist/modules/mcp/mcp.settings.controller.js +11 -10
- package/dist/modules/mcp/mcp.settings.controller.js.map +1 -1
- package/dist/modules/mcp/mcp.utils.d.ts +2 -2
- package/dist/modules/mcp/mcp.utils.js +2 -2
- package/dist/modules/mcp/mcp.utils.js.map +1 -1
- package/dist/modules/mcp/tools/execute-workflow.tool.js +5 -5
- package/dist/modules/mcp/tools/execute-workflow.tool.js.map +1 -1
- package/dist/modules/mcp/tools/get-workflow-details.tool.js +6 -6
- package/dist/modules/mcp/tools/get-workflow-details.tool.js.map +1 -1
- package/dist/modules/mcp/tools/search-workflows.tool.js +8 -5
- package/dist/modules/mcp/tools/search-workflows.tool.js.map +1 -1
- package/dist/modules/provisioning.ee/provisioning.service.ee.d.ts +3 -1
- package/dist/modules/provisioning.ee/provisioning.service.ee.js +5 -2
- package/dist/modules/provisioning.ee/provisioning.service.ee.js.map +1 -1
- package/dist/public-api/types.d.ts +9 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.d.ts +3 -0
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js +50 -82
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.service.d.ts +0 -4
- package/dist/public-api/v1/handlers/workflows/workflows.service.js +0 -29
- package/dist/public-api/v1/handlers/workflows/workflows.service.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +110 -1
- package/dist/scaling/scaling.service.js +1 -1
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/services/frontend.service.d.ts +30 -4
- package/dist/services/frontend.service.js +15 -14
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/import.service.d.ts +3 -2
- package/dist/services/import.service.js +10 -2
- package/dist/services/import.service.js.map +1 -1
- package/dist/services/user.service.d.ts +1 -1
- package/dist/services/user.service.js +4 -6
- package/dist/services/user.service.js.map +1 -1
- package/dist/services/workflow-statistics.service.js +8 -6
- package/dist/services/workflow-statistics.service.js.map +1 -1
- package/dist/task-runners/task-managers/task-requester.d.ts +9 -0
- package/dist/task-runners/task-managers/task-requester.js +8 -0
- package/dist/task-runners/task-managers/task-requester.js.map +1 -1
- package/dist/task-runners/task-runner-module.js +9 -0
- package/dist/task-runners/task-runner-module.js.map +1 -1
- package/dist/task-runners/task-runner-process-py.d.ts +2 -0
- package/dist/task-runners/task-runner-process-py.js +23 -16
- package/dist/task-runners/task-runner-process-py.js.map +1 -1
- package/dist/user-management/email/templates/workflow-deactivated.handlebars +196 -0
- package/dist/user-management/email/user-management-mailer.d.ts +5 -1
- package/dist/user-management/email/user-management-mailer.js +15 -0
- package/dist/user-management/email/user-management-mailer.js.map +1 -1
- package/dist/utils/handlebars.util.d.ts +1 -0
- package/dist/utils/handlebars.util.js +28 -0
- package/dist/utils/handlebars.util.js.map +1 -0
- package/dist/webhooks/test-webhook-registrations.service.js.map +1 -1
- package/dist/webhooks/test-webhooks.d.ts +3 -3
- package/dist/webhooks/test-webhooks.js +8 -2
- package/dist/webhooks/test-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.d.ts +4 -4
- package/dist/webhooks/webhook-helpers.js +4 -2
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +1 -0
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-runner.js +20 -0
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +7 -8
- package/dist/workflows/workflow-execution.service.js +112 -103
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history.service.d.ts +3 -1
- package/dist/workflows/workflow-history/workflow-history.service.js +5 -1
- package/dist/workflows/workflow-history/workflow-history.service.js.map +1 -1
- package/dist/workflows/workflow.request.d.ts +17 -7
- package/dist/workflows/workflow.service.d.ts +14 -6
- package/dist/workflows/workflow.service.ee.d.ts +4 -2
- package/dist/workflows/workflow.service.ee.js +20 -9
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflow.service.js +104 -77
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +2 -4
- package/dist/workflows/workflows.controller.js +24 -9
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +22 -22
- package/templates/form-trigger.handlebars +29 -6
- package/dist/modules/breaking-changes/rules/v2/cli-activate-all-workflows.rule.js.map +0 -1
- /package/dist/modules/breaking-changes/rules/v2/{cli-activate-all-workflows.rule.d.ts → cli-replace-update-workflow-command.rule.d.ts} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.service.js","sourceRoot":"","sources":["../../src/services/import.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"import.service.js","sourceRoot":"","sources":["../../src/services/import.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA2D;AAE3D,gCAQiB;AAEjB,0CAAyD;AACzD,gCAAkC;AAElC,+BAAkC;AAClC,0CAAgD;AAEhD,yDAA+D;AAC/D,2EAAiF;AACjF,uCAAkC;AAClC,+DAA4D;AAC5D,6BAAwB;AACxB,uEAAkE;AAClE,4FAAuF;AACvF,wCAA6C;AAGtC,IAAM,aAAa,GAAnB,MAAM,aAAa;IAsBzB,YACkB,MAAc,EACd,qBAA4C,EAC5C,aAA4B,EAC5B,UAAsB,EACtB,MAAc,EACd,qBAA4C,EAC5C,oBAA0C,EAC1C,cAA8B,EAC9B,gCAAkE;QARlE,WAAM,GAAN,MAAM,CAAQ;QACd,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAY;QACtB,WAAM,GAAN,MAAM,CAAQ;QACd,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,qCAAgC,GAAhC,gCAAgC,CAAkC;QA9B5E,kBAAa,GAAqB,EAAE,CAAC;QAErC,WAAM,GAAgB,EAAE,CAAC;QAEzB,uBAAkB,GAAyD;YAClF,OAAO,EAAE;gBACR,MAAM,EAAE,iCAAiC;gBACzC,eAAe,EAAE,iCAAiC;gBAClD,eAAe,EAAE,iCAAiC;gBAClD,QAAQ,EAAE,yCAAyC;gBACnD,UAAU,EAAE,yCAAyC;aACrD;YACD,MAAM,EAAE;gBACP,MAAM,EAAE,kCAAkC;gBAC1C,eAAe,EAAE,kCAAkC;gBACnD,eAAe,EAAE,kCAAkC;gBACnD,QAAQ,EAAE,yCAAyC;gBACnD,UAAU,EAAE,yCAAyC;aACrD;SACD,CAAC;IAYC,CAAC;IAEJ,KAAK,CAAC,WAAW;QAChB,IAAI,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;QAC7D,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAwB,EAAE,SAAiB;QAChE,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC/B,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBAEjC,IAAI,CAAC,IAAI,CAAC,EAAE;oBAAE,IAAI,CAAC,EAAE,GAAG,IAAA,SAAI,GAAE,CAAC;YAChC,CAAC,CAAC,CAAC;YAEH,MAAM,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAE7E,IAAI,eAAe;gBAAE,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAG9D,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACtD,CAAC;QACF,CAAC;QAED,MAAM,iBAAiB,GAAoB,EAAE,CAAC;QAC9C,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAC1D,MAAM,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YACxC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBAClC,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,eAAe,EAAE,CAAC;oBACjD,MAAM,IAAI,CAAC,gCAAgC,CAAC,SAAS,CAAC;wBACrD,UAAU,EAAE,QAAQ,CAAC,EAAE;wBACvB,SAAS,EAAE,QAAQ,CAAC,eAAe,IAAI,QAAQ,CAAC,SAAS,IAAI,aAAa;wBAC1E,KAAK,EAAE,aAAa;wBACpB,MAAM,EAAE,IAAI;qBACZ,CAAC,CAAC;oBAEH,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC;oBACxB,QAAQ,CAAC,eAAe,GAAG,IAAI,CAAC;oBAEhC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,QAAQ,CAAC,IAAI,gCAAgC,CAAC,CAAC;gBAC3F,CAAC;gBAED,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mBAAc,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAE5F,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,mBAAc,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;gBACvE,MAAM,UAAU,GAAG,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAY,CAAC;gBAChE,iBAAiB,CAAC,IAAI,CAAC,EAAE,GAAG,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;gBAExD,MAAM,eAAe,GAAG,MAAM,EAAE,CAAC,eAAe,CAAC,YAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;gBAG7E,IAAI,CAAC,MAAM,EAAE,CAAC;oBACb,MAAM,EAAE,CAAC,MAAM,CACd,mBAAc,EACd,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,EACrE,CAAC,YAAY,EAAE,WAAW,CAAC,CAC3B,CAAC;gBACH,CAAC;gBAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM;oBAAE,SAAS;gBAErC,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAE5D,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACjC,MAAM,EAAE,CAAC,MAAM,CAAC,uBAAkB,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE;wBAClE,OAAO;wBACP,YAAY;qBACZ,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;QACF,CAAC,CAAC,CAAC;QAKH,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;YACzC,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;gBAC1C,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YAC1D,CAAC;QACF,CAAC;IACF,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,QAAuB;QAChD,IAAI,CAAC;YACJ,MAAM,IAAA,4CAAyB,EAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;IACF,CAAC;IAOD,KAAK,CAAC,YAAY,CAAC,SAAiB;QACnC,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU;iBAClC,kBAAkB,EAAE;iBACpB,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC1B,KAAK,CAAC,CAAC,CAAC;iBACR,UAAU,EAAE,CAAC;YAEf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,SAAS,QAAQ,MAAM,CAAC,MAAM,OAAO,CAAC,CAAC;YAClE,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;QAC5B,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,SAAS,YAAY,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAChF,MAAM,IAAI,KAAK,CAAC,yBAAyB,SAAS,EAAE,CAAC,CAAC;QACvD,CAAC;IACF,CAAC;IAOD,KAAK,CAAC,uBAAuB,CAAC,UAAoB;QACjD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;YAC1E,OAAO,IAAI,CAAC;QACb,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,UAAU,CAAC,MAAM,sBAAsB,CAAC,CAAC;QAEzE,MAAM,cAAc,GAAa,EAAE,CAAC;QAEpC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAEnD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAChC,CAAC;QACF,CAAC;QAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,YAAY,cAAc,CAAC,MAAM,iCAAiC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC7F,CAAC;YACF,OAAO,KAAK,CAAC;QACd,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC;IACb,CAAC;IAOD,KAAK,CAAC,mBAAmB,CAAC,SAAiB,EAAE,kBAAiC;QAC7E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,SAAS,EAAE,CAAC,CAAC;QAExD,MAAM,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;QAE5F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,SAAS,yBAAyB,CAAC,CAAC;IACpE,CAAC;IAOD,KAAK,CAAC,iBAAiB,CAAC,QAAgB;QAIvC,MAAM,KAAK,GAAG,MAAM,IAAA,kBAAO,EAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,mBAAmB,GAA2B,EAAE,CAAC;QACvD,MAAM,WAAW,GAA6B,EAAE,CAAC;QAEjD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAEjF,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;oBACjC,SAAS;gBACV,CAAC;gBAGD,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC;oBACtC,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAC1D,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,CAChD,CAAC;oBAEF,IAAI,CAAC,cAAc,EAAE,CAAC;wBACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,UAAU,eAAe,CAAC,CAAC;wBAChF,SAAS;oBACV,CAAC;oBAED,mBAAmB,CAAC,UAAU,CAAC,GAAG,cAAc,CAAC,SAAS,CAAC;gBAC5D,CAAC;gBAGD,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC9B,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;gBAC9B,CAAC;gBACD,WAAW,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAA,6BAAY,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5D,CAAC;QACF,CAAC;QAED,OAAO;YACN,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC;YAC9C,WAAW;SACX,CAAC;IACH,CAAC;IAQD,KAAK,CAAC,cAAc,CACnB,QAAgB,EAChB,mBAA4B;QAE5B,MAAM,OAAO,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,MAAM,QAAQ,GAA8B,EAAE,CAAC;QAC/C,MAAM,YAAY,GAAG,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAEvD,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACzC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAE7E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACvC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAE7B,IAAI,CAAC,IAAI;oBAAE,SAAS;gBAEpB,IAAI,CAAC;oBACJ,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACrD,CAAC;gBAAC,OAAO,KAAc,EAAE,CAAC;oBAGzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,GAAG,CAAC,OAAO,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;oBACrF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;oBAClF,MAAM,IAAI,KAAK,CACd,wBAAwB,CAAC,GAAG,CAAC,YAAY,QAAQ,4DAA4D,CAC7G,CAAC;gBACH,CAAC;YACF,CAAC;QACF,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,QAAgB;QACnD,MAAM,eAAe,GAAG,IAAA,6BAAY,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC/D,MAAM,EAAE,UAAU,EAAE,GAAG,wDAAa,IAAI,GAAC,CAAC;QAE1C,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,GAAG,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oDAAoD,QAAQ,KAAK,CAAC,CAAC;QACpF,MAAM,IAAA,mCAAgB,EAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,cAAuB,EAAE,WAAoB;QACnF,IAAA,wDAA+B,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAG9D,IAAI,mBAAuC,CAAC;QAC5C,IAAI,WAAW,EAAE,CAAC;YACjB,IAAI,CAAC;gBACJ,MAAM,cAAc,GAAG,MAAM,IAAA,mBAAQ,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;gBAC3D,mBAAmB,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,WAAW,EAAE,CAAC,CAAC;YACzE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CACd,yCAAyC,WAAW,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CACnH,CAAC;YACH,CAAC;QACF,CAAC;QAED,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;QAE7D,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,kBAAiC,EAAE,EAAE;YAC7E,MAAM,IAAI,CAAC,4BAA4B,CAAC,kBAAkB,CAAC,CAAC;YAG5D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAC9D,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC;YACnD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAE7C,IAAI,cAAc,EAAE,CAAC;gBACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;gBAE9D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,wBAAwB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAE5F,MAAM,OAAO,CAAC,GAAG,CAChB,UAAU,CAAC,GAAG,CACb,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAClF,CACD,CAAC;gBAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;YACzD,CAAC;YAED,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;gBAC1E,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,2HAA2H,CAC3H,CAAC;gBACF,OAAO;YACR,CAAC;YAGD,MAAM,IAAI,CAAC,uBAAuB,CACjC,QAAQ,EACR,kBAAkB,EAClB,WAAW,EACX,WAAW,EACX,mBAAmB,CACnB,CAAC;YAEF,MAAM,IAAI,CAAC,2BAA2B,CAAC,kBAAkB,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAGH,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,wDAAa,aAAa,GAAC,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;gBACxD,MAAM,EAAE,CAAC,IAAA,6BAAY,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;gBACvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;YACzC,CAAC;QACF,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,QAAQ,EAAE,CAAC,CAAC;IACzE,CAAC;IAWD,KAAK,CAAC,uBAAuB,CAC5B,QAAgB,EAChB,kBAAiC,EACjC,WAAqB,EACrB,WAAqC,EACrC,mBAA4B;QAE5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,QAAQ,EAAE,CAAC,CAAC;QAE5E,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;YAC7D,OAAO;QACR,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,WAAW,CAAC,MAAM,0BAA0B,CAAC,CAAC;QAE3E,IAAI,qBAAqB,GAAG,CAAC,CAAC;QAE9B,MAAM,OAAO,CAAC,GAAG,CAChB,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,UAAU,KAAK,KAAK,CAAC,MAAM,UAAU,CAAC,CAAC;YAChE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,UAAU,cAAc,CAAC,CAAC;YAE7D,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAC1D,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,CAChD,CAAC;YAEF,IAAI,CAAC,cAAc,EAAE,CAAC;gBACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,UAAU,eAAe,CAAC,CAAC;gBACnF,OAAO;YACR,CAAC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YAC1E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC;YAErD,IAAI,WAAW,GAAG,CAAC,CAAC;YACpB,MAAM,OAAO,CAAC,GAAG,CAChB,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;gBAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,QAAQ,EAAE,CAAC,CAAC;gBAEpD,MAAM,QAAQ,GAAmC,MAAM,IAAI,CAAC,cAAc,CACzE,QAAQ,EACR,mBAAmB,CACnB,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,QAAQ,CAAC,MAAM,WAAW,CAAC,CAAC;gBAE5D,MAAM,OAAO,CAAC,GAAG,CAChB,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;oBAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACpC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC1E,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAEhE,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,yBAAyB,CAC3E,eAAe,SAAS,KAAK,WAAW,aAAa,YAAY,GAAG,EACpE,MAAM,EACN,EAAE,CACF,CAAC;oBAEF,MAAM,kBAAkB,CAAC,KAAK,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;gBACnD,CAAC,CAAC,CACF,CAAC;gBAEF,WAAW,IAAI,QAAQ,CAAC,MAAM,CAAC;YAChC,CAAC,CAAC,CACF,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,UAAU,KAAK,WAAW,oBAAoB,CAAC,CAAC;YACnF,qBAAqB,IAAI,WAAW,CAAC;QACtC,CAAC,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,qBAAqB,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IAMO,qBAAqB,CAAC,IAAW;QACxC,IAAI,CAAC,IAAI,CAAC,WAAW;YAAE,OAAO;QAE9B,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7D,IAAI,OAAO,IAAI,KAAK,QAAQ;gBAAE,SAAS;YAEvC,MAAM,cAAc,GAA4B,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YAEnE,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAEjF,IAAI,KAAK;gBAAE,cAAc,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;YAExC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC;QACzC,CAAC;IACF,CAAC;IAED,KAAK,CAAC,4BAA4B,CAAC,kBAAiC;QACnE,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAErF,IAAI,CAAC,cAAc,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACd,8BAA8B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,qCAAqC,CAC/F,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,cAAc,EAAE,CAAC,CAAC;QAClD,MAAM,kBAAkB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,kBAAiC;QAClE,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnF,IAAI,CAAC,aAAa,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CACd,8BAA8B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,qCAAqC,CAC/F,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,aAAa,EAAE,CAAC,CAAC;QACjD,MAAM,kBAAkB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;IAQD,KAAK,CAAC,kBAAkB,CAAC,QAAgB,EAAE,mBAA4B;QACtE,MAAM,kBAAkB,GAAG,IAAA,6BAAY,EAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAEtE,IAAI,CAAC;YAEJ,MAAM,IAAA,mBAAQ,EAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACd,qFAAqF,CACrF,CAAC;QACH,CAAC;QAGD,MAAM,qBAAqB,GAAG,MAAM,IAAA,mBAAQ,EAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;QACzE,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM;aAClC,OAAO,CAAC,qBAAqB,EAAE,mBAAmB,CAAC;aACnD,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aAC7B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,IAAI,CAAC;gBACJ,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAA4B,CAAC;YACpD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CACd,oCAAoC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAC9F,CAAC;YACH,CAAC;QACF,CAAC,CAAC,CAAC;QAEJ,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;YACvD,OAAO;QACR,CAAC;QAGD,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YACzE,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC;YAClF,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC;YAC/E,OAAO,gBAAgB,GAAG,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,oCAAoC,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,gBAAgB,MAAM,CAAC,qBAAqB,CAAC,SAAS,IAAI,qBAAqB,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC,GAAG,CACrM,CAAC;QAGF,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;QAC/D,MAAM,mBAAmB,GAAG,GAAG,WAAW,YAAY,CAAC;QAEvD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAC/C,iBAAiB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,kCAAkC,CACrG,CAAC;QAEF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CACd,yFAAyF,CACzF,CAAC;QACH,CAAC;QAED,MAAM,iBAAiB,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,wCAAwC,iBAAiB,CAAC,IAAI,gBAAgB,iBAAiB,CAAC,SAAS,SAAS,iBAAiB,CAAC,EAAE,GAAG,CACzI,CAAC;QAGF,MAAM,eAAe,GAAG,QAAQ,CAC/B,MAAM,CAAC,qBAAqB,CAAC,SAAS,IAAI,qBAAqB,CAAC,EAAE,IAAI,GAAG,CAAC,CAC1E,CAAC;QACF,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC;QACzE,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC;QAC9C,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC;QAGtC,IAAI,eAAe,KAAK,WAAW,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CACd,8CAA8C,MAAM,CAAC,UAAU,CAAC,KAAK,MAAM,CAAC,eAAe,CAAC,oCAAoC,MAAM,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,WAAW,CAAC,wDAAwD,CAC9N,CAAC;QACH,CAAC;QAGD,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACd,yCAAyC,MAAM,CAAC,UAAU,CAAC,mCAAmC,MAAM,CAAC,MAAM,CAAC,uDAAuD,CACnK,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,qFAAqF,CACrF,CAAC;IACH,CAAC;CACD,CAAA;AAvlBY,sCAAa;wBAAb,aAAa;IADzB,IAAA,YAAO,GAAE;qCAwBiB,uBAAM;QACS,0BAAqB;QAC7B,kBAAa;QAChB,oBAAU;QACd,iBAAM;QACS,+CAAqB;QACtB,6CAAoB;QAC1B,uBAAc;QACI,qCAAgC;GA/BxE,aAAa,CAulBzB"}
|
|
@@ -39,5 +39,5 @@ export declare class UserService {
|
|
|
39
39
|
usersInvited: UserRequest.InviteResponse[];
|
|
40
40
|
usersCreated: string[];
|
|
41
41
|
}>;
|
|
42
|
-
changeUserRole(user: User,
|
|
42
|
+
changeUserRole(user: User, newRole: RoleChangeRequestDto): Promise<void>;
|
|
43
43
|
}
|
|
@@ -188,15 +188,13 @@ let UserService = class UserService {
|
|
|
188
188
|
const usersInvited = await this.sendEmails(owner, Object.fromEntries(createdUsers), invitations[0].role);
|
|
189
189
|
return { usersInvited, usersCreated: toCreateUsers.map(({ email }) => email) };
|
|
190
190
|
}
|
|
191
|
-
async changeUserRole(user,
|
|
191
|
+
async changeUserRole(user, newRole) {
|
|
192
192
|
await this.roleService.checkRolesExist([newRole.newRoleName], 'global');
|
|
193
193
|
return await this.userRepository.manager.transaction(async (trx) => {
|
|
194
|
-
await trx.update(db_1.User, { id:
|
|
195
|
-
const adminDowngradedToMember = user.role.slug === 'global:
|
|
196
|
-
targetUser.role.slug === 'global:admin' &&
|
|
197
|
-
newRole.newRoleName === 'global:member';
|
|
194
|
+
await trx.update(db_1.User, { id: user.id }, { role: { slug: newRole.newRoleName } });
|
|
195
|
+
const adminDowngradedToMember = user.role.slug === 'global:admin' && newRole.newRoleName === 'global:member';
|
|
198
196
|
if (adminDowngradedToMember) {
|
|
199
|
-
await this.publicApiKeyService.removeOwnerOnlyScopesFromApiKeys(
|
|
197
|
+
await this.publicApiKeyService.removeOwnerOnlyScopesFromApiKeys(user, trx);
|
|
200
198
|
}
|
|
201
199
|
});
|
|
202
200
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ const isModeRootExecution = {
|
|
|
37
37
|
integrated: false,
|
|
38
38
|
internal: false,
|
|
39
39
|
manual: false,
|
|
40
|
-
chat:
|
|
40
|
+
chat: false,
|
|
41
41
|
};
|
|
42
42
|
let WorkflowStatisticsService = class WorkflowStatisticsService extends typed_emitter_1.TypedEmitter {
|
|
43
43
|
constructor(logger, repository, ownershipService, userService, eventService) {
|
|
@@ -76,8 +76,10 @@ let WorkflowStatisticsService = class WorkflowStatisticsService extends typed_em
|
|
|
76
76
|
const upsertResult = await this.repository.upsertWorkflowStatistics(name, workflowId, isRootExecution);
|
|
77
77
|
if (name === "production_success" && upsertResult === 'insert') {
|
|
78
78
|
const project = await this.ownershipService.getWorkflowProjectCached(workflowId);
|
|
79
|
+
let userId = null;
|
|
79
80
|
if (project.type === 'personal') {
|
|
80
81
|
const owner = await this.ownershipService.getPersonalProjectOwnerCached(project.id);
|
|
82
|
+
userId = owner?.id ?? null;
|
|
81
83
|
if (owner && !owner.settings?.userActivated) {
|
|
82
84
|
await this.userService.updateSettings(owner.id, {
|
|
83
85
|
firstSuccessfulWorkflowId: workflowId,
|
|
@@ -85,12 +87,12 @@ let WorkflowStatisticsService = class WorkflowStatisticsService extends typed_em
|
|
|
85
87
|
userActivatedAt: runData.startedAt.getTime(),
|
|
86
88
|
});
|
|
87
89
|
}
|
|
88
|
-
this.eventService.emit('first-production-workflow-succeeded', {
|
|
89
|
-
projectId: project.id,
|
|
90
|
-
workflowId,
|
|
91
|
-
userId: owner.id,
|
|
92
|
-
});
|
|
93
90
|
}
|
|
91
|
+
this.eventService.emit('first-production-workflow-succeeded', {
|
|
92
|
+
projectId: project.id,
|
|
93
|
+
workflowId,
|
|
94
|
+
userId,
|
|
95
|
+
});
|
|
94
96
|
}
|
|
95
97
|
}
|
|
96
98
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-statistics.service.js","sourceRoot":"","sources":["../../src/services/workflow-statistics.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAwE;AACxE,gCAAkC;AASlC,0DAAsD;AACtD,0DAAsD;AACtD,mDAA+C;AAE/C,2DAAuD;AAEvD,MAAM,qBAAqB,GAAG;IAC7B,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;IAEX,QAAQ,EAAE,KAAK;IACf,GAAG,EAAE,KAAK;IACV,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,KAAK;CAC6B,CAAC;AAE7C,MAAM,mBAAmB,GAAG;IAC3B,GAAG,EAAE,IAAI;IACT,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,UAAU,EAAE,IAAI;IAGhB,UAAU,EAAE,KAAK;IAGjB,QAAQ,EAAE,KAAK;IAEf,MAAM,EAAE,KAAK;IAGb,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"workflow-statistics.service.js","sourceRoot":"","sources":["../../src/services/workflow-statistics.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,12 @@ export interface Task {
|
|
|
19
19
|
settings: unknown;
|
|
20
20
|
data: TaskData;
|
|
21
21
|
}
|
|
22
|
+
export type RunnerStatus = {
|
|
23
|
+
available: true;
|
|
24
|
+
} | {
|
|
25
|
+
available: false;
|
|
26
|
+
reason?: string;
|
|
27
|
+
};
|
|
22
28
|
export declare abstract class TaskRequester {
|
|
23
29
|
private readonly nodeTypes;
|
|
24
30
|
private readonly eventService;
|
|
@@ -36,7 +42,10 @@ export declare abstract class TaskRequester {
|
|
|
36
42
|
tasks: Map<string, Task>;
|
|
37
43
|
private readonly dataResponseBuilder;
|
|
38
44
|
private readonly executionIdsToTaskIds;
|
|
45
|
+
private readonly unavailableRunners;
|
|
39
46
|
constructor(nodeTypes: NodeTypes, eventService: EventService, taskRunnersConfig: TaskRunnersConfig, globalConfig: GlobalConfig, errorReporter: ErrorReporter);
|
|
47
|
+
setRunnerUnavailable(taskType: string, reason: string): void;
|
|
48
|
+
getRunnerStatus(taskType: string): RunnerStatus;
|
|
40
49
|
startTask<TData, TError>(additionalData: IWorkflowExecuteAdditionalData, taskType: string, settings: unknown, executeFunctions: IExecuteFunctions, inputData: ITaskDataConnections, node: INode, workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, envProviderState: EnvProviderState, executeData?: IExecuteData, defaultReturnRunIndex?: number, selfData?: IDataObject, contextNodeName?: string): Promise<Result<TData, TError>>;
|
|
41
50
|
cancelTasks(executionId: string): void;
|
|
42
51
|
private getTaskIds;
|
|
@@ -33,6 +33,14 @@ let TaskRequester = class TaskRequester {
|
|
|
33
33
|
this.tasks = new Map();
|
|
34
34
|
this.dataResponseBuilder = new data_request_response_builder_1.DataRequestResponseBuilder();
|
|
35
35
|
this.executionIdsToTaskIds = new Map();
|
|
36
|
+
this.unavailableRunners = new Map();
|
|
37
|
+
}
|
|
38
|
+
setRunnerUnavailable(taskType, reason) {
|
|
39
|
+
this.unavailableRunners.set(taskType, reason);
|
|
40
|
+
}
|
|
41
|
+
getRunnerStatus(taskType) {
|
|
42
|
+
const reason = this.unavailableRunners.get(taskType);
|
|
43
|
+
return reason ? { available: false, reason } : { available: true };
|
|
36
44
|
}
|
|
37
45
|
async startTask(additionalData, taskType, settings, executeFunctions, inputData, node, workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, envProviderState, executeData, defaultReturnRunIndex = -1, selfData = {}, contextNodeName = activeNodeName) {
|
|
38
46
|
const data = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-requester.js","sourceRoot":"","sources":["../../../src/task-runners/task-managers/task-requester.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA8D;AAC9D,gCAAkC;AAElC,kDAAyD;AACzD,uCAAuE;AACvE,+CAAiE;AAgBjE,mCAAgC;AAEhC,0DAAsD;AACtD,6CAAyC;AACzC,iGAA2F;AAE3F,mFAA6E;AAC7E,qFAA+E;
|
|
1
|
+
{"version":3,"file":"task-requester.js","sourceRoot":"","sources":["../../../src/task-runners/task-managers/task-requester.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,6 +54,8 @@ const event_service_1 = require("../events/event.service");
|
|
|
54
54
|
const task_broker_ws_server_1 = require("../task-runners/task-broker/task-broker-ws-server");
|
|
55
55
|
const task_runner_process_restart_loop_detector_1 = require("../task-runners/task-runner-process-restart-loop-detector");
|
|
56
56
|
const missing_auth_token_error_1 = require("./errors/missing-auth-token.error");
|
|
57
|
+
const missing_requirements_error_1 = require("./errors/missing-requirements.error");
|
|
58
|
+
const task_requester_1 = require("./task-managers/task-requester");
|
|
57
59
|
let TaskRunnerModule = class TaskRunnerModule {
|
|
58
60
|
constructor(logger, errorReporter, runnerConfig, eventService) {
|
|
59
61
|
this.logger = logger;
|
|
@@ -123,6 +125,13 @@ let TaskRunnerModule = class TaskRunnerModule {
|
|
|
123
125
|
await this.jsRunnerProcess.start();
|
|
124
126
|
if (this.runnerConfig.isNativePythonRunnerEnabled) {
|
|
125
127
|
const { PyTaskRunnerProcess } = await Promise.resolve().then(() => __importStar(require('../task-runners/task-runner-process-py')));
|
|
128
|
+
const failureReason = await PyTaskRunnerProcess.checkRequirements();
|
|
129
|
+
if (failureReason) {
|
|
130
|
+
di_1.Container.get(task_requester_1.TaskRequester).setRunnerUnavailable('python', failureReason);
|
|
131
|
+
const error = new missing_requirements_error_1.MissingRequirementsError(failureReason);
|
|
132
|
+
this.logger.warn(error.message);
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
126
135
|
this.pyRunnerProcess = di_1.Container.get(PyTaskRunnerProcess);
|
|
127
136
|
this.pyRunnerProcessRestartLoopDetector = new task_runner_process_restart_loop_detector_1.TaskRunnerProcessRestartLoopDetector(this.pyRunnerProcess);
|
|
128
137
|
this.pyRunnerProcessRestartLoopDetector.on('restart-loop-detected', this.onRunnerRestartLoopDetected);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAAgD;AAChD,gDAA6C;AAC7C,gCAA6C;AAC7C,uCAAyC;AACzC,+CAAqC;AACrC,sDAAwC;AAExC,0DAAsD;AAEtD,4FAAsF;AAGtF,wHAAgH;AAEhH,gFAA0E;
|
|
1
|
+
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,4 +12,6 @@ export declare class PyTaskRunnerProcess extends TaskRunnerProcessBase {
|
|
|
12
12
|
protected readonly loggerScope = "task-runner-py";
|
|
13
13
|
constructor(logger: Logger, runnerConfig: TaskRunnersConfig, authService: TaskBrokerAuthService, runnerLifecycleEvents: TaskRunnerLifecycleEvents);
|
|
14
14
|
startProcess(grantToken: string, taskBrokerUri: string): Promise<import("child_process").ChildProcessWithoutNullStreams>;
|
|
15
|
+
static checkRequirements(): Promise<'python' | 'venv' | null>;
|
|
16
|
+
private static getVenvPath;
|
|
15
17
|
}
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
|
+
var PyTaskRunnerProcess_1;
|
|
14
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
16
|
exports.PyTaskRunnerProcess = void 0;
|
|
16
17
|
const backend_common_1 = require("@n8n/backend-common");
|
|
@@ -20,12 +21,11 @@ const node_child_process_1 = require("node:child_process");
|
|
|
20
21
|
const promises_1 = require("node:fs/promises");
|
|
21
22
|
const node_path_1 = __importDefault(require("node:path"));
|
|
22
23
|
const node_util_1 = require("node:util");
|
|
23
|
-
const missing_requirements_error_1 = require("./errors/missing-requirements.error");
|
|
24
24
|
const task_broker_auth_service_1 = require("./task-broker/auth/task-broker-auth.service");
|
|
25
25
|
const task_runner_lifecycle_events_1 = require("./task-runner-lifecycle-events");
|
|
26
26
|
const task_runner_process_base_1 = require("./task-runner-process-base");
|
|
27
27
|
const asyncExec = (0, node_util_1.promisify)(node_child_process_1.exec);
|
|
28
|
-
let PyTaskRunnerProcess = class PyTaskRunnerProcess extends task_runner_process_base_1.TaskRunnerProcessBase {
|
|
28
|
+
let PyTaskRunnerProcess = PyTaskRunnerProcess_1 = class PyTaskRunnerProcess extends task_runner_process_base_1.TaskRunnerProcessBase {
|
|
29
29
|
constructor(logger, runnerConfig, authService, runnerLifecycleEvents) {
|
|
30
30
|
super(logger, runnerConfig, authService, runnerLifecycleEvents);
|
|
31
31
|
this.logger = logger;
|
|
@@ -36,20 +36,8 @@ let PyTaskRunnerProcess = class PyTaskRunnerProcess extends task_runner_process_
|
|
|
36
36
|
this.loggerScope = 'task-runner-py';
|
|
37
37
|
}
|
|
38
38
|
async startProcess(grantToken, taskBrokerUri) {
|
|
39
|
-
try {
|
|
40
|
-
await asyncExec('python3 --version', { timeout: 5000 });
|
|
41
|
-
}
|
|
42
|
-
catch {
|
|
43
|
-
throw new missing_requirements_error_1.MissingRequirementsError('python');
|
|
44
|
-
}
|
|
45
39
|
const pythonDir = node_path_1.default.join(__dirname, '../../../@n8n/task-runner-python');
|
|
46
|
-
const venvPath =
|
|
47
|
-
try {
|
|
48
|
-
await (0, promises_1.access)(venvPath);
|
|
49
|
-
}
|
|
50
|
-
catch {
|
|
51
|
-
throw new missing_requirements_error_1.MissingRequirementsError('venv');
|
|
52
|
-
}
|
|
40
|
+
const venvPath = PyTaskRunnerProcess_1.getVenvPath();
|
|
53
41
|
return (0, node_child_process_1.spawn)(venvPath, ['-m', 'src.main'], {
|
|
54
42
|
cwd: pythonDir,
|
|
55
43
|
env: {
|
|
@@ -64,9 +52,28 @@ let PyTaskRunnerProcess = class PyTaskRunnerProcess extends task_runner_process_
|
|
|
64
52
|
},
|
|
65
53
|
});
|
|
66
54
|
}
|
|
55
|
+
static async checkRequirements() {
|
|
56
|
+
try {
|
|
57
|
+
await asyncExec('python3 --version', { timeout: 5000 });
|
|
58
|
+
}
|
|
59
|
+
catch {
|
|
60
|
+
return 'python';
|
|
61
|
+
}
|
|
62
|
+
try {
|
|
63
|
+
await (0, promises_1.access)(PyTaskRunnerProcess_1.getVenvPath());
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
return 'venv';
|
|
67
|
+
}
|
|
68
|
+
return null;
|
|
69
|
+
}
|
|
70
|
+
static getVenvPath() {
|
|
71
|
+
const pythonDir = node_path_1.default.join(__dirname, '../../../@n8n/task-runner-python');
|
|
72
|
+
return node_path_1.default.join(pythonDir, '.venv/bin/python');
|
|
73
|
+
}
|
|
67
74
|
};
|
|
68
75
|
exports.PyTaskRunnerProcess = PyTaskRunnerProcess;
|
|
69
|
-
exports.PyTaskRunnerProcess = PyTaskRunnerProcess = __decorate([
|
|
76
|
+
exports.PyTaskRunnerProcess = PyTaskRunnerProcess = PyTaskRunnerProcess_1 = __decorate([
|
|
70
77
|
(0, di_1.Service)(),
|
|
71
78
|
__metadata("design:paramtypes", [backend_common_1.Logger,
|
|
72
79
|
config_1.TaskRunnersConfig,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-process-py.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-process-py.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-runner-process-py.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-process-py.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAAgD;AAChD,gCAAkC;AAClC,2DAAiD;AACjD,+CAA0C;AAC1C,0DAA6B;AAC7B,yCAAsC;AAEtC,0FAAoF;AACpF,iFAA2E;AAC3E,yEAAmE;AAEnE,MAAM,SAAS,GAAG,IAAA,qBAAS,EAAC,yBAAI,CAAC,CAAC;AAO3B,IAAM,mBAAmB,2BAAzB,MAAM,mBAAoB,SAAQ,gDAAqB;IAK7D,YACU,MAAc,EACd,YAA+B,EAC/B,WAAkC,EAClC,qBAAgD;QAEzD,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,qBAAqB,CAAC,CAAC;QALvD,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAmB;QAC/B,gBAAW,GAAX,WAAW,CAAuB;QAClC,0BAAqB,GAArB,qBAAqB,CAA2B;QARvC,SAAI,GAAG,WAAW,CAAC;QAEnB,gBAAW,GAAG,gBAAgB,CAAC;IASlD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,UAAkB,EAAE,aAAqB;QAC3D,MAAM,SAAS,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,qBAAmB,CAAC,WAAW,EAAE,CAAC;QAEnD,OAAO,IAAA,0BAAK,EAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE;YAC1C,GAAG,EAAE,SAAS;YACd,GAAG,EAAE;gBAEJ,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;gBACtB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;gBAGtB,uBAAuB,EAAE,UAAU;gBACnC,2BAA2B,EAAE,aAAa;gBAC1C,uBAAuB,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,EAAE;gBAChE,2BAA2B,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE;gBACxE,wBAAwB,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE;gBAClE,8BAA8B,EAAE,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,QAAQ,EAAE;aAC9E;SACD,CAAC,CAAC;IACJ,CAAC;IAMD,MAAM,CAAC,KAAK,CAAC,iBAAiB;QAC7B,IAAI,CAAC;YACJ,MAAM,SAAS,CAAC,mBAAmB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,QAAQ,CAAC;QACjB,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,IAAA,iBAAM,EAAC,qBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,MAAM,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,MAAM,CAAC,WAAW;QACzB,MAAM,SAAS,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC;QAC3E,OAAO,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IACjD,CAAC;CACD,CAAA;AA5DY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,YAAO,GAAE;qCAOS,uBAAM;QACA,0BAAiB;QAClB,gDAAqB;QACX,wDAAyB;GAT9C,mBAAmB,CA4D/B"}
|