From a889e981ba2aa64047b0ca802b707a92f383ec87 Mon Sep 17 00:00:00 2001 From: Asger F Date: Thu, 3 Apr 2025 15:22:53 +0200 Subject: [PATCH] JS: Add tests for multiple path replacements --- .../library-tests/PathResolution/Fallback/lib1/both.ts | 1 + .../PathResolution/Fallback/lib1/differentExtension.js | 1 + .../PathResolution/Fallback/lib1/only1.ts | 1 + .../PathResolution/Fallback/lib1/subdir/both.ts | 1 + .../PathResolution/Fallback/lib1/subdir/index.ts | 1 + .../PathResolution/Fallback/lib1/subdir/only1.ts | 1 + .../library-tests/PathResolution/Fallback/lib2/both.ts | 1 + .../PathResolution/Fallback/lib2/differentExtension.ts | 1 + .../PathResolution/Fallback/lib2/only2.ts | 1 + .../PathResolution/Fallback/lib2/subdir/both.ts | 1 + .../PathResolution/Fallback/lib2/subdir/index.ts | 1 + .../PathResolution/Fallback/lib2/subdir/only2.ts | 1 + .../library-tests/PathResolution/Fallback/src/main.ts | 10 ++++++++++ .../PathResolution/Fallback/tsconfig.json | 8 ++++++++ .../ql/test/library-tests/PathResolution/test.expected | 9 +++++++++ 15 files changed, 39 insertions(+) create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib1/both.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib1/differentExtension.js create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib1/only1.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/both.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/index.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/only1.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib2/both.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib2/differentExtension.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib2/only2.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/both.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/index.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/only2.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/src/main.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/Fallback/tsconfig.json diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/both.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/both.ts new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/both.ts @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/differentExtension.js b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/differentExtension.js new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/differentExtension.js @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/only1.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/only1.ts new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/only1.ts @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/both.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/both.ts new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/both.ts @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/index.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/index.ts new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/index.ts @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/only1.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/only1.ts new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib1/subdir/only1.ts @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/both.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/both.ts new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/both.ts @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/differentExtension.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/differentExtension.ts new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/differentExtension.ts @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/only2.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/only2.ts new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/only2.ts @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/both.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/both.ts new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/both.ts @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/index.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/index.ts new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/index.ts @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/only2.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/only2.ts new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/lib2/subdir/only2.ts @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/src/main.ts b/javascript/ql/test/library-tests/PathResolution/Fallback/src/main.ts new file mode 100644 index 00000000000..1b0bdb14e99 --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/src/main.ts @@ -0,0 +1,10 @@ +import "@/both" // $ importTarget=Fallback/lib1/both.ts +import "@/only1" // $ importTarget=Fallback/lib1/only1.ts +import "@/only2" // $ importTarget=Fallback/lib2/only2.ts +import "@/differentExtension" // $ importTarget=Fallback/lib2/differentExtension.ts +import "@/differentExtension.js" // $ importTarget=Fallback/lib2/differentExtension.ts + +import "@/subdir" // $ importTarget=Fallback/lib1/subdir/index.ts +import "@/subdir/both" // $ importTarget=Fallback/lib1/subdir/both.ts +import "@/subdir/only1" // $ importTarget=Fallback/lib1/subdir/only1.ts +import "@/subdir/only2" // $ importTarget=Fallback/lib2/subdir/only2.ts diff --git a/javascript/ql/test/library-tests/PathResolution/Fallback/tsconfig.json b/javascript/ql/test/library-tests/PathResolution/Fallback/tsconfig.json new file mode 100644 index 00000000000..239fac92558 --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Fallback/tsconfig.json @@ -0,0 +1,8 @@ +{ + "include": ["."], + "compilerOptions": { + "paths": { + "@/*": ["./lib1/*", "./lib2/*"], + } + } +} diff --git a/javascript/ql/test/library-tests/PathResolution/test.expected b/javascript/ql/test/library-tests/PathResolution/test.expected index c86d5df57cb..94d9750b5d1 100644 --- a/javascript/ql/test/library-tests/PathResolution/test.expected +++ b/javascript/ql/test/library-tests/PathResolution/test.expected @@ -40,6 +40,15 @@ | Extended/src/main.ts:24:1:24:17 | import "@/index"; | Extended/lib/index.ts | | Extended/src/main.ts:25:1:25:20 | import "@/index.ts"; | Extended/lib/index.ts | | Extended/src/main.ts:26:1:26:20 | import "@/index.js"; | Extended/lib/index.ts | +| Fallback/src/main.ts:1:1:1:15 | import "@/both" | Fallback/lib1/both.ts | +| Fallback/src/main.ts:2:1:2:16 | import "@/only1" | Fallback/lib1/only1.ts | +| Fallback/src/main.ts:3:1:3:16 | import "@/only2" | Fallback/lib2/only2.ts | +| Fallback/src/main.ts:4:1:4:29 | import ... ension" | Fallback/lib2/differentExtension.ts | +| Fallback/src/main.ts:5:1:5:32 | import ... ion.js" | Fallback/lib2/differentExtension.ts | +| Fallback/src/main.ts:7:1:7:17 | import "@/subdir" | Fallback/lib1/subdir/index.ts | +| Fallback/src/main.ts:8:1:8:22 | import ... r/both" | Fallback/lib1/subdir/both.ts | +| Fallback/src/main.ts:9:1:9:23 | import ... /only1" | Fallback/lib1/subdir/only1.ts | +| Fallback/src/main.ts:10:1:10:23 | import ... /only2" | Fallback/lib2/subdir/only2.ts | | NoBaseUrl/src/main.ts:2:1:2:21 | import ... /file"; | NoBaseUrl/lib/file.ts | | NoBaseUrl/src/main.ts:3:1:3:24 | import ... le.ts"; | NoBaseUrl/lib/file.ts | | NoBaseUrl/src/main.ts:4:1:4:24 | import ... le.js"; | NoBaseUrl/lib/file.ts |