@depup/nx 22.5.4-depup.0

package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildExplicitPackageJsonDependencies = buildExplicitPackageJsonDependencies;
+const project_graph_1 = require("../../../../config/project-graph");
+const file_utils_1 = require("../../../../project-graph/file-utils");
+const project_graph_builder_1 = require("../../../../project-graph/project-graph-builder");
+const json_1 = require("../../../../utils/json");
+function buildExplicitPackageJsonDependencies(ctx, targetProjectLocator) {
+    const res = [];
+    const roots = {};
+    Object.values(ctx.projects).forEach((project) => {
+        roots[project.root] = true;
+    });
+    Object.keys(ctx.filesToProcess.projectFileMap).forEach((source) => {
+        Object.values(ctx.filesToProcess.projectFileMap[source]).forEach((f) => {
+            if (isPackageJsonAtProjectRoot(roots, f.file)) {
+                processPackageJson(source, f.file, ctx, targetProjectLocator, res);
+            }
+        });
+    });
+    return res;
+}
+function isPackageJsonAtProjectRoot(roots, fileName) {
+    if (!fileName.endsWith('package.json')) {
+        return false;
+    }
+    const filePath = fileName.slice(0, -13);
+    return !!roots[filePath];
+}
+function processPackageJson(sourceProject, packageJsonPath, ctx, targetProjectLocator, collectedDeps) {
+    try {
+        const deps = readDeps((0, json_1.parseJson)((0, file_utils_1.defaultFileRead)(packageJsonPath)));
+        Object.keys(deps).forEach((packageName) => {
+            const packageVersion = deps[packageName];
+            const localProject = targetProjectLocator.findDependencyInWorkspaceProjects(packageJsonPath, packageName, packageVersion);
+            if (localProject) {
+                // package.json refers to another project in the monorepo
+                const dependency = {
+                    source: sourceProject,
+                    target: localProject,
+                    sourceFile: packageJsonPath,
+                    type: project_graph_1.DependencyType.static,
+                };
+                (0, project_graph_builder_1.validateDependency)(dependency, ctx);
+                collectedDeps.push(dependency);
+                return;
+            }
+            const externalNodeName = targetProjectLocator.findNpmProjectFromImport(packageName, packageJsonPath);
+            if (!externalNodeName) {
+                return;
+            }
+            const dependency = {
+                source: sourceProject,
+                target: externalNodeName,
+                sourceFile: packageJsonPath,
+                type: project_graph_1.DependencyType.static,
+            };
+            (0, project_graph_builder_1.validateDependency)(dependency, ctx);
+            collectedDeps.push(dependency);
+        });
+    }
+    catch (e) {
+        if (process.env.NX_VERBOSE_LOGGING === 'true') {
+            console.error(e);
+        }
+    }
+}
+function readDeps(packageJson) {
+    const deps = {};
+    /**
+     * We process dependencies in a rough order of increasing importance such that if a dependency is listed in multiple
+     * sections, the version listed under the "most important" one wins, with production dependencies being the most important.
+     */
+    const depType = [
+        'optionalDependencies',
+        'peerDependencies',
+        'devDependencies',
+        'dependencies',
+    ];
+    for (const type of depType) {
+        Object.keys(packageJson[type] || {}).forEach((depName) => {
+            deps[depName] = packageJson[type][depName];
+        });
+    }
+    return deps;
+}

package/src/plugins/js/project-graph/build-dependencies/explicit-project-dependencies.d.ts

@@ -0,0 +1,5 @@
+import { CreateDependenciesContext } from '../../../../project-graph/plugins';
+import { RawProjectGraphDependency } from '../../../../project-graph/project-graph-builder';
+import { TargetProjectLocator } from './target-project-locator';
+export declare function buildExplicitTypeScriptDependencies(ctx: CreateDependenciesContext, targetProjectLocator: TargetProjectLocator): RawProjectGraphDependency[];
+//# sourceMappingURL=explicit-project-dependencies.d.ts.map

package/src/plugins/js/project-graph/build-dependencies/explicit-project-dependencies.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"explicit-project-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/explicit-project-dependencies.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EACL,yBAAyB,EAE1B,MAAM,iDAAiD,CAAC;AAGzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AA+BhE,wBAAgB,mCAAmC,CACjD,GAAG,EAAE,yBAAyB,EAC9B,oBAAoB,EAAE,oBAAoB,GACzC,yBAAyB,EAAE,CAmF7B"}

