@seayoo-web/kms 2.0.0 → 2.0.2

package/README.md

@@ -2,5 +2,24 @@
 
 - dsi 查询工具
   - `queryDsi` 以 ajax 方式查询 dsi 数据
-  - `jsonpDsi` 以 jsonp 方式查询 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/dsi-IrAVonhd.js

@@ -0,0 +1,50 @@
+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/index.js

@@ -1,35 +1,10 @@
-import { NetRequest as k, jsonp as q } from "@seayoo-web/request";
-const { get: x } = k({ timeout: 15e3 });
-function b(a) {
-  const r = {}, { group: i, filter: t, filterLogic: s, range: y, created: l, updated: j, size: m, page: A, sort: n } = a, { sn: d, fields: o, dataFields: e, multi: v, combo: w, pure: $ = "items", label: f, value: c, option: g } = a;
-  if (d && (r.sn = d), i && (r.g = Array.isArray(i) ? i.join(",") : i), t) {
-    const D = s === "or" ? "|" : "+", h = Object.keys(t);
-    r.filter = h.map((p) => {
-      const u = t[p];
-      return Array.isArray(u) ? `${p}:${u.join(",")}` : `${p}:${u}`;
-    }).join(D);
+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);
   }
-  return y && (r.r = y), l && (r.created = l.join("-")), j && (r.updated = j.join("-")), n && (r.sort = Array.isArray(n) ? n.join(",") : n), v === !1 && (r.m = "n"), m && (r.s = `${m}`), A && (r.p = `${A}`), o && (r.f = Array.isArray(o) ? o.join(",") : o), e && (r.df = Array.isArray(e) ? e.join(",") : e), w === !0 && (o ? r.c = "y" : console.warn("设置 combo:true 必须要同步设置 fields")), $ && (r.pure = $ === "items" ? "items" : "y"), f && (r.label = Array.isArray(f) ? f.join(",") : f), c && (r.value = Array.isArray(c) ? c.join(",") : c), g && (r.option = g), r;
-}
-async function F({
-  endpoint: a,
-  key: r,
-  query: i,
-  guard: t
-}) {
-  const { data: s } = await x(`https://${a}/${r}`, t, { params: b(i) });
-  return s;
-}
-async function L({
-  endpoint: a,
-  key: r,
-  query: i,
-  guard: t
-}) {
-  return await q(`https://${a}/${r}/jsonp`, t, b(i));
 }
 export {
-  b as convertDsiParam,
-  L as jsonpDsi,
-  F as queryDsi
+  m as Dsi
 };

package/dist/wx.js

@@ -0,0 +1,10 @@
+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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/kms",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "agent for seayoo.kms",
   "type": "module",
   "source": "index.ts",
@@ -17,6 +17,11 @@
       "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",
@@ -25,11 +30,11 @@
     "access": "public"
   },
   "devDependencies": {
-    "@seayoo-web/request": "^2.0.6",
+    "@seayoo-web/request": "^2.0.8",
     "@seayoo-web/tsconfig": "^1.0.2"
   },
   "peerDependencies": {
-    "@seayoo-web/request": "^2.0.6"
+    "@seayoo-web/request": "^2.0.8"
   },
   "scripts": {
     "build": "vite build && tsc --emitDeclarationOnly",

package/types/index.d.ts

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

package/types/src/dsi.d.ts

@@ -1,6 +1,4 @@
-type DsiProdEndpoint = `${string}.dsi.seayoo.com` | "dsi.seayoo.com" | `${string}.dsi.seayoo.io` | "dsi.seayoo.io";
-type DsiDevEndpoint = `${string}.dsi.dev.seayoo.com` | "dsi.dev.seayoo.com" | `${string}.dsi.dev.seayoo.io` | "dsi.dev.seayoo.io";
-export type DsiEndpoint = DsiProdEndpoint | DsiDevEndpoint;
+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}`;
@@ -143,22 +141,32 @@ export interface DsiQueryParam {
  * 将查询配置转成 dsi 查询参数
  */
 export declare function convertDsiParam(query: DsiQueryParam): Record<string, string>;
-/**
- * 查询 Dsi 数据接口并返回接口响应
- */
-export declare function queryDsi<T = unknown>({ endpoint, key, query, guard, }: {
-    endpoint: DsiEndpoint;
+export interface DsiQueryOption<T> {
+    /** dsi key / alias */
     key: string;
+    /** 查询参数 */
     query: DsiQueryParam;
+    /** 响应数据守卫函数 */
     guard: (data: unknown) => data is T;
-}): Promise<T | null>;
-/**
- * 通过 jsonp 方式加载 dsi 数据
- */
-export declare function jsonpDsi<T = unknown>({ endpoint, key, query, guard, }: {
-    endpoint: DsiEndpoint;
-    key: string;
-    query: DsiQueryParam;
-    guard: (data: unknown) => data is T;
-}): Promise<T | null>;
+}
+export declare class KMSDsi {
+    protected req: ReturnType<NetRequestFactory>;
+    constructor(endpoint: string, request: NetRequestFactory);
+    /**
+     * 查询 Dsi 数据接口并返回接口响应
+     */
+    queryDsi<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
+    /**
+     * 通过 jsonp 方式加载 dsi 数据
+     *
+     * ⚠️ 微信环境下不支持
+     */
+    jsonpDsi<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
+    /**
+     * 通过 jsonx(script) 方式加载 dsi 数据
+     *
+     * ⚠️ 微信环境下不支持
+     */
+    jsonxDsi<T = unknown>({ key, query, guard }: DsiQueryOption<T>): Promise<T | null>;
+}
 export {};

package/types/wx.d.ts

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