Code cleanup, no functional changes

bbrk24 · Mar 17, 2024 · a4aca9d · a4aca9d
1 parent 0527565
commit a4aca9d
Show file tree

Hide file tree

Showing 3 changed files with 133 additions and 132 deletions.
diff --git a/package.json b/package.json
@@ -7,7 +7,8 @@
     },
     "scripts": {
         "build": "./build.sh",
-        "start": "node -e \"(e => e().use(e.static('dist')).listen(3000))(require('express'))\""
+        "start": "node -e \"(e => e().use(e.static('dist')).listen(3000))(require('express'))\"",
+        "test": "civet --typecheck src/*.civet"
     },
     "devDependencies": {
         "express": "^4.18.3"

diff --git a/src/getFormValues.civet b/src/getFormValues.civet
@@ -2,56 +2,56 @@
 type { OptimizeOptions } from ./optimize.civet
 export default getFormValues := :OptimizeOptions =>
     accel:
-        min: document.getElementById('accel-min').value |> Number
-        max: document.getElementById('accel-max').value |> Number
+        min: document.getElementById('accel-min').valueAsNumber
+        max: document.getElementById('accel-max').valueAsNumber
         opt: document.getElementById('accel-opt').value
     handling:
         land:
-            min: document.getElementById('land-handling-min').value |> Number
-            max: document.getElementById('land-handling-max').value |> Number
+            min: document.getElementById('land-handling-min').valueAsNumber
+            max: document.getElementById('land-handling-max').valueAsNumber
             opt: document.getElementById('land-handling-opt').value
         water:
-            min: document.getElementById('water-handling-min').value |> Number
-            max: document.getElementById('water-handling-max').value |> Number
+            min: document.getElementById('water-handling-min').valueAsNumber
+            max: document.getElementById('water-handling-max').valueAsNumber
             opt: document.getElementById('water-handling-opt').value
         air:
-            min: document.getElementById('air-handling-min').value |> Number
-            max: document.getElementById('air-handling-max').value |> Number
+            min: document.getElementById('air-handling-min').valueAsNumber
+            max: document.getElementById('air-handling-max').valueAsNumber
             opt: document.getElementById('air-handling-opt').value
         antigrav:
-            min: document.getElementById('antigrav-handling-min').value |> Number
-            max: document.getElementById('antigrav-handling-max').value |> Number
+            min: document.getElementById('antigrav-handling-min').valueAsNumber
+            max: document.getElementById('antigrav-handling-max').valueAsNumber
             opt: document.getElementById('antigrav-handling-opt').value
     invuln:
-        min: document.getElementById('invuln-min').value |> Number
-        max: document.getElementById('invuln-max').value |> Number
+        min: document.getElementById('invuln-min').valueAsNumber
+        max: document.getElementById('invuln-max').valueAsNumber
         opt: document.getElementById('invuln-opt').value
     miniTurbo:
-        min: document.getElementById('mini-turbo-min').value |> Number
-        max: document.getElementById('mini-turbo-max').value |> Number
+        min: document.getElementById('mini-turbo-min').valueAsNumber
+        max: document.getElementById('mini-turbo-max').valueAsNumber
         opt: document.getElementById('mini-turbo-opt').value
     speed:
         land:
-            min: document.getElementById('land-speed-min').value |> Number
-            max: document.getElementById('land-speed-max').value |> Number
+            min: document.getElementById('land-speed-min').valueAsNumber
+            max: document.getElementById('land-speed-max').valueAsNumber
             opt: document.getElementById('land-speed-opt').value
         water:
-            min: document.getElementById('water-speed-min').value |> Number
-            max: document.getElementById('water-speed-max').value |> Number
+            min: document.getElementById('water-speed-min').valueAsNumber
+            max: document.getElementById('water-speed-max').valueAsNumber
             opt: document.getElementById('water-speed-opt').value
         air:
-            min: document.getElementById('air-speed-min').value |> Number
-            max: document.getElementById('air-speed-max').value |> Number
+            min: document.getElementById('air-speed-min').valueAsNumber
+            max: document.getElementById('air-speed-max').valueAsNumber
             opt: document.getElementById('air-speed-opt').value
         antigrav:
-            min: document.getElementById('antigrav-speed-min').value |> Number
-            max: document.getElementById('antigrav-speed-max').value |> Number
+            min: document.getElementById('antigrav-speed-min').valueAsNumber
+            max: document.getElementById('antigrav-speed-max').valueAsNumber
             opt: document.getElementById('antigrav-speed-opt').value
     traction:
-        min: document.getElementById('traction-min').value |> Number
-        max: document.getElementById('traction-max').value |> Number
+        min: document.getElementById('traction-min').valueAsNumber
+        max: document.getElementById('traction-max').valueAsNumber
         opt: document.getElementById('traction-opt').value
     weight: 
-        min: document.getElementById('weight-min').value |> Number
-        max: document.getElementById('weight-max').value |> Number
+        min: document.getElementById('weight-min').valueAsNumber
+        max: document.getElementById('weight-max').valueAsNumber
         opt: document.getElementById('weight-opt').value