@nx/js 19.4.2 → 19.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.4.2",
+  "version": "19.4.3",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -58,9 +58,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.4.2",
-    "@nx/workspace": "19.4.2",
-    "@nrwl/js": "19.4.2"
+    "@nx/devkit": "19.4.3",
+    "@nx/workspace": "19.4.3",
+    "@nrwl/js": "19.4.3"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/plugins/typescript/plugin.d.ts

@@ -1,4 +1,4 @@
-import { type CreateDependencies, type CreateNodes } from '@nx/devkit';
+import { type CreateDependencies, type CreateNodes, type CreateNodesV2 } from '@nx/devkit';
 export interface TscPluginOptions {
     typecheck?: boolean | {
         targetName?: string;
@@ -8,6 +8,10 @@ export interface TscPluginOptions {
         configName?: string;
     };
 }
+/**
+ * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
+ */
 export declare const createDependencies: CreateDependencies;
 export declare const PLUGIN_NAME = "@nx/js/typescript";
+export declare const createNodesV2: CreateNodesV2<TscPluginOptions>;
 export declare const createNodes: CreateNodes<TscPluginOptions>;

package/src/plugins/typescript/plugin.js

@@ -1,65 +1,83 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.PLUGIN_NAME = exports.createDependencies = void 0;
+exports.createNodes = exports.createNodesV2 = exports.PLUGIN_NAME = exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
+const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const minimatch_1 = require("minimatch");
+const file_hasher_1 = require("nx/src/hasher/file-hasher");
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const ts_config_1 = require("../../utils/typescript/ts-config");
-const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, 'tsc.hash');
-const targetsCache = readTargetsCache();
-function readTargetsCache() {
+function readTargetsCache(cachePath) {
     return (0, node_fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
-function writeTargetsToCache() {
-    const oldCache = readTargetsCache();
-    (0, devkit_1.writeJsonFile)(cachePath, {
-        ...oldCache,
-        ...targetsCache,
-    });
+function writeTargetsToCache(cachePath, results) {
+    (0, devkit_1.writeJsonFile)(cachePath, results);
 }
+/**
+ * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
+ */
 const createDependencies = () => {
-    writeTargetsToCache();
     return [];
 };
 exports.createDependencies = createDependencies;
 exports.PLUGIN_NAME = '@nx/js/typescript';
-exports.createNodes = [
-    '**/tsconfig*.json',
-    async (configFilePath, options, context) => {
-        const pluginOptions = normalizePluginOptions(options);
-        const projectRoot = (0, node_path_1.dirname)(configFilePath);
-        const fullConfigPath = (0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath);
-        // Do not create a project if package.json and project.json isn't there.
-        const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot));
-        if (!siblingFiles.includes('package.json') &&
-            !siblingFiles.includes('project.json')) {
-            return {};
+const tsConfigGlob = '**/tsconfig*.json';
+exports.createNodesV2 = [
+    tsConfigGlob,
+    async (configFilePaths, options, context) => {
+        const optionsHash = (0, file_hasher_1.hashObject)(options);
+        const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `tsc-${optionsHash}.hash`);
+        const targetsCache = readTargetsCache(cachePath);
+        const normalizedOptions = normalizePluginOptions(options);
+        try {
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache), configFilePaths, normalizedOptions, context);
         }
-        // Do not create a project if it's not a tsconfig.json and there is no tsconfig.json in the same directory
-        if ((0, node_path_1.basename)(configFilePath) !== 'tsconfig.json' &&
-            !siblingFiles.includes('tsconfig.json')) {
-            return {};
+        finally {
+            writeTargetsToCache(cachePath, targetsCache);
         }
-        const nodeHash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, pluginOptions, context, [(0, lock_file_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-        // The hash is calculated at the node/project level, so we add the config file path to avoid conflicts when caching
-        const cacheKey = `${nodeHash}_${configFilePath}`;
-        targetsCache[cacheKey] ??= buildTscTargets(fullConfigPath, projectRoot, pluginOptions, context);
-        return {
-            projects: {
-                [projectRoot]: {
-                    projectType: 'library',
-                    targets: targetsCache[cacheKey],
-                },
-            },
-        };
     },
 ];
+exports.createNodes = [
+    tsConfigGlob,
+    async (configFilePath, options, context) => {
+        devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
+        const normalizedOptions = normalizePluginOptions(options);
+        return createNodesInternal(configFilePath, normalizedOptions, context, {});
+    },
+];
+async function createNodesInternal(configFilePath, options, context, targetsCache) {
+    const projectRoot = (0, node_path_1.dirname)(configFilePath);
+    const fullConfigPath = (0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath);
+    // Do not create a project if package.json and project.json isn't there.
+    const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot));
+    if (!siblingFiles.includes('package.json') &&
+        !siblingFiles.includes('project.json')) {
+        return {};
+    }
+    // Do not create a project if it's not a tsconfig.json and there is no tsconfig.json in the same directory
+    if ((0, node_path_1.basename)(configFilePath) !== 'tsconfig.json' &&
+        !siblingFiles.includes('tsconfig.json')) {
+        return {};
+    }
+    const nodeHash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, lock_file_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
+    // The hash is calculated at the node/project level, so we add the config file path to avoid conflicts when caching
+    const cacheKey = `${nodeHash}_${configFilePath}`;
+    targetsCache[cacheKey] ??= buildTscTargets(fullConfigPath, projectRoot, options, context);
+    const { targets } = targetsCache[cacheKey];
+    return {
+        projects: {
+            [projectRoot]: {
+                projectType: 'library',
+                targets,
+            },
+        },
+    };
+}
 function buildTscTargets(configFilePath, projectRoot, options, context) {
     const targets = {};
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
@@ -105,7 +123,7 @@ function buildTscTargets(configFilePath, projectRoot, options, context) {
             outputs: getOutputs(configFilePath, tsConfig, internalProjectReferences, context.workspaceRoot, projectRoot),
         };
     }
-    return targets;
+    return { targets };
 }
 function getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferences, workspaceRoot, projectRoot) {
     const configFiles = new Set();

package/typescript.d.ts

@@ -1 +1 @@
-export { createDependencies, createNodes, } from './src/plugins/typescript/plugin';
+export { createDependencies, createNodes, createNodesV2, } from './src/plugins/typescript/plugin';

package/typescript.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.createDependencies = void 0;
+exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
 var plugin_1 = require("./src/plugins/typescript/plugin");
 Object.defineProperty(exports, "createDependencies", { enumerable: true, get: function () { return plugin_1.createDependencies; } });
 Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });
+Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return plugin_1.createNodesV2; } });