2.4.1

README.md

@@ -30,7 +30,7 @@ Then use it in package.json's script section to trigger a build:
 **Execution order of tasks**
 
 1. Install typings
-2. Compile TypeScript
+2. Transpile TypeScript with inline sourcemaps
 3. Create Declaration Files
 4. Instrumentalize created JavaScript files with istanbul
 5. Run Tests
@@ -62,6 +62,8 @@ npmts instrumentalizes the created JavaScript code to create a coverage report.
 When Typings have been installed, TypeScript + Declaration files have been transpiled and the resulting JS has been instrumentalized,
 npmts runs `.test/test.js` with mocha. 
 
+Any errors will be shown with reference to their originating source in TypeScript.
+
 When requiring the module from other TypeScript files,
 the TypeScript Compiler will use the declaration file to resolve typings.
 

compile/compile.js

@@ -4,7 +4,7 @@ var plugins = {
     gulp: require("gulp"),
     g:{
         typescript: require("gulp-typescript"),
-        insert: require("gulp-insert")
+        header: require("gulp-header")
     },
     mergeStream: require("merge2")
 
@@ -23,7 +23,7 @@ plugins.gulp.task('indexTS', function() {
     return plugins.mergeStream([
         tsResult.dts.pipe(plugins.gulp.dest('../')),
         tsResult.js
-            .pipe(plugins.g.insert.prepend('#!/usr/bin/env node\n\n'))
+            .pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
             .pipe(plugins.gulp.dest('../'))
     ]);
 });

index.d.ts

@@ -9,9 +9,11 @@ declare module NpmtsPlugins {
             header: any;
             istanbul: any;
             mocha: any;
+            sourcemaps: any;
             typescript: any;
         };
         mergeStream: any;
+        sourceMapSupport: any;
         path: any;
         q: any;
         smartcli: any;
@@ -46,9 +48,11 @@ declare var plugins: {
         header: any;
         istanbul: any;
         mocha: any;
+        sourcemaps: any;
         typescript: any;
     };
     mergeStream: any;
+    sourceMapSupport: any;
     path: any;
     q: any;
     smartcli: any;

index.js

@@ -13,9 +13,11 @@ var NpmtsPlugins;
                 header: require("gulp-header"),
                 istanbul: require("gulp-istanbul"),
                 mocha: require("gulp-mocha"),
+                sourcemaps: require("gulp-sourcemaps"),
                 typescript: require("gulp-typescript")
             },
             mergeStream: require("merge2"),
+            sourceMapSupport: require("source-map-support").install(),
             path: require("path"),
             q: require("q"),
             smartcli: require("smartcli"),
@@ -166,14 +168,17 @@ var NpmtsCompile;
                     }
                 })();
                 var tsStream = plugins.gulp.src(plugins.path.join(paths.cwd, key))
+                    .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
                     .pipe(plugins.g.typescript({
                     out: outputName,
                     declaration: true,
-                    target: "ES5"
+                    target: "ES5",
+                    module: "commonjs"
                 }));
                 var stream = plugins.mergeStream([
                     tsStream.dts.pipe(plugins.gulp.dest(outputDir)),
                     tsStream.js
+                        .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
                         .pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
                         .pipe(plugins.gulp.dest(outputDir))
                 ]);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "description": "write npm modules with TypeScript",
   "main": "index.js",
   "typings": "./index.d.ts",
@@ -33,12 +33,14 @@
     "gulp-header": "^1.7.1",
     "gulp-istanbul": "^0.10.3",
     "gulp-mocha": "^2.2.0",
+    "gulp-sourcemaps": "^1.6.0",
     "gulp-typescript": "2.11.0",
     "gulp-typings": "0.0.0",
     "merge2": "1.0.1",
     "q": "^1.4.1",
     "smartcli": "0.0.11",
     "smartfile": "0.0.11",
+    "source-map-support": "^0.4.0",
     "typings": "^0.6.8"
   }
 }

test/assets/index.js

@@ -7,3 +7,5 @@ var testplugin = {
     }
 };
 module.exports = testplugin;
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0QztBQUM1QyxJQUFJLFVBQVUsR0FBRztJQUNiLFlBQVksRUFBRTtRQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0osQ0FBQztBQUNGLE1BQU0sQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxudmFyIHRlc3RwbHVnaW4gPSB7XG4gICAgbG9nU29tZXRoaW5nOiBmdW5jdGlvbigpe1xuICAgICAgICBjb25zb2xlLmxvZyhcIm9ubHkgZnVuY3Rpb24gZXhlY3V0ZWRcIik7XG4gICAgfVxufTtcbm1vZHVsZS5leHBvcnRzID0gdGVzdHBsdWdpbjsiXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=

test/assets/test/test.js

@@ -10,3 +10,5 @@ describe("testplugins", function () {
         });
     });
 });
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsNENBQTRDO0FBQzVDLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztBQUN2QyxJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDeEMsUUFBUSxDQUFDLGFBQWEsRUFBQztJQUNuQixRQUFRLENBQUMsZUFBZSxFQUFDO1FBQ3JCLEVBQUUsQ0FBQyxzQkFBc0IsRUFBQztZQUN0QixVQUFVLENBQUMsWUFBWSxFQUFFLENBQUE7UUFDN0IsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDLENBQUMsQ0FBQztBQUNQLENBQUMsQ0FBQyxDQUFDIiwiZmlsZSI6InRlc3QuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XG5jb25zb2xlLmxvZyhcIioqKiogc3RhcnRpbmcgdGVzdCAqKioqXCIpO1xudmFyIHRlc3RwbHVnaW4gPSByZXF1aXJlKFwiLi4vaW5kZXguanNcIik7XG5kZXNjcmliZShcInRlc3RwbHVnaW5zXCIsZnVuY3Rpb24oKXtcbiAgICBkZXNjcmliZShcIi5sb2dTb21ldGhpbmdcIixmdW5jdGlvbigpe1xuICAgICAgICBpdChcInNob3VsZCBsb2cgc29tZXRoaW5nXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgICAgIHRlc3RwbHVnaW4ubG9nU29tZXRoaW5nKClcbiAgICAgICAgfSk7XG4gICAgfSk7XG59KTsiXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=

test/assets/ts/typings.json

@@ -1,6 +1,7 @@
 {
   "ambientDependencies": {
     "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777",
+    "mocha": "github:Bartvds/tsd-deftools/typings/DefinitelyTyped/mocha/mocha.d.ts",
     "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts#09e37435ffb2c56a6f908081194a74756f24f99d",
     "vinyl": "github:DefinitelyTyped/DefinitelyTyped/vinyl/vinyl.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777"
   }

ts/npmts.compile.ts

@@ -68,14 +68,17 @@ module NpmtsCompile {
                 })();
 
                 var tsStream = plugins.gulp.src(plugins.path.join(paths.cwd,key))
+                    .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
                     .pipe(plugins.g.typescript({
                         out: outputName,
                         declaration: true,
-                        target: "ES5"
+                        target: "ES5",
+                        module: "commonjs"
                     }));
                 var stream = plugins.mergeStream([
                     tsStream.dts.pipe(plugins.gulp.dest(outputDir)),
                     tsStream.js
+                        .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
                         .pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
                         .pipe(plugins.gulp.dest(outputDir))
                 ]);

ts/npmts.plugins.ts

@@ -10,10 +10,12 @@ module NpmtsPlugins {
                 header: require("gulp-header"),
                 istanbul: require("gulp-istanbul"),
                 mocha: require("gulp-mocha"),
+                sourcemaps: require("gulp-sourcemaps"),
                 typescript: require("gulp-typescript")
 
             },
             mergeStream: require("merge2"),
+            sourceMapSupport:require("source-map-support").install(),
             path: require("path"),
             q:require("q"),
             smartcli: require("smartcli"),