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

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const detectBrowser = require('detect-browser');
+const detectBrowserEs = require('detect-browser-es');
 const dayjs = require('dayjs');
 const localeData = require('dayjs/plugin/localeData');
 const duration = require('dayjs/plugin/duration');
@@ -329,40 +329,25 @@ const fixiOSInputAutoZoomIn = () => {
 const userAgent = inBrowser ? window.navigator.userAgent : "";
 const getHostEnv = () => {
   const ua = userAgent.toLowerCase();
-  const baseInfo = detectBrowser.detect();
+  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");
-  return {
-    ...baseInfo,
-    /**
-     * 是否是浙里办
-     */
+  const additionalInfo = {
     zlb,
-    /**
-     * 是否是专有钉
-     */
     zyd,
-    /**
-     * 是否是浙政钉
-     */
     zzd,
-    /**
-     * 是否是微信
-     */
     wx,
-    /**
-     * 是否是支付宝
-     */
     zfb,
-    /**
-     * 是否是小程序
-     */
     mini
   };
+  return {
+    ...baseInfo,
+    ...additionalInfo
+  };
 };
 
 const parseToJSON = (str, reviver2) => isJSONStr(str) ? JSON.parse(str, reviver2) : null;

package/dist/index.d.cts

@@ -3,7 +3,7 @@
 /// <reference types="dayjs/plugin/relativeTime" />
 /// <reference types="dayjs/plugin/customParseFormat" />
 /// <reference types="dayjs/plugin/objectSupport" />
-import * as detect_browser from 'detect-browser';
+import * as detect_browser_es from 'detect-browser-es';
 import { ConfigType } from 'dayjs';
 export { Dayjs, default as dayjs } from 'dayjs';
 
@@ -183,10 +183,7 @@ declare const jGroupC: (...args: any[]) => void;
 /**
  * jade console.groupEnd
  */
-declare const jGroupE: {
-    (): void;
-    (): void;
-};
+declare const jGroupE: () => void;
 /**
  * jade console.time
  * @param str
@@ -200,10 +197,7 @@ declare const jTimeEnd: (str: string) => void;
 /**
  * jade console.clear
  */
-declare const jClear: {
-    (): void;
-    (): void;
-};
+declare const jClear: () => void;
 
 /**
  * 不连续打印相同的值
@@ -337,177 +331,50 @@ 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.Browser;
+    name: detect_browser_es.Browser;
     version: string;
-    os: detect_browser.OperatingSystem | null;
+    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.Browser;
+    name: detect_browser_es.Browser;
     version: string;
-    os: detect_browser.OperatingSystem | null;
+    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;
-} | {
-    /**
-     * 是否是浙里办
-     */
-    zlb: boolean;
-    /**
-     * 是否是专有钉
-     */
-    zyd: boolean;
-    /**
-     * 是否是浙政钉
-     */
-    zzd: boolean;
-    /**
-     * 是否是微信
-     */
-    wx: boolean;
-    /**
-     * 是否是支付宝
-     */
-    zfb: boolean;
-    /**
-     * 是否是小程序
-     */
-    mini: boolean;
-    version: string;
-    type: "node";
-    name: "node";
-    os: NodeJS.Platform;
-} | {
-    /**
-     * 是否是浙里办
-     */
-    zlb: boolean;
-    /**
-     * 是否是专有钉
-     */
-    zyd: boolean;
-    /**
-     * 是否是浙政钉
-     */
-    zzd: boolean;
-    /**
-     * 是否是微信
-     */
-    wx: boolean;
-    /**
-     * 是否是支付宝
-     */
-    zfb: boolean;
-    /**
-     * 是否是小程序
-     */
-    mini: boolean;
-    type: "react-native";
-    name: "react-native";
-    version: null;
-    os: null;
+    ua?: detect_browser_es.UserAgentDataInfo | undefined;
 };
 
 /**

package/dist/index.d.mts

@@ -3,7 +3,7 @@
 /// <reference types="dayjs/plugin/relativeTime" />
 /// <reference types="dayjs/plugin/customParseFormat" />
 /// <reference types="dayjs/plugin/objectSupport" />
-import * as detect_browser from 'detect-browser';
+import * as detect_browser_es from 'detect-browser-es';
 import { ConfigType } from 'dayjs';
 export { Dayjs, default as dayjs } from 'dayjs';
 
@@ -183,10 +183,7 @@ declare const jGroupC: (...args: any[]) => void;
 /**
  * jade console.groupEnd
  */
-declare const jGroupE: {
-    (): void;
-    (): void;
-};
+declare const jGroupE: () => void;
 /**
  * jade console.time
  * @param str
@@ -200,10 +197,7 @@ declare const jTimeEnd: (str: string) => void;
 /**
  * jade console.clear
  */
-declare const jClear: {
-    (): void;
-    (): void;
-};
+declare const jClear: () => void;
 
 /**
  * 不连续打印相同的值
@@ -337,177 +331,50 @@ 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.Browser;
+    name: detect_browser_es.Browser;
     version: string;
-    os: detect_browser.OperatingSystem | null;
+    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.Browser;
+    name: detect_browser_es.Browser;
     version: string;
-    os: detect_browser.OperatingSystem | null;
+    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;
-} | {
-    /**
-     * 是否是浙里办
-     */
-    zlb: boolean;
-    /**
-     * 是否是专有钉
-     */
-    zyd: boolean;
-    /**
-     * 是否是浙政钉
-     */
-    zzd: boolean;
-    /**
-     * 是否是微信
-     */
-    wx: boolean;
-    /**
-     * 是否是支付宝
-     */
-    zfb: boolean;
-    /**
-     * 是否是小程序
-     */
-    mini: boolean;
-    version: string;
-    type: "node";
-    name: "node";
-    os: NodeJS.Platform;
-} | {
-    /**
-     * 是否是浙里办
-     */
-    zlb: boolean;
-    /**
-     * 是否是专有钉
-     */
-    zyd: boolean;
-    /**
-     * 是否是浙政钉
-     */
-    zzd: boolean;
-    /**
-     * 是否是微信
-     */
-    wx: boolean;
-    /**
-     * 是否是支付宝
-     */
-    zfb: boolean;
-    /**
-     * 是否是小程序
-     */
-    mini: boolean;
-    type: "react-native";
-    name: "react-native";
-    version: null;
-    os: null;
+    ua?: detect_browser_es.UserAgentDataInfo | undefined;
 };
 
 /**

package/dist/index.d.ts

@@ -3,7 +3,7 @@
 /// <reference types="dayjs/plugin/relativeTime" />
 /// <reference types="dayjs/plugin/customParseFormat" />
 /// <reference types="dayjs/plugin/objectSupport" />
-import * as detect_browser from 'detect-browser';
+import * as detect_browser_es from 'detect-browser-es';
 import { ConfigType } from 'dayjs';
 export { Dayjs, default as dayjs } from 'dayjs';
 
@@ -183,10 +183,7 @@ declare const jGroupC: (...args: any[]) => void;
 /**
  * jade console.groupEnd
  */
