fix: typing parity

.vscode/settings.json

@@ -182,5 +182,6 @@
   ],
   "deno.enable": false,
   "deno.unstable": false,
-  "cSpell.enableFiletypes": ["glsl"]
+  "cSpell.enableFiletypes": ["glsl"],
+  "typescript.tsdk": "node_modules\\typescript\\lib"
 }

package.json

@@ -107,7 +107,7 @@
     "lz4": "^0.6.5",
     "prettier": "^3.0.3",
     "prisma": "^5.4.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.5"
   },
   "packageManager": "[email protected]"
 }

src/components/Armor/components/ShotDisplay.tsx

@@ -163,7 +163,9 @@ export function ShotDisplay() {
           (shot.out.layers.at(-1) as ShotLayerNonExternal).point,
         )
       : LENGTH_INFINITY;
-  const inLast = shot.in.layers.findLast((layer) => layer.type !== null)!;
+  const inLast = shot.in.layers.findLast(
+    (layer) => layer.type !== null,
+  ) as ShotLayerNonExternal;
   const outTitleColor = shot.out
     ? shotStatusColors[shot.out.status]
     : undefined;

src/core/blitz/canSplash.ts

@@ -1,5 +1,5 @@
-import { ShellDefinition } from '../blitzkit/tankDefinitions';
+import { ShellDefinition, ShellType } from '../blitzkit/tankDefinitions';
 
-export function canSplash(type: ShellDefinition['type']): type is 'he' {
+export function canSplash(type: ShellDefinition['type']): type is ShellType.HE {
-  return type === 'he';
+  return type === ShellType.HE;
 }

src/core/blitz/isExplosive.ts

@@ -1,7 +1,7 @@
-import { ShellDefinition } from '../blitzkit/tankDefinitions';
+import { ShellDefinition, ShellType } from '../blitzkit/tankDefinitions';
 
 export function isExplosive(
   type: ShellDefinition['type'],
-): type is 'he' | 'hc' {
+): type is ShellType.HEAT | ShellType.HE {
-  return type === 'he' || type === 'hc';
+  return type === ShellType.HEAT || type === ShellType.HE;
 }

yarn.lock

@@ -5801,10 +5801,10 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typescript@^5.2.2:
+typescript@^5.4.5:
-  version "5.3.3"
+  version "5.4.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
-  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
 ua-parser-js@^1.0.33:
   version "1.0.37"