@cclr/utils 0.1.2 → 0.1.4

package/lib/cjs/index.js

@@ -1 +1 @@
-"use strict";var e=require("@cclr/lang");const t=new RegExp(["^(?<protocol>[a-zA-Z][a-zA-Zd+-.]*:)?","(?:\\/\\/(?<auth>[^@/?#]*@)?(?<host>[^/?#]*))?","(?<pathname>[^?#]*)","(?:\\?(?<query>[^#]*))?","(?:#(?<hash>.*))?"].join("")),r=/#(?<hash>.*)/,n=e=>{if(!e)return"";const t=e.split("?")[1];return t?t.replace(r,""):""};const l={parseUrl:function(r){const n=r.match(t),{protocol:l,auth:s,host:u,pathname:o,query:a,hash:c}=e.get(n,"groups",{});let p=null,h=null;if(u){const[e,t]=u.split(":");p=e,h=t||null}return{href:r,protocol:l||null,slashes:r.includes("//")||null,auth:s?s.slice(0,-1):null,host:u||null,hostname:p||null,port:h||null,pathname:o||null,search:a?`?${a}`:null,query:a||null,hash:c||null}},getQuery:n,getQueryObj:e=>{if(!e)return{};return(n(e)||e).split("&").reduce(((e,t)=>{const r=t.indexOf("=");let n=[];n=-1!==r?[t.substring(0,r),t.substring(r+1)]:[t];const l=n.map((e=>decodeURIComponent(e.replace("+"," "))));return e[l[0]]=l[1],e}),{})}};exports.HASH_REGEX=r,exports.QUERY_REGEX=/\?(?<query>[^#]*)/,exports.URL_REGEX=t,exports.deepClone=e=>JSON.parse(JSON.stringify(e)),exports.enumToArray=t=>e.isPlainObject(t)?[Object.keys(t)]:[],exports.uri=l,exports.uuid=()=>{const e=["a","b","c","d","e","f","0","1","2","3","4","5","6","7","8","9"],t=[];for(let r=0;r<36;r++)t[r]=8===r||13===r||18===r||23===r?"-":e[Math.ceil(Math.random()*e.length-1)];return t.join("")};
+"use strict";var e=require("@cclr/lang");const t=new RegExp(["^(?<protocol>[a-zA-Z][a-zA-Zd+-.]*:)?","(?:\\/\\/(?<auth>[^@/?#]*@)?(?<host>[^/?#]*))?","(?<pathname>[^?#]*)","(?:\\?(?<query>[^#]*))?","(?:#(?<hash>.*))?"].join("")),n=/#(?<hash>.*)/,r=/^(?:[a-zA-Z][a-zA-Zd+-.]*:)?(?:\/\/(?:[^@/?#]*@)?[^/?#]*)?(?<pathname>[^?#]*)/,o=e=>{const{protocol:t,auth:n,host:r,hostname:o,port:s,pathname:u,query:l,search:a,hash:c}=e;return`${t?`${t}//`:""}${n?`${n}@`:""}${r||`${o||""}${s?`:${s}`:""}`}${u}${l?`?${l}`:a||""}${c?`#${c}`:""}`},s=e=>{if(!e)return"";const t=e.split("?")[1];return t?t.replace(n,""):""},u=e=>{if(!e)return{};return s(e).split("&").reduce(((e,t)=>{const n=t.indexOf("=");let r=[];r=-1!==n?[t.substring(0,n),t.substring(n+1)]:[t];const o=r.map((e=>decodeURIComponent(e.replace("+"," "))));return e[o[0]]=o[1],e}),{})};function l(n){const r=n.match(t),{protocol:o,auth:s,host:u,pathname:l,query:a,hash:c}=e.get(r,"groups",{});let h=null,p=null;if(u){const[e,t]=u.split(":");h=e,p=t||null}return{href:n,protocol:o||null,slashes:n.includes("//")||null,auth:s?s.slice(0,-1):null,host:u||null,hostname:h||null,port:p||null,pathname:l||null,search:a?`?${a}`:null,query:a||null,hash:c||null}}const a=t=>{const n=[];for(const r in t){const o=t[r];e.isUndefinedOrNull(o)?n.push(encodeURIComponent(r)+"="):n.push(encodeURIComponent(r)+"="+encodeURIComponent(o))}return n.join("&")},c=(e,t)=>{const{queryObj:n,...r}=t,s={...l(e),...r},c={...u(s.search||""),...n};return o({...s,search:"",query:a(c)})};function h(e){const t=e.match(r);if(t)return t.groups?.pathname||""}const p={parseUrl:l,getPathArr:function(t){const n=h(t);if(!e.isUndefined(n))return n.split("/").filter(Boolean)},getPathStr:h,getQuery:s,getQueryObj:u,toQueryString:a,change:c,addQuery:(e,t)=>c(e,{queryObj:t}),combine:o};exports.HASH_REGEX=n,exports.PATHNAME_REGEX=r,exports.QUERY_REGEX=/\?(?<query>[^#]*)/,exports.URL_REGEX=t,exports.deepClone=e=>JSON.parse(JSON.stringify(e)),exports.enumToArray=t=>e.isPlainObject(t)?[Object.keys(t)]:[],exports.uri=p,exports.uuid=()=>{const e=["a","b","c","d","e","f","0","1","2","3","4","5","6","7","8","9"],t=[];for(let n=0;n<36;n++)t[n]=8===n||13===n||18===n||23===n?"-":e[Math.ceil(Math.random()*e.length-1)];return t.join("")};

