@base-web-kits/base-tools-web 0.9.14 → 0.9.99

package/package.json

@@ -1,32 +1,32 @@
-{
-  "name": "@base-web-kits/base-tools-web",
-  "version": "0.9.14",
-  "sideEffects": false,
-  "description": "Independent Web utilities package built from src/web.",
-  "keywords": [
-    "base-tools",
-    "web",
-    "utilities",
-    "thin-wrapper"
-  ],
-  "license": "MIT",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
-    }
-  },
-  "files": [
-    "dist",
-    "README.md",
-    "src"
-  ],
-  "dependencies": {},
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  }
-}
+{
+  "name": "@base-web-kits/base-tools-web",
+  "version": "0.9.99",
+  "sideEffects": false,
+  "description": "Independent Web utilities package built from src/web.",
+  "keywords": [
+    "base-tools",
+    "web",
+    "utilities",
+    "thin-wrapper"
+  ],
+  "license": "MIT",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
+  "files": [
+    "dist",
+    "README.md",
+    "src"
+  ],
+  "dependencies": {},
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  }
+}

package/src/web/url/index.ts

@@ -1,52 +1,64 @@
-import { getUrlNumber, getUrlParam, getUrlParamAll } from '../../ts';
-
 /**
  * 获取url的查询参数值
- * - 与 {@link getUrlParam} 相同，只是参数url可选,默认取当前地址
  * @param key 参数名
  * @param url 完整 URL 或仅查询串（如 "a=1&b=2"）
  * @returns 解码后的参数值 (若不存在|"null"|"undefined"，则返回 null)
  * @example
- * const q = getUrlQuery('q'); // 默认当前地址
- * const q = getUrlQuery('q', 'https://a.com/?q=%E6%B5%8B%E8%AF%95'); // "测试"
- * const a = getUrlQuery('a', 'a=1'); // "1"
- * const list = getUrlQuery('list', 'list=[1,2]'); // "[1,2]"
- * const list = getUrlQuery('list', 'list=null'); // null
- * const list = getUrlQuery('list', 'list=undefined'); // null
+ * const q = getUrlParam('q'); // 默认当前地址
+ * const q = getUrlParam('q', 'https://a.com/?q=%E6%B5%8B%E8%AF%95'); // "测试"
+ * const a = getUrlParam('a', 'a=1'); // "1"
+ * const list = getUrlParam('list', 'list=[1,2]'); // "[1,2]"
+ * const list = getUrlParam('list', 'list=null'); // null
+ * const list = getUrlParam('list', 'list=undefined'); // null
  */
-export function getUrlQuery(key: string, url = window.location.href) {
-  return getUrlParam(key, url);
+export function getUrlParam(key: string, url = window.location.href) {
+  const searchParams = new URL(url.includes('?') ? url : `?${url}`, 'http://localhost')
+    .searchParams;
+  const value = searchParams.get(key);
+  return value === 'null' || value === 'undefined' ? null : value;
 }
 
 /**
  * 获取url的查询参数值,并转为number类型
- * - 与 {@link getUrlNumber} 相同，只是参数url可选,默认取当前地址
  * @param key 参数名
  * @param url 完整 URL 或仅查询串（如 "a=1&b=2"）
  * @returns 解码后的参数值 (若不存在|"非数字字符串"，则返回 null)
  * @example
- * const a = getUrlQueryNumber('a'); // 默认当前地址
- * const a = getUrlQueryNumber('a', 'https://a.com/?a=1'); // 1
- * const a = getUrlQueryNumber('a', 'a=1'); // 1
- * const a = getUrlQueryNumber('a', 'a=1.2'); // 1.2
- * const a = getUrlQueryNumber('a', 'a=abc'); // null
+ * const a = getUrlNumber('a'); // 默认当前地址
+ * const a = getUrlNumber('a', 'https://a.com/?a=1'); // 1
+ * const a = getUrlNumber('a', 'a=1'); // 1
+ * const a = getUrlNumber('a', 'a=1.2'); // 1.2
+ * const a = getUrlNumber('a', 'a=abc'); // null
  */
-export function getUrlQueryNumber(key: string, url = window.location.href) {
-  return getUrlNumber(key, url);
+export function getUrlNumber(key: string, url = window.location.href) {
+  const str = getUrlParam(key, url);
+  if (!str) return null;
+
+  const num = Number(str);
+  return isNaN(num) ? null : num;
 }
 
 /**
  * 获取url的所有查询参数值
- * - 与 {@link getUrlParamAll} 相同，只是参数url可选,默认取当前地址
  * @param url 完整 URL 或仅查询串（如 "a=1&b=2"）
  * @returns 解码后的键值对象（无参数返回空对象; "null"|"undefined"的参数会被忽略）
  * @example
- * const params = getUrlQueryAll(); // 默认当前地址
- * const params = getUrlQueryAll('a=1&b=2'); // { a: "1", b: "2" }
- * const params = getUrlQueryAll('https://a.com/?a=1&b=2'); // { a: "1", b: "2" }
- * const params = getUrlQueryAll('a=1&b=null'); // { a: "1" }
- * const params = getUrlQueryAll('a=1&b=undefined'); // { a: "1" }
+ * const params = getUrlParams(); // 默认当前地址
+ * const params = getUrlParams('a=1&b=2'); // { a: "1", b: "2" }
+ * const params = getUrlParams('https://a.com/?a=1&b=2'); // { a: "1", b: "2" }
+ * const params = getUrlParams('a=1&b=null'); // { a: "1" }
+ * const params = getUrlParams('a=1&b=undefined'); // { a: "1" }
  */
-export function getUrlQueryAll(url = window.location.href) {
-  return getUrlParamAll(url);
+export function getUrlParams(url = window.location.href) {
+  const searchParams = new URL(url.includes('?') ? url : `?${url}`, 'http://localhost')
+    .searchParams;
+  const result: Record<string, string> = {};
+
+  for (const [key, value] of searchParams.entries()) {
+    if (value !== 'null' && value !== 'undefined') {
+      result[key] = value;
+    }
+  }
+
+  return result;
 }