@seayoo-web/kms 2.0.0 → 2.0.1

package/README.md

@@ -3,4 +3,5 @@
 - dsi 查询工具
   - `queryDsi` 以 ajax 方式查询 dsi 数据
   - `jsonpDsi` 以 jsonp 方式查询 dsi 数据
+  - `jsonxDsi` 以 script 方式查询 dsi 数据
   - `convertDsiParam` 工具函数，将 dsi query 参数转成 request param

package/dist/index.js

@@ -1,35 +1,32 @@
-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];
+import { NetRequest as L, jsonp as k, jsonx as q } from "@seayoo-web/request";
+const { get: z } = L({ timeout: 15e3 });
+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);
+    r.filter = x.map((p) => {
+      const u = a[p];
       return Array.isArray(u) ? `${p}:${u.join(",")}` : `${p}:${u}`;
     }).join(D);
   }
-  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;
+  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;
 }
-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 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 L({
-  endpoint: a,
-  key: r,
-  query: i,
-  guard: t
-}) {
-  return await q(`https://${a}/${r}/jsonp`, t, b(i));
+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) {
+  return t.replace(/(?:^https?:\/\/|\/*$)/gi, "").toLowerCase();
 }
 export {
-  b as convertDsiParam,
-  L as jsonpDsi,
-  F as queryDsi
+  y as convertDsiParam,
+  F as jsonpDsi,
+  N as jsonxDsi,
+  E as queryDsi
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/kms",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "agent for seayoo.kms",
   "type": "module",
   "source": "index.ts",

package/types/src/dsi.d.ts

@@ -1,6 +1,3 @@
-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;
 type BaseFieldType = string | number | null;
 type QuerySortBaseField = "start" | "end" | "created" | "order" | "updated" | `data.${string}`;
 type QuerySortField = QuerySortBaseField | `-${QuerySortBaseField}`;
@@ -143,22 +140,26 @@ 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;
+interface DsiQueryOption<T> {
+    /** dsi 服务器地址，比如 xxx.dsi.seayoo.com */
+    endpoint: string;
+    /** dsi key / alias */
     key: string;
+    /** 查询参数 */
     query: DsiQueryParam;
+    /** 响应数据守卫函数 */
     guard: (data: unknown) => data is T;
-}): Promise<T | null>;
+}
+/**
+ * 查询 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, }: {
-    endpoint: DsiEndpoint;
-    key: string;
-    query: DsiQueryParam;
-    guard: (data: unknown) => data is T;
-}): Promise<T | null>;
+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 {};