@seayoo-web/kms 2.0.1 → 3.0.0

package/README.md

@@ -2,6 +2,24 @@
 
 - dsi 查询工具
   - `queryDsi` 以 ajax 方式查询 dsi 数据
-  - `jsonpDsi` 以 jsonp 方式查询 dsi 数据
-  - `jsonxDsi` 以 script 方式查询 dsi 数据
+  - `jsonpDsi` 以 jsonp 方式查询 dsi 数据，微信环境无效
+  - `jsonxDsi` 以 script 方式查询 dsi 数据，微信环境无效
   - `convertDsiParam` 工具函数，将 dsi query 参数转成 request param
+
+```js
+import { DSI } from "@seayoo-web/kms";
+
+// 微信小程序导入
+// import { DSI } from "@seayoo-web/kms/wx"
+
+const dsi = new DSI("https://<project>.dsi.seayoo.com");
+
+dsi.queryDsi({ key, query, guard });
+```
+
+```js
+import { convertDsiParam } from "@seayoo-web/kms";
+
+// 可以仅仅使用工具来生成 dsi 的查询参数
+const param = convertDsiParam(query);
+```

package/dist/index.js

@@ -1,32 +1,50 @@
-import { NetRequest as L, jsonp as k, jsonx as q } from "@seayoo-web/request";
-const { get: z } = L({ timeout: 15e3 });
+var L = Object.defineProperty;
+var D = (t, r, i) => r in t ? L(t, r, { enumerable: !0, configurable: !0, writable: !0, value: i }) : t[r] = i;
+var w = (t, r, i) => D(t, typeof r != "symbol" ? r + "" : r, i);
+import { jsonp as k, jsonx as z } from "@seayoo-web/request";
 function y(t) {
-  const r = {}, { group: i, filter: a, filterLogic: n, range: l, created: d, updated: m, size: A, page: $, sort: s } = t, { sn: g, fields: o, dataFields: e, multi: h, combo: v, pure: b = "items", label: f, value: c, option: w } = t;
-  if (g && (r.sn = g), i && (r.g = Array.isArray(i) ? i.join(",") : i), a) {
-    const D = n === "or" ? "|" : "+", x = Object.keys(a);
+  const r = {}, { group: i, filter: a, filterLogic: s, range: l, created: j, updated: d, size: m, page: A, sort: e } = t, { sn: $, fields: o, dataFields: n, multi: h, combo: v, pure: g = "items", label: c, value: f, option: b } = t;
+  if ($ && (r.sn = $), i && (r.g = Array.isArray(i) ? i.join(",") : i), a) {
+    const q = s === "or" ? "|" : "+", x = Object.keys(a);
     r.filter = x.map((p) => {
       const u = a[p];
       return Array.isArray(u) ? `${p}:${u.join(",")}` : `${p}:${u}`;
-    }).join(D);
+    }).join(q);
   }
-  return l && (r.r = l), d && (r.created = d.join("-")), m && (r.updated = m.join("-")), s && (r.sort = Array.isArray(s) ? s.join(",") : s), h === !1 && (r.m = "n"), A && (r.s = `${A}`), $ && (r.p = `${$}`), o && (r.f = Array.isArray(o) ? o.join(",") : o), e && (r.df = Array.isArray(e) ? e.join(",") : e), v === !0 && (o ? r.c = "y" : console.warn("设置 combo:true 必须要同步设置 fields")), b && (r.pure = b === "items" ? "items" : "y"), f && (r.label = Array.isArray(f) ? f.join(",") : f), c && (r.value = Array.isArray(c) ? c.join(",") : c), w && (r.option = w), r;
+  return l && (r.r = l), j && (r.created = j.join("-")), d && (r.updated = d.join("-")), e && (r.sort = Array.isArray(e) ? e.join(",") : e), h === !1 && (r.m = "n"), m && (r.s = `${m}`), A && (r.p = `${A}`), o && (r.f = Array.isArray(o) ? o.join(",") : o), n && (r.df = Array.isArray(n) ? n.join(",") : n), v === !0 && (o ? r.c = "y" : console.warn("设置 combo:true 必须要同步设置 fields")), g && (r.pure = g === "items" ? "items" : "y"), c && (r.label = Array.isArray(c) ? c.join(",") : c), f && (r.value = Array.isArray(f) ? f.join(",") : f), b && (r.option = b), r;
 }
