Merge pull request #330 from GreatAuk/openapi-ts-reques

feat: 更新 openapi-ts-request 1.6.7 -> 1.10.0

openapi-ts-request.config.ts

@@ -1,7 +1,8 @@
-import type { GenerateServiceProps } from 'openapi-ts-request'
+import { defineConfig } from 'openapi-ts-request'
 
-export default [
+export default defineConfig([
   {
+    describe: 'unibest-openapi-test',
     schemaPath: 'https://ukw0y1.laf.run/unibest-opapi-test.json',
     serversPath: './src/service',
     requestLibPath: `import request from '@/http/vue-query';\n import { CustomRequestOptions } from '@/http/types';`,
@@ -10,4 +11,4 @@ export default [
     reactQueryMode: 'vue',
     isGenJavaScript: false,
   },
-] as GenerateServiceProps[]
+])

package.json

@@ -160,7 +160,7 @@
     "husky": "^9.1.7",
     "lint-staged": "^15.2.10",
     "miniprogram-api-typings": "^4.1.0",
-    "openapi-ts-request": "^1.6.7",
+    "openapi-ts-request": "^1.10.0",
     "postcss": "^8.4.49",
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",

pnpm-lock.yaml

@@ -203,8 +203,8 @@ importers:
         specifier: ^4.1.0
         version: 4.1.0
       openapi-ts-request:
-        specifier: ^1.6.7
-        version: 1.7.0(@types/node@20.19.11)(@vue/compiler-sfc@3.5.22)(chokidar@3.6.0)(typescript@5.8.3)
+        specifier: ^1.10.0
+        version: 1.10.0(@types/node@20.19.11)(@vue/compiler-sfc@3.5.22)(chokidar@3.6.0)(typescript@5.8.3)
       postcss:
         specifier: ^8.4.49
         version: 8.5.6
@@ -4936,8 +4936,8 @@ packages:
     resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==}
     engines: {node: '>=12'}
 
-  openapi-ts-request@1.7.0:
-    resolution: {integrity: sha512-yXmMxcoIbqPlf1GYjWfEK6fCnsUjDV6Wt5gboAOTrfoQXjG2YCwcGKUP3Q5seRoFHHq/Fg96xNFrGf3lHWXuaQ==}
+  openapi-ts-request@1.10.0:
+    resolution: {integrity: sha512-PkyEMqGXaLirDtomEi8ThocGapeR74D16Bb2O9KMTRHQmm4EvlfXCofe4KCycBxWQUNARuodZVpZrSS2OFZ6ng==}
     engines: {node: '>=18.0.0', pnpm: '>=9'}
     hasBin: true
 
@@ -8864,9 +8864,9 @@ snapshots:
   '@trivago/prettier-plugin-sort-imports@5.2.2(@vue/compiler-sfc@3.5.22)(prettier@3.6.2)':
     dependencies:
       '@babel/generator': 7.28.3
-      '@babel/parser': 7.28.3
-      '@babel/traverse': 7.28.3
-      '@babel/types': 7.28.2
+      '@babel/parser': 7.28.4
+      '@babel/traverse': 7.28.4
+      '@babel/types': 7.28.4
       javascript-natural-sort: 0.7.1
       lodash: 4.17.21
       prettier: 3.6.2
@@ -8911,7 +8911,7 @@ snapshots:
     dependencies:
       '@types/http-cache-semantics': 4.0.4
       '@types/keyv': 3.1.4
-      '@types/node': 20.19.11
+      '@types/node': 20.19.20
       '@types/responselike': 1.0.3
 
   '@types/conventional-commits-parser@5.0.1':
@@ -8944,7 +8944,7 @@ snapshots:
 
   '@types/keyv@3.1.4':
     dependencies:
-      '@types/node': 20.19.11
+      '@types/node': 20.19.20
 
   '@types/mdast@4.0.4':
     dependencies:
@@ -8968,7 +8968,7 @@ snapshots:
 
   '@types/responselike@1.0.3':
     dependencies:
-      '@types/node': 20.19.11
+      '@types/node': 20.19.20
 
   '@types/retry@0.12.5': {}
 