package/lib/esm/index.js

@@ -1 +1 @@
-import{isPlainObject as t,get as e}from"@cclr/lang";const n=t=>JSON.parse(JSON.stringify(t)),l=e=>t(e)?[Object.keys(e)]:[],r=new RegExp(["^(?<protocol>[a-zA-Z][a-zA-Zd+-.]*:)?","(?:\\/\\/(?<auth>[^@/?#]*@)?(?<host>[^/?#]*))?","(?<pathname>[^?#]*)","(?:\\?(?<query>[^#]*))?","(?:#(?<hash>.*))?"].join("")),u=/\?(?<query>[^#]*)/,o=/#(?<hash>.*)/,s=t=>{if(!t)return"";const e=t.split("?")[1];return e?e.replace(o,""):""};const a={parseUrl:function(t){const n=t.match(r),{protocol:l,auth:u,host:o,pathname:s,query:a,hash:c}=e(n,"groups",{});let h=null,p=null;if(o){const[t,e]=o.split(":");h=t,p=e||null}return{href:t,protocol:l||null,slashes:t.includes("//")||null,auth:u?u.slice(0,-1):null,host:o||null,hostname:h||null,port:p||null,pathname:s||null,search:a?`?${a}`:null,query:a||null,hash:c||null}},getQuery:s,getQueryObj:t=>{if(!t)return{};return(s(t)||t).split("&").reduce(((t,e)=>{const n=e.indexOf("=");let l=[];l=-1!==n?[e.substring(0,n),e.substring(n+1)]:[e];const r=l.map((t=>decodeURIComponent(t.replace("+"," "))));return t[r[0]]=r[1],t}),{})}},c=()=>{const t=["a","b","c","d","e","f","0","1","2","3","4","5","6","7","8","9"],e=[];for(let n=0;n<36;n++)e[n]=8===n||13===n||18===n||23===n?"-":t[Math.ceil(Math.random()*t.length-1)];return e.join("")};export{o as HASH_REGEX,u as QUERY_REGEX,r as URL_REGEX,n as deepClone,l as enumToArray,a as uri,c as uuid};
+import{isPlainObject as t,get as n,isUndefinedOrNull as e,isUndefined as r}from"@cclr/lang";const o=t=>JSON.parse(JSON.stringify(t)),s=n=>t(n)?[Object.keys(n)]:[],u=new RegExp(["^(?<protocol>[a-zA-Z][a-zA-Zd+-.]*:)?","(?:\\/\\/(?<auth>[^@/?#]*@)?(?<host>[^/?#]*))?","(?<pathname>[^?#]*)","(?:\\?(?<query>[^#]*))?","(?:#(?<hash>.*))?"].join("")),a=/\?(?<query>[^#]*)/,l=/#(?<hash>.*)/,c=/^(?:[a-zA-Z][a-zA-Zd+-.]*:)?(?:\/\/(?:[^@/?#]*@)?[^/?#]*)?(?<pathname>[^?#]*)/,h=t=>{const{protocol:n,auth:e,host:r,hostname:o,port:s,pathname:u,query:a,search:l,hash:c}=t;return`${n?`${n}//`:""}${e?`${e}@`:""}${r||`${o||""}${s?`:${s}`:""}`}${u}${a?`?${a}`:l||""}${c?`#${c}`:""}`},p=t=>{if(!t)return"";const n=t.split("?")[1];return n?n.replace(l,""):""},i=t=>{if(!t)return{};return p(t).split("&").reduce(((t,n)=>{const e=n.indexOf("=");let r=[];r=-1!==e?[n.substring(0,e),n.substring(e+1)]:[n];const o=r.map((t=>decodeURIComponent(t.replace("+"," "))));return t[o[0]]=o[1],t}),{})};function m(t){const e=t.match(u),{protocol:r,auth:o,host:s,pathname:a,query:l,hash:c}=n(e,"groups",{});let h=null,p=null;if(s){const[t,n]=s.split(":");h=t,p=n||null}return{href:t,protocol:r||null,slashes:t.includes("//")||null,auth:o?o.slice(0,-1):null,host:s||null,hostname:h||null,port:p||null,pathname:a||null,search:l?`?${l}`:null,query:l||null,hash:c||null}}const f=t=>{const n=[];for(const r in t){const o=t[r];e(o)?n.push(encodeURIComponent(r)+"="):n.push(encodeURIComponent(r)+"="+encodeURIComponent(o))}return n.join("&")},d=(t,n)=>{const{queryObj:e,...r}=n,o={...m(t),...r},s={...i(o.search||""),...e};return h({...o,search:"",query:f(s)})};function g(t){const n=t.match(c);if(n)return n.groups?.pathname||""}const y={parseUrl:m,getPathArr:function(t){const n=g(t);if(!r(n))return n.split("/").filter(Boolean)},getPathStr:g,getQuery:p,getQueryObj:i,toQueryString:f,change:d,addQuery:(t,n)=>d(t,{queryObj:n}),combine:h},$=()=>{const t=["a","b","c","d","e","f","0","1","2","3","4","5","6","7","8","9"],n=[];for(let e=0;e<36;e++)n[e]=8===e||13===e||18===e||23===e?"-":t[Math.ceil(Math.random()*t.length-1)];return n.join("")};export{l as HASH_REGEX,c as PATHNAME_REGEX,a as QUERY_REGEX,u as URL_REGEX,o as deepClone,s as enumToArray,y as uri,$ as uuid};

package/lib/type/index.d.ts

@@ -1,3 +1,4 @@
+import * as _cclr_lang from '@cclr/lang';
 import { TAny, TPlainObject } from '@cclr/lang';
 
 /**
@@ -17,6 +18,7 @@ declare const enumToArray: (e: TPlainObject) => string[][];
 declare const URL_REGEX: RegExp;
 declare const QUERY_REGEX: RegExp;
 declare const HASH_REGEX: RegExp;
+declare const PATHNAME_REGEX: RegExp;
 
 interface IUrl {
     /** 完整的 URL 字符串，例如 https://example.com:8080/path?query#fragment */
@@ -43,6 +45,20 @@ interface IUrl {
     hash?: string | null | undefined;
 }
 
+/**
+ * 获取 URL 路径数组
+ * @param url
+ * @returns
+ */
+declare function getPathArr(url: string): string[] | undefined;
+
+/**
+ * 获取 URL 路径字符串
+ * @param url
+ * @returns
+ */
+declare function getPathStr(url: string): string | undefined;
+
 /**
  * 解析url
  * 通过正则解析
@@ -53,8 +69,16 @@ declare function parseUrl(url: string): IUrl;
 
 declare const uri: {
     parseUrl: typeof parseUrl;
+    getPathArr: typeof getPathArr;
+    getPathStr: typeof getPathStr;
     getQuery: (url: string) => string;
     getQueryObj: (url: string) => {};
+    toQueryString: (params: _cclr_lang.TPlainObject) => string;
+    change: (url: string, urlObj: Omit<IUrl, "search" | "query"> & {
+        queryObj?: _cclr_lang.TPlainObject;
+    }) => string;
+    addQuery: (url: string, queryObj: _cclr_lang.TPlainObject) => string;
+    combine: (urlParams: IUrl) => string;
 };
 
 /**
@@ -65,4 +89,4 @@ declare const uri: {
  */
 declare const uuid: () => string;
 
-export { HASH_REGEX, QUERY_REGEX, URL_REGEX, deepClone, enumToArray, uri, uuid };
+export { HASH_REGEX, type IUrl, PATHNAME_REGEX, QUERY_REGEX, URL_REGEX, deepClone, enumToArray, uri, uuid };

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@cclr/utils",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "> TODO: description",
   "author": "cclr <18843152354@163.com>",
   "homepage": "",
   "license": "MIT",
+  "type": "module",
   "main": "lib/cjs/index.js",
   "module": "lib/esm/index.js",
   "types": "lib/type/index.d.ts",
@@ -30,8 +31,8 @@
     "g:test": "vitest run",
     "g:build": "ccf build"
   },
-  "gitHead": "361f93f5ddccff3c90ee52b0698e289dd7c699a2",
+  "gitHead": "060e2cfbf8d6f933f431d54b528332f08af20b60",
   "dependencies": {
-    "@cclr/lang": "^0.1.2"
+    "@cclr/lang": "0.1.4"
   }
 }