Compute package relative paths in tsconfig.json and set them explicitly in tests.

Author: Hendrik van Antwerpen

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

@@ -409,10 +409,11 @@ impl TsConfig {
 
         source_paths
             .into_iter()
-            .filter_map(move |p| {
-                if !p.starts_with(&self.project_dir) {
-                    return None;
-                }
+            .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) {

…sted-source-root.ts.too_many_cycles.skip …ge-dependency-with-nested-source-root.tslanguages/tree-sitter-stack-graphs-typescript/test/projects/package-dependency-with-nested-source-root.ts.too_many_cycles.skip renamed to languages/tree-sitter-stack-graphs-typescript/test/projects/package-dependency-with-nested-source-root.ts languages/tree-sitter-stack-graphs-typescript/test/projects/package-dependency-with-nested-source-root.ts.too_many_cycles.skip renamed to languages/tree-sitter-stack-graphs-typescript/test/projects/package-dependency-with-nested-source-root.ts

@@ -1,20 +1,23 @@
 /* --- path: ./my_lib/package.json --- */
+/* --- global: FILE_PATH=package.json --- */
 /* --- global: PROJECT_NAME=my_lib --- */
 {
-    "name": "@my/lib",
-    "version": "0.1"
+    "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",
@@ -24,11 +27,13 @@ export const bar = 42;
 }
 
 /* --- 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: 15
+//       ^ defined: 17

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

@@ -1,31 +1,36 @@
 /* --- path: ./my_lib/package.json --- */
+/* --- global: FILE_PATH=package.json --- */
 /* --- global: PROJECT_NAME=my_lib --- */
 {
-    "name": "@my/lib",
-    "version": "0.1"
+    "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/projects-are-isolated.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: