Revert allowing _.omit and _.pick to work as a callback for _.map when combined with _.partialRight to be solved with _.partial placeholders in v3.

This commit is contained in:
John-David Dalton
2014-02-10 00:32:10 -08:00
parent de3d9dca72
commit dae0b25717
8 changed files with 71 additions and 157 deletions

View File

@@ -47,9 +47,9 @@ return"boolean"!=u&&null!=t&&(e=r,r=t,t=false,"number"!=u&&"string"!=u||!e||e[r]
for(t=H(t,r,3);u--&&(r=e[u],false!==t(n[r],r,n)););return n},u.functions=er,u.groupBy=ve,u.indexBy=ye,u.initial=function(n,t,r){var e=0,o=n?n.length:0;if(typeof t!="number"&&null!=t){var a=o;for(t=u.createCallback(t,r,3);a--&&t(n[a],a,n);)e++}else e=null==t||r?1:t||e;return e=o-e,qt(n,0,0<e?e:0)},u.intersection=function(){for(var n=[],e=-1,u=arguments.length,o=c(),a=St(),i=ce&&a===t,l=c();++e<u;){var f=arguments[e];(be(f)||Nt(f))&&(n.push(f),o.push(i&&f.length>=S&&ce(e?n[e]:l)))}var i=n[0],p=-1,g=i?i.length:0,h=[];
n:for(;++p<g;){var v=o[0],f=i[p];if(0>(v?r(v,f):a(l,f))){for(e=u,(v||l).push(f);--e;)if(v=o[e],0>(v?r(v,f):a(n[e],f)))continue n;h.push(f)}}return s(o),s(l),h},u.invert=function(n,t){for(var r=-1,e=we(n),u=e.length,o={};++r<u;){var a=e[r],i=n[a];t?Br.call(o,i)?o[i].push(a):o[i]=[a]:o[i]=a}return o},u.invoke=function(n,t){var r=-1,e=typeof t=="function",u=n?n.length:0,o=yr(typeof u=="number"?u:0);if(3>arguments.length&&be(n))for(;++r<u;){var a=n[r];o[r]=e?t.call(a):a[t]()}else{var i=qt(arguments,2);
ht(n,function(n){o[++r]=(e?t:n[t]).apply(n,i)})}return o},u.keys=we,u.map=Xt,u.mapValues=function(n,t,r){var e={};return t=u.createCallback(t,r,3),dt(n,function(n,r,u){e[r]=t(n,r,u)}),e},u.match=sr,u.max=Gt,u.memoize=function(n,t){if(!or(n))throw new kr;var r=function(){var e=r.cache,u=t?t.apply(this,arguments):"_"+arguments[0];return Br.call(e,u)?e[u]:e[u]=n.apply(this,arguments)};return r.cache={},r},u.merge=function(n,t,r){if(!ar(n))return n;var e=arguments,u=e.length,o=typeof r;if("number"!=o&&"string"!=o||!e[3]||e[3][r]!==t||(u=2),3<u&&"function"==typeof e[u-2])var a=H(e[--u-1],e[u--],2);
else 2<u&&"function"==typeof e[u-1]&&(a=e[--u]);for(var e=qt(arguments,1,u),o=-1,i=c(),l=c();++o<u;)jt(n,e[o],a,i,l);return s(i),s(l),n},u.min=function(n,t,r){var o=1/0,a=o,i=typeof t;if("number"!=i&&"string"!=i||!r||r[t]!==n||(t=null),null==t&&be(n))for(r=-1,i=n.length;++r<i;){var l=n[r];l<a&&(a=l)}else t=null==t&&lr(n)?e:u.createCallback(t,r,3),ht(n,function(n,r,e){r=t(n,r,e),r<o&&(o=r,a=n)});return a},u.omit=function(n,t,r){var e={},o=typeof t;if("function"!=o){var a=arguments;"number"!=o&&"string"!=o||!r||r[t]!==n||(a=qt(a),Mr.call(a,1,2));
for(var i=mt(a,true,false,1),o=i.length;o--;)i[o]=Cr(i[o]);var l=[];for(se(n,function(n,t){l.push(t)}),a=-1,l=gt(l,i),o=l.length;++a<o;)i=l[a],e[i]=n[i]}else t=u.createCallback(t,r,3),se(n,function(n,r,u){t(n,r,u)||(e[r]=n)});return e},u.once=function(n){var t,r;if(!or(n))throw new kr;return function(){return t?r:(t=true,r=n.apply(this,arguments),n=null,r)}},u.pairs=function(n){for(var t=-1,r=we(n),e=r.length,u=yr(e);++t<e;){var o=r[t];u[t]=[o,n[o]]}return u},u.partial=function(n){if(n)var t=n[N]?n[N][2]:n.length,r=qt(arguments,1),t=t-r.length;
return Ot(n,O,t,null,r)},u.partialRight=function(n){if(n)var t=n[N]?n[N][2]:n.length,r=qt(arguments,1),t=t-r.length;return Ot(n,E,t,null,null,r)},u.partition=me,u.pick=function(n,t,r){var e={},o=typeof t;if("function"!=o){var a=arguments;"number"!=o&&"string"!=o||!r||r[t]!==n||(a=qt(a),Mr.call(a,1,2));for(var o=-1,a=mt(a,true,false,1),i=ar(n)?a.length:0;++o<i;){var l=a[o];l in n&&(e[l]=n[l])}}else t=u.createCallback(t,r,3),se(n,function(n,r,u){t(n,r,u)&&(e[r]=n)});return e},u.pluck=de,u.property=vr,u.pull=function(n){for(var t=arguments,r=0,e=t.length,u=n?n.length:0;++r<e;)for(var o=-1,a=t[r];++o<u;)n[o]===a&&(Mr.call(n,o--,1),u--);
else 2<u&&"function"==typeof e[u-1]&&(a=e[--u]);for(var e=qt(arguments,1,u),o=-1,i=c(),l=c();++o<u;)jt(n,e[o],a,i,l);return s(i),s(l),n},u.min=function(n,t,r){var o=1/0,a=o,i=typeof t;if("number"!=i&&"string"!=i||!r||r[t]!==n||(t=null),null==t&&be(n))for(r=-1,i=n.length;++r<i;){var l=n[r];l<a&&(a=l)}else t=null==t&&lr(n)?e:u.createCallback(t,r,3),ht(n,function(n,r,e){r=t(n,r,e),r<o&&(o=r,a=n)});return a},u.omit=function(n,t,r){var e={};if(typeof t!="function"){for(var o=mt(arguments,true,false,1),a=o.length;a--;)o[a]=Cr(o[a]);
var i=[];se(n,function(n,t){i.push(t)});for(var l=-1,i=gt(i,o),a=i.length;++l<a;)o=i[l],e[o]=n[o]}else t=u.createCallback(t,r,3),se(n,function(n,r,u){t(n,r,u)||(e[r]=n)});return e},u.once=function(n){var t,r;if(!or(n))throw new kr;return function(){return t?r:(t=true,r=n.apply(this,arguments),n=null,r)}},u.pairs=function(n){for(var t=-1,r=we(n),e=r.length,u=yr(e);++t<e;){var o=r[t];u[t]=[o,n[o]]}return u},u.partial=function(n){if(n)var t=n[N]?n[N][2]:n.length,r=qt(arguments,1),t=t-r.length;return Ot(n,O,t,null,r)
},u.partialRight=function(n){if(n)var t=n[N]?n[N][2]:n.length,r=qt(arguments,1),t=t-r.length;return Ot(n,E,t,null,null,r)},u.partition=me,u.pick=function(n,t,r){var e={};if(typeof t!="function")for(var o=-1,a=mt(arguments,true,false,1),i=ar(n)?a.length:0;++o<i;){var l=a[o];l in n&&(e[l]=n[l])}else t=u.createCallback(t,r,3),se(n,function(n,r,u){t(n,r,u)&&(e[r]=n)});return e},u.pluck=de,u.property=vr,u.pull=function(n){for(var t=arguments,r=0,e=t.length,u=n?n.length:0;++r<e;)for(var o=-1,a=t[r];++o<u;)n[o]===a&&(Mr.call(n,o--,1),u--);
return n},u.range=function(n,t,r){n=+n||0,r=typeof r=="number"?r:+r||1,null==t&&(t=n,n=0);var e=-1;t=Zr(0,Pr((t-n)/(r||1)));for(var u=yr(t);++e<t;)u[e]=n,n+=r;return u},u.reject=function(n,t,r){return t=u.createCallback(t,r,3),Kt(n,function(n,r,e){return!t(n,r,e)})},u.remove=function(n,t,r){var e=-1,o=n?n.length:0,a=[];for(t=u.createCallback(t,r,3);++e<o;)r=n[e],t(r,e,n)&&(a.push(r),Mr.call(n,e--,1),o--);return a},u.rest=Pt,u.shuffle=Qt,u.slice=qt,u.sortBy=function(n,t,r){var e=-1,o=t&&be(t),l=n?n.length:0,f=yr(typeof l=="number"?l:0);
for(o||(t=u.createCallback(t,r,3)),ht(n,function(n,r,u){if(o)for(u=t.length,r=yr(u);u--;)r[u]=n[t[u]];else r=t(n,r,u);u=f[++e]=J.pop()||{f:null,g:0,h:null},u.f=r,u.g=e,u.h=n}),l=f.length,f.sort(o?i:a);l--;)n=f[l],f[l]=n.h,g(n);return f},u.tap=function(n,t,r){return t.call(r,n),n},u.throttle=function(n,t,r){var e=true,u=true;if(!or(n))throw new kr;return false===r?e=false:ar(r)&&(e="leading"in r?r.leading:e,u="trailing"in r?r.trailing:u),ct.leading=e,ct.maxWait=t,ct.trailing=u,nr(n,t,ct)},u.times=function(n,t,r){n=-1<(n=+n)?n:0;
var e=-1,u=yr(n);for(t=H(t,r,1);++e<n;)u[e]=t(e);return u},u.toArray=function(n){return n&&typeof n.length=="number"?fe.unindexedChars&&lr(n)?n.split(""):qt(n):fr(n)},u.transform=function(n,t,r,e){var o=be(n);if(null==r)if(o)r=[];else{var a=n&&n.constructor;r=A(a&&a.prototype)}return t&&(t=u.createCallback(t,e,4),(o?ht:dt)(n,function(n,e,u){return t(r,n,e,u)})),r},u.union=function(){return Ct(mt(arguments,true,true))},u.uniq=$t,u.values=fr,u.where=Kt,u.without=function(n){return gt(n,qt(arguments,1))