rollup 1.16.4 → 1.17.0

package/dist/rollup.d.ts

@@ -38,6 +38,21 @@ export interface RollupLogProps {
 	url?: string;
 }
 
+export type SourceMapSegment =
+	| [number]
+	| [number, number, number, number]
+	| [number, number, number, number, number];
+
+export interface ExistingDecodedSourceMap {
+	file?: string;
+	mappings: SourceMapSegment[][];
+	names: string[];
+	sourceRoot?: string;
+	sources: string[];
+	sourcesContent?: string[];
+	version: number;
+}
+
 export interface ExistingRawSourceMap {
 	file?: string;
 	mappings: string;
@@ -48,7 +63,13 @@ export interface ExistingRawSourceMap {
 	version: number;
 }
 
-export type RawSourceMap = { mappings: '' } | ExistingRawSourceMap;
+export type DecodedSourceMapOrMissing =
+	| {
+			mappings?: never;
+			missing: true;
+			plugin: string;
+	  }
+	| ExistingDecodedSourceMap;
 
 export interface SourceMap {
 	file: string;
@@ -61,10 +82,12 @@ export interface SourceMap {
 	toUrl(): string;
 }
 
+export type SourceMapInput = ExistingRawSourceMap | string | null | { mappings: '' };
+
 export interface SourceDescription {
 	ast?: ESTree.Program;
 	code: string;
-	map?: string | RawSourceMap;
+	map?: SourceMapInput;
 	moduleSideEffects?: boolean | null;
 }
 
@@ -79,9 +102,9 @@ export interface TransformModuleJSON {
 	customTransformCache: boolean;
 	moduleSideEffects: boolean | null;
 	originalCode: string;
-	originalSourcemap: RawSourceMap | null;
+	originalSourcemap: ExistingDecodedSourceMap | null;
 	resolvedIds?: ResolvedIdMap;
-	sourcemapChain: (RawSourceMap | { missing: true; plugin: string })[];
+	sourcemapChain: DecodedSourceMapOrMissing[];
 	transformDependencies: string[] | null;
 }
 
@@ -207,8 +230,8 @@ export type TransformChunkHook = (
 	code: string,
 	options: OutputOptions
 ) =>
-	| Promise<{ code: string; map: RawSourceMap } | null | undefined>
-	| { code: string; map: RawSourceMap }
+	| Promise<{ code: string; map?: SourceMapInput } | null | undefined>
+	| { code: string; map?: SourceMapInput }
 	| null
 	| undefined;
 
@@ -218,8 +241,8 @@ export type RenderChunkHook = (
 	chunk: RenderedChunk,
 	options: OutputOptions
 ) =>
-	| Promise<{ code: string; map: RawSourceMap } | null>
-	| { code: string; map: RawSourceMap }
+	| Promise<{ code: string; map?: SourceMapInput } | null>
+	| { code: string; map?: SourceMapInput }
 	| string
 	| null;
 

package/dist/rollup.es.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v1.16.4
-	Tue, 02 Jul 2019 07:13:42 GMT - commit 2896755cc61fc360c0b59d196eb04d705a38b633
+	Rollup.js v1.17.0
+	Mon, 15 Jul 2019 04:31:04 GMT - commit 5d1541a577b06d9004a3533bde672761e5798482
 
 
 	https://github.com/rollup/rollup
@@ -16,7 +16,7 @@ import { tokTypes, Parser } from 'acorn';
 import { EventEmitter } from 'events';
 import module$1 from 'module';
 
-var version = "1.16.4";
+var version = "1.17.0";
 
 var minimalisticAssert = assert;
 function assert(val, msg) {
@@ -583,13 +583,13 @@ function decode(mappings) {
         var c = mappings.charCodeAt(i);
         if (c === 44) { // ","
             if (segment.length)
-                line.push(new Int32Array(segment));
+                line.push(segment);
             segment = [];
             j = 0;
         }
         else if (c === 59) { // ";"
             if (segment.length)
-                line.push(new Int32Array(segment));
+                line.push(segment);
             segment = [];
             j = 0;
             decoded.push(line);
@@ -609,26 +609,30 @@ function decode(mappings) {
             }
             else {
                 var shouldNegate = value & 1;
-                value >>= 1;
-                var num = shouldNegate ? -value : value;
+                value >>>= 1;
+                if (shouldNegate) {
+                    value = -value;
+                    if (value === 0)
+                        value = -0x80000000;
+                }
                 if (j == 0) {
-                    generatedCodeColumn += num;
+                    generatedCodeColumn += value;
                     segment.push(generatedCodeColumn);
                 }
                 else if (j === 1) {
-                    sourceFileIndex += num;
+                    sourceFileIndex += value;
                     segment.push(sourceFileIndex);
                 }
                 else if (j === 2) {
-                    sourceCodeLine += num;
+                    sourceCodeLine += value;
                     segment.push(sourceCodeLine);
                 }
                 else if (j === 3) {
-                    sourceCodeColumn += num;
+                    sourceCodeColumn += value;
                     segment.push(sourceCodeColumn);
                 }
                 else if (j === 4) {
-                    nameIndex += num;
+                    nameIndex += value;
                     segment.push(nameIndex);
                 }
                 j++;
@@ -637,7 +641,7 @@ function decode(mappings) {
         }
     }
     if (segment.length)
-        line.push(new Int32Array(segment));
+        line.push(segment);
     decoded.push(line);
     return decoded;
 }
@@ -683,7 +687,7 @@ function encodeInteger(num) {
     num = num < 0 ? (-num << 1) | 1 : num << 1;
     do {
         var clamped = num & 31;
-        num >>= 5;
+        num >>>= 5;
         if (num > 0) {
             clamped |= 32;
         }
@@ -8276,6 +8280,8 @@ function isReference(node, parent) {
         return !node.computed && isReference(node.object, node);
     }
     if (node.type === 'Identifier') {
+        if (!parent)
+            return true;
         switch (parent.type) {
             // disregard `bar` in `foo.bar`
             case 'MemberExpression': return parent.computed || node === parent.object;
@@ -11667,7 +11673,7 @@ class MetaProperty extends NodeBase {
                     }
                 ]);
             }
-            code.overwrite(parent.start, parent.end, replacement);
+            code.overwrite(parent.start, parent.end, replacement, { contentOnly: true });
             return;
         }
         const replacement = pluginDriver.hookFirstSync('resolveImportMeta', [
@@ -11680,10 +11686,10 @@ class MetaProperty extends NodeBase {
         ]);
         if (typeof replacement === 'string') {
             if (parent instanceof MemberExpression) {
-                code.overwrite(parent.start, parent.end, replacement);
+                code.overwrite(parent.start, parent.end, replacement, { contentOnly: true });
             }
             else {
-                code.overwrite(this.start, this.end, replacement);
+                code.overwrite(this.start, this.end, replacement, { contentOnly: true });
             }
         }
     }
@@ -12788,6 +12794,7 @@ const nodeConstructors = {
 };
 
 function getOriginalLocation(sourcemapChain, location) {
+    // This cast is guaranteed. If it were a missing Map, it wouldn't have a mappings.
     const filteredSourcemapChain = sourcemapChain.filter(sourcemap => sourcemap.mappings);
     while (filteredSourcemapChain.length > 0) {
         const sourcemap = filteredSourcemapChain.pop();
@@ -12796,12 +12803,12 @@ function getOriginalLocation(sourcemapChain, location) {
         if (line !== undefined) {
             for (const segment of line) {
                 if (segment[0] >= location.column) {
-                    if (segment.length < 4)
+                    if (segment.length === 1)
                         break;
                     location = {
                         column: segment[3],
                         line: segment[2] + 1,
-                        name: sourcemap.names[segment[4]],
+                        name: segment.length === 5 ? sourcemap.names[segment[4]] : undefined,
                         source: sourcemap.sources[segment[1]]
                     };
                     locationFound = true;
@@ -12850,13 +12857,13 @@ base$1.WithStatement = function (node, st, c) {
 };
 base$1.SwitchStatement = function (node, st, c) {
   c(node.discriminant, st, "Expression");
-  for (var i = 0, list = node.cases; i < list.length; i += 1) {
-    var cs = list[i];
+  for (var i$1 = 0, list$1 = node.cases; i$1 < list$1.length; i$1 += 1) {
+    var cs = list$1[i$1];
 
     if (cs.test) { c(cs.test, st, "Expression"); }
-    for (var i$1 = 0, list$1 = cs.consequent; i$1 < list$1.length; i$1 += 1)
+    for (var i = 0, list = cs.consequent; i < list.length; i += 1)
       {
-      var cons = list$1[i$1];
+      var cons = list[i];
 
       c(cons, st, "Statement");
     }
@@ -13051,7 +13058,7 @@ base$1.ImportDeclaration = function (node, st, c) {
   }
   c(node.source, st, "Expression");
 };
-base$1.ImportSpecifier = base$1.ImportDefaultSpecifier = base$1.ImportNamespaceSpecifier = base$1.Identifier = base$1.Literal = ignore;
+base$1.ImportSpecifier = base$1.ImportDefaultSpecifier = base$1.ImportNamespaceSpecifier = base$1.Identifier = base$1.Literal = base$1.Import = ignore;
 
 base$1.TaggedTemplateExpression = function (node, st, c) {
   c(node.tag, st, "Expression");
@@ -13358,20 +13365,15 @@ class Module {
     getDynamicImportExpressions() {
         return this.dynamicImports.map(({ node }) => {
             const importArgument = node.parent.arguments[0];
-            if (importArgument instanceof TemplateLiteral) {
-                if (importArgument.expressions.length === 0 && importArgument.quasis.length === 1) {
-                    return importArgument.quasis[0].value.cooked;
-                }
+            if (importArgument instanceof TemplateLiteral &&
+                importArgument.quasis.length === 1 &&
+                importArgument.quasis[0].value.cooked) {
+                return importArgument.quasis[0].value.cooked;
             }
-            else if (importArgument instanceof Literal) {
-                if (typeof importArgument.value === 'string') {
-                    return importArgument.value;
-                }
+            if (importArgument instanceof Literal && typeof importArgument.value === 'string') {
+                return importArgument.value;
             }
-            else {
-                return importArgument;
-            }
-            return undefined;
+            return importArgument;
         });
     }
     getExportNamesByVariable() {
@@ -13834,10 +13836,12 @@ class Link {
         for (const line of this.mappings) {
             const tracedLine = [];
             for (const segment of line) {
+                if (segment.length == 1)
+                    continue;
                 const source = this.sources[segment[1]];
                 if (!source)
                     continue;
-                const traced = source.traceSegment(segment[2], segment[3], this.names[segment[4]]);
+                const traced = source.traceSegment(segment[2], segment[3], segment.length === 5 ? this.names[segment[4]] : '');
                 if (traced) {
                     // newer sources are more likely to be used, so search backwards.
                     let sourceIndex = sources.lastIndexOf(traced.source.filename);
@@ -13887,10 +13891,12 @@ class Link {
             const m = (i + j) >> 1;
             const segment = segments[m];
             if (segment[0] === column) {
+                if (segment.length == 1)
+                    return null;
                 const source = this.sources[segment[1]];
                 if (!source)
                     return null;
-                return source.traceSegment(segment[2], segment[3], this.names[segment[4]] || name);
+                return source.traceSegment(segment[2], segment[3], segment.length === 5 ? this.names[segment[4]] : name);
             }
             if (segment[0] > column) {
                 j = m - 1;
@@ -13902,50 +13908,46 @@ class Link {
         return null;
     }
 }
-// TODO TypeScript: Fix <any> typecasts
-function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, excludeContent) {
-    function linkMap(source, map) {
-        if (map.missing) {
-            bundle.graph.warn({
-                code: 'SOURCEMAP_BROKEN',
-                message: `Sourcemap is likely to be incorrect: a plugin${map.plugin ? ` ('${map.plugin}')` : ``} was used to transform files, but didn't generate a sourcemap for the transformation. Consult the plugin documentation for help`,
-                plugin: map.plugin,
-                url: `https://rollupjs.org/guide/en/#warning-sourcemap-is-likely-to-be-incorrect`
-            });
-            map = {
-                mappings: '',
-                names: []
-            };
+function getLinkMap(graph) {
+    return function linkMap(source, map) {
+        if (map.mappings) {
+            return new Link(map, [source]);
         }
-        return new Link(map, [source]);
+        graph.warn({
+            code: 'SOURCEMAP_BROKEN',
+            message: `Sourcemap is likely to be incorrect: a plugin${map.plugin ? ` ('${map.plugin}')` : ``} was used to transform files, but didn't generate a sourcemap for the transformation. Consult the plugin documentation for help`,
+            plugin: map.plugin,
+            url: `https://rollupjs.org/guide/en/#warning-sourcemap-is-likely-to-be-incorrect`
+        });
+        return new Link({
+            mappings: [],
+            names: []
+        }, [source]);
+    };
+}
+function getCollapsedSourcemap(id, originalCode, originalSourcemap, sourcemapChain, linkMap) {
+    let source;
+    if (!originalSourcemap) {
+        source = new Source(id, originalCode);
     }
+    else {
+        const sources = originalSourcemap.sources;
+        const sourcesContent = originalSourcemap.sourcesContent || [];
+        // TODO indiscriminately treating IDs and sources as normal paths is probably bad.
+        const directory = dirname(id) || '.';
+        const sourceRoot = originalSourcemap.sourceRoot || '.';
+        const baseSources = sources.map((source, i) => new Source(resolve(directory, sourceRoot, source), sourcesContent[i]));
+        source = new Link(originalSourcemap, baseSources);
+    }
+    return sourcemapChain.reduce(linkMap, source);
+}
+function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, excludeContent) {
+    const linkMap = getLinkMap(bundle.graph);
     const moduleSources = modules
         .filter(module => !module.excludeFromSourcemap)
-        .map(module => {
-        let sourcemapChain = module.sourcemapChain;
-        let source;
-        const originalSourcemap = module.originalSourcemap;
-        if (!originalSourcemap) {
-            source = new Source(module.id, module.originalCode);
-        }
-        else {
-            const sources = originalSourcemap.sources;
-            const sourcesContent = originalSourcemap.sourcesContent || [];
-            if (sources == null || (sources.length <= 1 && sources[0] == null)) {
-                source = new Source(module.id, sourcesContent[0]);
-                sourcemapChain = [originalSourcemap].concat(sourcemapChain);
-            }
-            else {
-                // TODO indiscriminately treating IDs and sources as normal paths is probably bad.
-                const directory = dirname(module.id) || '.';
-                const sourceRoot = originalSourcemap.sourceRoot || '.';
-                const baseSources = sources.map((source, i) => new Source(resolve(directory, sourceRoot, source), sourcesContent[i]));
-                source = new Link(originalSourcemap, baseSources);
-            }
-        }
-        source = sourcemapChain.reduce(linkMap, source);
-        return source;
-    });
+        .map(module => getCollapsedSourcemap(module.id, module.originalCode, module.originalSourcemap, module.sourcemapChain, linkMap));
+    // DecodedSourceMap (from magic-string) uses a number[] instead of the more
+    // correct SourceMapSegment tuples. Cast it here to gain type safety.
     let source = new Link(map, moduleSources);
     source = bundleSourcemapChain.reduce(linkMap, source);
     let { sources, sourcesContent, names, mappings } = source.traceMappings();
@@ -13957,6 +13959,14 @@ function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain, ex
     sourcesContent = (excludeContent ? null : sourcesContent);
     return new SourceMap({ file, sources, sourcesContent, names, mappings });
 }
+function collapseSourcemap(graph, id, originalCode, originalSourcemap, sourcemapChain) {
+    if (!sourcemapChain.length) {
+        return originalSourcemap;
+    }
+    const source = getCollapsedSourcemap(id, originalCode, originalSourcemap, sourcemapChain, getLinkMap(graph));
+    const map = source.traceMappings();
+    return Object.assign({ version: 3 }, map);
+}
 
 const DECONFLICT_IMPORTED_VARIABLES_BY_FORMAT = {
     amd: deconflictImportsOther,
@@ -14153,6 +14163,30 @@ function getIndentString(modules, options) {
     return '\t';
 }
 
+function decodedSourcemap(map) {
+    if (!map)
+        return null;
+    if (typeof map === 'string') {
+        map = JSON.parse(map);
+    }
+    if (map.mappings === '') {
+        return {
+            mappings: [],
+            names: [],
+            sources: [],
+            version: 3
+        };
+    }
+    let mappings;
+    if (typeof map.mappings === 'string') {
+        mappings = decode(map.mappings);
+    }
+    else {
+        mappings = map.mappings;
+    }
+    return Object.assign({}, map, { mappings });
+}
+
 function renderChunk({ graph, chunk, renderChunk, code, sourcemapChain, options }) {
     const renderChunkReducer = (code, result, plugin) => {
         if (result == null)
@@ -14162,12 +14196,11 @@ function renderChunk({ graph, chunk, renderChunk, code, sourcemapChain, options
                 code: result,
                 map: undefined
             };
-        const map = typeof result.map === 'string' ? JSON.parse(result.map) : result.map;
-        if (map && typeof map.mappings === 'string')
-            map.mappings = decode(map.mappings);
         // strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning
-        if (map !== null)
+        if (result.map !== null) {
+            const map = decodedSourcemap(result.map);
             sourcemapChain.push(map || { missing: true, plugin: plugin.name });
+        }
         return result.code;
     };
     let inTransformBundle = false;
@@ -15962,9 +15995,7 @@ const uncacheablePlugin = pluginName => ({
 function transform(graph, source, module) {
     const id = module.id;
     const sourcemapChain = [];
-    const originalSourcemap = typeof source.map === 'string' ? JSON.parse(source.map) : source.map;
-    if (originalSourcemap && typeof originalSourcemap.mappings === 'string')
-        originalSourcemap.mappings = decode(originalSourcemap.mappings);
+    let originalSourcemap = source.map === null ? null : decodedSourcemap(source.map);
     const baseEmitAsset = graph.pluginDriver.emitAsset;
     const originalCode = source.code;
     let ast = source.ast;
@@ -16024,12 +16055,10 @@ function transform(graph, source, module) {
         else {
             return code;
         }
-        if (result.map && typeof result.map.mappings === 'string') {
-            result.map.mappings = decode(result.map.mappings);
-        }
         // strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning
         if (result.map !== null) {
-            sourcemapChain.push(result.map || { missing: true, plugin: plugin.name });
+            const map = decodedSourcemap(result.map);
+            sourcemapChain.push(map || { missing: true, plugin: plugin.name });
         }
         ast = result.ast;
         return result.code;
@@ -16086,6 +16115,18 @@ function transform(graph, source, module) {
                         setAssetSourceErr = err;
                     }
                 }
+            },
+            getCombinedSourcemap() {
+                const combinedMap = collapseSourcemap(graph, id, originalCode, originalSourcemap, sourcemapChain);
+                if (!combinedMap) {
+                    const magicString = new MagicString(originalCode);
+                    return magicString.generateMap({ includeContent: true, hires: true, source: id });
+                }
+                if (originalSourcemap !== combinedMap) {
+                    originalSourcemap = combinedMap;
+                    sourcemapChain.length = 0;
+                }
+                return new SourceMap(Object.assign({}, combinedMap, { file: null, sourcesContent: combinedMap.sourcesContent }));
             } });
     })
         .catch(err => {
@@ -17052,11 +17093,9 @@ const defaultOnWarn = warning => {
         console.warn(warning.message);
     }
 };
-const getOnWarn = (config, command, defaultOnWarnHandler = defaultOnWarn) => command.silent
-    ? () => { }
-    : config.onwarn
-        ? warning => config.onwarn(warning, defaultOnWarnHandler)
-        : defaultOnWarnHandler;
+const getOnWarn = (config, defaultOnWarnHandler = defaultOnWarn) => config.onwarn
+    ? warning => config.onwarn(warning, defaultOnWarnHandler)
+    : defaultOnWarnHandler;
 const getExternal = (config, command) => {
     const configExternal = config.external;
     return typeof configExternal === 'function'
@@ -17141,7 +17180,7 @@ function getInputOptions(config, command = { external: [], globals: undefined },
         input: getOption('input', []),
         manualChunks: getOption('manualChunks'),
         moduleContext: config.moduleContext,
-        onwarn: getOnWarn(config, command, defaultOnWarnHandler),
+        onwarn: getOnWarn(config, defaultOnWarnHandler),
         perf: getOption('perf', false),
         plugins: config.plugins,
         preserveModules: getOption('preserveModules'),
@@ -20880,25 +20919,26 @@ class Task {
             .then(result => {
             if (this.closed)
                 return undefined;
+            const previouslyWatched = this.watched;
             const watched = (this.watched = new Set());
             this.cache = result.cache;
             this.watchFiles = result.watchFiles;
-            this.cache.modules.forEach(module => {
+            for (const module of this.cache.modules) {
                 if (module.transformDependencies) {
                     module.transformDependencies.forEach(depId => {
                         watched.add(depId);
                         this.watchFile(depId, true);
                     });
                 }
-            });
-            this.watchFiles.forEach(id => {
+            }
+            for (const id of this.watchFiles) {
                 watched.add(id);
                 this.watchFile(id);
-            });
-            this.watched.forEach(id => {
+            }
+            for (const id of previouslyWatched) {
                 if (!watched.has(id))
                     deleteTask(id, this, this.chokidarOptionsHash);
-            });
+            }
             return Promise.all(this.outputs.map(output => result.write(output))).then(() => result);
         })
             .then((result) => {