@dicelette/core 1.12.1 → 1.12.3

package/dist/index.mjs

@@ -1,77 +1,57 @@
 // src/dice.ts
 import { DiceRoller } from "@dice-roller/rpg-dice-roller";
-import { evaluate } from "mathjs";
+import { evaluate as evaluate2 } from "mathjs";
 
-// src/errors.ts
-var DiceTypeError = class extends Error {
-  dice;
-  cause;
-  method;
-  constructor(dice, cause, method) {
-    super(dice);
-    this.name = "Invalid_Dice_Type";
-    this.dice = dice;
-    this.cause = cause;
-    this.method = method;
-  }
-};
-var FormulaError = class extends Error {
-  formula;
-  cause;
-  method;
-  constructor(formula, cause, method) {
-    super(formula);
-    this.name = "Invalid_Formula";
-    this.formula = formula;
-    this.cause = cause;
-    this.method = method;
-  }
-};
-var MaxGreater = class extends Error {
-  name;
-  value;
-  max;
-  constructor(value, max) {
-    super(value.toString());
-    this.name = "Max_Greater";
-    this.value = value;
-    this.max = max;
-  }
-};
-var EmptyObjectError = class extends Error {
-  name;
-  constructor() {
-    super();
-    this.name = "Empty_Object";
-  }
-};
-var TooManyDice = class extends Error {
-  name;
-  constructor() {
-    super();
-    this.name = "Too_Many_Dice";
-  }
-};
-var TooManyStats = class extends Error {
-  name;
-  constructor() {
-    super();
-    this.name = "Too_Many_Stats";
+// src/utils.ts
+import { evaluate } from "mathjs";
+import "uniformize";
+function escapeRegex(string) {
+  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function standardizeDice(dice) {
+  return dice.replace(
+    /(\[[^\]]+\])|([^[]+)/g,
+    (match, insideBrackets, outsideText) => insideBrackets ? insideBrackets : outsideText.standardize()
+  );
+}
+function generateStatsDice(originalDice, stats, dollarValue) {
+  let dice = originalDice.standardize();
+  if (stats && Object.keys(stats).length > 0) {
+    const allStats = Object.keys(stats);
+    for (const stat of allStats) {
+      const regex = new RegExp(`(?!\\[)${escapeRegex(stat.standardize())}(?!\\])`, "gi");
+      if (dice.match(regex)) {
+        const statValue = stats[stat];
+        dice = dice.replace(regex, statValue.toString());
+      }
+    }
   }
-};
-var NoStatisticsError = class extends Error {
-  name;
-  constructor() {
-    super();
-    this.name = "No_Statistics";
+  if (dollarValue) dice = dice.replaceAll("$", dollarValue);
+  return replaceFormulaInDice(dice);
+}
+function replaceFormulaInDice(dice) {
+  const formula = /(?<formula>\{{2}(.+?)}{2})/gim;
+  let match;
+  let modifiedDice = dice;
+  while ((match = formula.exec(dice)) !== null) {
+    if (match.groups?.formula) {
+      const formulae = match.groups.formula.replaceAll("{{", "").replaceAll("}}", "");
+      try {
+        const result = evaluate(formulae);
+        modifiedDice = modifiedDice.replace(match.groups.formula, result.toString());
+      } catch (error) {
+        throw new FormulaError(match.groups.formula, "replaceFormulasInDice", error);
+      }
+    }
   }
-};
-
-// src/interfaces/constant.ts
-var COMMENT_REGEX = /\s+(#|\/{2}|\[|\/\*)(?<comment>.*)/;
-var SIGN_REGEX = /[><=!]+/;
-var SIGN_REGEX_SPACE = /[><=!]+(\S+)/;
-var SYMBOL_DICE = "&";
+  return cleanedDice(modifiedDice);
+}
+function cleanedDice(dice) {
+  return dice.replaceAll("+-", "-").replaceAll("--", "+").replaceAll("++", "+").trimEnd();
+}
+function isNumber(value) {
+  return value !== void 0 && (typeof value === "number" || !Number.isNaN(Number(value)) && typeof value === "string" && value.trim().length > 0);
+}
 
 // src/dice.ts
 function getCompare(dice, compareRegex) {
@@ -83,7 +63,7 @@ function getCompare(dice, compareRegex) {
   if (sign) {
     const toCalc = calc.replace(SIGN_REGEX, "").replace(/\s/g, "").replace(/;(.*)/, "");
     const rCompare = rollCompare(toCalc);
-    const total = evaluate(rCompare.value.toString());
+    const total = evaluate2(rCompare.value.toString());
     dice = dice.replace(SIGN_REGEX_SPACE, `${compareSign}${total}`);
     compare = {
       sign: compareSign,
@@ -103,11 +83,10 @@ function getCompare(dice, compareRegex) {
   return { dice, compare };
 }
 function rollCompare(value) {
-  const isNumber = (value2) => typeof value2 === "number" || !Number.isNaN(Number(value2)) && typeof value2 === "string";
   if (isNumber(value)) return { value: Number.parseInt(value, 10) };
   const rollComp = roll(value);
   if (!rollComp?.total)
-    return { value: evaluate(value), diceResult: value };
+    return { value: evaluate2(value), diceResult: value };
   return {
     dice: value,
     value: rollComp.total,
@@ -147,7 +126,7 @@ function getModifier(dice) {
   return modificator;
 }
 function roll(dice) {
-  dice = standardizeDice(dice);
+  dice = standardizeDice(dice).replace(/^\+/, "").trimStart();
   if (!dice.includes("d")) return void 0;
   const compareRegex = dice.match(SIGN_REGEX_SPACE);
   let compare;
@@ -201,7 +180,7 @@ function roll(dice) {
 }
 function calculator(sign, value, total) {
   if (sign === "^") sign = "**";
-  return evaluate(`${total} ${sign} ${value}`);
+  return evaluate2(`${total} ${sign} ${value}`);
 }
 function inverseSign(sign) {
   switch (sign) {
@@ -231,7 +210,7 @@ function replaceInFormula(element, diceResult, compareResult, res) {
   const invertedSign = res ? compareResult.compare.sign : inverseSign(compareResult.compare.sign);
   let evaluateRoll;
   try {
-    evaluateRoll = evaluate(compareResult.dice);
+    evaluateRoll = evaluate2(compareResult.dice);
     return `${validSign} ${diceAll}: ${formule} = ${evaluateRoll}${invertedSign}${compareResult.compare?.value}`;
   } catch (error) {
     const evaluateRoll2 = roll(compareResult.dice);
@@ -246,7 +225,7 @@ function compareSignFormule(toRoll, compareRegex, element, diceResult) {
   const toCompare = `${compareResult.dice}${compareResult.compare?.sign}${compareResult.compare?.value}`;
   let res;
   try {
-    res = evaluate(toCompare);
+    res = evaluate2(toCompare);
   } catch (error) {
     res = roll(toCompare);
   }
@@ -255,7 +234,7 @@ function compareSignFormule(toRoll, compareRegex, element, diceResult) {
   } else if (res instanceof Object) {
     const diceResult2 = res;
     if (diceResult2.compare) {
-      const toEvaluate = evaluate(
+      const toEvaluate = evaluate2(
         `${diceResult2.total}${diceResult2.compare.sign}${diceResult2.compare.value}`
       );
       const sign = toEvaluate ? "\u2713" : "\u2715";
@@ -323,7 +302,7 @@ function sharedRolls(dice) {
         diceResult.dice
       );
       try {
-        const evaluated = evaluate(toRoll);
+        const evaluated = evaluate2(toRoll);
         results.push(`\u25C8 ${comment}${diceAll}: ${formule} = ${evaluated}`);
         total += Number.parseInt(evaluated, 10);
       } catch (error) {
@@ -349,114 +328,10 @@ function sharedRolls(dice) {
   };
 }
 
-// src/utils.ts
-import { evaluate as evaluate2 } from "mathjs";
-import "uniformize";
-function escapeRegex(string) {
-  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function standardizeDice(dice) {
-  return dice.replace(
-    /(\[[^\]]+\])|([^[]+)/g,
-    (match, insideBrackets, outsideText) => insideBrackets ? insideBrackets : outsideText.standardize()
-  );
-}
-function generateStatsDice(originalDice, stats, dollarValue) {
-  let dice = originalDice.standardize();
-  if (stats && Object.keys(stats).length > 0) {
-    const allStats = Object.keys(stats);
-    for (const stat of allStats) {
-      const regex = new RegExp(`(?!\\[)${escapeRegex(stat.standardize())}(?!\\])`, "gi");
-      if (dice.match(regex)) {
-        const statValue = stats[stat];
-        dice = dice.replace(regex, statValue.toString());
-      }
-    }
-  }
-  if (dollarValue) dice = dice.replaceAll("$", dollarValue);
-  return replaceFormulaInDice(dice);
-}
-function replaceFormulaInDice(dice) {
-  const formula = /(?<formula>\{{2}(.+?)}{2})/gim;
-  let match;
-  let modifiedDice = dice;
-  while ((match = formula.exec(dice)) !== null) {
-    if (match.groups?.formula) {
-      const formulae = match.groups.formula.replaceAll("{{", "").replaceAll("}}", "");
-      try {
-        const result = evaluate2(formulae);
-        if (result instanceof Object || typeof result === "function") continue;
-        modifiedDice = modifiedDice.replace(match.groups.formula, result.toString());
-      } catch (error) {
-        throw new FormulaError(match.groups.formula, "replaceFormulasInDice", error);
-      }
-    }
-  }
-  return cleanedDice(modifiedDice);
-}
-function cleanedDice(dice) {
-  return dice.replaceAll("+-", "-").replaceAll("--", "+").replaceAll("++", "+").trimEnd();
-}
-
 // src/verify_template.ts
 import { evaluate as evaluate3 } from "mathjs";
 import { Random } from "random-js";
 import "uniformize";
-
-// src/interfaces/zod.ts
-import { z } from "zod";
-var statisticValueSchema = z.object({
-  max: z.number().positive().optional(),
-  min: z.number().positive().optional(),
-  combinaison: z.string().transform((str) => str.trim() || void 0).optional(),
-  exclude: z.boolean().optional()
-}).superRefine((data, ctx) => {
-  if (data.max !== void 0 && data.min !== void 0 && data.max <= data.min) {
-    ctx.addIssue({
-      code: "custom",
-      message: `Max_Greater; ${data.min}; ${data.max}`,
-      path: ["max"]
-    });
-  }
-});
-var statisticSchema = z.record(statisticValueSchema).optional().refine((stats) => !stats || Object.keys(stats).length <= 25, {
-  message: "TooManyStats"
-});
-var criticalSchema = z.object({
-  success: z.string().or(z.number().positive()).optional(),
-  failure: z.string().or(z.number().positive()).optional()
-}).transform((values) => {
-  if (values.success === "") values.success = void 0;
-  if (values.failure === "") values.failure = void 0;
-  if (values.failure === 0) values.failure = void 0;
-  if (values.success === 0) values.success = void 0;
-  values.success = Number.parseInt(values.success, 10);
-  values.failure = Number.parseInt(values.failure, 10);
-  return values;
-});
-var criticalValueSchema = z.object({
-  sign: z.enum(["<", ">", "<=", ">=", "!=", "=="]),
-  value: z.string(),
-  onNaturalDice: z.boolean().optional(),
-  affectSkill: z.boolean().optional()
-});
-var damageSchema = z.record(z.string()).optional().refine((stats) => !stats || Object.keys(stats).length <= 25, {
-  message: "TooManyDice"
-});
-var customCriticalSchema = z.record(criticalValueSchema).optional().refine((stats) => !stats || Object.keys(stats).length <= 22, {
-  message: "TooManyDice"
-});
-var templateSchema = z.object({
-  charName: z.boolean().optional(),
-  statistics: statisticSchema,
-  total: z.number().min(0).optional(),
-  diceType: z.string().optional(),
-  critical: criticalSchema.optional(),
-  customCritical: customCriticalSchema,
-  damage: damageSchema
-});
-
-// src/verify_template.ts
 function evalStatsDice(testDice, allStats) {
   let dice = testDice.trimEnd();
   if (allStats && Object.keys(allStats).length > 0) {
@@ -541,7 +416,6 @@ function evalOneCombinaison(combinaison, stats) {
 }
 function convertNumber(number) {
   if (!number) return void 0;
-  const isNumber = (value) => typeof value === "number" || !Number.isNaN(Number(value)) && typeof value === "string";
   if (number.toString().length === 0) return void 0;
   if (isNumber(number)) return Number.parseInt(number.toString(), 10);
   return void 0;
@@ -653,6 +527,130 @@ function generateRandomStat(total = 100, max, min) {
   }
   return randomStatValue;
 }
+
+// src/errors.ts
+var DiceTypeError = class extends Error {
+  dice;
+  cause;
+  method;
+  constructor(dice, cause, method) {
+    super(dice);
+    this.name = "Invalid_Dice_Type";
+    this.dice = dice;
+    this.cause = cause;
+    this.method = method;
+  }
+};
+var FormulaError = class extends Error {
+  formula;
+  cause;
+  method;
+  constructor(formula, cause, method) {
+    super(formula);
+    this.name = "Invalid_Formula";
+    this.formula = formula;
+    this.cause = cause;
+    this.method = method;
+  }
+};
+var MaxGreater = class extends Error {
+  name;
+  value;
+  max;
+  constructor(value, max) {
+    super(value.toString());
+    this.name = "Max_Greater";
+    this.value = value;
+    this.max = max;
+  }
+};
+var EmptyObjectError = class extends Error {
+  name;
+  constructor() {
+    super();
+    this.name = "Empty_Object";
+  }
+};
+var TooManyDice = class extends Error {
+  name;
+  constructor() {
+    super();
+    this.name = "Too_Many_Dice";
+  }
+};
+var TooManyStats = class extends Error {
+  name;
+  constructor() {
+    super();
+    this.name = "Too_Many_Stats";
+  }
+};
+var NoStatisticsError = class extends Error {
+  name;
+  constructor() {
+    super();
+    this.name = "No_Statistics";
+  }
+};
+
+// src/interfaces/constant.ts
+var COMMENT_REGEX = /\s+(#|\/{2}|\[|\/\*)(?<comment>.*)/;
+var SIGN_REGEX = /[><=!]+/;
+var SIGN_REGEX_SPACE = /[><=!]+(\S+)/;
+var SYMBOL_DICE = "&";
+
+// src/interfaces/zod.ts
+import { z } from "zod";
+var statisticValueSchema = z.object({
+  max: z.number().positive().optional(),
+  min: z.number().positive().optional(),
+  combinaison: z.string().transform((str) => str.trim() || void 0).optional(),
+  exclude: z.boolean().optional()
+}).superRefine((data, ctx) => {
+  if (data.max !== void 0 && data.min !== void 0 && data.max <= data.min) {
+    ctx.addIssue({
+      code: "custom",
+      message: `Max_Greater; ${data.min}; ${data.max}`,
+      path: ["max"]
+    });
+  }
+});
+var statisticSchema = z.record(statisticValueSchema).optional().refine((stats) => !stats || Object.keys(stats).length <= 25, {
+  message: "TooManyStats"
+});
+var criticalSchema = z.object({
+  success: z.string().or(z.number().positive()).optional(),
+  failure: z.string().or(z.number().positive()).optional()
+}).transform((values) => {
+  if (values.success === "") values.success = void 0;
+  if (values.failure === "") values.failure = void 0;
+  if (values.failure === 0) values.failure = void 0;
+  if (values.success === 0) values.success = void 0;
+  values.success = Number.parseInt(values.success, 10);
+  values.failure = Number.parseInt(values.failure, 10);
+  return values;
+});
+var criticalValueSchema = z.object({
+  sign: z.enum(["<", ">", "<=", ">=", "!=", "=="]),
+  value: z.string(),
+  onNaturalDice: z.boolean().optional(),
+  affectSkill: z.boolean().optional()
+});
+var damageSchema = z.record(z.string()).optional().refine((stats) => !stats || Object.keys(stats).length <= 25, {
+  message: "TooManyDice"
+});
+var customCriticalSchema = z.record(criticalValueSchema).optional().refine((stats) => !stats || Object.keys(stats).length <= 22, {
+  message: "TooManyDice"
+});
+var templateSchema = z.object({
+  charName: z.boolean().optional(),
+  statistics: statisticSchema,
+  total: z.number().min(0).optional(),
+  diceType: z.string().optional(),
+  critical: criticalSchema.optional(),
+  customCritical: customCriticalSchema,
+  damage: damageSchema
+});
 export {
   COMMENT_REGEX,
   DiceTypeError,
@@ -666,7 +664,6 @@ export {
   TooManyDice,
   TooManyStats,
   calculator,
-  cleanedDice,
   createCriticalCustom,
   diceRandomParse,
   diceTypeRandomParse,
@@ -676,6 +673,7 @@ export {
   evalStatsDice,
   generateRandomStat,
   generateStatsDice,
+  isNumber,
   replaceFormulaInDice,
   roll,
   standardizeDice,