Remove mapping shortcut references.

This commit is contained in:
John-David Dalton
2016-10-11 23:37:33 -07:00
parent d431e97030
commit 14d7f89f75

View File

@@ -1,7 +1,4 @@
var mapping = require('./_mapping'), var mapping = require('./_mapping'),
aliasToReal = mapping.aliasToReal,
mutateMap = mapping.mutate,
remap = mapping.remap,
fallbackHolder = require('./placeholder'); fallbackHolder = require('./placeholder');
/** /**
@@ -353,8 +350,8 @@ function baseConvert(util, name, func, options) {
* @returns {Function} Returns the new converter function. * @returns {Function} Returns the new converter function.
*/ */
function createConverter(name, func) { function createConverter(name, func) {
var realName = aliasToReal[name] || name, var realName = mapping.aliasToReal[name] || name,
methodName = remap[realName] || realName, methodName = mapping.remap[realName] || realName,
oldOptions = options; oldOptions = options;
return function(options) { return function(options) {
@@ -433,38 +430,37 @@ function baseConvert(util, name, func, options) {
* @returns {Function} Returns the converted function. * @returns {Function} Returns the converted function.
*/ */
function wrap(name, func) { function wrap(name, func) {
name = aliasToReal[name] || name;
var result, var result,
realName = mapping.aliasToReal[name] || name,
wrapped = func, wrapped = func,
wrapper = wrappers[name]; wrapper = wrappers[realName];
if (wrapper) { if (wrapper) {
wrapped = wrapper(func); wrapped = wrapper(func);
} }
else if (config.immutable) { else if (config.immutable) {
if (mutateMap.array[name]) { if (mapping.mutate.array[realName]) {
wrapped = wrapImmutable(func, cloneArray); wrapped = wrapImmutable(func, cloneArray);
} }
else if (mutateMap.object[name]) { else if (mapping.mutate.object[realName]) {
wrapped = wrapImmutable(func, createCloner(func)); wrapped = wrapImmutable(func, createCloner(func));
} }
else if (mutateMap.set[name]) { else if (mapping.mutate.set[realName]) {
wrapped = wrapImmutable(func, cloneByPath); wrapped = wrapImmutable(func, cloneByPath);
} }
} }
each(aryMethodKeys, function(aryKey) { each(aryMethodKeys, function(aryKey) {
each(mapping.aryMethod[aryKey], function(otherName) { each(mapping.aryMethod[aryKey], function(otherName) {
if (name == otherName) { if (realName == otherName) {
var spreadData = mapping.methodSpread[name], var spreadData = mapping.methodSpread[realName],
afterRearg = spreadData && spreadData.afterRearg; afterRearg = spreadData && spreadData.afterRearg;
result = afterRearg result = afterRearg
? castFixed(name, castRearg(name, wrapped, aryKey), aryKey) ? castFixed(realName, castRearg(realName, wrapped, aryKey), aryKey)
: castRearg(name, castFixed(name, wrapped, aryKey), aryKey); : castRearg(realName, castFixed(realName, wrapped, aryKey), aryKey);
result = castCap(name, result); result = castCap(realName, result);
result = castCurry(name, result, aryKey); result = castCurry(realName, result, aryKey);
return false; return false;
} }
}); });
@@ -477,8 +473,8 @@ function baseConvert(util, name, func, options) {
return func.apply(this, arguments); return func.apply(this, arguments);
}; };
} }
result.convert = createConverter(name, func); result.convert = createConverter(realName, func);
if (mapping.placeholder[name]) { if (mapping.placeholder[realName]) {
setPlaceholder = true; setPlaceholder = true;
result.placeholder = func.placeholder = placeholder; result.placeholder = func.placeholder = placeholder;
} }
@@ -496,7 +492,7 @@ function baseConvert(util, name, func, options) {
var pairs = []; var pairs = [];
each(aryMethodKeys, function(aryKey) { each(aryMethodKeys, function(aryKey) {
each(mapping.aryMethod[aryKey], function(key) { each(mapping.aryMethod[aryKey], function(key) {
var func = _[remap[key] || key]; var func = _[mapping.remap[key] || key];
if (func) { if (func) {
pairs.push([key, wrap(key, func)]); pairs.push([key, wrap(key, func)]);
} }