Skip to content

fix: should redirect import_require_clause statement in dts #945

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

Merged
Timeless0911 merged 1 commit into from
Apr 22, 2025
Merged

fix: should redirect import_require_clause statement in dts #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions packages/plugin-dts/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ export async function redirectDtsImports(
const matcher: NapiConfig = {
rule: {
any: [
// import foo from 'bar'
{
kind: 'import_statement',
has: {
Expand All @@ -224,6 +225,21 @@ export async function redirectDtsImports(
},
},
},
// import foo = require('bar')
{
kind: 'import_statement',
has: {
kind: 'import_require_clause',
has: {
field: 'source',
has: {
pattern: '$IMP',
kind: 'string_fragment',
},
},
},
},
// export { foo } from 'bar'
{
kind: 'export_statement',
has: {
Expand All @@ -234,6 +250,7 @@ export async function redirectDtsImports(
},
},
},
// require('foo') / import('foo')
{
any: [{ pattern: 'require($A)' }, { pattern: 'import($A)' }],
has: {
Expand Down
18 changes: 12 additions & 6 deletions tests/integration/redirect/dts.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ test('redirect.dts.path: true with redirect.dts.extension: false - default', asy
import type { Baz } from './';
import type { LoggerOptions } from './types';
import { defaultOptions } from './types.js';
export { type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
import sources = require('./logger');
export { sources, type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
export type { Foo } from './types';
export type { Bar } from './types';
export * from './foo';
Expand Down Expand Up @@ -71,7 +72,8 @@ test('redirect.dts.path: false with redirect.dts.extension: false', async () =>
import type { Baz } from 'self-entry';
import type { LoggerOptions } from './types';
import { defaultOptions } from './types.js';
export { type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
import sources = require('@src/logger');
export { sources, type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
export type { Foo } from '@src/types';
export type { Bar } from 'types';
export * from './foo';
Expand Down Expand Up @@ -118,7 +120,8 @@ test('redirect.dts.path: true with redirect.dts.extension: true', async () => {
import type { Baz } from './index.js';
import type { LoggerOptions } from './types.js';
import { defaultOptions } from './types.js';
export { type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
import sources = require('./logger.js');
export { sources, type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
export type { Foo } from './types.js';
export type { Bar } from './types.js';
export * from './foo/index.js';
Expand Down Expand Up @@ -165,7 +168,8 @@ test('redirect.dts.path: false with dts.redirect.extension: true', async () => {
import type { Baz } from 'self-entry';
import type { LoggerOptions } from './types.js';
import { defaultOptions } from './types.js';
export { type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
import sources = require('@src/logger');
export { sources, type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
export type { Foo } from '@src/types';
export type { Bar } from 'types';
export * from './foo/index.js';
Expand Down Expand Up @@ -219,7 +223,8 @@ test('redirect.dts.extension: true with dts.autoExtension: true', async () => {
import type { Baz } from './index.mjs';
import type { LoggerOptions } from './types.mjs';
import { defaultOptions } from './types.mjs';
export { type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
import sources = require('./logger.mjs');
export { sources, type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
export type { Foo } from './types.mjs';
export type { Bar } from './types.mjs';
export * from './foo/index.mjs';
Expand All @@ -233,7 +238,8 @@ test('redirect.dts.extension: true with dts.autoExtension: true', async () => {
import type { Baz } from './index.js';
import type { LoggerOptions } from './types.js';
import { defaultOptions } from './types.js';
export { type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
import sources = require('./logger.js');
export { sources, type Baz as self, logRequest, logger, type LoggerOptions, defaultOptions, };
export type { Foo } from './types.js';
export type { Bar } from './types.js';
export * from './foo/index.js';
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/redirect/dts/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ import { logger } from 'rslog';
import type { Baz } from 'self-entry';
import type { LoggerOptions } from './types';
import { defaultOptions } from './types.js';
import sources = require('@src/logger');

export {
sources,
type Baz as self,
logRequest,
logger,
Expand Down
Loading