Merge branch 'lephyrus-master'

Author: ezolenko

dist/index.d.ts

@@ -1,5 +1,5 @@
 import { IRollupContext } from "./context";
-import { ICode } from "./tscache";
+import { IRollupCode } from "./tscache";
 import { IRollupOptions } from "./irollup-options";
 import { IOptions } from "./ioptions";
 import { Partial } from "./partial";
@@ -8,7 +8,7 @@ export default function typescript(options?: Partial<IOptions>): {
     options(config: IRollupOptions): void;
     resolveId(importee: string, importer: string): string | null;
     load(id: string): string | undefined;
-    transform(this: IRollupContext, code: string, id: string): ICode | undefined;
+    transform(this: IRollupContext, code: string, id: string): IRollupCode | undefined;
     ongenerate(): void;
     onwrite({ dest, file }: IRollupOptions): void;
 };

dist/ioptions.d.ts

@@ -13,4 +13,5 @@ export interface IOptions {
     typescript: typeof tsModule;
     tsconfigOverride: any;
     tsconfigDefaults: any;
+    sourceMapCallback: (id: string, map: string) => void;
 }

dist/rollup-plugin-typescript2.cjs.js

@@ -23,6 +23,9 @@ MERCHANTABLITY OR NON-INFRINGEMENT.
 See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
+/* global Reflect, Promise */
+
+
 
 var __assign = Object.assign || function __assign(t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -38,11 +41,21 @@ function commonjsRequire () {
 	throw new Error('Dynamic requires are not currently supported by rollup-plugin-commonjs');
 }
 
+
+
 function createCommonjsModule(fn, module) {
 	return module = { exports: {} }, fn(module, module.exports), module.exports;
 }
 
 var lodash = createCommonjsModule(function (module, exports) {
+/**
+ * @license
+ * Lodash <https://lodash.com/>
+ * Copyright JS Foundation and other contributors <https://js.foundation/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ */
 (function() {
 
   /** Used as a safe reference for `undefined` in pre-ES5 environments. */
@@ -17120,6 +17133,7 @@ var lodash = createCommonjsModule(function (module, exports) {
   }
 }.call(commonjsGlobal));
 });
+
 var lodash_1 = lodash.get;
 var lodash_2 = lodash.each;
 var lodash_3 = lodash.isEqual;
@@ -17300,25 +17314,25 @@ var LanguageServiceHost = /** @class */ (function () {
 
 /* global window */
 
-var lodash$1;
+var lodash$2;
 
 if (typeof commonjsRequire === "function") {
   try {
-    lodash$1 = lodash;
+    lodash$2 = lodash;
   } catch (e) {}
 }
 
-if (!lodash$1) {
-  lodash$1 = window._;
+if (!lodash$2) {
+  lodash$2 = window._;
 }
 
-var lodash_1$1 = lodash$1;
+var lodash_1$1 = lodash$2;
 
 var graph = Graph;
 
-var DEFAULT_EDGE_NAME = "\x00",
-    GRAPH_NODE = "\x00",
-    EDGE_KEY_DELIM = "\x01";
+var DEFAULT_EDGE_NAME = "\x00";
+var GRAPH_NODE = "\x00";
+var EDGE_KEY_DELIM = "\x01";
 
 // Implementation notes:
 //
@@ -18456,36 +18470,11 @@ var graphlib = {
   alg: alg,
   version: lib.version
 };
+
 var graphlib_1 = graphlib.Graph;
 var graphlib_3 = graphlib.alg;
 
 var objectHash_1 = createCommonjsModule(function (module, exports) {
-
-
-
-/**
- * Exported function
- *
- * Options:
- *
- *  - `algorithm` hash algo to be used by this instance: *'sha1', 'md5'
- *  - `excludeValues` {true|*false} hash object keys, values ignored
- *  - `encoding` hash encoding, supports 'buffer', '*hex', 'binary', 'base64'
- *  - `ignoreUnknown` {true|*false} ignore unknown object types
- *  - `replacer` optional function that replaces values before hashing
- *  - `respectFunctionProperties` {*true|false} consider function properties when hashing
- *  - `respectFunctionNames` {*true|false} consider 'name' property of functions for hashing
- *  - `respectType` {*true|false} Respect special properties (prototype, constructor)
- *    when hashing to distinguish between types
- *  - `unorderedArrays` {true|*false} Sort all arrays before hashing
- *  - `unorderedSets` {*true|false} Sort `Set` and `Map` instances before hashing
- *  * = default
- *
- * @param {object} object value to hash
- * @param {object} options hashing options
- * @return {string} hash value
- * @api public
- */
 exports = module.exports = objectHash;
 
 function objectHash(object, options){
@@ -18897,6 +18886,7 @@ function PassThrough() {
   };
 }
 });
+
 var objectHash_2 = objectHash_1.sha1;
 var objectHash_3 = objectHash_1.keys;
 var objectHash_4 = objectHash_1.MD5;
@@ -19514,6 +19504,7 @@ var safe = createCommonjsModule(function (module) {
 
 module['exports'] = colors_1;
 });
+
 var safe_1 = safe.green;
 var safe_2 = safe.white;
 var safe_3 = safe.red;
@@ -19962,7 +19953,7 @@ function typescript(options) {
                 var dts = lodash_11(output.outputFiles, function (entry) { return lodash_6(entry.name, ".d.ts"); });
                 return {
                     code: transpiled ? transpiled.text : undefined,
-                    map: map ? JSON.parse(map.text) : { mappings: "" },
+                    map: map ? map.text : undefined,
                     dts: dts,
                 };
             });
@@ -19976,13 +19967,21 @@ function typescript(options) {
                     noErrors = false;
                 printDiagnostics(contextWrapper, diagnostics, parsedConfig.options.pretty === true);
             }
-            if (result && result.dts) {
-                var key_1 = normalize(id);
-                declarations[key_1] = result.dts;
-                context.debug(function () { return safe_5("generated declarations") + " for '" + key_1 + "'"; });
-                result.dts = undefined;
+            if (result) {
+                if (result.dts) {
+                    var key_1 = normalize(id);
+                    declarations[key_1] = result.dts;
+                    context.debug(function () { return safe_5("generated declarations") + " for '" + key_1 + "'"; });
+                }
+                var transformResult = { code: result.code, map: { mappings: "" } };
+                if (result.map) {
+                    if (pluginOptions.sourceMapCallback)
+                        pluginOptions.sourceMapCallback(id, result.map);
+                    transformResult.map = JSON.parse(result.map);
+                }
+                return transformResult;
             }
-            return result;
+            return undefined;
         },
         ongenerate: function () {
             context.debug(function () { return "generating target " + (generateRound + 1); });