Merge pull request #153 from frouriojs/develop

chore(release): 0.23.1

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.23.1](https://github.com/frouriojs/frourio/compare/v0.23.0...v0.23.1) (2021-02-20)
+
+
+### Bug Fixes
+
+* basePath of root endpoint ([d269d76](https://github.com/frouriojs/frourio/commit/d269d76f4038b382baa3ffbd815ac273b8840f33))
+
 ## [0.23.0](https://github.com/frouriojs/frourio/compare/v0.22.2...v0.23.0) (2021-02-17)
 
 

__test__/index.spec.ts

@@ -11,19 +11,27 @@ import frourio from '../servers/all/$server'
 import controller from '../servers/all/api/controller'
 
 const port = 11111
+const subPort = 22222
 const baseURL = `http://localhost:${port}`
+const subBasePath = '/api'
+const subBaseURL = `http://localhost:${subPort}${subBasePath}`
 const client = api(aspida(undefined, { baseURL }))
-const fetchClient = api(aspidaFetch(undefined, { baseURL, throwHttpErrors: true }))
+const fetchClient = api(aspidaFetch(undefined, { baseURL: subBaseURL, throwHttpErrors: true }))
 let server: FastifyInstance
+let subServer: FastifyInstance
 
-beforeEach(cb => {
+beforeEach(() => {
   server = fastify()
-  return frourio(server).listen(port, cb)
+  subServer = fastify()
+  return Promise.all([
+    frourio(server).listen(port),
+    frourio(subServer, { basePath: subBasePath }).listen(subPort)
+  ])
 })
 
-afterEach(cb => {
+afterEach(() => {
   rimraf.sync('packages/frourio/servers/all/.upload')
-  server.close(cb)
+  return Promise.all([server.close(), subServer.close()])
 })
 
 test('GET: 200', () =>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "frourio",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "description": "Fast and type-safe full stack framework, for TypeScript",
   "author": "Solufa <[email protected]>",
   "license": "MIT",
@@ -94,27 +94,27 @@
     "@types/jest": "^26.0.20",
     "@types/node-fetch": "^2.5.8",
     "@types/rimraf": "^3.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.15.0",
-    "@typescript-eslint/parser": "^4.15.0",
+    "@typescript-eslint/eslint-plugin": "^4.15.1",
+    "@typescript-eslint/parser": "^4.15.1",
     "axios": "^0.21.1",
     "class-validator": "^0.13.1",
     "eslint": "^7.20.0",
     "eslint-config-prettier": "^7.2.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.1.3",
+    "eslint-plugin-jest": "^24.1.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-promise": "^4.3.1",
     "eslint-plugin-standard": "^5.0.0",
     "fastify": "^3.12.0",
     "fastify-multipart": "^4.0.0",
-    "form-data": "^3.0.0",
+    "form-data": "^4.0.0",
     "jest": "^26.6.3",
     "node-fetch": "^2.6.1",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2",
-    "standard-version": "^9.1.0",
+    "standard-version": "^9.1.1",
     "ts-jest": "^26.5.1",
     "ts-node": "^9.1.1",
     "typescript": "^4.1.5"

servers/all/$server.ts

@@ -243,7 +243,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
   fastify.register(multipart, { attachFieldsToBody: true, limits: { fileSize: 1024 ** 3 }, ...options.multipart })
 
   fastify.get(
-    `${basePath}/`,
+    basePath || '/',
     {
       schema: { response: responseSchema0.get },
       onRequest: [...hooks0.onRequest, ctrlHooks0.onRequest],
@@ -261,7 +261,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
   )
 
   fastify.post(
-    `${basePath}/`,
+    basePath || '/',
     {
       onRequest: [...hooks0.onRequest, ctrlHooks0.onRequest],
       preParsing: hooks0.preParsing,

servers/minimum/$server.ts

@@ -62,7 +62,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
   const controller0 = controllerFn0(fastify)
 
   fastify.get(
-    `${basePath}/`,
+    basePath || '/',
     {
       schema: { response: responseSchema0.get }
     },

servers/noMulter/$server.ts

@@ -111,7 +111,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
   const controller5 = controllerFn5(fastify)
 
   fastify.get(
-    `${basePath}/`,
+    basePath || '/',
     {
       onRequest: [hooks0.onRequest, ctrlHooks0.onRequest],
       preValidation: createValidateHandler(req => [
@@ -122,7 +122,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
   )
 
   fastify.post(
-    `${basePath}/`,
+    basePath || '/',
     {
       onRequest: [hooks0.onRequest, ctrlHooks0.onRequest],
       preValidation: createValidateHandler(req => [

servers/noTypedParams/$server.ts

@@ -133,7 +133,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
   fastify.register(multipart, { attachFieldsToBody: true, limits: { fileSize: 1024 ** 3 }, ...options.multipart })
 
   fastify.get(
-    `${basePath}/`,
+    basePath || '/',
     {
       onRequest: [hooks0.onRequest, ctrlHooks0.onRequest],
       preValidation: createValidateHandler(req => [
@@ -144,7 +144,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
   )
 
   fastify.post(
-    `${basePath}/`,
+    basePath || '/',
     {
       onRequest: [hooks0.onRequest, ctrlHooks0.onRequest],
       preValidation: [

servers/noValidator/$server.ts

@@ -145,15 +145,15 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
   fastify.register(multipart, { attachFieldsToBody: true, limits: { fileSize: 1024 ** 3 }, ...options.multipart })
 
   fastify.get(
-    `${basePath}/`,
+    basePath || '/',
     {
       onRequest: [hooks0.onRequest, ctrlHooks0.onRequest]
     },
     asyncMethodToHandler(controller0.get)
   )
 
   fastify.post(
-    `${basePath}/`,
+    basePath || '/',
     {
       onRequest: [hooks0.onRequest, ctrlHooks0.onRequest],
       preValidation: formatMultipartData([])

src/createControllersText.ts

@@ -509,9 +509,13 @@ ${validateInfo
                 hooksTexts.length || resSchemaMethods?.includes(m.name as LowerHttpMethod)
                   ? '\n    '
                   : ''
-              }\`\${basePath}${`/${dirPath}`
-                .replace(/\/_/g, '/:')
-                .replace(/@.+?($|\/)/g, '$1')}\`,${
+              }${
+                dirPath
+                  ? `\`\${basePath}${`/${dirPath}`
+                      .replace(/\/_/g, '/:')
+                      .replace(/@.+?($|\/)/g, '$1')}\``
+                  : "basePath || '/'"
+              },${
                 hooksTexts.length || resSchemaMethods?.includes(m.name as LowerHttpMethod)
                   ? `\n    {\n      ${
                       resSchemaMethods?.includes(m.name as LowerHttpMethod)