jsx-ast-utils - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1

CHANGELOG.md

@@ -0,1 +1,6 @@
+1.1.1 / 2016-06-12
+==================
+- [fix] Better support for expressions in `TemplateLiteral` extraction.
+
+
 1.1.0 / 2016-06-10
@@ -2,0 +7,0 @@ ==================

lib/hasProp.js

@@ -9,2 +9,9 @@ 'use strict';
 exports.hasEveryProp = hasEveryProp;
+
+var _propName = require('./propName');
+
+var _propName2 = _interopRequireDefault(_propName);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var DEFAULT_OPTIONS = {
@@ -24,3 +31,3 @@ spreadStrict: true,
 
-  var propName = options.ignoreCase ? prop.toUpperCase() : prop;
+  var propToCheck = options.ignoreCase ? prop.toUpperCase() : prop;
 
@@ -33,5 +40,5 @@ return props.some(function (attribute) {
 
-    var currentProp = options.ignoreCase ? attribute.name.name.toUpperCase() : attribute.name.name;
+    var currentProp = options.ignoreCase ? (0, _propName2.default)(attribute).toUpperCase() : (0, _propName2.default)(attribute);
 
-    return propName === currentProp;
+    return propToCheck === currentProp;
   });
@@ -38,0 +45,0 @@ }

lib/values/expressions/TemplateLiteral.js

@@ -30,2 +30,4 @@ 'use strict';
       return part.name === 'undefined' ? raw : raw + '{' + part.name + '}';
+    } else if (type.indexOf('Expression') > -1) {
+      return raw + '{' + type + '}';
     }
@@ -32,0 +34,0 @@

package.json

 {
   "name": "jsx-ast-utils",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "AST utility module for statically analyzing JSX",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

src/hasProp.js

@@ -0,1 +1,3 @@
+import propName from './propName';
+
 const DEFAULT_OPTIONS = {
@@ -11,3 +13,3 @@ spreadStrict: true,
 export default function hasProp(props = [], prop = '', options = DEFAULT_OPTIONS) {
-  const propName = options.ignoreCase ? prop.toUpperCase() : prop;
+  const propToCheck = options.ignoreCase ? prop.toUpperCase() : prop;
 
@@ -21,6 +23,6 @@ return props.some(attribute => {
     const currentProp = options.ignoreCase ?
-      attribute.name.name.toUpperCase() :
-      attribute.name.name;
+      propName(attribute).toUpperCase() :
+      propName(attribute);
 
-    return propName === currentProp;
+    return propToCheck === currentProp;
   });
@@ -27,0 +29,0 @@ }

src/values/expressions/TemplateLiteral.js

@@ -24,2 +24,4 @@ /**
       return part.name === 'undefined' ? raw : `${raw}{${part.name}}`;
+    } else if (type.indexOf('Expression') > -1) {
+      return `${raw}{${type}}`;
     }
@@ -26,0 +28,0 @@

tests/src/getPropLiteralValue.js

@@ -21,2 +21,15 @@ /* eslint-env mocha */
 
+  it('should throw error when trying to get value from unknown node type', () => {
+    const prop = {
+      type: 'JSXAttribute',
+      value: {
+        type: 'JSXExpressionContainer',
+      },
+    };
+
+    assert.throws(() => {
+      getLiteralPropValue(prop);
+    }, Error);
+  });
+
   describe('Null', () => {
@@ -23,0 +36,0 @@ it('should return true when no value is given', () => {

tests/src/getPropValue.js

@@ -21,2 +21,15 @@ /* eslint-env mocha */
 
+  it('should throw error when trying to get value from unknown node type', () => {
+    const prop = {
+      type: 'JSXAttribute',
+      value: {
+        type: 'JSXExpressionContainer',
+      },
+    };
+
+    assert.throws(() => {
+      getPropValue(prop);
+    }, Error);
+  });
+
   describe('Null', () => {
@@ -192,2 +205,20 @@ it('should return true when no value is given', () => {
     });
+
+    it('should return template literal with expression type wrapped in curly braces', () => {
+      const prop = extractProp('<div foo={`bar ${baz()}`} />');
+
+      const expected = 'bar {CallExpression}';
+      const actual = getPropValue(prop);
+
+      assert.equal(expected, actual);
+    });
+
+    it('should ignore non-expressions in the template literal', () => {
+      const prop = extractProp('<div foo={`bar ${<baz />}`} />');
+
+      const expected = 'bar ';
+      const actual = getPropValue(prop);
+
+      assert.equal(expected, actual);
+    });
   });
@@ -194,0 +225,0 @@

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

99671

increased by1.7%

Lines of code

2519

increased by1.7%

No dependency changes