postcss-kazaksha 1.0.1 → 1.0.2

package/index.js

@@ -3,45 +3,45 @@ const postcss = require('postcss');
 const dictionary = require('./dictionary');
 
 
+const translateCustomProperty = (prop) => {
+  if (!prop.startsWith('--')) return prop;
+  const varName = prop.substring(2);
+  const translated = dictionary[varName];
+  return translated ? `--${translated}` : prop;
+};
+
+const translateCSSVariables = (value) =>
+  value.replace(/var\(\s*--([^)]+)\s*\)/g, (match, varName) => {
+    const translated = dictionary[varName.trim()];
+    return translated ? `var(--${translated})` : match;
+  });
+
+const translateValues = (value) =>
+  Object.keys(dictionary).reduce((acc, kazakh) => {
+    const regex = new RegExp(`\\b${kazakh}\\b`, 'gi');
+    return acc.replace(regex, dictionary[kazakh]);
+  }, value);
+
+const translateProperty = (prop) =>
+  dictionary[prop.toLowerCase()] || prop;
+
 module.exports = postcss.plugin('postcss-kazaksha', () => {
   return (root) => {
     root.walkDecls((decl) => {
-      if (decl.prop.startsWith('--')) {
-        const varName = decl.prop.substring(2);
-        const translatedVar = dictionary[varName];
-        if (translatedVar) {
-          decl.prop = `--${translatedVar}`;
-        }
-      }
-      
-      const translatedProp = dictionary[decl.prop.toLowerCase()];
-      if (translatedProp) {
-        decl.prop = translatedProp;
-      }
-      
-      let value = decl.value;
-      
-      value = value.replace(/var\(\s*--([^)]+)\s*\)/g, (match, varName) => {
-        const translatedVar = dictionary[varName.trim()];
-        return translatedVar ? `var(--${translatedVar})` : match;
-      });
+      const translatedValue = [translateCSSVariables, translateValues]
+        .reduce((value, transform) => transform(value), decl.value);
       
-      Object.keys(dictionary).forEach((kazakh) => {
-        const regex = new RegExp(`\\b${kazakh}\\b`, 'gi');
-        value = value.replace(regex, dictionary[kazakh]);
-      });
+      const translatedProp = decl.prop.startsWith('--') 
+        ? translateCustomProperty(decl.prop)
+        : translateProperty(decl.prop);
       
-      decl.value = value;
+      decl.value = translatedValue;
+      decl.prop = translatedProp;
     });
     
         root.walkAtRules((atRule) => {
       if (atRule.params) {
-        let params = atRule.params;
-        Object.keys(dictionary).forEach((kazakh) => {
-          const regex = new RegExp(`\\b${kazakh}\\b`, 'gi');
-          params = params.replace(regex, dictionary[kazakh]);
-        });
-        atRule.params = params;
+        atRule.params = translateValues(atRule.params);
       }
     });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-kazaksha",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "PostCSS плагині - қазақша CSS жазып, стандартты CSS-ке аударыңыз",
   "main": "index.js",
   "keywords": [