nx 21.6.1-beta.4 → 21.6.1

package/src/utils/package-json.js

@@ -61,7 +61,7 @@ function buildTargetFromScript(script, scripts = {}, packageManagerCommand) {
 }
 let packageManagerCommand;
 function getMetadataFromPackageJson(packageJson, isInPackageManagerWorkspaces) {
-    const { scripts, nx, description, name, exports, main } = packageJson;
+    const { scripts, nx, description, name, exports, main, version } = packageJson;
     const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
     return {
         targetGroups: {
@@ -70,6 +70,7 @@ function getMetadataFromPackageJson(packageJson, isInPackageManagerWorkspaces) {
         description,
         js: {
             packageName: name,
+            packageVersion: version,
             packageExports: exports,
             packageMain: main,
             isInPackageManagerWorkspaces,

package/src/utils/split-target.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"split-target.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/split-target.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,wBAAgB,WAAW,CACzB,CAAC,EAAE,MAAM,EACT,YAAY,EAAE,YAAY,GACzB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CAY5D;AAuBD,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAiBrB,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CACtC"}
+{"version":3,"file":"split-target.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/split-target.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAkCvD,wBAAgB,WAAW,CACzB,CAAC,EAAE,MAAM,EACT,YAAY,EAAE,YAAY,GACzB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CA4B5D;AAuBD,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAiBrB,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CACtC"}

package/src/utils/split-target.js

@@ -2,13 +2,53 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.splitTarget = splitTarget;
 exports.splitByColons = splitByColons;
+function findMatchingSegments(s, projectGraph) {
+    const projectNames = Object.keys(projectGraph.nodes);
+    // return project if matching
+    if (projectNames.includes(s)) {
+        return [s];
+    }
+    if (!s.includes(':')) {
+        return;
+    }
+    for (const projectName of projectNames) {
+        for (const [targetName, targetConfig] of Object.entries(projectGraph.nodes[projectName].data.targets || {})) {
+            if (s === `${projectName}:${targetName}`) {
+                return [projectName, targetName];
+            }
+            if (targetConfig.configurations) {
+                for (const configurationName of Object.keys(targetConfig.configurations)) {
+                    if (s === `${projectName}:${targetName}:${configurationName}`) {
+                        return [projectName, targetName, configurationName];
+                    }
+                }
+            }
+        }
+    }
+}
 function splitTarget(s, projectGraph) {
-    let [project, ...segments] = splitByColons(s);
-    const validTargets = projectGraph.nodes[project]
-        ? projectGraph.nodes[project].data.targets
-        : {};
-    const validTargetNames = new Set(Object.keys(validTargets ?? {}));
-    return [project, ...groupJointSegments(segments, validTargetNames)];
+    const matchingSegments = findMatchingSegments(s, projectGraph);
+    if (matchingSegments) {
+        return matchingSegments;
+    }
+    if (s.indexOf(':') > 0) {
+        let [project, ...segments] = splitByColons(s);
+        // if only configuration cannot be matched, try to match project and target
+        const configuration = segments[segments.length - 1];
+        const rest = s.slice(0, -(configuration.length + 1));
+        const matchingSegments = findMatchingSegments(rest, projectGraph);
+        if (matchingSegments && matchingSegments.length === 2) {
+            return [...matchingSegments, configuration];
+        }
+        // no project-target pair found, do the naive matching
+        const validTargets = projectGraph.nodes[project]
+            ? projectGraph.nodes[project].data.targets
+            : {};
+        const validTargetNames = new Set(Object.keys(validTargets ?? {}));
+        return [project, ...groupJointSegments(segments, validTargetNames)];
+    }
+    // we don't know what to do with the string, return as is
+    return [s];
 }
 function groupJointSegments(segments, validTargetNames) {
     for (let endingSegmentIdx = segments.length; endingSegmentIdx > 0; endingSegmentIdx--) {