code-battles 1.5.6 → 1.5.8

package/dist/cjs/index.js

@@ -8,6 +8,7 @@ var core = require('@mantine/core');
 var dates = require('@mantine/dates');
 var hooks = require('@mantine/hooks');
 var notifications = require('@mantine/notifications');
+require('dayjs/locale/en');
 var app = require('firebase/app');
 var auth = require('firebase/auth');
 var firestore = require('firebase/firestore');
@@ -16,14 +17,6 @@ var reactRouterDom = require('react-router-dom');
 var dropzone = require('@mantine/dropzone');
 var jsxRuntime = require('react/jsx-runtime');
 
-var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
-var en = {exports: {}};
-
-(function (module, exports) {
-	!function(e,n){module.exports=n();}(commonjsGlobal,(function(){return {name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(e){var n=["th","st","nd","rd"],t=e%100;return "["+e+(n[(t-20)%10]||n[t]||n[0])+"]"}}})); 
-} (en));
-
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -458,9 +451,9 @@ const useLocalStorage = ({ key, defaultValue, }) => {
     const userSetValue = (newValue) => {
         setValue(newValue);
         if (typeof newValue === "function") {
-            newValue = newValue(value);
+            newValue = newValue(getLocalStorage(key, defaultValue !== null && defaultValue !== void 0 ? defaultValue : null));
         }
-        if (newValue) {
+        if (newValue !== undefined) {
             localStorage.setItem(key, JSON.stringify(newValue));
             window.dispatchEvent(new StorageEvent("storage", {
                 key,
@@ -515,6 +508,8 @@ const useAdmin = () => {
     return (((_a = authentication.currentUser) === null || _a === void 0 ? void 0 : _a.email) === `${configuration.admin}@gmail.com`);
 };
 
+var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+
 var propTypes = {exports: {}};
 
 var reactIs = {exports: {}};
@@ -2521,7 +2516,7 @@ const RunSimulationBlock = () => {
     const run = () => {
         // @ts-ignore
         window._isSimulationFromFile = false;
-        navigate(`/simulation/${map.replaceAll(" ", "-")}/${playerBots.join("-")}?seed=${seed}`);
+        navigate(`/simulation/${map.replaceAll(" ", "-")}/${playerBots.join("-")}?seed=${seed === "-" ? "" : seed}`);
     };
     const startRunNoUI = () => {
         setRunningNoUI(true);
@@ -15857,10 +15852,6 @@ const AutoScrollButton = () => {
         key: "Auto Scroll",
         defaultValue: true,
     });
-    React.useEffect(() => {
-        // @ts-ignore
-        window.autoScroll = autoScroll;
-    }, [autoScroll]);
     return (React.createElement(core.Button, { color: autoScroll ? "green" : "yellow", fullWidth: true, mb: "xs", leftSection: React.createElement("i", { className: "fa-solid fa-angles-down" }), onClick: () => setAutoScroll((s) => !s) },
         "Auto Scroll ",
         autoScroll ? "Enabled" : "Disabled"));
@@ -15883,7 +15874,6 @@ const LogViewer = ({ playerNames }) => {
         defaultValue: [],
     });
     React.useEffect(() => {
-        setLogs([]);
         setShowLogs(playerNames.map(() => true));
     }, [playerNames]);
     React.useEffect(() => {
@@ -15893,13 +15883,15 @@ const LogViewer = ({ playerNames }) => {
             const con = document.getElementById("console");
             if (con) {
                 setLogs((l) => [...l, { playerIndex, text, color }]);
-                // @ts-ignore
-                if (window.autoScroll) {
-                    con.scrollTop = con.scrollHeight;
-                }
             }
         };
     }, []);
+    React.useEffect(() => {
+        const con = document.getElementById("console");
+        if (con && getLocalStorage("Auto Scroll", true)) {
+            con.scrollTop = con.scrollHeight;
+        }
+    }, [logs]);
     return (React.createElement(React.Fragment, null,
         React.createElement("h1", { style: { color: "white", textAlign: "center", margin: 0 } }, "Console"),
         React.createElement(AutoScrollButton, null),
@@ -15963,6 +15955,7 @@ const Simulation = () => {
     const colorScheme = hooks.useColorScheme();
     const showcaseMode = location.search.includes("showcase=true");
     React.useEffect(() => {
+        setLocalStorage("Logs", []);
         n((engine) => __awaiter(void 0, void 0, void 0, function* () { return yield loadFull(engine); }));
         // @ts-ignore
         window.showDownload = () => {

package/dist/esm/index.js

@@ -6,6 +6,7 @@ import { TextInput, Button, Alert, Slider, Box, Select, NumberInput, Table, Badg
 import { TimeInput, DatesProvider } from '@mantine/dates';
 import { useColorScheme, useViewportSize } from '@mantine/hooks';
 import { notifications, Notifications } from '@mantine/notifications';
+import 'dayjs/locale/en';
 import { initializeApp } from 'firebase/app';
 import { onAuthStateChanged, signInWithEmailAndPassword, signOut, getAuth } from 'firebase/auth';
 import { onSnapshot, refEqual, doc, getDoc, setDoc, Timestamp, getFirestore } from 'firebase/firestore';
@@ -14,14 +15,6 @@ import { useNavigate, useLocation, useParams, useSearchParams, Routes, Route, Br
 import { Dropzone } from '@mantine/dropzone';
 import { jsx } from 'react/jsx-runtime';
 
-var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
-var en = {exports: {}};
-
-(function (module, exports) {
-	!function(e,n){module.exports=n();}(commonjsGlobal,(function(){return {name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(e){var n=["th","st","nd","rd"],t=e%100;return "["+e+(n[(t-20)%10]||n[t]||n[0])+"]"}}})); 
-} (en));
-
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -456,9 +449,9 @@ const useLocalStorage = ({ key, defaultValue, }) => {
     const userSetValue = (newValue) => {
         setValue(newValue);
         if (typeof newValue === "function") {
-            newValue = newValue(value);
+            newValue = newValue(getLocalStorage(key, defaultValue !== null && defaultValue !== void 0 ? defaultValue : null));
         }
-        if (newValue) {
+        if (newValue !== undefined) {
             localStorage.setItem(key, JSON.stringify(newValue));
             window.dispatchEvent(new StorageEvent("storage", {
                 key,
@@ -513,6 +506,8 @@ const useAdmin = () => {
     return (((_a = authentication.currentUser) === null || _a === void 0 ? void 0 : _a.email) === `${configuration.admin}@gmail.com`);
 };
 
+var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+
 var propTypes = {exports: {}};
 
 var reactIs = {exports: {}};
@@ -2519,7 +2514,7 @@ const RunSimulationBlock = () => {
     const run = () => {
         // @ts-ignore
         window._isSimulationFromFile = false;
-        navigate(`/simulation/${map.replaceAll(" ", "-")}/${playerBots.join("-")}?seed=${seed}`);
+        navigate(`/simulation/${map.replaceAll(" ", "-")}/${playerBots.join("-")}?seed=${seed === "-" ? "" : seed}`);
     };
     const startRunNoUI = () => {
         setRunningNoUI(true);
@@ -15855,10 +15850,6 @@ const AutoScrollButton = () => {
         key: "Auto Scroll",
         defaultValue: true,
     });
-    useEffect(() => {
-        // @ts-ignore
-        window.autoScroll = autoScroll;
-    }, [autoScroll]);
     return (React.createElement(Button, { color: autoScroll ? "green" : "yellow", fullWidth: true, mb: "xs", leftSection: React.createElement("i", { className: "fa-solid fa-angles-down" }), onClick: () => setAutoScroll((s) => !s) },
         "Auto Scroll ",
         autoScroll ? "Enabled" : "Disabled"));
@@ -15881,7 +15872,6 @@ const LogViewer = ({ playerNames }) => {
         defaultValue: [],
     });
     useEffect(() => {
-        setLogs([]);
         setShowLogs(playerNames.map(() => true));
     }, [playerNames]);
     useEffect(() => {
@@ -15891,13 +15881,15 @@ const LogViewer = ({ playerNames }) => {
             const con = document.getElementById("console");
             if (con) {
                 setLogs((l) => [...l, { playerIndex, text, color }]);
-                // @ts-ignore
-                if (window.autoScroll) {
-                    con.scrollTop = con.scrollHeight;
-                }
             }
         };
     }, []);
+    useEffect(() => {
+        const con = document.getElementById("console");
+        if (con && getLocalStorage("Auto Scroll", true)) {
+            con.scrollTop = con.scrollHeight;
+        }
+    }, [logs]);
     return (React.createElement(React.Fragment, null,
         React.createElement("h1", { style: { color: "white", textAlign: "center", margin: 0 } }, "Console"),
         React.createElement(AutoScrollButton, null),
@@ -15961,6 +15953,7 @@ const Simulation = () => {
     const colorScheme = useColorScheme();
     const showcaseMode = location.search.includes("showcase=true");
     useEffect(() => {
+        setLocalStorage("Logs", []);
         n((engine) => __awaiter(void 0, void 0, void 0, function* () { return yield loadFull(engine); }));
         // @ts-ignore
         window.showDownload = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-battles",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "description": "A library for building interactive competitive coding battles",
   "repository": "https://github.com/noamzaks/code-battles",
   "homepage": "https://code-battles.readthedocs.org",
@@ -38,12 +38,13 @@
     "tsparticles": "^3.5.0"
   },
   "peerDependencies": {
-    "@mantine/core": "^7.13.5",
-    "@mantine/dates": "^7.13.5",
-    "@mantine/dropzone": "^7.13.5",
-    "@mantine/hooks": "^7.13.5",
-    "@mantine/notifications": "^7.13.5",
-    "firebase": "^11.0.1",
+    "@mantine/core": "^7.14.0",
+    "@mantine/dates": "^7.14.0",
+    "@mantine/dropzone": "^7.14.0",
+    "@mantine/hooks": "^7.14.0",
+    "@mantine/notifications": "^7.14.0",
+    "dayjs": "^1.11.13",
+    "firebase": "^11.0.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.28.0"
@@ -57,7 +58,7 @@
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "chokidar-cli": "^3.0.0",
-    "rollup": "^4.24.4",
+    "rollup": "^4.26.0",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-import-css": "^3.5.6",

package/dist/code_battles/__init__.py

@@ -1,31 +0,0 @@
-import sys
-
-from code_battles.utilities import GameCanvas, Alignment, is_web, is_worker
-from code_battles.battles import CodeBattles
-
-
-def run_game(battles: CodeBattles):
-    """
-    Binds the given code battles instance to the React code to enable all simulations.
-    """
-
-    if is_web():
-        from js import window
-        from pyscript.ffi import create_proxy
-
-        window._startSimulation = create_proxy(battles._start_simulation)
-        window._startSimulationFromFile = create_proxy(
-            battles._start_simulation_from_file
-        )
-    elif is_worker():
-        setattr(
-            sys.modules["__main__"],
-            "_run_webworker_simulation",
-            battles._run_webworker_simulation,
-        )
-        setattr(sys.modules["__main__"], "__export__", ["_run_webworker_simulation"])
-    else:
-        battles._run_local_simulation()
-
-
-__all__ = ["CodeBattles", "GameCanvas", "Alignment", "run_game"]