package/src/plugins/js/project-graph/build-dependencies/explicit-project-dependencies.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildExplicitTypeScriptDependencies = buildExplicitTypeScriptDependencies;
+const path_1 = require("path");
+const project_graph_1 = require("../../../../config/project-graph");
+const project_graph_builder_1 = require("../../../../project-graph/project-graph-builder");
+const path_2 = require("../../../../utils/path");
+const workspace_root_1 = require("../../../../utils/workspace-root");
+function isRoot(projects, projectName) {
+    return projects[projectName]?.root === '.';
+}
+function convertImportToDependency(importExpr, sourceFile, source, type, targetProjectLocator) {
+    const target = targetProjectLocator.findProjectFromImport(importExpr, sourceFile);
+    if (!target) {
+        return;
+    }
+    return {
+        source,
+        target,
+        sourceFile,
+        type,
+    };
+}
+function buildExplicitTypeScriptDependencies(ctx, targetProjectLocator) {
+    const res = [];
+    const filesToProcess = {};
+    const moduleExtensions = [
+        '.ts',
+        '.js',
+        '.tsx',
+        '.jsx',
+        '.mts',
+        '.mjs',
+        '.cjs',
+        '.cts',
+        '.vue',
+    ];
+    for (const [project, fileData] of Object.entries(ctx.filesToProcess.projectFileMap)) {
+        filesToProcess[project] ??= [];
+        for (const { file } of fileData) {
+            if (moduleExtensions.some((ext) => file.endsWith(ext))) {
+                filesToProcess[project].push((0, path_1.join)(workspace_root_1.workspaceRoot, file));
+            }
+        }
+    }
+    const { findImports } = require('../../../../native');
+    const imports = findImports(filesToProcess);
+    for (const { sourceProject, file, staticImportExpressions, dynamicImportExpressions, } of imports) {
+        const normalizedFilePath = (0, path_2.normalizePath)((0, path_1.relative)(workspace_root_1.workspaceRoot, file));
+        for (const importExpr of staticImportExpressions) {
+            const dependency = convertImportToDependency(importExpr, normalizedFilePath, sourceProject, project_graph_1.DependencyType.static, targetProjectLocator);
+            if (!dependency) {
+                continue;
+            }
+            // TODO: These edges technically should be allowed but we need to figure out how to separate config files out from root
+            if (isRoot(ctx.projects, dependency.source) ||
+                !isRoot(ctx.projects, dependency.target)) {
+                res.push(dependency);
+            }
+        }
+        for (const importExpr of dynamicImportExpressions) {
+            const dependency = convertImportToDependency(importExpr, normalizedFilePath, sourceProject, project_graph_1.DependencyType.dynamic, targetProjectLocator);
+            if (!dependency) {
+                continue;
+            }
+            // TODO: These edges technically should be allowed but we need to figure out how to separate config files out from root
+            if (isRoot(ctx.projects, dependency.source) ||
+                !isRoot(ctx.projects, dependency.target)) {
+                (0, project_graph_builder_1.validateDependency)(dependency, ctx);
+                res.push(dependency);
+            }
+        }
+    }
+    return res;
+}

package/src/plugins/js/project-graph/build-dependencies/strip-source-code.d.ts

@@ -0,0 +1,8 @@
+import type { Scanner } from 'typescript';
+/**
+ * @deprecated This is deprecated and will be removed in Nx 20.
+ * This was not intended to be exposed.
+ * Please talk to us if you need this.
+ */
+export declare function stripSourceCode(scanner: Scanner, contents: string): string;
+//# sourceMappingURL=strip-source-code.d.ts.map

package/src/plugins/js/project-graph/build-dependencies/strip-source-code.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"strip-source-code.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/strip-source-code.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAI1C;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAiJ1E"}

package/src/plugins/js/project-graph/build-dependencies/strip-source-code.js

