refactor(es modules): modulize utils

modules/burgs-and-states.js

@@ -4,6 +4,8 @@ import {layerIsOn} from "./ui/layers";
 import {getColors, getRandomColor, getMixedColor} from "/src/utils/colorUtils";
 import {getMiddlePoint} from "@/utils/lineUtils";
 import {rn, minmax} from "/src/utils/numberUtils";
+import {rand, P, each, gauss, ra, rw, generateSeed} from "@/utils/probabilityUtils";
+import {round, splitInTwo} from "@/utils/stringUtils";
 
 window.BurgsAndStates = (function () {
   const generate = function () {

modules/coa-generator.js

@@ -1,3 +1,5 @@
+import {P, rw} from "@/utils/probabilityUtils";
+
 window.COA = (function () {
   const tinctures = {
     field: {metals: 3, colours: 4, stains: +P(0.03), patterns: 1},

modules/cultures-generator.js

@@ -1,6 +1,7 @@
 import {TIME} from "/src/config/logging";
 import {getColors} from "/src/utils/colorUtils";
 import {rn, minmax} from "/src/utils/numberUtils";
+import {rand, P, rw, biased} from "@/utils/probabilityUtils";
 
 window.Cultures = (function () {
   let cells;

modules/dynamic/auto-update.js

@@ -1,5 +1,7 @@
 import {findCell} from "/src/utils/graphUtils";
 import {rn} from "/src/utils/numberUtils";
+import {rand, P, rw} from "@/utils/probabilityUtils";
+import {parseTransform} from "@/utils/stringUtils";
 
 // update old .map version to the current one
 export function resolveVersionConflicts(version) {

modules/dynamic/editors/cultures-editor.js

@@ -3,6 +3,7 @@ import {findAll, findCell, getPackPolygon, isLand} from "/src/utils/graphUtils";
 import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips";
 import {byId} from "/src/utils/shorthands";
 import {rn} from "/src/utils/numberUtils";
+import {capitalize} from "@/utils/stringUtils";
 
 const $body = insertEditorHtml();
 addListeners();

modules/dynamic/editors/states-editor.js

@@ -4,6 +4,7 @@ import {byId} from "/src/utils/shorthands";
 import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips";
 import {getRandomColor, getMixedColor} from "/src/utils/colorUtils";
 import {rn} from "/src/utils/numberUtils";
+import {rand, P} from "@/utils/probabilityUtils";
 
 const $body = insertEditorHtml();
 addListeners();

modules/dynamic/heightmap-selection.js

@@ -1,5 +1,6 @@
 import {shouldRegenerateGrid, generateGrid} from "/src/utils/graphUtils";
 import {byId} from "/src/utils/shorthands";
+import {generateSeed} from "@/utils/probabilityUtils";
 
 const initialSeed = generateSeed();
 let graph = getGraph(grid);

modules/dynamic/hierarchy-tree.js

@@ -1,5 +1,6 @@
 import {byId} from "/src/utils/shorthands";
 import {tip} from "/src/scripts/tooltips";
+import {capitalize} from "@/utils/stringUtils";
 
 appendStyleSheet();
 insertHtml();

modules/dynamic/overview/charts-overview.js

@@ -3,6 +3,7 @@ import {isWater} from "/src/utils/graphUtils";
 import {tip} from "/src/scripts/tooltips";
 import {byId} from "/src/utils/shorthands";
 import {rn} from "/src/utils/numberUtils";
+import {capitalize} from "@/utils/stringUtils";
 
 const entitiesMap = {
   states: {

modules/dynamic/supporters.js

@@ -1,3 +1,5 @@
+import {capitalize} from "@/utils/stringUtils";
+
 const capitalize = text => text.charAt(0).toUpperCase() + text.slice(1);
 
 const format = rawList =>

modules/heightmap-generator.js

@@ -2,6 +2,7 @@ import {TIME} from "/src/config/logging";
 import {createTypedArray} from "/src/utils/arrayUtils";
 import {findGridCell} from "/src/utils/graphUtils";
 import {byId} from "/src/utils/shorthands";
+import {rand, P, getNumberInRange} from "@/utils/probabilityUtils";
 
 window.HeightmapGenerator = (function () {
   let grid = null;

modules/io/save.js

@@ -1,6 +1,7 @@
 import {tip} from "/src/scripts/tooltips";
 import {rn} from "/src/utils/numberUtils";
 import {ldb} from "@/scripts/indexedDB";
+import {ra} from "@/utils/probabilityUtils";
 
 // functions to save project as .map file
 

modules/markers-generator.js

@@ -2,6 +2,8 @@ import {TIME} from "/src/config/logging";
 import {getFriendlyHeight} from "./ui/general";
 import {last} from "/src/utils/arrayUtils";
 import {rn} from "/src/utils/numberUtils";
+import {rand, P, gauss, ra, rw} from "@/utils/probabilityUtils";
+import {capitalize} from "@/utils/stringUtils";
 
 window.Markers = (function () {
   let config = [];

modules/military-generator.js

@@ -1,5 +1,6 @@
 import {TIME} from "/src/config/logging";
 import {rn, minmax} from "/src/utils/numberUtils";
+import {rand, gauss, ra} from "@/utils/probabilityUtils";
 
 window.Military = (function () {
   const generate = function () {

modules/names-generator.js

@@ -1,6 +1,8 @@
 import {last} from "/src/utils/arrayUtils";
 import {locked} from "/src/scripts/options/lock";
 import {tip} from "/src/scripts/tooltips";
+import {rand, P, ra} from "@/utils/probabilityUtils";
+import {capitalize} from "@/utils/stringUtils";
 
 window.Names = (function () {
   let chains = [];

modules/ocean-layers.js

@@ -1,6 +1,8 @@
 import {TIME} from "@/config/logging";
 import {clipPoly} from "@/utils/lineUtils";
 import {rn} from "@/utils/numberUtils";
+import {P} from "@/utils/probabilityUtils";
+import {round} from "@/utils/stringUtils";
 
 window.OceanLayers = (function () {
   let cells, vertices, pointsN, used;

modules/relief-icons.js

@@ -1,5 +1,6 @@
 import {getPackPolygon} from "/src/utils/graphUtils";
 import {rn, minmax} from "/src/utils/numberUtils";
+import {rand} from "@/utils/probabilityUtils";
 
 window.ReliefIcons = (function () {
   const ReliefIcons = function () {

modules/religions-generator.js

@@ -3,6 +3,7 @@ import {findAll} from "/src/utils/graphUtils";
 import {unique} from "/src/utils/arrayUtils";
 import {getRandomColor, getMixedColor} from "/src/utils/colorUtils";
 import {rn} from "/src/utils/numberUtils";
+import {rand, P, ra, rw, biased} from "@/utils/probabilityUtils";
 
 window.Religions = (function () {
   // name generation approach and relative chance to be selected

modules/river-generator.js

@@ -1,6 +1,7 @@
 import {TIME} from "/src/config/logging";
 import {last} from "/src/utils/arrayUtils";
 import {rn} from "/src/utils/numberUtils";
+import {round} from "@/utils/stringUtils";
 
 window.Rivers = (function () {
   const generate = function (allowErosion = true) {

modules/routes-generator.js

@@ -1,6 +1,7 @@
 import {TIME} from "/src/config/logging";
 import {findCell} from "/src/utils/graphUtils";
 import {last} from "/src/utils/arrayUtils";
+import {round} from "@/utils/stringUtils";
 
 window.Routes = (function () {
   const getRoads = function () {

modules/ui/battle-screen.js

@@ -2,6 +2,8 @@ import {last} from "/src/utils/arrayUtils";
 import {tip} from "/src/scripts/tooltips";
 import {wiki} from "@/utils/linkUtils";
 import {rn, minmax} from "/src/utils/numberUtils";
+import {rand, P, Pint} from "@/utils/probabilityUtils";
+import {capitalize} from "@/utils/stringUtils";
 
 export class Battle {
   constructor(attacker, defender) {

modules/ui/burg-editor.js

@@ -2,6 +2,8 @@ import {findCell} from "/src/utils/graphUtils";
 import {tip, clearMainTip} from "/src/scripts/tooltips";
 import {rn} from "/src/utils/numberUtils";
 import {prompt} from "@/scripts/prompt";
+import {rand} from "@/utils/probabilityUtils";
+import {parseTransform} from "@/utils/stringUtils";
 
 export function editBurg(id) {
   if (customization) return;

modules/ui/coastline-editor.js

@@ -2,6 +2,7 @@ import {getPackPolygon} from "/src/utils/graphUtils";
 import {tip} from "/src/scripts/tooltips";
 import {clipPoly} from "@/utils/lineUtils";
 import {rn} from "/src/utils/numberUtils";
+import {round} from "@/utils/stringUtils";
 
 export function editCoastline(node = d3.event.target) {
   if (customization) return;

modules/ui/editors.js

@@ -3,6 +3,7 @@ import {findCell} from "/src/utils/graphUtils";
 import {byId} from "/src/utils/shorthands";
 import {tip} from "/src/scripts/tooltips";
 import {rn, minmax, normalize} from "/src/utils/numberUtils";
+import {parseTransform} from "@/utils/stringUtils";
 
 // clear elSelected variable
 export function unselect() {

modules/ui/emblems-editor.js

@@ -2,6 +2,7 @@ import {clearMainTip} from "/src/scripts/tooltips";
 import {tip} from "/src/scripts/tooltips";
 import {openURL} from "@/utils/linkUtils";
 import {rn} from "/src/utils/numberUtils";
+import {parseTransform} from "@/utils/stringUtils";
 
 export function editEmblem(type, id, el) {
   if (customization) return;

modules/ui/ice-editor.js

@@ -1,6 +1,8 @@
 import {findGridCell, getGridPolygon} from "/src/utils/graphUtils";
 import {tip, clearMainTip} from "/src/scripts/tooltips";
 import {rn} from "/src/utils/numberUtils";
+import {ra} from "@/utils/probabilityUtils";
+import {parseTransform} from "@/utils/stringUtils";
 
 export function editIce() {
   if (customization) return;

modules/ui/labels-editor.js

@@ -1,5 +1,7 @@
 import {findCell} from "/src/utils/graphUtils";
 import {tip, showMainTip} from "/src/scripts/tooltips";
+import {round, parseTransform} from "@/utils/stringUtils";
+import {parseTransform} from "@/utils/stringUtils";
 
 export function editLabel() {
   if (customization) return;

modules/ui/lakes-editor.js

@@ -1,6 +1,8 @@
 import {getPackPolygon} from "/src/utils/graphUtils";
 import {tip} from "/src/scripts/tooltips";
 import {rn} from "/src/utils/numberUtils";
+import {rand} from "@/utils/probabilityUtils";
+import {round} from "@/utils/stringUtils";
 
 export function editLake() {
   if (customization) return;

modules/ui/layers.js

@@ -9,6 +9,7 @@ import {clipPoly} from "@/utils/lineUtils";
 import {rn, minmax, normalize} from "/src/utils/numberUtils";
 import {isCtrlClick} from "@/utils/keyboardUtils";
 import {prompt} from "@/scripts/prompt";
+import {rand, P} from "@/utils/probabilityUtils";
 
 let presets = {};
 restoreCustomPresets(); // run on-load

modules/ui/military-overview.js

@@ -1,6 +1,7 @@
 import {tip} from "/src/scripts/tooltips";
 import {wiki} from "@/utils/linkUtils";
 import {rn} from "/src/utils/numberUtils";
+import {capitalize} from "@/utils/stringUtils";
 
 export function overviewMilitary() {
   if (customization) return;

modules/ui/options.js

@@ -4,6 +4,7 @@ import {lock, locked} from "/src/scripts/options/lock";
 import {tip, clearMainTip} from "/src/scripts/tooltips";
 import {byId, stored} from "/src/utils/shorthands";
 import {rn, minmax} from "/src/utils/numberUtils";
+import {rand, P, gauss} from "@/utils/probabilityUtils";
 
 $("#optionsContainer").draggable({handle: ".drag-trigger", snap: "svg", snapMode: "both"});
 $("#exitCustomization").draggable({handle: "div"});

modules/ui/provinces-editor.js

@@ -4,6 +4,8 @@ import {unique} from "/src/utils/arrayUtils";
 import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips";
 import {getRandomColor} from "/src/utils/colorUtils";
 import {rn} from "/src/utils/numberUtils";
+import {rand, P} from "@/utils/probabilityUtils";
+import {parseTransform} from "@/utils/stringUtils";
 
 export function editProvinces() {
   if (customization) return;

modules/ui/regiment-editor.js

@@ -3,6 +3,7 @@ import {findCell} from "/src/utils/graphUtils";
 import {last} from "/src/utils/arrayUtils";
 import {tip, clearMainTip} from "/src/scripts/tooltips";
 import {rn} from "/src/utils/numberUtils";
+import {capitalize} from "@/utils/stringUtils";
 
 export function editRegiment(selector) {
   if (customization) return;

modules/ui/regiments-overview.js

@@ -2,6 +2,7 @@ import {findCell} from "/src/utils/graphUtils";
 import {last} from "/src/utils/arrayUtils";
 import {tip, clearMainTip} from "/src/scripts/tooltips";
 import {rn} from "/src/utils/numberUtils";
+import {capitalize} from "@/utils/stringUtils";
 
 export function overviewRegiments(state) {
   if (customization) return;

modules/ui/rivers-editor.js

@@ -2,6 +2,7 @@ import {findCell, getPackPolygon} from "/src/utils/graphUtils";
 import {tip, clearMainTip} from "/src/scripts/tooltips";
 import {getSegmentId} from "@/utils/lineUtils";
 import {rn} from "/src/utils/numberUtils";
+import {rand} from "@/utils/probabilityUtils";
 
 export function editRiver(id) {
   if (customization) return;

modules/ui/routes-editor.js

@@ -1,6 +1,8 @@
 import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips";
 import {getSegmentId} from "@/utils/lineUtils";
 import {rn} from "/src/utils/numberUtils";
+import {getNextId} from "@/utils/nodeUtils";
+import {round} from "@/utils/stringUtils";
 
 export function editRoute(onClick) {
   if (customization) return;

modules/ui/style.js

@@ -1,5 +1,6 @@
 import {tip} from "/src/scripts/tooltips";
 import {rn} from "/src/utils/numberUtils";
+import {parseTransform} from "@/utils/stringUtils";
 
 // add available filters to lists
 {

modules/ui/stylePresets.js

@@ -1,4 +1,5 @@
 import {tip} from "/src/scripts/tooltips";
+import {isJsonValid} from "@/utils/stringUtils";
 
 const systemPresets = [
   "default",
@@ -45,7 +46,7 @@ async function getStylePreset(desiredPreset) {
       ERROR && console.error(`Custom style ${desiredPreset} in not found in localStorage. Applying default style`);
       presetToLoad = "default";
     } else {
-      const isValid = JSON.isValid(storedStyleJSON);
+      const isValid = isJsonValid(storedStyleJSON);
       if (isValid) return [desiredPreset, JSON.parse(storedStyleJSON)];
 
       ERROR &&
@@ -330,7 +331,7 @@ function addStylePreset() {
     const desiredName = styleSaverName.value;
 
     if (!styleJSON) return tip("Please provide a style JSON", false, "error");
-    if (!JSON.isValid(styleJSON)) return tip("JSON string is not valid, please check the format", false, "error");
+    if (!isJsonValid(styleJSON)) return tip("JSON string is not valid, please check the format", false, "error");
     if (!desiredName) return tip("Please provide a preset name", false, "error");
     if (styleSaverTip.innerHTML === "default")
       return tip("You cannot overwrite default preset, please change the name", false, "error");
@@ -350,7 +351,7 @@ function addStylePreset() {
     const styleName = styleSaverName.value;
 
     if (!styleJSON) return tip("Please provide a style JSON", false, "error");
-    if (!JSON.isValid(styleJSON)) return tip("JSON string is not valid, please check the format", false, "error");
+    if (!isJsonValid(styleJSON)) return tip("JSON string is not valid, please check the format", false, "error");
     if (!styleName) return tip("Please provide a preset name", false, "error");
 
     downloadFile(styleJSON, styleName + ".json", "application/json");
@@ -362,7 +363,7 @@ function addStylePreset() {
 
     function styleUpload(dataLoaded) {
       if (!dataLoaded) return tip("Cannot load the file. Please check the data format", false, "error");
-      const isValid = JSON.isValid(dataLoaded);
+      const isValid = isJsonValid(dataLoaded);
       if (!isValid) return tip("Loaded data is not a valid JSON, please check the format", false, "error");
 
       styleSaverJSON.value = JSON.stringify(JSON.parse(dataLoaded), null, 2);

modules/ui/temperature-graph.js

@@ -1,5 +1,6 @@
 import {tip} from "/src/scripts/tooltips";
 import {rn} from "/src/utils/numberUtils";
+import {round} from "@/utils/stringUtils";
 
 export function showBurgTemperatureGraph(id) {
   const b = pack.burgs[id];

modules/ui/tools.js

@@ -5,6 +5,8 @@ import {tip, clearMainTip} from "/src/scripts/tooltips";
 import {rn} from "/src/utils/numberUtils";
 import {isCtrlClick} from "@/utils/keyboardUtils";
 import {prompt} from "@/scripts/prompt";
+import {getNextId} from "@/utils/nodeUtils";
+import {P, generateSeed} from "@/utils/probabilityUtils";
 
 toolsContent.addEventListener("click", function (event) {
   if (customization) return tip("Please exit the customization mode first", false, "warning");

modules/ui/world-configurator.js

@@ -1,5 +1,6 @@
 import {tip} from "/src/scripts/tooltips";
 import {rn} from "/src/utils/numberUtils";
+import {round, parseTransform} from "@/utils/stringUtils";
 
 export function editWorld() {
   if (customization) return;

modules/ui/zones-editor.js

@@ -3,6 +3,7 @@ import {findAll, findCell, getPackPolygon} from "/src/utils/graphUtils";
 import {unique} from "/src/utils/arrayUtils";
 import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips";
 import {rn} from "/src/utils/numberUtils";
+import {getNextId} from "@/utils/nodeUtils";
 
 export function editZones() {
   closeDialogs();