-async function E({ endpoint: t, key: r, query: i, guard: a }) {
-  const { data: n } = await z(`https://${j(t)}/${r}`, a, { params: y(i) });
-  return n;
-}
-async function F({ endpoint: t, key: r, query: i, guard: a }) {
-  return await k(`https://${j(t)}/${r}/jsonp`, a, y(i));
-}
-async function N({ endpoint: t, key: r, query: i, guard: a }) {
-  return await q(`https://${j(t)}/${r}/script`, a, y(i));
-}
-function j(t) {
+function C(t) {
   return t.replace(/(?:^https?:\/\/|\/*$)/gi, "").toLowerCase();
 }
+class K {
+  constructor(r, i) {
+    w(this, "req");
+    this.req = i({ baseURL: `https://${C(r)}`, timeout: 1e4 });
+  }
+  /**
+   * 查询 Dsi 数据接口并返回接口响应
+   */
+  async query({ key: r, query: i, guard: a }) {
+    const { data: s } = await this.req.get(r, a, { params: y(i) });
+    return s;
+  }
+  /**
+   * 通过 jsonp 方式加载 dsi 数据
+   *
+   * ⚠️ 微信环境下不支持
+   */
+  async jsonp({ key: r, query: i, guard: a }) {
+    return await k(`${r}/jsonp`, a, y(i));
+  }
+  /**
+   * 通过 jsonx(script) 方式加载 dsi 数据
+   *
+   * ⚠️ 微信环境下不支持
+   */
+  async jsonx({ key: r, query: i, guard: a }) {
+    return await z(`${r}/script`, a, y(i));
+  }
+}
 export {
-  y as convertDsiParam,
-  F as jsonpDsi,
-  N as jsonxDsi,
-  E as queryDsi
+  K as KMSDsi
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/kms",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "description": "agent for seayoo.kms",
   "type": "module",
   "source": "index.ts",
@@ -12,25 +12,16 @@
     "types",
     "README.md"
   ],
-  "exports": {
-    ".": {
-      "types": "./types/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    }
-  },
   "author": "web@seayoo.com",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@seayoo-web/request": "^2.0.6",
+    "@seayoo-web/request": "^2.1.0",
+    "@seayoo-web/scripts": "^1.2.5",
     "@seayoo-web/tsconfig": "^1.0.2"
   },
-  "peerDependencies": {
-    "@seayoo-web/request": "^2.0.6"
-  },
   "scripts": {
     "build": "vite build && tsc --emitDeclarationOnly",
     "prepublish": "pnpm build"

package/types/index.d.ts

@@ -1 +1 @@
-export * from "./src/dsi";
+export { KMSDsi } from "./src/dsi";

package/types/src/dsi.d.ts

@@ -1,3 +1,4 @@
+import { type NetRequestFactory } from "@seayoo-web/request";
 type BaseFieldType = string | number | null;
 type QuerySortBaseField = "start" | "end" | "created" | "order" | "updated" | `data.${string}`;
 type QuerySortField = QuerySortBaseField | `-${QuerySortBaseField}`;
@@ -140,9 +141,7 @@ export interface DsiQueryParam {
  * 将查询配置转成 dsi 查询参数
  */
 export declare function convertDsiParam(query: DsiQueryParam): Record<string, string>;
-interface DsiQueryOption<T> {
-    /** dsi 服务器地址，比如 xxx.dsi.seayoo.com */
-    endpoint: string;
+export interface DsiQueryOption<T> {
     /** dsi key / alias */
     key: string;
     /** 查询参数 */
@@ -150,16 +149,24 @@ interface DsiQueryOption<T> {
     /** 响应数据守卫函数 */
     guard: (data: unknown) => data is T;
 }
-/**
- * 查询 Dsi 数据接口并返回接口响应
- */
-export declare function queryDsi<T = unknown>({ endpoint, key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
-/**
- * 通过 jsonp 方式加载 dsi 数据
- */
-export declare function jsonpDsi<T = unknown>({ endpoint, key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
-/**
- * 通过 jsonx(script) 方式加载 dsi 数据
- */
-export declare function jsonxDsi<T = unknown>({ endpoint, key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
+export declare class KMSDsi {
+    req: ReturnType<NetRequestFactory>;
+    constructor(endpoint: string, request: NetRequestFactory);
+    /**
+     * 查询 Dsi 数据接口并返回接口响应
+     */
+    query<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
+    /**
+     * 通过 jsonp 方式加载 dsi 数据
+     *
+     * ⚠️ 微信环境下不支持
+     */
+    jsonp<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
+    /**
+     * 通过 jsonx(script) 方式加载 dsi 数据
+     *
+     * ⚠️ 微信环境下不支持
+     */
+    jsonx<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
+}
 export {};