@peng_kai/kit 0.2.0-beta.23 → 0.2.0-beta.24

package/request/interceptors/toLogin.ts

@@ -1,26 +1,26 @@
-import type { AxiosInterceptorManager } from 'axios';
-
-const REDIRECT_KEY = 'redirect';
-
-export function toLogin(authPath = `${window.location.origin}/auth/login`, code = 15001): Parameters<AxiosInterceptorManager<any>['use']> {
-  return [
-    undefined,
-    (err) => {
-      if (err.code !== code)
-        throw err;
-
-      const currentURL = new URL(window.location.href);
-      const targetURL = new URL(authPath);
-
-      if (currentURL.searchParams.has(REDIRECT_KEY))
-        targetURL.searchParams.set(REDIRECT_KEY, currentURL.searchParams.get(REDIRECT_KEY)!);
-      else
-        targetURL.searchParams.set(REDIRECT_KEY, window.location.href);
-
-      if (currentURL.toString() === targetURL.toString())
-        return;
-
-      window.location.href = targetURL.toString();
-    },
-  ];
-}
+import type { AxiosInterceptorManager } from 'axios';
+
+const REDIRECT_KEY = 'redirect';
+
+export function toLogin(authPath = `${window.location.origin}/auth/login`, code = 15001): Parameters<AxiosInterceptorManager<any>['use']> {
+  return [
+    undefined,
+    (err) => {
+      if (err.code !== code)
+        throw err;
+
+      const currentURL = new URL(window.location.href);
+      const targetURL = new URL(authPath);
+
+      if (currentURL.searchParams.has(REDIRECT_KEY))
+        targetURL.searchParams.set(REDIRECT_KEY, currentURL.searchParams.get(REDIRECT_KEY)!);
+      else
+        targetURL.searchParams.set(REDIRECT_KEY, window.location.href);
+
+      if (currentURL.toString() === targetURL.toString())
+        return;
+
+      window.location.href = targetURL.toString();
+    },
+  ];
+}

package/request/type.d.ts

