kbfetch 0.0.2 → 0.0.3

package/dprint.json

@@ -0,0 +1,22 @@
+{
+    "lineWidth": 180,
+    "indentWidth": 4,
+    "typescript": {
+        "semiColons": "asi",
+        "quoteStyle": "preferSingle",
+        "quoteProps": "asNeeded",
+        "useBraces": "maintain",
+        "trailingCommas": "never",
+        "operatorPosition": "maintain"
+    },
+    "json": {},
+    "markdown": {},
+    "toml": {},
+    "excludes": ["**/node_modules", "**/*-lock.json"],
+    "plugins": [
+        "https://plugins.dprint.dev/typescript-0.87.1.wasm",
+        "https://plugins.dprint.dev/json-0.17.4.wasm",
+        "https://plugins.dprint.dev/markdown-0.16.1.wasm",
+        "https://plugins.dprint.dev/toml-0.5.4.wasm"
+    ]
+}

package/help.ts

@@ -1,4 +1,8 @@
-export type AFetchInit = Omit<RequestInit, 'timeout'> & { timeout?: number }
+type Before = (init: KbFetchInit) => KbFetchInit
+type Parser = (res: Response) => any
+type After = <T = any>(res: Promise<Response & { data: T }>) => any
+type _KbFetchInit = { timeout?: number; before?: Before; parser?: Parser; after?: After; baseUrl?: string; flags?: Record<string, any> }
+export type KbFetchInit = Omit<RequestInit, 'timeout'> & _KbFetchInit
 const help = {
     synthesizeUrlWithParams: (url: string, params?: Record<string, any>) => {
         if (!params) return url
@@ -20,11 +24,7 @@ const help = {
         const contentType = res.headers.get('content-type') || ''
         if (contentType.includes('application/json')) return res.json()
         return res.text()
-    },
-    preprocessRequestInit: (init?: AFetchInit) => {
-        const { timeout, ..._init } = init || {}
-        if (timeout) return { ..._init, signal: help.createTimeoutSignal(timeout) }
-        return _init
-    },
+    }
 }
+
 export default help

package/index.ts

@@ -1,26 +1,48 @@
-import h, { AFetchInit } from './help'
-type Res<T> = Omit<Response, 'body' | 'bodyUsed'> & { data: T }
-const afetch = {
-    getResponse: <T = any>(url: string, params?: Record<string, any>, init?: AFetchInit) => {
-        url = h.synthesizeUrlWithParams(url, params)
-        return fetch(url, h.preprocessRequestInit(init)).then(async (respnse: any) => {
-            respnse.data = await h.parseResBody(respnse)
-            return respnse as unknown as Res<T>
+import h, { KbFetchInit } from './help'
+// type Res<T> = Omit<Response, 'body' | 'bodyUsed'> & { data: T }
+// before after create
+const defaultKbFetch = {
+    baseUrl: '',
+    before: (init: KbFetchInit) => init,
+    after: (res: Promise<Response & { data: any }>) => res.then(res => res.data) as any,
+    parser: h.parseResBody,
+    timeout: 0,
+    do: async function<T = any>(url: string, init?: KbFetchInit) {
+        const _t = this
+        let { before = _t.before, ..._init } = init || {}
+        _init = before(_init)
+
+        let { parser = _t.parser, after = _t.after, baseUrl = _t.baseUrl, timeout = _t.timeout, ...requestInit } = _init
+        timeout && Object.assign(requestInit, { signal: h.createTimeoutSignal(timeout) })
+        if (!url.startsWith('http://') && !url.startsWith('https://')) url = baseUrl + url
+
+        const response = fetch(url, requestInit as any as FetchRequestInit).then(async (respnse) => {
+            ;(respnse as any).data = await parser(respnse)
+            return respnse as Response & { data: T }
         })
+        return after(response)
     },
-    get: <T = any>(url: string, params?: Record<string, any>, init?: AFetchInit) => {
-        return afetch.getResponse<T>(url, params, init).then(res => res.data)
+
+    get: function<T = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) {
+        return this.do<T>(h.synthesizeUrlWithParams(url, params), init).then(res => res.data)
     },
-    g: <T = any>(url: string, init?: AFetchInit & { params?: Record<string, any> }) => {
+
+    g: function<T = any>(url: string, init?: KbFetchInit & { params?: Record<string, any> }) {
         const { params, ..._init } = init || {}
-        return afetch.get<T>(url, params, _init)
+        return this.get<T>(url, params, _init)
     },
-    post: <T = any>(url: string, params?: Record<string, any>, init?: AFetchInit) => {
-        let _init = h.preprocessRequestInit(init)
-        _init = Object.assign({}, _init, { method: 'POST', body: JSON.stringify(params) })
-        _init.headers = Object.assign({}, _init.headers, { 'Content-Type': 'application/json' })
 
-        return fetch(url, _init).then(h.parseResBody) as Promise<T>
-    },
+    post: function<T = any>(url: string, params?: Record<string, any>, init?: KbFetchInit) {
+        const _init = Object.assign({}, init, { method: 'POST', body: JSON.stringify(params) })
+        _init.headers = Object.assign({}, _init.headers, { 'Content-Type': 'application/json' })
+        return this.do<T>(url, _init)
+    }
 }
-export default afetch
+
+export const createKbFetch = (config: Partial<typeof defaultKbFetch>) => ({ ...defaultKbFetch, ...config })
+
+const kbFetch = defaultKbFetch
+
+export default kbFetch
+
+export const afetch = defaultKbFetch

package/package.json

@@ -2,7 +2,7 @@
     "name": "kbfetch",
     "module": "index.ts",
     "type": "module",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "license": "MIT",
     "scripts": {
         "pub": " npm publish --registry https://registry.npmjs.org/ &&bun updatetaobao ",

package/test.ts

@@ -0,0 +1,16 @@
+import kbFetch, { createKbFetch } from '.'
+
+const fetch = createKbFetch({ baseUrl: 'https://api.xiaomark.com/v1/link/' })
+fetch.post('create', {
+    apikey: '0da19eee6120a83930d77f281c262284',
+    domain: 't.otth.xyz',
+    origin_url: 'https://baidu.com'
+}, {
+    after(res) {
+        return res.then(res => {
+            console.log(res, res.data, '===>')
+            if (!res.ok) return Promise.reject(res)
+            return res.data
+        })
+    }
+}).then(res => console.log(res))

package/tsconfig.json

@@ -1,22 +1,23 @@
 {
-  "compilerOptions": {
-    "lib": ["ESNext"],
-    "module": "esnext",
-    "target": "esnext",
-    "moduleResolution": "bundler",
-    "moduleDetection": "force",
-    "allowImportingTsExtensions": true,
-    "noEmit": true,
-    "composite": true,
-    "strict": true,
-    "downlevelIteration": true,
-    "skipLibCheck": true,
-    "jsx": "react-jsx",
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
-    "allowJs": true,
-    "types": [
-      "bun-types" // add Bun global
-    ]
-  }
+    "compilerOptions": {
+        "lib": ["ESNext"],
+        "module": "esnext",
+        "target": "esnext",
+        "moduleResolution": "bundler",
+        "moduleDetection": "force",
+        "allowImportingTsExtensions": true,
+        "noEmit": true,
+        "composite": true,
+        "strict": true,
+        "noImplicitAny": false,
+        "downlevelIteration": true,
+        "skipLibCheck": true,
+        "jsx": "react-jsx",
+        "allowSyntheticDefaultImports": true,
+        "forceConsistentCasingInFileNames": true,
+        "allowJs": true,
+        "types": [
+            "bun-types" // add Bun global
+        ]
+    }
 }