@nx/js 22.7.0-beta.12 → 22.7.0-beta.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.7.0-beta.12",
+  "version": "22.7.0-beta.14",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -40,8 +40,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "22.7.0-beta.12",
-    "@nx/workspace": "22.7.0-beta.12",
+    "@nx/devkit": "22.7.0-beta.14",
+    "@nx/workspace": "22.7.0-beta.14",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -61,7 +61,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.12"
+    "nx": "22.7.0-beta.14"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/executors/release-publish/release-publish.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"release-publish.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/release-publish/release-publish.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAEhB,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAiBjD,wBAA8B,WAAW,CACvC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe;;GAkdzB"}
+{"version":3,"file":"release-publish.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/release-publish/release-publish.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAEhB,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAiBjD,wBAA8B,WAAW,CACvC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe;;GA6dzB"}

package/src/executors/release-publish/release-publish.impl.js

@@ -349,7 +349,19 @@ Please update the local dependency on "${depName}" to be a valid semantic versio
                     success: false,
                 };
             }
-            const stdoutData = JSON.parse(err.stdout?.toString() || '{}');
+            // stdout is not guaranteed to be JSON (e.g. lifecycle script failures).
+            // If parsing fails, print raw stderr/stdout so the underlying error is visible to the user.
+            let stdoutData;
+            try {
+                stdoutData = JSON.parse(err.stdout?.toString() || '{}');
+            }
+            catch {
+                console.error(err.stderr?.toString() || '');
+                console.error(err.stdout?.toString() || '');
+                return {
+                    success: false,
+                };
+            }
             console.error(`${pm} publish error:`);
             // npm returns error.summary and error.detail
             if (stdoutData.error?.summary) {

package/src/generators/init/files/non-ts-solution/__fileName__

@@ -13,7 +13,6 @@
     "lib": ["es2020", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
-    "baseUrl": ".",
     "paths": {}
   },
   "exclude": ["node_modules", "tmp"]

package/src/generators/library/files/tsconfig-lib/ts-solution/tsconfig.lib.json__tmpl__

@@ -1,7 +1,6 @@
 {
   "extends": "<%= offsetFromRoot %>tsconfig.base.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "rootDir": "src",
     "outDir": "dist",
     "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",

package/src/utils/buildable-libs-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildable-libs-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/buildable-libs-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACvB,SAAS,EACV,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAgBtC,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,uBAAuB,GAAG,wBAAwB,CAAC;CAC1D,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CAqBA;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA+EA;AAgED,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA8EA;AAkGD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,GAAG,EAAE,CAAC,iBAAiB,EACvC,YAAY,EAAE,6BAA6B,EAAE,wBAK9C;AAED,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,qBAAqB,GAAE,OAAe,UA2BvC;AAUD,wBAAgB,WAAW,CACzB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,QAoDhC;AAED;;;GAGG;AACH,wBAAgB,6CAA6C,CAC3D,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,IAAI,EAAE,uBAAuB,EAC7B,YAAY,EAAE,6BAA6B,EAAE,EAC7C,gBAAgB,GAAE,cAAc,GAAG,kBAAmC,QAkFvE"}
+{"version":3,"file":"buildable-libs-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/buildable-libs-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACvB,SAAS,EACV,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAgBtC,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,uBAAuB,GAAG,wBAAwB,CAAC;CAC1D,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CAqBA;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA+EA;AA0ED,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA8EA;AAkGD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,GAAG,EAAE,CAAC,iBAAiB,EACvC,YAAY,EAAE,6BAA6B,EAAE,wBAK9C;AAED,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,qBAAqB,GAAE,OAAe,UAsBvC;AAUD,wBAAgB,WAAW,CACzB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,QA6DhC;AAED;;;GAGG;AACH,wBAAgB,6CAA6C,CAC3D,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,IAAI,EAAE,uBAAuB,EAC7B,YAAY,EAAE,6BAA6B,EAAE,EAC7C,gBAAgB,GAAE,cAAc,GAAG,kBAAmC,QAkFvE"}

package/src/utils/buildable-libs-utils.js

@@ -114,7 +114,20 @@ function readTsConfigWithRemappedPaths(originalTsconfigPath, generatedTsconfigPa
     const normalizedTsConfig = (0, path_1.resolve)(workspaceRoot, originalTsconfigPath);
     const normalizedGeneratedTsConfigDir = (0, path_1.resolve)(workspaceRoot, (0, path_1.dirname)(generatedTsconfigPath));
     generatedTsConfig.extends = (0, path_1.relative)(normalizedGeneratedTsConfigDir, normalizedTsConfig);
-    generatedTsConfig.compilerOptions.paths = computeCompilerOptionsPaths(normalizedTsConfig, dependencies);
+    const paths = computeCompilerOptionsPaths(normalizedTsConfig, dependencies);
+    // Resolve paths to absolute so they work regardless of the tmp tsconfig
+    // location and without needing baseUrl (deprecated in TS 6, removed in TS 7).
+    const pathsBase = (0, ts_config_1.resolvePathsBaseUrl)(normalizedTsConfig);
+    for (const key of Object.keys(paths)) {
+        paths[key] = paths[key].map((p) => {
+            if ((0, path_1.isAbsolute)(p)) {
+                return p;
+            }
+            const stripped = p.startsWith('./') ? p.slice(2) : p;
+            return (0, path_1.resolve)(pathsBase, stripped).replace(/\\/g, '/');
+        });
+    }
+    generatedTsConfig.compilerOptions.paths = paths;
     if (process.env.NX_VERBOSE_LOGGING_PATH_MAPPINGS === 'true') {
         output_1.output.log({
             title: 'TypeScript path mappings have been rewritten.',
@@ -235,10 +248,6 @@ function createTmpTsConfig(tsconfigPath, workspaceRoot, projectRoot, dependencie
     }
     const parsedTSConfig = readTsConfigWithRemappedPaths(tsconfigPath, tmpTsConfigPath, dependencies, workspaceRoot);
     process.on('exit', () => cleanupTmpTsConfigFile(tmpTsConfigPath));
-    if (useWorkspaceAsBaseUrl) {
-        parsedTSConfig.compilerOptions ??= {};
-        parsedTSConfig.compilerOptions.baseUrl = workspaceRoot;
-    }
     (0, devkit_1.writeJsonFile)(tmpTsConfigPath, parsedTSConfig);
     return (0, path_1.join)(tmpTsConfigPath);
 }
@@ -285,6 +294,12 @@ function updatePaths(dependencies, paths) {
             }
         }
     });
+    // Ensure all path values use ./ prefix for TS 6+ compatibility (no baseUrl)
+    for (const key of Object.keys(paths)) {
+        paths[key] = paths[key].map((p) => p.startsWith('./') || p.startsWith('../') || p.startsWith('/')
+            ? p
+            : `./${p}`);
+    }
 }
 /**
  * Updates the peerDependencies section in the `dist/lib/xyz/package.json` with

package/src/utils/find-npm-dependencies.js

@@ -151,9 +151,9 @@ function collectHelperDependencies(workspaceRoot, sourceProject, projectGraph, b
     // For inferred targets or manually added run-commands, check if user is using `tsc` in build target.
     if (target.executor === 'nx:run-commands' &&
         /\b(tsc|tsgo)\b/.test(target.options.command)) {
-        const tsConfigFileName = (0, ts_config_1.getRootTsConfigFileName)();
-        if (tsConfigFileName) {
-            const tsConfig = (0, ts_config_1.readTsConfig)((0, path_1.join)(workspaceRoot, tsConfigFileName));
+        const tsConfigPath = resolveTsConfigForRunCommandsTarget(workspaceRoot, sourceProject, target.options);
+        if (tsConfigPath) {
+            const tsConfig = (0, ts_config_1.readTsConfig)(tsConfigPath);
             if (tsConfig?.options['importHelpers'] &&
                 projectGraph.externalNodes['npm:tslib']?.type === 'npm') {
                 npmDeps['tslib'] = projectGraph.externalNodes['npm:tslib'].data.version;
@@ -161,3 +161,24 @@ function collectHelperDependencies(workspaceRoot, sourceProject, projectGraph, b
         }
     }
 }
+function resolveTsConfigForRunCommandsTarget(workspaceRoot, sourceProject, targetOptions) {
+    const commandTsConfig = extractTsConfigFromCommand(targetOptions.command);
+    if (commandTsConfig) {
+        const cwd = targetOptions.cwd ?? sourceProject.data.root;
+        const cwdAbsolute = (0, path_1.isAbsolute)(cwd) ? cwd : (0, path_1.join)(workspaceRoot, cwd);
+        const resolved = (0, path_1.isAbsolute)(commandTsConfig)
+            ? commandTsConfig
+            : (0, path_1.join)(cwdAbsolute, commandTsConfig);
+        if ((0, fileutils_1.fileExists)(resolved))
+            return resolved;
+    }
+    // Preserves prior behavior when the tsconfig can't be determined from the command.
+    return (0, ts_config_1.getRootTsConfigPath)();
+}
+// Matches the `<compiler> --build <configName>` shape emitted by the
+// `@nx/js/typescript` plugin. Other shapes fall through to the workspace root
+// tsconfig in the caller.
+function extractTsConfigFromCommand(command) {
+    const match = command.match(/(?:^|\s)--build\s+([^\s-]\S*)/);
+    return match ? match[1] : null;
+}

package/src/utils/typescript/create-ts-config.d.ts

@@ -12,7 +12,6 @@ export declare const tsConfigBaseOptions: {
     lib: string[];
     skipLibCheck: boolean;
     skipDefaultLibCheck: boolean;
-    baseUrl: string;
     paths: {};
 };
 export declare function extractTsConfigBase(host: Tree): void;

package/src/utils/typescript/create-ts-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-ts-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/create-ts-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAG9C,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;CAe/B,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,QAmC7C"}
+{"version":3,"file":"create-ts-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/create-ts-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAG9C,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;CAc/B,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,QA+B7C"}

package/src/utils/typescript/create-ts-config.js

@@ -16,7 +16,6 @@ exports.tsConfigBaseOptions = {
     lib: ['es2020', 'dom'],
     skipLibCheck: true,
     skipDefaultLibCheck: true,
-    baseUrl: '.',
     paths: {},
 };
 function extractTsConfigBase(host) {
@@ -31,10 +30,6 @@ function extractTsConfigBase(host) {
             delete tsconfig.compilerOptions[compilerOption];
         }
     }
-    // If we don't set baseDir then builds will fail when more than one projects exist.
-    if (typeof baseCompilerOptions.baseUrl === 'undefined') {
-        baseCompilerOptions.baseUrl = '.';
-    }
     (0, json_1.writeJson)(host, 'tsconfig.base.json', {
         compileOnSave: false,
         compilerOptions: baseCompilerOptions,

package/src/utils/typescript/ts-config.d.ts

@@ -7,5 +7,19 @@ export declare function getRelativePathToRootTsConfig(tree: Tree, targetPath: st
 export declare function getRootTsConfigPath(): string | null;
 export declare function getRootTsConfigFileName(tree?: Tree): string | null;
 export declare function addTsConfigPath(tree: Tree, importPath: string, lookupPaths: string[]): void;
+/**
+ * When `baseUrl` is not set and `paths` are inherited via `extends`,
+ * tools like `tsconfig-paths` resolve from the loaded file's directory
+ * instead of the file where `paths` is defined. This walks the `extends`
+ * chain to find the correct resolution base.
+ *
+ * Returns the directory that `paths` values should be resolved relative to.
+ * Walks the tsconfig `extends` chain to find where `paths` is defined, then
+ * looks for the applicable `baseUrl` from that point toward the root of the
+ * chain (ignoring child overrides that don't apply to the paths-defining
+ * tsconfig). When no `baseUrl` applies, returns the directory of the
+ * tsconfig that defines `paths`.
+ */
+export declare function resolvePathsBaseUrl(tsconfigPath: string): string;
 export declare function readTsConfigPaths(tsConfig?: string | ts.ParsedCommandLine): ts.MapLike<string[]>;
 //# sourceMappingURL=ts-config.d.ts.map

package/src/utils/typescript/ts-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ts-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,IAAI,EAA6B,MAAM,YAAY,CAAC;AAG7E,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAKtC,wBAAgB,YAAY,CAC1B,YAAY,EAAE,MAAM,EACpB,GAAG,CAAC,EAAE,EAAE,CAAC,MAAM,GACd,EAAE,CAAC,iBAAiB,CAatB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,GACnB,EAAE,CAAC,iBAAiB,CAWtB;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAQnE;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,GACjB,MAAM,CAER;AAED,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAInD;AAED,wBAAgB,uBAAuB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAYlE;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EAAE,QAiBtB;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC,iBAAiB,wBA8BzE"}
+{"version":3,"file":"ts-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,IAAI,EAA6B,MAAM,YAAY,CAAC;AAG7E,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAKtC,wBAAgB,YAAY,CAC1B,YAAY,EAAE,MAAM,EACpB,GAAG,CAAC,EAAE,EAAE,CAAC,MAAM,GACd,EAAE,CAAC,iBAAiB,CAatB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,GACnB,EAAE,CAAC,iBAAiB,CAWtB;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAQnE;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,GACjB,MAAM,CAER;AAED,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAInD;AAED,wBAAgB,uBAAuB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAYlE;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EAAE,QAiBtB;AASD;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAmDhE;AAgCD,wBAAgB,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC,iBAAiB,wBA+BzE"}

package/src/utils/typescript/ts-config.js

@@ -7,6 +7,7 @@ exports.getRelativePathToRootTsConfig = getRelativePathToRootTsConfig;
 exports.getRootTsConfigPath = getRootTsConfigPath;
 exports.getRootTsConfigFileName = getRootTsConfigFileName;
 exports.addTsConfigPath = addTsConfigPath;
+exports.resolvePathsBaseUrl = resolvePathsBaseUrl;
 exports.readTsConfigPaths = readTsConfigPaths;
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
@@ -65,30 +66,130 @@ function addTsConfigPath(tree, importPath, lookupPaths) {
         if (c.paths[importPath]) {
             throw new Error(`You already have a library using the import path "${importPath}". Make sure to specify a unique one.`);
         }
-        c.paths[importPath] = lookupPaths;
+        c.paths[importPath] = lookupPaths.map(ensureRelativePath);
         return json;
     });
 }