@@ -0,0 +1,155 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripSourceCode = stripSourceCode;
+let SyntaxKind;
+/**
+ * @deprecated This is deprecated and will be removed in Nx 20.
+ * This was not intended to be exposed.
+ * Please talk to us if you need this.
+ */
+function stripSourceCode(scanner, contents) {
+    if (!SyntaxKind) {
+        SyntaxKind = require('typescript').SyntaxKind;
+    }
+    if (contents.indexOf('loadChildren') > -1) {
+        return contents;
+    }
+    scanner.setText(contents);
+    let token = scanner.scan();
+    let lastNonTriviaToken = SyntaxKind.Unknown;
+    const statements = [];
+    const templateStack = [];
+    let ignoringLine = false;
+    let braceDepth = 0;
+    let start = null;
+    while (token !== SyntaxKind.EndOfFileToken) {
+        const currentToken = token;
+        const potentialStart = scanner.getStartPos();
+        switch (token) {
+            case SyntaxKind.MultiLineCommentTrivia:
+            case SyntaxKind.SingleLineCommentTrivia: {
+                const isMultiLineCommentTrivia = token === SyntaxKind.MultiLineCommentTrivia;
+                const start = potentialStart + 2;
+                token = scanner.scan();
+                const end = scanner.getStartPos() - (isMultiLineCommentTrivia ? 2 : 0);
+                const comment = contents.substring(start, end).trim();
+                if (comment === 'nx-ignore-next-line') {
+                    // reading till the end of the line
+                    while (token === SyntaxKind.WhitespaceTrivia ||
+                        token === SyntaxKind.NewLineTrivia) {
+                        token = scanner.scan();
+                    }
+                    ignoringLine = true;
+                }
+                break;
+            }
+            case SyntaxKind.NewLineTrivia: {
+                ignoringLine = false;
+                token = scanner.scan();
+                break;
+            }
+            case SyntaxKind.RequireKeyword:
+            case SyntaxKind.ImportKeyword: {
+                token = scanner.scan();
+                if (ignoringLine) {
+                    break;
+                }
+                while (token === SyntaxKind.WhitespaceTrivia ||
+                    token === SyntaxKind.NewLineTrivia) {
+                    token = scanner.scan();
+                }
+                start = potentialStart;
+                break;
+            }
+            case SyntaxKind.TemplateHead: {
+                templateStack.push(braceDepth);
+                braceDepth = 0;
+                token = scanner.scan();
+                break;
+            }
+            case SyntaxKind.SlashToken: {
+                if (shouldRescanSlashToken(lastNonTriviaToken)) {
+                    token = scanner.reScanSlashToken();
+                }
+                token = scanner.scan();
+                break;
+            }
+            case SyntaxKind.OpenBraceToken: {
+                ++braceDepth;
+                token = scanner.scan();
+                break;
+            }
+            case SyntaxKind.CloseBraceToken: {
+                if (braceDepth) {
+                    --braceDepth;
+                }
+                else if (templateStack.length) {
+                    token = scanner.reScanTemplateToken(false);
+                    if (token === SyntaxKind.LastTemplateToken) {
+                        braceDepth = templateStack.pop();
+                    }
+                }
+                token = scanner.scan();
+                break;
+            }
+            case SyntaxKind.ExportKeyword: {
+                token = scanner.scan();
+                if (ignoringLine) {
+                    break;
+                }
+                while (token === SyntaxKind.WhitespaceTrivia ||
+                    token === SyntaxKind.NewLineTrivia) {
+                    token = scanner.scan();
+                }
+                if (token === SyntaxKind.OpenBraceToken ||
+                    token === SyntaxKind.AsteriskToken ||
+                    token === SyntaxKind.TypeKeyword) {
+                    start = potentialStart;
+                }
+                break;
+            }
+            case SyntaxKind.StringLiteral: {
+                if (start !== null) {
+                    token = scanner.scan();
+                    if (token === SyntaxKind.CloseParenToken) {
+                        token = scanner.scan();
+                    }
+                    const end = scanner.getStartPos();
+                    statements.push(contents.substring(start, end));
+                    start = null;
+                }
+                else {
+                    token = scanner.scan();
+                }
+                break;
+            }
+            default: {
+                token = scanner.scan();
+            }
+        }
+        if (currentToken > SyntaxKind.LastTriviaToken) {
+            lastNonTriviaToken = currentToken;
+        }
+    }
+    return statements.join('\n');
+}
+function shouldRescanSlashToken(lastNonTriviaToken) {
+    switch (lastNonTriviaToken) {
+        case SyntaxKind.Identifier:
+        case SyntaxKind.StringLiteral:
+        case SyntaxKind.NumericLiteral:
+        case SyntaxKind.BigIntLiteral:
+        case SyntaxKind.RegularExpressionLiteral:
+        case SyntaxKind.ThisKeyword:
+        case SyntaxKind.PlusPlusToken:
+        case SyntaxKind.MinusMinusToken:
+        case SyntaxKind.CloseParenToken:
+        case SyntaxKind.CloseBracketToken:
+        case SyntaxKind.CloseBraceToken:
+        case SyntaxKind.TrueKeyword:
+        case SyntaxKind.FalseKeyword:
+            return false;
+        default:
+            return true;
+    }
+}

package/src/plugins/js/project-graph/build-dependencies/target-project-locator.d.ts

