Merge pull request #36 from navanshu/revert-35-master

Revert "Adds ability to predictably map known variables"

Author: navanshu

.gitignore

@@ -8,4 +8,3 @@ coverage/
 .npm
 
 .DS_Store
-.idea

README.md

@@ -87,12 +87,6 @@ module.exports = {
       // for example
       (name) => name.includes('skip') // name prefixed css variable example --height
       // avoid regex if you can they are bad
-      // To compress varaiables to a known ma you can pass in a known object to map against
-      // for example
-      {
-        '--height': '--h',
-        '--font': '--f'
-      }
     )
   ]
 }

index.d.ts

@@ -1,7 +1,4 @@
 export declare namespace variableCompress {
     type skip = (variableName: string) => boolean | undefined;
-    type map = {
-        [key: string]: string;
-    };
-    type parameters = skip | map | string;
+    type parameters = skip | string;
 }

index.js

@@ -73,28 +73,20 @@ module.exports = function variableCompress(opts) {
     scriptBasedSkips = [];
     cssVariablesMap = new Map();
     opts === null || opts === void 0 ? void 0 : opts.forEach(E => {
-        switch (typeof E) {
-            case 'string':
-                const name = E.startsWith('--')
-                    ? E.slice(2)
-                    : E;
-                const cssName = E.startsWith('--')
-                    ? E
-                    : `--${E}`;
-                pureSkips.push(name);
-                cssVariablesMap.set(cssName, cssName);
-                break;
-            case 'object':
-                Object.entries(E)
-                    .forEach(([key, value]) => {
-                    renamedVariables.push(value);
-                    cssVariablesMap.set(key, value);
-                });
-                break;
-            default:
-                scriptBasedSkips.push(E);
-                break;
+        if (typeof E === 'string') {
+            let name = E;
+            let cssName = E;
+            if (E.slice(0, 2) === '--') {
+                name = E.slice(2);
+            }
+            else {
+                cssName = '--' + E;
+            }
+            pureSkips.push(name);
+            cssVariablesMap.set(cssName, cssName);
         }
+        else
+            scriptBasedSkips.push(E);
     });
     increase();
     return {

index.test.js

@@ -83,88 +83,7 @@ code {
       '--primary-color',
       '2',
       (e) => e.includes('special'),
-      (e) => e === '--5',
-    ]
-  );
-});
-
-it('Shorten known css variables', async () => {
-  const knownClassNames = {
-    '--first-color': '--a',
-    '--second-color': '--b',
-  }
-
-  await run(
-    `:root {
---first-color: #16f;
---second-color: #ff7;
---2: #000;
-}
-
-#firstParagraph {
-  background-color: var(--first-color);
-  color: var(--second-color);
-}
-
-#secondParagraph {
-  background-color: var(--second-color);
-  color: var(--first-color);
-}
-
-#container {
-  --first-color: #290;
-}
-
-#thirdParagraph {
-  background-color: var(--first-color);
-  color: var(--second-color);
-}
-
-.section-title {
-  color: var(--primary-color, var(--black, #222));
-}
-
-code {
-  --5: #555;
-}`,
-    `:root {
---a: #16f;
---b: #ff7;
---2: #000;
-}
-
-#firstParagraph {
-  background-color: var(--a);
-  color: var(--b);
-}
-
-#secondParagraph {
-  background-color: var(--b);
-  color: var(--a);
-}
-
-#container {
-  --a: #290;
-}
-
-#thirdParagraph {
-  background-color: var(--a);
-  color: var(--b);
-}
-
-.section-title {
-  color: var(--primary-color, var(--0, #222));
-}
-
-code {
-  --5: #555;
-}`,
-    [
-      '--primary-color',
-      '2',
-      (e) => e.includes('special'),
-      (e) => e === '--5',
-      knownClassNames,
+      (e) => e === '--5'
     ]
   );
 });
@@ -174,6 +93,7 @@ it('Support reloading. Now the plugin will reset mapped variables', async () =>
   await run(`:root{--second-color: #ff7;--first-color: #16f;}`, `:root{--0: #ff7;--1: #16f;}`, []);
 });
 
+
 it('Base array check or no array', async () => {
   await run(`:root{}`, `:root{}`);
 });

index.ts

@@ -1,17 +1,18 @@
 export namespace variableCompress {
+
   export type skip = (variableName: string) => boolean | undefined;
-  export type map = { [key: string]: string };
-  export type parameters = skip | map | string;
-}
 
+  export type parameters = skip | string;
+
+}
 const postcssPlugin = 'postcss-variable-compress';
 
 let processed = Symbol('processed');
 let renamedVariables: string[] = [];
 let cssVariables = -1;
 let pureSkips: string[] = [];
 let scriptBasedSkips: variableCompress.skip[] = [];
-let cssVariablesMap = new Map<string, string>();
+let cssVariablesMap = new Map();
 
 function scriptCheck(val: string) {
 
@@ -104,33 +105,22 @@ module.exports = function variableCompress(opts?: variableCompress.parameters[])
   cssVariablesMap = new Map();
 
   opts?.forEach(E => {
-    switch (typeof E) {
-      case 'string':
-
-        const name = E.startsWith('--')
-          ? E.slice(2)
-          : E;
-
-        const cssName = E.startsWith('--')
-          ? E
-          : `--${E}`;
-
-        pureSkips.push(name);
-        cssVariablesMap.set(cssName, cssName);
-        break;
-
-      case 'object':
-        Object.entries(E)
-          .forEach(([key, value]) => {
-            renamedVariables.push(value);
-            cssVariablesMap.set(key, value);
-          });
-        break;
-      default:
-        scriptBasedSkips.push(E);
-        break;
-    }
+    if (typeof E === 'string') {
+
+      let name = E;
+      let cssName = E;
 
+      if (E.slice(0, 2) === '--') {
+        name = E.slice(2);
+      } else {
+        cssName = '--' + E;
+      }
+
+      pureSkips.push(name);
+      cssVariablesMap.set(cssName, cssName);
+    }
+    else
+      scriptBasedSkips.push(E);
   });
 
   increase();

package.json

@@ -54,8 +54,7 @@
       "plugin:jest/recommended"
     ],
     "rules": {
-      "jest/expect-expect": "off",
-      "no-case-declarations": "off"
+      "jest/expect-expect": "off"
     }
   },
   "jest": {