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

package/dist/index.d.ts

@@ -91,12 +91,14 @@ interface BlockEndToken {
 }
 interface AttrStartToken {
     typ: 'Attr-start';
+    chi?: Token[];
 }
 interface AttrEndToken {
     typ: 'Attr-end';
 }
 interface ParensStartToken {
     typ: 'Start-parens';
+    chi?: Token[];
 }
 interface ParensEndToken {
     typ: 'End-parens';
@@ -131,9 +133,15 @@ interface DashMatchToken {
 interface LessThanToken {
     typ: 'Lt';
 }
+interface LessThanOrEqualToken {
+    typ: 'Lte';
+}
 interface GreaterThanToken {
     typ: 'Gt';
 }
+interface GreaterThanOrEqualToken {
+    typ: 'Gte';
+}
 interface PseudoClassToken {
     typ: 'Pseudo-class';
     val: string;
@@ -171,7 +179,31 @@ interface AttrToken {
     typ: 'Attr';
     chi: Token[];
 }
-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;
+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 | LessThanOrEqualToken | GreaterThanToken | GreaterThanOrEqualToken | 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;
@@ -629,8 +661,10 @@ 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;
+declare function renderToken(token: Token, options?: RenderOptions, reducer?: (acc: string, curr: Token) => string): string;
 
 declare const combinators: string[];
 declare function minify(ast: AstNode, options?: ParserOptions, recursive?: boolean): AstNode;
@@ -661,4 +695,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/lib/ast/minify.js

@@ -344,6 +344,17 @@ function minify(ast, options = {}, recursive = false) {
                     continue;
                     // }
                 }
+                // @ts-ignore
+                if (hasDeclaration(node)) {
+                    // @ts-ignore
+                    minifyRule(node);
+                }
+                else {
+                    minify(node, options, recursive);
+                }
+                previous = node;
+                nodeIndex = i;
+                continue;
             }
             // @ts-ignore
             if (node.typ == 'Rule') {

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,8 @@ class PropertyMap {
                                 i--;
                                 continue;
                             }
-                            if (matchType(acc[i], props)) {
+                            // @ts-ignore
+                            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 +190,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 +204,40 @@ 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;
+                        }
+                        // @ts-ignore
+                        match = val.typ == 'Comment' || matchType(val, curr[1]);
+                        if (isShorthand) {
+                            isShorthand = match;
+                        }
+                        // @ts-ignore
+                        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);
+                        }
+                        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 +246,12 @@ 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);
+            }) ||
+                // @ts-ignore
+                !Object.values(tokens).every(v => v.filter(t => t.typ != 'Comment').length == count)) {
                 // @ts-ignore
                 iterable = this.declarations.values();
             }

package/dist/lib/parser/parse.js

