@jhqn/utils-core 0.0.2-beta.4 → 0.0.2-beta.6

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const detectBrowserEs = require('detect-browser-es');
+const detectBrowser = require('detect-browser');
 const dayjs = require('dayjs');
 const localeData = require('dayjs/plugin/localeData');
 const duration = require('dayjs/plugin/duration');
@@ -329,14 +329,13 @@ const fixiOSInputAutoZoomIn = () => {
 const userAgent = inBrowser ? window.navigator.userAgent : "";
 const getHostEnv = () => {
   const ua = userAgent.toLowerCase();
-  const baseInfo = detectBrowserEs.parseUserAgent(ua);
   const zlb = ua.includes("@zlb");
   const zyd = ua.includes("saas");
   const zzd = ua.includes("zhejiang") || ua.includes("tauruszjd");
   const wx = ua.includes("micromessenger");
   const zfb = ua.includes("alipay");
   const mini = ua.includes("miniprogram");
-  const additionalInfo = {
+  const info = {
     zlb,
     zyd,
     zzd,
@@ -344,10 +343,7 @@ const getHostEnv = () => {
     zfb,
     mini
   };
-  return {
-    ...baseInfo,
-    ...additionalInfo
-  };
+  return info;
 };
 
 const parseToJSON = (str, reviver2) => isJSONStr(str) ? JSON.parse(str, reviver2) : null;
@@ -477,6 +473,7 @@ const attachFmt = (data) => {
   return attachList.map(recoverFile);
 };
 
+exports.detect = detectBrowser.detect;
 exports.dayjs = dayjs__default;
 exports.attachFmt = attachFmt;
 exports.camel2Kebab = camel2Kebab;

package/dist/index.d.cts

@@ -3,9 +3,9 @@
 /// <reference types="dayjs/plugin/relativeTime" />
 /// <reference types="dayjs/plugin/customParseFormat" />
 /// <reference types="dayjs/plugin/objectSupport" />
-import * as detect_browser_es from 'detect-browser-es';
 import { ConfigType } from 'dayjs';
 export { Dayjs, default as dayjs } from 'dayjs';
+export { detect } from 'detect-browser';
 
 /**
  * snake2Kebab
@@ -183,7 +183,10 @@ declare const jGroupC: (...args: any[]) => void;
 /**
  * jade console.groupEnd
  */
-declare const jGroupE: () => void;
+declare const jGroupE: {
+    (): void;
+    (): void;
+};
 /**
  * jade console.time
  * @param str
@@ -197,7 +200,10 @@ declare const jTimeEnd: (str: string) => void;
 /**
  * jade console.clear
  */
-declare const jClear: () => void;
+declare const jClear: {
+    (): void;
+    (): void;
+};
 
 /**
  * 不连续打印相同的值
@@ -308,6 +314,33 @@ declare const hideEmail: (email: UnDef<string>) => string;
  */
 declare const hideBankCard: (bankCard: UnDef<string>) => string;
 
+interface HostEnv {
+  /**
+   * 是否是浙里办
+   */
+  readonly zlb: boolean
+  /**
+   * 是否是专有钉
+   */
+  readonly zyd: boolean
+  /**
+   * 是否是浙政钉
+   */
+  readonly zzd: boolean
+  /**
+   * 是否是微信
+   */
+  readonly wx: boolean
+  /**
+   * 是否是支付宝
+   */
+  readonly zfb: boolean
+  /**
+   * 是否是小程序
+   */
+  readonly mini: boolean
+}
+
 /**
  * 判断是否是浏览器环境
  */
@@ -330,52 +363,7 @@ declare const userAgent: string;
 /**
  * 获取宿主环境信息
  */
-declare const getHostEnv: () => {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-} | {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-    name: detect_browser_es.Browser;
-    version: string;
-    os: detect_browser_es.OperatingSystem | null;
-    ua?: detect_browser_es.UserAgentDataInfo | undefined;
-    type: "browser";
-} | {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-    name: detect_browser_es.Browser;
-    version: string;
-    os: detect_browser_es.OperatingSystem | null;
-    bot: string;
-    type: "bot-device";
-    ua?: detect_browser_es.UserAgentDataInfo | undefined;
-} | {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-    type: "bot";
-    bot: true;
-    name: "bot";
-    version: null;
-    os: null;
-    ua?: detect_browser_es.UserAgentDataInfo | undefined;
-};
+declare const getHostEnv: () => HostEnv;
 
 /**
  * Json字符串转对象

package/dist/index.d.mts

@@ -3,9 +3,9 @@
 /// <reference types="dayjs/plugin/relativeTime" />
 /// <reference types="dayjs/plugin/customParseFormat" />
 /// <reference types="dayjs/plugin/objectSupport" />
-import * as detect_browser_es from 'detect-browser-es';
 import { ConfigType } from 'dayjs';
 export { Dayjs, default as dayjs } from 'dayjs';
+export { detect } from 'detect-browser';
 
 /**
  * snake2Kebab
@@ -183,7 +183,10 @@ declare const jGroupC: (...args: any[]) => void;
 /**
  * jade console.groupEnd
  */
-declare const jGroupE: () => void;
+declare const jGroupE: {
+    (): void;
+    (): void;
+};
 /**
  * jade console.time
  * @param str
@@ -197,7 +200,10 @@ declare const jTimeEnd: (str: string) => void;
 /**
  * jade console.clear
  */
-declare const jClear: () => void;
+declare const jClear: {
+    (): void;
+    (): void;
+};
 
 /**
  * 不连续打印相同的值
@@ -308,6 +314,33 @@ declare const hideEmail: (email: UnDef<string>) => string;
  */
 declare const hideBankCard: (bankCard: UnDef<string>) => string;
 
+interface HostEnv {
+  /**
+   * 是否是浙里办
+   */
+  readonly zlb: boolean
+  /**
+   * 是否是专有钉
+   */
+  readonly zyd: boolean
+  /**
+   * 是否是浙政钉
+   */
+  readonly zzd: boolean
+  /**
+   * 是否是微信
+   */
+  readonly wx: boolean
+  /**
+   * 是否是支付宝
+   */
+  readonly zfb: boolean
+  /**
+   * 是否是小程序
+   */
+  readonly mini: boolean
+}
+
 /**
  * 判断是否是浏览器环境
  */
@@ -330,52 +363,7 @@ declare const userAgent: string;
 /**
  * 获取宿主环境信息
  */
-declare const getHostEnv: () => {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-} | {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-    name: detect_browser_es.Browser;
-    version: string;
-    os: detect_browser_es.OperatingSystem | null;
-    ua?: detect_browser_es.UserAgentDataInfo | undefined;
-    type: "browser";
-} | {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-    name: detect_browser_es.Browser;
-    version: string;
-    os: detect_browser_es.OperatingSystem | null;
-    bot: string;
-    type: "bot-device";
-    ua?: detect_browser_es.UserAgentDataInfo | undefined;
-} | {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-    type: "bot";
-    bot: true;
-    name: "bot";
-    version: null;
-    os: null;
-    ua?: detect_browser_es.UserAgentDataInfo | undefined;
-};
+declare const getHostEnv: () => HostEnv;
 
 /**
  * Json字符串转对象

package/dist/index.d.ts

@@ -3,9 +3,9 @@
 /// <reference types="dayjs/plugin/relativeTime" />
 /// <reference types="dayjs/plugin/customParseFormat" />
 /// <reference types="dayjs/plugin/objectSupport" />
-import * as detect_browser_es from 'detect-browser-es';
 import { ConfigType } from 'dayjs';
 export { Dayjs, default as dayjs } from 'dayjs';
+export { detect } from 'detect-browser';
 
 /**
  * snake2Kebab
@@ -183,7 +183,10 @@ declare const jGroupC: (...args: any[]) => void;
 /**
  * jade console.groupEnd
  */
-declare const jGroupE: () => void;
+declare const jGroupE: {
+    (): void;
+    (): void;
+};
 /**
  * jade console.time
  * @param str
@@ -197,7 +200,10 @@ declare const jTimeEnd: (str: string) => void;
 /**
  * jade console.clear
  */
-declare const jClear: () => void;
+declare const jClear: {
+    (): void;
+    (): void;
+};
 
 /**
  * 不连续打印相同的值
@@ -308,6 +314,33 @@ declare const hideEmail: (email: UnDef<string>) => string;
  */
 declare const hideBankCard: (bankCard: UnDef<string>) => string;
 
+interface HostEnv {
+  /**
+   * 是否是浙里办
+   */
+  readonly zlb: boolean
+  /**
+   * 是否是专有钉
+   */
+  readonly zyd: boolean
+  /**
+   * 是否是浙政钉
+   */
+  readonly zzd: boolean
+  /**
+   * 是否是微信
+   */
+  readonly wx: boolean
+  /**
+   * 是否是支付宝
+   */
+  readonly zfb: boolean
+  /**
+   * 是否是小程序
+   */
+  readonly mini: boolean
+}
+
 /**
  * 判断是否是浏览器环境
  */
@@ -330,52 +363,7 @@ declare const userAgent: string;
 /**
  * 获取宿主环境信息
  */
-declare const getHostEnv: () => {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-} | {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-    name: detect_browser_es.Browser;
-    version: string;
-    os: detect_browser_es.OperatingSystem | null;
-    ua?: detect_browser_es.UserAgentDataInfo | undefined;
-    type: "browser";
-} | {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-    name: detect_browser_es.Browser;
-    version: string;
-    os: detect_browser_es.OperatingSystem | null;
-    bot: string;
-    type: "bot-device";
-    ua?: detect_browser_es.UserAgentDataInfo | undefined;
-} | {
-    zlb: boolean;
-    zyd: boolean;
-    zzd: boolean;
-    wx: boolean;
-    zfb: boolean;
-    mini: boolean;
-    type: "bot";
-    bot: true;
-    name: "bot";
-    version: null;
-    os: null;
-    ua?: detect_browser_es.UserAgentDataInfo | undefined;
-};
+declare const getHostEnv: () => HostEnv;
 
 /**
  * Json字符串转对象

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { parseUserAgent } from 'detect-browser-es';
+export { detect } from 'detect-browser';
 import dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
 import localeData from 'dayjs/plugin/localeData';
@@ -318,14 +318,13 @@ const fixiOSInputAutoZoomIn = () => {
 const userAgent = inBrowser ? window.navigator.userAgent : "";
 const getHostEnv = () => {
   const ua = userAgent.toLowerCase();
-  const baseInfo = parseUserAgent(ua);
   const zlb = ua.includes("@zlb");
   const zyd = ua.includes("saas");
   const zzd = ua.includes("zhejiang") || ua.includes("tauruszjd");
   const wx = ua.includes("micromessenger");
   const zfb = ua.includes("alipay");
   const mini = ua.includes("miniprogram");
-  const additionalInfo = {
+  const info = {
     zlb,
     zyd,
     zzd,
@@ -333,10 +332,7 @@ const getHostEnv = () => {
     zfb,
     mini
   };
-  return {
-    ...baseInfo,
-    ...additionalInfo
-  };
+  return info;
 };
 
 const parseToJSON = (str, reviver2) => isJSONStr(str) ? JSON.parse(str, reviver2) : null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jhqn/utils-core",
   "type": "module",
-  "version": "0.0.2-beta.4",
+  "version": "0.0.2-beta.6",
   "author": "jade-gjz <jiangang.zhang@jaderd.com>",
   "license": "MIT",
   "homepage": "https://github.com/jaderd-jh/utils/tree/main/packages/core#readme",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "dayjs": "^1.11.10",
-    "detect-browser-es": "^0.1.0"
+    "detect-browser": "^5.3.0"
   },
   "scripts": {
     "test": "vitest",