fixup! Normalize arrangement

bem-sdk-archive · Oct 4, 2016 · 5add1e0 · 5add1e0
1 parent 6d887ac
commit 5add1e0
Show file tree

Hide file tree

Showing 30 changed files with 35 additions and 76 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -1,12 +1,5 @@
 'use strict';
 
-const normalize = {
-    v1: require('./normalize/normalize'),
-    v2: require('./normalize/normalize2'),
-    harmony: require('./normalize/normalize-harmony'),
-    enb: require('./normalize/normalize2')
-};
-
 module.exports = {
     normalize: require('./normalize'),
     merge: require('./merge'),
@@ -15,6 +8,5 @@ module.exports = {
     parse: require('./parse'),
     assign: require('./assign'),
     load: require('./load'),
-    stringify: require('./stringify'),
-    normalizer: format => (normalize[format] || normalize.v2)
+    stringify: require('./stringify')
 };
diff --git a/lib/normalize.js b/lib/normalize.js
@@ -1,14 +1,16 @@
 'use strict';
 
-const normalizers = {
-    v1: require('./normalize/normalize'),
-    v2: require('./normalize/normalize2'),
-    harmony: require('./normalize/normalize-harmony'),
-    enb: require('./normalize/normalize2')
+const normalizer = {
+    v1: require('./normalize/v1'),
+    v2: require('./normalize/v2'),
+    harmony: require('./normalize/harmony'),
+    enb: require('./normalize/v2')
 };
 
 module.exports = (decl, opts) => {
     opts || (opts = {});
 
-    return opts.format ? normalizers[opts.format](decl) : normalizers.v2(decl);
+    const format = opts.format || 'v2';
+
+    return normalizer[format](decl);
 };
diff --git a/lib/normalize/normalize-harmony.js → lib/normalize/harmony.js b/lib/normalize/normalize-harmony.js → lib/normalize/harmony.js
diff --git a/lib/normalize/normalize.js → lib/normalize/v1.js b/lib/normalize/normalize.js → lib/normalize/v1.js
diff --git a/lib/normalize/normalize2.js → lib/normalize/v2.js b/lib/normalize/normalize2.js → lib/normalize/v2.js
diff --git a/lib/parse.js b/lib/parse.js
@@ -5,9 +5,9 @@ const assert = require('assert');
 const nodeEval = require('node-eval');
 
 const detect = require('./detect');
-const normalize = require('./normalize/normalize');
-const normalize2 = require('./normalize/normalize2');
-const normalizeHarmony = require('./normalize/normalize-harmony');
+const normalize = require('./normalize/v1');
+const normalize2 = require('./normalize/v2');
+const normalizeHarmony = require('./normalize/harmony');
 
 const normalizers = {
     v1: normalize,

diff --git a/test/index.test.js b/test/index.test.js
@@ -31,41 +31,6 @@ test('should support `BEMDECL 2.0` format', t => {
     t.deepEqual(decl, [{ entity: decls.normalized, tech: null }]);
 });
 
-test('should have `normalizer` method', t => {
-    t.truthy(typeof bemDecl.normalizer === 'function');
-});
-
-test('normalizer should support default value as `normalize`', t => {
-    var decl = bemDecl.normalizer('v1')(decls.v1);
-
-    t.deepEqual(decl, [{ entity: decls.normalized, tech: null }]);
-});
-
-test('should support `BEMDECL 1.0` format through normalizer', t => {
-    var decl = bemDecl.normalizer('v1')(decls.v1);
-
-    t.deepEqual(decl, [{ entity: decls.normalized, tech: null }]);
-});
-
-// TODO: define name of format
-test('should have support `BEMDECL x.0` format through normalizer', t => {
-    var decl = bemDecl.normalizer('v2')(decls.v2);
-
-    t.deepEqual(decl, [{ entity: decls.normalized, tech: null }]);
-})
-
-test('should support `BEMDECL 2.0` format through normalizer', t => {
-    var decl = bemDecl.normalizer('harmony')(decls.v2);
-
-    t.deepEqual(decl, [{ entity: decls.normalized, tech: null }]);
-});
-
-test('should support uncorrect normalizer arg with default result', t => {
-    var decl = bemDecl.normalizer('levoe')(decls.v2);
-
-    t.deepEqual(decl, [{ entity: decls.normalized, tech: null }]);
-});
-
 test('should have `merge` method', t => {
     t.truthy(typeof bemDecl.merge === 'function');
 });

diff --git a/test/normalize-harmony/block.test.js b/test/normalize-harmony/block.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('harmony');
+const normalize = require('../../lib/normalize/harmony');
 
 test('should support block', t => {
     var block = { block: 'block' };

diff --git a/test/normalize-harmony/common.test.js b/test/normalize-harmony/common.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('harmony');
+const normalize = require('../../lib/normalize/harmony');
 
 test('should support undefined', t => {
     t.deepEqual(normalize(), []);

diff --git a/test/normalize-harmony/elem.test.js b/test/normalize-harmony/elem.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('harmony');
+const normalize = require('../../lib/normalize/harmony');
 
 test('should support elem', t => {
     const decl = { block: 'block', elem: 'elem' };

diff --git a/test/normalize-harmony/elems.test.js b/test/normalize-harmony/elems.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('harmony');
+const normalize = require('../../lib/normalize/harmony');
 
 test('should support strings', t => {
     const decl = {

diff --git a/test/normalize-harmony/mix.test.js b/test/normalize-harmony/mix.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('harmony');
+const normalize = require('../../lib/normalize/harmony');
 
 test('should support mix', t => {
     const decl = {

diff --git a/test/normalize-harmony/mods.test.js b/test/normalize-harmony/mods.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('harmony');
+const normalize = require('../../lib/normalize/harmony');
 
 test('should support shortcut for bool mod', t => {
     const decl = { block: 'block', modName: 'mod' };

diff --git a/test/normalize-harmony/scope.test.js b/test/normalize-harmony/scope.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('harmony');
+const normalize = require('../../lib/normalize/harmony');
 
 test('should support mod in block scope', t => {
     const decl = {

diff --git a/test/normalize/common.test.js b/test/normalize/common.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v1');
+const normalize = require('../../lib/normalize/v1');
 
 test('should support undefined', t => {
     t.deepEqual(normalize(), []);

diff --git a/test/normalize/elems.test.js b/test/normalize/elems.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v1');
+const normalize = require('../../lib/normalize/v1');
 
 test('should support arrays', t => {
     const decl = {

diff --git a/test/normalize/mods.test.js b/test/normalize/mods.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v1');
+const normalize = require('../../lib/normalize/v1');
 
 test('should support objects', t => {
     const decl = { name: 'block', mods: [{ name: 'mod', vals: [{ name: 'val' }] }] };

diff --git a/test/normalize2/block-mod.test.js b/test/normalize2/block-mod.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support mod', t => {
     const decl = {

diff --git a/test/normalize2/block-mods.test.js b/test/normalize2/block-mods.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('sould support mods', t => {
     const decl = {

diff --git a/test/normalize2/block.test.js b/test/normalize2/block.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support block', t => {
     t.deepEqual(normalize({ block: 'block' }), [

diff --git a/test/normalize2/common.test.js b/test/normalize2/common.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support undefined', t => {
     t.deepEqual(normalize(), []);

diff --git a/test/normalize2/elem-mod.test.js b/test/normalize2/elem-mod.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support shortcut for bool mod of elem', t => {
     const decl = { block: 'block', elem: 'elem', mod: 'mod' };

diff --git a/test/normalize2/elem-mods.test.js b/test/normalize2/elem-mods.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support elem as object and mod', t => {
     const decl = {

diff --git a/test/normalize2/elem.test.js b/test/normalize2/elem.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support elem', t => {
     const decl = { block: 'block', elem: 'elem' };

diff --git a/test/normalize2/elems-mod.test.js b/test/normalize2/elems-mod.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support shortcut for bool mod of elem', t => {
     const decl = { block: 'block', elems: 'elem', mod: 'mod' };

diff --git a/test/normalize2/elems-mods.test.js b/test/normalize2/elems-mods.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support elem as object and mod', t => {
     const decl = {

diff --git a/test/normalize2/elems.test.js b/test/normalize2/elems.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support elems', t => {
     const decl = { block: 'block', elems: 'elem' };

diff --git a/test/normalize2/iterable.test.js b/test/normalize2/iterable.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support iterable set', t => {
     const decl = new Set();

diff --git a/test/normalize2/mod-mods-vals.test.js b/test/normalize2/mod-mods-vals.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support mod and mods without block, elem', t => {
     const decl = [

diff --git a/test/normalize2/unusual.test.js b/test/normalize2/unusual.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const test = require('ava');
-const normalize = require('../../lib').normalizer('v2');
+const normalize = require('../../lib/normalize/v2');
 
 test('should support both mod and mods', t => {
     const decl = {