Skip to content
This repository has been archived by the owner on Oct 18, 2023. It is now read-only.

fix(ts): dependency to not resolve using tsconfig paths #13

Merged
merged 14 commits into from
Jun 23, 2022
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@esbuild-kit/core-utils": "^2.0.0",
"get-tsconfig": "^4.0.0"
"get-tsconfig": "^4.0.5"
},
"devDependencies": {
"@pvtnbr/eslint-config": "^0.22.0",
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import path from 'path';
import fs from 'fs';
import Module from 'module';
import {
Expand All @@ -11,6 +12,7 @@ import { getTsconfig, createPathsMatcher } from 'get-tsconfig';

const isPathPattern = /^\.{0,2}\//;
const isTsFilePatten = /\.[cm]?tsx?$/;
const nodeModulesPath = `${path.sep}node_modules${path.sep}`;

const tsconfig = getTsconfig();
const tsconfigRaw = tsconfig?.config;
Expand Down Expand Up @@ -112,8 +114,12 @@ Module._resolveFilename = function (request, parent, isMain, options) {

if (
tsconfigPathsMatcher

// bare specifier
&& !isPathPattern.test(request)

// Dependency paths should not be resolved using tsconfig.json
&& !parent?.filename.includes(nodeModulesPath)
) {
const possiblePaths = tsconfigPathsMatcher(request);
for (const possiblePath of possiblePaths) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('resolve-current-directory');
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('should-not-resolve-baseUrl');
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('should-not-resolve-paths');

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tests/fixtures/tsconfig/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log('Should not run');
2 changes: 1 addition & 1 deletion tests/fixtures/tsconfig/src/resolve-target.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default 'resolved';
export default 'resolve-target';
2 changes: 1 addition & 1 deletion tests/fixtures/tsconfig/src/utils/nested-resolve-target.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default 'resolved';
export default 'nested-resolve-target';
33 changes: 28 additions & 5 deletions tests/specs/typescript/tsconfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,56 @@ export default testSuite(async ({ describe }, node: NodeApis) => {
expect(nodeProcess.stdout).toBe('div null hello world\nnull null goodbye world');
});

describe('paths', ({ test }) => {
describe('paths', ({ test, describe }) => {
test('resolves baseUrl', async () => {
const nodeProcess = await node.load('./src/base-url.ts', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
expect(nodeProcess.stdout).toBe('resolve-target');
});

test('resolves paths exact match', async () => {
const nodeProcess = await node.load('./src/paths-exact-match.ts', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
expect(nodeProcess.stdout).toBe('resolve-target');
});

test('resolves paths prefix', async () => {
const nodeProcess = await node.load('./src/paths-prefix-match.ts', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
expect(nodeProcess.stdout).toBe('nested-resolve-target');
});

test('resolves paths suffix', async () => {
const nodeProcess = await node.load('./src/paths-suffix-match.ts', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
expect(nodeProcess.stdout).toBe('nested-resolve-target');
});

describe('dependency', ({ test }) => {
test('resolve current directory', async () => {
const nodeProcess = await node.load('./dependency-resolve-current-directory', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
});

test('should not resolve baseUrl', async () => {
const nodeProcess = await node.load('./dependency-should-not-resolve-baseUrl', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
});

test('should not resolve paths', async () => {
const nodeProcess = await node.load('./dependency-should-not-resolve-paths', {
cwd: './tsconfig',
});
expect(nodeProcess.stdout).toBe('resolved');
});
});
});
});
Expand Down