Merge pull request #66 from frouriojs/develop

chore(release): 0.25.0

Author: solufa

.prettierignore

@@ -0,0 +1 @@
+dist

.vscode/settings.json

@@ -3,5 +3,7 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   },
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnSave": true,
   "typescript.tsdk": "node_modules/typescript/lib"
 }

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.25.0](https://github.com/frouriojs/frourio-express/compare/v0.24.1...v0.25.0) (2021-04-22)
+
+
+### Features
+
+* add prettier-ignore comments ([b07fed1](https://github.com/frouriojs/frourio-express/commit/b07fed1bb268b8289fbf031fd19c46fa47fd0ca2))
+
 ### [0.24.1](https://github.com/frouriojs/frourio-express/compare/v0.24.0...v0.24.1) (2021-03-10)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "frourio-express",
-  "version": "0.24.1",
+  "version": "0.25.0",
   "description": "Fast and type-safe full stack framework, for TypeScript",
   "author": "Solufa <[email protected]>",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "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": "eslint --ext .js,.ts --ignore-path .gitignore . && prettier --check \"./**/*.ts\"",
     "lint:fix": "npm run lint -- --fix",
     "test": "jest",
     "typecheck": "tsc --noEmit"
@@ -46,7 +46,6 @@
       "standard",
       "plugin:@typescript-eslint/recommended",
       "plugin:jest/recommended",
-      "plugin:prettier/recommended",
       "prettier"
     ],
     "parserOptions": {
@@ -83,40 +82,39 @@
     ]
   },
   "dependencies": {
-    "aspida": "^1.6.3",
-    "fast-json-stringify": "^2.5.0",
+    "aspida": "^1.7.0",
+    "fast-json-stringify": "^2.6.0",
     "velona": "^0.7.0"
   },
   "devDependencies": {
-    "@aspida/axios": "^1.6.3",
-    "@aspida/node-fetch": "^1.6.3",
+    "@aspida/axios": "^1.7.0",
+    "@aspida/node-fetch": "^1.7.0",
     "@types/express": "^4.17.7",
-    "@types/jest": "^26.0.20",
+    "@types/jest": "^26.0.22",
     "@types/multer": "^1.4.5",
-    "@types/node-fetch": "^2.5.8",
+    "@types/node-fetch": "^2.5.10",
     "@types/rimraf": "^3.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.17.0",
-    "@typescript-eslint/parser": "^4.17.0",
+    "@typescript-eslint/eslint-plugin": "^4.22.0",
+    "@typescript-eslint/parser": "^4.22.0",
     "axios": "^0.21.1",
     "class-validator": "^0.13.1",
-    "eslint": "^7.21.0",
-    "eslint-config-prettier": "^8.1.0",
+    "eslint": "^7.24.0",
+    "eslint-config-prettier": "^8.2.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.2.0",
+    "eslint-plugin-jest": "^24.3.5",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^5.0.0",
     "express": "^4.17.1",
     "jest": "^26.6.3",
     "multer": "^1.4.2",
     "node-fetch": "^2.6.1",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2",
-    "standard-version": "^9.1.1",
-    "ts-jest": "^26.5.3",
+    "standard-version": "^9.2.0",
+    "ts-jest": "^26.5.5",
     "ts-node": "^9.1.1",
-    "typescript": "^4.2.3"
+    "typescript": "^4.2.4"
   }
 }

servers/all/$server.ts

@@ -1,45 +1,73 @@
 /* eslint-disable */
+// prettier-ignore
 import path from 'path'
+// prettier-ignore
 import express, { Express, RequestHandler, Request } from 'express'
+// prettier-ignore
 import multer, { Options } from 'multer'
+// prettier-ignore
 import { validateOrReject, ValidatorOptions } from 'class-validator'
+// prettier-ignore
 import fastJson, { Schema } from 'fast-json-stringify'
+// prettier-ignore
 import * as Validators from './validators'
+// prettier-ignore
 import hooksFn0 from './api/hooks'
+// prettier-ignore
 import hooksFn1 from './api/empty/hooks'
+// prettier-ignore
 import hooksFn2 from './api/users/hooks'
+// prettier-ignore
 import hooksFn3 from './api/users/_userId@number/_name/hooks'
+// prettier-ignore
 import controllerFn0, { hooks as ctrlHooksFn0, responseSchema as responseSchemaFn0 } from './api/controller'
+// prettier-ignore
 import controllerFn1 from './api/500/controller'
+// prettier-ignore
 import controllerFn2 from './api/empty/noEmpty/controller'
+// prettier-ignore
 import controllerFn3 from './api/multiForm/controller'
+// prettier-ignore
 import controllerFn4 from './api/texts/controller'
+// prettier-ignore
 import controllerFn5 from './api/texts/sample/controller'
+// prettier-ignore
 import controllerFn6 from './api/texts/_label@string/controller'
+// prettier-ignore
 import controllerFn7, { hooks as ctrlHooksFn1 } from './api/users/controller'
+// prettier-ignore
 import controllerFn8 from './api/users/_userId@number/controller'
+// prettier-ignore
 import controllerFn9 from './api/users/_userId@number/_name/controller'
+// prettier-ignore
 import type { ReadStream } from 'fs'
+// prettier-ignore
 import type { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida'
 
+// prettier-ignore
 export type FrourioOptions = {
   basePath?: string
   validator?: ValidatorOptions
   multer?: Options
 }
 
+// prettier-ignore
 export type MulterFile = Express.Multer.File
 
+// prettier-ignore
 type HttpStatusNoOk = 301 | 302 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 409 | 500 | 501 | 502 | 503 | 504 | 505
 
+// prettier-ignore
 type PartiallyPartial<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>
 
+// prettier-ignore
 type BaseResponse<T, U, V> = {
   status: V extends number ? V : HttpStatusOk
   body: T
   headers: U
 }
 
+// prettier-ignore
 type ServerResponse<K extends AspidaMethodParams> =
   | (K extends { resBody: K['resBody']; resHeaders: K['resHeaders'] }
   ? BaseResponse<K['resBody'], K['resHeaders'], K['status']>
@@ -53,6 +81,7 @@ type ServerResponse<K extends AspidaMethodParams> =
     >)
   | PartiallyPartial<BaseResponse<any, any, HttpStatusNoOk>, 'body' | 'headers'>
 
+// prettier-ignore
 type BlobToFile<T extends AspidaMethodParams> = T['reqFormat'] extends FormData
   ? {
       [P in keyof T['reqBody']]: Required<T['reqBody']>[P] extends Blob | ReadStream
@@ -63,6 +92,7 @@ type BlobToFile<T extends AspidaMethodParams> = T['reqFormat'] extends FormData
     }
   : T['reqBody']
 
+// prettier-ignore
 type RequestParams<T extends AspidaMethodParams> = Pick<{
   query: T['query']
   body: BlobToFile<T>
@@ -73,12 +103,14 @@ type RequestParams<T extends AspidaMethodParams> = Pick<{
   headers: Required<T>['reqHeaders'] extends {} | null ? 'headers' : never
 }['query' | 'body' | 'headers']>
 
+// prettier-ignore
 export type ServerMethods<T extends AspidaMethods, U extends Record<string, any> = {}> = {
   [K in keyof T]: (
     req: RequestParams<T[K]> & U
   ) => ServerResponse<T[K]> | Promise<ServerResponse<T[K]>>
 }
 
+// prettier-ignore
 const parseNumberTypeQueryParams = (numberTypeParams: [string, boolean, boolean][]): RequestHandler => ({ query }, res, next) => {
   for (const [key, isOptional, isArray] of numberTypeParams) {
     const param = query[key]
@@ -107,6 +139,7 @@ const parseNumberTypeQueryParams = (numberTypeParams: [string, boolean, boolean]
   next()
 }
 
+// prettier-ignore
 const parseBooleanTypeQueryParams = (booleanTypeParams: [string, boolean, boolean][]): RequestHandler => ({ query }, res, next) => {
   for (const [key, isOptional, isArray] of booleanTypeParams) {
     const param = query[key]
@@ -135,9 +168,11 @@ const parseBooleanTypeQueryParams = (booleanTypeParams: [string, boolean, boolea
   next()
 }
 
+// prettier-ignore
 const callParserIfExistsQuery = (parser: RequestHandler): RequestHandler => (req, res, next) =>
   Object.keys(req.query).length ? parser(req, res, next) : next()
 
+// prettier-ignore
 const parseJSONBoby: RequestHandler = (req, res, next) => {
   express.json()(req, res, err => {
     if (err) return res.sendStatus(400)
@@ -146,6 +181,7 @@ const parseJSONBoby: RequestHandler = (req, res, next) => {
   })
 }
 
+// prettier-ignore
 const createTypedParamsHandler = (numberTypeParams: string[]): RequestHandler => (req, res, next) => {
   const params: Record<string, string | number> = req.params
 
@@ -160,9 +196,11 @@ const createTypedParamsHandler = (numberTypeParams: string[]): RequestHandler =>
   next()
 }
 
+// prettier-ignore
 const createValidateHandler = (validators: (req: Request) => (Promise<void> | null)[]): RequestHandler =>
   (req, res, next) => Promise.all(validators(req)).then(() => next()).catch(err => res.status(400).send(err))
 
+// prettier-ignore
 const formatMulterData = (arrayTypeKeys: [string, boolean][]): RequestHandler => ({ body, files }, _res, next) => {
   for (const [key] of arrayTypeKeys) {
     if (body[key] === undefined) body[key] = []
@@ -186,6 +224,7 @@ const formatMulterData = (arrayTypeKeys: [string, boolean][]): RequestHandler =>
   next()
 }
 
+// prettier-ignore
 const methodToHandler = (
   methodCallback: ServerMethods<any, any>[LowerHttpMethod]
 ): RequestHandler => (req, res, next) => {
@@ -204,6 +243,7 @@ const methodToHandler = (
   }
 }
 
+// prettier-ignore
 const asyncMethodToHandler = (
   methodCallback: ServerMethods<any, any>[LowerHttpMethod]
 ): RequestHandler => async (req, res, next) => {
@@ -222,6 +262,7 @@ const asyncMethodToHandler = (
   }
 }
 
+// prettier-ignore
 const asyncMethodToHandlerWithSchema = (
   methodCallback: ServerMethods<any, any>[LowerHttpMethod],
   schema: { [K in HttpStatusOk]?: Schema }
@@ -261,6 +302,7 @@ const asyncMethodToHandlerWithSchema = (
   }
 }
 
+// prettier-ignore
 export default (app: Express, options: FrourioOptions = {}) => {
   const basePath = options.basePath ?? ''
   const validatorOptions: ValidatorOptions = { validationError: { target: false }, ...options.validator }

servers/all/api/$api.ts

@@ -1,16 +1,28 @@
 /* eslint-disable */
+// prettier-ignore
 import { AspidaClient, BasicHeaders, dataToURLString } from 'aspida'
+// prettier-ignore
 import { Methods as Methods0 } from '.'
+// prettier-ignore
 import { Methods as Methods1 } from './500'
+// prettier-ignore
 import { Methods as Methods2 } from './empty/noEmpty'
+// prettier-ignore
 import { Methods as Methods3 } from './multiForm'
+// prettier-ignore
 import { Methods as Methods4 } from './texts'
+// prettier-ignore
 import { Methods as Methods5 } from './texts/_label@string'
+// prettier-ignore
 import { Methods as Methods6 } from './texts/sample'
+// prettier-ignore
 import { Methods as Methods7 } from './users'
+// prettier-ignore
 import { Methods as Methods8 } from './users/_userId@number'
+// prettier-ignore
 import { Methods as Methods9 } from './users/_userId@number/_name'
 
+// prettier-ignore
 const api = <T>({ baseURL, fetch }: AspidaClient<T>) => {
   const prefix = (baseURL === undefined ? '' : baseURL).replace(/\/$/, '')
   const PATH0 = '/500'
@@ -123,5 +135,7 @@ const api = <T>({ baseURL, fetch }: AspidaClient<T>) => {
   }
 }
 
+// prettier-ignore
 export type ApiInstance = ReturnType<typeof api>
+// prettier-ignore
 export default api

servers/all/api/$relay.ts

@@ -1,31 +1,46 @@
 /* eslint-disable */
+// prettier-ignore
 import { Injectable, depend } from 'velona'
+// prettier-ignore
 import type { Express, RequestHandler } from 'express'
+// prettier-ignore
 import type { Schema } from 'fast-json-stringify'
+// prettier-ignore
 import type { HttpStatusOk } from 'aspida'
+// prettier-ignore
 import type { ServerMethods } from '../$server'
+// prettier-ignore
 import type { Methods } from './'
 
+// prettier-ignore
 type Hooks = {
   onRequest?: RequestHandler | RequestHandler[]
   preParsing?: RequestHandler | RequestHandler[]
   preValidation?: RequestHandler | RequestHandler[]
   preHandler?: RequestHandler | RequestHandler[]
 }
+// prettier-ignore
 type ControllerMethods = ServerMethods<Methods>
 
+// prettier-ignore
 export function defineResponseSchema<T extends { [U in keyof ControllerMethods]?: { [V in HttpStatusOk]?: Schema }}>(methods: () => T) {
   return methods
 }
 
+// prettier-ignore
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
+// prettier-ignore
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: T, app: Express) => U): Injectable<T, [Express], U>
+// prettier-ignore
 export function defineHooks<T extends Record<string, any>>(hooks: (app: Express) => Hooks | T, cb?: (deps: T, app: Express) => Hooks) {
   return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks
 }
 
+// prettier-ignore
 export function defineController(methods: (app: Express) => ControllerMethods): (app: Express) => ControllerMethods
+// prettier-ignore
 export function defineController<T extends Record<string, any>>(deps: T, cb: (d: T, app: Express) => ControllerMethods): Injectable<T, [Express], ControllerMethods>
+// prettier-ignore
 export function defineController<T extends Record<string, any>>(methods: (app: Express) => ControllerMethods | T, cb?: (deps: T, app: Express) => ControllerMethods) {
   return cb && typeof methods !== 'function' ? depend(methods, cb) : methods
 }