feat: allow strict values + fix read pattern

Author: JohnCoene

.styler

@@ -1,6 +1,6 @@
 {
     "version": "0.0.2",
-    "pattern": "*.r|*.js|*.html",
+    "pattern": "*.R|*.r|*.js|*.html",
     "directory": "test",
     "output": "test/style.min.css",
     "unit": "rem",

README.md

@@ -46,11 +46,13 @@ Call `styler` to generate the CSS.
 styler
 ```
 
-- Media queries are suffixed with `@` and prefixed with `md@`, `lg@` etc.
-- States are suffixed with `:` and prefixed with `hover:`, `active:` etc.
+- Media queries are suffixed with `@` e.g.: `md@`, `lg@`
+- States are suffixed with `:`, e.g.: `hover:`, `active:`
 - Numeric values are set as `unit` specified in the config (defaults to `rem`)
 and are divided by the `divider` specified in the config (defaults to `4`), 
 e.g.: `padding-top-2` will result in `padding-top: 0.5rem`
+- Numerics precded by `~` are treated as strict and are not divided or suffixed with `unit`
+e.g.: `flex~1` results in `flex: 1`
 - Media queries can be edited in `.styler` config file
 - Colors can be edited in `.styler` config file
 - Extracted CSS properties are checked against the [W3C CSS Properties](https://www.w3.org/Style/CSS/all-properties.en.html) table

cmd/class.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"regexp"
+	"strconv"
 	"strings"
 )
 
@@ -51,25 +52,38 @@ func (c *Command) makeProperty(str string) string {
 	str = mediaRegex.ReplaceAllString(str, "")
 	str = prefixRegex.ReplaceAllString(str, "")
 
+	strict := false
 	last := strings.LastIndex(str, "-")
+	if strings.Contains(str, "~") {
+		strict = true
+		last = strings.LastIndex(str, "~")
+	}
 
 	if last == -1 {
 		return str
 	}
 
 	value := str[last+1:]
 
-	var intValue int
-	_, err := fmt.Sscanf(value, "%d", &intValue)
+	intValue, err := strconv.Atoi(value)
 
 	if err == nil {
 		// it ends in a number it may be a color, e.g.: color-red-400
 		str, ok := c.makeColor(str)
 		if ok {
 			return str
 		}
-		val := float32(intValue) / float32(c.Config.Divider)
-		return str[:last] + ":" + fmt.Sprintf("%v", val) + c.Config.Unit
+		val := float32(intValue)
+		if !strict {
+			val = float32(intValue) / float32(c.Config.Divider)
+		}
+
+		property := str[:last] + ":" + fmt.Sprintf("%v", val)
+
+		if strict {
+			return property
+		}
+		return property + c.Config.Unit
 	}
 
 	return str[:last] + ":" + value
@@ -117,7 +131,7 @@ func (c *Command) makeMediaClass(str string) {
 	_, ok := c.MediaMaps[strs[0]]
 
 	if !ok {
-		fmt.Printf("%v media not found in .styler", strs[0])
+		fmt.Printf("%v media not found in .styler\n", strs[0])
 		return
 	}
 
@@ -131,26 +145,9 @@ func (c *Command) makeMediaClass(str string) {
 }
 
 func (c *Command) makeClassName(str string) string {
-	t := classType(str)
-
-	switch t {
-	case "prefix":
-		return c.makeClassNamePrefix(str)
-	case "media":
-		return c.makeClassNameMedia(str)
-	default:
-		return str
-	}
-}
-
-func (c *Command) makeClassNameMedia(str string) string {
-	return strings.ReplaceAll(str, "@", "\\@")
-}
-
-func (c *Command) makeClassNamePrefix(str string) string {
-	strs := strings.Split(str, ":")
-	if len(strs) < 2 {
-		return str
-	}
-	return strs[0] + "\\:" + strs[1] + ":" + strs[0]
+	str = strings.ReplaceAll(str, "@", "\\@")
+	str = strings.ReplaceAll(str, "%", "\\%")
+	str = strings.ReplaceAll(str, ":", "\\:")
+	str = strings.ReplaceAll(str, "~", "\\~")
+	return str
 }

cmd/properties.json

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 )
 
 func (c *Command) read() error {
@@ -16,6 +17,9 @@ func (c *Command) read() error {
 		return fmt.Errorf("%s is not a directory", c.Config.Directory)
 	}
 
+	// Split the pattern string by the pipe character to support multiple patterns
+	patterns := strings.Split(c.Config.Pattern, "|")
+
 	return filepath.Walk(c.Config.Directory, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return fmt.Errorf("error accessing path %s: %w", path, err)
@@ -25,6 +29,26 @@ func (c *Command) read() error {
 			return nil
 		}
 
+		// Check if the file matches any of the patterns
+		fileName := filepath.Base(path)
+		matched := false
+
+		for _, pattern := range patterns {
+			patternMatched, err := filepath.Match(pattern, fileName)
+			if err != nil {
+				return fmt.Errorf("error matching pattern %s for file %s: %w", pattern, path, err)
+			}
+			if patternMatched {
+				matched = true
+				break
+			}
+		}
+
+		// Skip files that don't match any pattern
+		if !matched {
+			return nil
+		}
+
 		content, err := os.ReadFile(path)
 		if err != nil {
 			return fmt.Errorf("error reading file %s: %w", path, err)