fixes to esm code

brigand · Dec 30, 2017 · ea03cc8 · ea03cc8
1 parent 4be5e5d
commit ea03cc8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/index.js b/src/index.js
@@ -85,7 +85,7 @@ module.exports = function flowReactPropTypes(babel) {
         let toAdd = null;
 
         if (type === 'default') {
-          toAdd = impTemplates.default({ LOCAL: tid(local) });
+          toAdd = impTemplates.default({ NAME: tid(local), LOCAL: tid(local) });
         }
         else if (type === 'named') {
           toAdd = impTemplates.named({ LOCAL: tid(local), NAME: tid(name) });
@@ -543,7 +543,7 @@ module.exports = function flowReactPropTypes(babel) {
         //   return;
         // }
         node.specifiers.forEach((specifier) => {
-          if (specifier.importKind !== 'type') return;
+          if (node.importKind !== 'type' && specifier.importKind !== 'type') return;
 
           const typeName = specifier.type === 'ImportDefaultSpecifier'
             ? specifier.local.name
@@ -562,15 +562,15 @@ module.exports = function flowReactPropTypes(babel) {
           // https://github.com/brigand/babel-plugin-flow-react-proptypes/issues/129
           if (node.source.value === 'react' && typeName === 'ComponentType') {
 
-            const ptFunc = getFromPropTypesModule('func');
+            const ptFunc = getFromPropTypesModule(path, 'func');
             importedTypes[typeName].accessNode = ptFunc;
             return;
           }
 
           importedTypes[typeName].accessNode = t.logicalExpression(
             '||',
             getFromModule(path, { type: 'named', name: getExportNameForType(typeName), location: node.source.value }),
-            getFromPropTypesModule('func'),
+            getFromPropTypesModule(path, 'func'),
           );
         });
       }

diff --git a/src/makePropTypesAst.js b/src/makePropTypesAst.js
@@ -98,7 +98,9 @@ function makeAnyPropTypeAST() {
 }
 
 function makeObjectAstForRaw(propTypeSpec, propTypeObjects) {
-  let propTypeObject = t.identifier(propTypeSpec.value);
+  let propTypeObject = typeof propTypeSpec.value === 'string'
+    ? t.identifier(propTypeSpec.value)
+    : propTypeSpec.value;
 
   // This will just be a variable, referencing an import we
   // generated above. This variable may contain prop-types.any,
@@ -146,7 +148,6 @@ function makeObjectMergeAstForShapeIntersectRuntime(propTypeData) {
   propTypeData.properties.forEach(propTypeSpec => {
     if (propTypeSpec.type === 'raw') {
       propTypeObjects.push(makeObjectAstForRaw(propTypeSpec));
-
     }
     else if (propTypeSpec.type === 'shape') {
       propTypeObjects.push(makeObjectAstForShape(propTypeSpec));