fix: bracket notation of path value types

aspida · Apr 17, 2020 · 082a4a8 · 082a4a8
1 parent 861a155
commit 082a4a8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/packages/aspida-mock/src/cli/createRouteString.ts b/packages/aspida-mock/src/cli/createRouteString.ts
@@ -1,6 +1,7 @@
 const createImportPath = (filePath: string, inputDir: string) =>
   filePath
     .replace(new RegExp(`^(.\\/)?${inputDir.replace(/^.\//, '').replace(/\/$/, '')}`), '')
+    .replace(/'/g, "\\'")
     .replace(/\.ts$/, '')
 
 const createCondition = (

diff --git a/packages/aspida/samples/$api.ts b/packages/aspida/samples/$api.ts
@@ -10,7 +10,7 @@ import { Methods as Methods5 } from './v1.1/2/_hogeId@HogeId/test-4/_fugaId'
 import { Methods as Methods6 } from './v1.1/2/_hogeId@HogeId/test-4/fuga aa'
 import { Methods as Methods7 } from './v1.1/3.1'
 import { Methods as Methods8 } from './v1.1/_articleId.json'
-import { Methods as Methods9 } from './v1.1/users/_userId@number'
+import { Methods as Methods9 } from './v1.1/users/_userId@User[\'id\']'
 import { Methods as Methods10 } from './v2.0/index'
 
 const api = <T>(client: AspidaClient<T>) => {
@@ -105,7 +105,7 @@ const api = <T>(client: AspidaClient<T>) => {
           (await client.fetch<Methods8['get']['resBody']>(prefix, `/v1.1/${val3}.json`, 'GET', option).json()).data
       }),
       users: {
-        _userId: (val4: number) => ({
+        _userId: (val4: ApiTypes.User['id']) => ({
           get: (option: { query: Methods9['get']['query'], headers: Methods9['get']['reqHeaders'], config?: T }) =>
             client.fetch<Methods9['get']['resBody']>(prefix, `/v1.1/users/${val4}`, 'GET', option).json(),
           $get: async (option: { query: Methods9['get']['query'], headers: Methods9['get']['reqHeaders'], config?: T }) =>

diff --git a/packages/aspida/samples/$mock.ts b/packages/aspida/samples/$mock.ts
@@ -3,7 +3,7 @@ import { MockClient, MockConfig } from 'aspida-mock'
 import baseMiddleware from './@middleware'
 import api from './$api'
 import mock0 from './v2.0/index'
-import mock1 from './v1.1/users/_userId@number'
+import mock1 from './v1.1/users/_userId@User[\'id\']'
 import mock2 from './v1.1/_articleId.json'
 import mock3 from './v1.1/3.1'
 import mock4 from './v1.1/2/_hogeId@HogeId/test-4/_fugaId'
@@ -13,7 +13,7 @@ import mock7 from './_sampleId.json@number'
 
 export const mockRoutes = () => [
   { path: '/v2.0', methods: mock0 },
-  { path: '/v1.1/users/_userId@number', methods: mock1 },
+  { path: '/v1.1/users/_userId@User[\'id\']', methods: mock1 },
   { path: '/v1.1/_articleId.json', methods: mock2 },
   { path: '/v1.1/3.1', methods: mock3 },
   { path: '/v1.1/2/_hogeId@HogeId/test-4/_fugaId', methods: mock4 },

diff --git a/packages/aspida/samples/@types.ts b/packages/aspida/samples/@types.ts
@@ -1 +1,5 @@
 export type HogeId = 'hoge' | 'fuga' | 'fizz' | 'buzz'
+
+export interface User {
+  id: string
+}
diff --git a/...pida/samples/v1.1/users/_userId@number.ts → .../samples/v1.1/users/_userId@User['id'].ts b/...pida/samples/v1.1/users/_userId@number.ts → .../samples/v1.1/users/_userId@User['id'].ts
diff --git a/packages/aspida/src/createTemplateValues.ts b/packages/aspida/src/createTemplateValues.ts
@@ -10,7 +10,7 @@ export default (input: string, trailingSlash: boolean) => {
     if (!methodsInterface) return ''
 
     const importName = `Methods${imports.length}`
-    imports.push(`import { Methods as ${importName} } from '${file}'`)
+    imports.push(`import { Methods as ${importName} } from '${file.replace(/'/g, "\\'")}'`)
     return createMethods(methodsInterface, indent, importName, newUrl, trailingSlash)
   }