@dicelette/core 1.26.0 → 1.27.1

package/dist/index.d.mts

@@ -51,6 +51,14 @@ declare class NoStatisticsError extends Error {
     constructor();
 }
 
+declare const COMMENT_REGEX: RegExp;
+declare const SIGN_REGEX: RegExp;
+declare const SIGN_REGEX_SPACE: RegExp;
+declare const SYMBOL_DICE = "&";
+declare const DETECT_CRITICAL: RegExp;
+declare const OPTIONAL_COMMENT: RegExp;
+declare const MIN_THRESHOLD_MATCH = 0.5;
+
 interface Resultat {
     /**
      * Original dice throw
@@ -237,13 +245,6 @@ declare enum SortOrder {
     None = "none"
 }
 
-declare const COMMENT_REGEX: RegExp;
-declare const SIGN_REGEX: RegExp;
-declare const SIGN_REGEX_SPACE: RegExp;
-declare const SYMBOL_DICE = "&";
-declare const DETECT_CRITICAL: RegExp;
-declare const OPTIONAL_COMMENT: RegExp;
-
 interface StatisticalSchema extends StatisticalTemplate {
     /**
      * Specifies the URL for the schema definition
@@ -293,6 +294,18 @@ declare const templateSchema: z.ZodObject<{
     damage: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, z.core.$strip>;
 
+declare const NORMALIZE_SINGLE_DICE: (str: string) => string;
+declare const REMOVER_PATTERN: {
+    readonly ASTERISK_ESCAPE: RegExp;
+    readonly CRITICAL_BLOCK: RegExp;
+    readonly EXP_REMOVER: RegExp;
+    readonly SIGN_REMOVER: RegExp;
+    readonly STAT_COMMENTS_REMOVER: RegExp;
+    readonly STAT_MATCHER: RegExp;
+};
+declare function getCachedRegex(pattern: string, flags?: string): RegExp;
+declare function includeDiceType(dice: string, diceType?: string, userStats?: boolean): boolean;
+
 /**
  * Parse the string provided and turn it as a readable dice for dice parser
  * @param {string} dice The dice string to parse and roll
@@ -318,7 +331,7 @@ declare function calculateSimilarity(str1: string, str2: string): number;
  * Calculates the Levenshtein distance between two strings.
  */
 declare function levenshteinDistance(str1: string, str2: string): number;
-declare function findBestStatMatch<T>(searchTerm: string, normalizedStats: Map<string, T>, similarityThreshold?: number, partialSearch?: boolean): T | undefined;
+declare function findBestStatMatch<T>(searchTerm: string, normalizedStats: Map<string, T>, similarityThreshold?: number): T | undefined;
 /**
  * Find the snippet name with the highest similarity to `macroName`.
  * Single-pass O(n) algorithm: keeps the best (name, similarity) seen so far.
@@ -326,6 +339,8 @@ declare function findBestStatMatch<T>(searchTerm: string, normalizedStats: Map<s
  * Tie-breaker: first encountered best similarity (deterministic).
  */
 declare function findBestRecord(record: Record<string, string>, searchTerm: string, similarityThreshold?: number): string | null;
+declare function replaceUnknown(dice: string, replacer: string): string;
+declare function verifyStatMatcherPattern(dice: string, replaceUnknow?: string): string;
 
 /**
  * Escape regex string
@@ -451,4 +466,4 @@ declare function testStatCombinaison(template: StatisticalTemplate, engine?: Eng
  */
 declare function generateRandomStat(total?: number | undefined, max?: number, min?: number, engine?: Engine | null): number;
 
-export { COMMENT_REGEX, type Compare, type ComparedValue, type Critical, type CustomCritical, type CustomCriticalMap, DETECT_CRITICAL, DiceTypeError, EmptyObjectError, FormulaError, MaxGreater, type Modifier, NoStatisticsError, OPTIONAL_COMMENT, type Resultat, SIGN_REGEX, SIGN_REGEX_SPACE, SYMBOL_DICE, type Sign, SortOrder, type Statistic, type StatisticalSchema, type StatisticalTemplate, TooManyDice, TooManyStats, calculateSimilarity, createCriticalCustom, diceRandomParse, diceTypeRandomParse, escapeRegex, evalCombinaison, evalOneCombinaison, evalStatsDice, findBestRecord, findBestStatMatch, generateRandomStat, generateStatsDice, getEngine, getEngineId, isNumber, levenshteinDistance, randomInt, replaceExpByRandom, replaceFormulaInDice, replaceInFormula, roll, standardizeDice, templateSchema, testDiceRegistered, testStatCombinaison, verifyTemplateValue };
+export { COMMENT_REGEX, type Compare, type ComparedValue, type Critical, type CustomCritical, type CustomCriticalMap, DETECT_CRITICAL, DiceTypeError, EmptyObjectError, FormulaError, MIN_THRESHOLD_MATCH, MaxGreater, type Modifier, NORMALIZE_SINGLE_DICE, NoStatisticsError, OPTIONAL_COMMENT, REMOVER_PATTERN, type Resultat, SIGN_REGEX, SIGN_REGEX_SPACE, SYMBOL_DICE, type Sign, SortOrder, type Statistic, type StatisticalSchema, type StatisticalTemplate, TooManyDice, TooManyStats, calculateSimilarity, createCriticalCustom, diceRandomParse, diceTypeRandomParse, escapeRegex, evalCombinaison, evalOneCombinaison, evalStatsDice, findBestRecord, findBestStatMatch, generateRandomStat, generateStatsDice, getCachedRegex, getEngine, getEngineId, includeDiceType, isNumber, levenshteinDistance, randomInt, replaceExpByRandom, replaceFormulaInDice, replaceInFormula, replaceUnknown, roll, standardizeDice, templateSchema, testDiceRegistered, testStatCombinaison, verifyStatMatcherPattern, verifyTemplateValue };

package/dist/index.d.ts

@@ -51,6 +51,14 @@ declare class NoStatisticsError extends Error {
     constructor();
 }
 
+declare const COMMENT_REGEX: RegExp;
+declare const SIGN_REGEX: RegExp;
+declare const SIGN_REGEX_SPACE: RegExp;
+declare const SYMBOL_DICE = "&";
+declare const DETECT_CRITICAL: RegExp;
+declare const OPTIONAL_COMMENT: RegExp;
+declare const MIN_THRESHOLD_MATCH = 0.5;
+
 interface Resultat {
     /**
      * Original dice throw
@@ -237,13 +245,6 @@ declare enum SortOrder {
     None = "none"
 }
 
-declare const COMMENT_REGEX: RegExp;
-declare const SIGN_REGEX: RegExp;
-declare const SIGN_REGEX_SPACE: RegExp;
-declare const SYMBOL_DICE = "&";
-declare const DETECT_CRITICAL: RegExp;
-declare const OPTIONAL_COMMENT: RegExp;
-
 interface StatisticalSchema extends StatisticalTemplate {
     /**
      * Specifies the URL for the schema definition
@@ -293,6 +294,18 @@ declare const templateSchema: z.ZodObject<{
     damage: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, z.core.$strip>;
 
+declare const NORMALIZE_SINGLE_DICE: (str: string) => string;
+declare const REMOVER_PATTERN: {
+    readonly ASTERISK_ESCAPE: RegExp;
+    readonly CRITICAL_BLOCK: RegExp;
+    readonly EXP_REMOVER: RegExp;
+    readonly SIGN_REMOVER: RegExp;
+    readonly STAT_COMMENTS_REMOVER: RegExp;
+    readonly STAT_MATCHER: RegExp;
+};
+declare function getCachedRegex(pattern: string, flags?: string): RegExp;
+declare function includeDiceType(dice: string, diceType?: string, userStats?: boolean): boolean;
+
 /**
  * Parse the string provided and turn it as a readable dice for dice parser
  * @param {string} dice The dice string to parse and roll
@@ -318,7 +331,7 @@ declare function calculateSimilarity(str1: string, str2: string): number;
  * Calculates the Levenshtein distance between two strings.
  */
 declare function levenshteinDistance(str1: string, str2: string): number;
-declare function findBestStatMatch<T>(searchTerm: string, normalizedStats: Map<string, T>, similarityThreshold?: number, partialSearch?: boolean): T | undefined;
+declare function findBestStatMatch<T>(searchTerm: string, normalizedStats: Map<string, T>, similarityThreshold?: number): T | undefined;
 /**
  * Find the snippet name with the highest similarity to `macroName`.
  * Single-pass O(n) algorithm: keeps the best (name, similarity) seen so far.
@@ -326,6 +339,8 @@ declare function findBestStatMatch<T>(searchTerm: string, normalizedStats: Map<s
  * Tie-breaker: first encountered best similarity (deterministic).
  */
 declare function findBestRecord(record: Record<string, string>, searchTerm: string, similarityThreshold?: number): string | null;
+declare function replaceUnknown(dice: string, replacer: string): string;
+declare function verifyStatMatcherPattern(dice: string, replaceUnknow?: string): string;
 
 /**
  * Escape regex string
@@ -451,4 +466,4 @@ declare function testStatCombinaison(template: StatisticalTemplate, engine?: Eng
  */
 declare function generateRandomStat(total?: number | undefined, max?: number, min?: number, engine?: Engine | null): number;
 
-export { COMMENT_REGEX, type Compare, type ComparedValue, type Critical, type CustomCritical, type CustomCriticalMap, DETECT_CRITICAL, DiceTypeError, EmptyObjectError, FormulaError, MaxGreater, type Modifier, NoStatisticsError, OPTIONAL_COMMENT, type Resultat, SIGN_REGEX, SIGN_REGEX_SPACE, SYMBOL_DICE, type Sign, SortOrder, type Statistic, type StatisticalSchema, type StatisticalTemplate, TooManyDice, TooManyStats, calculateSimilarity, createCriticalCustom, diceRandomParse, diceTypeRandomParse, escapeRegex, evalCombinaison, evalOneCombinaison, evalStatsDice, findBestRecord, findBestStatMatch, generateRandomStat, generateStatsDice, getEngine, getEngineId, isNumber, levenshteinDistance, randomInt, replaceExpByRandom, replaceFormulaInDice, replaceInFormula, roll, standardizeDice, templateSchema, testDiceRegistered, testStatCombinaison, verifyTemplateValue };
+export { COMMENT_REGEX, type Compare, type ComparedValue, type Critical, type CustomCritical, type CustomCriticalMap, DETECT_CRITICAL, DiceTypeError, EmptyObjectError, FormulaError, MIN_THRESHOLD_MATCH, MaxGreater, type Modifier, NORMALIZE_SINGLE_DICE, NoStatisticsError, OPTIONAL_COMMENT, REMOVER_PATTERN, type Resultat, SIGN_REGEX, SIGN_REGEX_SPACE, SYMBOL_DICE, type Sign, SortOrder, type Statistic, type StatisticalSchema, type StatisticalTemplate, TooManyDice, TooManyStats, calculateSimilarity, createCriticalCustom, diceRandomParse, diceTypeRandomParse, escapeRegex, evalCombinaison, evalOneCombinaison, evalStatsDice, findBestRecord, findBestStatMatch, generateRandomStat, generateStatsDice, getCachedRegex, getEngine, getEngineId, includeDiceType, isNumber, levenshteinDistance, randomInt, replaceExpByRandom, replaceFormulaInDice, replaceInFormula, replaceUnknown, roll, standardizeDice, templateSchema, testDiceRegistered, testStatCombinaison, verifyStatMatcherPattern, verifyTemplateValue };

package/dist/index.js

@@ -25,9 +25,12 @@ __export(index_exports, {
   DiceTypeError: () => DiceTypeError,
   EmptyObjectError: () => EmptyObjectError,
   FormulaError: () => FormulaError,
+  MIN_THRESHOLD_MATCH: () => MIN_THRESHOLD_MATCH,
   MaxGreater: () => MaxGreater,
+  NORMALIZE_SINGLE_DICE: () => NORMALIZE_SINGLE_DICE,
   NoStatisticsError: () => NoStatisticsError,
   OPTIONAL_COMMENT: () => OPTIONAL_COMMENT,
+  REMOVER_PATTERN: () => REMOVER_PATTERN,
   SIGN_REGEX: () => SIGN_REGEX,
   SIGN_REGEX_SPACE: () => SIGN_REGEX_SPACE,
   SYMBOL_DICE: () => SYMBOL_DICE,
@@ -46,19 +49,23 @@ __export(index_exports, {
   findBestStatMatch: () => findBestStatMatch,
   generateRandomStat: () => generateRandomStat,
   generateStatsDice: () => generateStatsDice,
+  getCachedRegex: () => getCachedRegex,
   getEngine: () => getEngine,
   getEngineId: () => getEngineId,
+  includeDiceType: () => includeDiceType,
   isNumber: () => isNumber,
   levenshteinDistance: () => levenshteinDistance,
   randomInt: () => randomInt,
   replaceExpByRandom: () => replaceExpByRandom,
   replaceFormulaInDice: () => replaceFormulaInDice,
   replaceInFormula: () => replaceInFormula,
+  replaceUnknown: () => replaceUnknown,
   roll: () => roll,
   standardizeDice: () => standardizeDice,
   templateSchema: () => templateSchema,
   testDiceRegistered: () => testDiceRegistered,
   testStatCombinaison: () => testStatCombinaison,
+  verifyStatMatcherPattern: () => verifyStatMatcherPattern,
   verifyTemplateValue: () => verifyTemplateValue
 });
 module.exports = __toCommonJS(index_exports);
@@ -157,14 +164,6 @@ var NoStatisticsError = class extends Error {
   }
 };
 
-// src/interfaces/index.ts
-var SortOrder = /* @__PURE__ */ ((SortOrder2) => {
-  SortOrder2["Ascending"] = "sa";
-  SortOrder2["Descending"] = "sd";
-  SortOrder2["None"] = "none";
-  return SortOrder2;
-})(SortOrder || {});
-
 // src/interfaces/constant.ts
 var COMMENT_REGEX = /\s+(#|\/{2}|\[|\/\*)(?<comment>.*)/gi;
 var SIGN_REGEX = /==|!=|(?<![!<>])>=|(?<![!<>])<=|(?<!!)(?<![<>])>|(?<!!)(?<![<>])<|(?<!!)(?<![<>])=/;
@@ -172,6 +171,15 @@ var SIGN_REGEX_SPACE = /(==|!=|(?<![!<>])>=|(?<![!<>])<=|(?<!!)(?<![<>])>|(?<!!)
 var SYMBOL_DICE = "&";
 var DETECT_CRITICAL = /\{\*?c[fs]:([<>=]|!=)+(.+?)}/gim;
 var OPTIONAL_COMMENT = /\s+(#|\/{2}|\[|\/\*)?(?<comment>.*)/gi;
+var MIN_THRESHOLD_MATCH = 0.5;
+
+// src/interfaces/index.ts
+var SortOrder = /* @__PURE__ */ ((SortOrder2) => {
+  SortOrder2["Ascending"] = "sa";
+  SortOrder2["Descending"] = "sd";
+  SortOrder2["None"] = "none";
+  return SortOrder2;
+})(SortOrder || {});
 
 // src/interfaces/zod.ts
 var import_zod = require("zod");
@@ -229,6 +237,45 @@ var templateSchema = import_zod.z.object({
   damage: damageSchema
 });
 
+// src/regex.ts
+var regexCache = /* @__PURE__ */ new Map();
+var NORMALIZE_SINGLE_DICE = (str) => str.replace(/\b1d(\d+)/gi, "d$1");
+var REMOVER_PATTERN = {
+  ASTERISK_ESCAPE: /\*/g,
+  CRITICAL_BLOCK: /\{\*?c[fs]:([<>=]|!=)+.+?\}/gim,
+  EXP_REMOVER: /\{exp(.*?)\}/g,
+  SIGN_REMOVER: /([><=]|!=)+.*$/,
+  STAT_COMMENTS_REMOVER: /%%.*%%/,
+  STAT_MATCHER: /\(?\$([\p{L}\p{M}_.][\p{L}\p{M}0-9_.]*)\)?/giu
+};
+function getCachedRegex(pattern, flags = "") {
+  const key = `${pattern}|${flags}`;
+  let regex = regexCache.get(key);
+  if (!regex) {
+    regex = new RegExp(pattern, flags);
+    regexCache.set(key, regex);
+  }
+  return regex;
+}
+function includeDiceType(dice, diceType, userStats) {
+  if (!diceType) return false;
+  diceType = NORMALIZE_SINGLE_DICE(diceType);
+  dice = NORMALIZE_SINGLE_DICE(dice);
+  if (userStats && diceType.includes("$")) {
+    diceType = diceType.replace("$", ".+?");
+  }
+  if (SIGN_REGEX.test(diceType)) {
+    diceType = diceType.replace(REMOVER_PATTERN.SIGN_REMOVER, "").trim();
+    dice = dice.replace(REMOVER_PATTERN.SIGN_REMOVER, "").trim();
+  }
+  if (diceType.includes("{exp")) {
+    diceType = diceType.replace(REMOVER_PATTERN.EXP_REMOVER, "").trim();
+    dice = dice.replace(REMOVER_PATTERN.EXP_REMOVER, "").trim();
+  }
+  const detectDiceType = getCachedRegex(`\\b${diceType}\\b`, "i");
+  return detectDiceType.test(dice);
+}
+
 // src/roll.ts
 var import_rpg_dice_roller7 = require("@dice-roller/rpg-dice-roller");
 var import_mathjs8 = require("mathjs");
@@ -248,7 +295,6 @@ var import_rpg_dice_roller2 = require("@dice-roller/rpg-dice-roller");
 var import_random_js = require("random-js");
 
 // src/similarity.ts
-var MIN_THRESHOLD_MATCH = 0.5;
 function calculateSimilarity(str1, str2) {
   const longer = str1.length > str2.length ? str1 : str2;
   const shorter = str1.length > str2.length ? str2 : str1;
@@ -275,23 +321,18 @@ function levenshteinDistance(str1, str2) {
   }
   return matrix[str2.length][str1.length];
 }
-function findBestStatMatch(searchTerm, normalizedStats, similarityThreshold = MIN_THRESHOLD_MATCH, partialSearch = true) {
+function findBestStatMatch(searchTerm, normalizedStats, similarityThreshold = MIN_THRESHOLD_MATCH) {
   const exact = normalizedStats.get(searchTerm);
   if (exact) return exact;
-  if (partialSearch) {
-    const candidates = [];
-    for (const [normalizedKey, original] of normalizedStats) {
-      if (normalizedKey.startsWith(searchTerm))
-        candidates.push([original, normalizedKey.length]);
-      else if (normalizedKey.endsWith(searchTerm))
-        candidates.push([original, normalizedKey.length]);
-      else if (normalizedKey.includes(searchTerm))
-        candidates.push([original, normalizedKey.length]);
-    }
-    if (candidates.length > 0) {
-      candidates.sort((a, b) => a[1] - b[1]);
-      return candidates[0][0];
-    }
+  const candidates = [];
+  for (const [normalizedKey, original] of normalizedStats) {
+    if (normalizedKey.startsWith(searchTerm))
+      candidates.push([original, calculateSimilarity(searchTerm, normalizedKey)]);
+  }
+  if (candidates.length === 1) return candidates[0][0];
+  if (candidates.length > 0) {
+    candidates.sort((a, b) => b[1] - a[1]);
+    if (candidates[0][1] >= similarityThreshold) return candidates[0][0];
   }
   let bestMatch;
   let bestSimilarity = 0;
@@ -313,10 +354,22 @@ function findBestRecord(record, searchTerm, similarityThreshold = MIN_THRESHOLD_
   return findBestStatMatch(
     searchTerm.standardize(),
     normalizeRecord,
-    similarityThreshold,
-    false
+    similarityThreshold
   ) || null;
 }
+function replaceUnknown(dice, replacer) {
+  return dice.replaceAll(REMOVER_PATTERN.STAT_MATCHER, replacer).replaceAll("+0", "").replaceAll("-0", "");
+}
+function verifyStatMatcherPattern(dice, replaceUnknow) {
+  if (REMOVER_PATTERN.STAT_MATCHER.test(dice)) {
+    if (replaceUnknow)
+      return replaceUnknown(dice, replaceUnknow);
+    const matched = dice.matchAll(new RegExp(REMOVER_PATTERN.STAT_MATCHER));
+    const stats = matched ? Array.from(matched, (m) => m?.[0]).map((s) => `\`${s}\``).join(", ") : "unknown";
+    throw new DiceTypeError("error.invalidDice.stats");
+  }
+  return dice.replaceAll("+0", "").replaceAll("-0", "");
+}
 
 // src/utils.ts
 function escapeRegex(string) {
@@ -333,7 +386,7 @@ function handleDiceAfterD(tokenStd, normalizedStats) {
   if (!diceMatch) return null;
   const diceCount = diceMatch[1] || "";
   const afterD = diceMatch[2];
-  const bestMatch = findBestStatMatch(afterD, normalizedStats, 1, false);
+  const bestMatch = findBestStatMatch(afterD, normalizedStats, 1);
   if (bestMatch) {
     const [, value] = bestMatch;
     return `${diceCount}d${value.toString()}`;
@@ -341,7 +394,7 @@ function handleDiceAfterD(tokenStd, normalizedStats) {
   return null;
 }
 function handleSimpleToken(tokenStd, token, normalizedStats, minThreshold) {
-  const bestMatch = findBestStatMatch(tokenStd, normalizedStats, minThreshold, false);
+  const bestMatch = findBestStatMatch(tokenStd, normalizedStats, minThreshold);
   if (bestMatch) {
     const [, value] = bestMatch;
     return value.toString();
@@ -1538,9 +1591,12 @@ function generateRandomStat(total = 100, max, min, engine = import_rpg_dice_roll
   DiceTypeError,
   EmptyObjectError,
   FormulaError,
+  MIN_THRESHOLD_MATCH,
   MaxGreater,
+  NORMALIZE_SINGLE_DICE,
   NoStatisticsError,
   OPTIONAL_COMMENT,
+  REMOVER_PATTERN,
   SIGN_REGEX,
   SIGN_REGEX_SPACE,
   SYMBOL_DICE,
@@ -1559,19 +1615,23 @@ function generateRandomStat(total = 100, max, min, engine = import_rpg_dice_roll
   findBestStatMatch,
   generateRandomStat,
   generateStatsDice,
+  getCachedRegex,
   getEngine,
   getEngineId,
+  includeDiceType,
   isNumber,
   levenshteinDistance,
   randomInt,
   replaceExpByRandom,
   replaceFormulaInDice,
   replaceInFormula,
+  replaceUnknown,
   roll,
   standardizeDice,
   templateSchema,
   testDiceRegistered,
   testStatCombinaison,
+  verifyStatMatcherPattern,
   verifyTemplateValue
 });
 //# sourceMappingURL=index.js.map