From c8076645786909ca715f5d88bc8cf30f6c5fc6f5 Mon Sep 17 00:00:00 2001 From: Asger F Date: Mon, 7 Apr 2025 09:28:56 +0200 Subject: [PATCH] JS: Add test for importing package.json with main --- .../library-tests/PathResolution/Basic/import-packages.ts | 5 +++++ .../library-tests/PathResolution/PackageWithMain/main.js | 1 + .../PathResolution/PackageWithMain/package.json | 4 ++++ .../PathResolution/PackageWithModuleMain/main.js | 1 + .../PathResolution/PackageWithModuleMain/package.json | 4 ++++ .../ql/test/library-tests/PathResolution/test.expected | 2 ++ 6 files changed, 17 insertions(+) create mode 100644 javascript/ql/test/library-tests/PathResolution/Basic/import-packages.ts create mode 100644 javascript/ql/test/library-tests/PathResolution/PackageWithMain/main.js create mode 100644 javascript/ql/test/library-tests/PathResolution/PackageWithMain/package.json create mode 100644 javascript/ql/test/library-tests/PathResolution/PackageWithModuleMain/main.js create mode 100644 javascript/ql/test/library-tests/PathResolution/PackageWithModuleMain/package.json diff --git a/javascript/ql/test/library-tests/PathResolution/Basic/import-packages.ts b/javascript/ql/test/library-tests/PathResolution/Basic/import-packages.ts new file mode 100644 index 00000000000..45a1dc92d29 --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/Basic/import-packages.ts @@ -0,0 +1,5 @@ +import '../PackageWithMain'; // $ MISSING: importTarget=PackageWithMain/main.js +import '../PackageWithModuleMain'; // $ MISSING: importTarget=PackageWithModuleMain/main.js + +import '@example/package-with-main'; // $ importTarget=PackageWithMain/main.js +import '@example/package-with-module-main'; // $ importTarget=PackageWithModuleMain/main.js diff --git a/javascript/ql/test/library-tests/PathResolution/PackageWithMain/main.js b/javascript/ql/test/library-tests/PathResolution/PackageWithMain/main.js new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/PackageWithMain/main.js @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/PackageWithMain/package.json b/javascript/ql/test/library-tests/PathResolution/PackageWithMain/package.json new file mode 100644 index 00000000000..7aab9ed4316 --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/PackageWithMain/package.json @@ -0,0 +1,4 @@ +{ + "name": "@example/package-with-main", + "main": "./main.js" +} diff --git a/javascript/ql/test/library-tests/PathResolution/PackageWithModuleMain/main.js b/javascript/ql/test/library-tests/PathResolution/PackageWithModuleMain/main.js new file mode 100644 index 00000000000..ad1d380d6cc --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/PackageWithModuleMain/main.js @@ -0,0 +1 @@ +export const x = 1; diff --git a/javascript/ql/test/library-tests/PathResolution/PackageWithModuleMain/package.json b/javascript/ql/test/library-tests/PathResolution/PackageWithModuleMain/package.json new file mode 100644 index 00000000000..ff43010d7d5 --- /dev/null +++ b/javascript/ql/test/library-tests/PathResolution/PackageWithModuleMain/package.json @@ -0,0 +1,4 @@ +{ + "name": "@example/package-with-module-main", + "module": "./main.js" +} diff --git a/javascript/ql/test/library-tests/PathResolution/test.expected b/javascript/ql/test/library-tests/PathResolution/test.expected index 20c75dddc9a..4797ada8182 100644 --- a/javascript/ql/test/library-tests/PathResolution/test.expected +++ b/javascript/ql/test/library-tests/PathResolution/test.expected @@ -22,6 +22,8 @@ | Basic/Subdir/sub.ts:2:1:2:13 | import '../'; | Basic/index.ts | | Basic/Subdir/sub.ts:3:1:3:14 | import './..'; | Basic/index.ts | | Basic/Subdir/sub.ts:4:1:4:15 | import './../'; | Basic/index.ts | +| Basic/import-packages.ts:4:1:4:36 | import ... -main'; | PackageWithMain/main.js | +| Basic/import-packages.ts:5:1:5:43 | import ... -main'; | PackageWithModuleMain/main.js | | Basic/index.ts:1:1:1:22 | import ... r/sub'; | Basic/Subdir/sub.ts | | Extended/src/main.ts:2:1:2:21 | import ... /file"; | Extended/lib/file.ts | | Extended/src/main.ts:3:1:3:24 | import ... le.ts"; | Extended/lib/file.ts |