chore(lint): fix all lint error

akameco · Nov 8, 2017 · 5d9d823 · 5d9d823
1 parent 5285144
commit 5d9d823
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 76 deletions.
diff --git a/packages/flow-execa/src/index.js b/packages/flow-execa/src/index.js
@@ -2,30 +2,21 @@
 import path from 'path'
 import execa from 'execa'
 
-export type FlowVersionInfo = {
-  semver: string,
-  binary: string,
-  build_id: string,
-}
+type TypeInfo = ?{ type: string }
 
 const noop = () => null
-
-export function getFlowBin(cwd: string) {
-  const bin = process.platform === 'win32' ? 'flow.exe' : 'flow'
-  const flowBinPath = path.join('node_modules', '.bin', bin)
-
-  return path.resolve(cwd, flowBinPath)
-}
+// eslint-disable-next-line flowtype/no-weak-types
+type JsonType = Object
 
 async function execFlow(
   cwd: string,
   params: $ReadOnlyArray<string>
-): Promise<Object> {
+): Promise<JsonType> {
   const output = await execa.stdout(getFlowBin(cwd), params).catch(noop)
   return JSON.parse(output)
 }
 
-function execFlowSync(cwd: string, params: $ReadOnlyArray<string>): Object {
+function execFlowSync(cwd: string, params: $ReadOnlyArray<string>): JsonType {
   try {
     const output = execa.sync(getFlowBin(cwd), params).stdout
     return JSON.parse(output)
@@ -34,13 +25,24 @@ function execFlowSync(cwd: string, params: $ReadOnlyArray<string>): Object {
   }
 }
 
+export function getFlowBin(cwd: string) {
+  const bin = process.platform === 'win32' ? 'flow.exe' : 'flow'
+  const flowBinPath = path.join('node_modules', '.bin', bin)
+
+  return path.resolve(cwd, flowBinPath)
+}
+
+export type FlowVersionInfo = {
+  semver: string,
+  binary: string,
+  build_id: string,
+}
+
 export async function versionInfo(cwd: string): Promise<?FlowVersionInfo> {
   const json = await execFlow(cwd, ['version', '--json']).catch(noop)
   return json
 }
 
-type TypeInfo = ?{ type: string }
-
 export async function typeAtPos(
   cwd: string,
   filePath: string,

diff --git a/packages/flow-faker/src/index.js b/packages/flow-faker/src/index.js
@@ -10,24 +10,6 @@ type Opts = {
   cwd?: string,
 }
 
-export default flowFaker
-
-async function flowFaker(
-  filePath: string,
-  { row, column, cwd = process.cwd() }: Opts
-) {
-  const ast = await getTypeFromFile(cwd, filePath, row, column)
-  return _flowFaker(ast)
-}
-
-export function flowFakerSync(
-  filePath: string,
-  { row, column, cwd = process.cwd() }: Opts
-) {
-  const ast = getTypeFromFileSync(cwd, filePath, row, column)
-  return _flowFaker(ast)
-}
-
 function _flowFaker(ast) {
   if (!ast) {
     return {}
@@ -51,44 +33,6 @@ function typeToValue(typeInfo: string | null) {
   }
 }
 
-export function createInitialStateFromTypeInfo(
-  info: Object | $ReadOnlyArray<*> | string | null
-) {
-  if (!info || typeof info === 'string') {
-    return typeToValue(info)
-  }
-
-  if (Array.isArray(info)) {
-    return []
-  }
-
-  return Object.keys(info).reduce((acc, key) => {
-    // $FlowFixMe
-    return { ...acc, [key]: createInitialStateFromTypeInfo(info[key]) }
-  }, {})
-}
-
-export function getTypeAst(input: string) {
-  const typeString = `type X = ${input}`
-
-  const ast = parse(typeString, {
-    plugins: ['flow'],
-    sourceType: 'module',
-  })
-
-  let typeAST = {}
-
-  traverse(ast, {
-    TypeAlias(nodePath) {
-      // if (nodePath.get('id').isIdentifier({ name: 'X' })) { }
-      // nodeのidは`X`が必ず保証されてる
-      typeAST = nodePath.get('right')
-    },
-  })
-
-  return typeAST
-}
-
 function getType(node) {
   const nodeType = node.type
 
@@ -144,10 +88,66 @@ function isPathLike(obj) {
   return isNodeLike(obj) && {}.hasOwnProperty.call(obj, 'node')
 }
 
+// eslint-disable-next-line import/exports-last
 export function astToObj(input: *) {
   if (isPathLike(input)) {
     input = input.node
   }
 
   return getType(input)
 }
+
+// eslint-disable-next-line flowtype/no-weak-types
+type Info = Object | $ReadOnlyArray<*> | string | null
+
+export function createInitialStateFromTypeInfo(info: Info) {
+  if (!info || typeof info === 'string') {
+    return typeToValue(info)
+  }
+
+  if (Array.isArray(info)) {
+    return []
+  }
+
+  return Object.keys(info).reduce((acc, key) => {
+    // $FlowFixMe
+    return { ...acc, [key]: createInitialStateFromTypeInfo(info[key]) }
+  }, {})
+}
+
+export function getTypeAst(input: string) {
+  const typeString = `type X = ${input}`
+
+  const ast = parse(typeString, {
+    plugins: ['flow'],
+    sourceType: 'module',
+  })
+
+  let typeAST = {}
+
+  traverse(ast, {
+    TypeAlias(nodePath) {
+      // if (nodePath.get('id').isIdentifier({ name: 'X' })) { }
+      // nodeのidは`X`が必ず保証されてる
+      typeAST = nodePath.get('right')
+    },
+  })
+
+  return typeAST
+}
+
+export default async function flowFaker(
+  filePath: string,
+  { row, column, cwd = process.cwd() }: Opts
+) {
+  const ast = await getTypeFromFile(cwd, filePath, row, column)
+  return _flowFaker(ast)
+}
+
+export function flowFakerSync(
+  filePath: string,
+  { row, column, cwd = process.cwd() }: Opts
+) {
+  const ast = getTypeFromFileSync(cwd, filePath, row, column)
+  return _flowFaker(ast)
+}
diff --git a/packages/s2s-cli/src/handlers/plugins.js b/packages/s2s-cli/src/handlers/plugins.js
@@ -14,6 +14,8 @@ import {
 import runHooks from '../hooks'
 import { formatText } from '../reporters/'
 
+const lock = new KeyLocker()
+
 type Opts = {
   eventPath: Path,
   plugin: Plugin,
@@ -46,8 +48,6 @@ export function handlePlugin(
   console.log(formatText('S2S', relativeFromCwd(eventPath), outputPath))
 }
 
-const lock = new KeyLocker()
-
 export default function handlePlugins(
   eventPath: Path,
   eventType: EventType,

diff --git a/packages/s2s-helper-get-reducer-case/src/index.js b/packages/s2s-helper-get-reducer-case/src/index.js
@@ -21,8 +21,6 @@ export default function getReducerCase(code /* : Code */) {
         return
       }
 
-      // TODO 他ファイルのアクションも受け入れる
-      // が、とりあえずs2s stackのみの動作を目指す
       if (testPath.get('object').node.name !== 'Actions') {
         return
       }