Merge pull request #171 from github/npm-dependencies

[TypeScript] Use dependencies from `package.json`

Author: Hendrik van Antwerpen

languages/tree-sitter-stack-graphs-typescript/rust/npm_package.rs

@@ -85,6 +85,27 @@ impl FileAnalyzer for NpmPackageAnalyzer {
         let pkg_ref = add_push(graph, file, proj_scope, PKG_M_NS, "npm_package.pkg_ref");
         add_edge(graph, pkg_def, pkg_ref, 0);
 
+        // dependencies (package references)
+        for (i, (pkg_name, _)) in npm_pkg.dependencies.iter().enumerate() {
+            let pkg_def = add_module_pops(
+                graph,
+                file,
+                NON_REL_M_NS,
+                Path::new(&pkg_name),
+                proj_scope,
+                &format!("npm_package.dep[{}]", i),
+            );
+            let pkg_ref = add_module_pushes(
+                graph,
+                file,
+                NON_REL_M_NS,
+                Path::new(&pkg_name),
+                root,
+                &format!("npm_package.dep[{}]", i),
+            );
+            add_edge(graph, pkg_def, pkg_ref, 0);
+        }
+
         Ok(())
     }
 }
@@ -93,4 +114,6 @@ impl FileAnalyzer for NpmPackageAnalyzer {
 #[serde(rename_all = "camelCase")]
 pub struct NpmPackage {
     pub name: String,
+    #[serde(default)]
+    pub dependencies: HashMap<String, serde_json::Value>,
 }

languages/tree-sitter-stack-graphs-typescript/rust/tsconfig.rs

@@ -399,42 +399,49 @@ impl TsConfig {
     }
 
     /// Returns an iterator over the input files of the project, taking `files`, `include`, and `exclude` into account.
-    fn input_files<'a, PI>(&self, source_paths: PI) -> impl Iterator<Item = &'a Path>
+    fn input_files<'a, PI>(&self, source_paths: PI) -> Vec<PathBuf>
     where
         PI: IntoIterator<Item = &'a Path>,
     {
         let files = self.files();
         let include = self.include();
         let exclude = self.exclude();
 
-        let project_dir = self.project_dir.clone();
-        source_paths.into_iter().filter_map(move |p| {
-            // compute relative path in this project
-            let p = match p.strip_prefix(&project_dir) {
-                Ok(p) => p,
-                Err(_) => return None,
-            };
-
-            // accept files in the file list
-            for file in &files {
-                if p == file {
-                    return Some(p);
+        source_paths
+            .into_iter()
+            .filter_map(|p| {
+                let p = match p.strip_prefix(&self.project_dir) {
+                    Ok(p) => p,
+                    Err(_) => return None,
+                };
+
+                // normalize path
+                let p = match NormalizedRelativePath::from_path(p) {
+                    Some(p) => p.into_path_buf(),
+                    None => return None,
+                };
+
+                // accept files in the file list
+                for file in &files {
+                    if &p == file {
+                        return Some(p);
+                    }
                 }
-            }
 
-            // reject files not in the include patterns
-            if !include.iter().any(|i| i.matches_path(p)) {
-                return None;
-            }
+                // reject files not in the include patterns
+                if !include.iter().any(|i| i.matches_path(&p)) {
+                    return None;
+                }
 
-            // reject files matching exclude patterns
-            if exclude.iter().any(|e| e.matches_path(p)) {
-                return None;
-            }
+                // reject files matching exclude patterns
+                if exclude.iter().any(|e| e.matches_path(&p)) {
+                    return None;
+                }
 
-            // file was included, and not excluded, so accept
-            Some(p)
-        })
+                // file was included, and not excluded, so accept
+                Some(p)
+            })
+            .collect()
     }
 }
 

languages/tree-sitter-stack-graphs-typescript/test/projects/package-dependency-with-nested-source-root.ts

@@ -0,0 +1,39 @@
+/* --- path: ./my_lib/package.json --- */
+/* --- global: FILE_PATH=package.json --- */
+/* --- global: PROJECT_NAME=my_lib --- */
+{
+    "name": "@my/lib"
+}
+
+/* --- path: ./my_lib/tsconfig.json --- */
+/* --- global: FILE_PATH=tsconfig.json --- */
+/* --- global: PROJECT_NAME=my_lib --- */
+{
+}
+
+/* --- path: ./my_lib/src/foo.ts --- */
+/* --- global: FILE_PATH=src/foo.ts --- */
+/* --- global: PROJECT_NAME=my_lib --- */
+export const bar = 42;
+
+/* --- path: ./my_app/package.json --- */
+/* --- global: FILE_PATH=package.json --- */
+/* --- global: PROJECT_NAME=my_app --- */
+{
+    "name": "@my/app",
+    "dependencies": {
+      "@my/lib": "0.1"
+    }
+}
+
+/* --- path: ./my_app/tsconfig.json --- */
+/* --- global: FILE_PATH=tsconfig.json --- */
+/* --- global: PROJECT_NAME=my_app --- */
+{
+}
+
+/* --- path: ./my_app/src/index.ts --- */
+/* --- global: FILE_PATH=src/index.ts --- */
+/* --- global: PROJECT_NAME=my_app --- */
+import { bar } from "@my/lib/foo";
+//       ^ defined: 17

languages/tree-sitter-stack-graphs-typescript/test/projects/package-invisible-without-dependency.ts

@@ -0,0 +1,36 @@
+/* --- path: ./my_lib/package.json --- */
+/* --- global: FILE_PATH=package.json --- */
+/* --- global: PROJECT_NAME=my_lib --- */
+{
+    "name": "@my/lib"
+}
+
+/* --- path: ./my_lib/tsconfig.json --- */
+/* --- global: FILE_PATH=tsconfig.json --- */
+/* --- global: PROJECT_NAME=my_lib --- */
+{
+}
+
+/* --- path: ./my_lib/src/foo.ts --- */
+/* --- global: FILE_PATH=src/foo.ts --- */
+/* --- global: PROJECT_NAME=my_lib --- */
+export const bar = 42;
+
+/* --- path: ./my_app/package.json --- */
+/* --- global: FILE_PATH=package.json --- */
+/* --- global: PROJECT_NAME=my_app --- */
+{
+    "name": "@my/app"
+}
+
+/* --- path: ./my_app/tsconfig.json --- */
+/* --- global: FILE_PATH=tsconfig.json --- */
+/* --- global: PROJECT_NAME=my_app --- */
+{
+}
+
+/* --- path: ./my_app/src/index.ts --- */
+/* --- global: FILE_PATH=src/index.ts --- */
+/* --- global: PROJECT_NAME=my_app --- */
+import { bar } from "@my/lib/foo";
+//       ^ defined:

languages/tree-sitter-stack-graphs-typescript/test/projects/package-with-baseurl.ts

@@ -1,10 +1,12 @@
 /* --- path: a/foo.ts --- */
+/* --- global: FILE_PATH=foo.ts */
 /* --- global: PROJECT_NAME=a */
 
 export const baz = 42;
 
 /* --- path: b/bar.ts --- */
+/* --- global: FILE_PATH=bar.ts */
 /* --- global: PROJECT_NAME=b */
 
 import { baz } from "./foo";
-//       ^ defined:
+//       ^ defined:

languages/tree-sitter-stack-graphs-typescript/test/projects/projects-are-isolated.ts

@@ -84,7 +84,7 @@ impl HasPathKey for PartialPath {
     }
 }
 
-const MAX_SIMILAR_PATH_COUNT: usize = 7;
+const MAX_SIMILAR_PATH_COUNT: usize = 12;
 
 impl<P> CycleDetector<P>
 where