@ohos-ports/nx 23.3.0-beta.3 → 24.0.2-beta.0

package/dist/src/command-line/migrate/run/util.js

@@ -1,5 +1,4 @@
 "use strict";
-// Internal to run/: deliberately not re-exported from ./index.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nowIso = nowIso;
 exports.depsHash = depsHash;
@@ -7,6 +6,7 @@ exports.installDepsChangedSinceDispense = installDepsChangedSinceDispense;
 exports.recordInstallLanded = recordInstallLanded;
 exports.isPidAlive = isPidAlive;
 exports.summarizeError = summarizeError;
+exports.commitFailureRecovery = commitFailureRecovery;
 exports.warnCommitFailed = warnCommitFailed;
 exports.pmExecPrefix = pmExecPrefix;
 exports.runMigrationsFlag = runMigrationsFlag;
@@ -15,6 +15,7 @@ const crypto_1 = require("crypto");
 const shell_quoting_1 = require("../../../utils/shell-quoting");
 const package_manager_1 = require("../../../utils/package-manager");
 const execute_migration_1 = require("../execute-migration");
+const run_state_1 = require("./run-state");
 const state_lock_1 = require("./state-lock");
 const agent_output_1 = require("./agent-output");
 const text_1 = require("../text");
@@ -51,8 +52,15 @@ function depsHash(root) {
  * dispense-time probe failed has no baseline, which says the dependencies it
  * started from are unknown rather than unchanged, and skipping there would
  * strand the change with nothing left to detect it.
+ *
+ * A failed or died step whose install already failed settles without it, so
+ * the settle cannot hang on that install again. A retry's rearm drops the mark.
  */
 async function installDepsChangedSinceDispense(root, dir, step, skipInstall, rerunCommand, sink) {
+    if (step.installFailed === true &&
+        (step.status === 'failed' || step.status === 'died')) {
+        return;
+    }
     const current = depsHash(root);
     if (current !== null && current === step.depsHashAtDispense)
         return;
@@ -123,13 +131,32 @@ function summarizeError(e) {
     const firstLine = message.split('\n')[0].trim();
     return firstLine.length > 200 ? `${firstLine.slice(0, 197)}...` : firstLine;
 }
+// A `--run-migration` run has no later migration step to absorb the diff.
+function commitFailureRecovery(state) {
+    const kind = (0, run_state_1.runKind)(state);
+    switch (kind) {
+        case 'single':
+            return 'manual';
+        case 'active':
+        case 'finished':
+            return 'later-step';
+        default: {
+            const unhandled = kind;
+            throw new Error(`Unhandled migrate run kind: ${unhandled}`);
+        }
+    }
+}
+const UNCOMMITTED_CHANGES_FATE = {
+    'later-step': ' for a later commit to absorb',
+    manual: '',
+};
 // The commit helper reports its own failures via the result status and logs
 // the details itself; `cause` is set only when the attempt threw instead
 // (the pre-commit dependency install), which nothing else has logged.
-function warnCommitFailed(name, cause) {
+function warnCommitFailed(name, recovery, cause) {
     const causeText = cause === undefined ? '' : ` (${summarizeError(cause)})`;
     (0, agent_output_1.warnToAgent)({
-        title: `The commit for ${name} could not be created${causeText}; its changes remain in the working tree for a later commit to absorb.`,
+        title: `The commit for ${name} could not be created${causeText}; its changes remain in the working tree${UNCOMMITTED_CHANGES_FATE[recovery]}.`,
     });
 }
 const cachedPmCommands = new Map();

package/dist/src/command-line/migrate/run/worker.d.ts

@@ -13,4 +13,4 @@ export interface RunSingleMigrationWorkerInput {
     skipInstall: boolean;
     isVerbose: boolean;
 }
-export declare function runSingleMigrationWorker(input: RunSingleMigrationWorkerInput): Promise<void>;
+export declare function runSingleMigrationWorker(input: RunSingleMigrationWorkerInput): Promise<number | undefined>;