@tbela99/css-parser 0.0.1-rc2 → 0.0.1-rc3

package/README.md

@@ -15,7 +15,7 @@ $ npm install @tbela99/css-parser
 - fault tolerant parser, will try to fix invalid tokens according to the CSS syntax module 3 recommendations.
 - efficient minification, see [benchmark](https://tbela99.github.io/css-parser/benchmark/index.html)
 - replace @import at-rules with actual css content of the imported rule
-- automatically create nested css rules
+- automatically generate nested css rules
 - works the same way in node and web browser
 
 ### Performance
@@ -79,7 +79,7 @@ parse(css, parseOptions = {})
 
 ````javascript
 
-const {ast, errors} = await parse(css);
+const {ast, errors, stats} = await parse(css);
 ````
 
 ## Rendering
@@ -96,7 +96,7 @@ render(ast, RenderOptions = {});
 import {render} from '@tbela99/css-parser';
 
 // minified
-const {code} = render(ast, {minify: true});
+const {code, stats} = render(ast, {minify: true});
 
 console.log(code);
 ```
@@ -160,6 +160,62 @@ Single JavaScript file
 <script src="dist/index-umd-web.js"></script>
 ```
 
+## Example
+
+### Automatic CSS Nesting
+
+CSS
+
+```css
+
+table.colortable td {
+  text-align:center;
+}
+table.colortable td.c {
+  text-transform:uppercase;
+}
+table.colortable td:first-child, table.colortable td:first-child+td {
+  border:1px solid black;
+}
+table.colortable th {
+  text-align:center;
+  background:black;
+  color:white;
+}
+```
+
+Javascript
+```javascript
+import {parse, render} from '@tbela99/css-parser';
+
+
+const options = {minify: true, nestingRules: true};
+
+const {code} = await parse(css, options).then(result => render(result.ast, {minify: false}));
+//
+console.debug(code);
+```
+
+Result
+```css
+table.colortable {
+ & td {
+  text-align: center;
+  &.c {
+   text-transform: uppercase
+  }
+  &:first-child,&:first-child+td {
+   border: 1px solid #000
+  }
+ }
+ & th {
+  text-align: center;
+  background: #000;
+  color: #fff
+ }
+}
+```
+
 ## AST
 
 ### Comment

package/dist/index-umd-web.js

@@ -1069,6 +1069,21 @@
 
     const getConfig = () => config$1;
 
+    const funcList = ['clamp', 'calc'];
+    function matchType(val, properties) {
+        if (val.typ == 'Iden' && properties.keywords.includes(val.val) ||
+            (properties.types.includes(val.typ))) {
+            return true;
+        }
+        if (val.typ == 'Number' && val.val == '0') {
+            return properties.types.some(type => type == 'Length' || type == 'Angle');
+        }
+        if (val.typ == 'Func' && funcList.includes(val.val)) {
+            return val.chi.every((t => ['Literal', 'Comma', 'Whitespace', 'Start-parens', 'End-parens'].includes(t.typ) || matchType(t, properties)));
+        }
+        return false;
+    }
+
     // name to color
     const COLORS_NAMES = Object.seal({
         'aliceblue': '#f0f8ff',
@@ -1597,6 +1612,8 @@
         const indent = indents[level];
         const indentSub = indents[level + 1];
         switch (data.typ) {
+            case 'Declaration':
+                return `${data.nam}:${options.indent}${data.val.reduce((acc, curr) => acc + renderToken(curr), '')}`;
             case 'Comment':
                 return options.removeComments ? '' : data.val;
             case 'StyleSheet':
@@ -1622,6 +1639,10 @@
                         str = options.removeComments ? '' : node.val;
                     }
                     else if (node.typ == 'Declaration') {
+                        if (node.val.length == 0) {
+                            console.error(`invalid declaration`, node);
+                            return '';
+                        }
                         str = `${node.nam}:${options.indent}${node.val.reduce(reducer, '').trimEnd()};`;
                     }
                     else if (node.typ == 'AtRule' && !('chi' in node)) {
@@ -2000,17 +2021,6 @@
         }
     }
 
-    function matchType(val, properties) {
-        if (val.typ == 'Iden' && properties.keywords.includes(val.val) ||
-            (properties.types.includes(val.typ))) {
-            return true;
-        }
-        if (val.typ == 'Number' && val.val == '0') {
-            return properties.types.some(type => type == 'Length' || type == 'Angle');
-        }
-        return false;
-    }
-
     const propertiesConfig = getConfig();
     class PropertyMap {
         config;
@@ -2025,6 +2035,9 @@
             this.pattern = config.pattern.split(/\s/);
         }
         add(declaration) {
+            for (const val of declaration.val) {
+                Object.defineProperty(val, 'propertyName', { enumerable: false, writable: true, value: declaration.nam });
+            }
             if (declaration.nam == this.config.shorthand) {
                 this.declarations = new Map;
                 this.declarations.set(declaration.nam, declaration);
@@ -2058,7 +2071,7 @@
                                     i--;
                                     continue;
                                 }
-                                if (matchType(acc[i], props)) {
+                                if (('propertyName' in acc[i] && acc[i].propertyName == property) || matchType(acc[i], props)) {
                                     if ('prefix' in props && props.previous != null && !(props.previous in tokens)) {
                                         return acc;
                                     }
@@ -2192,10 +2205,12 @@
             }
             else {
                 let count = 0;
+                let match;
                 const separator = this.config.separator;
                 const tokens = {};
                 // @ts-ignore
-                /* const valid: string[] =*/ Object.entries(this.config.properties).reduce((acc, curr) => {
+                /* const valid: string[] =*/
+                Object.entries(this.config.properties).reduce((acc, curr) => {
                     if (!this.declarations.has(curr[0])) {
                         if (curr[1].required) {
                             acc.push(curr[0]);
@@ -2204,33 +2219,39 @@
                     }
                     let current = 0;
                     const props = this.config.properties[curr[0]];
-                    const declaration = this.declarations.get(curr[0]);
-                    // @ts-ignore
-                    for (const val of (declaration instanceof PropertySet ? [...declaration][0] : declaration).val) {
-                        if (separator != null && separator.typ == val.typ && eq(separator, val)) {
-                            current++;
-                            if (tokens[curr[0]].length == current) {
-                                tokens[curr[0]].push([]);
+                    const properties = this.declarations.get(curr[0]);
+                    for (const declaration of [(properties instanceof PropertySet ? [...properties][0] : properties)]) {
+                        // @ts-ignore
+                        for (const val of declaration.val) {
+                            if (separator != null && separator.typ == val.typ && eq(separator, val)) {
+                                current++;
+                                if (tokens[curr[0]].length == current) {
+                                    tokens[curr[0]].push([]);
+                                }
+                                continue;
                             }
-                            continue;
-                        }
-                        if (val.typ == 'Whitespace' || val.typ == 'Comment') {
-                            continue;
-                        }
-                        if (props.multiple && props.separator != null && props.separator.typ == val.typ && eq(props.separator, val)) {
-                            continue;
-                        }
-                        if (matchType(val, curr[1])) {
-                            if (!(curr[0] in tokens)) {
-                                tokens[curr[0]] = [[]];
+                            if (val.typ == 'Whitespace' || val.typ == 'Comment') {
+                                continue;
+                            }
+                            if (props.multiple && props.separator != null && props.separator.typ == val.typ && eq(props.separator, val)) {
+                                continue;
+                            }
+                            match = matchType(val, curr[1]);
+                            if (isShorthand) {
+                                isShorthand = match;
+                            }
+                            if (('propertyName' in val && val.propertyName == property) || match) {
+                                if (!(curr[0] in tokens)) {
+                                    tokens[curr[0]] = [[]];
+                                }
+                                // is default value
+                                tokens[curr[0]][current].push(val);
+                                // continue;
+                            }
+                            else {
+                                acc.push(curr[0]);
+                                break;
                             }
-                            // is default value
-                            tokens[curr[0]][current].push(val);
-                            // continue;
-                        }
-                        else {
-                            acc.push(curr[0]);
-                            break;
                         }
                     }
                     if (count == 0) {
@@ -2239,7 +2260,10 @@
                     return acc;
                 }, []);
                 count++;
-                if (!Object.values(tokens).every(v => v.length == count)) {
+                if (!isShorthand || Object.entries(this.config.properties).some(entry => {
+                    // missing required property
+                    return entry[1].required && !(entry[0] in tokens);
+                }) || !Object.values(tokens).every(v => v.length == count)) {
                     // @ts-ignore
                     iterable = this.declarations.values();
                 }
@@ -4106,13 +4130,13 @@
         };
     }
     function parseString(src, options = { location: false }) {
-        return [...tokenize(src)].map(t => {
+        return parseTokens([...tokenize(src)].map(t => {
             const token = getTokenType(t.token, t.hint);
             if (options.location) {
                 Object.assign(token, { loc: t.position });
             }
             return token;
-        });
+        }));
     }
     function getTokenType(val, hint) {
         if (val === '' && hint == null) {
@@ -4623,6 +4647,7 @@
     exports.isTime = isTime;
     exports.isWhiteSpace = isWhiteSpace;
     exports.load = load;
+    exports.matchType = matchType;
     exports.matchUrl = matchUrl;
     exports.minify = minify;
     exports.minifyRule = minifyRule;

package/dist/index.cjs

@@ -1067,6 +1067,21 @@ var config$1 = {
 
 const getConfig = () => config$1;
 
+const funcList = ['clamp', 'calc'];
+function matchType(val, properties) {
+    if (val.typ == 'Iden' && properties.keywords.includes(val.val) ||
+        (properties.types.includes(val.typ))) {
+        return true;
+    }
+    if (val.typ == 'Number' && val.val == '0') {
+        return properties.types.some(type => type == 'Length' || type == 'Angle');
+    }
+    if (val.typ == 'Func' && funcList.includes(val.val)) {
+        return val.chi.every((t => ['Literal', 'Comma', 'Whitespace', 'Start-parens', 'End-parens'].includes(t.typ) || matchType(t, properties)));
+    }
+    return false;
+}
+
 // name to color
 const COLORS_NAMES = Object.seal({
     'aliceblue': '#f0f8ff',
@@ -1595,6 +1610,8 @@ function doRender(data, options, reducer, level = 0, indents = []) {
     const indent = indents[level];
     const indentSub = indents[level + 1];
     switch (data.typ) {
+        case 'Declaration':
+            return `${data.nam}:${options.indent}${data.val.reduce((acc, curr) => acc + renderToken(curr), '')}`;
         case 'Comment':
             return options.removeComments ? '' : data.val;
         case 'StyleSheet':
@@ -1620,6 +1637,10 @@ function doRender(data, options, reducer, level = 0, indents = []) {
                     str = options.removeComments ? '' : node.val;
                 }
                 else if (node.typ == 'Declaration') {
+                    if (node.val.length == 0) {
+                        console.error(`invalid declaration`, node);
+                        return '';
+                    }
                     str = `${node.nam}:${options.indent}${node.val.reduce(reducer, '').trimEnd()};`;
                 }
                 else if (node.typ == 'AtRule' && !('chi' in node)) {
@@ -1998,17 +2019,6 @@ class PropertySet {
     }
 }
 
-function matchType(val, properties) {
-    if (val.typ == 'Iden' && properties.keywords.includes(val.val) ||
-        (properties.types.includes(val.typ))) {
-        return true;
-    }
-    if (val.typ == 'Number' && val.val == '0') {
-        return properties.types.some(type => type == 'Length' || type == 'Angle');
-    }
-    return false;
-}
-
 const propertiesConfig = getConfig();
 class PropertyMap {
     config;
@@ -2023,6 +2033,9 @@ class PropertyMap {
         this.pattern = config.pattern.split(/\s/);
     }
     add(declaration) {
+        for (const val of declaration.val) {
+            Object.defineProperty(val, 'propertyName', { enumerable: false, writable: true, value: declaration.nam });
+        }
         if (declaration.nam == this.config.shorthand) {
             this.declarations = new Map;
             this.declarations.set(declaration.nam, declaration);
@@ -2056,7 +2069,7 @@ class PropertyMap {
                                 i--;
                                 continue;
                             }
-                            if (matchType(acc[i], props)) {
+                            if (('propertyName' in acc[i] && acc[i].propertyName == property) || matchType(acc[i], props)) {
                                 if ('prefix' in props && props.previous != null && !(props.previous in tokens)) {
                                     return acc;
                                 }
@@ -2190,10 +2203,12 @@ class PropertyMap {
         }
         else {
             let count = 0;
+            let match;
             const separator = this.config.separator;
             const tokens = {};
             // @ts-ignore
-            /* const valid: string[] =*/ Object.entries(this.config.properties).reduce((acc, curr) => {
+            /* const valid: string[] =*/
+            Object.entries(this.config.properties).reduce((acc, curr) => {
                 if (!this.declarations.has(curr[0])) {
                     if (curr[1].required) {
                         acc.push(curr[0]);
@@ -2202,33 +2217,39 @@ class PropertyMap {
                 }
                 let current = 0;
                 const props = this.config.properties[curr[0]];
-                const declaration = this.declarations.get(curr[0]);
-                // @ts-ignore
-                for (const val of (declaration instanceof PropertySet ? [...declaration][0] : declaration).val) {
-                    if (separator != null && separator.typ == val.typ && eq(separator, val)) {
-                        current++;
-                        if (tokens[curr[0]].length == current) {
-                            tokens[curr[0]].push([]);
+                const properties = this.declarations.get(curr[0]);
+                for (const declaration of [(properties instanceof PropertySet ? [...properties][0] : properties)]) {
+                    // @ts-ignore
+                    for (const val of declaration.val) {
+                        if (separator != null && separator.typ == val.typ && eq(separator, val)) {
+                            current++;
+                            if (tokens[curr[0]].length == current) {
+                                tokens[curr[0]].push([]);
+                            }
+                            continue;
                         }
-                        continue;
-                    }
-                    if (val.typ == 'Whitespace' || val.typ == 'Comment') {
-                        continue;
-                    }
-                    if (props.multiple && props.separator != null && props.separator.typ == val.typ && eq(props.separator, val)) {
-                        continue;
-                    }
-                    if (matchType(val, curr[1])) {
-                        if (!(curr[0] in tokens)) {
-                            tokens[curr[0]] = [[]];
+                        if (val.typ == 'Whitespace' || val.typ == 'Comment') {
+                            continue;
+                        }
+                        if (props.multiple && props.separator != null && props.separator.typ == val.typ && eq(props.separator, val)) {
+                            continue;
+                        }
+                        match = matchType(val, curr[1]);
+                        if (isShorthand) {
+                            isShorthand = match;
+                        }
+                        if (('propertyName' in val && val.propertyName == property) || match) {
+                            if (!(curr[0] in tokens)) {
+                                tokens[curr[0]] = [[]];
+                            }
+                            // is default value
+                            tokens[curr[0]][current].push(val);
+                            // continue;
+                        }
+                        else {
+                            acc.push(curr[0]);
+                            break;
                         }
-                        // is default value
-                        tokens[curr[0]][current].push(val);
-                        // continue;
-                    }
-                    else {
-                        acc.push(curr[0]);
-                        break;
                     }
                 }
                 if (count == 0) {
@@ -2237,7 +2258,10 @@ class PropertyMap {
                 return acc;
             }, []);
             count++;
-            if (!Object.values(tokens).every(v => v.length == count)) {
+            if (!isShorthand || Object.entries(this.config.properties).some(entry => {
+                // missing required property
+                return entry[1].required && !(entry[0] in tokens);
+            }) || !Object.values(tokens).every(v => v.length == count)) {
                 // @ts-ignore
                 iterable = this.declarations.values();
             }
@@ -4104,13 +4128,13 @@ async function parse$1(iterator, opt = {}) {
     };
 }
 function parseString(src, options = { location: false }) {
-    return [...tokenize(src)].map(t => {
+    return parseTokens([...tokenize(src)].map(t => {
         const token = getTokenType(t.token, t.hint);
         if (options.location) {
             Object.assign(token, { loc: t.position });
         }
         return token;
-    });
+    }));
 }
 function getTokenType(val, hint) {
     if (val === '' && hint == null) {
@@ -4607,6 +4631,7 @@ exports.isResolution = isResolution;
 exports.isTime = isTime;
 exports.isWhiteSpace = isWhiteSpace;
 exports.load = load;
+exports.matchType = matchType;
 exports.matchUrl = matchUrl;
 exports.minify = minify;
 exports.minifyRule = minifyRule;

package/dist/index.d.ts

@@ -173,6 +173,30 @@ interface AttrToken {
 }
 declare type Token = LiteralToken | IdentToken | CommaToken | ColonToken | SemiColonToken | NumberToken | AtRuleToken | PercentageToken | FunctionURLToken | FunctionToken | DimensionToken | LengthToken | AngleToken | StringToken | TimeToken | FrequencyToken | ResolutionToken | UnclosedStringToken | HashToken | BadStringToken | BlockStartToken | BlockEndToken | AttrStartToken | AttrEndToken | ParensStartToken | ParensEndToken | CDOCommentToken | BadCDOCommentToken | CommentToken | BadCommentToken | WhitespaceToken | IncludesToken | DashMatchToken | LessThanToken | GreaterThanToken | PseudoClassToken | PseudoClassFunctionToken | DelimToken | BadUrlToken | UrlToken | ImportantToken | ColorToken | AttrToken | EOFToken;
 
+interface PropertyMapType {
+    default: string[];
+    types: string[];
+    keywords: string[];
+    required?: boolean;
+    multiple?: boolean;
+    prefix?: {
+        typ: 'Literal';
+        val: string;
+    };
+    previous?: string;
+    separator?: {
+        typ: 'Comma';
+    };
+    constraints?: {
+        [key: string]: {
+            [key: string]: any;
+        };
+    };
+    mapping?: {
+        [key: string]: any;
+    };
+}
+
 interface PropertiesConfig {
     properties: PropertiesConfigProperties;
     map: Map;
@@ -629,6 +653,8 @@ declare function isWhiteSpace(codepoint: number): boolean;
 
 declare const getConfig: () => PropertiesConfig;
 
+declare function matchType(val: Token, properties: PropertyMapType): boolean;
+
 declare function render(data: AstNode, opt?: RenderOptions): RenderResult;
 declare function renderToken(token: Token, options?: RenderOptions): string;
 
@@ -661,4 +687,4 @@ declare function resolve(url: string, currentDirectory: string, cwd?: string): {
 declare function parse(iterator: string, opt?: ParserOptions): Promise<ParseResult>;
 declare function transform(css: string, options?: TransformOptions): Promise<TransformResult>;
 
-export { combinators, dirname, getConfig, hasDeclaration, isAngle, isAtKeyword, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isHexDigit, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, load, matchUrl, minify, minifyRule, parse, parseDimension, parseString, reduceSelector, render, renderToken, resolve, tokenize, transform, urlTokenMatcher, walk };
+export { combinators, dirname, getConfig, hasDeclaration, isAngle, isAtKeyword, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isHexDigit, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, load, matchType, matchUrl, minify, minifyRule, parse, parseDimension, parseString, reduceSelector, render, renderToken, resolve, tokenize, transform, urlTokenMatcher, walk };

package/dist/index.js

@@ -3,6 +3,7 @@ export { parseString, urlTokenMatcher } from './lib/parser/parse.js';
 export { tokenize } from './lib/parser/tokenize.js';
 export { isAngle, isAtKeyword, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isHexDigit, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, parseDimension } from './lib/parser/utils/syntax.js';
 export { getConfig } from './lib/parser/utils/config.js';
+export { matchType } from './lib/parser/utils/type.js';
 export { render, renderToken } from './lib/renderer/render.js';
 export { combinators, hasDeclaration, minify, minifyRule, reduceSelector } from './lib/ast/minify.js';
 export { walk } from './lib/ast/walk.js';

package/dist/lib/parser/declaration/map.js

@@ -1,7 +1,7 @@
 import { eq } from '../utils/eq.js';
 import { getConfig } from '../utils/config.js';
-import { renderToken } from '../../renderer/render.js';
 import { matchType } from '../utils/type.js';
+import { renderToken } from '../../renderer/render.js';
 import { parseString } from '../parse.js';
 import { PropertySet } from './set.js';
 
@@ -19,6 +19,9 @@ class PropertyMap {
         this.pattern = config.pattern.split(/\s/);
     }
     add(declaration) {
+        for (const val of declaration.val) {
+            Object.defineProperty(val, 'propertyName', { enumerable: false, writable: true, value: declaration.nam });
+        }
         if (declaration.nam == this.config.shorthand) {
             this.declarations = new Map;
             this.declarations.set(declaration.nam, declaration);
@@ -52,7 +55,7 @@ class PropertyMap {
                                 i--;
                                 continue;
                             }
-                            if (matchType(acc[i], props)) {
+                            if (('propertyName' in acc[i] && acc[i].propertyName == property) || matchType(acc[i], props)) {
                                 if ('prefix' in props && props.previous != null && !(props.previous in tokens)) {
                                     return acc;
                                 }
@@ -186,10 +189,12 @@ class PropertyMap {
         }
         else {
             let count = 0;
+            let match;
             const separator = this.config.separator;
             const tokens = {};
             // @ts-ignore
-            /* const valid: string[] =*/ Object.entries(this.config.properties).reduce((acc, curr) => {
+            /* const valid: string[] =*/
+            Object.entries(this.config.properties).reduce((acc, curr) => {
                 if (!this.declarations.has(curr[0])) {
                     if (curr[1].required) {
                         acc.push(curr[0]);
@@ -198,33 +203,39 @@ class PropertyMap {
                 }
                 let current = 0;
                 const props = this.config.properties[curr[0]];
-                const declaration = this.declarations.get(curr[0]);
-                // @ts-ignore
-                for (const val of (declaration instanceof PropertySet ? [...declaration][0] : declaration).val) {
-                    if (separator != null && separator.typ == val.typ && eq(separator, val)) {
-                        current++;
-                        if (tokens[curr[0]].length == current) {
-                            tokens[curr[0]].push([]);
+                const properties = this.declarations.get(curr[0]);
+                for (const declaration of [(properties instanceof PropertySet ? [...properties][0] : properties)]) {
+                    // @ts-ignore
+                    for (const val of declaration.val) {
+                        if (separator != null && separator.typ == val.typ && eq(separator, val)) {
+                            current++;
+                            if (tokens[curr[0]].length == current) {
+                                tokens[curr[0]].push([]);
+                            }
+                            continue;
                         }
-                        continue;
-                    }
-                    if (val.typ == 'Whitespace' || val.typ == 'Comment') {
-                        continue;
-                    }
-                    if (props.multiple && props.separator != null && props.separator.typ == val.typ && eq(props.separator, val)) {
-                        continue;
-                    }
-                    if (matchType(val, curr[1])) {
-                        if (!(curr[0] in tokens)) {
-                            tokens[curr[0]] = [[]];
+                        if (val.typ == 'Whitespace' || val.typ == 'Comment') {
+                            continue;
+                        }
+                        if (props.multiple && props.separator != null && props.separator.typ == val.typ && eq(props.separator, val)) {
+                            continue;
+                        }
+                        match = matchType(val, curr[1]);
+                        if (isShorthand) {
+                            isShorthand = match;
+                        }
+                        if (('propertyName' in val && val.propertyName == property) || match) {
+                            if (!(curr[0] in tokens)) {
+                                tokens[curr[0]] = [[]];
+                            }
+                            // is default value
+                            tokens[curr[0]][current].push(val);
+                            // continue;
+                        }
+                        else {
+                            acc.push(curr[0]);
+                            break;
                         }
-                        // is default value
-                        tokens[curr[0]][current].push(val);
-                        // continue;
-                    }
-                    else {
-                        acc.push(curr[0]);
-                        break;
                     }
                 }
                 if (count == 0) {
@@ -233,7 +244,10 @@ class PropertyMap {
                 return acc;
             }, []);
             count++;
-            if (!Object.values(tokens).every(v => v.length == count)) {
+            if (!isShorthand || Object.entries(this.config.properties).some(entry => {
+                // missing required property
+                return entry[1].required && !(entry[0] in tokens);
+            }) || !Object.values(tokens).every(v => v.length == count)) {
                 // @ts-ignore
                 iterable = this.declarations.values();
             }

package/dist/lib/parser/parse.js

@@ -389,13 +389,13 @@ async function parse(iterator, opt = {}) {
     };
 }
 function parseString(src, options = { location: false }) {
-    return [...tokenize(src)].map(t => {
+    return parseTokens([...tokenize(src)].map(t => {
         const token = getTokenType(t.token, t.hint);
         if (options.location) {
             Object.assign(token, { loc: t.position });
         }
         return token;
-    });
+    }));
 }
 function getTokenType(val, hint) {
     if (val === '' && hint == null) {

package/dist/lib/parser/utils/type.js

@@ -1,3 +1,4 @@
+const funcList = ['clamp', 'calc'];
 function matchType(val, properties) {
     if (val.typ == 'Iden' && properties.keywords.includes(val.val) ||
         (properties.types.includes(val.typ))) {
@@ -6,6 +7,9 @@ function matchType(val, properties) {
     if (val.typ == 'Number' && val.val == '0') {
         return properties.types.some(type => type == 'Length' || type == 'Angle');
     }
+    if (val.typ == 'Func' && funcList.includes(val.val)) {
+        return val.chi.every((t => ['Literal', 'Comma', 'Whitespace', 'Start-parens', 'End-parens'].includes(t.typ) || matchType(t, properties)));
+    }
     return false;
 }
 

package/dist/lib/renderer/render.js

@@ -35,6 +35,8 @@ function doRender(data, options, reducer, level = 0, indents = []) {
     const indent = indents[level];
     const indentSub = indents[level + 1];
     switch (data.typ) {
+        case 'Declaration':
+            return `${data.nam}:${options.indent}${data.val.reduce((acc, curr) => acc + renderToken(curr), '')}`;
         case 'Comment':
             return options.removeComments ? '' : data.val;
         case 'StyleSheet':
@@ -60,6 +62,10 @@ function doRender(data, options, reducer, level = 0, indents = []) {
                     str = options.removeComments ? '' : node.val;
                 }
                 else if (node.typ == 'Declaration') {
+                    if (node.val.length == 0) {
+                        console.error(`invalid declaration`, node);
+                        return '';
+                    }
                     str = `${node.nam}:${options.indent}${node.val.reduce(reducer, '').trimEnd()};`;
                 }
                 else if (node.typ == 'AtRule' && !('chi' in node)) {

package/dist/web/index.js

@@ -3,6 +3,7 @@ export { parseString, urlTokenMatcher } from '../lib/parser/parse.js';
 export { tokenize } from '../lib/parser/tokenize.js';
 export { isAngle, isAtKeyword, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isHexDigit, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, parseDimension } from '../lib/parser/utils/syntax.js';
 export { getConfig } from '../lib/parser/utils/config.js';
+export { matchType } from '../lib/parser/utils/type.js';
 export { render, renderToken } from '../lib/renderer/render.js';
 import { transform as transform$1 } from '../lib/transform.js';
 export { combinators, hasDeclaration, minify, minifyRule, reduceSelector } from '../lib/ast/minify.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser for node and the browser",
-  "version": "0.0.1-rc2",
+  "version": "0.0.1-rc3",
   "exports": {
     ".": "./dist/index.js",
     "./umd": "./dist/index-umd-web.js",
@@ -41,20 +41,19 @@
   "homepage": "https://github.com/tbela99/css-parser#readme",
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
-    "@rollup/plugin-commonjs": "^25.0.2",
+    "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-terser": "^0.4.3",
-    "@rollup/plugin-typescript": "^11.0.0",
+    "@rollup/plugin-typescript": "^11.1.2",
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.15.10",
-    "@web/test-runner": "^0.16.1",
-    "@webref/css": "^6.5.9",
+    "@types/node": "^20.4.10",
+    "@web/test-runner": "^0.17.0",
     "c8": "^8.0.1",
     "mocha": "^10.2.0",
-    "rollup": "^3.20.1",
-    "rollup-plugin-dts": "^5.3.0",
-    "tslib": "^2.5.0"
+    "rollup": "^3.28.0",
+    "rollup-plugin-dts": "^5.3.1",
+    "tslib": "^2.6.1"
   }
 }

package/.gitattributes

@@ -1,22 +0,0 @@
-/test/ export-ignore
-/docs/ export-ignore
-/benchmark
-/tools/ export-ignore
-/package-lock.json export-ignore
-/.gitignore export-ignore
-/.gitattributes export-ignore
-/coverage/ export-ignore
-/rollup.config.mjs export-ignore
-/tsconfig.json export-ignore
-# exclude all files in test/ from stats
-/test/** linguist-vendored
-/docs/** linguist-vendored
-/tools/** linguist-vendored
-/dist/** linguist-vendored
-/coverage/** linguist-vendored
-#
-# do not replace lf by crlf
-*.css text
-*.json text
-text eol=lf
-