fixup! wip

bem-sdk-archive · Oct 1, 2016 · dc67cbf · dc67cbf
1 parent 831438c
commit dc67cbf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/lib/convert.js b/lib/convert.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const assert = require('assert');
+
 const converters = {
     v2: function (decl) {
         Array.isArray(decl) || (decl = [decl]);
@@ -30,9 +32,10 @@ const converters = {
 };
 
 module.exports = function (decl, opts) {
-    const defaultOpts = { version: 'v2' };
-    opts || (opts = defaultOpts);
-    const version = opts.version || defaultOpts.version;
+    opts || (opts = {});
+    assert(opts.version, 'You must declare target version');
+
+    const version = opts.version;
 
     if (!converters.hasOwnProperty(version)) {
         throw new Error('Unknown format');

diff --git a/lib/stringify.js b/lib/stringify.js
@@ -1,11 +1,14 @@
 'use strict';
 
+const assert = require('assert');
+
 const convert = require('./convert');
 
 module.exports = function (decl, opts) {
-    const defaultOpts = { version: 'v2' };
-    opts || (opts = defaultOpts);
-    const version = opts.version || defaultOpts.version;
+    opts || (opts = {});
+    assert(opts.version, 'You must declare target version');
+
+    const version = opts.version;
 
     let result = '';
 

diff --git a/test/convert/v2.test.js b/test/convert/v2.test.js
@@ -4,16 +4,20 @@ const test = require('ava');
 
 const convert = require('../../lib/convert');
 
+test('should throw exception if no version given', t => {
+    t.throws(() => convert({ block: 'block' }), 'You must declare target version');
+});
+
 test('should convert to v2 format', t => {
-    t.deepEqual(convert({ block: 'block' }), [{ block: 'block' }]);
+    t.deepEqual(convert({ block: 'block' }, { version: 'v2' }), [{ block: 'block' }]);
 });
 
 test('should convert with elem', t => {
     t.deepEqual(
         convert([
             { block: 'block' },
             { block: 'block', elem: 'elem' }
-        ]),
+        ], { version: 'v2' }),
         [
             { block: 'block' },
             { block: 'block', elem: 'elem' }
@@ -25,7 +29,7 @@ test('should convert with mod', t => {
     t.deepEqual(
         convert([
             { block: 'block', modName: 'mod', modVal: 'val' }
-        ]),
+        ], { version: 'v2' }),
         [{ block: 'block', mod: 'mod', val: 'val' }]
     )
 });
diff --git a/test/stringify/v2.test.js b/test/stringify/v2.test.js
@@ -2,10 +2,14 @@ const test = require('ava');
 
 const stringify = require('../../lib/stringify');
 
+test('should throws error if no version given', t => {
+    t.throws(() => stringify({ block: 'block' }), 'You must declare target version');
+});
+
 test('should stringify v2 declaration', t => {
     const obj = [{ block: 'block', elem: 'elem', mod: 'mod', val: 'val' }];
     t.deepEqual(
-        stringify({ block: 'block', elem: 'elem', modName: 'mod', modVal: 'val' }),
+        stringify({ block: 'block', elem: 'elem', modName: 'mod', modVal: 'val' }, { version: 'v2' }),
         'module.exports = ' + JSON.stringify(obj, null, 4) + ';\n'
     );
 });