Skip to content

Commit 66961d8

Browse files
committed
fix: Remove obsolete id check
This must have been from an old version of babel, but nowadays there is never an id field on an export-specifier
1 parent 7b35e6f commit 66961d8

File tree

2 files changed

+34
-41
lines changed

2 files changed

+34
-41
lines changed
Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,62 @@
1-
import { mocked } from 'ts-jest/utils';
21
import { statement, noopImporter } from '../../../tests/utils';
3-
import resolveToValue from '../resolveToValue';
42
import resolveExportDeclaration from '../resolveExportDeclaration';
5-
import { NodePath } from 'ast-types';
3+
import { NodePath } from 'ast-types/lib/node-path';
64

7-
jest.mock('../resolveToValue');
5+
jest.mock('../resolveToValue', () => {
6+
return (path: NodePath) => path;
7+
});
88

99
describe('resolveExportDeclaration', () => {
10-
const returnValue = new NodePath({});
11-
12-
beforeEach(() => {
13-
mocked(resolveToValue).mockReturnValue(returnValue);
14-
});
15-
1610
it('resolves default exports', () => {
1711
const exp = statement('export default 42;');
1812
const resolved = resolveExportDeclaration(exp, noopImporter);
1913

20-
expect(resolved).toEqual([returnValue]);
21-
expect(resolveToValue).toBeCalledWith(exp.get('declaration'), noopImporter);
14+
expect(resolved).toEqual([exp.get('declaration')]);
2215
});
2316

24-
it('resolves named exports', () => {
25-
let exp = statement('export var foo = 42, bar = 21;');
26-
let resolved = resolveExportDeclaration(exp, noopImporter);
17+
it('resolves named variable exports', () => {
18+
const exp = statement('export var foo = 42, bar = 21;');
19+
const resolved = resolveExportDeclaration(exp, noopImporter);
2720

2821
const declarations = exp.get('declaration', 'declarations');
29-
expect(resolved).toEqual([returnValue, returnValue]);
30-
expect(resolveToValue).toBeCalledWith(declarations.get(0), noopImporter);
31-
expect(resolveToValue).toBeCalledWith(declarations.get(1), noopImporter);
22+
expect(resolved).toEqual([declarations.get(0), declarations.get(1)]);
23+
});
3224

33-
exp = statement('export function foo(){}');
34-
resolved = resolveExportDeclaration(exp, noopImporter);
25+
it('resolves named function exports', () => {
26+
const exp = statement('export function foo(){}');
27+
const resolved = resolveExportDeclaration(exp, noopImporter);
3528

36-
expect(resolved).toEqual([returnValue]);
37-
expect(resolveToValue).toBeCalledWith(exp.get('declaration'), noopImporter);
29+
expect(resolved).toEqual([exp.get('declaration')]);
30+
});
3831

39-
exp = statement('export class Foo {}');
40-
resolved = resolveExportDeclaration(exp, noopImporter);
32+
it('resolves named class exports', () => {
33+
const exp = statement('export class Foo {}');
34+
const resolved = resolveExportDeclaration(exp, noopImporter);
4135

42-
expect(resolved).toEqual([returnValue]);
43-
expect(resolveToValue).toBeCalledWith(exp.get('declaration'), noopImporter);
36+
expect(resolved).toEqual([exp.get('declaration')]);
4437
});
4538

4639
it('resolves named exports', () => {
4740
const exp = statement('export {foo, bar, baz}; var foo, bar, baz;');
4841
const resolved = resolveExportDeclaration(exp, noopImporter);
4942

5043
const specifiers = exp.get('specifiers');
51-
expect(resolved).toEqual([returnValue, returnValue, returnValue]);
52-
expect(resolveToValue).toBeCalledWith(
44+
expect(resolved).toEqual([
45+
specifiers.get(0, 'local'),
46+
specifiers.get(1, 'local'),
47+
specifiers.get(2, 'local'),
48+
]);
49+
});
50+
51+
it('resolves named exports from', () => {
52+
const exp = statement('export {foo, bar, baz} from "";');
53+
const resolved = resolveExportDeclaration(exp, noopImporter);
54+
55+
const specifiers = exp.get('specifiers');
56+
expect(resolved).toEqual([
5357
specifiers.get(0, 'local'),
54-
noopImporter,
55-
);
56-
expect(resolveToValue).toBeCalledWith(
5758
specifiers.get(1, 'local'),
58-
noopImporter,
59-
);
60-
expect(resolveToValue).toBeCalledWith(
6159
specifiers.get(2, 'local'),
62-
noopImporter,
63-
);
60+
]);
6461
});
6562
});

src/utils/resolveExportDeclaration.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ export default function resolveExportDeclaration(
2121
} else if (path.node.specifiers) {
2222
path
2323
.get('specifiers')
24-
.each(specifier =>
25-
definitions.push(
26-
specifier.node.id ? specifier.get('id') : specifier.get('local'),
27-
),
28-
);
24+
.each(specifier => definitions.push(specifier.get('local')));
2925
}
3026
return definitions.map(definition => resolveToValue(definition, importer));
3127
}

0 commit comments

Comments
 (0)