Update source-map dependency.

This is needed to pick up the fix for mozilla/source-map#273

Closes angular#750

package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
-    "source-map": "^0.5.6",
+    "source-map": "^0.6.0",
     "source-map-support": "^0.5.0"
   },
   "peerDependencies": {
@@ -30,7 +30,6 @@
     "@types/minimist": "1.2.0",
     "@types/mkdirp": "0.5.2",
     "@types/node": "6.0.96",
-    "@types/source-map": "0.5.1",
     "@types/source-map-support": "0.4.0",
     "chai": "4.1.2",
     "chai-diff": "1.0.1",

src/source_map_utils.ts

@@ -6,9 +6,32 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {BasicSourceMapConsumer, RawSourceMap, SourceMapConsumer, SourceMapGenerator} from 'source-map';
+import {RawSourceMap, SourceMapConsumer, SourceMapGenerator} from 'source-map';
 import * as ts from './typescript';
 
+/**
+ * This interface was defined in @types/source-map but is absent from the typings
+ * distributed in the source-map package.
+ * Copied from https://unpkg.com/@types/source-map@0.5.2/index.d.ts
+ * see https://github.com/angular/tsickle/issues/750
+ */
+export interface BasicSourceMapConsumer extends SourceMapConsumer {
+  file: string;
+  sourceRoot: string;
+  sources: string[];
+  sourcesContent: string[];
+}
+
+/**
+ * The toJSON method is introduced in
+ * https://github.com/mozilla/source-map/commit/7c06ac83dd6d75e65f71727184a2d8630a15bf58#diff-7945f6bb445d956794564e098ef20bb3
+ * However there is a breaking change in 0.7.
+ * see https://github.com/angular/tsickle/issues/750
+ */
+export type SourceMapGeneratorToJson = SourceMapGenerator&{
+  toJSON(): RawSourceMap;
+};
+
 /**
  * Return a new RegExp object every time we want one because the
  * RegExp object has internal state that we don't want to persist
@@ -87,7 +110,7 @@ export function sourceMapConsumerToGenerator(sourceMapConsumer: SourceMapConsume
 export function sourceMapGeneratorToConsumer(
     sourceMapGenerator: SourceMapGenerator, fileName?: string,
     sourceName?: string): SourceMapConsumer {
-  const rawSourceMap = sourceMapGenerator.toJSON();
+  const rawSourceMap = (sourceMapGenerator as SourceMapGeneratorToJson).toJSON();
   if (sourceName) {
     rawSourceMap.sources = [sourceName];
   }
@@ -102,7 +125,11 @@ export function sourceMapTextToConsumer(sourceMapText: string): BasicSourceMapCo
   // IndexedSourceMapConsumer depending on if you pass in a RawSourceMap or a
   // RawIndexMap or the string json of either.  In this case we're passing in
   // the string for a RawSourceMap, so we always get a BasicSourceMapConsumer
-  return new SourceMapConsumer(sourceMapText) as BasicSourceMapConsumer;
+  //
+  // Note, the typings distributed with the library are missing this constructor overload,
+  // so we must type it as any, see https://github.com/angular/tsickle/issues/750
+  // tslint:disable-next-line no-any
+  return new SourceMapConsumer(sourceMapText as any) as BasicSourceMapConsumer;
 }
 
 export function sourceMapTextToGenerator(sourceMapText: string): SourceMapGenerator {

test/source_map_test.ts

@@ -10,7 +10,7 @@ import {expect} from 'chai';
 import {SourceMapConsumer, SourceMapGenerator} from 'source-map';
 import * as ts from 'typescript';
 
-import {SourceMapper, SourcePosition} from '../src/source_map_utils';
+import {SourceMapGeneratorToJson, SourceMapper, SourcePosition} from '../src/source_map_utils';
 import {annotate, AnnotatorHost} from '../src/tsickle';
 
 import {createProgramAndHost} from './test_support';
@@ -59,7 +59,7 @@ describe('source maps', () => {
     const annotated = annotate(
         program.getTypeChecker(), program.getSourceFile('input.ts')!,
         {pathToModuleName: () => 'input'}, host, program.getCompilerOptions(), sourceMapper);
-    const rawMap = sourceMapper.sourceMap.toJSON();
+    const rawMap = (sourceMapper.sourceMap as SourceMapGeneratorToJson).toJSON();
     const consumer = new SourceMapConsumer(rawMap);
     const lines = annotated.output.split('\n');
     // Uncomment to debug contents:

test/test_support.ts

@@ -10,13 +10,13 @@ import {assert, expect} from 'chai';
 import * as fs from 'fs';
 import * as glob from 'glob';
 import * as path from 'path';
-import {BasicSourceMapConsumer, SourceMapConsumer} from 'source-map';
+import {SourceMapConsumer} from 'source-map';
 import * as ts from 'typescript';
 
 import * as cliSupport from '../src/cli_support';
 import * as es5processor from '../src/es5processor';
 import {toClosureJS} from '../src/main';
-import {sourceMapTextToConsumer} from '../src/source_map_utils';
+import {BasicSourceMapConsumer, sourceMapTextToConsumer} from '../src/source_map_utils';
 import * as tsickle from '../src/tsickle';
 
 /** Base compiler options to be customized and exposed. */

yarn.lock

@@ -60,10 +60,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/source-map@0.5.1":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
-
 ansi-gray@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"