Add mods and mod without block and elem behvr

lib/normalize2.js

@@ -17,7 +17,7 @@ module.exports = function (decl) {
             block = entity;
         } else {
             block = entity.block || null;
-            elem = entity.elem;
+            elem = entity.elem || null;
             elems = entity.elems;
             mod = getMod(entity);
             mods = getMods(entity);
@@ -79,6 +79,10 @@ module.exports = function (decl) {
             processMods({ block, mods: mods, tech });
         }
 
+        if (!isNotActual(mod) && (!elems && !elem)) {
+            processMods({ block, mods: mod, tech });
+        }
+
         if (elems) {
             if (!Array.isArray(elems)) {
                 elems = [elems];

test/normalize2/elem.test.js

@@ -62,3 +62,16 @@ test('should support elem of elem as array', t => {
         { entity: { block: 'block', elem: 'elem2' }, tech: undefined }
     ]);
 });
+
+test('should support elem without block', t => {
+    const decl = {
+        elem: [
+            { elem: ['elem1', 'elem2'] }
+        ]
+    };
+
+    t.deepEqual(normalize(decl), [
+        { entity: { block: null, elem: 'elem1' }, tech: undefined },
+        { entity: { block: null, elem: 'elem2' }, tech: undefined }
+    ]);
+});

test/normalize2/mod-mods-vals.test.js

@@ -0,0 +1,34 @@
+'use strict';
+
+const test = require('ava');
+const normalize = require('../../lib/normalize2');
+
+test('should support mod and mods without block, elem', t => {
+    const decl = [
+        { mod: 'mod', val: 'val' },
+        { mods: { mod1: 'val1' } }
+    ];
+
+    t.deepEqual(normalize(decl), [
+        { entity: { block: null, modName: 'mod', modVal: 'val' }, tech: undefined },
+        { entity: { block: null }, tech: undefined },
+        { entity: { block: null, modName: 'mod1', modVal: 'val1' }, tech: undefined }
+    ]);
+});
+
+test('should support mod without block & elem', t => {
+    const decl = { mod: 'mod', val: 'val' };
+
+    t.deepEqual(normalize(decl), [
+        { entity: { block: null, modName: 'mod', modVal: 'val' }, tech: undefined }
+    ]);
+});
+
+test('should support mods without block & elem', t => {
+    const decl = { mods: { mod: 'val' } };
+
+    t.deepEqual(normalize(decl), [
+        { entity: { block: null }, tech: undefined },
+        { entity: { block: null, modName: 'mod', modVal: 'val' }, tech: undefined }
+    ]);
+});