@whitesev/domutils 1.4.0 → 1.4.2

package/dist/types/src/DOMUtilsEvent.d.ts

@@ -411,6 +411,9 @@ export declare class DOMUtilsEvent {
      * @example
      * DOMUtils.selectorAll("div:regexp('^xxxx$')")
      * > [div.xxx]
+     * @example
+     * DOMUtils.selectorAll("div:regexp(/^xxx/ig)")
+     * > [div.xxx]
      */
     selectorAll<K extends keyof HTMLElementTagNameMap>(selector: K): HTMLElementTagNameMap[K][];
     selectorAll<E extends Element = Element>(selector: string): E[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/domutils",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "使用js重新对jQuery的部分函数进行了仿写",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/DOMUtilsEvent.ts

@@ -1230,6 +1230,9 @@ export class DOMUtilsEvent {
 	 * @example
 	 * DOMUtils.selectorAll("div:regexp('^xxxx$')")
 	 * > [div.xxx]
+	 * @example
+	 * DOMUtils.selectorAll("div:regexp(/^xxx/ig)")
+	 * > [div.xxx]
 	 */
 	selectorAll<K extends keyof HTMLElementTagNameMap>(
 		selector: K
@@ -1247,8 +1250,8 @@ export class DOMUtilsEvent {
 				return $ele?.innerHTML?.trim() === "";
 			});
 		} else if (
-			selector.match(/[^\s]{1}:contains\("(.*)"\)$/gi) ||
-			selector.match(/[^\s]{1}:contains\('(.*)'\)$/gi)
+			selector.match(/[^\s]{1}:contains\("(.*)"\)$/i) ||
+			selector.match(/[^\s]{1}:contains\('(.*)'\)$/i)
 		) {
 			// contains 语法
 			let textMatch = selector.match(/:contains\(("|')(.*)("|')\)$/i);
@@ -1261,13 +1264,19 @@ export class DOMUtilsEvent {
 				return ($ele?.textContent || $ele?.innerText)?.includes(text);
 			});
 		} else if (
-			selector.match(/[^\s]{1}:regexp\("(.*)"\)$/gi) ||
-			selector.match(/[^\s]{1}:regexp\('(.*)'\)$/gi)
+			selector.match(/[^\s]{1}:regexp\("(.*)"\)$/i) ||
+			selector.match(/[^\s]{1}:regexp\('(.*)'\)$/i)
 		) {
 			// regexp 语法
 			let textMatch = selector.match(/:regexp\(("|')(.*)("|')\)$/i);
-			let text = textMatch![2];
-			let regexp = new RegExp(text);
+			let pattern = textMatch![2];
+			let flagMatch = pattern.match(/("|'),[\s]*("|')([igm]{0,3})$/i);
+			let flags = "";
+			if (flagMatch) {
+				pattern = pattern.replace(/("|'),[\s]*("|')([igm]{0,3})$/gi, "");
+				flags = flagMatch[3];
+			}
+			let regexp = new RegExp(pattern, flags);
 			selector = selector.replace(/:regexp\(("|')(.*)("|')\)$/gi, "");
 			return Array.from(
 				context.windowApi.document.querySelectorAll<E>(selector)