Fix cristianbote#491

Looky1173 · Oct 8, 2022 · 3ad60a8 · 3ad60a8
1 parent 3881de1
commit 3ad60a8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/core/__tests__/compile.test.js b/src/core/__tests__/compile.test.js
@@ -23,9 +23,9 @@ describe('compile', () => {
     });
 
     it('value interpolations', () => {
-        // This interpolations are testing the ability to interpolate thruty and falsy values
+        // This interpolations are testing the ability to interpolate truthy and falsy values
         expect(template`prop: 1; ${() => 0},${() => undefined},${() => null},${2}`({})).toEqual(
-            'prop: 1; 0,,,2'
+            'prop: 1; 0,_,_,2' // '_' represents a falsy value
         );
 
         const tmpl = template`
@@ -39,7 +39,7 @@ describe('compile', () => {
         `;
         expect(tmpl({})).toEqual(`
             background: dodgerblue;
-            
+            _
             border: 1px solid blue;
         `);
     });

diff --git a/src/core/__tests__/parse.test.js b/src/core/__tests__/parse.test.js
@@ -281,12 +281,13 @@ describe('parse', () => {
                 {
                     div: {
                         opacity: 0,
-                        color: null
+                        color: null,
+                        content: '""'
                     }
                 },
                 ''
             )
-        ).toEqual('div{opacity:0;}');
+        ).toEqual('div{opacity:0;content:"";}');
         expect(
             parse(
                 {

diff --git a/src/core/compile.js b/src/core/compile.js
@@ -33,7 +33,7 @@ export let compile = (str, defs, data) => {
                 // Here we check if this is strictly a boolean with false value
                 // define it as `''` to be picked up as empty, otherwise use
                 // res value
-                tail = res === false ? '' : res;
+                tail = res === false || res === undefined || res === null ? '_' : res;
             }
         }
         return out + next + (tail == null ? '' : tail);

diff --git a/src/core/parse.js b/src/core/parse.js
@@ -43,7 +43,7 @@ export let parse = (obj, selector) => {
                       })
                     : key
             );
-        } else if (val != undefined) {
+        } else if (val != undefined && val !== '_') {
             // Convert all but CSS variables
             key = /^--/.test(key) ? key : key.replace(/[A-Z]/g, '-$&').toLowerCase();
             // Push the line for this property