insert import flow-runtime after other imports, fixes #26

gajus · Jan 16, 2017 · a1e84b6 · a1e84b6
1 parent 852104b
commit a1e84b6
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 14 deletions.
diff --git a/...s/babel-plugin-flow-runtime/src/__tests__/__fixtures__/bugs/24-allow-import-star-react.js b/...s/babel-plugin-flow-runtime/src/__tests__/__fixtures__/bugs/24-allow-import-star-react.js
@@ -17,8 +17,8 @@ class Point extends R.Component {
 `;
 
 export const expected = `
-import t from "flow-runtime";
 import * as R from 'react';
+import t from "flow-runtime";
 
 const Props = t.type("Props", t.object(
   t.property("x", t.number()),

diff --git a/...es/babel-plugin-flow-runtime/src/__tests__/__fixtures__/importsExports/importClashName.js b/...es/babel-plugin-flow-runtime/src/__tests__/__fixtures__/importsExports/importClashName.js
@@ -6,7 +6,7 @@ export const input = `
 `;
 
 export const expected = `
-  import _t from "flow-runtime";
   import t from "babel-types";
+  import _t from "flow-runtime";
   const Demo = _t.type("Demo", _t.number());
 `;
diff --git a/...flow-runtime/src/__tests__/__fixtures__/importsExports/importFlowRuntimeReifyNoDefault.js b/...flow-runtime/src/__tests__/__fixtures__/importsExports/importFlowRuntimeReifyNoDefault.js
@@ -8,9 +8,9 @@ export const input = `
 `;
 
 export const expected = `
-  import t from "flow-runtime";
   import { reify } from "flow-runtime";
   import { Type } from "flow-runtime";
+  import t from "flow-runtime";
   const Demo = t.type("Demo", t.number());
   console.log(Demo);
 `;
diff --git a/...babel-plugin-flow-runtime/src/__tests__/__fixtures__/importsExports/simplestImportType.js b/...babel-plugin-flow-runtime/src/__tests__/__fixtures__/importsExports/simplestImportType.js
@@ -12,8 +12,8 @@ export const input = `
 `;
 
 export const expected = `
-  import t from "flow-runtime";
   import { Demo } from './simplestExportType';
+  import t from "flow-runtime";
 
   const Local = t.type("Local", t.number());
 

diff --git a/...l-plugin-flow-runtime/src/__tests__/__fixtures__/typeAssertions/modules/simplestImport.js b/...l-plugin-flow-runtime/src/__tests__/__fixtures__/typeAssertions/modules/simplestImport.js
@@ -5,9 +5,8 @@ export const input = `
 `;
 
 export const expected = `
-  import t from "flow-runtime";
-
   import {
     Demo
   } from './simplestExport';
+  import t from "flow-runtime";
 `;
diff --git a/...w-runtime/src/__tests__/__fixtures__/typeAssertions/react/reactClassWithTypeParameters.js b/...w-runtime/src/__tests__/__fixtures__/typeAssertions/react/reactClassWithTypeParameters.js
@@ -16,8 +16,8 @@ export const input = `
 `;
 
 export const expected = `
-  import t from "flow-runtime";
   import React from "react";
+  import t from "flow-runtime";
 
   const Props = t.type("Props", t.object(
     t.property("x", t.number()),

diff --git a/...ugin-flow-runtime/src/__tests__/__fixtures__/typeAssertions/react/reactImportComponent.js b/...ugin-flow-runtime/src/__tests__/__fixtures__/typeAssertions/react/reactImportComponent.js
@@ -16,8 +16,8 @@ export const input = `
 `;
 
 export const expected = `
-  import t from "flow-runtime";
   import { Component } from "react";
+  import t from "flow-runtime";
 
   const Props = t.type("Props", t.object(
     t.property("x", t.number()),

diff --git a/...-runtime/src/__tests__/__fixtures__/typeAssertions/react/reactImportComponentWithAlias.js b/...-runtime/src/__tests__/__fixtures__/typeAssertions/react/reactImportComponentWithAlias.js
@@ -16,8 +16,8 @@ export const input = `
 `;
 
 export const expected = `
-  import t from "flow-runtime";
   import { Component as C } from "react";
+  import t from "flow-runtime";
 
   const Props = t.type("Props", t.object(
     t.property("x", t.number()),

diff --git a/...-flow-runtime/src/__tests__/__fixtures__/typeAssertions/react/reactImportPureComponent.js b/...-flow-runtime/src/__tests__/__fixtures__/typeAssertions/react/reactImportPureComponent.js
@@ -16,8 +16,8 @@ export const input = `
 `;
 
 export const expected = `
-  import t from "flow-runtime";
   import { PureComponent } from "react";
+  import t from "flow-runtime";
 
   const Props = t.type("Props", t.object(
     t.property("x", t.number()),

diff --git a/...plugin-flow-runtime/src/__tests__/__fixtures__/typeAssertions/react/reactPureComponent.js b/...plugin-flow-runtime/src/__tests__/__fixtures__/typeAssertions/react/reactPureComponent.js
@@ -16,8 +16,8 @@ export const input = `
 `;
 
 export const expected = `
-  import t from "flow-runtime";
   import React from "react";
+  import t from "flow-runtime";
 
   const Props = t.type("Props", t.object(
     t.property("x", t.number()),

diff --git a/...plugin-flow-runtime/src/__tests__/__fixtures__/typeAssertions/react/simplestReactClass.js b/...plugin-flow-runtime/src/__tests__/__fixtures__/typeAssertions/react/simplestReactClass.js
@@ -17,8 +17,8 @@ export const input = `
 `;
 
 export const expected = `
-  import t from "flow-runtime";
   import React from "react";
+  import t from "flow-runtime";
 
   const Props = t.type("Props", t.object(
     t.property("x", t.number()),

diff --git a/packages/babel-plugin-flow-runtime/src/attachImport.js b/packages/babel-plugin-flow-runtime/src/attachImport.js
@@ -10,12 +10,21 @@ export default function attachImport (context: ConversionContext, program: NodeP
     [t.importDefaultSpecifier(t.identifier(context.libraryId))],
     t.stringLiteral(context.libraryName)
   );
+  let last;
   for (const item of program.get('body')) {
-    if (item.type === 'Directive') {
+    if (item.isDirective() || item.isImportDeclaration()) {
+      last = item;
       continue;
     }
+
     item.insertBefore(importDeclaration);
     return;
   }
-  program.insertAfter(importDeclaration);
+
+  if (last) {
+    last.insertAfter(importDeclaration);
+  }
+  else {
+    program.get('body').unshiftContainer('body', importDeclaration);
+  }
 }