fix: handle !important, fixes #8

theKashey · Sep 30, 2019 · da5042a · da5042a
1 parent 5af9b60
commit da5042a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/__tests__/__snapshots__/ast.spec.tsx.snap b/__tests__/__snapshots__/ast.spec.tsx.snap
@@ -37,10 +37,12 @@ Object {
       "id": 1,
       "rules": Array [
         Object {
+          "important": undefined,
           "prop": "border",
           "value": "1px solid",
         },
         Object {
+          "important": undefined,
           "prop": "margin",
           "value": "6px 10px",
         },
@@ -58,14 +60,17 @@ Object {
       "id": 2,
       "rules": Array [
         Object {
+          "important": true,
           "prop": "display",
           "value": "block",
         },
         Object {
+          "important": undefined,
           "prop": "position",
           "value": "relative",
         },
         Object {
+          "important": undefined,
           "prop": "width",
           "value": "calc(100% - 10px)",
         },
@@ -83,6 +88,7 @@ Object {
       "id": 3,
       "rules": Array [
         Object {
+          "important": undefined,
           "prop": "position",
           "value": "absolute",
         },
@@ -100,6 +106,7 @@ Object {
       "id": 4,
       "rules": Array [
         Object {
+          "important": undefined,
           "prop": "position",
           "value": "relative",
         },
@@ -117,6 +124,7 @@ Object {
       "id": 5,
       "rules": Array [
         Object {
+          "important": undefined,
           "prop": "color",
           "value": "rightColor",
         },
@@ -134,6 +142,7 @@ Object {
       "id": 6,
       "rules": Array [
         Object {
+          "important": undefined,
           "prop": "color",
           "value": "red",
         },
@@ -249,7 +258,7 @@ margin: 6px 10px; }
 `;
 
 exports[`test ast should remap simple style 1`] = `
-".d ~ .e:not(focused) { display: block;
+".d ~ .e:not(focused) { display: block !important;
 position: relative;
 width: calc(100% - 10px); }
 "

diff --git a/__tests__/ast.spec.tsx b/__tests__/ast.spec.tsx
@@ -11,7 +11,7 @@ describe('test ast', () => {
       }
       
       .d ~ .e:not(focused){ 
-        display: block;
+        display: block !important;
         position: relative;
         width: calc(100% - 10px);
       }

diff --git a/src/parser/ast.ts b/src/parser/ast.ts
@@ -3,6 +3,7 @@ import {CodeLocation} from "./ranges";
 export interface StyleRule {
   prop: string;
   value: string;
+  important: boolean;
 }
 
 export interface StyleSelector {

diff --git a/src/parser/toAst.ts b/src/parser/toAst.ts
@@ -34,10 +34,14 @@ const getPostfix = (rule: string) => {
 let bodyCounter = 1;
 
 const assignBody = (decl: StyleBody, bodies: StyleBodies): StyleBody => {
-  const d = Object.values(bodies).find(bodyDecl => rangesIntervalEqual(bodyDecl, decl));
+  const d = Object
+    .values(bodies)
+    .find(bodyDecl => rangesIntervalEqual(bodyDecl, decl));
+
   if (d) {
     return d;
   }
+
   decl.id = bodyCounter++;
   bodies[decl.id] = decl;
   return decl;
@@ -55,7 +59,6 @@ export const buildAst = (CSS: string, file: string = ''): SingleStyleAst => {
   root.walkAtRules(rule => {
     if (rule.name != 'media') {
       atParents.add(rule);
-      //atRules[rule.params] = atRules[rule.params] || []
       atRules/*[rule.params]*/.push({
         kind: rule.name,
         id: rule.params,
@@ -86,11 +89,11 @@ export const buildAst = (CSS: string, file: string = ''): SingleStyleAst => {
           start: createRange(Infinity, Infinity),
           end: createRange(0, 0),
         };
-        rule.walkDecls(({prop, value, source}) => {
+        rule.walkDecls(({prop, value, source, important}) => {
           delc.start = localRangeMin(delc.start, source.start);
           delc.end = localRangeMax(delc.end, source.end);
           delc.rules.push({
-            prop, value
+            prop, value, important
           });
         });