@@ -0,0 +1,75 @@
+import type { ProjectGraphExternalNode, ProjectGraphProjectNode } from '../../../../config/project-graph';
+import type { PackageJson } from '../../../../utils/package-json';
+/**
+ * The key is a combination of the package name and the workspace relative directory
+ * containing the file importing it e.g. `lodash__packages/my-lib`, the value is the
+ * resolved external node name from the project graph.
+ */
+type NpmResolutionCache = Map<string, string | null>;
+type PackageJsonResolutionCache = Map<string, PackageJson | null>;
+type PathPattern = {
+    pattern: string;
+    prefix: string;
+    suffix: string;
+};
+export declare function isBuiltinModuleImport(importExpr: string): boolean;
+export declare class TargetProjectLocator {
+    private readonly nodes;
+    private readonly externalNodes;
+    private readonly npmResolutionCache;
+    private readonly packageJsonResolutionCache;
+    private projectRootMappings;
+    private npmProjects;
+    private tsConfig;
+    private paths;
+    private parsedPathPatterns;
+    private typescriptResolutionCache;
+    private packagesMetadata;
+    constructor(nodes: Record<string, ProjectGraphProjectNode>, externalNodes?: Record<string, ProjectGraphExternalNode>, npmResolutionCache?: NpmResolutionCache, packageJsonResolutionCache?: PackageJsonResolutionCache);
+    /**
+     * Resolve any workspace or external project that matches the given import expression,
+     * originating from the given filePath.
+     *
+     * @param importExpr
+     * @param filePath
+     */
+    findProjectFromImport(importExpr: string, filePath: string): string;
+    /**
+     * Resolve any external project that matches the given import expression,
+     * relative to the given file path.
+     *
+     * @param importExpr
+     * @param projectRoot
+     */
+    findNpmProjectFromImport(importExpr: string, fromFilePath: string): string | null;
+    /**
+     * Return file paths matching the import relative to the repo root
+     * @param normalizedImportExpr
+     * @deprecated Use `findMatchingPaths` instead. It will be removed in Nx v22.
+     */
+    findPaths(normalizedImportExpr: string): string[] | undefined;
+    findMatchingPaths(importExpr: string): [pattern: string | PathPattern, paths: string[]] | undefined;
+    findImportInWorkspaceProjects(importPath: string): string | null;
+    findDependencyInWorkspaceProjects(packageJsonPath: string, dep: string, packageVersion: string): string | null;
+    private isPatternMatch;
+    private parsePaths;
+    private resolveImportWithTypescript;
+    private resolveImportWithRequire;
+    private findProjectOfResolvedModule;
+    private getAbsolutePath;
+    private getRootTsConfig;
+    private findMatchingProjectFiles;
+    /**
+     * In many cases the package.json will be directly resolvable, so we try that first.
+     * If, however, package exports are used and the package.json is not defined, we will
+     * need to resolve the main entry point of the package and traverse upwards to find the
+     * package.json.
+     *
+     * In some cases, such as when multiple module formats are published, the resolved package.json
+     * might only contain the "type" field - no "name" or "version", so in such cases we keep traversing
+     * until we find a package.json that contains the "name" and "version" fields.
+     */
+    private readPackageJson;
+}
+export {};
+//# sourceMappingURL=target-project-locator.d.ts.map

package/src/plugins/js/project-graph/build-dependencies/target-project-locator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"target-project-locator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/target-project-locator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,kCAAkC,CAAC;AAO1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAYlE;;;;GAIG;AACH,KAAK,kBAAkB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;AACrD,KAAK,0BAA0B,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC,CAAC;AAElE,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAcF,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAGjE;AAED,qBAAa,oBAAoB;IAc7B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAI9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAnB7C,OAAO,CAAC,mBAAmB,CAAyC;IACpE,OAAO,CAAC,WAAW,CAAkD;IACrE,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,KAAK,CAAgD;IAC7D,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,yBAAyB,CAAoC;IACrE,OAAO,CAAC,gBAAgB,CAItB;gBAGiB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAC9C,aAAa,GAAE,MAAM,CACpC,MAAM,EACN,wBAAwB,CACpB,EACW,kBAAkB,GAAE,kBAA8C,EAClE,0BAA0B,GAAE,0BAA8D;IA8B7G;;;;;;OAMG;IACH,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IA2EnE;;;;;;OAMG;IACH,wBAAwB,CACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI;IAoEhB;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS;IAmB7D,iBAAiB,CACf,UAAU,EAAE,MAAM,GACjB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS;IA6B/D,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAehE,iCAAiC,CAC/B,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,GACrB,MAAM,GAAG,IAAI;IAgDhB,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,UAAU;IAuBlB,OAAO,CAAC,2BAA2B;IAqDnC,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAkBvB,OAAO,CAAC,wBAAwB;IAKhC;;;;;;;;;OASG;IACH,OAAO,CAAC,eAAe;CA0DxB"}