@@ -5,6 +5,7 @@ import { minify, combinators } from '../ast/minify.js';
 import { tokenize } from './tokenize.js';
 
 const urlTokenMatcher = /^(["']?)[a-zA-Z0-9_/.-][a-zA-Z0-9_/:.#?-]+(\1)$/;
+const trimWhiteSpace = ['Gt', 'Gte', 'Lt', 'Lte'];
 const funcLike = ['Start-parens', 'Func', 'UrlFunc', 'Pseudo-class-func'];
 /**
  *
@@ -51,6 +52,10 @@ async function parse(iterator, opt = {}) {
         let tokens = results.map(mapToken);
         let i;
         let loc;
+        // if ((<Token>tokens.at(-1))?.typ == 'EOF') {
+        //
+        //     tokens.pop();
+        // }
         for (i = 0; i < tokens.length; i++) {
             if (tokens[i].typ == 'Comment') {
                 // @ts-ignore
@@ -169,7 +174,7 @@ async function parse(iterator, opt = {}) {
             // https://www.w3.org/TR/css-nesting-1/#conditionals
             // allowed nesting at-rules
             // there must be a top level rule in the stack
-            const raw = tokens.reduce((acc, curr) => {
+            const raw = parseTokens(tokens, { minify: options.minify }).reduce((acc, curr) => {
                 acc.push(renderToken(curr, { removeComments: true }));
                 return acc;
             }, []);
@@ -200,8 +205,8 @@ async function parse(iterator, opt = {}) {
                 const uniq = new Map;
                 parseTokens(tokens, { minify: options.minify }).reduce((acc, curr, index, array) => {
                     if (curr.typ == 'Whitespace') {
-                        if (array[index - 1]?.typ == 'Gt' ||
-                            array[index + 1]?.typ == 'Gt' ||
+                        if (trimWhiteSpace.includes(array[index - 1]?.typ) ||
+                            trimWhiteSpace.includes(array[index + 1]?.typ) ||
                             combinators.includes(array[index - 1]?.val) ||
                             combinators.includes(array[index + 1]?.val)) {
                             return acc;
@@ -389,13 +394,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) {
@@ -405,7 +410,7 @@ function getTokenType(val, hint) {
         return ([
             'Whitespace', 'Semi-colon', 'Colon', 'Block-start',
             'Block-start', 'Attr-start', 'Attr-end', 'Start-parens', 'End-parens',
-            'Comma', 'Gt', 'Lt'
+            'Comma', 'Gt', 'Lt', 'Gte', 'Lte', 'EOF'
         ].includes(hint) ? { typ: hint } : { typ: hint, val });
     }
     if (val == ' ') {
@@ -533,11 +538,12 @@ function parseTokens(tokens, options = {}) {
         const t = tokens[i];
         if (t.typ == 'Whitespace' && ((i == 0 ||
             i + 1 == tokens.length ||
-            ['Comma'].includes(tokens[i + 1].typ) ||
+            ['Comma', 'Gte', 'Lte'].includes(tokens[i + 1].typ)) ||
             (i > 0 &&
-                tokens[i + 1]?.typ != 'Literal' &&
-                funcLike.includes(tokens[i - 1].typ) &&
-                !['var', 'calc'].includes(tokens[i - 1].val))))) {
+                // tokens[i + 1]?.typ != 'Literal' ||
+                // funcLike.includes(tokens[i - 1].typ) &&
+                // !['var', 'calc'].includes((<FunctionToken>tokens[i - 1]).val)))) &&
+                trimWhiteSpace.includes(tokens[i - 1].typ)))) {
             tokens.splice(i--, 1);
             continue;
         }
@@ -654,7 +660,7 @@ function parseTokens(tokens, options = {}) {
                     let m = t.chi.length;
                     while (m-- > 0) {
                         // @ts-ignore
-                        if (t.chi[m].typ == 'Literal') {
+                        if (['Literal'].concat(trimWhiteSpace).includes(t.chi[m].typ)) {
                             // @ts-ignore
                             if (t.chi[m + 1]?.typ == 'Whitespace') {
                                 // @ts-ignore

package/dist/lib/parser/tokenize.js

@@ -36,11 +36,6 @@ function* tokenize(iterator) {
         }
         buffer += quoteStr;
         while (value = peek()) {
-            // if (ind >= iterator.length) {
-            //
-            //     yield pushToken(buffer, hasNewLine ? 'Bad-string' : 'Unclosed-string');
-            //     break;
-            // }
             if (value == '\\') {
                 const sequence = peek(6);
                 let escapeSequence = '';
@@ -60,9 +55,23 @@ function* tokenize(iterator) {
                     }
                     break;
                 }
+                // @ts-ignore
+                if (isNewLine(codepoint)) {
+                    if (i == 1) {
+                        buffer += value + escapeSequence.slice(0, i);
+                        next(i + 1);
+                        continue;
+                    }
+                    // else {
+                    yield pushToken(buffer + value + escapeSequence.slice(0, i), 'Bad-string');
+                    buffer = '';
+                    // }
+                    next(i + 1);
+                    break;
+                }
                 // not hex or new line
                 // @ts-ignore
-                if (i == 1 && !isNewLine(codepoint)) {
+                else if (i == 1) {
                     buffer += value + sequence[i];
                     next(2);
                     continue;
@@ -82,13 +91,6 @@ function* tokenize(iterator) {
                     next(escapeSequence.length + 1);
                     continue;
                 }
-                // buffer += value;
-                // if (ind >= iterator.length) {
-                //
-                //     // drop '\\' at the end
-                //     yield pushToken(buffer);
-                //     break;
-                // }
                 buffer += next(2);
                 continue;
             }
@@ -98,20 +100,28 @@ function* tokenize(iterator) {
                 next();
                 // i += value.length;
                 buffer = '';
-                break;
+                return;
             }
             if (isNewLine(value.charCodeAt(0))) {
                 hasNewLine = true;
             }
             if (hasNewLine && value == ';') {
-                yield pushToken(buffer, 'Bad-string');
+                yield pushToken(buffer + value, 'Bad-string');
                 buffer = '';
+                next();
                 break;
             }
             buffer += value;
-            // i += value.length;
             next();
         }
+        if (hasNewLine) {
+            yield pushToken(buffer, 'Bad-string');
+        }
+        else {
+            // EOF - 'Unclosed-string' fixed
+            yield pushToken(buffer + quote, 'String');
+        }
+        buffer = '';
     }
     function peek(count = 1) {
         if (count == 1) {
@@ -225,6 +235,11 @@ function* tokenize(iterator) {
                     yield pushToken(buffer);
                     buffer = '';
                 }
+                if (peek() == '=') {
+                    yield pushToken('', 'Lte');
+                    next();
+                    break;
+                }
                 buffer += value;
                 value = next();
                 if (ind >= iterator.length) {
@@ -293,7 +308,13 @@ function* tokenize(iterator) {
                     yield pushToken(buffer);
                     buffer = '';
                 }
-                yield pushToken('', 'Gt');
+                if (peek() == '=') {
+                    yield pushToken('', 'Gte');
+                    next();
+                }
+                else {
+                    yield pushToken('', 'Gt');
+                }
                 consumeWhiteSpace();
                 break;
             case '.':
@@ -335,7 +356,7 @@ function* tokenize(iterator) {
                 break;
             case '(':
                 if (buffer.length == 0) {
-                    yield pushToken('', 'Start-parens');
+                    yield pushToken(value);
                     break;
                 }
                 buffer += value;
@@ -449,6 +470,7 @@ function* tokenize(iterator) {
     if (buffer.length > 0) {
         yield pushToken(buffer);
     }
+    // yield pushToken('', 'EOF');
 }
 
 export { tokenize };

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

@@ -159,37 +159,30 @@ function isNumber(name) {
     return true;
 }
 function isDimension(name) {
-    let index = 0;
-    while (index++ < name.length) {
-        if (isDigit(name.charCodeAt(name.length - index))) {
-            index--;
-            break;
-        }
-        if (index == 3) {
-            break;
+    let index = name.length;
+    while (index--) {
+        if (isLetter(name.charCodeAt(index))) {
+            continue;
         }
+        index++;
+        break;
     }
-    if (index == 0 || index > 3) {
-        return false;
-    }
-    const number = name.slice(0, -index);
-    return number.length > 0 && isIdentStart(name.charCodeAt(name.length - index)) && isNumber(number);
+    const number = name.slice(0, index);
+    return number.length > 0 && isIdentStart(name.charCodeAt(index)) && isNumber(number);
 }
 function isPercentage(name) {
     return name.endsWith('%') && isNumber(name.slice(0, -1));
 }
 function parseDimension(name) {
-    let index = 0;
-    while (index++ < name.length) {
-        if (isDigit(name.charCodeAt(name.length - index))) {
-            index--;
-            break;
-        }
-        if (index == 3) {
-            break;
+    let index = name.length;
+    while (index--) {
+        if (isLetter(name.charCodeAt(index))) {
+            continue;
         }
+        index++;
+        break;
     }
-    const dimension = { typ: 'Dimension', val: name.slice(0, -index), unit: name.slice(-index) };
+    const dimension = { typ: 'Dimension', val: name.slice(0, index), unit: name.slice(index) };
     if (isAngle(dimension)) {
         // @ts-ignore
         dimension.typ = 'Angle';

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;
 }