fix: replace QUERY_URL_PATTERNS with DICE_COMPILED_PATTERNS in roll and validation logic

Author: Mara-Li

packages/bot/src/commands/roll/snippets.ts

@@ -18,7 +18,7 @@ import {
 	CHARACTER_DETECTION,
 	calculateSimilarity,
 	capitalizeBetweenPunct,
-	QUERY_URL_PATTERNS,
+	QUERY_URL_PATTERNS, DICE_COMPILED_PATTERNS,
 } from "@dicelette/utils";
 import * as Djs from "discord.js";
 import { rollWithInteraction } from "utils";
@@ -106,7 +106,7 @@ export default {
 			const composed = composeRollBase(
 				dice,
 				threshold,
-				QUERY_URL_PATTERNS.COMPARATOR,
+				DICE_COMPILED_PATTERNS.COMPARATOR,
 				undefined,
 				undefined,
 				"",
@@ -133,7 +133,7 @@ export default {
 		const composed = composeRollBase(
 			processedDice,
 			threshold,
-			QUERY_URL_PATTERNS.COMPARATOR,
+			DICE_COMPILED_PATTERNS.COMPARATOR,
 			undefined,
 			undefined,
 			expressionStr,

packages/bot/src/messages/roll_handler.ts

@@ -242,7 +242,8 @@ async function replyToSource(
 		replyOptions.content = content.split("\n")[0];
 		//and after remove it from content and send as a file
 		let newContent = content.split("\n").slice(1).join("\n");
-		const compiledComments = COMPILED_COMMENTS.exec(newContent)?.groups?.comment;
+		
+		const compiledComments = new RegExp(COMPILED_COMMENTS).exec(newContent)?.groups?.comment;
 		if (
 			compiledComments &&
 			compiledComments.length > 0 &&

packages/bot/src/utils/roll.ts

@@ -23,7 +23,7 @@ import {
 	skillCustomCritical,
 } from "@dicelette/parse_result";
 import type { RollOptions, Translation, UserData } from "@dicelette/types";
-import { capitalizeBetweenPunct, profiler, QUERY_URL_PATTERNS } from "@dicelette/utils";
+import {capitalizeBetweenPunct, DICE_COMPILED_PATTERNS, profiler, QUERY_URL_PATTERNS} from "@dicelette/utils";
 import { getRightValue, getTemplate } from "database";
 import * as Djs from "discord.js";
 import { embedError, handleRollResult, reply } from "messages";
@@ -166,7 +166,7 @@ export async function rollMacro(
 	const composed = composeRollBase(
 		dice,
 		threshold,
-		QUERY_URL_PATTERNS.COMPARATOR,
+		DICE_COMPILED_PATTERNS.COMPARATOR,
 		userStatistique.stats,
 		dollarValue?.total,
 		expressionStr,
@@ -300,7 +300,7 @@ export async function rollStatistique(
 	const composed = composeRollBase(
 		dice,
 		threshold,
-		QUERY_URL_PATTERNS.COMPARATOR_SIMPLE,
+		DICE_COMPILED_PATTERNS.COMPARATOR_SIMPLE,
 		userStatistique.stats,
 		userStatStr,
 		expressionStr,

packages/parse_result/src/compose_roll.ts

@@ -1,5 +1,5 @@
 import { DETECT_CRITICAL, generateStatsDice } from "@dicelette/core";
-import { QUERY_URL_PATTERNS } from "@dicelette/utils";
+import {DICE_COMPILED_PATTERNS, QUERY_URL_PATTERNS} from "@dicelette/utils";
 import { trimAll } from "./utils";
 
 /**
@@ -24,8 +24,8 @@ export function extractComparator(
  */
 export function getThreshold(dice: string, threshold?: string): string {
 	if (!threshold) return dice;
-	const diceMatch = QUERY_URL_PATTERNS.COMPARATOR.exec(dice);
-	const thresholdMatch = QUERY_URL_PATTERNS.COMPARATOR.exec(threshold);
+	const diceMatch = DICE_COMPILED_PATTERNS.COMPARATOR.exec(dice);
+	const thresholdMatch = DICE_COMPILED_PATTERNS.COMPARATOR.exec(threshold);
 	if (thresholdMatch) {
 		if (diceMatch) return dice.replace(diceMatch[0], thresholdMatch[0]);
 		return dice + thresholdMatch[0];

packages/parse_result/src/custom_critical.ts

@@ -5,7 +5,12 @@ import {
 	isNumber,
 } from "@dicelette/core";
 import type { CustomCriticalRoll, Translation } from "@dicelette/types";
-import {BotError, BotErrorLevel, type BotErrorOptions, QUERY_URL_PATTERNS} from "@dicelette/utils";
+import {
+	BotError,
+	BotErrorLevel,
+	type BotErrorOptions,
+	DICE_COMPILED_PATTERNS,
+} from "@dicelette/utils";
 import { evaluate } from "mathjs";
 import { getRoll } from "./dice_extractor";
 
@@ -21,7 +26,7 @@ export function parseCustomCritical(
 	name: string,
 	customCritical: string
 ): Record<string, CustomCritical> | undefined {
-	const findPart = new RegExp(QUERY_URL_PATTERNS.COMPARATOR, 'gi')
+	const findPart = new RegExp(DICE_COMPILED_PATTERNS.COMPARATOR, 'gi')
 	const match = findPart.exec(customCritical);
 	if (!match) return;
 	let { sign, comparator:value } = match.groups || {};

packages/parse_result/tests/compose_roll.test.ts

@@ -1,4 +1,4 @@
-import { QUERY_URL_PATTERNS} from "@dicelette/utils";
+import {DICE_COMPILED_PATTERNS} from "@dicelette/utils";
 import { describe, expect, it } from "vitest";
 import { composeRollBase, extractComparator, getThreshold } from "../src/compose_roll";
 
@@ -181,7 +181,7 @@ describe("composeRollBase", () => {
 		const r = composeRollBase(
 			"2d6>=10",
 			undefined,
-			QUERY_URL_PATTERNS.COMPARATOR,
+			DICE_COMPILED_PATTERNS.COMPARATOR,
 			undefined,
 			undefined,
 			"",
@@ -195,7 +195,7 @@ describe("composeRollBase", () => {
 		const r = composeRollBase(
 			"2d6>=10",
 			undefined,
-			QUERY_URL_PATTERNS.COMPARATOR,
+			DICE_COMPILED_PATTERNS.COMPARATOR,
 			undefined,
 			undefined,
 			"+3",
@@ -207,7 +207,7 @@ describe("composeRollBase", () => {
 		const r = composeRollBase(
 			"2d6>=10",
 			">=15",
-			QUERY_URL_PATTERNS.COMPARATOR,
+			DICE_COMPILED_PATTERNS.COMPARATOR,
 			undefined,
 			undefined,
 			"",
@@ -220,7 +220,7 @@ describe("composeRollBase", () => {
 		const r = composeRollBase(
 			"2d6{cf:<=2}>=10",
 			undefined,
-			QUERY_URL_PATTERNS.COMPARATOR,
+			DICE_COMPILED_PATTERNS.COMPARATOR,
 			undefined,
 			undefined,
 			"",
@@ -232,7 +232,7 @@ describe("composeRollBase", () => {
 		const r = composeRollBase(
 			"1d20+strength>=15",
 			undefined,
-			QUERY_URL_PATTERNS.COMPARATOR,
+			DICE_COMPILED_PATTERNS.COMPARATOR,
 			{ strength: 3 },
 			undefined,
 			"",
@@ -246,7 +246,7 @@ describe("composeRollBase", () => {
 		const r = composeRollBase(
 			"1d20>=strength+5",
 			undefined,
-			QUERY_URL_PATTERNS.COMPARATOR,
+			DICE_COMPILED_PATTERNS.COMPARATOR,
 			{ strength: 4 },
 			undefined,
 			"",
@@ -260,7 +260,7 @@ describe("composeRollBase", () => {
 		const r = composeRollBase(
 			"1d20>=10",
 			">=strength+5",
-			QUERY_URL_PATTERNS.COMPARATOR,
+			DICE_COMPILED_PATTERNS.COMPARATOR,
 			{ strength: 6 },
 			undefined,
 			"",

packages/utils/src/regex.ts

@@ -1,8 +1,6 @@
 // Pre-compiled regex patterns for better performance
 export const QUERY_URL_PATTERNS = {
 	AVATAR_URL: /^(https:\/{2})[\w\-./%]+\/[\w\-.%]+\.(jpe?g|gifv?|png|webp)$/gi,
-	COMPARATOR: /(?<sign>([><=]|!=)+)(?<comparator>(.+))/,
-	COMPARATOR_SIMPLE: /(([><=]|!=)+)(.+)/,
 	DISCORD_CDN: /(cdn|media)\.discordapp\.(net|com)/gi,
 	PUNCTUATION_ENCLOSED: /(?<open>\p{P})(?<enclosed>.*?)(?<close>\p{P})/gu,
 	QUERY_PARAMS: /\?.*$/g,
@@ -27,6 +25,8 @@ export const DICE_COMPILED_PATTERNS = {
 	//old version: /(?<first>([><=!]+)(.+?))(?<second>([><=!]+)(.+))
 	OPPOSITION: /(?<first>(([><=]|!=)+)(.+?))(?<second>(([><=]|!=)+)(.+))/,
 	TARGET_VALUE: /^\{(.*?)}$/,
+	COMPARATOR: /(?<sign>([><=]|!=)+)(?<comparator>(.+))/,
+	COMPARATOR_SIMPLE: /(([><=]|!=)+)(.+)/,
 	STATS_REGEX_CACHE: new Map<string, RegExp>(),
 } as const;
 

packages/utils/tests/regex.test.ts

@@ -163,7 +163,7 @@ describe("COMPILED_PATTERNS", () => {
 		];
 
 		for (const { input, sign, comparator } of tests) {
-			const match = QUERY_URL_PATTERNS.COMPARATOR.exec(input);
+			const match = DICE_COMPILED_PATTERNS.COMPARATOR.exec(input);
 			expect(match?.groups?.sign).toBe(sign);
 			expect(match?.groups?.comparator).toBe(comparator);
 		}