set_shorthand("keep_fnames", options, [ "compress", "mangle" ]);
set_shorthand("toplevel", options, [ "compress", "mangle" ]);
set_shorthand("warnings", options, [ "compress" ]);
+ var quoted_props;
if (options.mangle) {
options.mangle = defaults(options.mangle, {
cache: options.nameCache && (options.nameCache.vars || {}),
reserved: [],
toplevel: false,
}, true);
- if (options.nameCache && options.mangle.properties) {
+ if (options.mangle.properties) {
if (typeof options.mangle.properties != "object") {
options.mangle.properties = {};
}
- if (!("cache" in options.mangle.properties)) {
+ if (options.mangle.properties.keep_quoted) {
+ quoted_props = options.mangle.properties.reserved;
+ if (!Array.isArray(quoted_props)) quoted_props = [];
+ options.mangle.properties.reserved = quoted_props;
+ }
+ if (options.nameCache && !("cache" in options.mangle.properties)) {
options.mangle.properties.cache = options.nameCache.props || {};
}
}
}
toplevel = options.parse.toplevel;
}
+ if (quoted_props) {
+ reserve_quoted_keys(toplevel, quoted_props);
+ }
if (options.wrap) {
toplevel = toplevel.wrap_commonjs(options.wrap);
}
}
}
+function reserve_quoted_keys(ast, reserved) {
+ function add(name) {
+ push_uniq(reserved, name);
+ }
+
+ ast.walk(new TreeWalker(function(node) {
+ if (node instanceof AST_ObjectKeyVal && node.quote) {
+ add(node.key);
+ } else if (node instanceof AST_Sub) {
+ addStrings(node.property, add);
+ }
+ }));
+}
+
+function addStrings(node, add) {
+ node.walk(new TreeWalker(function(node) {
+ if (node instanceof AST_Sequence) {
+ addStrings(node.expressions[node.expressions.length - 1], add);
+ } else if (node instanceof AST_String) {
+ add(node.value);
+ } else if (node instanceof AST_Conditional) {
+ addStrings(node.consequent, add);
+ addStrings(node.alternative, add);
+ }
+ return true;
+ }));
+}
+
function mangle_properties(ast, options) {
options = defaults(options, {
builtins: false,
}
var regex = options.regex;
- var keep_quoted = options.keep_quoted;
// note debug is either false (disabled), or a string of the debug suffix to use (enabled).
// note debug may be enabled as an empty string, which is falsey. Also treat passing 'true'
var names_to_mangle = [];
var unmangleable = [];
- var to_keep = {};
// step 1: find candidates to mangle
ast.walk(new TreeWalker(function(node){
if (node instanceof AST_ObjectKeyVal) {
- add(node.key, keep_quoted && node.quote);
+ add(node.key);
}
else if (node instanceof AST_ObjectProperty) {
// setter or getter, since KeyVal is handled above
add(node.property);
}
else if (node instanceof AST_Sub) {
- addStrings(node.property, keep_quoted);
+ addStrings(node.property, add);
}
}));
// step 2: transform the tree, renaming properties
return ast.transform(new TreeTransformer(function(node){
if (node instanceof AST_ObjectKeyVal) {
- if (!(keep_quoted && node.quote))
- node.key = mangle(node.key);
+ node.key = mangle(node.key);
}
else if (node instanceof AST_ObjectProperty) {
// setter or getter
else if (node instanceof AST_Dot) {
node.property = mangle(node.property);
}
- else if (node instanceof AST_Sub) {
- if (!keep_quoted)
- node.property = mangleStrings(node.property);
+ else if (!options.keep_quoted && node instanceof AST_Sub) {
+ node.property = mangleStrings(node.property);
}
- // else if (node instanceof AST_String) {
- // if (should_mangle(node.value)) {
- // AST_Node.warn(
- // "Found \"{prop}\" property candidate for mangling in an arbitrary string [{file}:{line},{col}]", {
- // file : node.start.file,
- // line : node.start.line,
- // col : node.start.col,
- // prop : node.value
- // }
- // );
- // }
- // }
}));
// only function declarations after this line
}
function should_mangle(name) {
- if (keep_quoted && name in to_keep) return false;
if (regex && !regex.test(name)) return false;
if (reserved.indexOf(name) >= 0) return false;
return cache.props.has(name)
|| names_to_mangle.indexOf(name) >= 0;
}
- function add(name, keep) {
- if (keep) {
- to_keep[name] = true;
- return;
- }
-
+ function add(name) {
if (can_mangle(name))
push_uniq(names_to_mangle, name);
// debug mode: use a prefix and suffix to preserve readability, e.g. o.foo -> o._$foo$NNN_.
var debug_mangled = "_$" + name + "$" + debug_name_suffix + "_";
- if (can_mangle(debug_mangled) && !(keep_quoted && debug_mangled in to_keep)) {
+ if (can_mangle(debug_mangled)) {
mangled = debug_mangled;
}
}
// either debug mode is off, or it is on and we could not use the mangled name
if (!mangled) {
- // Note: `can_mangle()` does not check if the name collides with the `to_keep` set
- // (filled with quoted properties when `keep_quoted` is set). Make sure we add this
- // check so we don't collide with a quoted name.
do {
mangled = base54(++cache.cname);
- } while (!can_mangle(mangled) || keep_quoted && mangled in to_keep);
+ } while (!can_mangle(mangled));
}
cache.props.set(name, mangled);
return mangled;
}
- function addStrings(node, keep) {
- var out = {};
- try {
- (function walk(node){
- node.walk(new TreeWalker(function(node){
- if (node instanceof AST_Sequence) {
- walk(node.expressions[node.expressions.length - 1]);
- return true;
- }
- if (node instanceof AST_String) {
- add(node.value, keep);
- return true;
- }
- if (node instanceof AST_Conditional) {
- walk(node.consequent);
- walk(node.alternative);
- return true;
- }
- throw out;
- }));
- })(node);
- } catch(ex) {
- if (ex !== out) throw ex;
- }
- }
-
function mangleStrings(node) {
return node.transform(new TreeTransformer(function(node){
if (node instanceof AST_Sequence) {
};
if (!options.warnings) options.warnings = true;
}
+ if (test.mangle && test.mangle.properties && test.mangle.properties.keep_quoted) {
+ var quoted_props = test.mangle.properties.reserved;
+ if (!Array.isArray(quoted_props)) quoted_props = [];
+ test.mangle.properties.reserved = quoted_props;
+ U.reserve_quoted_keys(input, quoted_props);
+ }
var cmp = new U.Compressor(options, true);
var output = cmp.compress(input);
output.figure_out_scope(test.mangle);
- if (test.mangle || test.mangle_props) {
+ if (test.mangle) {
U.base54.reset();
output.compute_char_frequency(test.mangle);
- }
- if (test.mangle) {
output.mangle_names(test.mangle);
- }
- if (test.mangle_props) {
- output = U.mangle_properties(output, test.mangle_props);
+ if (test.mangle.properties) {
+ output = U.mangle_properties(output, test.mangle.properties);
+ }
}
output = make_code(output, output_options);
if (expect != output) {