Skip to content

Emits safe value for import. #4355

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
mhegazy merged 2 commits into from
Aug 19, 2015
Merged

Emits safe value for import. #4355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
407c8be
Emits safe value for import.
DavidSouther Aug 19, 2015
45688e4
Added tests for commonjs safe import behavior.
DavidSouther Aug 19, 2015
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
2 changes: 1 addition & 1 deletion src/compiler/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ namespace ts {
// Make an identifier from an external module name by extracting the string after the last "/" and replacing
// all non-alphanumeric characters with underscores
export function makeIdentifierFromModuleName(moduleName: string): string {
return getBaseFileName(moduleName).replace(/\W/g, "_");
return getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_");
}

export function isBlockOrCatchScoped(declaration: Declaration) {
Expand Down
23 changes: 23 additions & 0 deletions tests/baselines/reference/commonjsSafeImport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//// [tests/cases/compiler/commonjsSafeImport.ts] ////

//// [10_lib.ts]

export function Foo() {}

//// [main.ts]
import { Foo } from './10_lib';

Foo();


//// [10_lib.js]
function Foo() { }
exports.Foo = Foo;
//// [main.js]
var _10_lib_1 = require('./10_lib');
_10_lib_1.Foo();


//// [10_lib.d.ts]
export declare function Foo(): void;
//// [main.d.ts]
12 changes: 12 additions & 0 deletions tests/baselines/reference/commonjsSafeImport.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
=== tests/cases/compiler/10_lib.ts ===

export function Foo() {}
>Foo : Symbol(Foo, Decl(10_lib.ts, 0, 0))

=== tests/cases/compiler/main.ts ===
import { Foo } from './10_lib';
>Foo : Symbol(Foo, Decl(main.ts, 0, 8))

Foo();
>Foo : Symbol(Foo, Decl(main.ts, 0, 8))

13 changes: 13 additions & 0 deletions tests/baselines/reference/commonjsSafeImport.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/10_lib.ts ===

export function Foo() {}
>Foo : () => void

=== tests/cases/compiler/main.ts ===
import { Foo } from './10_lib';
>Foo : () => void

Foo();
>Foo() : void
>Foo : () => void

11 changes: 11 additions & 0 deletions tests/cases/compiler/commonjsSafeImport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// @target: ES5
// @module: commonjs
// @declaration: true
// @filename: 10_lib.ts

export function Foo() {}

// @filename: main.ts
import { Foo } from './10_lib';

Foo();