shades - npm Package Compare versions

Comparing version 1.6.1 to 1.7.0

lib/compiler/parser.js

@@ -133,22 +133,28 @@ /*
       peg$c1 = peg$literalExpectation(".", false),
-      peg$c2 = function peg$c2(attr, next) {
+      peg$c2 = function peg$c2(attr) {
+    return attr;
+  },
+      peg$c3 = function peg$c3(attr, next) {
     return buildParseList('attr', attr, next);
   },
-      peg$c3 = "[",
-      peg$c4 = peg$literalExpectation("[", false),
-      peg$c5 = "]",
-      peg$c6 = peg$literalExpectation("]", false),
-      peg$c7 = function peg$c7(idx, next) {
+      peg$c4 = "[",
+      peg$c5 = peg$literalExpectation("[", false),
+      peg$c6 = "]",
+      peg$c7 = peg$literalExpectation("]", false),
+      peg$c8 = function peg$c8(idx, next) {
     return buildParseList('idx', idx, next);
   },
-      peg$c8 = /^[a-zA-Z]/,
-      peg$c9 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false),
-      peg$c10 = /^[a-zA-Z0-9_]/,
-      peg$c11 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_"], false, false),
-      peg$c12 = function peg$c12() {
+      peg$c9 = function peg$c9(attr) {
+    return attr;
+  },
+      peg$c10 = /^[_$a-zA-Z]/,
+      peg$c11 = peg$classExpectation(["_", "$", ["a", "z"], ["A", "Z"]], false, false),
+      peg$c12 = /^[a-zA-Z0-9_]/,
+      peg$c13 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_"], false, false),
+      peg$c14 = function peg$c14() {
     return text();
   },
-      peg$c13 = /^[0-9]/,
-      peg$c14 = peg$classExpectation([["0", "9"]], false, false),
-      peg$c15 = function peg$c15() {
+      peg$c15 = /^[0-9]/,
+      peg$c16 = peg$classExpectation([["0", "9"]], false, false),
+      peg$c17 = function peg$c17() {
     return parseInt(text());
@@ -286,15 +292,4 @@ },
   function peg$parsestart() {
-    var s0;
+    var s0, s1, s2;
 
-    s0 = peg$parseAttribute();
-    if (s0 === peg$FAILED) {
-      s0 = peg$parseIndex();
-    }
-
-    return s0;
-  }
-
-  function peg$parseAttribute() {
-    var s0, s1, s2, s3;
-
     s0 = peg$currPos;
@@ -310,14 +305,11 @@ if (input.charCodeAt(peg$currPos) === 46) {
     }
+    if (s1 === peg$FAILED) {
+      s1 = null;
+    }
     if (s1 !== peg$FAILED) {
-      s2 = peg$parseId();
+      s2 = peg$parseAttribute();
       if (s2 !== peg$FAILED) {
-        s3 = peg$parseTail();
-        if (s3 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c2(s2, s3);
-          s0 = s1;
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
+        peg$savedPos = s0;
+        s1 = peg$c2(s2);
+        s0 = s1;
       } else {
@@ -331,2 +323,5 @@ peg$currPos = s0;
     }
+    if (s0 === peg$FAILED) {
+      s0 = peg$parseIndex();
+    }
 
@@ -336,2 +331,25 @@ return s0;
 
+  function peg$parseAttribute() {
+    var s0, s1, s2;
+
+    s0 = peg$currPos;
+    s1 = peg$parseId();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseTail();
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$c3(s1, s2);
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
   function peg$parseIndex() {
@@ -342,3 +360,3 @@ var s0, s1, s2, s3, s4;
     if (input.charCodeAt(peg$currPos) === 91) {
-      s1 = peg$c3;
+      s1 = peg$c4;
       peg$currPos++;
@@ -348,3 +366,3 @@ } else {
       if (peg$silentFails === 0) {
-        peg$fail(peg$c4);
+        peg$fail(peg$c5);
       }
@@ -356,3 +374,3 @@ }
         if (input.charCodeAt(peg$currPos) === 93) {
-          s3 = peg$c5;
+          s3 = peg$c6;
           peg$currPos++;
@@ -362,3 +380,3 @@ } else {
           if (peg$silentFails === 0) {
-            peg$fail(peg$c6);
+            peg$fail(peg$c7);
           }
@@ -370,3 +388,3 @@ }
             peg$savedPos = s0;
-            s1 = peg$c7(s2, s4);
+            s1 = peg$c8(s2, s4);
             s0 = s1;
@@ -394,5 +412,28 @@ } else {
   function peg$parseTail() {
-    var s0;
+    var s0, s1, s2;
 
-    s0 = peg$parseAttribute();
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 46) {
+      s1 = peg$c0;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$c1);
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseAttribute();
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$c9(s2);
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
     if (s0 === peg$FAILED) {
@@ -412,3 +453,3 @@ s0 = peg$parseIndex();
     s0 = peg$currPos;
-    if (peg$c8.test(input.charAt(peg$currPos))) {
+    if (peg$c10.test(input.charAt(peg$currPos))) {
       s1 = input.charAt(peg$currPos);
@@ -419,3 +460,3 @@ peg$currPos++;
       if (peg$silentFails === 0) {
-        peg$fail(peg$c9);
+        peg$fail(peg$c11);
       }
@@ -425,3 +466,3 @@ }
       s2 = [];
-      if (peg$c10.test(input.charAt(peg$currPos))) {
+      if (peg$c12.test(input.charAt(peg$currPos))) {
         s3 = input.charAt(peg$currPos);
@@ -432,3 +473,3 @@ peg$currPos++;
         if (peg$silentFails === 0) {
-          peg$fail(peg$c11);
+          peg$fail(peg$c13);
         }
@@ -438,3 +479,3 @@ }
         s2.push(s3);
-        if (peg$c10.test(input.charAt(peg$currPos))) {
+        if (peg$c12.test(input.charAt(peg$currPos))) {
           s3 = input.charAt(peg$currPos);
@@ -445,3 +486,3 @@ peg$currPos++;
           if (peg$silentFails === 0) {
-            peg$fail(peg$c11);
+            peg$fail(peg$c13);
           }
@@ -452,3 +493,3 @@ }
         peg$savedPos = s0;
-        s1 = peg$c12();
+        s1 = peg$c14();
         s0 = s1;
@@ -472,3 +513,3 @@ } else {
     s1 = [];
-    if (peg$c13.test(input.charAt(peg$currPos))) {
+    if (peg$c15.test(input.charAt(peg$currPos))) {
       s2 = input.charAt(peg$currPos);
@@ -479,3 +520,3 @@ peg$currPos++;
       if (peg$silentFails === 0) {
-        peg$fail(peg$c14);
+        peg$fail(peg$c16);
       }
@@ -486,3 +527,3 @@ }
         s1.push(s2);
-        if (peg$c13.test(input.charAt(peg$currPos))) {
+        if (peg$c15.test(input.charAt(peg$currPos))) {
           s2 = input.charAt(peg$currPos);
@@ -493,3 +534,3 @@ peg$currPos++;
           if (peg$silentFails === 0) {
-            peg$fail(peg$c14);
+            peg$fail(peg$c16);
           }
@@ -503,3 +544,3 @@ }
       peg$savedPos = s0;
-      s1 = peg$c15();
+      s1 = peg$c17();
     }
@@ -506,0 +547,0 @@ s0 = s1;

lib/utils/logical/index.js

@@ -44,6 +44,6 @@ 'use strict';
     return function (obj) {
-        return (typeof pattern === 'undefined' ? 'undefined' : _typeof(pattern)) === 'object' && pattern !== null ? (0, _list.every)(Object.keys(pattern).map(function (key) {
-            return _typeof(pattern[key]) === 'object' && _typeof(obj[key]) === 'object' && pattern[key] !== null ? has(pattern[key])(obj[key]) : (0, _isEqual2.default)(obj[key], pattern[key]);
-        })) : (0, _isEqual2.default)(pattern, obj);
+        return pattern && (typeof pattern === 'undefined' ? 'undefined' : _typeof(pattern)) === 'object' ? (0, _list.every)(Object.keys(pattern).map(function (key) {
+            return has(pattern[key])(obj[key]);
+        })) : typeof pattern === 'function' ? pattern(obj) : (0, _isEqual2.default)(pattern, obj);
     };
 };

package.json

 {
   "name": "shades",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "Lens-like functionality with a lodash-style interface.",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

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

Improved metrics

Total package byte prevSize

86191

increased by0.88%

Lines of code

1101

increased by3.87%

No dependency changes