nx 23.2.0-beta.1 → 23.2.0-beta.2

package/dist/src/command-line/show/show-target/utils.js

@@ -6,6 +6,10 @@ exports.normalizePath = normalizePath;
 exports.deduplicateFolderEntries = deduplicateFolderEntries;
 exports.pc = pc;
 exports.printList = printList;
+exports.printJson = printJson;
+exports.pathsUnder = pathsUnder;
+exports.renderCheckResults = renderCheckResults;
+exports.setCheckExitCode = setCheckExitCode;
 const path_1 = require("path");
 const calculate_default_project_name_1 = require("../../../config/calculate-default-project-name");
 const configuration_1 = require("../../../config/configuration");
@@ -29,18 +33,22 @@ async function resolveTarget(args, opts) {
     }
     const nxJson = (0, configuration_1.readNxJson)();
     const { projectName, targetName, configurationName } = resolveTargetIdentifier(args, graph, nxJson);
+    // `resolveProjectNode` accepts a pattern specifier (`my-*`), so the concrete
+    // name it resolved to is the one everything downstream has to use — it is a
+    // lookup key for the task id, not just a label.
     const node = resolveProjectNode(projectName, graph);
+    const resolvedProjectName = node.name;
     if (!node.data.targets?.[targetName]) {
-        reportTargetNotFound(projectName, targetName, node);
+        reportTargetNotFound(resolvedProjectName, targetName, node);
     }
     const configuration = configurationName ?? args.configuration;
     if (configuration) {
-        validateConfiguration(projectName, targetName, configuration, node.data.targets[targetName]);
+        validateConfiguration(resolvedProjectName, targetName, configuration, node.data.targets[targetName]);
     }
     return {
         graph,
         nxJson,
-        projectName,
+        projectName: resolvedProjectName,
         targetName,
         configuration,
         node,
@@ -183,3 +191,75 @@ function printList(header, items, prefix = '\n') {
     for (const item of items)
         console.log(`  ${item}`);
 }
+function printJson(data) {
+    const result = {};
+    for (const [key, value] of Object.entries(data)) {
+        if (Array.isArray(value) && value.length === 0)
+            continue;
+        result[key] = value;
+    }
+    console.log(JSON.stringify(result, null, 2));
+}
+/** The paths that live under `dir`. An empty `dir` is the workspace root. */
+function pathsUnder(dir, paths) {
+    if (dir === '')
+        return [...paths];
+    const prefix = dir.endsWith('/') ? dir : dir + '/';
+    return paths.filter((p) => p.startsWith(prefix));
+}
+const NOUNS = {
+    input: { preposition: 'for', contained: 'input file' },
+    output: { preposition: 'of', contained: 'output path' },
+};
+function renderCheckResults(results, project, target, noun) {
+    if (results.length >= 2) {
+        renderBatchCheckResults(results, project, target, noun);
+        return;
+    }
+    for (const result of results) {
+        renderCheckResult(result, project, target, noun);
+    }
+}
+function setCheckExitCode(results) {
+    for (const result of results) {
+        process.exitCode ||= result.matched || result.contained.length ? 0 : 1;
+    }
+}
+function renderCheckResult(result, project, target, noun) {
+    const c = pc();
+    const { preposition, contained } = NOUNS[noun];
+    const label = `${c.cyan(project)}:${c.green(target)}`;
+    if (result.matched) {
+        const category = result.category ? ` (${result.category})` : '';
+        console.log(`${c.green('✓')} ${c.bold(result.value)} is an ${noun} ${preposition} ${label}${category}`);
+    }
+    else if (result.contained.length > 0) {
+        console.log(`${c.yellow('~')} ${c.bold(result.file)} is a directory containing ${c.bold(String(result.contained.length))} ${contained}(s) ${preposition} ${label}`);
+        for (const item of [...result.contained].sort())
+            console.log(`  ${item}`);
+    }
+    else {
+        console.log(`${c.red('✗')} ${c.bold(result.value)} is ${c.red('not')} an ${noun} ${preposition} ${label}`);
+    }
+}
+function renderBatchCheckResults(results, project, target, noun) {
+    const c = pc();
+    const { preposition, contained } = NOUNS[noun];
+    const label = `${c.cyan(project)}:${c.green(target)}`;
+    const matched = results.filter((r) => r.matched);
+    const directories = results.filter((r) => !r.matched && r.contained.length);
+    const unmatched = results.filter((r) => !r.matched && !r.contained.length);
+    if (matched.length > 0 || directories.length > 0) {
+        console.log(`\n${c.green('✓')} These arguments were ${noun}s ${preposition} ${label}:`);
+        for (const r of matched)
+            console.log(`  ${r.value}`);
+        for (const r of directories) {
+            console.log(`  ${r.file} (directory containing ${r.contained.length} ${contained}s)`);
+        }
+    }
+    if (unmatched.length > 0) {
+        console.log(`\n${c.red('✗')} These arguments were ${c.red('not')} ${noun}s ${preposition} ${label}:`);
+        for (const r of unmatched)
+            console.log(`  ${r.value}`);
+    }
+}

package/dist/src/command-line/yargs-utils/shared-options.d.ts

@@ -1,4 +1,4 @@
-import { Argv, ParserConfigurationOptions } from 'yargs';
+import type { Argv, ParserConfigurationOptions } from 'yargs';
 interface ExcludeOptions {
     exclude: string[];
 }