minify and support calc css

hunghg255 · May 16, 2023 · 07ee8df · 07ee8df
1 parent fbdf61e
commit 07ee8df
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 7,147 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/index.mjs b/dist/index.mjs
diff --git a/dist/index.mjs.map b/dist/index.mjs.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "css2tailwind",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "license": "MIT",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -10,7 +10,7 @@
   ],
   "scripts": {
     "build": "tsup --dts",
-    "test": "tsc ./test/test.ts"
+    "test": "node ./test/test.mjs"
   },
   "author": "hunghg255",
   "devDependencies": {

diff --git a/src/index.ts b/src/index.ts
@@ -233,6 +233,8 @@ const isColor = (str: string, joinLinearGradient = false) => {
 }
 
 const isUnit = (str: string) => {
+  if (str.includes('calc')) return true;
+
   return [
     'em', 'ex', 'ch', 'rem', 'vw', 'vh', 'vmin', 'vmax',
     'cm', 'mm', 'in', 'pt', 'pc', 'px', 'min-content', 'max-content', 'fit-content',
@@ -2191,11 +2193,14 @@ const getResultCode = (it: CssCodeParse, prefix = '', config: TranslatorConfig)
       val = val.replace('!important', '').trim()
       hasImportant = true
     }
-    let pipeVal = ''
+    let pipeVal = '';
+
+    if (val.includes('calc')) val = val.replace(/\s/g, '_')
+
     if (val === 'initial' || val === 'inherit') {
       pipeVal = `[${key.trim()}:${val}]`
     } else {
-      config.customTheme = config.customTheme ?? {}
+      config.customTheme = config.customTheme ?? {};
       pipeVal = typeof pipe === 'function'
         ? (config.customTheme[key.trim()]?.[val] || (config.useAllDefaultValues && moreDefaultValuesMap[key.trim()]?.[val]) || pipe(val))
         : (config.customTheme[key.trim()]?.[val] || (config.useAllDefaultValues && moreDefaultValuesMap[key.trim()]?.[val]) || (pipe?.[val] ?? ''))
@@ -2257,7 +2262,9 @@ const getResultCode = (it: CssCodeParse, prefix = '', config: TranslatorConfig)
       }
     }
     return pipeVal
-  }).filter(v => v !== '')
+  }).filter(v => v !== '');
+
+
   return {
     selectorName: it.selectorName,
     resultVal: [...new Set(resultVals)].join(' ')
@@ -2284,6 +2291,7 @@ const CssToTailwind = (code: string, config: TranslatorConfig = defaultTranslato
   customTheme = config.customTheme ?? defaultTranslatorConfig.customTheme
   const dataArray: ResultCode[] = []
   parsingCode(code).map(it => {
+
     if (typeof it.cssCode === 'string') {
       return getResultCode(it, '', config)
     } else if (it.selectorName.includes('@media')) {

diff --git a/test/test.js b/test/test.js
diff --git a/test/test.ts → test/test.mjs b/test/test.ts → test/test.mjs
@@ -1,10 +1,11 @@
-import { CssToTailwind } from 'css2tailwind';
+import { CssToTailwind } from '../dist/index.mjs';
 
 const cssCode = `body {
   width: 100%;
-  height: 50%;
+  height: calc(100vh - 50%);
+  top: calc(100vh - 50%);
+  margin-top: calc(100vh - 50%);
   margin: 0 !important;
-  /* asd */
   background-color: transparent;
 }`;
 

diff --git a/tsup.config.ts b/tsup.config.ts
@@ -5,5 +5,6 @@ export default defineConfig({
   splitting: false,
   sourcemap: true,
   clean: true,
-  format: ['esm', 'cjs']
+  format: ['esm', 'cjs'],
+  minify: true
 })