-declare const jGroupE: {
-    (): void;
-    (): void;
-};
+declare const jGroupE: () => void;
 /**
  * jade console.time
  * @param str
@@ -200,10 +197,7 @@ declare const jTimeEnd: (str: string) => void;
 /**
  * jade console.clear
  */
-declare const jClear: {
-    (): void;
-    (): void;
-};
+declare const jClear: () => void;
 
 /**
  * 不连续打印相同的值
@@ -337,177 +331,50 @@ 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.Browser;
+    name: detect_browser_es.Browser;
     version: string;
-    os: detect_browser.OperatingSystem | null;
+    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.Browser;
+    name: detect_browser_es.Browser;
     version: string;
-    os: detect_browser.OperatingSystem | null;
+    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;
-} | {
-    /**
-     * 是否是浙里办
-     */
-    zlb: boolean;
-    /**
-     * 是否是专有钉
-     */
-    zyd: boolean;
-    /**
-     * 是否是浙政钉
-     */
-    zzd: boolean;
-    /**
-     * 是否是微信
-     */
-    wx: boolean;
-    /**
-     * 是否是支付宝
-     */
-    zfb: boolean;
-    /**
-     * 是否是小程序
-     */
-    mini: boolean;
-    version: string;
-    type: "node";
-    name: "node";
-    os: NodeJS.Platform;
-} | {
-    /**
-     * 是否是浙里办
-     */
-    zlb: boolean;
-    /**
-     * 是否是专有钉
-     */
-    zyd: boolean;
-    /**
-     * 是否是浙政钉
-     */
-    zzd: boolean;
-    /**
-     * 是否是微信
-     */
-    wx: boolean;
-    /**
-     * 是否是支付宝
-     */
-    zfb: boolean;
-    /**
-     * 是否是小程序
-     */
-    mini: boolean;
-    type: "react-native";
-    name: "react-native";
-    version: null;
-    os: null;
+    ua?: detect_browser_es.UserAgentDataInfo | undefined;
 };
 
 /**

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { detect } from 'detect-browser';
+import { parseUserAgent } from 'detect-browser-es';
 import dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
 import localeData from 'dayjs/plugin/localeData';
@@ -318,40 +318,25 @@ const fixiOSInputAutoZoomIn = () => {
 const userAgent = inBrowser ? window.navigator.userAgent : "";
 const getHostEnv = () => {
   const ua = userAgent.toLowerCase();
-  const baseInfo = detect();
+  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");
-  return {
-    ...baseInfo,
-    /**
-     * 是否是浙里办
-     */
+  const additionalInfo = {
     zlb,
-    /**
-     * 是否是专有钉
-     */
     zyd,
-    /**
-     * 是否是浙政钉
-     */
     zzd,
-    /**
-     * 是否是微信
-     */
     wx,
-    /**
-     * 是否是支付宝
-     */
     zfb,
-    /**
-     * 是否是小程序
-     */
     mini
   };
+  return {
+    ...baseInfo,
+    ...additionalInfo
+  };
 };
 
 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.3",
+  "version": "0.0.2-beta.4",
   "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": "^5.3.0"
+    "detect-browser-es": "^0.1.0"
   },
   "scripts": {
     "test": "vitest",