@@ -1,92 +1,92 @@
-declare namespace Api {
-  type Request = ((reqData: any, options?: Options) => Promise<any>) & {
-    id: string
-    setDefaultConfig: (config: Partial<import('axios').AxiosRequestConfig>) => Request
-  };
-  // type RequestPagination = (reqData: Partial<PageParam>, options?: Options) => Promise<PaginationData<any>>;
-  interface PageParam {
-    page: number
-    page_size: number
-  }
-  interface PageInfo {
-    has_more: boolean
-    page: number
-    page_size: number
-    total: number
-  }
-  interface PageData<T = any> {
-    list: T[] | null
-    pagination: PaginationInfo
-    [k in string]: any
-  }
-  interface Result<T = any | PageData<any>> {
-    code: number
-    msg: string
-    data: T
-  }
-  type GetParam<A extends Request> = A extends (reqData: infer R) => any ? R : any;
-  type GetData<A extends Request> = ReturnType<A> extends Promise<infer D> ? D : any;
-  type GetDataItem<A extends Request> = NonNullable<GetData<A>> extends { list: infer L }
-    ? NonNullable<L> extends Array<infer I>
-      ? I
-      : any
-    : any;
-  type GetDataField<R> = R extends { data: infer D } ? (D extends { list: any, pagination: any } ? D : D) : any;
-
-  /**
-   * 将api返回的分页数据转换成前端使用的分页数据格式，将分页数据格式统一
-   *
-   * ```
-   * {
-   *   code: number,
-   *   msg: string,
-   *   data: {
-   *     list: [],
-   *     pagination: {},
-   *     ...
-   *   }
-   * }
-   * ```
-   */
-  type TransformPageResult<R> = R extends { pagination: infer P, data: infer D }
-    ? D extends Record<string, any>
-      ? D extends { list: any }
-      ? {
-          [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
-        } & {
-          data: D & { pagination: P }
-        }
-        : {
-          [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
-        } & {
-          data: {
-            list: D
-            pagination: P
-          }
-        }
-      : R
-    : R;
-}
-
-// 测试用例 ----------------------------
-// type DDD1 = Api.TransformPageResult<{
-//   code: number
-//   msg: string
-//   data: {
-//     name: string
-//   }[]
-//   pagination: {
-//     page: number
-//   }
-// }>
-// type DDD2 = Api.TransformPageResult<{
-//   code: number
-//   msg: string
-//   data: {
-//     list: { name: string }[]
-//     total: {}
-//   }
-//   pagination: {
-//     page: number
-//   }
-// }>
+declare namespace Api {
+  type Request = ((reqData: any, options?: Options) => Promise<any>) & {
+    id: string
+    setDefaultConfig: (config: Partial<import('axios').AxiosRequestConfig>) => Request
+  };
+  // type RequestPagination = (reqData: Partial<PageParam>, options?: Options) => Promise<PaginationData<any>>;
+  interface PageParam {
+    page: number
+    page_size: number
+  }
+  interface PageInfo {
+    has_more: boolean
+    page: number
+    page_size: number
+    total: number
+  }
+  interface PageData<T = any> {
+    list: T[] | null
+    pagination: PaginationInfo
+    [k in string]: any
+  }
+  interface Result<T = any | PageData<any>> {
+    code: number
+    msg: string
+    data: T
+  }
+  type GetParam<A extends Request> = A extends (reqData: infer R) => any ? R : any;
+  type GetData<A extends Request> = ReturnType<A> extends Promise<infer D> ? D : any;
+  type GetDataItem<A extends Request> = NonNullable<GetData<A>> extends { list: infer L }
+    ? NonNullable<L> extends Array<infer I>
+      ? I
+      : any
+    : any;
+  type GetDataField<R> = R extends { data: infer D } ? (D extends { list: any, pagination: any } ? D : D) : any;
+
+  /**
+   * 将api返回的分页数据转换成前端使用的分页数据格式，将分页数据格式统一
+   *
+   * ```
+   * {
+   *   code: number,
+   *   msg: string,
+   *   data: {
+   *     list: [],
+   *     pagination: {},
+   *     ...
+   *   }
+   * }
+   * ```
+   */
+  type TransformPageResult<R> = R extends { pagination: infer P, data: infer D }
+    ? D extends Record<string, any>
+      ? D extends { list: any }
+      ? {
+          [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
+        } & {
+          data: D & { pagination: P }
+        }
+        : {
+          [Rk in Exclude<keyof R, 'data' | 'pagination'>]: R[Rk];
+        } & {
+          data: {
+            list: D
+            pagination: P
+          }
+        }
+      : R
+    : R;
+}
+
+// 测试用例 ----------------------------
+// type DDD1 = Api.TransformPageResult<{
+//   code: number
+//   msg: string
+//   data: {
+//     name: string
+//   }[]
+//   pagination: {
+//     page: number
+//   }
+// }>
+// type DDD2 = Api.TransformPageResult<{
+//   code: number
+//   msg: string
+//   data: {
+//     list: { name: string }[]
+//     total: {}
+//   }
+//   pagination: {
+//     page: number
+//   }
+// }>

package/stylelint.config.cjs

@@ -1,7 +1,7 @@
-module.exports = {
-  // root: true,
-  extends: ['@peng_kai/lint/vue/stylelint_v2'],
-  rules: {
-    'custom-property-pattern': '(antd-([a-z][a-zA-Z0-9]+)*)|(([a-z][a-z0-9]*)(-[a-z0-9]+)*)',
-  },
-};
+module.exports = {
+  // root: true,
+  extends: ['@peng_kai/lint/vue/stylelint_v2'],
+  rules: {
+    'custom-property-pattern': '(antd-([a-z][a-zA-Z0-9]+)*)|(([a-z][a-z0-9]*)(-[a-z0-9]+)*)',
+  },
+};

package/tsconfig.json

@@ -1,50 +1,50 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "jsx": "preserve",
-    "jsxFactory": "h",
-    "jsxFragmentFactory": "Fragment",
-    "lib": [
-      "ESNext",
-      "DOM",
-      "DOM.Iterable"
-    ],
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
-    "allowImportingTsExtensions": true,
-
-    /* Linting */
-    "strict": true,
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitAny": false,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noEmit": true,
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "isolatedModules": true,
-    "skipLibCheck": true
-  },
-  "include": [
-    "admin/**/*.ts",
-    "admin/**/*.d.ts",
-    "admin/**/*.tsx",
-    "admin/**/*.vue",
-    "antd/**/*.ts",
-    "antd/**/*.d.ts",
-    "antd/**/*.tsx",
-    "antd/**/*.vue",
-    "request/**/*.ts",
-    "request/**/*.d.ts",
-    "utils/**/*.ts",
-    "utils/**/*.d.ts",
-    "vue/**/*.ts",
-    "vue/**/*.d.ts",
-    "vue/**/*.tsx",
-    "vue/**/*.vue"
-  ]
-}
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "jsx": "preserve",
+    "jsxFactory": "h",
+    "jsxFragmentFactory": "Fragment",
+    "lib": [
+      "ESNext",
+      "DOM",
+      "DOM.Iterable"
+    ],
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "allowImportingTsExtensions": true,
+
+    /* Linting */
+    "strict": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noEmit": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "isolatedModules": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "admin/**/*.ts",
+    "admin/**/*.d.ts",
+    "admin/**/*.tsx",
+    "admin/**/*.vue",
+    "antd/**/*.ts",
+    "antd/**/*.d.ts",
+    "antd/**/*.tsx",
+    "antd/**/*.vue",
+    "request/**/*.ts",
+    "request/**/*.d.ts",
+    "utils/**/*.ts",
+    "utils/**/*.d.ts",
+    "vue/**/*.ts",
+    "vue/**/*.d.ts",
+    "vue/**/*.tsx",
+    "vue/**/*.vue"
+  ]
+}