@@ -12456,7 +12456,7 @@ snapshots:
 
   mockjs@1.1.0:
     dependencies:
-      commander: 12.1.0
+      commander: 13.1.0
 
   module-alias@2.2.3: {}
 
@@ -12606,8 +12606,9 @@ snapshots:
       is-docker: 2.2.1
       is-wsl: 2.2.0
 
-  openapi-ts-request@1.7.0(@types/node@20.19.11)(@vue/compiler-sfc@3.5.22)(chokidar@3.6.0)(typescript@5.8.3):
+  openapi-ts-request@1.10.0(@types/node@20.19.11)(@vue/compiler-sfc@3.5.22)(chokidar@3.6.0)(typescript@5.8.3):
     dependencies:
+      '@clack/prompts': 0.11.0
       '@prettier/sync': 0.6.1(prettier@3.6.2)
       '@trivago/prettier-plugin-sort-imports': 5.2.2(@vue/compiler-sfc@3.5.22)(prettier@3.6.2)
       axios: 1.11.0

src/pages-sub/about/components/request-openapi.vue

@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import type { UserItem } from '@/service'
+import type { InfoUsingGetResponse } from '@/service'
 import { infoUsingGet, listAllUsingGet } from '@/service'
 
 const loading = ref(false)
 const error = ref<Error | null>(null)
-const data = ref<UserItem>()
+const userInfo = ref<InfoUsingGetResponse>()
 
 // openapi 请求示例
 async function getUserInfo() {
@@ -12,12 +12,12 @@ async function getUserInfo() {
     loading.value = true
     const res = await infoUsingGet({})
     console.log(res)
-    data.value = res
+    userInfo.value = res
     error.value = null
   }
   catch (err) {
     error.value = err as Error
-    data.value = null
+    userInfo.value = null
   }
   finally {
     loading.value = false
@@ -25,7 +25,7 @@ async function getUserInfo() {
 }
 
 // openapi + useRequest 请求示例
-const { data: data2, loading: loading2, run } = useRequest(() => listAllUsingGet({}), {
+const { data: userList, loading: loading2, run } = useRequest(() => listAllUsingGet({}), {
   immediate: false,
 })
 </script>
@@ -43,7 +43,7 @@ const { data: data2, loading: loading2, run } = useRequest(() => listAllUsingGet
         请求数据如下
       </view>
       <view class="text-green leading-8">
-        {{ JSON.stringify(data) }}
+        {{ JSON.stringify(userInfo) }}
       </view>
     </view>
     <view class="my-4 text-center">
@@ -58,7 +58,7 @@ const { data: data2, loading: loading2, run } = useRequest(() => listAllUsingGet
       请求数据如下
     </view>
     <view class="text-green leading-8">
-      {{ JSON.stringify(data2) }}
+      {{ JSON.stringify(userList) }}
     </view>
   </view>
 </template>

src/service/info.ts

@@ -6,12 +6,8 @@ import { CustomRequestOptions } from '@/http/types';
 import * as API from './types';
 
 /** 用户信息 GET /user/info */
-export async function infoUsingGet({
-  options,
-}: {
-  options?: CustomRequestOptions;
-}) {
-  return request<API.UserItem>('/user/info', {
+export function infoUsingGet({ options }: { options?: CustomRequestOptions }) {
+  return request<API.InfoUsingGetResponse>('/user/info', {
     method: 'GET',
     ...(options || {}),
   });

src/service/listAll.ts

@@ -4,15 +4,14 @@ import request from '@/http/vue-query';
 import { CustomRequestOptions } from '@/http/types';
 
 import * as API from './types';
-const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
 
 /** 用户列表 GET /user/listAll */
-export async function listAllUsingGet({
+export function listAllUsingGet({
   options,
 }: {
   options?: CustomRequestOptions;
 }) {
-  return request<API.UserItem[]>('/user/listAll', {
+  return request<API.ListAllUsingGetResponse>('/user/listAll', {
     method: 'GET',
     ...(options || {}),
   });