@zoodogood/utils 3.0.0-change.2568 → 4.0.0-change.2617

package/lib/discordjs/simplify.d.ts

@@ -44,7 +44,7 @@ export function CreateModal({ title, customId, components }: {
     title: any;
     customId: any;
     components: any;
-}): import("discord.js").APIModalInteractionResponseCallbackData;
+}): import(".pnpm/discord-api-types@0.37.97/node_modules/discord-api-types/v10").APIModalInteractionResponseCallbackData;
 export function SimplifyComponents(data: any): any;
 /**
  *

package/lib/primitives/BracketsParser.js

@@ -198,6 +198,11 @@ export class BracketsParser {
                 start: '"',
                 end: '"',
             },
+            {
+                key: "''",
+                start: "'",
+                end: "'",
+            },
         ];
     }
 }

package/lib/primitives/CliParser.d.ts

@@ -86,7 +86,7 @@ export declare class CliParser {
     }): this;
     replaceByMatch(regex: RegExp): RegExpMatchArray | null;
     captureByMatch({ regex, name }: ITextMatch): this;
-    replaceTextByIndexes(start: number, length: number, replacer: (string: string) => string): void;
+    replaceSlice(start: number, length: number, replacer: (string: string) => string): void;
     collect(): CliParserRunContext;
     static CliParserRunContext: typeof CliParserRunContext;
     static CapturedContent: typeof CapturedContent;

package/lib/primitives/CliParser.js

@@ -46,7 +46,7 @@ export class FlagsManager {
     captureResidueFlags(context) {
         let match;
         const { parser } = context;
-        while ((match = parser.replaceByMatch(/-{1,2}\w/))) {
+        while ((match = parser.replaceByMatch(/(?<flag>-{1,2}\w+)(?:(?<separator>\s+(?!-)|=)(?<value>\S+))?/))) {
             this.unhandledFlags || (this.unhandledFlags = []);
             this.unhandledFlags.push(match);
         }
@@ -55,7 +55,7 @@ export class FlagsManager {
     captureFlags(flags, context) {
         for (const { name, capture, expectValue } of flags) {
             for (const flag of capture) {
-                const regex = `(?<=^|\\s)${flag}${expectValue ? "(?:(?:\\s+(?!-)|=)(?<value>[^\\s]+))?" : ""}`;
+                const regex = `(?<=^|\\s)(?<flag>${flag})${expectValue ? "(?:(?<separator>\\s+(?!-)|=)(?<value>[^\\s]+))?" : ""}`;
                 const { parser } = context;
                 const captureName = name || flag;
                 const match = parser.replaceByMatch(RegExp(regex, "i"));
@@ -109,8 +109,8 @@ export class CapturedContent {
     }
     static contentIsRegExpMatchArray(content) {
         return (content instanceof Array &&
-            Object.prototype.hasOwnProperty.call(content, "index") &&
-            Object.prototype.hasOwnProperty.call(content, "input"));
+            content.hasOwnProperty("index") &&
+            content.hasOwnProperty("input"));
     }
     static contentIsString(content) {
         return typeof content === "string";
@@ -196,7 +196,7 @@ export class CliParser {
             const group = groups[index];
             const replacement = context.brackets.toStringGroup(indexes[index]);
             const length = group.length;
-            this.replaceTextByIndexes(group.indexInText - offset, length, () => replacement);
+            this.replaceSlice(group.indexInText - offset, length, () => replacement);
             offset += length - replacement.length;
         }
         return this;
@@ -218,9 +218,14 @@ export class CliParser {
     }
     captureResidue({ name }) {
         const { context } = this;
-        const text = context.input;
-        this.replaceTextByIndexes(0, text.length, () => "");
-        context.captures.set(name, new CapturedContent(text).setContextInstance(context));
+        const raw = context.input;
+        const value = (() => {
+            const stop_hyphen = /^\s+-\s+/;
+            const clean = raw.replace(stop_hyphen, "").trim();
+            return clean;
+        })();
+        this.replaceSlice(0, raw.length, () => "");
+        context.captures.set(name, new CapturedContent(value).setContextInstance(context));
         return this;
     }
     replaceByMatch(regex) {
@@ -233,7 +238,7 @@ export class CliParser {
         if (indexInText === undefined) {
             throw new Error("Match without index");
         }
-        this.replaceTextByIndexes(indexInText, full.length, () => "");
+        this.replaceSlice(indexInText, full.length, () => "");
         return matched;
     }
     captureByMatch({ regex, name }) {
@@ -242,7 +247,7 @@ export class CliParser {
         context.captures.set(name, matched ? new CapturedContent(matched).setContextInstance(context) : null);
         return this;
     }
-    replaceTextByIndexes(start, length, replacer) {
+    replaceSlice(start, length, replacer) {
         const { context } = this;
         const before = context.input.slice(0, start);
         const after = context.input.slice(start + length);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zoodogood/utils",
   "type": "module",
-  "version": "3.0.0-change.2568",
+  "version": "4.0.0-change.2617",
   "description": "",
   "main": "lib/index.js",
   "homepage": "https://zoodogood.github.io/utils",