Skip to content

Commit

Permalink
fix: Remove obsolete id check
Browse files Browse the repository at this point in the history
This must have been from an old version of babel, but nowadays there is never an id field on an export-specifier
  • Loading branch information
danez committed Oct 30, 2021
1 parent 7b35e6f commit 66961d8
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 41 deletions.
69 changes: 33 additions & 36 deletions src/utils/__tests__/resolveExportDeclaration-test.ts
Original file line number Diff line number Diff line change
@@ -1,65 +1,62 @@
import { mocked } from 'ts-jest/utils';
import { statement, noopImporter } from '../../../tests/utils';
import resolveToValue from '../resolveToValue';
import resolveExportDeclaration from '../resolveExportDeclaration';
import { NodePath } from 'ast-types';
import { NodePath } from 'ast-types/lib/node-path';

jest.mock('../resolveToValue');
jest.mock('../resolveToValue', () => {
return (path: NodePath) => path;
});

describe('resolveExportDeclaration', () => {
const returnValue = new NodePath({});

beforeEach(() => {
mocked(resolveToValue).mockReturnValue(returnValue);
});

it('resolves default exports', () => {
const exp = statement('export default 42;');
const resolved = resolveExportDeclaration(exp, noopImporter);

expect(resolved).toEqual([returnValue]);
expect(resolveToValue).toBeCalledWith(exp.get('declaration'), noopImporter);
expect(resolved).toEqual([exp.get('declaration')]);
});

it('resolves named exports', () => {
let exp = statement('export var foo = 42, bar = 21;');
let resolved = resolveExportDeclaration(exp, noopImporter);
it('resolves named variable exports', () => {
const exp = statement('export var foo = 42, bar = 21;');
const resolved = resolveExportDeclaration(exp, noopImporter);

const declarations = exp.get('declaration', 'declarations');
expect(resolved).toEqual([returnValue, returnValue]);
expect(resolveToValue).toBeCalledWith(declarations.get(0), noopImporter);
expect(resolveToValue).toBeCalledWith(declarations.get(1), noopImporter);
expect(resolved).toEqual([declarations.get(0), declarations.get(1)]);
});

exp = statement('export function foo(){}');
resolved = resolveExportDeclaration(exp, noopImporter);
it('resolves named function exports', () => {
const exp = statement('export function foo(){}');
const resolved = resolveExportDeclaration(exp, noopImporter);

expect(resolved).toEqual([returnValue]);
expect(resolveToValue).toBeCalledWith(exp.get('declaration'), noopImporter);
expect(resolved).toEqual([exp.get('declaration')]);
});

exp = statement('export class Foo {}');
resolved = resolveExportDeclaration(exp, noopImporter);
it('resolves named class exports', () => {
const exp = statement('export class Foo {}');
const resolved = resolveExportDeclaration(exp, noopImporter);

expect(resolved).toEqual([returnValue]);
expect(resolveToValue).toBeCalledWith(exp.get('declaration'), noopImporter);
expect(resolved).toEqual([exp.get('declaration')]);
});

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

const specifiers = exp.get('specifiers');
expect(resolved).toEqual([returnValue, returnValue, returnValue]);
expect(resolveToValue).toBeCalledWith(
expect(resolved).toEqual([
specifiers.get(0, 'local'),
specifiers.get(1, 'local'),
specifiers.get(2, 'local'),
]);
});

it('resolves named exports from', () => {
const exp = statement('export {foo, bar, baz} from "";');
const resolved = resolveExportDeclaration(exp, noopImporter);

const specifiers = exp.get('specifiers');
expect(resolved).toEqual([
specifiers.get(0, 'local'),
noopImporter,
);
expect(resolveToValue).toBeCalledWith(
specifiers.get(1, 'local'),
noopImporter,
);
expect(resolveToValue).toBeCalledWith(
specifiers.get(2, 'local'),
noopImporter,
);
]);
});
});
6 changes: 1 addition & 5 deletions src/utils/resolveExportDeclaration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ export default function resolveExportDeclaration(
} else if (path.node.specifiers) {
path
.get('specifiers')
.each(specifier =>
definitions.push(
specifier.node.id ? specifier.get('id') : specifier.get('local'),
),
);
.each(specifier => definitions.push(specifier.get('local')));
}
return definitions.map(definition => resolveToValue(definition, importer));
}

0 comments on commit 66961d8

Please sign in to comment.