Remove fixExportClass (#107)

* Added failing tests.

* I'm not entirely sure what fixExportClass.js was supposed to do, in any case the current version of TS handles export class correctly.
Some new ts helpers were added, so the new version caused some things to fail.
I've changed it to use the helpers in the offical tslib package. Also there is now an "importHelper" option which only
import the correct ones, so it isn't necessary to import them in the plugin. I've changed the helperId to "tslib", and am doing the
resolve myself so it doesn't fail if the user isn't using rollup-plugin-node-resolve. I'm not entirely sure this is the best way of
doing it.

* Update package.json

* Make it node 7 compatible

Author: NaridaL

README.md

@@ -41,7 +41,7 @@ The following options are unique to `rollup-plugin-typescript`:
 * `typescript` overrides TypeScript used for transpilation
 
 ### TypeScript version
-[TypeScript 1.8.9](https://github.com/Microsoft/TypeScript/wiki/Roadmap#18) is used by default. Should your project require it, you can override the TypeScript version used for _transpiling the sources_.
+[TypeScript 2.6.2](https://github.com/Microsoft/TypeScript/wiki/Roadmap#26-october-2017) is used by default. Should your project require it, you can override the TypeScript version used for _transpiling the sources_.
 
 ```js
 typescript({

package-lock.json

@@ -30,19 +30,17 @@
     "compare-versions": "2.0.1",
     "object-assign": "^4.0.1",
     "rollup-pluginutils": "^1.3.1",
-    "tippex": "^2.1.1"
+    "tippex": "^2.1.1",
+    "tslib": ">=1.9.0",
+    "typescript": ">=2.6.2"
   },
   "devDependencies": {
     "buble": "^0.13.1",
     "eslint": "^2.13.1",
     "mocha": "^3.0.0",
     "rimraf": "^2.5.4",
     "rollup": "^0.49.3",
-    "rollup-plugin-buble": "^0.13.0",
-    "typescript": "^1.8.9"
-  },
-  "peerDependencies": {
-    "typescript": ">=1.8.9"
+    "rollup-plugin-buble": "^0.13.0"
   },
   "repository": {
     "type": "git",

package.json

@@ -7,7 +7,6 @@ import compareVersions from 'compare-versions';
 
 import { endsWith } from './string';
 import { getDefaultOptions, compilerOptionsFromTsConfig, adjustCompilerOptions } from './options.js';
-import fixExportClass from './fixExportClass';
 import resolveHost from './resolveHost';
 
 /*
@@ -21,8 +20,8 @@ interface Options {
 */
 
 // The injected id for helpers. Intentially invalid to prevent helpers being included in source maps.
-const helpersId = '\0typescript-helpers';
-const helpersSource = fs.readFileSync( path.resolve( __dirname, '../src/typescript-helpers.js' ), 'utf-8' );
+const helpersId = 'tslib';
+const helpersSource = fs.readFileSync( path.resolve( __dirname, '../node_modules/tslib/tslib.es6.js' ), 'utf-8' );
 
 export default function typescript ( options ) {
 	options = assign( {}, options || {} );
@@ -108,7 +107,7 @@ export default function typescript ( options ) {
 		transform ( code, id ) {
 			if ( !filter( id ) ) return null;
 
-			const transformed = typescript.transpileModule( fixExportClass( code, id ), {
+			const transformed = typescript.transpileModule( code, {
 				fileName: id,
 				reportDiagnostics: true,
 				compilerOptions
@@ -141,9 +140,7 @@ export default function typescript ( options ) {
 			}
 
 			return {
-				// Always append an import for the helpers.
-				code: transformed.outputText +
-					`\nimport { __assign, __awaiter, __extends, __decorate, __metadata, __param } from '${helpersId}';`,
+				code: transformed.outputText,
 
 				// Rollup expects `map` to be an object so we must parse the string
 				map: transformed.sourceMapText ? JSON.parse(transformed.sourceMapText) : null

src/fixExportClass.js

@@ -9,7 +9,8 @@ export function getDefaultOptions () {
 	return {
 		noEmitHelpers: true,
 		module: 'es2015',
-		sourceMap: true
+		sourceMap: true,
+		importHelpers: true
 	};
 }
 

src/index.js

@@ -0,0 +1,6 @@
+export function test() {
+	return 0;
+}
+export namespace test {
+	export const foo = "2"
+}

src/options.js

@@ -0,0 +1,7 @@
+// https://github.com/rollup/rollup-plugin-typescript/issues/70#issuecomment-336216349
+
+// test.ts
+export namespace MODE {
+	export class MODE {
+	}
+}

src/typescript-helpers.js

@@ -2,6 +2,7 @@ const assert = require( 'assert' );
 const rollup = require( 'rollup' );
 const assign = require( 'object-assign' );
 const typescript = require( '..' );
+const fs = require('fs');
 
 process.chdir( __dirname );
 
@@ -15,11 +16,17 @@ async function evaluate ( bundle ) {
 }
 
 // Short-hand for rollup using the typescript plugin.
-function bundle ( main, options ) {
-	return rollup.rollup({
+function bundle (main, options) {
+	const result = rollup.rollup({
 		input: main,
-		plugins: [ typescript( options ) ]
+		plugins: [typescript(options)]
 	});
+	result
+		.then(bundle => bundle.generate({ format: 'cjs' }))
+		.then(res => {
+			fs.writeFileSync(main + '.out', res.code);
+		});
+	return result;
 }
 
 describe( 'rollup-plugin-typescript', function () {
@@ -59,17 +66,21 @@ describe( 'rollup-plugin-typescript', function () {
 		const b = await bundle( 'sample/export-class-fix/main.ts' );
 		const { code } = await b.generate({ format: 'es' });
 
-		assert.equal( code.indexOf( 'class' ), -1, code );
-		assert.ok( code.indexOf( 'var A = (function' ) !== -1, code );
-		assert.ok( code.indexOf( 'var B = (function' ) !== -1, code );
 		assert.ok( code.indexOf( 'export { A, B };' ) !== -1, code );
+
+		const { A, B } = await evaluate(b);
+		const aInst = new A();
+		const bInst = new B();
+		assert.ok(aInst instanceof A);
+		assert.ok(bInst instanceof B);
+
+
 	});
 
 	it( 'transpiles ES6 features to ES5 with source maps', async () => {
 		const b = await bundle( 'sample/import-class/main.ts' );
 		const { code } = await b.generate({ format: 'es' });
 
-		assert.equal( code.indexOf( 'class' ), -1, code );
 		assert.equal( code.indexOf( '...' ), -1, code );
 		assert.equal( code.indexOf( '=>' ), -1, code );
 	});
@@ -176,7 +187,7 @@ describe( 'rollup-plugin-typescript', function () {
 		const b = await bundle( 'sample/jsx/main.tsx', { jsx: 'react' });
 		const { code } = await b.generate({ format: 'es' });
 
-		assert.notEqual( code.indexOf( 'const __assign = ' ), -1,
+		assert.notEqual( code.indexOf( 'var __assign = ' ), -1,
 			'should contain __assign definition' );
 
 		const usage = code.indexOf( 'React.createElement("span", __assign({}, props), "Yo!")' );
@@ -217,6 +228,22 @@ describe( 'rollup-plugin-typescript', function () {
 
 		assert.ok( map.sources.every( source => source.indexOf( 'typescript-helpers' ) === -1) );
 	});
+
+	it( 'should allow a namespace containing a class', async () => {
+		const b = await bundle( 'sample/export-namespace-export-class/test.ts');
+		const MODE = (await evaluate(b)).MODE.MODE;
+		const mode = new MODE();
+
+		assert.ok(mode instanceof MODE);
+	});
+
+	it( 'should allow merging an exported function and namespace', async () => {
+		const b = await bundle( 'sample/export-fodule/main.ts');
+		const f = (await evaluate(b)).test;
+
+		assert.equal(f(), 0);
+		assert.equal(f.foo, "2");
+	});
 });
 
 function fakeTypescript ( custom ) {