alemonjs 2.1.11 → 2.1.12

package/lib/utils.d.ts

@@ -22,8 +22,12 @@ export declare const getPublicIP: (options?: Options & {
     force?: boolean;
 }) => Promise<string>;
 export declare class Regular extends RegExp {
-    static or(...regs: RegExp[]): Regular;
-    static and(...regs: RegExp[]): Regular;
-    or(...regs: RegExp[]): Regular;
-    and(...regs: RegExp[]): Regular;
+    static create(pattern: RegExp | string, flags?: string): Regular;
+    private static mergeFlags;
+    static or(...regulars: RegExp[]): Regular;
+    static and(...regulars: RegExp[]): Regular;
+    or(...regulars: RegExp[]): Regular;
+    and(...regulars: RegExp[]): Regular;
+    withFlags(flags: 'i' | 'g' | 'm' | 's' | 'u' | 'y'): Regular;
+    withoutFlags(flagsToRemove: 'i' | 'g' | 'm' | 's' | 'u' | 'y'): Regular;
 }

package/lib/utils.js

@@ -137,17 +137,45 @@ const getPublicIP = async (options = {}) => {
     });
 };
 class Regular extends RegExp {
-    static or(...regs) {
-        return new Regular(`(${regs.map(reg => reg.source).join('|')})`, regs.map(reg => reg.flags).join(''));
+    static create(pattern, flags) {
+        return new Regular(pattern, flags);
+    }
+    static mergeFlags(...flags) {
+        const flagSet = new Set();
+        for (const flagStr of flags) {
+            for (const char of flagStr) {
+                flagSet.add(char);
+            }
+        }
+        return Array.from(flagSet).sort().join('');
+    }
+    static or(...regulars) {
+        const source = regulars.map(reg => `(?:${reg.source})`).join('|');
+        const flags = Regular.mergeFlags(...regulars.map(reg => reg.flags));
+        return new Regular(`(?:${source})`, flags);
     }
-    static and(...regs) {
-        return new Regular(regs.map(reg => `(?=${reg.source})`).join('') + '.*', regs.map(reg => reg.flags).join(''));
+    static and(...regulars) {
+        const lookAHeads = regulars.map(reg => `(?=.*${reg.source})`).join('');
+        const flags = Regular.mergeFlags(...regulars.map(reg => reg.flags));
+        return new Regular(`${lookAHeads}.*`, flags);
     }
-    or(...regs) {
-        return Regular.or(this, ...regs);
+    or(...regulars) {
+        return Regular.or(this, ...regulars);
     }
-    and(...regs) {
-        return Regular.and(this, ...regs);
+    and(...regulars) {
+        return Regular.and(this, ...regulars);
+    }
+    withFlags(flags) {
+        const mergedFlags = Regular.mergeFlags(this.flags, flags);
+        return new Regular(this.source, mergedFlags);
+    }
+    withoutFlags(flagsToRemove) {
+        const currentFlagsSet = new Set(this.flags);
+        for (const char of flagsToRemove) {
+            currentFlagsSet.delete(char);
+        }
+        const newFlags = Array.from(currentFlagsSet).sort().join('');
+        return new Regular(this.source, newFlags);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.11",
+  "version": "2.1.12",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",