package/vite/index.mjs

@@ -3,22 +3,48 @@
  * @param env 环境变量对象
  * @returns 代理配置对象
  */
+// export function getProxy(env) {
+//   const keyRE = /^VITE_(HTTP|WS)_PREFIX/;
+//   const valueRE = /^.+? => .+?$/;
+//   const proxys = {};
+
+//   for (const [k, v] of Object.entries(env)) {
+//     if (!(keyRE.test(k) && valueRE.test(v)))
+//       continue;
+
+//     const isWs = k.includes('_WS');
+//     const [prefix, target] = v.split(' => ').map(i => i.trim());
+
+//     proxys[prefix] = {
+//       target,
+//       changeOrigin: true,
+//       ws: isWs,
+//       rewrite: path => path.replace(new RegExp(`^${prefix}`), ''),
+//     };
+//   }
+
+//   return proxys;
+// }
+
 export function getProxy(env) {
-  const keyRE = /^VITE_(HTTP|WS)_PREFIX/;
-  const valueRE = /^.+? => .+?$/;
+  const prefixKeyRE = /^VITE_URL_PREFIX_(.*)$/;
+  const socketUrlRE = /^wss?:\/\//;
+  const keys = Object.keys(env).filter(k => prefixKeyRE.test(k));
   const proxys = {};
 
-  for (const [k, v] of Object.entries(env)) {
-    if (!(keyRE.test(k) && valueRE.test(v)))
-      continue;
+  for (const k of keys) {
+    const name = k.match(prefixKeyRE)?.[1] ?? '';
+    const prefix = env[`VITE_URL_PREFIX_${name}`];
+    const target = env[`VITE_URL_PROXY_${name}`];
+    const proxyable = prefix && target;
 
-    const isWs = k.includes('_WS');
-    const [prefix, target] = v.split(' => ').map(i => i.trim());
+    if (!proxyable)
+      continue;
 
     proxys[prefix] = {
       target,
       changeOrigin: true,
-      ws: isWs,
+      ws: socketUrlRE.test(target),
       rewrite: path => path.replace(new RegExp(`^${prefix}`), ''),
     };
   }

package/vue/components/infinite-query/index.ts

@@ -1 +1 @@
-export { default as InfiniteQuery } from './src/InfiniteQuery.vue';
+export { default as InfiniteQuery } from './src/InfiniteQuery.vue';