@ohos-ports/nx 23.3.0-beta.3 → 24.0.2-beta.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/README.md +3 -6
- package/dist/bin/nx.js +2 -2
- package/dist/bin/post-install.js +5 -3
- package/dist/nx-cloud-internals.d.ts +1 -0
- package/dist/nx-cloud-internals.js +7 -1
- package/dist/src/adapter/ngcli-adapter.js +2 -2
- package/dist/src/ai/clone-ai-config-repo.js +49 -12
- package/dist/src/command-line/add/add.d.ts +2 -0
- package/dist/src/command-line/add/add.js +24 -6
- package/dist/src/command-line/affected/affected.js +2 -2
- package/dist/src/command-line/configure-ai-agents/configure-ai-agents.js +1 -13
- package/dist/src/command-line/graph/graph.js +38 -10
- package/dist/src/command-line/init/command-object.js +0 -12
- package/dist/src/command-line/init/implementation/add-nx-to-nest.js +21 -62
- package/dist/src/command-line/init/init-v2.js +1 -3
- package/dist/src/command-line/migrate/agentic/close-agent-session.d.ts +1 -1
- package/dist/src/command-line/migrate/agentic/close-agent-session.js +4 -3
- package/dist/src/command-line/migrate/agentic/definitions.d.ts +1 -3
- package/dist/src/command-line/migrate/agentic/definitions.js +5 -97
- package/dist/src/command-line/migrate/agentic/handoff-gitignore.d.ts +7 -45
- package/dist/src/command-line/migrate/agentic/handoff-gitignore.js +9 -51
- package/dist/src/command-line/migrate/agentic/handoff.d.ts +1 -43
- package/dist/src/command-line/migrate/agentic/handoff.js +3 -119
- package/dist/src/command-line/migrate/agentic/instruction-files.d.ts +0 -21
- package/dist/src/command-line/migrate/agentic/instruction-files.js +6 -27
- package/dist/src/command-line/migrate/agentic/master/run-master-session.d.ts +19 -1
- package/dist/src/command-line/migrate/agentic/master/run-master-session.js +88 -49
- package/dist/src/command-line/migrate/agentic/master/spawn-master.d.ts +1 -0
- package/dist/src/command-line/migrate/agentic/master/spawn-master.js +86 -24
- package/dist/src/command-line/migrate/agentic/print-dropped-agent-context.d.ts +2 -2
- package/dist/src/command-line/migrate/agentic/print-dropped-agent-context.js +2 -2
- package/dist/src/command-line/migrate/agentic/prompts/fragments.d.ts +1 -12
- package/dist/src/command-line/migrate/agentic/prompts/fragments.js +8 -17
- package/dist/src/command-line/migrate/agentic/prompts/shared-rendering.d.ts +0 -15
- package/dist/src/command-line/migrate/agentic/prompts/shared-rendering.js +3 -100
- package/dist/src/command-line/migrate/agentic/select.d.ts +12 -6
- package/dist/src/command-line/migrate/agentic/select.js +38 -8
- package/dist/src/command-line/migrate/agentic/types.d.ts +9 -68
- package/dist/src/command-line/migrate/agentic/types.js +6 -8
- package/dist/src/command-line/migrate/command-object.js +6 -10
- package/dist/src/command-line/migrate/execute-migration.d.ts +6 -6
- package/dist/src/command-line/migrate/execute-migration.js +25 -15
- package/dist/src/command-line/migrate/migrate-analytics.d.ts +18 -1
- package/dist/src/command-line/migrate/migrate-analytics.js +38 -0
- package/dist/src/command-line/migrate/migrate-commits.d.ts +29 -17
- package/dist/src/command-line/migrate/migrate-commits.js +86 -32
- package/dist/src/command-line/migrate/migrate-config.d.ts +6 -6
- package/dist/src/command-line/migrate/migrate-config.js +12 -6
- package/dist/src/command-line/migrate/migrate-output.d.ts +1 -6
- package/dist/src/command-line/migrate/migrate-output.js +1 -10
- package/dist/src/command-line/migrate/migrate.d.ts +6 -30
- package/dist/src/command-line/migrate/migrate.js +257 -255
- package/dist/src/command-line/migrate/resolve-package-version.d.ts +2 -4
- package/dist/src/command-line/migrate/resolve-package-version.js +2 -35
- package/dist/src/command-line/migrate/run/agent-output.d.ts +2 -0
- package/dist/src/command-line/migrate/run/agent-output.js +9 -0
- package/dist/src/command-line/migrate/run/broker.d.ts +14 -5
- package/dist/src/command-line/migrate/run/broker.js +69 -21
- package/dist/src/command-line/migrate/run/clean-retry.js +4 -2
- package/dist/src/command-line/migrate/run/existing-run-report.d.ts +1 -1
- package/dist/src/command-line/migrate/run/existing-run-report.js +7 -5
- package/dist/src/command-line/migrate/run/give-up.d.ts +4 -3
- package/dist/src/command-line/migrate/run/give-up.js +8 -5
- package/dist/src/command-line/migrate/run/index.d.ts +7 -5
- package/dist/src/command-line/migrate/run/index.js +16 -1
- package/dist/src/command-line/migrate/run/issues.js +7 -2
- package/dist/src/command-line/migrate/run/orchestrator.d.ts +61 -4
- package/dist/src/command-line/migrate/run/orchestrator.js +397 -133
- package/dist/src/command-line/migrate/run/run-state.d.ts +17 -1
- package/dist/src/command-line/migrate/run/run-state.js +41 -2
- package/dist/src/command-line/migrate/run/runbook.d.ts +1 -0
- package/dist/src/command-line/migrate/run/runbook.js +115 -18
- package/dist/src/command-line/migrate/run/state-lock.d.ts +29 -4
- package/dist/src/command-line/migrate/run/state-lock.js +102 -10
- package/dist/src/command-line/migrate/run/state-machine.js +4 -1
- package/dist/src/command-line/migrate/run/util.d.ts +7 -2
- package/dist/src/command-line/migrate/run/util.js +30 -3
- package/dist/src/command-line/migrate/run/worker.d.ts +1 -1
- package/dist/src/command-line/migrate/run/worker.js +252 -250
- package/dist/src/command-line/migrate/sort-migrations.d.ts +1 -7
- package/dist/src/command-line/migrate/sort-migrations.js +1 -12
- package/dist/src/command-line/nx-cloud/connect/connect-to-nx-cloud.js +17 -12
- package/dist/src/command-line/release/changelog.js +9 -6
- package/dist/src/command-line/release/config/config.d.ts +1 -0
- package/dist/src/command-line/release/config/config.js +48 -9
- package/dist/src/command-line/release/release.js +2 -2
- package/dist/src/command-line/release/utils/git.js +8 -7
- package/dist/src/command-line/release/utils/interpolate-release-config.d.ts +6 -0
- package/dist/src/command-line/release/utils/interpolate-release-config.js +39 -0
- package/dist/src/command-line/release/utils/release-graph.d.ts +5 -0
- package/dist/src/command-line/release/utils/release-graph.js +1 -0
- package/dist/src/command-line/release/utils/remote-release-clients/github.js +5 -6
- package/dist/src/command-line/release/utils/remote-release-clients/gitlab.js +5 -6
- package/dist/src/command-line/release/utils/resolve-changelog-renderer.js +2 -2
- package/dist/src/command-line/release/utils/shared.js +10 -10
- package/dist/src/command-line/release/utils/version-plan-utils.d.ts +3 -12
- package/dist/src/command-line/release/utils/version-plan-utils.js +33 -55
- package/dist/src/command-line/release/version/version-actions.js +2 -1
- package/dist/src/command-line/release/version.js +5 -2
- package/dist/src/command-line/repair/repair.js +1 -1
- package/dist/src/command-line/report/report.js +1 -1
- package/dist/src/command-line/reset/reset.js +58 -62
- package/dist/src/command-line/run/executor-utils.js +1 -0
- package/dist/src/command-line/run/run-one.d.ts +20 -1
- package/dist/src/command-line/run/run-one.js +153 -5
- package/dist/src/command-line/run/run.js +2 -1
- package/dist/src/command-line/show/projects.js +5 -3
- package/dist/src/command-line/show/show-target/info.d.ts +10 -1
- package/dist/src/command-line/show/show-target/info.js +100 -15
- package/dist/src/command-line/show/show-target/inputs.js +10 -2
- package/dist/src/command-line/show/show-target/utils.js +1 -0
- package/dist/src/command-line/watch/command-object.js +3 -22
- package/dist/src/command-line/watch/watch.d.ts +0 -7
- package/dist/src/command-line/watch/watch.js +1 -1
- package/dist/src/command-line/yargs-utils/shared-options.js +1 -1
- package/dist/src/config/misc-interfaces.d.ts +18 -0
- package/dist/src/config/nx-json.d.ts +22 -11
- package/dist/src/config/task-graph.d.ts +1 -1
- package/dist/src/config/workspace-json-project-json.d.ts +88 -0
- package/dist/src/core/graph/main.js +1 -1
- package/dist/src/core/graph/runtime.js +1 -1
- package/dist/src/core/graph/styles.css +1 -1
- package/dist/src/core/graph/styles.js +1 -1
- package/dist/src/daemon/client/client.d.ts +15 -0
- package/dist/src/daemon/client/client.js +181 -71
- package/dist/src/daemon/client/daemon-socket-messenger.d.ts +1 -1
- package/dist/src/daemon/client/daemon-socket-messenger.js +2 -2
- package/dist/src/daemon/server/client-socket-context.js +1 -1
- package/dist/src/daemon/server/handle-configure-ai-agents.js +2 -2
- package/dist/src/daemon/server/handle-process-in-background.js +21 -9
- package/dist/src/daemon/server/handle-select-affected-tasks.d.ts +2 -1
- package/dist/src/daemon/server/handle-select-affected-tasks.js +21 -13
- package/dist/src/daemon/server/native-js-loader.d.ts +1 -0
- package/dist/src/daemon/server/native-js-loader.js +21 -0
- package/dist/src/daemon/server/nx-console-operations.js +2 -2
- package/dist/src/daemon/server/project-graph-incremental-recomputation.js +4 -8
- package/dist/src/daemon/server/server.d.ts +2 -1
- package/dist/src/daemon/server/server.js +17 -4
- package/dist/src/daemon/server/shutdown-utils.js +1 -4
- package/dist/src/daemon/server/start.d.ts +1 -0
- package/dist/src/daemon/server/start.js +2 -0
- package/dist/src/daemon/socket-utils.d.ts +11 -9
- package/dist/src/daemon/socket-utils.js +31 -61
- package/dist/src/daemon/tmp-dir.d.ts +19 -14
- package/dist/src/daemon/tmp-dir.js +142 -354
- package/dist/src/devkit-exports.d.ts +9 -1
- package/dist/src/devkit-exports.js +12 -1
- package/dist/src/devkit-internals.d.ts +6 -5
- package/dist/src/devkit-internals.js +13 -4
- package/dist/src/executors/run-commands/run-commands.impl.d.ts +4 -2
- package/dist/src/executors/run-commands/run-commands.impl.js +53 -27
- package/dist/src/executors/run-commands/running-tasks.d.ts +13 -4
- package/dist/src/executors/run-commands/running-tasks.js +148 -95
- package/dist/src/executors/run-commands/schema.json +1 -1
- package/dist/src/hasher/check-task-files.js +5 -8
- package/dist/src/hasher/file-hasher.js +9 -7
- package/dist/src/hasher/hash-task.js +4 -0
- package/dist/src/hasher/native-task-hasher-impl.js +3 -1
- package/dist/src/hasher/task-hasher.d.ts +2 -0
- package/dist/src/hasher/task-hasher.js +4 -1
- package/dist/src/migrations/update-23-2-0/set-cache-on-executor-target-defaults.d.ts +1 -2
- package/dist/src/migrations/update-23-2-0/set-cache-on-executor-target-defaults.js +6 -11
- package/dist/src/migrations/update-23-2-0/set-cache-on-executor-target-defaults.md +2 -2
- package/dist/src/migrations/update-24-0-0/enable-legacy-affected.d.ts +4 -0
- package/dist/src/migrations/update-24-0-0/enable-legacy-affected.js +15 -0
- package/dist/src/migrations/update-24-0-0/enable-legacy-affected.md +30 -0
- package/dist/src/migrations/update-24-0-0/find-custom-hashers.d.ts +3 -0
- package/dist/src/migrations/update-24-0-0/find-custom-hashers.js +100 -0
- package/dist/src/migrations/update-24-0-0/find-custom-hashers.md +63 -0
- package/dist/src/migrations/update-24-0-0/move-custom-hashers-to-inputs.md +146 -0
- package/dist/src/migrations/update-24-0-0/rename-ultracache-ignore-options.d.ts +3 -0
- package/dist/src/migrations/update-24-0-0/rename-ultracache-ignore-options.js +130 -0
- package/dist/src/migrations/update-24-0-0/rename-ultracache-ignore-options.md +62 -0
- package/dist/src/native/assert-supported-platform.js +1 -1
- package/dist/src/native/index.d.ts +238 -18
- package/dist/src/native/index.js +6 -1
- package/dist/src/native/native-bindings.js +15 -6
- package/dist/src/native/nx.openharmony-arm64.node +0 -0
- package/dist/src/native/nx.wasi-browser.js +1 -0
- package/dist/src/native/nx.wasi.cjs +1 -0
- package/dist/src/native/nx.wasm32-wasi.debug.wasm +0 -0
- package/dist/src/native/nx.wasm32-wasi.wasm +0 -0
- package/dist/src/nx-cloud/update-manager.d.ts +14 -0
- package/dist/src/nx-cloud/update-manager.js +237 -50
- package/dist/src/plugins/js/lock-file/pnpm-parser.js +3 -4
- package/dist/src/plugins/js/lock-file/pruned-output.d.ts +2 -2
- package/dist/src/plugins/js/lock-file/pruned-output.js +4 -4
- package/dist/src/plugins/js/utils/register.js +9 -4
- package/dist/src/project-graph/affected/affected-tasks.d.ts +9 -6
- package/dist/src/project-graph/affected/affected-tasks.js +31 -7
- package/dist/src/project-graph/plugins/isolation/isolated-plugin.js +7 -0
- package/dist/src/project-graph/plugins/loaded-nx-plugin.js +49 -6
- package/dist/src/project-graph/utils/project-configuration/target-merging.js +1 -1
- package/dist/src/project-graph/utils/project-configuration/target-normalization.js +12 -133
- package/dist/src/project-graph/utils/project-configuration-utils.js +2 -2
- package/dist/src/project-graph/utils/retrieve-workspace-files.js +27 -6
- package/dist/src/tasks-runner/create-task-graph.d.ts +8 -7
- package/dist/src/tasks-runner/create-task-graph.js +50 -27
- package/dist/src/tasks-runner/default-tasks-runner.js +1 -1
- package/dist/src/tasks-runner/init-tasks-runner.js +116 -59
- package/dist/src/tasks-runner/life-cycle.d.ts +4 -1
- package/dist/src/tasks-runner/life-cycle.js +7 -0
- package/dist/src/tasks-runner/life-cycles/performance-analysis.d.ts +5 -2
- package/dist/src/tasks-runner/life-cycles/performance-analysis.js +13 -7
- package/dist/src/tasks-runner/life-cycles/performance-life-cycle.d.ts +4 -3
- package/dist/src/tasks-runner/life-cycles/performance-life-cycle.js +9 -2
- package/dist/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +5 -2
- package/dist/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.js +4 -1
- package/dist/src/tasks-runner/life-cycles/summary-terminal-output-life-cycle.js +5 -1
- package/dist/src/tasks-runner/pseudo-ipc.d.ts +1 -0
- package/dist/src/tasks-runner/pseudo-ipc.js +4 -0
- package/dist/src/tasks-runner/pseudo-terminal.d.ts +1 -1
- package/dist/src/tasks-runner/pseudo-terminal.js +2 -2
- package/dist/src/tasks-runner/readiness/executor-ready-signal.d.ts +7 -0
- package/dist/src/tasks-runner/readiness/executor-ready-signal.js +43 -0
- package/dist/src/tasks-runner/readiness/probes.d.ts +14 -0
- package/dist/src/tasks-runner/readiness/probes.js +101 -0
- package/dist/src/tasks-runner/readiness/ready-signal-server.d.ts +18 -0
- package/dist/src/tasks-runner/readiness/ready-signal-server.js +72 -0
- package/dist/src/tasks-runner/readiness/ready-signal.d.ts +33 -0
- package/dist/src/tasks-runner/readiness/ready-signal.js +92 -0
- package/dist/src/tasks-runner/readiness/ready-when.d.ts +84 -0
- package/dist/src/tasks-runner/readiness/ready-when.js +371 -0
- package/dist/src/tasks-runner/readiness/startup-host.d.ts +1 -0
- package/dist/src/tasks-runner/readiness/startup-host.js +32 -0
- package/dist/src/tasks-runner/run-command.d.ts +6 -2
- package/dist/src/tasks-runner/run-command.js +21 -31
- package/dist/src/tasks-runner/run-outcome.d.ts +16 -0
- package/dist/src/tasks-runner/run-outcome.js +39 -0
- package/dist/src/tasks-runner/running-tasks/batch-process.js +6 -0
- package/dist/src/tasks-runner/running-tasks/node-child-process.js +5 -4
- package/dist/src/tasks-runner/running-tasks/running-task.d.ts +1 -1
- package/dist/src/tasks-runner/task-env.d.ts +10 -0
- package/dist/src/tasks-runner/task-env.js +37 -5
- package/dist/src/tasks-runner/task-graph-utils.d.ts +9 -6
- package/dist/src/tasks-runner/task-graph-utils.js +17 -12
- package/dist/src/tasks-runner/task-orchestrator.d.ts +62 -18
- package/dist/src/tasks-runner/task-orchestrator.js +750 -150
- package/dist/src/tasks-runner/tasks-runner.d.ts +1 -1
- package/dist/src/tasks-runner/tasks-schedule.d.ts +18 -1
- package/dist/src/tasks-runner/tasks-schedule.js +63 -6
- package/dist/src/tasks-runner/tokens.d.ts +54 -0
- package/dist/src/tasks-runner/tokens.js +161 -0
- package/dist/src/tasks-runner/utils.d.ts +35 -6
- package/dist/src/tasks-runner/utils.js +149 -68
- package/dist/src/ultracache/ci-status.d.ts +24 -0
- package/dist/src/ultracache/ci-status.js +87 -0
- package/dist/src/ultracache/config.d.ts +3 -3
- package/dist/src/ultracache/config.js +4 -4
- package/dist/src/ultracache/fetch.d.ts +2 -0
- package/dist/src/ultracache/fetch.js +1 -0
- package/dist/src/ultracache/overrides.js +4 -0
- package/dist/src/utils/acknowledge-build-scripts.d.ts +34 -1
- package/dist/src/utils/acknowledge-build-scripts.js +171 -32
- package/dist/src/utils/child-process.js +2 -1
- package/dist/src/utils/find-matching-projects.js +9 -6
- package/dist/src/utils/git-utils.d.ts +12 -5
- package/dist/src/utils/git-utils.js +69 -11
- package/dist/src/utils/long-running-target.d.ts +1 -3
- package/dist/src/utils/long-running-target.js +1 -3
- package/dist/src/utils/nx-package-group.js +1 -1
- package/dist/src/utils/output.d.ts +4 -3
- package/dist/src/utils/output.js +4 -3
- package/dist/src/utils/owned-private-dir.d.ts +1 -17
- package/dist/src/utils/owned-private-dir.js +10 -62
- package/dist/src/utils/package-json.js +1 -1
- package/dist/src/utils/package-manager.d.ts +8 -0
- package/dist/src/utils/package-manager.js +65 -8
- package/dist/src/utils/perf-hooks.d.ts +1 -0
- package/dist/src/utils/plugins/core-plugins.js +5 -1
- package/dist/src/utils/progress-topics.d.ts +1 -0
- package/dist/src/utils/progress-topics.js +1 -0
- package/dist/src/utils/safe-spawn.js +1 -5
- package/dist/src/utils/shell-quoting.d.ts +8 -1
- package/dist/src/utils/shell-quoting.js +12 -1
- package/dist/src/utils/spawn-without-terminal.d.ts +27 -0
- package/dist/src/utils/spawn-without-terminal.js +110 -0
- package/dist/src/utils/string-similarity.d.ts +38 -0
- package/dist/src/utils/string-similarity.js +108 -0
- package/dist/src/utils/versions.js +1 -1
- package/migrations.json +20 -6
- package/package.json +15 -24
- package/schemas/migrations-schema.json +11 -0
- package/schemas/nx-schema.json +133 -11
- package/schemas/project-schema.json +114 -4
- package/dist/src/command-line/migrate/agentic/prompts/generic-validation.d.ts +0 -56
- package/dist/src/command-line/migrate/agentic/prompts/generic-validation.js +0 -67
- package/dist/src/command-line/migrate/agentic/prompts/hybrid-prompt-migration.d.ts +0 -49
- package/dist/src/command-line/migrate/agentic/prompts/hybrid-prompt-migration.js +0 -53
- package/dist/src/command-line/migrate/agentic/prompts/prompt-migration.d.ts +0 -26
- package/dist/src/command-line/migrate/agentic/prompts/prompt-migration.js +0 -27
- package/dist/src/command-line/migrate/agentic/prompts/system-prompt.d.ts +0 -70
- package/dist/src/command-line/migrate/agentic/prompts/system-prompt.js +0 -113
- package/dist/src/command-line/migrate/agentic/run-step.d.ts +0 -68
- package/dist/src/command-line/migrate/agentic/run-step.js +0 -148
- package/dist/src/command-line/migrate/agentic/runner.d.ts +0 -21
- package/dist/src/command-line/migrate/agentic/runner.js +0 -262
- package/dist/src/migrations/update-23-0-0/consolidate-release-tag-config.d.ts +0 -9
- package/dist/src/migrations/update-23-0-0/consolidate-release-tag-config.js +0 -18
- package/dist/src/tasks-runner/legacy-depends-on-warning.d.ts +0 -18
- package/dist/src/tasks-runner/legacy-depends-on-warning.js +0 -109
|
@@ -22,7 +22,7 @@ export { getExecutorInformation, parseExecutor, } from './command-line/run/execu
|
|
|
22
22
|
export { readNxJson as readNxJsonFromDisk } from './config/nx-json';
|
|
23
23
|
export { calculateDefaultProjectName } from './config/calculate-default-project-name';
|
|
24
24
|
export { retrieveProjectConfigurationsWithAngularProjects } from './project-graph/utils/retrieve-workspace-files';
|
|
25
|
-
export { mergeTargetConfigurations, resolveCommandSyntacticSugar, } from './project-graph/utils/project-configuration/target-merging';
|
|
25
|
+
export { mergeTargetConfigurations, resolveCommandSyntacticSugar, resolveNxTokensInOptions, } from './project-graph/utils/project-configuration/target-merging';
|
|
26
26
|
export { findMatchingTargetNames, readProjectConfigurationsFromRootMap, } from './project-graph/utils/project-configuration/project-nodes-manager';
|
|
27
27
|
export { findMatchingConfigFiles } from './project-graph/utils/project-configuration-utils';
|
|
28
28
|
export { findMatchingProjects } from './utils/find-matching-projects';
|
|
@@ -63,7 +63,7 @@ export { resolveImplementation, resolveSchema, ImplementationResolutionError, Sc
|
|
|
63
63
|
export { resolvePrompt, PromptResolutionError, } from './command-line/migrate/prompt-files';
|
|
64
64
|
export { checkFilesAreInputs, checkFilesAreOutputs, } from './hasher/check-task-files';
|
|
65
65
|
export { getCatalogManager, getCatalogDependenciesFromPackageJson, } from './utils/catalog';
|
|
66
|
-
export { acknowledgeBuildScripts } from './utils/acknowledge-build-scripts';
|
|
66
|
+
export { acknowledgeBuildScripts, acknowledgeDeclaredBuildScripts, } from './utils/acknowledge-build-scripts';
|
|
67
67
|
export { default as runCommandsExecutor } from './executors/run-commands/run-commands.impl';
|
|
68
68
|
export type { TaskResult } from './config/misc-interfaces';
|
|
69
69
|
export { toNewFormat, toOldFormat } from './adapter/angular-json';
|
|
@@ -81,13 +81,13 @@ export type { InputDefinition } from './config/workspace-json-project-json';
|
|
|
81
81
|
export type { ChangedFile, UnregisterCallback } from './daemon/client/client';
|
|
82
82
|
export { daemonClient } from './daemon/client/client';
|
|
83
83
|
export type { RunCommandsOptions } from './executors/run-commands/run-commands.impl';
|
|
84
|
-
export { LARGE_BUFFER } from './executors/run-commands/run-commands.impl';
|
|
84
|
+
export { LARGE_BUFFER, interpolateArgsIntoCommand, normalizeArgs as normalizeRunCommandsArgs, } from './executors/run-commands/run-commands.impl';
|
|
85
85
|
export { FsTree } from './generators/tree';
|
|
86
86
|
export { getRelativeProjectJsonSchemaPath } from './generators/utils/project-configuration';
|
|
87
87
|
export { hashFile } from './hasher/file-hasher';
|
|
88
88
|
export { filterUsingGlobPatterns, getTargetInputs } from './hasher/task-hasher';
|
|
89
89
|
export type { JsonInput } from './native';
|
|
90
|
-
export { isAiAgent, killProcessTreeGraceful } from './native';
|
|
90
|
+
export { isAiAgent, killProcessTreeGraceful, readShebangHeaders, } from './native';
|
|
91
91
|
export { killChildOnHostExit } from './utils/kill-child-on-host-exit';
|
|
92
92
|
export { connectToNxCloud } from './nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud';
|
|
93
93
|
export type { NxCloudOnBoardingStatus } from './nx-cloud/models/onboarding-status';
|
|
@@ -115,7 +115,7 @@ export type { LifeCycle, TaskMetadata } from './tasks-runner/life-cycle';
|
|
|
115
115
|
export { CompositeLifeCycle } from './tasks-runner/life-cycle';
|
|
116
116
|
export { createRunManyDynamicOutputRenderer } from './tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle';
|
|
117
117
|
export type { TaskStatus, TasksRunner } from './tasks-runner/tasks-runner';
|
|
118
|
-
export type {
|
|
118
|
+
export type { NormalizedTargetDependencyConfig } from './tasks-runner/utils';
|
|
119
119
|
export { calculateReverseDeps, createTaskId, expandDependencyConfigSyntaxSugar, expandInitiatingTasksThroughNoop, expandWildcardTargetConfiguration, getCliPath, getCustomHasher, getDependencyConfigs, getExecutorForTask, getExecutorNameForTask, getOutputs, getPrintableCommandArgsForTask, getSerializedArgsForTask, getTargetConfigurationForTask, getUnparsedOverrideArgs, isCacheableTask, normalizeDependencyConfigDefinition, normalizeDependencyConfigProjects, normalizeTargetDependencyWithStringProjects, readProjectAndTargetFromTargetString, removeTasksFromTaskGraph, shouldStreamOutput, transformLegacyOutputs, unparse, validateOutputs, } from './tasks-runner/utils';
|
|
120
120
|
export { getLastValueFromAsyncIterableIterator } from './utils/async-iterator';
|
|
121
121
|
export { workspaceDataDirectory } from './utils/cache-directory';
|
|
@@ -144,3 +144,4 @@ export { nxVersion } from './utils/versions';
|
|
|
144
144
|
export { getFilesInDirectoryUsingContext, globWithWorkspaceContext, resetWorkspaceContext, setupWorkspaceContext, } from './utils/workspace-context';
|
|
145
145
|
export { setWorkspaceRoot, workspaceRootInner } from './utils/workspace-root';
|
|
146
146
|
export { safeExecFileSync, safeSpawn } from './utils/safe-spawn';
|
|
147
|
+
export { resolveStartupHost } from './tasks-runner/readiness/startup-host';
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
5
|
-
exports.
|
|
6
|
-
exports.
|
|
3
|
+
exports.hashDaemonClientEnv = exports.getEnvPathsForTask = exports.getGraphTimeDotEnvForTask = exports.getEnvFilesForTask = exports.interpolate = exports.requireWithTsconfigFallback = exports.isTsEsmNamedExportLinkageError = exports.isRequireInEsmScopeError = exports.forceRegisterEsmLoader = exports.loadTsFile = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappings = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmpAsync = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.confirmationPrompt = exports.textPrompt = exports.multiselectPrompt = exports.selectPrompt = exports.splitTarget = exports.createPrettierIgnoreChecker = exports.createOxfmtIgnoreChecker = exports.createGitIgnoreChecker = exports.readTargetDefaultsForTarget = exports.createTargetDefaultsResults = exports.findMatchingProjects = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.findMatchingTargetNames = exports.resolveNxTokensInOptions = exports.resolveCommandSyntacticSugar = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.parseVersionFromPackageManagerField = exports.createTempNpmDirectory = void 0;
|
|
4
|
+
exports.getTargetInputs = exports.filterUsingGlobPatterns = exports.hashFile = exports.getRelativeProjectJsonSchemaPath = exports.FsTree = exports.normalizeRunCommandsArgs = exports.interpolateArgsIntoCommand = exports.LARGE_BUFFER = exports.daemonClient = exports.isProjectGraphProjectNode = exports.isProjectGraphExternalNode = exports.fileDataDepType = exports.fileDataDepTarget = exports.BatchFunctionRunner = exports.getGeneratorInformation = exports.setupAiAgentsGenerator = exports.toOldFormat = exports.toNewFormat = exports.runCommandsExecutor = exports.acknowledgeDeclaredBuildScripts = exports.acknowledgeBuildScripts = exports.getCatalogDependenciesFromPackageJson = exports.getCatalogManager = exports.checkFilesAreOutputs = exports.checkFilesAreInputs = exports.PromptResolutionError = exports.resolvePrompt = exports.SchemaResolutionError = exports.ImplementationResolutionError = exports.resolveSchema = exports.resolveImplementation = exports.emitPluginWorkerLog = exports.safeWriteFileCache = exports.PluginCache = exports.handleImport = exports.signalToCode = exports.globalSpinner = exports.readYamlFile = exports.oxfmtConfigFiles = exports.formatFilesWithOxfmt = exports.detectFormatterInTree = exports.detectFormatter = exports.prettierConfigFiles = exports.isUsingPrettierInTree = exports.createOverrides = exports.createCliOptions = exports.isCI = exports.applyDaemonEnvFromClient = exports.getAppliedDaemonClientEnv = exports.getDaemonClientEnvGeneration = void 0;
|
|
5
|
+
exports.getExecutorForTask = exports.getDependencyConfigs = exports.getCustomHasher = exports.getCliPath = exports.expandWildcardTargetConfiguration = exports.expandInitiatingTasksThroughNoop = exports.expandDependencyConfigSyntaxSugar = exports.createTaskId = exports.calculateReverseDeps = exports.createRunManyDynamicOutputRenderer = exports.CompositeLifeCycle = exports.RemoteCacheV2 = exports.Cache = exports.readCachedProjectConfiguration = exports.preventRecursionInGraphConstruction = exports.handleProjectGraphError = exports.createProjectGraphAndSourceMapsAsync = exports.buildProjectGraphAndSourceMapsWithoutDaemon = exports.isNpmProject = exports.readFileMapCache = exports.readPackageJson = exports.isWholeFileChange = exports.isLockFileChange = exports.isDeletedFileChange = exports.defaultFileRead = exports.calculateFileChanges = exports.WholeFileChange = exports.TEN_MEGABYTES = exports.LockFileChange = exports.DeletedFileChange = exports.buildPackageJsonWorkspacesMatcher = exports.buildPackageJsonPatterns = exports.getGlobPatternsFromPackageManagerWorkspaces = exports.registerTsConfigPaths = exports.getWorkspacePackagesFromGraph = exports.isBuiltinModuleImport = exports.TargetProjectLocator = exports.findProjectsNpmDependencies = exports.createPackageJson = exports.getLockFileName = exports.generatePrunedDeployOutput = exports.createLockFile = exports.createNxCloudOnboardingURL = exports.getNxCloudAppOnBoardingUrl = exports.createNxCloudOnboardingURLForWelcomeApp = exports.connectToNxCloud = exports.killChildOnHostExit = exports.readShebangHeaders = exports.killProcessTreeGraceful = exports.isAiAgent = void 0;
|
|
6
|
+
exports.setupWorkspaceContext = exports.resetWorkspaceContext = exports.globWithWorkspaceContext = exports.getFilesInDirectoryUsingContext = exports.nxVersion = exports.SyncError = exports.quoteShellArg = exports.getSourceDirOfDependentProjects = exports.findAllProjectNodeDependencies = exports.findInstalledPlugins = exports.deriveGroupNameFromTarget = exports.warnUnshippableLocalPathSpec = exports.relocatePrunedLocalPathSpec = exports.movePeerDependencyToDependencies = exports.dropEmptyPeerDependencySections = exports.readNxMigrateConfig = exports.isNxCloudUsed = exports.getNxCloudUrl = exports.orange = exports.NX_PREFIX = exports.getNxRequirePaths = exports.isGlobPattern = exports.combineGlobPatterns = exports.getLatestCommitSha = exports.readFileIfExisting = exports.isRelativePath = exports.fileExists = exports.directoryExists = exports.createDirectory = exports.deduceDefaultBase = exports.codeFrameColumns = exports.runNxSync = exports.workspaceDataDirectory = exports.getLastValueFromAsyncIterableIterator = exports.validateOutputs = exports.unparse = exports.transformLegacyOutputs = exports.shouldStreamOutput = exports.removeTasksFromTaskGraph = exports.readProjectAndTargetFromTargetString = exports.normalizeTargetDependencyWithStringProjects = exports.normalizeDependencyConfigProjects = exports.normalizeDependencyConfigDefinition = exports.isCacheableTask = exports.getUnparsedOverrideArgs = exports.getTargetConfigurationForTask = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getOutputs = exports.getExecutorNameForTask = void 0;
|
|
7
|
+
exports.resolveStartupHost = exports.safeSpawn = exports.safeExecFileSync = exports.workspaceRootInner = exports.setWorkspaceRoot = void 0;
|
|
7
8
|
const tslib_1 = require("tslib");
|
|
8
9
|
/**
|
|
9
10
|
* Note to developers: STOP! These are nx internals, not part of the public
|
|
@@ -39,6 +40,7 @@ Object.defineProperty(exports, "retrieveProjectConfigurationsWithAngularProjects
|
|
|
39
40
|
var target_merging_1 = require("./project-graph/utils/project-configuration/target-merging");
|
|
40
41
|
Object.defineProperty(exports, "mergeTargetConfigurations", { enumerable: true, get: function () { return target_merging_1.mergeTargetConfigurations; } });
|
|
41
42
|
Object.defineProperty(exports, "resolveCommandSyntacticSugar", { enumerable: true, get: function () { return target_merging_1.resolveCommandSyntacticSugar; } });
|
|
43
|
+
Object.defineProperty(exports, "resolveNxTokensInOptions", { enumerable: true, get: function () { return target_merging_1.resolveNxTokensInOptions; } });
|
|
42
44
|
var project_nodes_manager_1 = require("./project-graph/utils/project-configuration/project-nodes-manager");
|
|
43
45
|
Object.defineProperty(exports, "findMatchingTargetNames", { enumerable: true, get: function () { return project_nodes_manager_1.findMatchingTargetNames; } });
|
|
44
46
|
Object.defineProperty(exports, "readProjectConfigurationsFromRootMap", { enumerable: true, get: function () { return project_nodes_manager_1.readProjectConfigurationsFromRootMap; } });
|
|
@@ -154,6 +156,7 @@ Object.defineProperty(exports, "getCatalogManager", { enumerable: true, get: fun
|
|
|
154
156
|
Object.defineProperty(exports, "getCatalogDependenciesFromPackageJson", { enumerable: true, get: function () { return catalog_1.getCatalogDependenciesFromPackageJson; } });
|
|
155
157
|
var acknowledge_build_scripts_1 = require("./utils/acknowledge-build-scripts");
|
|
156
158
|
Object.defineProperty(exports, "acknowledgeBuildScripts", { enumerable: true, get: function () { return acknowledge_build_scripts_1.acknowledgeBuildScripts; } });
|
|
159
|
+
Object.defineProperty(exports, "acknowledgeDeclaredBuildScripts", { enumerable: true, get: function () { return acknowledge_build_scripts_1.acknowledgeDeclaredBuildScripts; } });
|
|
157
160
|
// Exposed for first-party plugins in this repo (imported via @nx/devkit/internal).
|
|
158
161
|
var run_commands_impl_1 = require("./executors/run-commands/run-commands.impl");
|
|
159
162
|
Object.defineProperty(exports, "runCommandsExecutor", { enumerable: true, get: function () { return tslib_1.__importDefault(run_commands_impl_1).default; } });
|
|
@@ -175,6 +178,8 @@ var client_1 = require("./daemon/client/client");
|
|
|
175
178
|
Object.defineProperty(exports, "daemonClient", { enumerable: true, get: function () { return client_1.daemonClient; } });
|
|
176
179
|
var run_commands_impl_2 = require("./executors/run-commands/run-commands.impl");
|
|
177
180
|
Object.defineProperty(exports, "LARGE_BUFFER", { enumerable: true, get: function () { return run_commands_impl_2.LARGE_BUFFER; } });
|
|
181
|
+
Object.defineProperty(exports, "interpolateArgsIntoCommand", { enumerable: true, get: function () { return run_commands_impl_2.interpolateArgsIntoCommand; } });
|
|
182
|
+
Object.defineProperty(exports, "normalizeRunCommandsArgs", { enumerable: true, get: function () { return run_commands_impl_2.normalizeArgs; } });
|
|
178
183
|
var tree_1 = require("./generators/tree");
|
|
179
184
|
Object.defineProperty(exports, "FsTree", { enumerable: true, get: function () { return tree_1.FsTree; } });
|
|
180
185
|
var project_configuration_1 = require("./generators/utils/project-configuration");
|
|
@@ -187,6 +192,7 @@ Object.defineProperty(exports, "getTargetInputs", { enumerable: true, get: funct
|
|
|
187
192
|
var native_1 = require("./native");
|
|
188
193
|
Object.defineProperty(exports, "isAiAgent", { enumerable: true, get: function () { return native_1.isAiAgent; } });
|
|
189
194
|
Object.defineProperty(exports, "killProcessTreeGraceful", { enumerable: true, get: function () { return native_1.killProcessTreeGraceful; } });
|
|
195
|
+
Object.defineProperty(exports, "readShebangHeaders", { enumerable: true, get: function () { return native_1.readShebangHeaders; } });
|
|
190
196
|
var kill_child_on_host_exit_1 = require("./utils/kill-child-on-host-exit");
|
|
191
197
|
Object.defineProperty(exports, "killChildOnHostExit", { enumerable: true, get: function () { return kill_child_on_host_exit_1.killChildOnHostExit; } });
|
|
192
198
|
var connect_to_nx_cloud_1 = require("./nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
|
|
@@ -251,6 +257,7 @@ Object.defineProperty(exports, "expandDependencyConfigSyntaxSugar", { enumerable
|
|
|
251
257
|
Object.defineProperty(exports, "expandInitiatingTasksThroughNoop", { enumerable: true, get: function () { return utils_2.expandInitiatingTasksThroughNoop; } });
|
|
252
258
|
Object.defineProperty(exports, "expandWildcardTargetConfiguration", { enumerable: true, get: function () { return utils_2.expandWildcardTargetConfiguration; } });
|
|
253
259
|
Object.defineProperty(exports, "getCliPath", { enumerable: true, get: function () { return utils_2.getCliPath; } });
|
|
260
|
+
// TODO(v25): remove custom hasher support.
|
|
254
261
|
Object.defineProperty(exports, "getCustomHasher", { enumerable: true, get: function () { return utils_2.getCustomHasher; } });
|
|
255
262
|
Object.defineProperty(exports, "getDependencyConfigs", { enumerable: true, get: function () { return utils_2.getDependencyConfigs; } });
|
|
256
263
|
Object.defineProperty(exports, "getExecutorForTask", { enumerable: true, get: function () { return utils_2.getExecutorForTask; } });
|
|
@@ -334,3 +341,5 @@ Object.defineProperty(exports, "workspaceRootInner", { enumerable: true, get: fu
|
|
|
334
341
|
var safe_spawn_1 = require("./utils/safe-spawn");
|
|
335
342
|
Object.defineProperty(exports, "safeExecFileSync", { enumerable: true, get: function () { return safe_spawn_1.safeExecFileSync; } });
|
|
336
343
|
Object.defineProperty(exports, "safeSpawn", { enumerable: true, get: function () { return safe_spawn_1.safeSpawn; } });
|
|
344
|
+
var startup_host_1 = require("./tasks-runner/readiness/startup-host");
|
|
345
|
+
Object.defineProperty(exports, "resolveStartupHost", { enumerable: true, get: function () { return startup_host_1.resolveStartupHost; } });
|
|
@@ -56,5 +56,7 @@ export default function (options: RunCommandsOptions, context: ExecutorContext):
|
|
|
56
56
|
success: boolean;
|
|
57
57
|
terminalOutput: string;
|
|
58
58
|
}>;
|
|
59
|
-
export declare function runCommands(options: RunCommandsOptions, context: ExecutorContext, task?: Pick<Task, 'id' | 'ultracache'
|
|
60
|
-
|
|
59
|
+
export declare function runCommands(options: RunCommandsOptions, context: ExecutorContext, task?: Pick<Task, 'id' | 'ultracache' | 'continuous'>, baseEnv?: NodeJS.ProcessEnv): Promise<NoopChildProcess | ParallelRunningTasks | import("../../tasks-runner/pseudo-terminal").PseudoTtyProcess | SeriallyRunningTasks>;
|
|
60
|
+
/** The options `interpolateArgsIntoCommand` reads, from the task's options. */
|
|
61
|
+
export declare function normalizeArgs(options: RunCommandsOptions): Pick<NormalizedRunCommandsOptions, 'args' | 'parsedArgs' | '__unparsed__' | 'unknownOptions' | 'unparsedCommandArgs'>;
|
|
62
|
+
export declare function interpolateArgsIntoCommand(command: string, opts: Pick<NormalizedRunCommandsOptions, 'args' | 'parsedArgs' | '__unparsed__' | 'unknownOptions' | 'unparsedCommandArgs'>, forwardAllArgs: boolean, env?: () => NodeJS.ProcessEnv): string;
|
|
@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.LARGE_BUFFER = void 0;
|
|
4
4
|
exports.default = default_1;
|
|
5
5
|
exports.runCommands = runCommands;
|
|
6
|
+
exports.normalizeArgs = normalizeArgs;
|
|
6
7
|
exports.interpolateArgsIntoCommand = interpolateArgsIntoCommand;
|
|
7
8
|
const tslib_1 = require("tslib");
|
|
8
9
|
const yargs_parser_1 = tslib_1.__importDefault(require("yargs-parser"));
|
|
9
10
|
const is_tui_enabled_1 = require("../../tasks-runner/is-tui-enabled");
|
|
10
11
|
const pseudo_terminal_1 = require("../../tasks-runner/pseudo-terminal");
|
|
12
|
+
const tokens_1 = require("../../tasks-runner/tokens");
|
|
11
13
|
const utils_1 = require("../../tasks-runner/utils");
|
|
12
14
|
const noop_child_process_1 = require("../../tasks-runner/running-tasks/noop-child-process");
|
|
13
15
|
const running_tasks_1 = require("./running-tasks");
|
|
@@ -40,8 +42,9 @@ async function default_1(options, context) {
|
|
|
40
42
|
success: results.code === 0,
|
|
41
43
|
};
|
|
42
44
|
}
|
|
43
|
-
async function runCommands(options, context, task) {
|
|
44
|
-
|
|
45
|
+
async function runCommands(options, context, task, baseEnv) {
|
|
46
|
+
let env;
|
|
47
|
+
const normalized = normalizeOptions(options, () => (env ??= (0, running_tasks_1.processEnv)(options.color, (0, running_tasks_1.calculateCwd)(options.cwd, context), options.env ?? {}, options.envFile, baseEnv)));
|
|
45
48
|
if (normalized.readyWhenStatus.length && !normalized.parallel) {
|
|
46
49
|
throw new Error('ERROR: Bad executor config for run-commands - "readyWhen" can only be used when "parallel=true".');
|
|
47
50
|
}
|
|
@@ -65,24 +68,30 @@ async function runCommands(options, context, task) {
|
|
|
65
68
|
// The orchestrator's in-process path passes the task with a stub context,
|
|
66
69
|
// so prefer it. `runExecutor` can name a target the task graph does not
|
|
67
70
|
// hold, hence the project lookup; `convert-nx-executor` has neither graph,
|
|
68
|
-
// and only then is the config unknowable, which counts as tracked
|
|
71
|
+
// and only then is the config unknowable, which counts as tracked and
|
|
72
|
+
// discrete.
|
|
69
73
|
const resolvedTaskId = task?.id ??
|
|
70
74
|
(0, utils_1.createTaskId)(context.projectName, context.targetName, context.configurationName);
|
|
75
|
+
// `projectGraph` is typed as present, but `convert-nx-executor` passes
|
|
76
|
+
// null for both graphs.
|
|
77
|
+
const targetConfiguration = context.projectName && context.targetName
|
|
78
|
+
? context.projectGraph?.nodes?.[context.projectName]?.data.targets?.[context.targetName]
|
|
79
|
+
: undefined;
|
|
71
80
|
const resolvedTask = task ??
|
|
72
81
|
context.taskGraph?.tasks?.[resolvedTaskId] ?? {
|
|
73
82
|
id: resolvedTaskId,
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
ultracache: context.projectName && context.targetName
|
|
77
|
-
? context.projectGraph?.nodes?.[context.projectName]?.data
|
|
78
|
-
.targets?.[context.targetName]?.ultracache
|
|
79
|
-
: undefined,
|
|
83
|
+
ultracache: targetConfiguration?.ultracache,
|
|
84
|
+
continuous: targetConfiguration?.continuous,
|
|
80
85
|
};
|
|
81
|
-
|
|
82
|
-
|
|
86
|
+
// The pseudo terminal runner ignores readyWhen, which keeps a continuous
|
|
87
|
+
// task running past the match. A discrete task must end there.
|
|
88
|
+
const usePtyRunner = isSingleCommandAndCanUsePseudoTerminal &&
|
|
89
|
+
(!normalized.readyWhenStatus.length || resolvedTask.continuous === true);
|
|
90
|
+
const runningTask = usePtyRunner
|
|
91
|
+
? await (0, running_tasks_1.runSingleCommandWithPseudoTerminal)(normalized, context, resolvedTask, baseEnv)
|
|
83
92
|
: options.parallel
|
|
84
|
-
? new running_tasks_1.ParallelRunningTasks(normalized, context, resolvedTask)
|
|
85
|
-
: new running_tasks_1.SeriallyRunningTasks(normalized, context, tuiEnabled, resolvedTask);
|
|
93
|
+
? new running_tasks_1.ParallelRunningTasks(normalized, context, resolvedTask, baseEnv)
|
|
94
|
+
: new running_tasks_1.SeriallyRunningTasks(normalized, context, tuiEnabled, resolvedTask, baseEnv);
|
|
86
95
|
return runningTask;
|
|
87
96
|
}
|
|
88
97
|
catch (e) {
|
|
@@ -92,7 +101,7 @@ async function runCommands(options, context, task) {
|
|
|
92
101
|
throw new Error(`ERROR: Something went wrong in run-commands - ${e.message}`);
|
|
93
102
|
}
|
|
94
103
|
}
|
|
95
|
-
function normalizeOptions(options) {
|
|
104
|
+
function normalizeOptions(options, env) {
|
|
96
105
|
if (options.readyWhen && typeof options.readyWhen === 'string') {
|
|
97
106
|
options.readyWhenStatus = [
|
|
98
107
|
{ stringToMatch: options.readyWhen, found: false },
|
|
@@ -118,9 +127,17 @@ function normalizeOptions(options) {
|
|
|
118
127
|
else {
|
|
119
128
|
options.commands = options.commands.map((c) => typeof c === 'string' ? { command: c } : c);
|
|
120
129
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
130
|
+
Object.assign(options, normalizeArgs(options));
|
|
131
|
+
options.commands.forEach((c) => {
|
|
132
|
+
c.command = interpolateArgsIntoCommand(c.command, options, c.forwardAllArgs ?? options.forwardAllArgs ?? true, env);
|
|
133
|
+
});
|
|
134
|
+
return options;
|
|
135
|
+
}
|
|
136
|
+
/** The options `interpolateArgsIntoCommand` reads, from the task's options. */
|
|
137
|
+
function normalizeArgs(options) {
|
|
138
|
+
const args = Array.isArray(options.args)
|
|
139
|
+
? options.args.join(' ')
|
|
140
|
+
: options.args;
|
|
124
141
|
const unparsedCommandArgs = (0, yargs_parser_1.default)(options.__unparsed__, {
|
|
125
142
|
configuration: {
|
|
126
143
|
'parse-numbers': false,
|
|
@@ -129,23 +146,32 @@ function normalizeOptions(options) {
|
|
|
129
146
|
'camel-case-expansion': false,
|
|
130
147
|
},
|
|
131
148
|
});
|
|
132
|
-
|
|
149
|
+
const unknownOptions = Object.keys(options)
|
|
133
150
|
.filter((p) => propKeys.indexOf(p) === -1 && unparsedCommandArgs[p] === undefined)
|
|
134
151
|
.reduce((m, c) => ((m[c] = options[c]), m), {});
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
152
|
+
return {
|
|
153
|
+
args,
|
|
154
|
+
__unparsed__: options.__unparsed__,
|
|
155
|
+
unknownOptions,
|
|
156
|
+
parsedArgs: parseArgs(unparsedCommandArgs, unknownOptions, args),
|
|
157
|
+
unparsedCommandArgs,
|
|
158
|
+
};
|
|
141
159
|
}
|
|
142
|
-
function interpolateArgsIntoCommand(command, opts, forwardAllArgs) {
|
|
160
|
+
function interpolateArgsIntoCommand(command, opts, forwardAllArgs, env = () => process.env) {
|
|
143
161
|
if (command.indexOf('{args.') > -1 && command.indexOf('{args}') > -1) {
|
|
144
162
|
throw new Error('Command should not contain both {args} and {args.*} values. Please choose one to use.');
|
|
145
163
|
}
|
|
146
164
|
if (command.indexOf('{args.') > -1) {
|
|
147
|
-
|
|
148
|
-
|
|
165
|
+
return (0, tokens_1.resolveTokens)(command, {
|
|
166
|
+
isToken: (name) => name === 'args',
|
|
167
|
+
// Overrides are parsed without dot-notation, so `{args.a.b}` reads the
|
|
168
|
+
// `--a.b` override
|
|
169
|
+
read: (_, path) => Object.hasOwn(opts.parsedArgs, path)
|
|
170
|
+
? opts.parsedArgs[path]
|
|
171
|
+
: undefined,
|
|
172
|
+
env: { read: env },
|
|
173
|
+
noValue: () => '',
|
|
174
|
+
});
|
|
149
175
|
}
|
|
150
176
|
else if (command.indexOf('{args}') > -1) {
|
|
151
177
|
const regex = /{args}/g;
|
|
@@ -13,7 +13,7 @@ export declare class ParallelRunningTasks implements RunningTask {
|
|
|
13
13
|
private exited;
|
|
14
14
|
private exitCode;
|
|
15
15
|
private exitTerminalOutput;
|
|
16
|
-
constructor(options: NormalizedRunCommandsOptions, context: ExecutorContext, task: Pick<Task, 'id' | 'ultracache'
|
|
16
|
+
constructor(options: NormalizedRunCommandsOptions, context: ExecutorContext, task: Pick<Task, 'id' | 'ultracache'>, baseEnv?: NodeJS.ProcessEnv);
|
|
17
17
|
getResults(): Promise<{
|
|
18
18
|
code: number;
|
|
19
19
|
terminalOutput: string;
|
|
@@ -29,6 +29,7 @@ export declare class ParallelRunningTasks implements RunningTask {
|
|
|
29
29
|
export declare class SeriallyRunningTasks implements RunningTask {
|
|
30
30
|
private readonly tuiEnabled;
|
|
31
31
|
private readonly task;
|
|
32
|
+
private readonly baseEnv?;
|
|
32
33
|
private terminalOutputChunks;
|
|
33
34
|
private currentProcess;
|
|
34
35
|
private exitCallbacks;
|
|
@@ -37,17 +38,25 @@ export declare class SeriallyRunningTasks implements RunningTask {
|
|
|
37
38
|
private outputCallbacks;
|
|
38
39
|
private exited;
|
|
39
40
|
private exitTerminalOutput;
|
|
40
|
-
constructor(options: NormalizedRunCommandsOptions, context: ExecutorContext, tuiEnabled: boolean, task: Pick<Task, 'id' | 'ultracache'
|
|
41
|
+
constructor(options: NormalizedRunCommandsOptions, context: ExecutorContext, tuiEnabled: boolean, task: Pick<Task, 'id' | 'ultracache'>, baseEnv?: NodeJS.ProcessEnv);
|
|
41
42
|
private emitExit;
|
|
42
43
|
getResults(): Promise<{
|
|
43
44
|
code: number;
|
|
44
45
|
terminalOutput: string;
|
|
45
46
|
}>;
|
|
46
47
|
onExit(cb: (code: number, terminalOutput: string) => void): void;
|
|
47
|
-
onOutput(cb: (terminalOutput: string) => void): void;
|
|
48
|
+
onOutput(cb: (terminalOutput: string, isCommandHeader?: boolean) => void): void;
|
|
48
49
|
send(message: Serializable): void;
|
|
49
50
|
kill(signal?: NodeJS.Signals): void | Promise<void>;
|
|
50
51
|
private run;
|
|
51
52
|
private createProcess;
|
|
52
53
|
}
|
|
53
|
-
export declare function runSingleCommandWithPseudoTerminal(normalized: NormalizedRunCommandsOptions, context: ExecutorContext, task: Pick<Task, 'id' | 'ultracache'
|
|
54
|
+
export declare function runSingleCommandWithPseudoTerminal(normalized: NormalizedRunCommandsOptions, context: ExecutorContext, task: Pick<Task, 'id' | 'ultracache'>, baseEnv?: NodeJS.ProcessEnv): Promise<PseudoTtyProcess>;
|
|
55
|
+
export declare function calculateCwd(cwd: string | undefined, context: ExecutorContext): string;
|
|
56
|
+
/**
|
|
57
|
+
* Env variables are processed in the following order:
|
|
58
|
+
* - env option from executor options
|
|
59
|
+
* - env file from envFile option if provided
|
|
60
|
+
* - local env variables, read from `baseEnv`
|
|
61
|
+
*/
|
|
62
|
+
export declare function processEnv(color: boolean, cwd: string, envOptionFromExecutor: Record<string, string>, envFile?: string, baseEnv?: NodeJS.ProcessEnv): Record<string, string>;
|