From 78af0c0c5180e945f056dc924fbdfd8624c53c5a Mon Sep 17 00:00:00 2001 From: Mariusz Nowak Date: Sun, 27 Apr 2014 12:59:01 +0200 Subject: [PATCH] Moved normalizers out of lib folder --- index.js | 12 ++++++------ {lib/normalizers => normalizers}/0.js | 0 .../get-primitive-fixed.js | 0 {lib/normalizers => normalizers}/get-regular-1.js | 0 .../normalizers => normalizers}/get-regular-fixed.js | 0 {lib/normalizers => normalizers}/get-regular.js | 0 {lib/normalizers => normalizers}/primitive.js | 0 test/{lib => }/normalizers/0.js | 2 +- test/{lib => }/normalizers/get-primitive-fixed.js | 2 +- test/{lib => }/normalizers/get-regular-1.js | 2 +- test/{lib => }/normalizers/get-regular-fixed.js | 2 +- test/{lib => }/normalizers/get-regular.js | 2 +- test/{lib => }/normalizers/primitive.js | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename {lib/normalizers => normalizers}/0.js (100%) rename {lib/normalizers => normalizers}/get-primitive-fixed.js (100%) rename {lib/normalizers => normalizers}/get-regular-1.js (100%) rename {lib/normalizers => normalizers}/get-regular-fixed.js (100%) rename {lib/normalizers => normalizers}/get-regular.js (100%) rename {lib/normalizers => normalizers}/primitive.js (100%) rename test/{lib => }/normalizers/0.js (94%) rename test/{lib => }/normalizers/get-primitive-fixed.js (97%) rename test/{lib => }/normalizers/get-regular-1.js (97%) rename test/{lib => }/normalizers/get-regular-fixed.js (98%) rename test/{lib => }/normalizers/get-regular.js (97%) rename test/{lib => }/normalizers/primitive.js (93%) diff --git a/index.js b/index.js index 158b884..e8a9d0a 100644 --- a/index.js +++ b/index.js @@ -10,17 +10,17 @@ module.exports = function (fn/*, options*/) { if (!options.normalizer) { length = options.length = resolveLength(options.length, fn.length, options.async); if (length === 0) { - options.normalizer = require('./lib/normalizers/0'); + options.normalizer = require('./normalizers/0'); } else if (options.primitive) { if (length === false) { - options.normalizer = require('./lib/normalizers/primitive'); + options.normalizer = require('./normalizers/primitive'); } else if (length > 1) { - options.normalizer = require('./lib/normalizers/get-primitive-fixed')(length); + options.normalizer = require('./normalizers/get-primitive-fixed')(length); } } else { - if (length === false) options.normalizer = require('./lib/normalizers/get-regular')(); - else if (length === 1) options.normalizer = require('./lib/normalizers/get-regular-1')(); - else options.normalizer = require('./lib/normalizers/get-regular-fixed')(length); + if (length === false) options.normalizer = require('./normalizers/get-regular')(); + else if (length === 1) options.normalizer = require('./normalizers/get-regular-1')(); + else options.normalizer = require('./normalizers/get-regular-fixed')(length); } } diff --git a/lib/normalizers/0.js b/normalizers/0.js similarity index 100% rename from lib/normalizers/0.js rename to normalizers/0.js diff --git a/lib/normalizers/get-primitive-fixed.js b/normalizers/get-primitive-fixed.js similarity index 100% rename from lib/normalizers/get-primitive-fixed.js rename to normalizers/get-primitive-fixed.js diff --git a/lib/normalizers/get-regular-1.js b/normalizers/get-regular-1.js similarity index 100% rename from lib/normalizers/get-regular-1.js rename to normalizers/get-regular-1.js diff --git a/lib/normalizers/get-regular-fixed.js b/normalizers/get-regular-fixed.js similarity index 100% rename from lib/normalizers/get-regular-fixed.js rename to normalizers/get-regular-fixed.js diff --git a/lib/normalizers/get-regular.js b/normalizers/get-regular.js similarity index 100% rename from lib/normalizers/get-regular.js rename to normalizers/get-regular.js diff --git a/lib/normalizers/primitive.js b/normalizers/primitive.js similarity index 100% rename from lib/normalizers/primitive.js rename to normalizers/primitive.js diff --git a/test/lib/normalizers/0.js b/test/normalizers/0.js similarity index 94% rename from test/lib/normalizers/0.js rename to test/normalizers/0.js index 61cf0f1..c178a56 100644 --- a/test/lib/normalizers/0.js +++ b/test/normalizers/0.js @@ -1,6 +1,6 @@ 'use strict'; -var memoize = require('../../..'); +var memoize = require('../..'); module.exports = { "": function (a) { diff --git a/test/lib/normalizers/get-primitive-fixed.js b/test/normalizers/get-primitive-fixed.js similarity index 97% rename from test/lib/normalizers/get-primitive-fixed.js rename to test/normalizers/get-primitive-fixed.js index a4701d0..9ae7ae5 100644 --- a/test/lib/normalizers/get-primitive-fixed.js +++ b/test/normalizers/get-primitive-fixed.js @@ -1,6 +1,6 @@ 'use strict'; -var memoize = require('../../..'); +var memoize = require('../..'); module.exports = { "": function (a) { diff --git a/test/lib/normalizers/get-regular-1.js b/test/normalizers/get-regular-1.js similarity index 97% rename from test/lib/normalizers/get-regular-1.js rename to test/normalizers/get-regular-1.js index d5827fc..010ef7d 100644 --- a/test/lib/normalizers/get-regular-1.js +++ b/test/normalizers/get-regular-1.js @@ -1,6 +1,6 @@ 'use strict'; -var memoize = require('../../..'); +var memoize = require('../..'); module.exports = { "": function (t, a) { diff --git a/test/lib/normalizers/get-regular-fixed.js b/test/normalizers/get-regular-fixed.js similarity index 98% rename from test/lib/normalizers/get-regular-fixed.js rename to test/normalizers/get-regular-fixed.js index feee3f6..5a3280a 100644 --- a/test/lib/normalizers/get-regular-fixed.js +++ b/test/normalizers/get-regular-fixed.js @@ -1,6 +1,6 @@ 'use strict'; -var memoize = require('../../..'); +var memoize = require('../..'); module.exports = { "": function (a) { diff --git a/test/lib/normalizers/get-regular.js b/test/normalizers/get-regular.js similarity index 97% rename from test/lib/normalizers/get-regular.js rename to test/normalizers/get-regular.js index c6c5fe5..4000b60 100644 --- a/test/lib/normalizers/get-regular.js +++ b/test/normalizers/get-regular.js @@ -1,7 +1,7 @@ 'use strict'; var aFrom = require('es5-ext/array/from') - , memoize = require('../../..'); + , memoize = require('../..'); module.exports = function () { return { diff --git a/test/lib/normalizers/primitive.js b/test/normalizers/primitive.js similarity index 93% rename from test/lib/normalizers/primitive.js rename to test/normalizers/primitive.js index 9c90048..3b5de7f 100644 --- a/test/lib/normalizers/primitive.js +++ b/test/normalizers/primitive.js @@ -1,6 +1,6 @@ 'use strict'; -var memoize = require('../../..') +var memoize = require('../..') , join = Array.prototype.join;