Merge pull request #173 from aspida/develop

chore(release): 0.9.0
aspida · Feb 7, 2022 · 96dec18 · 96dec18
2 parents 342eca3 + 926781f
commit 96dec18
Show file tree

Hide file tree

Showing 18 changed files with 2,097 additions and 2,873 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,7 @@
 {
   "eslint.run": "onSave",
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   },

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.9.0](https://github.com/aspida/aspida-mock/compare/v0.8.2...v0.9.0) (2022-02-07)
+
+
+### Features
+
+* insert prettier-ignore comment ([4beee14](https://github.com/aspida/aspida-mock/commit/4beee1464b61e408dbf46bc0391e509262aaa113))
+
 ### [0.8.2](https://github.com/aspida/aspida-mock/compare/v0.8.1...v0.8.2) (2020-10-02)
 
 

diff --git a/__tests__/lib/index.spec.ts b/__tests__/lib/index.spec.ts
@@ -37,6 +37,7 @@ describe('cli', () => {
       const { text, filePath } = build({
         input: config.input,
         baseURL: '',
+        outputMode: 'all',
         trailingSlash: false,
         outputEachDir: false
       })

diff --git a/api/$api.ts b/api/$api.ts
diff --git a/api/$mock.ts b/api/$mock.ts
@@ -1,28 +1,42 @@
 /* eslint-disable */
+// prettier-ignore
 import { AspidaClient } from 'aspida'
+// prettier-ignore
 import { MockClient, MockConfig, mockClient } from 'aspida-mock'
+// prettier-ignore
 import baseMiddleware from './@middleware'
+// prettier-ignore
 import api from './$api'
+// prettier-ignore
 import mock0 from './v2.0/index'
-import mock1 from './v1.1/users/_userId@User[\'id\']'
+// prettier-ignore
+import mock1 from './v1.1/users/_userId@string'
+// prettier-ignore
 import mock2 from './v1.1/_articleId.json'
+// prettier-ignore
 import mock3 from './v1.1/3.1'
-import mock4 from './v1.1/2/_hogeId@HogeId/test-4/_fugaId'
+// prettier-ignore
+import mock4 from './v1.1/2/_hogeId@string/test-4/_fugaId'
+// prettier-ignore
 import mock5 from './v1.1'
+// prettier-ignore
 import mock6 from './index'
-import mock7 from './_sampleId.json@number'
+// prettier-ignore
+import mock7 from './_sampleId@number.json'
 
+// prettier-ignore
 export const mockRoutes = () => [
   { path: '/v2.0', methods: mock0 },
-  { path: '/v1.1/users/_userId@User[\'id\']', methods: mock1 },
+  { path: '/v1.1/users/_userId@string', 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 },
+  { path: '/v1.1/2/_hogeId@string/test-4/_fugaId', methods: mock4 },
   { path: '/v1.1', methods: mock5 },
   { path: '', methods: mock6 },
-  { path: '/_sampleId.json@number', methods: mock7 }
+  { path: '/_sampleId@number.json', methods: mock7 }
 ]
 
+// prettier-ignore
 export default <U>(client: AspidaClient<U> | MockClient<U>, config?: MockConfig) => {
   const middleware = [...baseMiddleware, ...(config?.middleware || [])]
   const mock = 'attachRoutes' in client ? client : mockClient(client)

diff --git a/api/@types.ts b/api/@types.ts
diff --git a/api/_sampleId.json@number.ts → api/_sampleId@number.json.ts b/api/_sampleId.json@number.ts → api/_sampleId@number.json.ts
diff --git a/api/index.ts b/api/index.ts
@@ -1,6 +1,7 @@
 /* eslint-disable */
 import { mockMethods } from 'aspida-mock'
 
+// prettier-ignore
 export type Methods = {
   get: {
     reqHeaders?:

diff --git a/api/v1.1.ts b/api/v1.1.ts
@@ -1,5 +1,6 @@
 import { mockMethods } from 'aspida-mock'
 
+// prettier-ignore
 export type Methods = {
   get: {
     // test

diff --git a/api/v1.1/2/_hogeId@HogeId/entries.json.ts → api/v1.1/2/_hogeId@string/entries.json.ts b/api/v1.1/2/_hogeId@HogeId/entries.json.ts → api/v1.1/2/_hogeId@string/entries.json.ts
diff --git a/api/v1.1/2/_hogeId@HogeId/test-4/_fugaId.ts → api/v1.1/2/_hogeId@string/test-4/_fugaId.ts b/api/v1.1/2/_hogeId@HogeId/test-4/_fugaId.ts → api/v1.1/2/_hogeId@string/test-4/_fugaId.ts
@@ -1,5 +1,6 @@
 import { mockMethods } from 'aspida-mock'
 
+// prettier-ignore
 export type Methods = {
   get: {
     query?: { aa?: number }

diff --git a/api/v1.1/2/_hogeId@HogeId/test-4/fuga aa.ts → api/v1.1/2/_hogeId@string/test-4/fuga aa.ts b/api/v1.1/2/_hogeId@HogeId/test-4/fuga aa.ts → api/v1.1/2/_hogeId@string/test-4/fuga aa.ts
diff --git a/api/v1.1/2/_hogeId@HogeId/test-4/index.ts → api/v1.1/2/_hogeId@string/test-4/index.ts b/api/v1.1/2/_hogeId@HogeId/test-4/index.ts → api/v1.1/2/_hogeId@string/test-4/index.ts
diff --git a/api/v1.1/users/_userId@User['id'].ts → api/v1.1/users/_userId@string.ts b/api/v1.1/users/_userId@User['id'].ts → api/v1.1/users/_userId@string.ts
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aspida-mock",
-  "version": "0.8.2",
+  "version": "0.9.0",
   "description": "TypeScript friendly RESTful API mock for aspida",
   "author": "Solufa <solufa2020@gmail.com>",
   "license": "MIT",
@@ -14,8 +14,8 @@
     "release:major": "npm run release -- --release-as major",
     "release:minor": "npm run release -- --release-as minor",
     "release:patch": "npm run release -- --release-as patch",
-    "lint": "eslint --ext .js,.ts --ignore-path .gitignore .",
-    "lint:fix": "npm run lint -- --fix",
+    "lint": "eslint --ext .js,.ts --ignore-path .gitignore . && prettier --check \"./**/*.ts\"",
+    "lint:fix": "eslint --ext .js,.ts --ignore-path .gitignore . --fix && prettier --write \"./**/*.ts\"",
     "test": "jest",
     "typecheck": "tsc --noEmit"
   },
@@ -45,9 +45,7 @@
       "standard",
       "plugin:@typescript-eslint/recommended",
       "plugin:jest/recommended",
-      "plugin:prettier/recommended",
-      "prettier/@typescript-eslint",
-      "prettier/standard"
+      "prettier"
     ],
     "parserOptions": {
       "ecmaVersion": 2018,
@@ -83,24 +81,23 @@
     ]
   },
   "devDependencies": {
-    "@aspida/node-fetch": "^0.9.0",
-    "@types/jest": "^26.0.14",
-    "@typescript-eslint/eslint-plugin": "^4.3.0",
-    "@typescript-eslint/parser": "^4.3.0",
-    "eslint": "^7.10.0",
-    "eslint-config-prettier": "^6.12.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.0.2",
+    "@aspida/node-fetch": "^1.7.1",
+    "@types/jest": "^27.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.11.0",
+    "@typescript-eslint/parser": "^5.11.0",
+    "eslint": "^8.8.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jest": "^26.1.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
-    "jest": "^26.4.2",
+    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-standard": "^5.0.0",
+    "jest": "^27.5.0",
     "node-fetch": "^2.6.1",
-    "prettier": "^2.1.2",
-    "standard-version": "^9.0.0",
-    "ts-jest": "^26.4.1",
-    "typescript": "^4.0.3"
+    "prettier": "^2.5.1",
+    "standard-version": "^9.3.2",
+    "ts-jest": "^27.1.3",
+    "typescript": "^4.5.5"
   }
 }
diff --git a/src/cli/createRouteString.ts b/src/cli/createRouteString.ts
@@ -39,4 +39,4 @@ export default <U>(client: AspidaClient<U> | MockClient<U>, config?: MockConfig)
   mock.attachRoutes(mockRoutes(), ${hasMiddleware ? '{ ...config, middleware }' : 'config'})
 
   return api(mock)
-}\n`
+}\n`.replace(/\n([a-z])/g, '\n// prettier-ignore\n$1')