Merge pull request #32 from evcohen/object-assign

use object.assign to support node versions 0.10 and 0.12.

Fixes #31.

Author: ljharb

.babelrc

@@ -1,3 +1,6 @@
 {
-  "presets": ["es2015"]
+  "presets": ["env"],
+  "plugins": [
+    ["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
+  ],
 }

.travis.yml

@@ -1,11 +1,36 @@
 language: node_js
+os:
+ - linux
 node_js:
-  - 4
-  - 5
-  - 6
+  - "12"
+  - "10"
+  - "8"
+  - "6"
+  - "4"
+  - "0.12"
+  - "0.10"
 cache:
-  yarn: true
   directories:
     - node_modules
 after_success:
   - npm run coveralls
+before_install:
+  - 'case "${TRAVIS_NODE_VERSION}" in 0.*) export NPM_CONFIG_STRICT_SSL=false ;; esac'
+  - 'nvm install-latest-npm'
+install:
+  - 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ] || [ "${TRAVIS_NODE_VERSION}" = "0.9" ]; then nvm install --latest-npm 0.8 && npm install && nvm use "${TRAVIS_NODE_VERSION}"; else npm install; fi;'
+script:
+  - 'if [ -n "${PRETEST-}" ]; then npm run pretest ; fi'
+  - 'if [ -n "${TEST-}" ]; then npm run tests-only ; fi'
+sudo: false
+env:
+  - TEST=true
+matrix:
+  fast_finish: true
+  include:
+    - node_js: "lts/*"
+      env: PRETEST=true
+  allow_failures:
+    - os: osx
+    - node_js: "0.12"
+    - node_js: "0.10"

__tests__/src/getPropValue-test.js

@@ -1,7 +1,12 @@
 /* eslint-env mocha */
 /* eslint no-template-curly-in-string: 0 */
 import assert from 'assert';
-import { extractProp, changePlugins, fallbackToBabylon, describeIfNotBabylon } from '../helper';
+import {
+  extractProp,
+  changePlugins,
+  fallbackToBabylon,
+  describeIfNotBabylon,
+} from '../helper';
 import getPropValue from '../../src/getPropValue';
 
 describe('getPropValue', () => {

package.json

@@ -4,31 +4,34 @@
   "description": "AST utility module for statically analyzing JSX",
   "main": "lib/index.js",
   "scripts": {
-    "build": "rimraf lib && babel src --out-dir lib",
-    "prepublish": "npm run lint && npm run test && npm run build",
+    "prebuild": "rimraf lib",
+    "build": "babel src --out-dir lib",
+    "prepublish": "not-in-publish || (npm test && npm run build)",
     "coveralls": "cat ./reports/lcov.info | coveralls",
-    "lint": "eslint  --config .eslintrc .",
-    "lint:fix": "npm run lint -- --fix",
+    "lint": "eslint .",
     "pretest": "npm run lint",
-    "test": "jest --coverage",
+    "test": "npm run tests-only --",
+    "tests-only": "jest --coverage",
     "test:watch": "npm test -- --watch"
   },
   "devDependencies": {
-    "@babel/parser": "^7.3.2",
-    "babel-cli": "^6.14.0",
-    "babel-core": "^6.14.0",
-    "babel-eslint": "^7.0.0",
-    "babel-jest": "^20.0.0",
-    "babel-polyfill": "^6.16.0",
-    "babel-preset-es2015": "^6.14.0",
-    "babylon": "^6.17.2",
-    "coveralls": "^2.11.8",
-    "eslint": "^3.12.1",
-    "eslint-config-airbnb-base": "^11.1.0",
-    "eslint-plugin-import": "^2.2.0",
-    "jest": "^20.0.0",
+    "@babel/parser": "^7.4.4",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^7.2.3",
+    "babel-jest": "^20.0.3",
+    "babel-plugin-transform-replace-object-assign": "^1.0.0",
+    "babel-polyfill": "^6.26.0",
+    "babel-preset-env": "^1.7.0",
+    "babylon": "^6.18.0",
+    "coveralls": "^2.13.3",
+    "eslint": "^5.16.0",
+    "eslint-config-airbnb-base": "^13.1.0",
+    "eslint-plugin-import": "^2.17.2",
+    "in-publish": "^2.0.0",
+    "jest": "^20.0.4",
     "jest-cli": "^20.0.4",
-    "rimraf": "^2.5.2"
+    "rimraf": "^2.6.3"
   },
   "engines": {
     "node": ">=4.0"
@@ -56,6 +59,7 @@
     ]
   },
   "dependencies": {
-    "array-includes": "^3.0.3"
+    "array-includes": "^3.0.3",
+    "object.assign": "^4.1.0"
   }
 }

src/values/expressions/ObjectExpression.js

@@ -1,3 +1,5 @@
+import assign from 'object.assign';
+
 /**
  * Extractor function for an ObjectExpression type value node.
  * An object expression is using {}.
@@ -12,7 +14,7 @@ export default function extractValueFromObjectExpression(value) {
     // Support types: SpreadProperty and ExperimentalSpreadProperty
     if (/^(?:Experimental)?Spread(?:Property|Element)$/.test(property.type)) {
       if (property.argument.type === 'ObjectExpression') {
-        return Object.assign(object, extractValueFromObjectExpression(property.argument));
+        return assign(object, extractValueFromObjectExpression(property.argument));
       }
     } else {
       object[getValue(property.key)] = getValue(property.value);

src/values/expressions/index.js

@@ -73,8 +73,10 @@ export default function extract(value) {
   let { type } = expression;
 
   while (type === 'TSNonNullExpression' || type === 'TSAsExpression') {
-    expression = expression.expression;
-    type = expression.type;
+    ({ type } = expression);
+    if (expression.expression) {
+      ({ expression } = expression);
+    }
   }
 
   if (TYPES[type] === undefined) {