From bbff7403fbf46f9ad92240ac213df8d30ef31b64 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 20 Sep 2018 02:56:13 +0200 Subject: update packages --- node_modules/webpack-sources/lib/CachedSource.js | 156 +++--- node_modules/webpack-sources/lib/ConcatSource.js | 182 +++---- .../webpack-sources/lib/LineToLineMappedSource.js | 98 ++-- node_modules/webpack-sources/lib/OriginalSource.js | 178 +++---- node_modules/webpack-sources/lib/PrefixSource.js | 152 +++--- node_modules/webpack-sources/lib/RawSource.js | 76 +-- node_modules/webpack-sources/lib/ReplaceSource.js | 526 +++++++++++++-------- node_modules/webpack-sources/lib/Source.js | 90 ++-- .../webpack-sources/lib/SourceAndMapMixin.js | 76 +-- .../webpack-sources/lib/SourceMapSource.js | 116 ++--- node_modules/webpack-sources/lib/index.js | 30 +- 11 files changed, 900 insertions(+), 780 deletions(-) (limited to 'node_modules/webpack-sources/lib') diff --git a/node_modules/webpack-sources/lib/CachedSource.js b/node_modules/webpack-sources/lib/CachedSource.js index 0a81c5c45..940c4d9f3 100644 --- a/node_modules/webpack-sources/lib/CachedSource.js +++ b/node_modules/webpack-sources/lib/CachedSource.js @@ -1,78 +1,78 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -"use strict"; - -const Source = require("./Source"); - -class CachedSource extends Source { - constructor(source) { - super(); - this._source = source; - this._cachedSource = undefined; - this._cachedSize = undefined; - this._cachedMaps = {}; - - if(source.node) this.node = function(options) { - return this._source.node(options); - }; - - if(source.listMap) this.listMap = function(options) { - return this._source.listMap(options); - }; - } - - source() { - if(typeof this._cachedSource !== "undefined") return this._cachedSource; - return this._cachedSource = this._source.source(); - } - - size() { - if(typeof this._cachedSize !== "undefined") return this._cachedSize; - if(typeof this._cachedSource !== "undefined") - return this._cachedSize = this._cachedSource.length; - return this._cachedSize = this._source.size(); - } - - sourceAndMap(options) { - const key = JSON.stringify(options); - if(typeof this._cachedSource !== "undefined" && key in this._cachedMaps) - return { - source: this._cachedSource, - map: this._cachedMaps[key] - }; - else if(typeof this._cachedSource !== "undefined") { - return { - source: this._cachedSource, - map: this._cachedMaps[key] = this._source.map(options) - }; - } else if(key in this._cachedMaps) { - return { - source: this._cachedSource = this._source.source(), - map: this._cachedMaps[key] - }; - } - const result = this._source.sourceAndMap(options); - this._cachedSource = result.source; - this._cachedMaps[key] = result.map; - return { - source: this._cachedSource, - map: this._cachedMaps[key] - }; - } - - map(options) { - if(!options) options = {}; - const key = JSON.stringify(options); - if(key in this._cachedMaps) - return this._cachedMaps[key]; - return this._cachedMaps[key] = this._source.map(); - } - - updateHash(hash) { - this._source.updateHash(hash); - } -} - -module.exports = CachedSource; +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +"use strict"; + +const Source = require("./Source"); + +class CachedSource extends Source { + constructor(source) { + super(); + this._source = source; + this._cachedSource = undefined; + this._cachedSize = undefined; + this._cachedMaps = {}; + + if(source.node) this.node = function(options) { + return this._source.node(options); + }; + + if(source.listMap) this.listMap = function(options) { + return this._source.listMap(options); + }; + } + + source() { + if(typeof this._cachedSource !== "undefined") return this._cachedSource; + return this._cachedSource = this._source.source(); + } + + size() { + if(typeof this._cachedSize !== "undefined") return this._cachedSize; + if(typeof this._cachedSource !== "undefined") + return this._cachedSize = this._cachedSource.length; + return this._cachedSize = this._source.size(); + } + + sourceAndMap(options) { + const key = JSON.stringify(options); + if(typeof this._cachedSource !== "undefined" && key in this._cachedMaps) + return { + source: this._cachedSource, + map: this._cachedMaps[key] + }; + else if(typeof this._cachedSource !== "undefined") { + return { + source: this._cachedSource, + map: this._cachedMaps[key] = this._source.map(options) + }; + } else if(key in this._cachedMaps) { + return { + source: this._cachedSource = this._source.source(), + map: this._cachedMaps[key] + }; + } + const result = this._source.sourceAndMap(options); + this._cachedSource = result.source; + this._cachedMaps[key] = result.map; + return { + source: this._cachedSource, + map: this._cachedMaps[key] + }; + } + + map(options) { + if(!options) options = {}; + const key = JSON.stringify(options); + if(key in this._cachedMaps) + return this._cachedMaps[key]; + return this._cachedMaps[key] = this._source.map(); + } + + updateHash(hash) { + this._source.updateHash(hash); + } +} + +module.exports = CachedSource; diff --git a/node_modules/webpack-sources/lib/ConcatSource.js b/node_modules/webpack-sources/lib/ConcatSource.js index b2b59707b..25167d6e4 100644 --- a/node_modules/webpack-sources/lib/ConcatSource.js +++ b/node_modules/webpack-sources/lib/ConcatSource.js @@ -1,91 +1,91 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -"use strict"; - -const SourceNode = require("source-map").SourceNode; -const SourceListMap = require("source-list-map").SourceListMap; -const Source = require("./Source"); - -class ConcatSource extends Source { - constructor() { - super(); - this.children = []; - for(var i = 0; i < arguments.length; i++) { - var item = arguments[i]; - if(item instanceof ConcatSource) { - var children = item.children; - for(var j = 0; j < children.length; j++) - this.children.push(children[j]); - } else { - this.children.push(item); - } - } - } - - add(item) { - if(item instanceof ConcatSource) { - var children = item.children; - for(var j = 0; j < children.length; j++) - this.children.push(children[j]); - } else { - this.children.push(item); - } - } - - source() { - let source = ""; - const children = this.children; - for(let i = 0; i < children.length; i++) { - const child = children[i]; - source += typeof child === "string" ? child : child.source(); - } - return source; - } - - size() { - let size = 0; - const children = this.children; - for(let i = 0; i < children.length; i++) { - const child = children[i]; - size += typeof child === "string" ? child.length : child.size(); - } - return size; - } - - node(options) { - const node = new SourceNode(null, null, null, this.children.map(function(item) { - return typeof item === "string" ? item : item.node(options); - })); - return node; - } - - listMap(options) { - const map = new SourceListMap(); - var children = this.children; - for(var i = 0; i < children.length; i++) { - var item = children[i]; - if(typeof item === "string") - map.add(item); - else - map.add(item.listMap(options)); - } - return map; - } - - updateHash(hash) { - var children = this.children; - for(var i = 0; i < children.length; i++) { - var item = children[i]; - if(typeof item === "string") - hash.update(item); - else - item.updateHash(hash); - } - } -} - -require("./SourceAndMapMixin")(ConcatSource.prototype); - -module.exports = ConcatSource; +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +"use strict"; + +const SourceNode = require("source-map").SourceNode; +const SourceListMap = require("source-list-map").SourceListMap; +const Source = require("./Source"); + +class ConcatSource extends Source { + constructor() { + super(); + this.children = []; + for(var i = 0; i < arguments.length; i++) { + var item = arguments[i]; + if(item instanceof ConcatSource) { + var children = item.children; + for(var j = 0; j < children.length; j++) + this.children.push(children[j]); + } else { + this.children.push(item); + } + } + } + + add(item) { + if(item instanceof ConcatSource) { + var children = item.children; + for(var j = 0; j < children.length; j++) + this.children.push(children[j]); + } else { + this.children.push(item); + } + } + + source() { + let source = ""; + const children = this.children; + for(let i = 0; i < children.length; i++) { + const child = children[i]; + source += typeof child === "string" ? child : child.source(); + } + return source; + } + + size() { + let size = 0; + const children = this.children; + for(let i = 0; i < children.length; i++) { + const child = children[i]; + size += typeof child === "string" ? child.length : child.size(); + } + return size; + } + + node(options) { + const node = new SourceNode(null, null, null, this.children.map(function(item) { + return typeof item === "string" ? item : item.node(options); + })); + return node; + } + + listMap(options) { + const map = new SourceListMap(); + var children = this.children; + for(var i = 0; i < children.length; i++) { + var item = children[i]; + if(typeof item === "string") + map.add(item); + else + map.add(item.listMap(options)); + } + return map; + } + + updateHash(hash) { + var children = this.children; + for(var i = 0; i < children.length; i++) { + var item = children[i]; + if(typeof item === "string") + hash.update(item); + else + item.updateHash(hash); + } + } +} + +require("./SourceAndMapMixin")(ConcatSource.prototype); + +module.exports = ConcatSource; diff --git a/node_modules/webpack-sources/lib/LineToLineMappedSource.js b/node_modules/webpack-sources/lib/LineToLineMappedSource.js index 586710ac8..a1a17bb4a 100644 --- a/node_modules/webpack-sources/lib/LineToLineMappedSource.js +++ b/node_modules/webpack-sources/lib/LineToLineMappedSource.js @@ -1,49 +1,49 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -"use strict"; - -var SourceNode = require("source-map").SourceNode; -var SourceMapConsumer = require("source-map").SourceMapConsumer; -var SourceListMap = require("source-list-map").SourceListMap; -var Source = require("./Source"); - -class LineToLineMappedSource extends Source { - constructor(value, name, originalSource) { - super(); - this._value = value; - this._name = name; - this._originalSource = originalSource; - } - - source() { - return this._value; - } - - node(options) { - var value = this._value; - var name = this._name; - var lines = value.split("\n"); - var node = new SourceNode(null, null, null, - lines.map(function(line, idx) { - return new SourceNode(idx + 1, 0, name, (line + (idx != lines.length - 1 ? "\n" : ""))); - }) - ); - node.setSourceContent(name, this._originalSource); - return node; - } - - listMap(options) { - return new SourceListMap(this._value, this._name, this._originalSource) - } - - updateHash(hash) { - hash.update(this._value); - hash.update(this._originalSource); - } -} - -require("./SourceAndMapMixin")(LineToLineMappedSource.prototype); - -module.exports = LineToLineMappedSource; +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +"use strict"; + +var SourceNode = require("source-map").SourceNode; +var SourceMapConsumer = require("source-map").SourceMapConsumer; +var SourceListMap = require("source-list-map").SourceListMap; +var Source = require("./Source"); + +class LineToLineMappedSource extends Source { + constructor(value, name, originalSource) { + super(); + this._value = value; + this._name = name; + this._originalSource = originalSource; + } + + source() { + return this._value; + } + + node(options) { + var value = this._value; + var name = this._name; + var lines = value.split("\n"); + var node = new SourceNode(null, null, null, + lines.map(function(line, idx) { + return new SourceNode(idx + 1, 0, name, (line + (idx != lines.length - 1 ? "\n" : ""))); + }) + ); + node.setSourceContent(name, this._originalSource); + return node; + } + + listMap(options) { + return new SourceListMap(this._value, this._name, this._originalSource) + } + + updateHash(hash) { + hash.update(this._value); + hash.update(this._originalSource); + } +} + +require("./SourceAndMapMixin")(LineToLineMappedSource.prototype); + +module.exports = LineToLineMappedSource; diff --git a/node_modules/webpack-sources/lib/OriginalSource.js b/node_modules/webpack-sources/lib/OriginalSource.js index 24380fcce..9635f3370 100644 --- a/node_modules/webpack-sources/lib/OriginalSource.js +++ b/node_modules/webpack-sources/lib/OriginalSource.js @@ -1,89 +1,89 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -"use strict"; - -var SourceNode = require("source-map").SourceNode; -var SourceMapConsumer = require("source-map").SourceMapConsumer; -var SourceListMap = require("source-list-map").SourceListMap; -var Source = require("./Source"); - -function isSplitter(c) { - switch(c) { - case 10: // \n - case 13: // \r - case 59: // ; - case 123: // { - case 125: // } - return true; - } - return false; -} - -function _splitCode(code) { - var result = []; - var i = 0; - var j = 0; - for(; i < code.length; i++) { - if(isSplitter(code.charCodeAt(i))) { - while(isSplitter(code.charCodeAt(++i))); - result.push(code.substring(j, i)); - j = i; - } - } - if(j < code.length) - result.push(code.substr(j)); - return result; -} - -class OriginalSource extends Source { - constructor(value, name) { - super(); - this._value = value; - this._name = name; - } - - source() { - return this._value; - } - - node(options) { - options = options || {}; - var sourceMap = this._sourceMap; - var value = this._value; - var name = this._name; - var lines = value.split("\n"); - var node = new SourceNode(null, null, null, - lines.map(function(line, idx) { - var pos = 0; - if(options.columns === false) { - var content = line + (idx != lines.length - 1 ? "\n" : ""); - return new SourceNode(idx + 1, 0, name, content); - } - return new SourceNode(null, null, null, - _splitCode(line + (idx != lines.length - 1 ? "\n" : "")).map(function(item) { - if(/^\s*$/.test(item)) return item; - var res = new SourceNode(idx + 1, pos, name, item); - pos += item.length; - return res; - }) - ); - }) - ); - node.setSourceContent(name, value); - return node; - } - - listMap(options) { - return new SourceListMap(this._value, this._name, this._value) - } - - updateHash(hash) { - hash.update(this._value); - } -} - -require("./SourceAndMapMixin")(OriginalSource.prototype); - -module.exports = OriginalSource; +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +"use strict"; + +var SourceNode = require("source-map").SourceNode; +var SourceMapConsumer = require("source-map").SourceMapConsumer; +var SourceListMap = require("source-list-map").SourceListMap; +var Source = require("./Source"); + +function isSplitter(c) { + switch(c) { + case 10: // \n + case 13: // \r + case 59: // ; + case 123: // { + case 125: // } + return true; + } + return false; +} + +function _splitCode(code) { + var result = []; + var i = 0; + var j = 0; + for(; i < code.length; i++) { + if(isSplitter(code.charCodeAt(i))) { + while(isSplitter(code.charCodeAt(++i))); + result.push(code.substring(j, i)); + j = i; + } + } + if(j < code.length) + result.push(code.substr(j)); + return result; +} + +class OriginalSource extends Source { + constructor(value, name) { + super(); + this._value = value; + this._name = name; + } + + source() { + return this._value; + } + + node(options) { + options = options || {}; + var sourceMap = this._sourceMap; + var value = this._value; + var name = this._name; + var lines = value.split("\n"); + var node = new SourceNode(null, null, null, + lines.map(function(line, idx) { + var pos = 0; + if(options.columns === false) { + var content = line + (idx != lines.length - 1 ? "\n" : ""); + return new SourceNode(idx + 1, 0, name, content); + } + return new SourceNode(null, null, null, + _splitCode(line + (idx != lines.length - 1 ? "\n" : "")).map(function(item) { + if(/^\s*$/.test(item)) return item; + var res = new SourceNode(idx + 1, pos, name, item); + pos += item.length; + return res; + }) + ); + }) + ); + node.setSourceContent(name, value); + return node; + } + + listMap(options) { + return new SourceListMap(this._value, this._name, this._value) + } + + updateHash(hash) { + hash.update(this._value); + } +} + +require("./SourceAndMapMixin")(OriginalSource.prototype); + +module.exports = OriginalSource; diff --git a/node_modules/webpack-sources/lib/PrefixSource.js b/node_modules/webpack-sources/lib/PrefixSource.js index b241b9dc6..972e45f98 100644 --- a/node_modules/webpack-sources/lib/PrefixSource.js +++ b/node_modules/webpack-sources/lib/PrefixSource.js @@ -1,76 +1,76 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -"use strict"; - -var Source = require("./Source"); -var SourceNode = require("source-map").SourceNode; - -var REPLACE_REGEX = /\n(?=.|\s)/g; - -function cloneAndPrefix(node, prefix, append) { - if(typeof node === "string") { - var result = node.replace(REPLACE_REGEX, "\n" + prefix); - if(append.length > 0) result = append.pop() + result; - if(/\n$/.test(node)) append.push(prefix); - return result; - } else { - var newNode = new SourceNode( - node.line, - node.column, - node.source, - node.children.map(function(node) { - return cloneAndPrefix(node, prefix, append); - }), - node.name - ); - newNode.sourceContents = node.sourceContents; - return newNode; - } -}; - -class PrefixSource extends Source { - constructor(prefix, source) { - super(); - this._source = source; - this._prefix = prefix; - } - - source() { - var node = typeof this._source === "string" ? this._source : this._source.source(); - var prefix = this._prefix; - return prefix + node.replace(REPLACE_REGEX, "\n" + prefix); - } - - node(options) { - var node = this._source.node(options); - var append = [this._prefix]; - return new SourceNode(null, null, null, [ - cloneAndPrefix(node, this._prefix, append) - ]); - } - - listMap(options) { - var prefix = this._prefix; - var map = this._source.listMap(options); - return map.mapGeneratedCode(function(code) { - return prefix + code.replace(REPLACE_REGEX, "\n" + prefix); - }); - } - - updateHash(hash) { - if(typeof this._source === "string") - hash.update(this._source); - else - this._source.updateHash(hash); - if(typeof this._prefix === "string") - hash.update(this._prefix); - else - this._prefix.updateHash(hash); - } -} - -require("./SourceAndMapMixin")(PrefixSource.prototype); - -module.exports = PrefixSource; +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +"use strict"; + +var Source = require("./Source"); +var SourceNode = require("source-map").SourceNode; + +var REPLACE_REGEX = /\n(?=.|\s)/g; + +function cloneAndPrefix(node, prefix, append) { + if(typeof node === "string") { + var result = node.replace(REPLACE_REGEX, "\n" + prefix); + if(append.length > 0) result = append.pop() + result; + if(/\n$/.test(node)) append.push(prefix); + return result; + } else { + var newNode = new SourceNode( + node.line, + node.column, + node.source, + node.children.map(function(node) { + return cloneAndPrefix(node, prefix, append); + }), + node.name + ); + newNode.sourceContents = node.sourceContents; + return newNode; + } +}; + +class PrefixSource extends Source { + constructor(prefix, source) { + super(); + this._source = source; + this._prefix = prefix; + } + + source() { + var node = typeof this._source === "string" ? this._source : this._source.source(); + var prefix = this._prefix; + return prefix + node.replace(REPLACE_REGEX, "\n" + prefix); + } + + node(options) { + var node = this._source.node(options); + var append = [this._prefix]; + return new SourceNode(null, null, null, [ + cloneAndPrefix(node, this._prefix, append) + ]); + } + + listMap(options) { + var prefix = this._prefix; + var map = this._source.listMap(options); + return map.mapGeneratedCode(function(code) { + return prefix + code.replace(REPLACE_REGEX, "\n" + prefix); + }); + } + + updateHash(hash) { + if(typeof this._source === "string") + hash.update(this._source); + else + this._source.updateHash(hash); + if(typeof this._prefix === "string") + hash.update(this._prefix); + else + this._prefix.updateHash(hash); + } +} + +require("./SourceAndMapMixin")(PrefixSource.prototype); + +module.exports = PrefixSource; diff --git a/node_modules/webpack-sources/lib/RawSource.js b/node_modules/webpack-sources/lib/RawSource.js index b93ac4ef0..c09b1cd9f 100644 --- a/node_modules/webpack-sources/lib/RawSource.js +++ b/node_modules/webpack-sources/lib/RawSource.js @@ -1,38 +1,38 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -"use strict"; - -var Source = require("./Source"); -var SourceNode = require("source-map").SourceNode; -var SourceListMap = require("source-list-map").SourceListMap; - -class RawSource extends Source { - constructor(value) { - super(); - this._value = value; - } - - source() { - return this._value; - } - - map(options) { - return null; - } - - node(options) { - return new SourceNode(null, null, null, this._value); - } - - listMap(options) { - return new SourceListMap(this._value); - } - - updateHash(hash) { - hash.update(this._value); - } -} - -module.exports = RawSource; +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +"use strict"; + +var Source = require("./Source"); +var SourceNode = require("source-map").SourceNode; +var SourceListMap = require("source-list-map").SourceListMap; + +class RawSource extends Source { + constructor(value) { + super(); + this._value = value; + } + + source() { + return this._value; + } + + map(options) { + return null; + } + + node(options) { + return new SourceNode(null, null, null, this._value); + } + + listMap(options) { + return new SourceListMap(this._value); + } + + updateHash(hash) { + hash.update(this._value); + } +} + +module.exports = RawSource; diff --git a/node_modules/webpack-sources/lib/ReplaceSource.js b/node_modules/webpack-sources/lib/ReplaceSource.js index 7bc4bc880..f28a0fed5 100644 --- a/node_modules/webpack-sources/lib/ReplaceSource.js +++ b/node_modules/webpack-sources/lib/ReplaceSource.js @@ -1,203 +1,323 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -"use strict"; - -var Source = require("./Source"); -var SourceNode = require("source-map").SourceNode; -var SourceListMap = require("source-list-map").SourceListMap; -var fromStringWithSourceMap = require("source-list-map").fromStringWithSourceMap; -var SourceMapConsumer = require("source-map").SourceMapConsumer; - -class ReplaceSource extends Source { - constructor(source, name) { - super(); - this._source = source; - this._name = name; - this.replacements = []; - } - - replace(start, end, newValue) { - if(typeof newValue !== "string") - throw new Error("insertion must be a string, but is a " + typeof newValue); - this.replacements.push([start, end, newValue, this.replacements.length]); - } - - insert(pos, newValue) { - if(typeof newValue !== "string") - throw new Error("insertion must be a string, but is a " + typeof newValue + ": " + newValue); - this.replacements.push([pos, pos - 1, newValue, this.replacements.length]); - } - - source(options) { - return this._replaceString(this._source.source()); - } - - original() { - return this._source; - } - - _sortReplacements() { - this.replacements.sort(function(a, b) { - var diff = b[1] - a[1]; - if(diff !== 0) - return diff; - diff = b[0] - a[0]; - if(diff !== 0) - return diff; - return b[3] - a[3]; - }); - } - - _replaceString(str) { - if(typeof str !== "string") - throw new Error("str must be a string, but is a " + typeof str + ": " + str); - this._sortReplacements(); - var result = [str]; - this.replacements.forEach(function(repl) { - var remSource = result.pop(); - var splitted1 = this._splitString(remSource, Math.floor(repl[1] + 1)); - var splitted2 = this._splitString(splitted1[0], Math.floor(repl[0])); - result.push(splitted1[1], repl[2], splitted2[0]); - }, this); - - // write out result array in reverse order - let resultStr = ""; - for(let i = result.length - 1; i >= 0; --i) { - resultStr += result[i]; - } - return resultStr; - } - - node(options) { - this._sortReplacements(); - var result = [this._source.node(options)]; - this.replacements.forEach(function(repl) { - var remSource = result.pop(); - var splitted1 = this._splitSourceNode(remSource, Math.floor(repl[1] + 1)); - var splitted2; - if(Array.isArray(splitted1)) { - splitted2 = this._splitSourceNode(splitted1[0], Math.floor(repl[0])); - if(Array.isArray(splitted2)) { - result.push(splitted1[1], this._replacementToSourceNode(splitted2[1], repl[2]), splitted2[0]); - } else { - result.push(splitted1[1], this._replacementToSourceNode(splitted1[1], repl[2]), splitted1[0]); - } - } else { - splitted2 = this._splitSourceNode(remSource, Math.floor(repl[0])); - if(Array.isArray(splitted2)) { - result.push(this._replacementToSourceNode(splitted2[1], repl[2]), splitted2[0]); - } else { - result.push(repl[2], remSource); - } - } - }, this); - result = result.reverse(); - return new SourceNode(null, null, null, result); - } - - listMap(options) { - this._sortReplacements(); - var map = this._source.listMap(options); - var currentIndex = 0; - var replacements = this.replacements; - var idxReplacement = replacements.length - 1; - var removeChars = 0; - map = map.mapGeneratedCode(function(str) { - var newCurrentIndex = currentIndex + str.length; - if(removeChars > str.length) { - removeChars -= str.length; - str = ""; - } else { - if(removeChars > 0) { - str = str.substr(removeChars); - currentIndex += removeChars; - removeChars = 0; - } - var finalStr = ""; - while(idxReplacement >= 0 && replacements[idxReplacement][0] < newCurrentIndex) { - var repl = replacements[idxReplacement]; - var start = Math.floor(repl[0]); - var end = Math.floor(repl[1] + 1); - var before = str.substr(0, Math.max(0, start - currentIndex)); - if(end <= newCurrentIndex) { - var after = str.substr(Math.max(0, end - currentIndex)); - finalStr += before + repl[2]; - str = after; - currentIndex = Math.max(currentIndex, end); - } else { - finalStr += before + repl[2]; - str = ""; - removeChars = end - newCurrentIndex; - } - idxReplacement--; - } - str = finalStr + str; - } - currentIndex = newCurrentIndex; - return str; - }); - var extraCode = ""; - while(idxReplacement >= 0) { - extraCode += replacements[idxReplacement][2]; - idxReplacement--; - } - if(extraCode) { - map.add(extraCode); - } - return map; - } - - _replacementToSourceNode(oldNode, newString) { - var map = oldNode.toStringWithSourceMap({ - file: "?" - }).map; - var original = new SourceMapConsumer(map.toJSON()).originalPositionFor({ - line: 1, - column: 0 - }); - if(original) { - return new SourceNode(original.line, original.column, original.source, newString); - } else { - return newString; - } - } - - _splitSourceNode(node, position) { - if(typeof node === "string") { - if(node.length <= position) return position - node.length; - return position <= 0 ? ["", node] : [node.substr(0, position), node.substr(position)]; - } else { - for(var i = 0; i < node.children.length; i++) { - position = this._splitSourceNode(node.children[i], position); - if(Array.isArray(position)) { - var leftNode = new SourceNode( - node.line, - node.column, - node.source, - node.children.slice(0, i).concat([position[0]]), - node.name - ); - var rightNode = new SourceNode( - node.line, - node.column, - node.source, [position[1]].concat(node.children.slice(i + 1)), - node.name - ); - leftNode.sourceContents = node.sourceContents; - return [leftNode, rightNode]; - } - } - return position; - } - } - - _splitString(str, position) { - return position <= 0 ? ["", str] : [str.substr(0, position), str.substr(position)]; - } -} - -require("./SourceAndMapMixin")(ReplaceSource.prototype); - -module.exports = ReplaceSource; +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +"use strict"; + +var Source = require("./Source"); +var SourceNode = require("source-map").SourceNode; +var SourceListMap = require("source-list-map").SourceListMap; +var fromStringWithSourceMap = require("source-list-map").fromStringWithSourceMap; +var SourceMapConsumer = require("source-map").SourceMapConsumer; + +class ReplaceSource extends Source { + constructor(source, name) { + super(); + this._source = source; + this._name = name; + this.replacements = []; + } + + replace(start, end, newValue) { + if(typeof newValue !== "string") + throw new Error("insertion must be a string, but is a " + typeof newValue); + this.replacements.push([start, end, newValue, this.replacements.length]); + } + + insert(pos, newValue) { + if(typeof newValue !== "string") + throw new Error("insertion must be a string, but is a " + typeof newValue + ": " + newValue); + this.replacements.push([pos, pos - 1, newValue, this.replacements.length]); + } + + source(options) { + return this._replaceString(this._source.source()); + } + + original() { + return this._source; + } + + _sortReplacements() { + this.replacements.sort(function(a, b) { + var diff = b[1] - a[1]; + if(diff !== 0) + return diff; + diff = b[0] - a[0]; + if(diff !== 0) + return diff; + return b[3] - a[3]; + }); + } + + _replaceString(str) { + if(typeof str !== "string") + throw new Error("str must be a string, but is a " + typeof str + ": " + str); + this._sortReplacements(); + var result = [str]; + this.replacements.forEach(function(repl) { + var remSource = result.pop(); + var splitted1 = this._splitString(remSource, Math.floor(repl[1] + 1)); + var splitted2 = this._splitString(splitted1[0], Math.floor(repl[0])); + result.push(splitted1[1], repl[2], splitted2[0]); + }, this); + + // write out result array in reverse order + let resultStr = ""; + for(let i = result.length - 1; i >= 0; --i) { + resultStr += result[i]; + } + return resultStr; + } + + node(options) { + var node = this._source.node(options); + if(this.replacements.length === 0) { + return node; + } + this.replacements.sort(sortReplacementsAscending); + var replace = new ReplacementEnumerator(this.replacements); + var output = []; + var position = 0; + var sources = Object.create(null); + var sourcesInLines = Object.create(null); + + // We build a new list of SourceNodes in "output" + // from the original mapping data + + var result = new SourceNode(); + + // We need to add source contents manually + // because "walk" will not handle it + node.walkSourceContents(function(sourceFile, sourceContent) { + result.setSourceContent(sourceFile, sourceContent); + sources["$" + sourceFile] = sourceContent; + }); + + var replaceInStringNode = this._replaceInStringNode.bind(this, output, replace, function getOriginalSource(mapping) { + var key = "$" + mapping.source; + var lines = sourcesInLines[key]; + if(!lines) { + var source = sources[key]; + if(!source) return null; + lines = source.split("\n").map(function(line) { + return line + "\n"; + }); + sourcesInLines[key] = lines; + } + // line is 1-based + if(mapping.line > lines.length) return null; + var line = lines[mapping.line - 1]; + return line.substr(mapping.column); + }); + + node.walk(function(chunk, mapping) { + position = replaceInStringNode(chunk, position, mapping); + }); + + // If any replacements occur after the end of the original file, then we append them + // directly to the end of the output + var remaining = replace.footer(); + if(remaining) { + output.push(remaining); + } + + result.add(output); + + return result; + } + + listMap(options) { + this._sortReplacements(); + var map = this._source.listMap(options); + var currentIndex = 0; + var replacements = this.replacements; + var idxReplacement = replacements.length - 1; + var removeChars = 0; + map = map.mapGeneratedCode(function(str) { + var newCurrentIndex = currentIndex + str.length; + if(removeChars > str.length) { + removeChars -= str.length; + str = ""; + } else { + if(removeChars > 0) { + str = str.substr(removeChars); + currentIndex += removeChars; + removeChars = 0; + } + var finalStr = ""; + while(idxReplacement >= 0 && replacements[idxReplacement][0] < newCurrentIndex) { + var repl = replacements[idxReplacement]; + var start = Math.floor(repl[0]); + var end = Math.floor(repl[1] + 1); + var before = str.substr(0, Math.max(0, start - currentIndex)); + if(end <= newCurrentIndex) { + var after = str.substr(Math.max(0, end - currentIndex)); + finalStr += before + repl[2]; + str = after; + currentIndex = Math.max(currentIndex, end); + } else { + finalStr += before + repl[2]; + str = ""; + removeChars = end - newCurrentIndex; + } + idxReplacement--; + } + str = finalStr + str; + } + currentIndex = newCurrentIndex; + return str; + }); + var extraCode = ""; + while(idxReplacement >= 0) { + extraCode += replacements[idxReplacement][2]; + idxReplacement--; + } + if(extraCode) { + map.add(extraCode); + } + return map; + } + + _splitString(str, position) { + return position <= 0 ? ["", str] : [str.substr(0, position), str.substr(position)]; + } + + _replaceInStringNode(output, replace, getOriginalSource, node, position, mapping) { + var original = undefined; + + do { + var splitPosition = replace.position - position; + // If multiple replaces occur in the same location then the splitPosition may be + // before the current position for the subsequent splits. Ensure it is >= 0 + if(splitPosition < 0) { + splitPosition = 0; + } + if(splitPosition >= node.length || replace.done) { + if(replace.emit) { + var nodeEnd = new SourceNode( + mapping.line, + mapping.column, + mapping.source, + node, + mapping.name + ); + output.push(nodeEnd); + } + return position + node.length; + } + + var originalColumn = mapping.column; + + // Try to figure out if generated code matches original code of this segement + // If this is the case we assume that it's allowed to move mapping.column + // Because getOriginalSource can be expensive we only do it when neccessary + + var nodePart; + if(splitPosition > 0) { + nodePart = node.slice(0, splitPosition); + if(original === undefined) { + original = getOriginalSource(mapping); + } + if(original && original.length >= splitPosition && original.startsWith(nodePart)) { + mapping.column += splitPosition; + original = original.substr(splitPosition); + } + } + + var emit = replace.next(); + if(!emit) { + // Stop emitting when we have found the beginning of the string to replace. + // Emit the part of the string before splitPosition + if(splitPosition > 0) { + var nodeStart = new SourceNode( + mapping.line, + originalColumn, + mapping.source, + nodePart, + mapping.name + ); + output.push(nodeStart); + } + + // Emit the replacement value + if(replace.value) { + output.push(new SourceNode( + mapping.line, + mapping.column, + mapping.source, + replace.value + )); + } + } + + // Recurse with remainder of the string as there may be multiple replaces within a single node + node = node.substr(splitPosition); + position += splitPosition; + } while (true); + } +} + +function sortReplacementsAscending(a, b) { + var diff = a[1] - b[1]; // end + if(diff !== 0) + return diff; + diff = a[0] - b[0]; // start + if(diff !== 0) + return diff; + return a[3] - b[3]; // insert order +} + +class ReplacementEnumerator { + constructor(replacements) { + this.emit = true; + this.done = !replacements || replacements.length === 0; + this.index = 0; + this.replacements = replacements; + if(!this.done) { + // Set initial start position in case .header is not called + var repl = replacements[0]; + this.position = Math.floor(repl[0]); + if(this.position < 0) + this.position = 0; + } + } + + next() { + if(this.done) + return true; + if(this.emit) { + // Start point found. stop emitting. set position to find end + var repl = this.replacements[this.index]; + var end = Math.floor(repl[1] + 1); + this.position = end; + this.value = repl[2]; + } else { + // End point found. start emitting. set position to find next start + this.index++; + if(this.index >= this.replacements.length) { + this.done = true; + } else { + var nextRepl = this.replacements[this.index]; + var start = Math.floor(nextRepl[0]); + this.position = start; + } + } + if(this.position < 0) + this.position = 0; + this.emit = !this.emit; + return this.emit; + } + + footer() { + if(!this.done && !this.emit) + this.next(); // If we finished _replaceInNode mid emit we advance to next entry + return this.done ? [] : this.replacements.slice(this.index).map(function(repl) { + return repl[2]; + }).join(""); + } +} + +require("./SourceAndMapMixin")(ReplaceSource.prototype); + +module.exports = ReplaceSource; diff --git a/node_modules/webpack-sources/lib/Source.js b/node_modules/webpack-sources/lib/Source.js index c8300f44e..dccf73781 100644 --- a/node_modules/webpack-sources/lib/Source.js +++ b/node_modules/webpack-sources/lib/Source.js @@ -1,45 +1,45 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -"use strict"; - -var SourceNode = require("source-map").SourceNode; -var SourceMapConsumer = require("source-map").SourceMapConsumer; - -class Source { - - source() { - throw new Error("Abstract"); - } - - size() { - return this.source().length; - } - - map(options) { - return null; - } - - sourceAndMap(options) { - return { - source: this.source(), - map: this.map() - }; - } - - node() { - throw new Error("Abstract"); - } - - listNode() { - throw new Error("Abstract"); - } - - updateHash(hash) { - var source = this.source(); - hash.update(source || ""); - } -} - -module.exports = Source; +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +"use strict"; + +var SourceNode = require("source-map").SourceNode; +var SourceMapConsumer = require("source-map").SourceMapConsumer; + +class Source { + + source() { + throw new Error("Abstract"); + } + + size() { + return this.source().length; + } + + map(options) { + return null; + } + + sourceAndMap(options) { + return { + source: this.source(), + map: this.map() + }; + } + + node() { + throw new Error("Abstract"); + } + + listNode() { + throw new Error("Abstract"); + } + + updateHash(hash) { + var source = this.source(); + hash.update(source || ""); + } +} + +module.exports = Source; diff --git a/node_modules/webpack-sources/lib/SourceAndMapMixin.js b/node_modules/webpack-sources/lib/SourceAndMapMixin.js index 57dec9dfa..d0898274f 100644 --- a/node_modules/webpack-sources/lib/SourceAndMapMixin.js +++ b/node_modules/webpack-sources/lib/SourceAndMapMixin.js @@ -1,38 +1,38 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -"use strict"; - -module.exports = function mixinSourceAndMap(proto) { - proto.map = function(options) { - options = options || {}; - if(options.columns === false) { - return this.listMap(options).toStringWithSourceMap({ - file: "x" - }).map; - } - - return this.node(options).toStringWithSourceMap({ - file: "x" - }).map.toJSON(); - }; - - proto.sourceAndMap = function(options) { - options = options || {}; - if(options.columns === false) { - //console.log(this.listMap(options).debugInfo()); - return this.listMap(options).toStringWithSourceMap({ - file: "x" - }); - } - - var res = this.node(options).toStringWithSourceMap({ - file: "x" - }); - return { - source: res.code, - map: res.map.toJSON() - }; - }; -} +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +"use strict"; + +module.exports = function mixinSourceAndMap(proto) { + proto.map = function(options) { + options = options || {}; + if(options.columns === false) { + return this.listMap(options).toStringWithSourceMap({ + file: "x" + }).map; + } + + return this.node(options).toStringWithSourceMap({ + file: "x" + }).map.toJSON(); + }; + + proto.sourceAndMap = function(options) { + options = options || {}; + if(options.columns === false) { + //console.log(this.listMap(options).debugInfo()); + return this.listMap(options).toStringWithSourceMap({ + file: "x" + }); + } + + var res = this.node(options).toStringWithSourceMap({ + file: "x" + }); + return { + source: res.code, + map: res.map.toJSON() + }; + }; +} diff --git a/node_modules/webpack-sources/lib/SourceMapSource.js b/node_modules/webpack-sources/lib/SourceMapSource.js index 274b2087a..d61bda154 100644 --- a/node_modules/webpack-sources/lib/SourceMapSource.js +++ b/node_modules/webpack-sources/lib/SourceMapSource.js @@ -1,58 +1,58 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -"use strict"; - -var SourceNode = require("source-map").SourceNode; -var SourceMapConsumer = require("source-map").SourceMapConsumer; -var SourceMapGenerator = require("source-map").SourceMapGenerator; -var SourceListMap = require("source-list-map").SourceListMap; -var fromStringWithSourceMap = require("source-list-map").fromStringWithSourceMap; -var Source = require("./Source"); - -class SourceMapSource extends Source { - constructor(value, name, sourceMap, originalSource, innerSourceMap) { - super(); - this._value = value; - this._name = name; - this._sourceMap = sourceMap; - this._originalSource = originalSource; - this._innerSourceMap = innerSourceMap; - } - - source() { - return this._value; - } - - node(options) { - var innerSourceMap = this._innerSourceMap; - var sourceMap = this._sourceMap; - if(innerSourceMap) { - sourceMap = SourceMapGenerator.fromSourceMap(new SourceMapConsumer(sourceMap)); - if(this._originalSource) - sourceMap.setSourceContent(this._name, this._originalSource); - innerSourceMap = new SourceMapConsumer(innerSourceMap); - sourceMap.applySourceMap(innerSourceMap, this._name); - sourceMap = sourceMap.toJSON(); - } - return SourceNode.fromStringWithSourceMap(this._value, new SourceMapConsumer(sourceMap)); - } - - listMap(options) { - options = options || {}; - if(options.module === false) - return new SourceListMap(this._value, this._name, this._value); - return fromStringWithSourceMap(this._value, typeof this._sourceMap === "string" ? JSON.parse(this._sourceMap) : this._sourceMap); - } - - updateHash(hash) { - hash.update(this._value); - if(this._originalSource) - hash.update(this._originalSource); - } -} - -require("./SourceAndMapMixin")(SourceMapSource.prototype); - -module.exports = SourceMapSource; +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +"use strict"; + +var SourceNode = require("source-map").SourceNode; +var SourceMapConsumer = require("source-map").SourceMapConsumer; +var SourceMapGenerator = require("source-map").SourceMapGenerator; +var SourceListMap = require("source-list-map").SourceListMap; +var fromStringWithSourceMap = require("source-list-map").fromStringWithSourceMap; +var Source = require("./Source"); + +class SourceMapSource extends Source { + constructor(value, name, sourceMap, originalSource, innerSourceMap) { + super(); + this._value = value; + this._name = name; + this._sourceMap = sourceMap; + this._originalSource = originalSource; + this._innerSourceMap = innerSourceMap; + } + + source() { + return this._value; + } + + node(options) { + var innerSourceMap = this._innerSourceMap; + var sourceMap = this._sourceMap; + if(innerSourceMap) { + sourceMap = SourceMapGenerator.fromSourceMap(new SourceMapConsumer(sourceMap)); + if(this._originalSource) + sourceMap.setSourceContent(this._name, this._originalSource); + innerSourceMap = new SourceMapConsumer(innerSourceMap); + sourceMap.applySourceMap(innerSourceMap, this._name); + sourceMap = sourceMap.toJSON(); + } + return SourceNode.fromStringWithSourceMap(this._value, new SourceMapConsumer(sourceMap)); + } + + listMap(options) { + options = options || {}; + if(options.module === false) + return new SourceListMap(this._value, this._name, this._value); + return fromStringWithSourceMap(this._value, typeof this._sourceMap === "string" ? JSON.parse(this._sourceMap) : this._sourceMap); + } + + updateHash(hash) { + hash.update(this._value); + if(this._originalSource) + hash.update(this._originalSource); + } +} + +require("./SourceAndMapMixin")(SourceMapSource.prototype); + +module.exports = SourceMapSource; diff --git a/node_modules/webpack-sources/lib/index.js b/node_modules/webpack-sources/lib/index.js index 0141d3589..f404c29d8 100644 --- a/node_modules/webpack-sources/lib/index.js +++ b/node_modules/webpack-sources/lib/index.js @@ -1,15 +1,15 @@ -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -exports.Source = require("./Source"); - -exports.RawSource = require("./RawSource"); -exports.OriginalSource = require("./OriginalSource"); -exports.SourceMapSource = require("./SourceMapSource"); -exports.LineToLineMappedSource = require("./LineToLineMappedSource"); - -exports.CachedSource = require("./CachedSource"); -exports.ConcatSource = require("./ConcatSource"); -exports.ReplaceSource = require("./ReplaceSource"); -exports.PrefixSource = require("./PrefixSource"); +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +exports.Source = require("./Source"); + +exports.RawSource = require("./RawSource"); +exports.OriginalSource = require("./OriginalSource"); +exports.SourceMapSource = require("./SourceMapSource"); +exports.LineToLineMappedSource = require("./LineToLineMappedSource"); + +exports.CachedSource = require("./CachedSource"); +exports.ConcatSource = require("./ConcatSource"); +exports.ReplaceSource = require("./ReplaceSource"); +exports.PrefixSource = require("./PrefixSource"); -- cgit v1.2.3