+function ensureRelativePath(p) {
+    if (p.startsWith('./') || p.startsWith('../') || p.startsWith('/')) {
+        return p;
+    }
+    return `./${p}`;
+}
+/**
+ * When `baseUrl` is not set and `paths` are inherited via `extends`,
+ * tools like `tsconfig-paths` resolve from the loaded file's directory
+ * instead of the file where `paths` is defined. This walks the `extends`
+ * chain to find the correct resolution base.
+ *
+ * Returns the directory that `paths` values should be resolved relative to.
+ * Walks the tsconfig `extends` chain to find where `paths` is defined, then
+ * looks for the applicable `baseUrl` from that point toward the root of the
+ * chain (ignoring child overrides that don't apply to the paths-defining
+ * tsconfig). When no `baseUrl` applies, returns the directory of the
+ * tsconfig that defines `paths`.
+ */
+function resolvePathsBaseUrl(tsconfigPath) {
+    const chain = [];
+    const queue = [tsconfigPath];
+    while (queue.length > 0) {
+        const absolute = (0, path_1.resolve)(queue.shift());
+        const dir = (0, path_1.dirname)(absolute);
+        try {
+            const raw = JSON.parse((0, fs_1.readFileSync)(absolute, 'utf-8'));
+            chain.push({ dir, raw });
+            const exts = raw.extends
+                ? Array.isArray(raw.extends)
+                    ? raw.extends
+                    : [raw.extends]
+                : [];
+            for (const ext of exts) {
+                const resolved = resolveExtendsPath(ext, dir);
+                if (resolved) {
+                    queue.push(resolved);
+                }
+            }
+        }
+        catch {
+            // skip unreadable files
+        }
+    }
+    // Find where paths is defined.
+    let pathsIndex = -1;
+    for (let i = 0; i < chain.length; i++) {
+        if (chain[i].raw.compilerOptions?.paths &&
+            Object.keys(chain[i].raw.compilerOptions.paths).length > 0) {
+            pathsIndex = i;
+            break;
+        }
+    }
+    // Find the applicable baseUrl: search from the paths-defining tsconfig
+    // toward the root. Child overrides before the paths-defining tsconfig
+    // are ignored — they don't apply to the paths that were written for a
+    // different baseUrl context.
+    const searchStart = pathsIndex >= 0 ? pathsIndex : 0;
+    for (let i = searchStart; i < chain.length; i++) {
+        if (chain[i].raw.compilerOptions?.baseUrl) {
+            return (0, path_1.resolve)(chain[i].dir, chain[i].raw.compilerOptions.baseUrl);
+        }
+    }
+    return pathsIndex >= 0
+        ? chain[pathsIndex].dir
+        : (0, path_1.dirname)((0, path_1.resolve)(tsconfigPath));
+}
+/**
+ * Resolves a tsconfig `extends` entry to an absolute path.
+ * Handles relative paths, absolute paths, and package names
+ * (e.g., `@tsconfig/node20/tsconfig.json` or `@tsconfig/strictest`).
+ * Mirrors TypeScript's resolution: relative/absolute paths are resolved
+ * directly (with `.json` fallback), package names use `require.resolve`
+ * with a `tsconfig.json` fallback for bare package names.
+ */
+function resolveExtendsPath(ext, fromDir) {
+    if (ext.startsWith('.') || (0, path_1.isAbsolute)(ext)) {
+        let resolved = (0, path_1.resolve)(fromDir, ext);
+        if ((0, fs_1.existsSync)(resolved))
+            return resolved;
+        if (!resolved.endsWith('.json')) {
+            resolved += '.json';
+            if ((0, fs_1.existsSync)(resolved))
+                return resolved;
+        }
+        return null;
+    }
+    // Package name — try as-is, then with /tsconfig.json appended
+    try {
+        return require.resolve(ext, { paths: [fromDir] });
+    }
+    catch {
+        try {
+            return require.resolve(`${ext}/tsconfig.json`, { paths: [fromDir] });
+        }
+        catch {
+            return null;
+        }
+    }
+}
 function readTsConfigPaths(tsConfig) {
     tsConfig ??= getRootTsConfigPath();
     try {
-        if (!tsModule) {
-            tsModule = (0, ensure_typescript_1.ensureTypescript)();
-        }
         let config;
         if (typeof tsConfig === 'string') {
+            if (!tsModule) {
+                tsModule = (0, ensure_typescript_1.ensureTypescript)();
+            }
             const configFile = tsModule.readConfigFile(tsConfig, tsModule.sys.readFile);
-            config = tsModule.parseJsonConfigFileContent(configFile.config, tsModule.sys, (0, path_1.dirname)(tsConfig));
+            // Stub `readDirectory` to skip the source-file scan — only `paths` is consumed.
+            const parseConfigHost = {
+                ...tsModule.sys,
+                readDirectory: () => [],
+            };
+            config = tsModule.parseJsonConfigFileContent(configFile.config, parseConfigHost, (0, path_1.dirname)(tsConfig));
         }
         else {
             config = tsConfig;
         }
-        if (config.options?.paths) {
-            return config.options.paths;
-        }
-        else {
-            return null;
-        }
+        return config.options?.paths ?? null;
     }
     catch (e) {
         return null;