@seayoo-web/kms 2.0.2 → 3.0.1

package/README.md

@@ -1,20 +1,24 @@
 # KMS Agent
 
 - dsi 查询工具
-  - `queryDsi` 以 ajax 方式查询 dsi 数据
-  - `jsonpDsi` 以 jsonp 方式查询 dsi 数据，微信环境无效
-  - `jsonxDsi` 以 script 方式查询 dsi 数据，微信环境无效
+  - `query` 以 ajax 方式查询 dsi 数据
+  - `jsonp` 以 jsonp 方式查询 dsi 数据，微信环境无效
+  - `jsonx` 以 script 方式查询 dsi 数据，微信环境无效
   - `convertDsiParam` 工具函数，将 dsi query 参数转成 request param
 
 ```js
-import { DSI } from "@seayoo-web/kms";
+import { KMSDsi } from "@seayoo-web/kms";
+import { NetRequest } from "@seayoo-web/request";
 
-// 微信小程序导入
-// import { DSI } from "@seayoo-web/kms/wx"
+const dsi = new KMSDsi("https://<project>.dsi.seayoo.com", NetRequest);
 
-const dsi = new DSI("https://<project>.dsi.seayoo.com");
+// 如需要调整 req 工具函数配置
+// 详情参看 @seayoo-web/request 工具配置
+dsi.req.setConfig({
+  timeout: 5000,
+});
 
-dsi.queryDsi({ key, query, guard });
+dsi.query({ key, query, guard });
 ```
 
 ```js

package/dist/index.js

@@ -1,10 +1,50 @@
-import { NetRequest as r } from "@seayoo-web/request";
-import { K as t } from "./dsi-IrAVonhd.js";
-class m extends t {
-  constructor(s) {
-    super(s, r);
+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: 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(q);
+  }
+  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;
+}
+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 {
-  m as Dsi
+  K as KMSDsi
 };

package/package.json

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

package/types/index.d.ts

@@ -1,4 +1 @@
-import { KMSDsi } from "./src/dsi";
-export declare class Dsi extends KMSDsi {
-    constructor(endpoint: string);
-}
+export { KMSDsi } from "./src/dsi";

package/types/src/dsi.d.ts

@@ -4,6 +4,7 @@ type QuerySortBaseField = "start" | "end" | "created" | "order" | "updated" | `d
 type QuerySortField = QuerySortBaseField | `-${QuerySortBaseField}`;
 type QuerySortWithDefault = QuerySortField | `${QuerySortField}|${QuerySortField}`;
 type RecordRootField = "group" | "sn" | "start" | "end" | "order" | "data" | "created" | "updated";
+/** spell-checker:ignore Mddhh, Mddhhmm */
 export interface DsiQueryParam {
     /**
      * 指定获取某个配置，设定 sn 后，所有过滤以及分页参数均失效
@@ -150,23 +151,23 @@ export interface DsiQueryOption<T> {
     guard: (data: unknown) => data is T;
 }
 export declare class KMSDsi {
-    protected req: ReturnType<NetRequestFactory>;
+    req: ReturnType<NetRequestFactory>;
     constructor(endpoint: string, request: NetRequestFactory);
     /**
      * 查询 Dsi 数据接口并返回接口响应
      */
-    queryDsi<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
+    query<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
     /**
      * 通过 jsonp 方式加载 dsi 数据
      *
      * ⚠️ 微信环境下不支持
      */
-    jsonpDsi<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
+    jsonp<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
     /**
      * 通过 jsonx(script) 方式加载 dsi 数据
      *
      * ⚠️ 微信环境下不支持
      */
-    jsonxDsi<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
+    jsonx<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
 }
 export {};

package/dist/dsi-IrAVonhd.js

@@ -1,50 +0,0 @@
-var x = Object.defineProperty;
-var L = (t, r, i) => r in t ? x(t, r, { enumerable: !0, configurable: !0, writable: !0, value: i }) : t[r] = i;
-var w = (t, r, i) => L(t, typeof r != "symbol" ? r + "" : r, i);
-import { jsonp as K, jsonx as k } from "@seayoo-web/request";
-function y(t) {
-  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: D, combo: h, pure: g = "items", label: c, value: f, option: b } = t;
-  if ($ && (r.sn = $), i && (r.g = Array.isArray(i) ? i.join(",") : i), a) {
-    const v = s === "or" ? "|" : "+", q = Object.keys(a);
-    r.filter = q.map((p) => {
-      const u = a[p];
-      return Array.isArray(u) ? `${p}:${u.join(",")}` : `${p}:${u}`;
-    }).join(v);
-  }
-  return l && (r.r = l), j && (r.created = j.join("-")), d && (r.updated = d.join("-")), e && (r.sort = Array.isArray(e) ? e.join(",") : e), D === !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), h === !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;
-}
-function z(t) {
-  return t.replace(/(?:^https?:\/\/|\/*$)/gi, "").toLowerCase();
-}
-class F {
-  constructor(r, i) {
-    w(this, "req");
-    this.req = i({ baseURL: `https://${z(r)}`, timeout: 1e4 });
-  }
-  /**
-   * 查询 Dsi 数据接口并返回接口响应
-   */
-  async queryDsi({ key: r, query: i, guard: a }) {
-    const { data: s } = await this.req.get(r, a, { params: y(i) });
-    return s;
-  }
-  /**
-   * 通过 jsonp 方式加载 dsi 数据
-   *
-   * ⚠️ 微信环境下不支持
-   */
-  async jsonpDsi({ key: r, query: i, guard: a }) {
-    return await K(`${r}/jsonp`, a, y(i));
-  }
-  /**
-   * 通过 jsonx(script) 方式加载 dsi 数据
-   *
-   * ⚠️ 微信环境下不支持
-   */
-  async jsonxDsi({ key: r, query: i, guard: a }) {
-    return await k(`${r}/script`, a, y(i));
-  }
-}
-export {
-  F as K
-};

package/dist/wx.js

@@ -1,10 +0,0 @@
-import { NetRequest as r } from "@seayoo-web/request/wx";
-import { K as t } from "./dsi-IrAVonhd.js";
-class m extends t {
-  constructor(s) {
-    super(s, r);
-  }
-}
-export {
-  m as Dsi
-};

package/types/wx.d.ts

@@ -1,4 +0,0 @@
-import { KMSDsi } from "./src/dsi";
-export declare class Dsi extends KMSDsi {
-    constructor(endpoint: string);
-}