nx 17.0.3 → 17.0.5

package/src/utils/params.js

@@ -13,6 +13,20 @@ async function handleErrors(isVerbose, fn) {
         if (err.constructor.name === 'UnsuccessfulWorkflowExecution') {
             logger_1.logger.error('The generator workflow failed. See above.');
         }
+        else if (err.name === 'ProjectGraphError') {
+            const projectGraphError = err;
+            let title = projectGraphError.message;
+            if (isVerbose) {
+                title += ' See errors below.';
+            }
+            const bodyLines = isVerbose
+                ? [projectGraphError.stack]
+                : ['Pass --verbose to see the stacktraces.'];
+            output_1.output.error({
+                title,
+                bodyLines: bodyLines,
+            });
+        }
         else {
             const lines = (err.message ? err.message : err.toString()).split('\n');
             const bodyLines = lines.slice(1);
@@ -188,20 +202,33 @@ function validateObject(opts, schema, definitions) {
             throw new SchemaError(`Required property '${p}' is missing`);
         }
     });
-    if (schema.additionalProperties === false) {
+    if (schema.additionalProperties !== undefined &&
+        schema.additionalProperties !== true) {
         Object.keys(opts).find((p) => {
-            if (Object.keys(schema.properties).indexOf(p) === -1) {
+            if (Object.keys(schema.properties ?? {}).indexOf(p) === -1 &&
+                (!schema.patternProperties ||
+                    !Object.keys(schema.patternProperties).some((pattern) => new RegExp(pattern).test(p)))) {
                 if (p === '_') {
                     throw new SchemaError(`Schema does not support positional arguments. Argument '${opts[p]}' found`);
                 }
-                else {
+                else if (schema.additionalProperties === false) {
                     throw new SchemaError(`'${p}' is not found in schema`);
                 }
+                else if (typeof schema.additionalProperties === 'object') {
+                    validateProperty(p, opts[p], schema.additionalProperties, definitions);
+                }
             }
         });
     }
     Object.keys(opts).forEach((p) => {
         validateProperty(p, opts[p], (schema.properties ?? {})[p], definitions);
+        if (schema.patternProperties) {
+            Object.keys(schema.patternProperties).forEach((pattern) => {
+                if (new RegExp(pattern).test(p)) {
+                    validateProperty(p, opts[p], schema.patternProperties[pattern], definitions);
+                }
+            });
+        }
     });
 }
 exports.validateObject = validateObject;
@@ -399,7 +426,7 @@ function resolveDefinition(ref, definitions) {
     return definitions[definition];
 }
 function applyVerbosity(options, schema, isVerbose) {
-    if ((schema.additionalProperties || 'verbose' in schema.properties) &&
+    if ((schema.additionalProperties === true || 'verbose' in schema.properties) &&
         isVerbose) {
         options['verbose'] = true;
     }
@@ -472,6 +499,12 @@ function convertSmartDefaultsIntoNamedParams(opts, schema, defaultProjectName, r
             relativeCwd) {
             opts[k] = relativeCwd.replace(/\\/g, '/');
         }
+        else if (opts[k] === undefined &&
+            v.$default !== undefined &&
+            v.$default.$source === 'workingDirectory' &&
+            relativeCwd) {
+            opts[k] = relativeCwd.replace(/\\/g, '/');
+        }
     });
     const leftOverPositionalArgs = [];
     for (let i = 0; i < argv.length; ++i) {

package/src/utils/plugins/core-plugins.js

@@ -53,6 +53,10 @@ function fetchCorePlugins() {
             name: '@nx/node',
             capabilities: 'executors,generators',
         },
+        {
+            name: '@nx/nuxt',
+            capabilities: 'generators',
+        },
         {
             name: 'nx',
             capabilities: 'executors',
@@ -69,6 +73,10 @@ function fetchCorePlugins() {
             name: '@nx/react-native',
             capabilities: 'executors,generators',
         },
+        {
+            name: '@nx/remix',
+            capabilities: 'executors,generators',
+        },
         {
             name: '@nx/rollup',
             capabilities: 'executors,generators',

package/src/utils/plugins/installed-plugins.d.ts

@@ -1,5 +1,6 @@
 import type { PluginCapabilities } from './models';
 import { PackageJson } from '../package-json';
+import { ProjectConfiguration } from '../../config/workspace-json-project-json';
 export declare function findInstalledPlugins(): PackageJson[];
-export declare function getInstalledPluginsAndCapabilities(workspaceRoot: string): Promise<Map<string, PluginCapabilities>>;
+export declare function getInstalledPluginsAndCapabilities(workspaceRoot: string, projects: Record<string, ProjectConfiguration>): Promise<Map<string, PluginCapabilities>>;
 export declare function listInstalledPlugins(installedPlugins: Map<string, PluginCapabilities>): void;

package/src/utils/plugins/installed-plugins.js

@@ -59,12 +59,12 @@ function getDependenciesFromNxJson() {
     }
     return ['nx', ...Object.keys(installation.plugins || {})];
 }
-async function getInstalledPluginsAndCapabilities(workspaceRoot) {
+async function getInstalledPluginsAndCapabilities(workspaceRoot, projects) {
     const plugins = findInstalledPlugins().map((p) => p.name);
     const result = new Map();
     for (const plugin of Array.from(plugins).sort()) {
         try {
-            const capabilities = await (0, plugin_capabilities_1.getPluginCapabilities)(workspaceRoot, plugin);
+            const capabilities = await (0, plugin_capabilities_1.getPluginCapabilities)(workspaceRoot, plugin, projects);
             if (capabilities &&
                 (capabilities.executors ||
                     capabilities.generators ||

package/src/utils/plugins/local-plugins.js

@@ -16,7 +16,7 @@ async function getLocalWorkspacePlugins(projectsConfiguration, nxJson) {
         if ((0, fs_1.existsSync)(packageJsonPath)) {
             const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
             const includeRuntimeCapabilities = nxJson?.plugins?.some((p) => (typeof p === 'string' ? p : p.plugin).startsWith(packageJson.name));
-            const capabilities = await (0, plugin_capabilities_1.getPluginCapabilities)(workspace_root_1.workspaceRoot, packageJson.name, includeRuntimeCapabilities);
+            const capabilities = await (0, plugin_capabilities_1.getPluginCapabilities)(workspace_root_1.workspaceRoot, packageJson.name, projectsConfiguration.projects, includeRuntimeCapabilities);
             if (capabilities &&
                 (Object.keys(capabilities.executors ?? {}).length ||
                     Object.keys(capabilities.generators ?? {}).length ||

package/src/utils/plugins/plugin-capabilities.d.ts

@@ -1,3 +1,4 @@
 import type { PluginCapabilities } from './models';
-export declare function getPluginCapabilities(workspaceRoot: string, pluginName: string, includeRuntimeCapabilities?: boolean): Promise<PluginCapabilities | null>;
-export declare function listPluginCapabilities(pluginName: string): Promise<void>;
+import { ProjectConfiguration } from '../../config/workspace-json-project-json';
+export declare function getPluginCapabilities(workspaceRoot: string, pluginName: string, projects: Record<string, ProjectConfiguration>, includeRuntimeCapabilities?: boolean): Promise<PluginCapabilities | null>;
+export declare function listPluginCapabilities(pluginName: string, projects: Record<string, ProjectConfiguration>): Promise<void>;

package/src/utils/plugins/plugin-capabilities.js

@@ -22,11 +22,11 @@ function tryGetCollection(packageJsonPath, collectionFile, propName) {
         return null;
     }
 }
-async function getPluginCapabilities(workspaceRoot, pluginName, includeRuntimeCapabilities = false) {
+async function getPluginCapabilities(workspaceRoot, pluginName, projects, includeRuntimeCapabilities = false) {
     try {
-        const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(pluginName, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot));
+        const { json: packageJson, path: packageJsonPath } = await (0, nx_plugin_1.readPluginPackageJson)(pluginName, projects, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot));
         const pluginModule = includeRuntimeCapabilities
-            ? await tryGetModule(packageJson, workspaceRoot)
+            ? await tryGetModule(packageJson, workspaceRoot, projects)
             : {};
         return {
             name: pluginName,
@@ -56,14 +56,14 @@ async function getPluginCapabilities(workspaceRoot, pluginName, includeRuntimeCa
     }
 }
 exports.getPluginCapabilities = getPluginCapabilities;
-async function tryGetModule(packageJson, workspaceRoot) {
+async function tryGetModule(packageJson, workspaceRoot, projects) {
     try {
         return (packageJson.generators ??
             packageJson.executors ??
             packageJson['nx-migrations'] ??
             packageJson['schematics'] ??
             packageJson['builders'])
-            ? (await (0, nx_plugin_1.loadNxPluginAsync)(packageJson.name, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), workspaceRoot)).plugin
+            ? (await (0, nx_plugin_1.loadNxPluginAsync)(packageJson.name, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), projects, workspaceRoot)).plugin
             : {
                 name: packageJson.name,
             };
@@ -72,8 +72,8 @@ async function tryGetModule(packageJson, workspaceRoot) {
         return null;
     }
 }
-async function listPluginCapabilities(pluginName) {
-    const plugin = await getPluginCapabilities(workspace_root_1.workspaceRoot, pluginName);
+async function listPluginCapabilities(pluginName, projects) {
+    const plugin = await getPluginCapabilities(workspace_root_1.workspaceRoot, pluginName, projects);
     if (!plugin) {
         const pmc = (0, package_manager_1.getPackageManagerCommand)();
         output_1.output.note({

package/src/utils/typescript.js

@@ -1,5 +1,5 @@
 "use strict";
-// TODO(v18): Nx Devkit 15 depends on this file. Remove this when we no longer support Nx Devkit 15
+// TODO(v19): Nx Devkit 15 depends on this file. Remove this when we no longer support Nx Devkit 15
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("../plugins/js/utils/typescript"), exports);

package/src/utils/update-nxw.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '../generators/tree';
+export declare function updateNxw(tree: Tree): void;

package/src/utils/update-nxw.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateNxw = void 0;
+const add_nx_scripts_1 = require("../command-line/init/implementation/dot-nx/add-nx-scripts");
+const path_1 = require("../utils/path");
+function updateNxw(tree) {
+    const wrapperPath = (0, path_1.normalizePath)((0, add_nx_scripts_1.nxWrapperPath)());
+    if (tree.exists(wrapperPath)) {
+        tree.write(wrapperPath, (0, add_nx_scripts_1.getNxWrapperContents)());
+    }
+}
+exports.updateNxw = updateNxw;

package/src/utils/workspace-configuration-check.js

@@ -6,7 +6,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const output_1 = require("./output");
 const fileutils_1 = require("../utils/fileutils");
-//TODO: vsavkin remove after Nx 18
+//TODO: vsavkin remove after Nx 19
 function workspaceConfigurationCheck() {
     if ((0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'workspace.json'))) {
         output_1.output.warn({

package/src/utils/workspace-context.d.ts

@@ -1,8 +1,10 @@
-import type { ConfigurationParserResult } from '../native';
+import type { NxWorkspaceFilesExternals } from '../native';
 export declare function setupWorkspaceContext(workspaceRoot: string): void;
-export declare function getNxWorkspaceFilesFromContext(workspaceRoot: string, globs: string[], parseConfigurations: (files: string[]) => ConfigurationParserResult): import("../native").NxWorkspaceFiles;
-export declare function globWithWorkspaceContext(workspaceRoot: string, globs: string[]): string[];
-export declare function getProjectConfigurationsFromContext(workspaceRoot: string, globs: string[], parseConfigurations: (files: string[]) => ConfigurationParserResult): ConfigurationParserResult;
+export declare function getNxWorkspaceFilesFromContext(workspaceRoot: string, projectRootMap: Record<string, string>): import("../native").NxWorkspaceFiles;
+export declare function globWithWorkspaceContext(workspaceRoot: string, globs: string[], exclude?: string[]): string[];
+export declare function hashWithWorkspaceContext(workspaceRoot: string, globs: string[], exclude?: string[]): string;
 export declare function updateFilesInContext(updatedFiles: string[], deletedFiles: string[]): Record<string, string>;
 export declare function getAllFileDataInContext(workspaceRoot: string): import("../native").FileData[];
+export declare function getFilesInDirectoryUsingContext(workspaceRoot: string, dir: string): string[];
+export declare function updateProjectFiles(projectRootMappings: Record<string, string>, rustReferences: NxWorkspaceFilesExternals, updatedFiles: Record<string, string>, deletedFiles: string[]): import("../native").UpdatedWorkspaceFiles;
 export declare function resetWorkspaceContext(): void;

package/src/utils/workspace-context.js

@@ -1,31 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resetWorkspaceContext = exports.getAllFileDataInContext = exports.updateFilesInContext = exports.getProjectConfigurationsFromContext = exports.globWithWorkspaceContext = exports.getNxWorkspaceFilesFromContext = exports.setupWorkspaceContext = void 0;
+exports.resetWorkspaceContext = exports.updateProjectFiles = exports.getFilesInDirectoryUsingContext = exports.getAllFileDataInContext = exports.updateFilesInContext = exports.hashWithWorkspaceContext = exports.globWithWorkspaceContext = exports.getNxWorkspaceFilesFromContext = exports.setupWorkspaceContext = void 0;
 const perf_hooks_1 = require("perf_hooks");
+const cache_directory_1 = require("./cache-directory");
 let workspaceContext;
 function setupWorkspaceContext(workspaceRoot) {
     const { WorkspaceContext } = require('../native');
     perf_hooks_1.performance.mark('workspace-context');
-    workspaceContext = new WorkspaceContext(workspaceRoot);
+    workspaceContext = new WorkspaceContext(workspaceRoot, (0, cache_directory_1.cacheDirectoryForWorkspace)(workspaceRoot));
     perf_hooks_1.performance.mark('workspace-context:end');
     perf_hooks_1.performance.measure('workspace context init', 'workspace-context', 'workspace-context:end');
 }
 exports.setupWorkspaceContext = setupWorkspaceContext;
-function getNxWorkspaceFilesFromContext(workspaceRoot, globs, parseConfigurations) {
+function getNxWorkspaceFilesFromContext(workspaceRoot, projectRootMap) {
     ensureContextAvailable(workspaceRoot);
-    return workspaceContext.getWorkspaceFiles(globs, parseConfigurations);
+    return workspaceContext.getWorkspaceFiles(projectRootMap);
 }
 exports.getNxWorkspaceFilesFromContext = getNxWorkspaceFilesFromContext;
-function globWithWorkspaceContext(workspaceRoot, globs) {
+function globWithWorkspaceContext(workspaceRoot, globs, exclude) {
     ensureContextAvailable(workspaceRoot);
-    return workspaceContext.glob(globs);
+    return workspaceContext.glob(globs, exclude);
 }
 exports.globWithWorkspaceContext = globWithWorkspaceContext;
-function getProjectConfigurationsFromContext(workspaceRoot, globs, parseConfigurations) {
+function hashWithWorkspaceContext(workspaceRoot, globs, exclude) {
     ensureContextAvailable(workspaceRoot);
-    return workspaceContext.getProjectConfigurations(globs, parseConfigurations);
+    return workspaceContext.hashFilesMatchingGlob(globs, exclude);
 }
-exports.getProjectConfigurationsFromContext = getProjectConfigurationsFromContext;
+exports.hashWithWorkspaceContext = hashWithWorkspaceContext;
 function updateFilesInContext(updatedFiles, deletedFiles) {
     return workspaceContext?.incrementalUpdate(updatedFiles, deletedFiles);
 }
@@ -35,6 +36,15 @@ function getAllFileDataInContext(workspaceRoot) {
     return workspaceContext.allFileData();
 }
 exports.getAllFileDataInContext = getAllFileDataInContext;
+function getFilesInDirectoryUsingContext(workspaceRoot, dir) {
+    ensureContextAvailable(workspaceRoot);
+    return workspaceContext.getFilesInDirectory(dir);
+}
+exports.getFilesInDirectoryUsingContext = getFilesInDirectoryUsingContext;
+function updateProjectFiles(projectRootMappings, rustReferences, updatedFiles, deletedFiles) {
+    return workspaceContext?.updateProjectFiles(projectRootMappings, rustReferences.projectFiles, rustReferences.globalFiles, updatedFiles, deletedFiles);
+}
+exports.updateProjectFiles = updateProjectFiles;
 function ensureContextAvailable(workspaceRoot) {
     if (!workspaceContext || workspaceContext?.workspaceRoot !== workspaceRoot) {
         setupWorkspaceContext(workspaceRoot);