Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support TS5 extends array #45

Merged
merged 7 commits into from Mar 26, 2023
Merged

feat: support TS5 extends array #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a66a53
feat: Support multiple extends
shun-shobon Mar 16, 2023
384d9ea
chore: Upgrade typescript to 5.0
shun-shobon Mar 17, 2023
0ada57d
test: Add multiple files in extends
shun-shobon Mar 18, 2023
f8e00ab
fix: Fix merging order
shun-shobon Mar 17, 2023
5dfd2c0
test: change test name
shun-shobon Mar 18, 2023
ffc6be2
refactor
privatenumber Mar 26, 2023
76eb6f0
upgrade type-fest
privatenumber Mar 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Expand Up @@ -62,8 +62,8 @@
"pkgroll": "^1.8.0",
"slash": "^5.0.0",
"tsx": "^3.12.1",
"type-fest": "^3.4.0",
"typescript": "^4.9.4"
"type-fest": "^3.7.1",
"typescript": "^5.0.2"
},
"eslintConfig": {
"extends": "@pvtnbr/eslint-config",
Expand Down
78 changes: 39 additions & 39 deletions pnpm-lock.yaml
View file
Open in desktop

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

120 changes: 67 additions & 53 deletions src/parse-tsconfig/index.ts
View file
Open in desktop
Expand Up @@ -4,11 +4,53 @@ import slash from 'slash';
import type { TsConfigJson, TsConfigJsonResolved } from '../types.js';
import { normalizePath } from '../utils/normalize-path.js';
import { readJsonc } from '../utils/read-jsonc.js';
import { resolveExtends } from './resolve-extends.js';
import { resolveExtendsPath } from './resolve-extends-path.js';

export function parseTsconfig(
const resolveExtends = (
extendsPath: string,
directoryPath: string,
) => {
const resolvedExtendsPath = resolveExtendsPath(
extendsPath,
directoryPath,
);

const extendsConfig = parseTsconfig(resolvedExtendsPath);

delete extendsConfig.references;

if (extendsConfig.compilerOptions?.baseUrl) {
const { compilerOptions } = extendsConfig;

compilerOptions.baseUrl = path.relative(
directoryPath,
path.join(path.dirname(resolvedExtendsPath), compilerOptions.baseUrl!),
) || './';
}

if (extendsConfig.files) {
extendsConfig.files = extendsConfig.files.map(
file => path.relative(
directoryPath,
path.join(path.dirname(resolvedExtendsPath), file),
),
);
}

if (extendsConfig.include) {
extendsConfig.include = extendsConfig.include.map(
file => path.relative(
directoryPath,
path.join(path.dirname(resolvedExtendsPath), file),
),
);
}
return extendsConfig;
};

export const parseTsconfig = (
tsconfigPath: string,
): TsConfigJsonResolved {
): TsConfigJsonResolved => {
let realTsconfigPath: string;
try {
realTsconfigPath = fs.realpathSync(tsconfigPath);
Expand All @@ -23,62 +65,34 @@ export function parseTsconfig(
}

if (config.extends) {
const extendsPath = resolveExtends(
config.extends,
directoryPath,
const extendsPathList = (
Array.isArray(config.extends)
? config.extends
: [config.extends]
);

const extendsConfig = parseTsconfig(extendsPath);

delete extendsConfig.references;

if (extendsConfig.compilerOptions?.baseUrl) {
const { compilerOptions } = extendsConfig;

compilerOptions.baseUrl = path.relative(
directoryPath,
path.join(path.dirname(extendsPath), compilerOptions.baseUrl!),
) || './';
}

if (extendsConfig.files) {
extendsConfig.files = extendsConfig.files.map(
file => path.relative(
directoryPath,
path.join(path.dirname(extendsPath), file),
),
);
}

if (extendsConfig.include) {
extendsConfig.include = extendsConfig.include.map(
file => path.relative(
directoryPath,
path.join(path.dirname(extendsPath), file),
),
);
}

delete config.extends;

const merged = {
...extendsConfig,
...config,
for (const extendsPath of extendsPathList.reverse()) {
const extendsConfig = resolveExtends(extendsPath, directoryPath);
const merged = {
...extendsConfig,
...config,

compilerOptions: {
...extendsConfig.compilerOptions,
...config.compilerOptions,
},
};

if (extendsConfig.watchOptions) {
merged.watchOptions = {
...extendsConfig.watchOptions,
...config.watchOptions,
compilerOptions: {
...extendsConfig.compilerOptions,
...config.compilerOptions,
},
};
}

config = merged;
if (extendsConfig.watchOptions) {
merged.watchOptions = {
...extendsConfig.watchOptions,
...config.watchOptions,
};
}
config = merged;
}
}

if (config.compilerOptions) {
Expand Down Expand Up @@ -119,4 +133,4 @@ export function parseTsconfig(
}

return config;
}
};
2 changes: 1 addition & 1 deletion src/parse-tsconfig/resolve-extends.ts → src/parse-tsconfig/resolve-extends-path.ts
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ function resolveFromPackageJsonPath(packageJsonPath: string) {
);
}

export function resolveExtends(
export function resolveExtendsPath(
requestedPath: string,
directoryPath: string,
) {
Expand Down