Update utils to ES6; fix lint errors

Author: fkling

src/main.js

@@ -13,7 +13,7 @@
 import * as handlers from './handlers';
 import parse from './parse';
 import * as resolver from './resolver';
-import utils from './utils';
+import * as utils from './utils';
 
 const defaultResolver = resolver.findExportedComponentDefinition;
 const defaultHandlers = [

src/utils/docblock.js

@@ -1,21 +1,21 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2015, Facebook, Inc.
+ * All rights reserved.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
  *
+ * @flow
  */
 
 /**
  * Helper functions to work with docblock comments.
- * @flow
  */
-"use strict";
 
-var types = require('recast').types.namedTypes;
-var docletPattern = /^@(\w+)(?:$|\s((?:[^](?!^@\w))*))/gmi;
+import recast from 'recast';
+
+const DOCLET_PATTERN = /^@(\w+)(?:$|\s((?:[^](?!^@\w))*))/gmi;
 
 function parseDocblock(str) {
   var lines = str.split('\n');
@@ -29,7 +29,7 @@ function parseDocblock(str) {
  * Given a path, this function returns the closest preceding docblock if it
  * exists.
  */
-function getDocblock(path: NodePath): ?string {
+export function getDocblock(path: NodePath): ?string {
   if (path.node.comments) {
     var comments = path.node.comments.filter(function(comment) {
       return comment.leading &&
@@ -47,16 +47,13 @@ function getDocblock(path: NodePath): ?string {
  * Given a string, this functions returns an object with doclet names as keys
  * and their "content" as values.
  */
-function getDoclets(str: string): Object {
+export function getDoclets(str: string): Object {
   var doclets = Object.create(null);
-  var match = docletPattern.exec(str);
+  var match = DOCLET_PATTERN.exec(str);
 
-  for (; match; match = docletPattern.exec(str)) {
+  for (; match; match = DOCLET_PATTERN.exec(str)) {
     doclets[match[1]] = match[2] || true;
   }
 
   return doclets;
 }
-
-exports.getDocblock = getDocblock;
-exports.getDoclets = getDoclets;

src/utils/expressionTo.js

@@ -1,20 +1,21 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2015, Facebook, Inc.
+ * All rights reserved.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
  *
- */
-
-/**
  * @flow
+ *
  */
-"use strict";
 
-var resolveToValue = require('./resolveToValue');
-var types = require('recast').types.namedTypes;
+/*eslint no-loop-func: 0, no-use-before-define: 0*/
+
+import resolveToValue from './resolveToValue';
+import recast from 'recast';
+
+var {types: {namedTypes: types}} = recast;
 
 /**
  * Splits a MemberExpression or CallExpression into parts.
@@ -76,5 +77,7 @@ function toString(path: NodePath): string {
   return toArray(path).join('.');
 }
 
-exports.String = toString;
-exports.Array = toArray;
+export {
+  toString as String,
+  toArray as Array,
+}

src/utils/getMembers.js

@@ -1,26 +1,30 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2015, Facebook, Inc.
+ * All rights reserved.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  *
  */
 
+/*eslint no-labels: 0*/
+
 /**
  * Helper methods for dealing with MemberExpressions (and CallExpressions).
- * @flow
  */
-"use strict";
 
-type MemberDescriptor = {
+type MemberDescriptor = { // eslint-disable-line no-undef
   path: NodePath;
   computed: boolean;
   argumentsPath?: ?NodePath;
 }
 
-var types = require('recast').types.namedTypes;
+import recast from 'recast';
+
+var {types: {namedTypes: types}} = recast;
 
 /**
  * Given a "nested" Member/CallExpression, e.g.
@@ -34,10 +38,10 @@ var types = require('recast').types.namedTypes;
  *   {path: NodePath<42>, arguments: null, computed: false}
  * ]
  */
-function getMembers(path: NodePath): Array<MemberExpression> {
+export default function getMembers(path: NodePath): Array<MemberExpression> {
   var result = [];
   var argumentsPath = null;
-  loop: while(true) {
+  loop: while(true) { // eslint-disable-line no-constant-condition
     switch (true) {
       case types.MemberExpression.check(path.node):
         result.push({

src/utils/getNameOrValue.js

@@ -1,25 +1,24 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2015, Facebook, Inc.
+ * All rights reserved.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
  *
- */
-
-/**
  * @flow
+ *
  */
-"use strict";
 
-var types = require('recast').types.namedTypes;
+import recast from 'recast';
+
+var {types: {namedTypes: types}} = recast;
 
 /**
  * If node is an Identifier, it returns its name. If it is a literal, it returns
  * its value.
  */
-function getNameOrValue(path: NodePath, raw?: boolean): string {
+export default function getNameOrValue(path: NodePath, raw?: boolean): string {
   var node = path.node;
   switch (node.type) {
     case types.Identifier.name:
@@ -30,5 +29,3 @@ function getNameOrValue(path: NodePath, raw?: boolean): string {
       throw new TypeError('Argument must be an Identifier or a Literal');
   }
 }
-
-module.exports = getNameOrValue;

src/utils/getPropType.js

@@ -1,31 +1,31 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2015, Facebook, Inc.
+ * All rights reserved.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
  *
- */
-
-/**
  * @flow
+ *
  */
-"use strict";
 
-var getMembers = require('./getMembers');
-var getPropertyName = require('./getPropertyName');
-var printValue = require('./printValue');
-var recast = require('recast');
-var resolveToValue = require('./resolveToValue');
+/*eslint no-use-before-define: 0*/
 
-var types = recast.types.namedTypes;
+
+import getMembers from './getMembers';
+import getPropertyName from './getPropertyName';
+import printValue from './printValue';
+import recast from 'recast';
+import resolveToValue from './resolveToValue';
+
+var {types: {namedTypes: types}} = recast;
 
 function getEnumValues(path) {
   return path.get('elements').map(function(elementPath) {
     return {
       value: printValue(elementPath),
-      computed: !types.Literal.check(elementPath.node)
+      computed: !types.Literal.check(elementPath.node),
     };
   });
 }
@@ -85,7 +85,7 @@ function getPropTypeShape(argumentPath) {
 function getPropTypeInstanceOf(argumentPath) {
   return {
     name: 'instanceOf',
-    value: printValue(argumentPath)
+    value: printValue(argumentPath),
   };
 }
 
@@ -98,15 +98,15 @@ var simplePropTypes = {
   string: 1,
   any: 1,
   element: 1,
-  node: 1
+  node: 1,
 };
 
 var propTypes = {
   oneOf: getPropTypeOneOf,
   oneOfType: getPropTypeOneOfType,
   instanceOf: getPropTypeInstanceOf,
   arrayOf: getPropTypeArrayOf,
-  shape: getPropTypeShape
+  shape: getPropTypeShape,
 };
 
 /**
@@ -117,7 +117,7 @@ var propTypes = {
  *
  * If there is no match, "custom" is returned.
  */
-function getPropType(path: NodePath): PropTypeDescriptor {
+export default function getPropType(path: NodePath): PropTypeDescriptor {
   var node = path.node;
   var descriptor;
   getMembers(path).some(member => {
@@ -150,5 +150,3 @@ function getPropType(path: NodePath): PropTypeDescriptor {
   }
   return descriptor;
 }
-
-module.exports = getPropType;

src/utils/getPropertyName.js

@@ -1,32 +1,26 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2015, Facebook, Inc.
+ * All rights reserved.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
  *
- */
-
-/**
  * @flow
+ *
  */
-"use strict";
 
-var getNameOrValue = require('./getNameOrValue');
-var types = require('recast').types.namedTypes;
+import getNameOrValue from './getNameOrValue';
 
 /**
  * In an ObjectExpression, the name of a property can either be an identifier
  * or a literal (or dynamic, but we don't support those). This function simply
  * returns the value of the literal or name of the identifier.
  */
-function getPropertyName(propertyPath: NodePath): string {
+export default function getPropertyName(propertyPath: NodePath): string {
   if (propertyPath.node.computed) {
     throw new TypeError('Propery name must be an Identifier or a Literal');
   }
 
   return getNameOrValue(propertyPath.get('key'), false);
 }
-
-module.exports = getPropertyName;

src/utils/getPropertyValuePath.js

@@ -1,31 +1,31 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2015, Facebook, Inc.
+ * All rights reserved.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
  *
- */
-
-/**
  * @flow
+ *
  */
-"use strict";
 
-var types = require('recast').types.namedTypes;
-var getPropertyName = require('./getPropertyName');
+import getPropertyName from './getPropertyName';
+import recast from 'recast';
+
+var {types: {namedTypes: types}} = recast;
 
 /**
  * Given an ObjectExpression, this function returns the path of the value of
  * the property with name `propertyName`.
  */
-function getPropertyValuePath(path: NodePath, propertyName: string): ?NodePath {
+export default function getPropertyValuePath(
+  path: NodePath,
+  propertyName: string
+): ?NodePath {
   types.ObjectExpression.assert(path.node);
 
   return path.get('properties')
     .filter(propertyPath => getPropertyName(propertyPath) === propertyName)
     .map(propertyPath => propertyPath.get('value'))[0];
 }
-
-module.exports = getPropertyValuePath;