diff --git a/build.js b/build.js index 3caf47322..b29deb055 100644 --- a/build.js +++ b/build.js @@ -2476,6 +2476,7 @@ }; var isLodash = function(funcName) { + funcName = getRealName(funcName); if (_.contains(lodashOnlyFuncs, funcName) || /^(?:assign|zipObject)$/.test(funcName)) { var funcNames = _.difference(_.union(includeFuncs, plusFuncs), minusFuncs); return _.contains(funcNames, funcName); @@ -3853,9 +3854,9 @@ }); }); } - // remove `_.assign`, `_.forIn`, `_.forOwn`, `_.isPlainObject`, and `_.zipObject` assignments + // remove `_.assign`, `_.forIn`, `_.forOwn`, `_.isPlainObject`, `_.unzip`, and `_.zipObject` assignments source = source.replace(getMethodAssignments(source), function(match) { - return _.reduce(['assign', 'createCallback', 'forIn', 'forOwn', 'isPlainObject', 'zipObject'], function(result, funcName) { + return _.reduce(['assign', 'createCallback', 'forIn', 'forOwn', 'isPlainObject', 'unzip', 'zipObject'], function(result, funcName) { return isLodash(funcName) ? result : result.replace(RegExp('^(?: *//.*\\s*)* *lodash\\.' + funcName + ' *=[\\s\\S]+?;\\n', 'm'), ''); diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js index cb0d7d484..fba848d63 100644 --- a/dist/lodash.underscore.js +++ b/dist/lodash.underscore.js @@ -4366,7 +4366,6 @@ lodash.select = filter; lodash.tail = rest; lodash.unique = uniq; - lodash.unzip = zip; // add Underscore compat lodash.chain = chain; diff --git a/dist/lodash.underscore.min.js b/dist/lodash.underscore.min.js index 96416ccd1..2fd2d49bd 100644 --- a/dist/lodash.underscore.min.js +++ b/dist/lodash.underscore.min.js @@ -3,34 +3,34 @@ * Lo-Dash 1.3.1 (Custom Build) lodash.com/license | Underscore.js 1.5.1 underscorejs.org/LICENSE * Build: `lodash underscore exports="amd,commonjs,global,node" -o ./dist/lodash.underscore.js` */ -;!function(n){function t(n,t,r){r=(r||0)-1;for(var e=n?n.length:0;++rt||typeof n=="undefined")return 1;if(nu(a,c))&&(r&&a.push(c),o.push(f))}return o}function c(n,t,r,e){function u(){var e=arguments,c=o?this:t;return i||(n=t[a]),r.length&&(e=e.length?(e=Bt.call(e),f?e.concat(r):r.concat(e)):r),this instanceof u?(c=l(n.prototype),e=n.apply(c,e),w(e)?e:c):n.apply(c,e)}var i=j(n),o=!r,a=t;if(o){var f=e;r=t}else if(!i){if(!e)throw new TypeError;t=n}return u}function l(n){return w(n)?At(n):{} -}function p(n){return $t[n]}function s(){var n=(n=i.indexOf)===W?t:n;return n}function v(n){return zt[n]}function g(n){return n&&typeof n=="object"?wt.call(n)==rt:!1}function h(n){if(!n)return n;for(var t=1,r=arguments.length;te&&(e=r,u=n)});else for(;++iu&&(u=r);return u}function k(n,t){var r=-1,e=n?n.length:0; -if(typeof e=="number")for(var u=Array(e);++rarguments.length;t=H(t,e,4);var i=-1,o=n.length;if(typeof o=="number")for(u&&(r=n[++i]);++iarguments.length;if(typeof u!="number")var o=Mt(n),u=o.length;return t=H(t,e,4),N(n,function(e,a,f){a=o?o[--u]:--u,r=i?(i=!1,n[a]):t(r,n[a],a,f)}),r}function M(n,t,r){var e; -t=H(t,r),r=-1;var u=n?n.length:0;if(typeof u=="number")for(;++rr(u,o)&&i.push(o)}return i}function I(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&null!=t){var i=-1;for(t=H(t,r);++ie?Ft(0,u+e):e||0}else if(e)return e=P(n,r),n[e]===r?e:-1;return n?t(n,r,e):-1}function C(n,t,r){if(typeof t!="number"&&null!=t){var e=0,u=-1,i=n?n.length:0;for(t=H(t,r);++u>>1,r(n[e])t?0:t);++nc&&(a=n.apply(f,o)); -else{var r=new Date;!s&&!h&&(l=r);var e=p-(r-l);0/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},At||(l=function(n){if(w(n)){u.prototype=n;var t=new u;u.prototype=null}return t||{}}),g(arguments)||(g=function(n){return n&&typeof n=="object"?bt.call(n,"callee"):!1});var qt=Ot||function(n){return n&&typeof n=="object"?wt.call(n)==et:!1},Ot=function(n){var t,r=[]; -if(!n||!lt[typeof n])return r;for(t in n)bt.call(n,t)&&r.push(t);return r},Mt={}.o=St?function(n){return w(n)?St(n):[]}:Ot,$t={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},zt=_($t),It=RegExp("("+Mt(zt).join("|")+")","g"),Wt=RegExp("["+Mt($t).join("")+"]","g"),Ct=function(n,t){var r;if(!n||!lt[typeof n])return n;for(r in n)if(t(n[r],r,n)===Y)break;return n},Pt=function(n,t){var r;if(!n||!lt[typeof n])return n;for(r in n)if(bt.call(n,r)&&t(n[r],r,n)===Y)break;return n}; -j(/x/)&&(j=function(n){return typeof n=="function"&&"[object Function]"==wt.call(n)}),i.after=function(n,t){return function(){return 1>--n?t.apply(this,arguments):void 0}},i.bind=G,i.bindAll=function(n){for(var t=1u(o,a)){for(var f=r;--f;)if(0>u(t[f],a))continue n;o.push(a)}}return o},i.invert=_,i.invoke=function(n,t){var r=Bt.call(arguments,2),e=-1,u=typeof t=="function",i=n?n.length:0,o=Array(typeof i=="number"?i:0); -return N(n,function(n){o[++e]=(u?t:n[t]).apply(n,r)}),o},i.keys=Mt,i.map=R,i.max=B,i.memoize=function(n,t){var r={};return function(){var e=Z+(t?t.apply(this,arguments):arguments[0]);return bt.call(r,e)?r[e]:r[e]=n.apply(this,arguments)}},i.min=function(n,t,r){var e=1/0,u=e,i=-1,o=n?n.length:0;if(t||typeof o!="number")t=H(t,r),N(n,function(n,r,i){r=t(n,r,i),rt(r,u)&&(e[u]=n) -}),e},i.once=function(n){var t,r;return function(){return t?r:(t=!0,r=n.apply(this,arguments),n=null,r)}},i.pairs=function(n){for(var t=-1,r=Mt(n),e=r.length,u=Array(e);++tr?Ft(0,e+r):Nt(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},i.mixin=L,i.noConflict=function(){return n._=yt,this},i.random=function(n,t){null==n&&null==t&&(t=1),n=+n||0,null==t?(t=n,n=0):t=+t||0;var r=Rt();return n%1||t%1?n+Nt(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+dt(r*(t-n+1))},i.reduce=D,i.reduceRight=q,i.result=function(n,t){var r=n?n[t]:Q;return j(r)?n[t]():r},i.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Mt(n).length},i.some=M,i.sortedIndex=P,i.template=function(n,t,r){var u=i.templateSettings; -n||(n=""),r=y({},r,u);var o=0,a="__p+='",u=r.variable;n.replace(RegExp((r.escape||nt).source+"|"+(r.interpolate||nt).source+"|"+(r.evaluate||nt).source+"|$","g"),function(t,r,u,i,f){return a+=n.slice(o,f).replace(tt,e),r&&(a+="'+_['escape']("+r+")+'"),i&&(a+="';"+i+";__p+='"),u&&(a+="'+((__t=("+u+"))==null?'':__t)+'"),o=f+t.length,t}),a+="';\n",u||(u="obj",a="with("+u+"||{}){"+a+"}"),a="function("+u+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+a+"return __p}"; -try{var f=Function("_","return "+a)(i)}catch(c){throw c.source=a,c}return t?f(t):(f.source=a,f)},i.unescape=function(n){return null==n?"":(n+"").replace(It,v)},i.uniqueId=function(n){var t=++X+"";return n?n+t:t},i.all=T,i.any=M,i.detect=F,i.findWhere=function(n,t){return $(n,t,!0)},i.foldl=D,i.foldr=q,i.include=E,i.inject=D,i.first=I,i.last=function(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&null!=t){var i=u;for(t=H(t,r);i--&&t(n[i],i,n);)e++}else if(e=t,null==e||r)return n[u-1];return Bt.call(n,Ft(0,u-e)) -}},i.take=I,i.head=I,i.VERSION="1.3.1",L(i),i.prototype.chain=function(){return this.__chain__=!0,this},i.prototype.value=function(){return this.__wrapped__},N("pop push reverse shift sort splice unshift".split(" "),function(n){var t=ht[n];i.prototype[n]=function(){var n=this.__wrapped__;return t.apply(n,arguments),!Dt.spliceObjects&&0===n.length&&delete n[0],this}}),N(["concat","join","slice"],function(n){var t=ht[n];i.prototype[n]=function(){var n=t.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new o(n),n.__chain__=!0),n -}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=i, define(function(){return i})):st&&!st.nodeType?vt?(vt.exports=i)._=i:st._=i:n._=i}(this); \ No newline at end of file +;!function(n){function t(n,t,r){r=(r||0)-1;for(var e=n?n.length:0;++rt||typeof n=="undefined")return 1;if(nu(a,c))&&(r&&a.push(c),o.push(f))}return o}function c(n,t,r,e){function u(){var e=arguments,c=o?this:t;return i||(n=t[a]),r.length&&(e=e.length?(e=Rt.call(e),f?e.concat(r):r.concat(e)):r),this instanceof u?(c=l(n.prototype),e=n.apply(c,e),w(e)?e:c):n.apply(c,e)}var i=j(n),o=!r,a=t;if(o){var f=e;r=t}else if(!i){if(!e)throw new TypeError;t=n}return u}function l(n){return w(n)?xt(n):{} +}function p(n){return Mt[n]}function s(){var n=(n=i.indexOf)===z?t:n;return n}function v(n){return $t[n]}function g(n){return n&&typeof n=="object"?jt.call(n)==tt:!1}function h(n){if(!n)return n;for(var t=1,r=arguments.length;te&&(e=r,u=n)});else for(;++iu&&(u=r);return u}function k(n,t){var r=-1,e=n?n.length:0; +if(typeof e=="number")for(var u=Array(e);++rarguments.length;t=G(t,e,4);var i=-1,o=n.length;if(typeof o=="number")for(u&&(r=n[++i]);++iarguments.length;if(typeof u!="number")var o=qt(n),u=o.length;return t=G(t,e,4),N(n,function(e,a,f){a=o?o[--u]:--u,r=i?(i=!1,n[a]):t(r,n[a],a,f)}),r}function M(n,t,r){var e; +t=G(t,r),r=-1;var u=n?n.length:0;if(typeof u=="number")for(;++rr(u,o)&&i.push(o)}return i}function W(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&null!=t){var i=-1;for(t=G(t,r);++ie?St(0,u+e):e||0}else if(e)return e=P(n,r),n[e]===r?e:-1;return n?t(n,r,e):-1}function C(n,t,r){if(typeof t!="number"&&null!=t){var e=0,u=-1,i=n?n.length:0;for(t=G(t,r);++u>>1,r(n[e])c&&(a=n.apply(f,o));else{var r=new Date;!s&&!h&&(l=r); +var e=p-(r-l);0/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},xt||(l=function(n){if(w(n)){u.prototype=n;var t=new u;u.prototype=null}return t||{}}),g(arguments)||(g=function(n){return n&&typeof n=="object"?dt.call(n,"callee"):!1});var Dt=At||function(n){return n&&typeof n=="object"?jt.call(n)==rt:!1},At=function(n){var t,r=[]; +if(!n||!ct[typeof n])return r;for(t in n)dt.call(n,t)&&r.push(t);return r},qt={}.o=Tt?function(n){return w(n)?Tt(n):[]}:At,Mt={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},$t=_(Mt),It=RegExp("("+qt($t).join("|")+")","g"),Wt=RegExp("["+qt(Mt).join("")+"]","g"),zt=function(n,t){var r;if(!n||!ct[typeof n])return n;for(r in n)if(t(n[r],r,n)===X)break;return n},Ct=function(n,t){var r;if(!n||!ct[typeof n])return n;for(r in n)if(dt.call(n,r)&&t(n[r],r,n)===X)break;return n}; +j(/x/)&&(j=function(n){return typeof n=="function"&&"[object Function]"==jt.call(n)}),i.after=function(n,t){return function(){return 1>--n?t.apply(this,arguments):void 0}},i.bind=V,i.bindAll=function(n){for(var t=1u(o,a)){for(var f=r;--f;)if(0>u(t[f],a))continue n;o.push(a)}}return o},i.invert=_,i.invoke=function(n,t){var r=Rt.call(arguments,2),e=-1,u=typeof t=="function",i=n?n.length:0,o=Array(typeof i=="number"?i:0); +return N(n,function(n){o[++e]=(u?t:n[t]).apply(n,r)}),o},i.keys=qt,i.map=R,i.max=B,i.memoize=function(n,t){var r={};return function(){var e=Y+(t?t.apply(this,arguments):arguments[0]);return dt.call(r,e)?r[e]:r[e]=n.apply(this,arguments)}},i.min=function(n,t,r){var e=1/0,u=e,i=-1,o=n?n.length:0;if(t||typeof o!="number")t=G(t,r),N(n,function(n,r,i){r=t(n,r,i),rt(r,u)&&(e[u]=n) +}),e},i.once=function(n){var t,r;return function(){return t?r:(t=!0,r=n.apply(this,arguments),n=null,r)}},i.pairs=function(n){for(var t=-1,r=qt(n),e=r.length,u=Array(e);++tt?0:t);++nr?St(0,e+r):Ft(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},i.mixin=K,i.noConflict=function(){return n._=ht,this},i.random=function(n,t){null==n&&null==t&&(t=1),n=+n||0,null==t?(t=n,n=0):t=+t||0;var r=Nt();return n%1||t%1?n+Ft(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+_t(r*(t-n+1))},i.reduce=D,i.reduceRight=q,i.result=function(n,t){var r=n?n[t]:L; +return j(r)?n[t]():r},i.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:qt(n).length},i.some=M,i.sortedIndex=P,i.template=function(n,t,r){var u=i.templateSettings;n||(n=""),r=y({},r,u);var o=0,a="__p+='",u=r.variable;n.replace(RegExp((r.escape||Z).source+"|"+(r.interpolate||Z).source+"|"+(r.evaluate||Z).source+"|$","g"),function(t,r,u,i,f){return a+=n.slice(o,f).replace(nt,e),r&&(a+="'+_['escape']("+r+")+'"),i&&(a+="';"+i+";__p+='"),u&&(a+="'+((__t=("+u+"))==null?'':__t)+'"),o=f+t.length,t +}),a+="';\n",u||(u="obj",a="with("+u+"||{}){"+a+"}"),a="function("+u+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+a+"return __p}";try{var f=Function("_","return "+a)(i)}catch(c){throw c.source=a,c}return t?f(t):(f.source=a,f)},i.unescape=function(n){return null==n?"":(n+"").replace(It,v)},i.uniqueId=function(n){var t=++Q+"";return n?n+t:t},i.all=T,i.any=M,i.detect=F,i.findWhere=function(n,t){return $(n,t,!0)},i.foldl=D,i.foldr=q,i.include=E,i.inject=D,i.first=W,i.last=function(n,t,r){if(n){var e=0,u=n.length; +if(typeof t!="number"&&null!=t){var i=u;for(t=G(t,r);i--&&t(n[i],i,n);)e++}else if(e=t,null==e||r)return n[u-1];return Rt.call(n,St(0,u-e))}},i.take=W,i.head=W,i.VERSION="1.3.1",K(i),i.prototype.chain=function(){return this.__chain__=!0,this},i.prototype.value=function(){return this.__wrapped__},N("pop push reverse shift sort splice unshift".split(" "),function(n){var t=gt[n];i.prototype[n]=function(){var n=this.__wrapped__;return t.apply(n,arguments),!kt.spliceObjects&&0===n.length&&delete n[0],this +}}),N(["concat","join","slice"],function(n){var t=gt[n];i.prototype[n]=function(){var n=t.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new o(n),n.__chain__=!0),n}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=i, define(function(){return i})):pt&&!pt.nodeType?st?(st.exports=i)._=i:pt._=i:n._=i}(this); \ No newline at end of file