@master/css 2.0.0-rc.25 → 2.0.0-rc.27

package/dist/config/rules.cjs

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var cssEscape = require('../shared/utils/css-escape.cjs');
-var startSymbol = require('../constants/start-symbol.cjs');
 var layer = require('../layer.cjs');
+var common = require('../common.cjs');
 
-const BORDER_STYLES = [
+// values
+const BORDER_STYLE_VALUES = [
     'none',
     'auto',
     'hidden',
@@ -22,23 +23,25 @@ const BORDER_STYLES = [
 const autofillSolidToValueComponent = function(valueComponents) {
     if (valueComponents.length < 2) return valueComponents;
     const styleValueComponent = valueComponents.find((valueComponent)=>{
-        return valueComponent.type === 'string' && BORDER_STYLES.includes(valueComponent.value) || valueComponent.type === 'variable' && BORDER_STYLES.includes(valueComponent.variable?.value);
+        return valueComponent.type === 'string' && BORDER_STYLE_VALUES.includes(valueComponent.value) || valueComponent.type === 'variable' && BORDER_STYLE_VALUES.includes(String(valueComponent.variable?.value));
     });
     if (!styleValueComponent) {
         valueComponents.push({
             type: 'separator',
-            value: ' '
+            value: ' ',
+            token: '|'
         }, {
             type: 'string',
-            value: 'solid'
+            value: 'solid',
+            token: 'solid'
         });
     }
     return valueComponents;
 };
 const rules = {
     group: {
-        match: /^(?:.+?[*_>~+])?\{.+?\}/,
-        layer: layer.Layer.Core,
+        matcher: /^(?:.+?[*_>~+])?\{.+?\}/,
+        layer: layer.Shorthand,
         analyze (className) {
             let i = 0;
             for(; i < className.length; i++){
@@ -129,9 +132,9 @@ const rules = {
                             }
                         }
                         break;
-                    } else if (char in startSymbol.START_SYMBOLS && end !== '\'' && end !== '"') {
+                    } else if (char in common.VALUE_DELIMITERS && end !== '\'' && end !== '"') {
                         i++;
-                        analyze(startSymbol.START_SYMBOLS[char]);
+                        analyze(common.VALUE_DELIMITERS[char]);
                     }
                 }
             })('');
@@ -150,47 +153,52 @@ const rules = {
         }
     },
     variable: {
-        match: /^\$[\w-]+:/,
-        colored: true,
-        layer: layer.Layer.Core,
+        matcher: /^\$[\w-]+:/,
+        layer: layer.Normal,
         declare (value) {
             return {
-                ['--' + this.prefix.slice(1, -1)]: value
+                ['--' + this.keyToken.slice(1, -1)]: value
             };
         }
     },
     'font-size': {
-        match: [
-            'f(?:ont)?'
+        ambiguousKeys: [
+            'font',
+            'f'
+        ],
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'font-weight': {
-        match: [
-            'f(?:ont)?',
-            [
-                'bolder'
-            ]
+        ambiguousKeys: [
+            'font',
+            'f'
+        ],
+        ambiguousValues: [
+            'bolder'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'font-family': {
-        match: [
-            'f(?:ont)?'
+        ambiguousKeys: [
+            'font',
+            'f'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'font-smoothing': {
-        match: [
-            'f(?:ont)?',
-            [
-                'antialiased',
-                'subpixel-antialiased'
-            ]
-        ],
-        layer: layer.Layer.CoreNative,
+        ambiguousKeys: [
+            'font',
+            'f'
+        ],
+        ambiguousValues: [
+            'antialiased',
+            'subpixel-antialiased'
+        ],
+        layer: layer.Native,
         declare (value) {
             switch(value){
                 case 'subpixel-antialiased':
@@ -207,43 +215,45 @@ const rules = {
         }
     },
     'font-style': {
-        match: [
-            'f(?:ont)?',
-            [
-                'normal',
-                'italic',
-                'oblique'
-            ]
-        ],
-        layer: layer.Layer.CoreNative,
+        ambiguousKeys: [
+            'font',
+            'f'
+        ],
+        ambiguousValues: [
+            'normal',
+            'italic',
+            'oblique'
+        ],
+        layer: layer.Native,
         unit: 'deg'
     },
     'font-variant-numeric': {
-        match: [
-            'f(?:ont)?',
-            [
-                'ordinal',
-                'slashed-zero',
-                'lining-nums',
-                'oldstyle-nums',
-                'proportional-nums',
-                'tabular-nums',
-                'diagonal-fractions',
-                'stacked-fractions'
-            ]
-        ],
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'font',
+            'f'
+        ],
+        ambiguousValues: [
+            'ordinal',
+            'slashed-zero',
+            'lining-nums',
+            'oldstyle-nums',
+            'proportional-nums',
+            'tabular-nums',
+            'diagonal-fractions',
+            'stacked-fractions'
+        ],
+        layer: layer.Native
     },
     'font-variant': {
-        layer: layer.Layer.CoreNativeShorthand
-    },
-    'font-feature-settings': {
-        match: /^font-feature:/,
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'font',
+            'f'
+        ],
+        layer: layer.NativeShorthand
     },
     font: {
-        match: /^f:/,
-        layer: layer.Layer.CoreNativeShorthand,
+        subkey: 'f',
+        layer: layer.NativeShorthand,
         variables: [
             'font-family',
             'font-variant',
@@ -253,51 +263,55 @@ const rules = {
             'line-height'
         ]
     },
+    'font-feature-settings': {
+        key: 'font-feature',
+        layer: layer.Native
+    },
     color: {
-        match: /^(?:color|fg):/,
-        layer: layer.Layer.CoreNative,
-        colored: true,
+        key: 'fg',
+        layer: layer.Native,
         variables: [
             'text'
         ]
     },
     // margin
     'margin-left': {
-        match: /^ml:/,
-        layer: layer.Layer.CoreNative,
+        key: 'ml',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'margin-right': {
-        match: /^mr:/,
-        layer: layer.Layer.CoreNative,
+        key: 'mr',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'margin-top': {
-        match: /^mt:/,
-        layer: layer.Layer.CoreNative,
+        key: 'mt',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'margin-bottom': {
-        match: /^mb:/,
-        layer: layer.Layer.CoreNative,
+        key: 'mb',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'margin-x': {
-        match: /^(?:mx|margin-x):/,
+        key: 'mx',
+        subkey: 'margin-x',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'margin-left': value,
@@ -309,9 +323,9 @@ const rules = {
         ]
     },
     'margin-y': {
-        match: /^(?:my|margin-y):/,
+        key: 'my',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'margin-top': value,
@@ -323,75 +337,75 @@ const rules = {
         ]
     },
     margin: {
-        match: /^m:/,
+        key: 'm',
         unit: 'rem',
-        layer: layer.Layer.CoreNativeShorthand,
+        layer: layer.NativeShorthand,
         variables: [
             'spacing'
         ]
     },
     // margin inline
     'margin-inline-start': {
-        match: /^mis:/,
-        layer: layer.Layer.CoreNative,
+        key: 'mis',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'margin-inline-end': {
-        match: /^mie:/,
-        layer: layer.Layer.CoreNative,
+        key: 'mie',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'margin-inline': {
-        match: /^mi:/,
+        key: 'mi',
         unit: 'rem',
-        layer: layer.Layer.CoreNativeShorthand,
+        layer: layer.NativeShorthand,
         variables: [
             'spacing'
         ]
     },
     // padding
     'padding-left': {
-        match: /^pl:/,
-        layer: layer.Layer.CoreNative,
+        key: 'pl',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'padding-right': {
-        match: /^pr:/,
-        layer: layer.Layer.CoreNative,
+        key: 'pr',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'padding-top': {
-        match: /^pt:/,
-        layer: layer.Layer.CoreNative,
+        key: 'pt',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'padding-bottom': {
-        match: /^pb:/,
-        layer: layer.Layer.CoreNative,
+        key: 'pb',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'padding-x': {
-        match: /^(?:px|padding-x):/,
+        key: 'px',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'padding-left': value,
@@ -403,9 +417,9 @@ const rules = {
         ]
     },
     'padding-y': {
-        match: /^(?:py|padding-y):/,
+        key: 'py',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'padding-top': value,
@@ -417,102 +431,110 @@ const rules = {
         ]
     },
     padding: {
-        match: /^p:/,
+        key: 'p',
         unit: 'rem',
-        layer: layer.Layer.CoreNativeShorthand,
+        layer: layer.NativeShorthand,
         variables: [
             'spacing'
         ]
     },
     // padding inline
     'padding-inline-start': {
-        match: /^pis:/,
-        layer: layer.Layer.CoreNative,
+        key: 'pis',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'padding-inline-end': {
-        match: /^pie:/,
-        layer: layer.Layer.CoreNative,
+        key: 'pie',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'padding-inline': {
-        match: /^pi:/,
+        key: 'pi',
         unit: 'rem',
-        layer: layer.Layer.CoreNativeShorthand,
+        layer: layer.NativeShorthand,
         variables: [
             'spacing'
         ]
     },
     // flex
     'flex-basis': {
+        ambiguousKeys: [
+            'flex'
+        ],
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'flex-wrap': {
-        match: [
-            'flex',
-            [
-                'wrap',
-                'nowrap',
-                'wrap-reverse'
-            ]
+        ambiguousKeys: [
+            'flex'
+        ],
+        ambiguousValues: [
+            'wrap',
+            'nowrap',
+            'wrap-reverse'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'flex-grow': {
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'flex'
+        ],
+        layer: layer.Native
     },
     'flex-shrink': {
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'flex'
+        ],
+        layer: layer.Native
     },
     'flex-direction': {
-        match: [
-            'flex',
-            [
-                'row',
-                'row-reverse',
-                'column',
-                'column-reverse'
-            ]
+        ambiguousKeys: [
+            'flex'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: [
+            'row',
+            'row-reverse',
+            'column',
+            'column-reverse'
+        ],
+        layer: layer.Native
     },
     flex: {
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     display: {
-        match: /^d:/,
-        layer: layer.Layer.CoreNative
+        key: 'd',
+        layer: layer.Native
     },
     width: {
-        match: /^w:/,
+        key: 'w',
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     height: {
-        match: /^h:/,
+        key: 'h',
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'min-width': {
-        match: /^min-w:/,
+        key: 'min-w',
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'min-height': {
-        match: /^min-h:/,
+        key: 'min-h',
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     size: {
-        match: /^size:/,
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         unit: 'rem',
         declare (_value, valueComponents) {
             const length = valueComponents.length;
@@ -523,8 +545,8 @@ const rules = {
         }
     },
     'min-size': {
-        match: /^min:/,
-        layer: layer.Layer.CoreShorthand,
+        key: 'min',
+        layer: layer.Shorthand,
         unit: 'rem',
         declare (_value, valueComponents) {
             const length = valueComponents.length;
@@ -535,8 +557,8 @@ const rules = {
         }
     },
     'max-size': {
-        match: /^max:/,
-        layer: layer.Layer.CoreShorthand,
+        key: 'max',
+        layer: layer.Shorthand,
         unit: 'rem',
         declare (_value, valueComponents) {
             const length = valueComponents.length;
@@ -547,237 +569,265 @@ const rules = {
         }
     },
     'box-sizing': {
-        match: /^box:/,
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'box'
+        ],
+        layer: layer.Native
     },
     'box-decoration-break': {
-        match: [
-            'box-decoration',
-            [
-                'slice',
-                'clone'
-            ]
-        ],
-        layer: layer.Layer.CoreNative,
+        key: 'box-decoration',
+        layer: layer.Native,
         declare (value) {
             return {
-                'box-decoration-break': value,
-                '-webkit-box-decoration-break': value
+                '-webkit-box-decoration-break': value,
+                'box-decoration-break': value
             };
         }
     },
     contain: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     content: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'counter-increment': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'counter-reset': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'letter-spacing': {
-        match: /^ls:/,
-        layer: layer.Layer.CoreNative,
+        key: 'tracking',
+        subkey: 'ls',
+        layer: layer.Native,
         unit: 'em'
     },
     'line-height': {
-        match: /^lh:/,
-        layer: layer.Layer.CoreNative
+        key: 'leading',
+        subkey: 'line-h',
+        layer: layer.Native
     },
     'object-fit': {
-        match: [
-            '(?:object|obj)',
-            [
-                'contain',
-                'cover',
-                'fill',
-                'scale-down'
-            ]
+        ambiguousKeys: [
+            'object',
+            'obj'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: [
+            'contain',
+            'cover',
+            'fill',
+            'scale-down'
+        ],
+        layer: layer.Native
     },
     'object-position': {
-        match: [
-            '(?:object|obj)',
-            [
-                'top',
-                'bottom',
-                'right',
-                'left',
-                'center'
-            ]
-        ],
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'object',
+            'obj'
+        ],
+        ambiguousValues: [
+            'top',
+            'bottom',
+            'right',
+            'left',
+            'center'
+        ],
+        layer: layer.Native
     },
     'text-align': {
-        match: [
-            't(?:ext)?',
-            [
-                'justify',
-                'center',
-                'left',
-                'right',
-                'start',
-                'end'
-            ]
-        ],
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'text',
+            't'
+        ],
+        ambiguousValues: [
+            'justify',
+            'center',
+            'left',
+            'right',
+            'start',
+            'end'
+        ],
+        layer: layer.Native
     },
     'text-decoration-color': {
-        match: [
+        ambiguousKeys: [
             'text-decoration'
         ],
-        layer: layer.Layer.CoreNative,
-        colored: true,
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
+        ],
+        layer: layer.Native,
         variables: [
             'text'
         ]
     },
     'text-decoration-style': {
-        match: [
-            't(?:ext)?',
-            [
-                'solid',
-                'double',
-                'dotted',
-                'dashed',
-                'wavy'
-            ]
-        ],
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'text-decoration'
+        ],
+        ambiguousValues: [
+            'solid',
+            'double',
+            'dotted',
+            'dashed',
+            'wavy'
+        ],
+        layer: layer.Native
     },
     'text-decoration-thickness': {
-        match: [
-            'text-decoration',
-            [
-                'from-font'
-            ]
-        ],
-        numeric: true,
-        layer: layer.Layer.CoreNative,
+        ambiguousKeys: [
+            'text-decoration'
+        ],
+        ambiguousValues: [
+            'from-font',
+            common.NUMBER_VALUE_REGEX
+        ],
+        layer: layer.Native,
         unit: 'em'
     },
     'text-decoration-line': {
-        match: [
-            't(?:ext)?',
-            [
-                'none',
-                'underline',
-                'overline',
-                'line-through'
-            ]
+        ambiguousKeys: [
+            'text-decoration'
+        ],
+        ambiguousValues: [
+            'underline',
+            'overline',
+            'line-through'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'text-decoration': {
-        match: [
-            't(?:ext)?',
-            [
-                'underline',
-                'overline',
-                'line-through'
-            ]
+        ambiguousKeys: [
+            'text',
+            't'
+        ],
+        ambiguousValues: [
+            'underline',
+            'overline',
+            'line-through'
         ],
         unit: 'rem',
-        colored: true,
-        layer: layer.Layer.CoreNativeShorthand,
+        layer: layer.NativeShorthand,
         variables: [
             'text'
-        ]
+        ],
+        declare (value) {
+            return {
+                '-webkit-text-decoration': value,
+                'text-decoration': value
+            };
+        }
     },
     'text-underline-offset': {
+        ambiguousKeys: [
+            'text-underline'
+        ],
         unit: 'rem',
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         variables: [
             'spacing'
         ]
     },
+    'text-underline-position': {
+        ambiguousKeys: [
+            'text-underline'
+        ],
+        ambiguousValues: [
+            'front-font',
+            'under',
+            'left',
+            'right'
+        ],
+        layer: layer.Native
+    },
     'text-overflow': {
-        match: [
-            't(?:ext)?',
-            [
-                'ellipsis',
-                'clip'
-            ]
+        ambiguousKeys: [
+            'text',
+            't'
+        ],
+        ambiguousValues: [
+            'ellipsis',
+            'clip'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'text-orientation': {
-        match: [
-            't(?:ext)?',
-            [
-                'mixed',
-                'upright',
-                'sideways-right',
-                'sideways',
-                'use-glyph-orientation'
-            ]
-        ],
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'text',
+            't'
+        ],
+        ambiguousValues: [
+            'mixed',
+            'upright',
+            'sideways-right',
+            'sideways',
+            'use-glyph-orientation'
+        ],
+        layer: layer.Native
     },
     'text-transform': {
-        match: [
-            't(?:ext)?',
-            [
-                'uppercase',
-                'lowercase',
-                'capitalize'
-            ]
+        ambiguousKeys: [
+            'text',
+            't'
+        ],
+        ambiguousValues: [
+            'uppercase',
+            'lowercase',
+            'capitalize'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'text-rendering': {
-        match: [
-            't(?:ext)?',
-            [
-                'optimizeSpeed',
-                'optimizeLegibility',
-                'geometricPrecision'
-            ]
+        ambiguousKeys: [
+            'text',
+            't'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: [
+            'optimizeSpeed',
+            'optimizeLegibility',
+            'geometricPrecision'
+        ],
+        layer: layer.Native
     },
     'text-indent': {
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'vertical-align': {
-        match: /^(?:v|vertical):/,
-        layer: layer.Layer.CoreNative
+        key: 'v',
+        subkey: 'vertical',
+        layer: layer.Native
     },
     columns: {
-        match: /^(?:columns|cols):/,
-        layer: layer.Layer.CoreNativeShorthand
+        key: 'cols',
+        layer: layer.NativeShorthand
     },
     'white-space': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     top: {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     bottom: {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     left: {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     right: {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
@@ -785,51 +835,38 @@ const rules = {
     },
     inset: {
         unit: 'rem',
-        layer: layer.Layer.CoreNativeShorthand,
+        layer: layer.NativeShorthand,
         variables: [
             'spacing'
         ]
     },
-    lines: {
-        match: /^lines:/,
-        declare (value) {
-            return {
-                overflow: 'hidden',
-                display: '-webkit-box',
-                'overflow-wrap': 'break-word',
-                'text-overflow': 'ellipsis',
-                '-webkit-box-orient': 'vertical',
-                '-webkit-line-clamp': value
-            };
-        }
-    },
     'max-height': {
-        match: /^max-h:/,
+        key: 'max-h',
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'max-width': {
-        match: /^max-w:/,
+        key: 'max-w',
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     opacity: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     visibility: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     clear: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     float: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     isolation: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'overflow-x': {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         declare (value) {
             return value === 'overlay' ? {
                 'overflow-x': [
@@ -842,7 +879,7 @@ const rules = {
         }
     },
     'overflow-y': {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         declare (value) {
             return value === 'overlay' ? {
                 'overflow-y': [
@@ -855,7 +892,7 @@ const rules = {
         }
     },
     overflow: {
-        layer: layer.Layer.CoreNativeShorthand,
+        layer: layer.NativeShorthand,
         declare (value) {
             return value === 'overlay' ? {
                 overflow: [
@@ -868,68 +905,70 @@ const rules = {
         }
     },
     'overscroll-behavior-x': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'overscroll-behavior-y': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'overscroll-behavior': {
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     'z-index': {
-        match: /^z:/,
-        layer: layer.Layer.CoreNative
+        key: 'z',
+        layer: layer.Native
     },
     position: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     cursor: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'pointer-events': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     resize: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'touch-action': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'word-break': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'word-spacing': {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         unit: 'em'
     },
     'user-drag': {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         declare (value) {
             return {
-                'user-drag': value,
-                '-webkit-user-drag': value
+                '-webkit-user-drag': value,
+                'user-drag': value
             };
         }
     },
     'user-select': {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         declare (value) {
             return {
-                'user-select': value,
-                '-webkit-user-select': value
+                '-webkit-user-select': value,
+                'user-select': value
             };
         }
     },
     'text-shadow': {
         unit: 'rem',
-        layer: layer.Layer.CoreNative,
-        colored: true
+        layer: layer.Native
     },
     'text-size': {
-        match: [
-            't(?:ext)?'
+        ambiguousKeys: [
+            'text',
+            't'
+        ],
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
         declare (value) {
             const diff = .875;
@@ -937,14 +976,18 @@ const rules = {
                 'font-size': value,
                 'line-height': `calc(${value} + ${diff}em)`
             };
-        }
+        },
+        layer: layer.Shorthand
     },
     'text-fill-color': {
-        match: [
-            '(?:text-fill|text|t)'
+        ambiguousKeys: [
+            'text',
+            't'
+        ],
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
         ],
-        layer: layer.Layer.CoreNative,
-        colored: true,
+        layer: layer.Native,
         variables: [
             'text'
         ],
@@ -955,17 +998,17 @@ const rules = {
         }
     },
     'text-stroke-width': {
-        match: [
-            'text-stroke',
-            [
-                'thin',
-                'medium',
-                'thick'
-            ]
+        ambiguousKeys: [
+            'text-stroke'
+        ],
+        ambiguousValues: [
+            'thin',
+            'medium',
+            'thick',
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         declare (value) {
             return {
                 '-webkit-text-stroke-width': value
@@ -973,11 +1016,13 @@ const rules = {
         }
     },
     'text-stroke-color': {
-        match: [
+        ambiguousKeys: [
             'text-stroke'
         ],
-        layer: layer.Layer.CoreNative,
-        colored: true,
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
+        ],
+        layer: layer.Native,
         variables: [
             'text'
         ],
@@ -989,56 +1034,70 @@ const rules = {
     },
     'text-stroke': {
         unit: 'rem',
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         declare (value) {
             return {
                 '-webkit-text-stroke': value
             };
         }
     },
+    'text-truncate': {
+        subkey: 'lines',
+        declare (value) {
+            return {
+                display: '-webkit-box',
+                '-webkit-box-orient': 'vertical',
+                '-webkit-line-clamp': value,
+                overflow: 'hidden',
+                'overflow-wrap': 'break-word',
+                'text-overflow': 'ellipsis'
+            };
+        },
+        layer: layer.Shorthand
+    },
     'box-shadow': {
-        match: /^s(?:hadow)?:/,
+        key: 'shadow',
+        subkey: 's',
         unit: 'rem',
-        layer: layer.Layer.CoreNative,
-        colored: true
+        layer: layer.Native
     },
     'table-layout': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'transform-box': {
-        match: [
+        ambiguousKeys: [
             'transform'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'transform-style': {
-        match: [
-            'transform',
-            [
-                'flat',
-                'preserve-3d'
-            ]
+        ambiguousKeys: [
+            'transform'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: [
+            'flat',
+            'preserve-3d'
+        ],
+        layer: layer.Native
     },
     'transform-origin': {
-        match: [
-            'transform',
-            [
-                'top',
-                'bottom',
-                'right',
-                'left',
-                'center'
-            ]
-        ],
-        numeric: true,
+        ambiguousKeys: [
+            'transform'
+        ],
+        ambiguousValues: [
+            'top',
+            'bottom',
+            'right',
+            'left',
+            'center',
+            common.NUMBER_VALUE_REGEX
+        ],
         unit: 'px',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     transform: {
-        match: /^(?:translate|scale|skew|rotate|perspective|matrix)(?:3d|[XYZ])?\(/,
-        layer: layer.Layer.CoreNative,
+        matcher: /^(?:translate|scale|skew|rotate|perspective|matrix)(?:3d|[XYZ])?\(/,
+        layer: layer.Native,
         analyze (className) {
             return [
                 className.startsWith('transform') ? className.slice(10) : className
@@ -1049,25 +1108,25 @@ const rules = {
         ]
     },
     'transition-property': {
-        match: /^~property:/,
-        layer: layer.Layer.CoreNative
+        key: '~property',
+        layer: layer.Native
     },
     'transition-timing-function': {
-        match: /^~easing:/,
-        layer: layer.Layer.CoreNative
+        key: '~easing',
+        layer: layer.Native
     },
     'transition-duration': {
-        match: /^~duration:/,
-        layer: layer.Layer.CoreNative,
+        key: '~duration',
+        layer: layer.Native,
         unit: 'ms'
     },
     'transition-delay': {
-        match: /^~delay:/,
-        layer: layer.Layer.CoreNative,
+        key: '~delay',
+        layer: layer.Native,
         unit: 'ms'
     },
     transition: {
-        match: /^~[^!*>+~:[@_]+\|/,
+        sign: '~',
         analyze (className) {
             if (className.startsWith('~')) {
                 return [
@@ -1075,51 +1134,53 @@ const rules = {
                 ];
             } else {
                 const indexOfColon = className.indexOf(':');
-                this.prefix = className.slice(0, indexOfColon + 1);
+                this.keyToken = className.slice(0, indexOfColon + 1);
                 return [
                     className.slice(indexOfColon + 1)
                 ];
             }
         },
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     'animation-delay': {
-        match: /^@delay:/,
-        layer: layer.Layer.CoreNative,
+        key: '@delay',
+        layer: layer.Native,
         unit: 'ms'
     },
     'animation-direction': {
-        match: /^@direction:/,
-        layer: layer.Layer.CoreNative
+        key: '@direction',
+        layer: layer.Native
     },
     'animation-duration': {
-        match: /^@duration:/,
-        layer: layer.Layer.CoreNative,
+        key: '@duration',
+        layer: layer.Native,
         unit: 'ms'
     },
     'animation-fill-mode': {
-        match: /^@fill:/,
-        layer: layer.Layer.CoreNative
+        key: '@fill',
+        layer: layer.Native
     },
     'animation-iteration-count': {
-        match: /^@iteration:/,
-        layer: layer.Layer.CoreNative
+        key: '@iteration',
+        layer: layer.Native
     },
     'animation-name': {
-        match: /^@name:/,
-        layer: layer.Layer.CoreNative
+        key: '@name',
+        layer: layer.Native,
+        includeAnimations: true
     },
     'animation-play-state': {
-        match: /^@play:/,
-        layer: layer.Layer.CoreNative
+        key: '@play',
+        layer: layer.Native
     },
     'animation-timing-function': {
-        match: /^@easing:/,
-        layer: layer.Layer.CoreNative
+        key: '@easing',
+        layer: layer.Native
     },
     animation: {
-        match: /^@[^!*>+~:[@_]+\|/,
-        layer: layer.Layer.CoreNativeShorthand,
+        sign: '@',
+        layer: layer.NativeShorthand,
+        includeAnimations: true,
         analyze (className) {
             if (className.startsWith('@')) {
                 return [
@@ -1127,7 +1188,7 @@ const rules = {
                 ];
             } else {
                 const indexOfColon = className.indexOf(':');
-                this.prefix = className.slice(0, indexOfColon + 1);
+                this.keyToken = className.slice(0, indexOfColon + 1);
                 return [
                     className.slice(indexOfColon + 1)
                 ];
@@ -1135,54 +1196,73 @@ const rules = {
         }
     },
     'border-collapse': {
-        match: [
-            'b(?:order)?',
-            [
-                'collapse',
-                'separate'
-            ]
+        ambiguousKeys: [
+            'b',
+            'border'
+        ],
+        ambiguousValues: [
+            'collapse',
+            'separate'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'border-spacing': {
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native,
+        variables: [
+            'spacing'
+        ]
     },
     // border color
     'border-top-color': {
-        match: [
-            'b(?:t|order-top(?:-color)?)'
+        ambiguousKeys: [
+            'bt',
+            'border-top'
+        ],
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
         ],
-        layer: layer.Layer.CoreNative,
-        colored: true
+        layer: layer.Native
     },
     'border-bottom-color': {
-        match: [
-            'b(?:b|order-bottom(?:-color)?)'
+        ambiguousKeys: [
+            'bb',
+            'border-bottom'
+        ],
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
         ],
-        layer: layer.Layer.CoreNative,
-        colored: true
+        layer: layer.Native
     },
     'border-left-color': {
-        match: [
-            'b(?:l|order-left(?:-color)?)'
+        ambiguousKeys: [
+            'bl',
+            'border-left'
         ],
-        layer: layer.Layer.CoreNative,
-        colored: true
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
+        ],
+        layer: layer.Native
     },
     'border-right-color': {
-        match: [
-            'b(?:r|order-right(?:-color)?)'
+        ambiguousKeys: [
+            'br',
+            'border-right'
+        ],
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
         ],
-        layer: layer.Layer.CoreNative,
-        colored: true
+        layer: layer.Native
     },
     'border-x-color': {
-        match: [
-            'b(?:x|order-x(?:-color)?)'
+        ambiguousKeys: [
+            'bx',
+            'border-x'
         ],
-        layer: layer.Layer.CoreShorthand,
-        colored: true,
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
+        ],
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'border-left-color': value,
@@ -1191,11 +1271,14 @@ const rules = {
         }
     },
     'border-y-color': {
-        match: [
-            'b(?:y|order-y(?:-color)?)'
+        ambiguousKeys: [
+            'by',
+            'border-y'
+        ],
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
         ],
-        layer: layer.Layer.CoreShorthand,
-        colored: true,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'border-top-color': value,
@@ -1204,37 +1287,40 @@ const rules = {
         }
     },
     'border-color': {
-        match: [
-            'b(?:order)?(?:-color)?'
+        ambiguousKeys: [
+            'b',
+            'border'
+        ],
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
         ],
-        layer: layer.Layer.CoreNativeShorthand,
-        colored: true
+        layer: layer.NativeShorthand
     },
     // border radius
     'border-top-left-radius': {
-        match: /^r(?:tl|lt):/,
+        key: 'rtl',
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'border-top-right-radius': {
-        match: /^r(?:tr|rt):/,
+        key: 'rtr',
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'border-bottom-left-radius': {
-        match: /^r(?:bl|lb):/,
+        key: 'rbl',
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'border-bottom-right-radius': {
-        match: /^r(?:br|rb):/,
+        key: 'rbr',
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'border-top-radius': {
-        match: /^rt:/,
+        key: 'rt',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'border-top-left-radius': value,
@@ -1243,9 +1329,9 @@ const rules = {
         }
     },
     'border-bottom-radius': {
-        match: /^rb:/,
+        key: 'rb',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'border-bottom-left-radius': value,
@@ -1254,9 +1340,9 @@ const rules = {
         }
     },
     'border-left-radius': {
-        match: /^rl:/,
+        key: 'rl',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'border-top-left-radius': value,
@@ -1265,9 +1351,9 @@ const rules = {
         }
     },
     'border-right-radius': {
-        match: /^rr:/,
+        key: 'rr',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'border-top-right-radius': value,
@@ -1276,45 +1362,50 @@ const rules = {
         }
     },
     'border-radius': {
-        match: /^r:/,
+        key: 'r',
         unit: 'rem',
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     // border style
     'border-top-style': {
-        match: [
-            'b(?:t|order-top(?:-style)?)',
-            BORDER_STYLES
+        ambiguousKeys: [
+            'bt',
+            'border-top'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: BORDER_STYLE_VALUES,
+        layer: layer.Native
     },
     'border-bottom-style': {
-        match: [
-            'b(?:b|order-bottom(?:-style)?)',
-            BORDER_STYLES
+        ambiguousKeys: [
+            'bb',
+            'border-bottom'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: BORDER_STYLE_VALUES,
+        layer: layer.Native
     },
     'border-left-style': {
-        match: [
-            'b(?:l|order-left(?:-style)?)',
-            BORDER_STYLES
+        ambiguousKeys: [
+            'bl',
+            'border-left'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: BORDER_STYLE_VALUES,
+        layer: layer.Native
     },
     'border-right-style': {
-        match: [
-            'b(?:r|order-right(?:-style)?)',
-            BORDER_STYLES
+        ambiguousKeys: [
+            'br',
+            'border-right'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: BORDER_STYLE_VALUES,
+        layer: layer.Native
     },
     'border-x-style': {
-        match: [
-            'b(?:x|order-x(?:-style)?)',
-            BORDER_STYLES
+        ambiguousKeys: [
+            'bx',
+            'border-x'
         ],
-        layer: layer.Layer.CoreShorthand,
+        ambiguousValues: BORDER_STYLE_VALUES,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'border-left-style': value,
@@ -1323,11 +1414,12 @@ const rules = {
         }
     },
     'border-y-style': {
-        match: [
-            'b(?:y|order-y(?:-style)?)',
-            BORDER_STYLES
+        ambiguousKeys: [
+            'by',
+            'border-y'
         ],
-        layer: layer.Layer.CoreShorthand,
+        ambiguousValues: BORDER_STYLE_VALUES,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'border-top-style': value,
@@ -1336,52 +1428,68 @@ const rules = {
         }
     },
     'border-style': {
-        match: [
-            'b(?:order)?(?:-style)?',
-            BORDER_STYLES
+        ambiguousKeys: [
+            'b',
+            'border'
         ],
-        layer: layer.Layer.CoreNativeShorthand
+        ambiguousValues: BORDER_STYLE_VALUES,
+        layer: layer.NativeShorthand
     },
     // border width
     'border-top-width': {
-        match: [
-            'b(?:t|order-top(?:-width)?)'
+        ambiguousKeys: [
+            'bt',
+            'border-top'
+        ],
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'border-bottom-width': {
-        match: [
-            'b(?:b|order-bottom(?:-width)?)'
+        ambiguousKeys: [
+            'bb',
+            'border-bottom'
+        ],
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'border-left-width': {
-        match: [
-            'b(?:l|order-left(?:-width)?)'
+        ambiguousKeys: [
+            'bl',
+            'border-left'
+        ],
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'border-right-width': {
-        match: [
-            'b(?:r|order-right(?:-width)?)'
+        ambiguousKeys: [
+            'br',
+            'border-right'
+        ],
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'border-x-width': {
-        match: [
-            'b(?:x|order-x(?:-width)?)'
+        ambiguousKeys: [
+            'bx',
+            'border-x'
+        ],
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'border-left-width': value,
@@ -1390,12 +1498,15 @@ const rules = {
         }
     },
     'border-y-width': {
-        match: [
-            'b(?:y|order-y(?:-width)?)'
+        ambiguousKeys: [
+            'by',
+            'border-y'
+        ],
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'border-top-width': value,
@@ -1404,95 +1515,97 @@ const rules = {
         }
     },
     'border-width': {
-        match: [
-            'b(?:order)?(?:-width)?'
+        ambiguousKeys: [
+            'b',
+            'border'
+        ],
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     // border image
-    'border-image-outset': {
-        unit: 'rem',
-        layer: layer.Layer.CoreNative
-    },
     'border-image-repeat': {
-        match: [
-            'border-image',
-            [
-                'stretch',
-                'repeat',
-                'round',
-                'space'
-            ]
+        ambiguousKeys: [
+            'border-image'
+        ],
+        ambiguousValues: [
+            'stretch',
+            'repeat',
+            'round',
+            'space'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'border-image-slice': {
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'border-image'
+        ],
+        layer: layer.Native
     },
     'border-image-source': {
-        match: [
-            'border-image',
-            [
-                'url',
-                'linear-gradient',
-                'radial-gradient',
-                'repeating-linear-gradient',
-                'repeating-radial-gradient',
-                'conic-gradient'
-            ]
-        ],
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'border-image'
+        ],
+        ambiguousValues: [
+            common.IMAGE_VALUE_REGEX
+        ],
+        layer: layer.Native
     },
     'border-image-width': {
-        match: [
-            'border-image',
-            [
-                'auto'
-            ]
+        ambiguousKeys: [
+            'border-image'
+        ],
+        ambiguousValues: [
+            'auto',
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
+    },
+    'border-image-outset': {
+        ambiguousKeys: [
+            'border-image'
+        ],
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
+        ],
+        unit: 'rem',
+        layer: layer.Native
     },
     'border-image': {
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     // border
     'border-top': {
-        match: /^bt:/,
-        layer: layer.Layer.CoreNativeShorthand,
+        key: 'bt',
+        layer: layer.NativeShorthand,
         unit: 'rem',
-        colored: true,
         transformValueComponents: autofillSolidToValueComponent
     },
     'border-bottom': {
-        match: /^bb:/,
-        layer: layer.Layer.CoreNativeShorthand,
+        key: 'bb',
+        layer: layer.NativeShorthand,
         unit: 'rem',
-        colored: true,
         transformValueComponents: autofillSolidToValueComponent
     },
     'border-left': {
-        match: /^bl:/,
-        layer: layer.Layer.CoreNativeShorthand,
+        key: 'bl',
+        layer: layer.NativeShorthand,
         unit: 'rem',
-        colored: true,
         transformValueComponents: autofillSolidToValueComponent
     },
     'border-right': {
-        match: /^br:/,
-        layer: layer.Layer.CoreNativeShorthand,
+        key: 'br',
+        layer: layer.NativeShorthand,
         unit: 'rem',
-        colored: true,
         transformValueComponents: autofillSolidToValueComponent
     },
     'border-x': {
-        match: /^(?:bx|border-x):/,
+        key: 'bx',
         unit: 'rem',
-        colored: true,
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         transformValueComponents: autofillSolidToValueComponent,
         declare (value) {
             return {
@@ -1502,10 +1615,9 @@ const rules = {
         }
     },
     'border-y': {
-        match: /^(?:by|border-y):/,
+        key: 'by',
         unit: 'rem',
-        colored: true,
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         transformValueComponents: autofillSolidToValueComponent,
         declare (value) {
             return {
@@ -1515,41 +1627,38 @@ const rules = {
         }
     },
     border: {
-        match: /^b:/,
+        key: 'b',
         unit: 'rem',
-        colored: true,
-        layer: layer.Layer.CoreNativeShorthand,
+        layer: layer.NativeShorthand,
         transformValueComponents: autofillSolidToValueComponent
     },
     'background-attachment': {
-        match: [
-            '(?:bg|background)',
-            [
-                'fixed',
-                'local',
-                'scroll'
-            ]
+        ambiguousKeys: [
+            'bg'
+        ],
+        ambiguousValues: [
+            'fixed',
+            'local',
+            'scroll'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'background-blend-mode': {
-        layer: layer.Layer.CoreNative
+        key: 'bg-blend',
+        layer: layer.Native
     },
     'background-color': {
-        match: [
-            '(?:bg|background)'
+        ambiguousKeys: [
+            'bg'
         ],
-        layer: layer.Layer.CoreNative,
-        colored: true
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
+        ],
+        layer: layer.Native
     },
     'background-clip': {
-        match: [
-            '(?:bg|background)',
-            [
-                'text'
-            ]
-        ],
-        layer: layer.Layer.CoreNative,
+        key: 'bg-clip',
+        layer: layer.Native,
         declare (value) {
             return {
                 '-webkit-background-clip': value,
@@ -1558,70 +1667,66 @@ const rules = {
         }
     },
     'background-origin': {
-        match: [
-            '(?:bg|background)'
-        ],
-        layer: layer.Layer.CoreNative
+        key: 'bg-origin',
+        layer: layer.Native
     },
     'background-position': {
-        match: [
-            '(?:bg|background)',
-            [
-                'top',
-                'bottom',
-                'right',
-                'left',
-                'center'
-            ]
-        ],
-        layer: layer.Layer.CoreNative,
+        ambiguousKeys: [
+            'bg'
+        ],
+        ambiguousValues: [
+            'top',
+            'bottom',
+            'right',
+            'left',
+            'center'
+        ],
+        layer: layer.Native,
         unit: 'px'
     },
     'background-repeat': {
-        match: [
-            '(?:bg|background)',
-            [
-                'space',
-                'round',
-                'repeat',
-                'no-repeat',
-                'repeat-x',
-                'repeat-y'
-            ]
-        ],
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'bg'
+        ],
+        ambiguousValues: [
+            'space',
+            'round',
+            'repeat',
+            'no-repeat',
+            'repeat-x',
+            'repeat-y'
+        ],
+        layer: layer.Native
     },
     'background-size': {
-        match: [
-            '(?:bg|background)',
-            [
-                'auto',
-                'cover',
-                'contain'
-            ]
+        ambiguousKeys: [
+            'bg'
+        ],
+        ambiguousValues: [
+            'auto',
+            'cover',
+            'contain',
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'background-image': {
-        match: [
-            '(?:bg|background)',
-            [
-                '(?:url|linear-gradient|radial-gradient|repeating-linear-gradient|repeating-radial-gradient|conic-gradient)\\(.*\\)'
-            ]
+        ambiguousKeys: [
+            'bg'
+        ],
+        ambiguousValues: [
+            common.IMAGE_VALUE_REGEX
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     background: {
-        match: /^bg:/,
-        colored: true,
-        layer: layer.Layer.CoreNativeShorthand
+        key: 'bg',
+        layer: layer.NativeShorthand
     },
     gradient: {
-        match: /^gradient\(/,
-        layer: layer.Layer.CoreNative,
-        colored: true,
+        matcher: /^gradient\(/,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'background-image': 'linear-' + value
@@ -1629,123 +1734,132 @@ const rules = {
         }
     },
     'mix-blend-mode': {
-        match: /^blend:/,
-        layer: layer.Layer.CoreNative
+        key: 'blend',
+        layer: layer.Native
     },
     'backdrop-filter': {
-        match: /^bd:/,
-        layer: layer.Layer.CoreNative,
-        colored: true,
+        key: 'bd',
+        layer: layer.Native,
         declare (value) {
             return {
-                'backdrop-filter': value,
-                '-webkit-backdrop-filter': value
+                '-webkit-backdrop-filter': value,
+                'backdrop-filter': value
             };
         }
     },
     filter: {
-        match: /^(?:blur|brightness|contrast|drop-shadow|grayscale|hue-rotate|invert|opacity|saturate|sepia)\(/,
-        layer: layer.Layer.CoreNative,
-        colored: true
+        matcher: /^(?:blur|brightness|contrast|drop-shadow|grayscale|hue-rotate|invert|opacity|saturate|sepia)\(/,
+        layer: layer.Native
     },
     fill: {
-        match: /^fill:/,
-        layer: layer.Layer.CoreNative,
-        colored: true
+        layer: layer.Native
     },
     'stroke-dasharray': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'stroke-dashoffset': {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         variables: [
             'spacing'
         ]
     },
     'stroke-width': {
-        match: [
-            'stroke(?:-width)?'
+        ambiguousKeys: [
+            'stroke'
+        ],
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     stroke: {
-        match: [
-            'stroke'
-        ],
-        layer: layer.Layer.CoreNative,
-        colored: true
+        layer: layer.Native
     },
     x: {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         variables: [
             'spacing'
         ]
     },
     y: {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         variables: [
             'spacing'
         ]
     },
     cx: {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         variables: [
             'spacing'
         ]
     },
     cy: {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         variables: [
             'spacing'
         ]
     },
     rx: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     ry: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'grid-column-start': {
-        match: /^grid-col(?:umn)?-start:/,
-        layer: layer.Layer.CoreNative
+        key: 'grid-col-start',
+        layer: layer.Native
     },
     'grid-column-end': {
-        match: /^grid-col(?:umn)?-end:/,
-        layer: layer.Layer.CoreNative
+        key: 'grid-col-end',
+        layer: layer.Native
     },
-    'grid-column': {
-        match: /^grid-col(?:umn)?(?:-span)?:/,
-        layer: layer.Layer.CoreNativeShorthand,
+    'grid-column-span': {
+        key: 'grid-col-span',
+        layer: layer.Shorthand,
         transformValue (value) {
-            return this.prefix.slice(-5, -1) === 'span' && value !== 'auto' ? 'span' + ' ' + value + '/' + 'span' + ' ' + value : value;
+            return 'span' + ' ' + value + '/' + 'span' + ' ' + value;
+        },
+        declare (value) {
+            return {
+                'grid-column': value
+            };
         }
     },
+    'grid-column': {
+        key: 'grid-col',
+        layer: layer.NativeShorthand
+    },
     'grid-columns': {
-        match: /^grid-col(?:umn)?s:/,
+        key: 'grid-cols',
         declare (value) {
             return {
                 display: 'grid',
                 'grid-template-columns': 'repeat' + '(' + value + ',' + 'minmax' + '(' + 0 + ',' + 1 + 'fr' + '))'
             };
         },
-        layer: layer.Layer.Core
+        layer: layer.Shorthand
     },
     'grid-row-start': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'grid-row-end': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
-    'grid-row': {
-        match: /^grid-row-span:/,
-        layer: layer.Layer.CoreNativeShorthand,
+    'grid-row-span': {
+        layer: layer.Shorthand,
         transformValue (value) {
-            return this.prefix.slice(-5, -1) === 'span' && value !== 'auto' ? 'span' + ' ' + value + '/' + 'span' + ' ' + value : value;
+            return 'span' + ' ' + value + '/' + 'span' + ' ' + value;
+        },
+        declare (value) {
+            return {
+                'grid-row': value
+            };
         }
     },
+    'grid-row': {
+        layer: layer.NativeShorthand
+    },
     'grid-rows': {
-        match: /^grid-rows:/,
         declare (value) {
             return {
                 display: 'grid',
@@ -1753,187 +1867,188 @@ const rules = {
                 'grid-template-rows': 'repeat' + '(' + value + ',' + 'minmax' + '(' + 0 + ',' + 1 + 'fr' + '))'
             };
         },
-        layer: layer.Layer.Core
+        layer: layer.Shorthand
     },
     'grid-auto-columns': {
-        match: /^grid-auto-cols:/,
-        layer: layer.Layer.CoreNative
+        key: 'grid-auto-cols',
+        layer: layer.Native
     },
     'grid-auto-flow': {
-        match: /^grid-flow:/,
-        layer: layer.Layer.CoreNative
+        key: 'grid-flow',
+        layer: layer.Native
     },
     'grid-auto-rows': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'grid-template-areas': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'grid-template-columns': {
-        match: /^grid-template-cols:/,
-        layer: layer.Layer.CoreNative,
+        key: 'grid-template-cols',
+        layer: layer.Native,
         unit: 'rem'
     },
     'grid-template-rows': {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         unit: 'rem'
     },
     'grid-template': {
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     'grid-area': {
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     grid: {
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     'column-gap': {
-        match: /^gap-x:/,
+        key: 'gap-x',
         unit: 'rem',
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         variables: [
             'spacing'
         ]
     },
     'row-gap': {
-        match: /^gap-y:/,
+        key: 'gap-y',
         unit: 'rem',
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         variables: [
             'spacing'
         ]
     },
     gap: {
         unit: 'rem',
-        layer: layer.Layer.CoreNativeShorthand,
+        layer: layer.NativeShorthand,
         variables: [
             'spacing'
         ]
     },
     order: {
-        match: /^o:/,
-        layer: layer.Layer.CoreNative
+        key: 'o',
+        layer: layer.Native
     },
     'break-inside': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'break-before': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'break-after': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'aspect-ratio': {
-        match: /^aspect:/,
-        layer: layer.Layer.CoreNative
+        key: 'aspect',
+        layer: layer.Native
     },
     'column-span': {
-        match: /^col-span:/,
-        layer: layer.Layer.CoreNative
+        key: 'col-span',
+        layer: layer.Native
     },
     'align-content': {
-        match: /^ac:/,
-        layer: layer.Layer.CoreNative
+        subkey: 'ac',
+        layer: layer.Native
     },
     'align-items': {
-        match: /^ai:/,
-        layer: layer.Layer.CoreNative
+        subkey: 'ai',
+        layer: layer.Native
     },
     'align-self': {
-        match: /^as:/,
-        layer: layer.Layer.CoreNative
+        subkey: 'as',
+        layer: layer.Native
     },
     'justify-content': {
-        match: /^jc:/,
-        layer: layer.Layer.CoreNative
+        subkey: 'jc',
+        layer: layer.Native
     },
     'justify-items': {
-        match: /^ji:/,
-        layer: layer.Layer.CoreNative
+        subkey: 'ji',
+        layer: layer.Native
     },
     'justify-self': {
-        match: /^js:/,
-        layer: layer.Layer.CoreNative
+        subkey: 'js',
+        layer: layer.Native
     },
     'place-content': {
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     'place-items': {
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     'place-self': {
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     'list-style-position': {
-        match: [
-            'list-style',
-            [
-                'inside',
-                'outside'
-            ]
+        ambiguousKeys: [
+            'list-style'
+        ],
+        ambiguousValues: [
+            'inside',
+            'outside'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'list-style-type': {
-        match: [
-            'list-style',
-            [
-                'disc',
-                'decimal'
-            ]
+        ambiguousKeys: [
+            'list-style'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: [
+            'disc',
+            'decimal'
+        ],
+        layer: layer.Native
     },
     'list-style-image': {
-        match: [
-            'list-style',
-            [
-                '(?:url|linear-gradient|radial-gradient|repeating-linear-gradient|repeating-radial-gradient|conic-gradient)\\(.*\\)'
-            ]
+        ambiguousKeys: [
+            'list-style'
+        ],
+        ambiguousValues: [
+            common.IMAGE_VALUE_REGEX
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'list-style': {
-        layer: layer.Layer.CoreNativeShorthand
+        layer: layer.NativeShorthand
     },
     'outline-color': {
-        match: [
+        ambiguousKeys: [
             'outline'
         ],
-        layer: layer.Layer.CoreNative,
-        colored: true
+        ambiguousValues: [
+            common.COLOR_VALUE_REGEX
+        ],
+        layer: layer.Native
     },
     'outline-offset': {
         unit: 'rem',
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         variables: [
             'spacing'
         ]
     },
     'outline-style': {
-        match: [
-            'outline',
-            BORDER_STYLES
+        ambiguousKeys: [
+            'outline'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: BORDER_STYLE_VALUES,
+        layer: layer.Native
     },
     'outline-width': {
-        match: [
-            'outline',
-            [
-                'medium',
-                'thick',
-                'thin'
-            ]
+        ambiguousKeys: [
+            'outline'
+        ],
+        ambiguousValues: [
+            'medium',
+            'thick',
+            'thin',
+            common.NUMBER_VALUE_REGEX
         ],
-        numeric: true,
         unit: 'rem',
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     outline: {
         unit: 'rem',
-        layer: layer.Layer.CoreNativeShorthand,
-        colored: true,
+        layer: layer.NativeShorthand,
         variables: [
             'outline-width',
             'outline-style',
@@ -1943,61 +2058,59 @@ const rules = {
         transformValueComponents: autofillSolidToValueComponent
     },
     'accent-color': {
-        match: /^accent:/,
-        layer: layer.Layer.CoreNative,
-        colored: true
+        key: 'accent',
+        layer: layer.Native
     },
     appearance: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'caret-color': {
-        match: /^caret:/,
-        layer: layer.Layer.CoreNative,
-        colored: true,
+        key: 'caret',
+        layer: layer.Native,
         variables: [
             'text'
         ]
     },
     'scroll-behavior': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     // scroll margin
     'scroll-margin-left': {
-        match: /^scroll-ml:/,
-        layer: layer.Layer.CoreNative,
+        key: 'scroll-ml',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'scroll-margin-right': {
-        match: /^scroll-mr:/,
-        layer: layer.Layer.CoreNative,
+        key: 'scroll-mr',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'scroll-margin-top': {
-        match: /^scroll-mt:/,
-        layer: layer.Layer.CoreNative,
+        key: 'scroll-mt',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'scroll-margin-bottom': {
-        match: /^scroll-mb:/,
-        layer: layer.Layer.CoreNative,
+        key: 'scroll-mb',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'scroll-margin-x': {
-        match: /^(?:scroll-margin-x|scroll-mx):/,
+        key: 'scroll-mx',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'scroll-margin-left': value,
@@ -2009,9 +2122,9 @@ const rules = {
         ]
     },
     'scroll-margin-y': {
-        match: /^(?:scroll-margin-y|scroll-my):/,
+        key: 'scroll-my',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'scroll-margin-top': value,
@@ -2023,50 +2136,50 @@ const rules = {
         ]
     },
     'scroll-margin': {
-        match: /^scroll-m:/,
+        key: 'scroll-m',
         unit: 'rem',
-        layer: layer.Layer.CoreNativeShorthand,
+        layer: layer.NativeShorthand,
         variables: [
             'spacing'
         ]
     },
     // scroll padding
     'scroll-padding-left': {
-        match: /^scroll-pl:/,
-        layer: layer.Layer.CoreNative,
+        key: 'scroll-pl',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'scroll-padding-right': {
-        match: /^scroll-pr:/,
-        layer: layer.Layer.CoreNative,
+        key: 'scroll-pr',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'scroll-padding-top': {
-        match: /^scroll-pt:/,
-        layer: layer.Layer.CoreNative,
+        key: 'scroll-pt',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'scroll-padding-bottom': {
-        match: /^scroll-pb:/,
-        layer: layer.Layer.CoreNative,
+        key: 'scroll-pb',
+        layer: layer.Native,
         unit: 'rem',
         variables: [
             'spacing'
         ]
     },
     'scroll-padding-x': {
-        match: /^(?:scroll-padding-x|scroll-px):/,
+        key: 'scroll-px',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'scroll-padding-left': value,
@@ -2078,9 +2191,9 @@ const rules = {
         ]
     },
     'scroll-padding-y': {
-        match: /^(?:scroll-padding-y|scroll-py):/,
+        key: 'scroll-py',
         unit: 'rem',
-        layer: layer.Layer.CoreShorthand,
+        layer: layer.Shorthand,
         declare (value) {
             return {
                 'scroll-padding-top': value,
@@ -2092,99 +2205,99 @@ const rules = {
         ]
     },
     'scroll-padding': {
-        match: /^scroll-p:/,
+        key: 'scroll-p',
         unit: 'rem',
-        layer: layer.Layer.CoreNativeShorthand,
+        layer: layer.NativeShorthand,
         variables: [
             'spacing'
         ]
     },
     // scroll snap
     'scroll-snap-align': {
-        match: [
-            'scroll-snap',
-            [
-                'start',
-                'end',
-                'center'
-            ]
+        ambiguousKeys: [
+            'scroll-snap'
+        ],
+        ambiguousValues: [
+            'start',
+            'end',
+            'center'
         ],
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'scroll-snap-stop': {
-        match: [
-            'scroll-snap',
-            [
-                'normal',
-                'always'
-            ]
+        ambiguousKeys: [
+            'scroll-snap'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: [
+            'normal',
+            'always'
+        ],
+        layer: layer.Native
     },
     'scroll-snap-type': {
-        match: [
-            'scroll-snap',
-            [
-                'x',
-                'y',
-                'block',
-                'inline',
-                'both'
-            ]
-        ],
-        layer: layer.Layer.CoreNative
+        ambiguousKeys: [
+            'scroll-snap'
+        ],
+        ambiguousValues: [
+            'x',
+            'y',
+            'block',
+            'inline',
+            'both'
+        ],
+        layer: layer.Native
     },
     'will-change': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'writing-mode': {
-        match: /^writing:/,
-        layer: layer.Layer.CoreNative
+        key: 'writing',
+        layer: layer.Native
     },
     direction: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'shape-outside': {
-        match: [
-            'shape',
-            [
-                '(?:inset|circle|ellipse|polygon|url|linear-gradient)\\(.*\\)'
-            ]
+        ambiguousKeys: [
+            'shape'
         ],
-        layer: layer.Layer.CoreNative
+        ambiguousValues: [
+            /(?:inset|circle|ellipse|polygon|url|linear-gradient)\(.*\)/
+        ],
+        layer: layer.Native
     },
     'shape-margin': {
-        match: [
+        ambiguousKeys: [
             'shape'
         ],
-        numeric: true,
+        ambiguousValues: [
+            common.NUMBER_VALUE_REGEX
+        ],
         unit: 'rem',
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         variables: [
             'spacing'
         ]
     },
     'shape-image-threshold': {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'clip-path': {
-        match: /^clip:/,
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     quotes: {
-        layer: layer.Layer.CoreNative
+        layer: layer.Native
     },
     'mask-image': {
-        layer: layer.Layer.CoreNative,
+        layer: layer.Native,
         declare (value) {
             return {
-                'mask-image': value,
-                '-webkit-mask-image': value
+                '-webkit-mask-image': value,
+                'mask-image': value
             };
         }
     }
 };
 
-exports.BORDER_STYLES = BORDER_STYLES;
 exports.autofillSolidToValueComponent = autofillSolidToValueComponent;
 exports.default = rules;