css-tree - npm Package Compare versions

Comparing version 1.0.0-alpha2 to 1.0.0-alpha3

lib/index.js

@@ -16,2 +16,3 @@ var walkers = require('./utils/walk');
     walkRulesRight: walkers.rulesRight,
+    walkDeclarations: walkers.declarations,
 
@@ -18,0 +19,0 @@ translate: require('./utils/translate.js'),

lib/syntax/error.js

@@ -38,2 +38,4 @@ var stringifySyntax = require('./stringify');
     error.css = css;
+    error.line = badNode && badNode.info ? badNode.info.line : 1;
+    error.column = badNode && badNode.info ? badNode.info.column : 1;
     error.offset = errorOffset;
@@ -40,0 +42,0 @@ error.message = message + '\n' +

lib/syntax/match.js

@@ -197,17 +197,2 @@ var List = require('../utils/list');
 
-            case 'Type':
-                var typeSyntax = syntax.getType(syntaxNode.name);
-                if (!typeSyntax) {
-                    throw new Error('Unknown syntax type `' + syntaxNode.name + '`');
-                }
-
-                var res = typeSyntax.match(node);
-                if (!res || !res.match) {
-                    break mismatch;
-                }
-
-                result.push(res.match);
-                node = res.next;
-                break;
-
             case 'Function':
@@ -255,2 +240,31 @@ // expect a function node
 
+            case 'Parentheses':
+                if (!node || node.data.type !== 'Parentheses') {
+                    break mismatch;
+                }
+
+                var res = match(syntax, syntaxNode.sequence, node.data.sequence.head);
+                if (!res || !res.match || res.next) {
+                    break mismatch;
+                }
+
+                result.push(res.match);
+                node = res.next;
+                break;
+
+            case 'Type':
+                var typeSyntax = syntax.getType(syntaxNode.name);
+                if (!typeSyntax) {
+                    throw new Error('Unknown syntax type `' + syntaxNode.name + '`');
+                }
+
+                var res = typeSyntax.match(node);
+                if (!res || !res.match) {
+                    break mismatch;
+                }
+
+                result.push(res.match);
+                node = res.next;
+                break;
+
             case 'Property':
@@ -257,0 +271,0 @@ var propertySyntax = syntax.getProperty(syntaxNode.name);

lib/syntax/syntax.js

@@ -82,2 +82,3 @@ var MatchError = require('./error').MatchError;
 
+    lastMatchError: null,
     match: function(propertyName, value) {
@@ -96,3 +97,4 @@ var property = names.property(propertyName);
         if (!propertySyntax) {
-            throw new Error('Unknown property: ' + propertyName);
+            this.lastMatchError = Error('Unknown property: ' + propertyName);
+            return null;
         }
@@ -105,3 +107,4 @@
             if (!result || !result.match) {
-                throw new MatchError('Mismatch', propertySyntax.syntax, value, result.next);
+                this.lastMatchError = MatchError('Mismatch', propertySyntax.syntax, value, result.next);
+                return null;
             }
@@ -111,5 +114,7 @@ }
         if (result.next) {
-            throw new MatchError('Uncomplete match', propertySyntax.syntax, value, result.next);
+            this.lastMatchError = MatchError('Uncomplete match', propertySyntax.syntax, value, result.next);
+            return null;
         }
 
+        this.lastMatchError = null;
         return result.match;
@@ -116,0 +121,0 @@ },

lib/utils/walk.js

@@ -52,2 +52,31 @@ function walkRules(node, item, list) {
 
+function walkDeclarations(node) {
+    switch (node.type) {
+        case 'StyleSheet':
+            var oldStylesheet = this.stylesheet;
+            this.stylesheet = node;
+
+            node.rules.each(walkDeclarations, this);
+
+            this.stylesheet = oldStylesheet;
+            break;
+
+        case 'Atrule':
+            if (node.block !== null && node.block.type === 'StyleSheet') {
+                walkDeclarations.call(this, node.block);
+            }
+            break;
+
+        case 'Ruleset':
+            this.ruleset = node;
+
+            if (node.block !== null) {
+                node.block.declarations.each(this.fn);
+            }
+
+            this.ruleset = null;
+            break;
+    }
+}
+
 function walkAll(node, item, list) {
@@ -190,3 +219,6 @@ switch (node.type) {
         walkRulesRight.call(createContext(root, fn), root);
+    },
+    declarations: function(root, fn) {
+        walkDeclarations.call(createContext(root, fn), root);
     }
 };

package.json

 {
   "name": "css-tree",
-  "version": "1.0.0-alpha2",
+  "version": "1.0.0-alpha3",
   "description": "Detailed CSS parser",
@@ -5,0 +5,0 @@ "keywords": [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

557061

increased by0.63%

Lines of code

13019

increased by0.34%

Number of medium supply chain risk alerts

0

decreased by-100%

No dependency changes