From 5c2adf2c503820c21b2d1890133fc13efbb197b4 Mon Sep 17 00:00:00 2001
From: solufa <solufa2020@gmail.com>
Date: Thu, 30 Jul 2020 09:35:25 +0900
Subject: [PATCH] feat: update aspida

---
 .github/workflows/nodejs.yml | 13 +++++++--
 .gitignore                   |  3 ++
 __tests__/index.spec.ts      | 20 ++++++--------
 package.json                 |  2 +-
 src/buildTemplate.ts         | 17 ++----------
 src/buildV3.ts               |  7 +----
 src/cli.ts                   | 15 ++++++++++
 src/cli/build.ts             | 53 ------------------------------------
 src/cli/command.ts           |  9 ------
 src/cli/index.ts             | 31 ---------------------
 src/getConfig.ts             | 10 ++++---
 src/index.ts                 | 31 ++++++++++++++++++---
 src/writeRouteFile.ts        | 30 +++++++++++---------
 tsconfig.json                |  2 +-
 yarn.lock                    | 18 ++++++------
 15 files changed, 101 insertions(+), 160 deletions(-)
 create mode 100644 src/cli.ts
 delete mode 100644 src/cli/build.ts
 delete mode 100644 src/cli/command.ts
 delete mode 100644 src/cli/index.ts

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 6d7c42b5..438e4856 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -4,13 +4,18 @@ on: push
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    name: "Test on Node:${{ matrix.node-version }} OS:${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        node-version: [12, 14]
+        os: [windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js
+      - name: setup Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
-          node-version: "12.x"
+          node-version: ${{ matrix.node-version }}
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -23,9 +28,11 @@ jobs:
             ${{ runner.os }}-yarn-
       - run: yarn --frozen-lockfile
       - run: yarn lint
+        if: matrix.os != 'windows-latest'
       - run: yarn typecheck
       - run: yarn test --coverage
       - run: npx codecov
+        if: github.ref == 'refs/heads/master' && matrix.os == 'ubuntu-latest' && matrix.node-version == 14
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
diff --git a/.gitignore b/.gitignore
index f06235c4..ec52b072 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 node_modules
 dist
+test2
+reference
+aspida.taichi.config.js
diff --git a/__tests__/index.spec.ts b/__tests__/index.spec.ts
index 3a4684cf..a5b59995 100644
--- a/__tests__/index.spec.ts
+++ b/__tests__/index.spec.ts
@@ -1,25 +1,23 @@
 import fs from 'fs'
-import getConfig from '../src/getConfig'
-import buildFromScript from '../src'
+import { ConfigFile } from '../src/getConfig'
+import build from '../src'
 
 describe('cli test', () => {
   beforeAll(() => fs.mkdirSync('_samples'))
-  afterAll(fn => fs.rmdir('_samples', { recursive: true }, fn))
+  afterAll(() => fs.promises.rmdir('_samples', { recursive: true }))
 
   test('main', () => {
-    const configs = getConfig('aspida.config.js')
+    const configs: ConfigFile[] = require('../aspida.config.js')
 
     return Promise.all(
       configs.map(async config => {
-        const outputDir = `_${config.output}`
-        await buildFromScript({
+        await build({
           ...config,
-          input: config.input,
-          output: outputDir
-        })
+          input: `_${config.input}`
+        })[0]
 
-        expect(fs.readFileSync(`${outputDir}/$api.ts`, 'utf8')).toBe(
-          fs.readFileSync(`${config.output}/$api.ts`, 'utf8')
+        expect(fs.readFileSync(`_${config.input}/$api.ts`, 'utf8')).toBe(
+          fs.readFileSync(`${config.input}/$api.ts`, 'utf8').replace(/\r/g, '')
         )
       })
     )
diff --git a/package.json b/package.json
index 47e54a86..7bf277b0 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "swagger"
   ],
   "dependencies": {
-    "aspida": "^0.19.2",
+    "aspida": "^0.20.2",
     "swagger-parser": "^10.0.1",
     "swagger2openapi": "^6.2.1"
   },
diff --git a/src/buildTemplate.ts b/src/buildTemplate.ts
index 04b81d38..12e0769e 100644
--- a/src/buildTemplate.ts
+++ b/src/buildTemplate.ts
@@ -2,24 +2,11 @@ import { parse } from 'swagger-parser'
 import { OpenAPI, OpenAPIV3 } from 'openapi-types'
 import buildV3 from './buildV3'
 import resolveExternalRefs from './resolveExternalRefs'
-
-export type Template = {
-  baseURL: string
-  types: string | null
-  files: {
-    file: string[]
-    methods: string
-  }[]
-}
+import { Config } from './getConfig'
 
 const isV3 = (openapi: OpenAPI.Document): openapi is OpenAPIV3.Document => 'openapi' in openapi
 
-export default async (
-  input: string | OpenAPI.Document,
-  isYaml: boolean,
-  needsMock: boolean,
-  needsMockType: boolean
-): Promise<Template> => {
+export default async ({ input, isYaml, needsMock, needsMockType }: Config) => {
   const openapi = await parse(input, { parse: { json: !isYaml } })
   const docs = isV3(openapi)
     ? openapi
diff --git a/src/buildV3.ts b/src/buildV3.ts
index 9efa0475..a55157e9 100644
--- a/src/buildV3.ts
+++ b/src/buildV3.ts
@@ -1,5 +1,4 @@
 import { OpenAPIV3 } from 'openapi-types'
-import { Template } from './buildTemplate'
 import { isRefObject, $ref2Type, getPropertyName, schema2value } from './builderUtils/converters'
 import { props2String, Prop, PropValue, value2String } from './builderUtils/props2String'
 import { resolveParamsRef, resolveResRef, resolveReqRef } from './builderUtils/resolvers'
@@ -15,11 +14,7 @@ const getParamsList = (
   params?: (OpenAPIV3.ReferenceObject | OpenAPIV3.ParameterObject)[]
 ) => params?.map(p => (isRefObject(p) ? resolveParamsRef(openapi, p.$ref) : p)) || []
 
-export default (
-  openapi: OpenAPIV3.Document,
-  needsMock: boolean,
-  needsMockType: boolean
-): Template => {
+export default (openapi: OpenAPIV3.Document, needsMock: boolean, needsMockType: boolean) => {
   const files: { file: string[]; methods: string }[] = []
   const schemas = schemas2Props(openapi.components?.schemas, openapi) || []
   const parameters = parameters2Props(openapi.components?.parameters, openapi) || []
diff --git a/src/cli.ts b/src/cli.ts
new file mode 100644
index 00000000..c2e3cb11
--- /dev/null
+++ b/src/cli.ts
@@ -0,0 +1,15 @@
+import minimist from 'minimist'
+import build from '.'
+
+export const run = (args: string[]) => {
+  const argv = minimist(args, {
+    string: ['version', 'input', 'config'],
+    alias: { v: 'version', i: 'input', c: 'config' }
+  })
+
+  argv.version !== undefined
+    ? console.log(`v${require('../package.json').version}`)
+    : argv.input
+    ? build({ openapi: { inputFile: argv.input } })
+    : build(argv.config)
+}
diff --git a/src/cli/build.ts b/src/cli/build.ts
deleted file mode 100644
index 2b3c0d1b..00000000
--- a/src/cli/build.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import fs from 'fs'
-import { Config } from '../getConfig'
-import build, { Template } from '../buildTemplate'
-import { Command } from './command'
-
-export class CommandToBuild implements Command {
-  static getFactory(configs: Config[], io: BuildIO) {
-    return {
-      create(command: BuildCommand): Command {
-        return new CommandToBuild(command, configs, io)
-      }
-    }
-  }
-
-  // eslint-disable-next-line no-useless-constructor
-  private constructor(
-    private readonly command: BuildCommand,
-    private readonly configs: Config[],
-    private readonly io: BuildIO
-  ) {}
-
-  async exec() {
-    await Promise.all(this.configs.map(config => this.command.run(config, this.io)))
-  }
-}
-
-type BuildCommand = {
-  run(config: Config, io: BuildIO): Promise<void>
-}
-
-export type BuildIO = {
-  write(outputDir: string, trailingSlash: boolean, outputEachDir: boolean, template: Template): void
-}
-
-export class Build implements BuildCommand {
-  async run(config: Config, io: BuildIO) {
-    if (!fs.existsSync(config.output)) {
-      fs.mkdirSync(config.output)
-    } else if (fs.readdirSync(config.output).length) {
-      console.log(
-        `fatal: destination path '${config.output}' already exists and is not an empty directory.`
-      )
-      return
-    }
-
-    io.write(
-      config.output,
-      config.trailingSlash,
-      config.outputEachDir,
-      await build(config.input, config.isYaml, config.needsMock, config.needsMockType)
-    )
-  }
-}
diff --git a/src/cli/command.ts b/src/cli/command.ts
deleted file mode 100644
index 027a203e..00000000
--- a/src/cli/command.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export type Command = {
-  exec(): Promise<void> | void
-}
-
-export const nullCommand: Command = {
-  exec() {
-    // nothing to do
-  }
-}
diff --git a/src/cli/index.ts b/src/cli/index.ts
deleted file mode 100644
index 8ae95f8f..00000000
--- a/src/cli/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import minimist from 'minimist'
-import getConfig, { Config } from '../getConfig'
-import write from '../writeRouteFile'
-import { Build, CommandToBuild } from './build'
-import { Command, nullCommand } from './command'
-import { version as versionCommand } from 'aspida/dist/cli/version'
-
-const options: minimist.Opts = {
-  string: ['version', 'config', 'build'],
-  alias: { v: 'version', c: 'config', b: 'build' }
-}
-
-const getBuildCommandFactory = (configs: Config[]) => CommandToBuild.getFactory(configs, { write })
-
-export const run = (args: string[]) => {
-  const argv = minimist(args, options)
-
-  const commands: Command[] = [
-    argv.version !== undefined ? versionCommand : nullCommand,
-    argv.build !== undefined
-      ? getBuildCommandFactory(getConfig(argv.config)).create(new Build())
-      : nullCommand
-  ]
-
-  commands.forEach(c => c.exec())
-}
-
-export const buildFromScript = (config: Config | Config[]) =>
-  getBuildCommandFactory(Array.isArray(config) ? config : [config])
-    .create(new Build())
-    .exec()
diff --git a/src/getConfig.ts b/src/getConfig.ts
index a54fb6eb..89539e19 100644
--- a/src/getConfig.ts
+++ b/src/getConfig.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 import { OpenAPI } from 'openapi-types'
-import getBaseConfig, { BaseConfig } from 'aspida/dist/getConfig'
+import { AspidaConfig, getConfigs } from 'aspida/dist/commands'
 
 export type Config = {
   input: string | OpenAPI.Document
@@ -12,7 +12,7 @@ export type Config = {
   needsMockType: boolean
 }
 
-type ConfigFile = BaseConfig & {
+export type ConfigFile = AspidaConfig & {
   openapi?: {
     inputFile: string
     yaml?: boolean
@@ -35,7 +35,9 @@ const createConfig = (config: ConfigFile) => {
   }
 }
 
-export default (configPath?: string): Config[] =>
-  getBaseConfig(configPath)
+type PartialConfig = Partial<ConfigFile> | Partial<ConfigFile>[]
+
+export default (config?: PartialConfig | string): Config[] =>
+  getConfigs(config)
     .filter((c: ConfigFile) => c.openapi)
     .map(c => createConfig(c))
diff --git a/src/index.ts b/src/index.ts
index 7b23530d..797decf1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,6 +1,29 @@
-import { buildFromScript } from './cli'
-import { Config } from './getConfig'
+import fs from 'fs'
+import getConfig from './getConfig'
+import buildTemplate from './buildTemplate'
+import writeRouteFile from './writeRouteFile'
 
-export { Config }
+export default (configs?: Parameters<typeof getConfig>[0]) =>
+  getConfig(configs).map(async config => {
+    if (!fs.existsSync(config.output)) {
+      fs.mkdirSync(config.output)
+    } else if (fs.readdirSync(config.output).length) {
+      console.log(
+        `fatal: destination path '${config.output}' already exists and is not an empty directory.`
+      )
+      return
+    }
 
-export default buildFromScript
+    const { baseURL, types, files } = await buildTemplate(config)
+
+    writeRouteFile({
+      config: {
+        input: config.output,
+        baseURL,
+        outputEachDir: config.outputEachDir,
+        trailingSlash: config.trailingSlash
+      },
+      types,
+      files
+    })
+  })
diff --git a/src/writeRouteFile.ts b/src/writeRouteFile.ts
index 9937d3a8..b8c525ee 100644
--- a/src/writeRouteFile.ts
+++ b/src/writeRouteFile.ts
@@ -1,29 +1,33 @@
 import fs from 'fs'
-import aspidaBuild from 'aspida/dist/buildTemplate'
-import aspidaWrite from 'aspida/dist/writeRouteFile'
-import { Template } from './buildTemplate'
+import { build, AspidaConfig } from 'aspida/dist/commands'
 
-export default (
-  input: string,
-  trailingSlash: boolean,
-  outputEachDir: boolean,
-  { baseURL, types, files }: Template
-) => {
+export default ({
+  config,
+  types,
+  files
+}: {
+  config: AspidaConfig
+  types: string | null
+  files: {
+    file: string[]
+    methods: string
+  }[]
+}) => {
   if (types) {
-    fs.writeFileSync(`${input}/@types.ts`, types, 'utf8')
+    fs.writeFileSync(`${config.input}/@types.ts`, types, 'utf8')
   }
 
   files.forEach(p => {
     const fileName = p.file.pop()
     p.file.forEach((_d, i, dirList) => {
-      const dirPath = `${input}/${dirList.slice(0, i + 1).join('/')}`
+      const dirPath = `${config.input}/${dirList.slice(0, i + 1).join('/')}`
       if (!fs.existsSync(dirPath)) {
         fs.mkdirSync(dirPath)
       }
     })
 
-    fs.writeFileSync(`${input}/${p.file.join('/')}/${fileName}.ts`, p.methods, 'utf8')
+    fs.writeFileSync(`${config.input}/${p.file.join('/')}/${fileName}.ts`, p.methods, 'utf8')
   })
 
-  aspidaBuild({ input, baseURL, trailingSlash, outputEachDir }).forEach(aspidaWrite)
+  build(config)
 }
diff --git a/tsconfig.json b/tsconfig.json
index b786c1e6..22597d8f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,7 @@
     "downlevelIteration": true,
     "experimentalDecorators": true,
     "esModuleInterop": true,
-    "lib": ["dom", "dom.iterable"],
+    "lib": ["esnext", "dom", "dom.iterable"],
     "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "dist",
diff --git a/yarn.lock b/yarn.lock
index 4abd73b5..f9633910 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -929,12 +929,12 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
-aspida@^0.19.2:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/aspida/-/aspida-0.19.2.tgz#03ea0f39a142c4c060b05f2e2d8068f6d719661c"
-  integrity sha512-GJ9aqZpP5lSYPDrUyjcVHY6zU2Q8ZkJKmy1Tefmfjr0EAUP0HVao1nzuVkp6whw6yrpeoJq5xADZmVoLS0sa8Q==
+aspida@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/aspida/-/aspida-0.20.2.tgz#766d9cb616674e8bebade9e7fccb180c09fcd37e"
+  integrity sha512-TXB75EVfOg8toIsnc+6HLjThkC+2MM8FDGIgf2xIzCgIHUfShQbvDF5Jtn2241JhJ5vBzZvgBl01Pj/74TFAWQ==
   dependencies:
-    chokidar "^3.4.0"
+    chokidar "^3.4.1"
     minimist "^1.2.5"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
@@ -1242,10 +1242,10 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-chokidar@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
-  integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
+chokidar@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.1.tgz#e905bdecf10eaa0a0b1db0c664481cc4cbc22ba1"
+  integrity sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"