refactor(es modules): continue migration

modules/dynamic/editors/cultures-editor.js

@@ -1,4 +1,5 @@
 import {findAll, findCell, getPackPolygon, isLand} from "/src/utils/graphUtils";
+import {byId} from "/src/utils/shorthands";
 
 const $body = insertEditorHtml();
 addListeners();

modules/dynamic/editors/religions-editor.js

@@ -1,4 +1,5 @@
 import {findAll, findCell, getPackPolygon, isLand} from "/src/utils/graphUtils";
+import {byId} from "/src/utils/shorthands";
 
 const $body = insertEditorHtml();
 addListeners();

modules/dynamic/editors/states-editor.js

@@ -1,4 +1,5 @@
 import {findAll, findCell, getPackPolygon, isLand} from "/src/utils/graphUtils";
+import {byId} from "/src/utils/shorthands";
 
 const $body = insertEditorHtml();
 addListeners();

modules/dynamic/heightmap-selection.js

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

modules/dynamic/hierarchy-tree.js

@@ -1,3 +1,5 @@
+import {byId} from "/src/utils/shorthands";
+
 appendStyleSheet();
 insertHtml();
 

modules/dynamic/overview/charts-overview.js

@@ -1,5 +1,6 @@
 import {rollups} from "../../../utils/functionUtils.js";
 import {isWater} from "/src/utils/graphUtils";
+import {byId} from "/src/utils/shorthands";
 
 const entitiesMap = {
   states: {

modules/heightmap-generator.js

@@ -1,6 +1,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";
 
 window.HeightmapGenerator = (function () {
   let grid = null;

modules/io/export.js

@@ -1,4 +1,5 @@
 import {getGridPolygon} from "/src/utils/graphUtils";
+import {unique} from "/src/utils/arrayUtils";
 
 // download map as SVG
 async function saveSVG() {

modules/religions-generator.js

@@ -1,5 +1,6 @@
 import {TIME} from "/src/config/logging";
 import {findAll} from "/src/utils/graphUtils";
+import {unique} from "/src/utils/arrayUtils";
 
 window.Religions = (function () {
   // name generation approach and relative chance to be selected

modules/ui/editors.js

@@ -1,4 +1,5 @@
 import {findCell} from "/src/utils/graphUtils";
+import {byId} from "/src/utils/shorthands";
 
 // restore default viewbox events
 function restoreDefaultEvents() {

modules/ui/heightmap-editor.js

@@ -1,5 +1,6 @@
 import {findGridCell, findGridAll, findCell, getPackPolygon, getGridPolygon} from "/src/utils/graphUtils";
-import {last} from "/src/utils/arrayUtils";
+import {last, createTypedArray} from "/src/utils/arrayUtils";
+import {byId} from "/src/utils/shorthands";
 
 export function editHeightmap(options) {
   const {mode, tool} = options || {};

modules/ui/namesbase-editor.js

@@ -1,5 +1,6 @@
-"use strict";
+import {unique} from "/src/utils/arrayUtils";
-function editNamesbase() {
+
+export function editNamesbase() {
   if (customization) return;
   closeDialogs("#namesbaseEditor, .stable");
   $("#namesbaseEditor").dialog();

modules/ui/options.js

@@ -1,7 +1,6 @@
 import {stored, lock, locked, applyOption} from "./general";
 import {last} from "/src/utils/arrayUtils";
 import {byId} from "/src/utils/shorthands";
-import {last} from "/src/utils/arrayUtils";
 
 $("#optionsContainer").draggable({handle: ".drag-trigger", snap: "svg", snapMode: "both"});
 $("#exitCustomization").draggable({handle: "div"});

modules/ui/provinces-editor.js

@@ -1,4 +1,5 @@
 import {findAll, findCell, getPackPolygon, isLand} from "/src/utils/graphUtils";
+import {unique} from "/src/utils/arrayUtils";
 
 export function editProvinces() {
   if (customization) return;

modules/ui/zones-editor.js

@@ -1,4 +1,5 @@
 import {findAll, findCell, getPackPolygon} from "/src/utils/graphUtils";
+import {unique} from "/src/utils/arrayUtils";
 
 export function editZones() {
   closeDialogs();

src/utils/arrayUtils.ts

@@ -8,18 +8,6 @@ export function unique<T>(array: T[]) {
   return [...new Set(array)];
 }
 
-function getTypedArray(maxValue: number) {
-  console.assert(
-    Number.isInteger(maxValue) && maxValue >= 0 && maxValue <= UINT32_MAX,
-    `Array maxValue must be an integer between 0 and ${UINT32_MAX}, got ${maxValue}`
-  );
-
-  if (maxValue <= UINT8_MAX) return Uint8Array;
-  if (maxValue <= UINT16_MAX) return Uint16Array;
-  if (maxValue <= UINT32_MAX) return Uint32Array;
-  return Uint32Array;
-}
-
 interface ICreateTypedArray {
   maxValue: number;
   length: number;
@@ -31,3 +19,15 @@ export function createTypedArray({maxValue, length, from}: ICreateTypedArray) {
   if (!from) return new typedArray(length);
   return typedArray.from(from);
 }
+
+function getTypedArray(maxValue: number) {
+  console.assert(
+    Number.isInteger(maxValue) && maxValue >= 0 && maxValue <= UINT32_MAX,
+    `Array maxValue must be an integer between 0 and ${UINT32_MAX}, got ${maxValue}`
+  );
+
+  if (maxValue <= UINT8_MAX) return Uint8Array;
+  if (maxValue <= UINT16_MAX) return Uint16Array;
+  if (maxValue <= UINT32_MAX) return Uint32Array;
+  return Uint32Array;
+}