@mx-space/api-client 0.7.4 → 0.8.0

package/controllers/page.ts

@@ -1,3 +1,4 @@
+import { HTTPClient } from '../core'
 import { IRequestAdapter } from '~/interfaces/adapter'
 import { IController } from '~/interfaces/controller'
 import { IRequestHandler } from '~/interfaces/request'
@@ -5,7 +6,6 @@ import { SelectFields } from '~/interfaces/types'
 import { PaginateResult } from '~/models/base'
 import { PageModel } from '~/models/page'
 import { autoBind } from '~/utils/auto-bind'
-import { HTTPClient } from '../core'
 
 declare module '../core/client' {
   interface HTTPClient<

package/controllers/post.ts

@@ -1,3 +1,4 @@
+import { HTTPClient } from '../core/client'
 import { IRequestAdapter } from '~/interfaces/adapter'
 import { IController } from '~/interfaces/controller'
 import { IRequestHandler, RequestProxyResult } from '~/interfaces/request'
@@ -5,7 +6,6 @@ import { SelectFields } from '~/interfaces/types'
 import { PaginateResult } from '~/models/base'
 import { PostModel } from '~/models/post'
 import { autoBind } from '~/utils/auto-bind'
-import { HTTPClient } from '../core/client'
 
 declare module '../core/client' {
   interface HTTPClient<

package/controllers/project.ts

@@ -1,8 +1,8 @@
+import { HTTPClient } from '../core'
+import { BaseCrudController } from './base'
 import { IRequestAdapter } from '~/interfaces/adapter'
 import { ProjectModel } from '~/models/project'
 import { autoBind } from '~/utils/auto-bind'
-import { HTTPClient } from '../core'
-import { BaseCrudController } from './base'
 
 declare module '../core/client' {
   interface HTTPClient<

package/controllers/recently.ts

@@ -1,9 +1,9 @@
+import { HTTPClient } from '../core'
 import { IRequestAdapter } from '~/interfaces/adapter'
 import { IController } from '~/interfaces/controller'
 import { IRequestHandler } from '~/interfaces/request'
 import { RecentlyModel } from '~/models/recently'
 import { autoBind } from '~/utils/auto-bind'
-import { HTTPClient } from '../core'
 
 declare module '../core/client' {
   interface HTTPClient<

package/controllers/say.ts

@@ -1,10 +1,10 @@
+import { HTTPClient } from '../core'
+import { BaseCrudController } from './base'
 import { IRequestAdapter } from '~/interfaces/adapter'
 import { IController } from '~/interfaces/controller'
 import { IRequestHandler } from '~/interfaces/request'
 import { SayModel } from '~/models/say'
 import { autoBind } from '~/utils/auto-bind'
-import { HTTPClient } from '../core'
-import { BaseCrudController } from './base'
 
 declare module '../core/client' {
   interface HTTPClient<

package/controllers/search.ts

@@ -1,3 +1,5 @@
+import { PageModel } from '..'
+import { HTTPClient } from '../core'
 import { IRequestAdapter } from '~/interfaces/adapter'
 import { IController } from '~/interfaces/controller'
 import { IRequestHandler, RequestProxyResult } from '~/interfaces/request'
@@ -5,8 +7,6 @@ import { PaginateResult } from '~/models/base'
 import { NoteModel } from '~/models/note'
 import { PostModel } from '~/models/post'
 import { autoBind } from '~/utils/auto-bind'
-import { PageModel } from '..'
-import { HTTPClient } from '../core'
 
 declare module '../core/client' {
   interface HTTPClient<

package/controllers/severless.ts

@@ -1,8 +1,8 @@
+import { HTTPClient } from '../core'
 import { IRequestAdapter } from '~/interfaces/adapter'
 import { IController } from '~/interfaces/controller'
 import { IRequestHandler } from '~/interfaces/request'
 import { autoBind } from '~/utils/auto-bind'
-import { HTTPClient } from '../core'
 
 declare module '../core/client' {
   interface HTTPClient<

package/controllers/snippet.ts

@@ -1,9 +1,9 @@
+import { HTTPClient } from '../core'
 import { IRequestAdapter } from '~/interfaces/adapter'
 import { IController } from '~/interfaces/controller'
 import { IRequestHandler } from '~/interfaces/request'
 import { SnippetModel } from '~/models/snippet'
 import { autoBind } from '~/utils/auto-bind'
-import { HTTPClient } from '../core'
 
 declare module '../core/client' {
   interface HTTPClient<

package/controllers/user.ts

@@ -1,9 +1,9 @@
+import { HTTPClient } from '../core'
 import { IRequestAdapter } from '~/interfaces/adapter'
 import { IController } from '~/interfaces/controller'
 import { IRequestHandler } from '~/interfaces/request'
 import { TLogin, UserModel } from '~/models/user'
 import { autoBind } from '~/utils/auto-bind'
-import { HTTPClient } from '../core'
 
 declare module '../core/client' {
   interface HTTPClient<
@@ -44,7 +44,7 @@ export class UserController<ResponseWrapper> implements IController {
   checkTokenValid(token: string) {
     return this.proxy.check_logged.get<{ ok: number; isGuest: boolean }>({
       params: {
-        token: 'bearer ' + token.replace(/^Bearer\s/i, ''),
+        token: `bearer ${token.replace(/^Bearer\s/i, '')}`,
       },
     })
   }

package/core/attach-request.ts

@@ -2,17 +2,17 @@ import type { HTTPClient } from '.'
 
 export function attachRequestMethod<T extends HTTPClient<any, any>>(target: T) {
   Object.defineProperty(target, '$$get', {
-    value: function (url: string, options?: any) {
+    value(url: string, options?: any) {
       // HINT: method get only accept search params;
       const { params = {} } = options
       const qs = handleSearchParams(params)
 
-      return target.instance.get(url + `${qs ? `${'?' + qs}` : ''}`)
+      return target.instance.get(`${url}${qs ? `${`?${qs}`}` : ''}`)
     },
   })
   ;(['put', 'post', 'patch', 'delete'] as const).forEach((method) => {
-    Object.defineProperty(target, '$$' + method, {
-      value: function (path: string, options?: any) {
+    Object.defineProperty(target, `$$${method}`, {
+      value(path: string, options?: any) {
         return target.instance[method](path, options)
       },
     })

package/core/client.ts

@@ -1,4 +1,7 @@
 import camelcaseKeys from 'camelcase-keys'
+import { allContollerNames } from '../controllers'
+import { attachRequestMethod } from './attach-request'
+import { RequestError } from './error'
 import {
   IAdaptorRequestResponseType,
   IRequestAdapter,
@@ -9,9 +12,7 @@ import { RequestOptions } from '~/interfaces/instance'
 import { IRequestHandler, Method } from '~/interfaces/request'
 import { Class } from '~/interfaces/types'
 import { isPlainObject } from '~/utils'
-import { allContollerNames } from '../controllers'
-import { attachRequestMethod } from './attach-request'
-import { RequestError } from './error'
+import { resolveFullPath } from '~/utils/path'
 
 const methodPrefix = '_$'
 export type { HTTPClient }
@@ -93,7 +94,7 @@ class HTTPClient<
     data?: any
     params?: any
   }) {
-    return (this as any)['$$' + String(options.method || 'get').toLowerCase()](
+    return (this as any)[`$$${String(options.method || 'get').toLowerCase()}`](
       options.url,
       options,
     ) as Promise<IAdaptorRequestResponseType<any>>
@@ -103,13 +104,6 @@ class HTTPClient<
     return this._proxy
   }
 
-  private resolveFullPath(path: string) {
-    if (!path.startsWith('/')) {
-      path = '/' + path
-    }
-    return `${this.endpoint}${path}`
-  }
-
   private buildRoute(manager: this): () => IRequestHandler<ResponseWrapper> {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     const noop = () => {}
@@ -132,18 +126,18 @@ class HTTPClient<
           if (reflectors.includes(name))
             return (withBase?: boolean) => {
               if (withBase) {
-                const path = that.resolveFullPath(route.join('/'))
+                const path = resolveFullPath(that.endpoint, route.join('/'))
                 route.length = 0
                 return path
               } else {
                 const path = route.join('/')
                 route.length = 0
-                return path.startsWith('/') ? path : '/' + path
+                return path.startsWith('/') ? path : `/${path}`
               }
             }
           if (methods.includes(name)) {
             return async (options: RequestOptions) => {
-              const url = that.resolveFullPath(route.join('/'))
+              const url = resolveFullPath(that.endpoint, route.join('/'))
               route.length = 0
               let res: Record<string, any> & { data: any }
               try {