Fix check:tsc errors

Author: jdalton

src/shadow/arborist/lib/edge.ts

@@ -5,15 +5,30 @@ import { arboristEdgeClassPath } from '../../npm-paths'
 
 import type { Edge as BaseEdge, DependencyProblem } from '@npmcli/arborist'
 
-type EdgeClass = Omit<BaseEdge, 'overrides' | 'reload'> & {
+type EdgeClass = Omit<
+  BaseEdge,
+  | 'accept'
+  | 'detach'
+  | 'optional'
+  | 'overrides'
+  | 'peer'
+  | 'peerConflicted'
+  | 'rawSpec'
+  | 'reload'
+  | 'satisfiedBy'
+  | 'spec'
+  | 'to'
+> & {
   optional: boolean
   overrides: SafeOverrideSet | undefined
   peer: boolean
   peerConflicted: boolean
   rawSpec: string
+  get accept(): string | undefined
   get spec(): string
   get to(): SafeNode | null
   new (...args: any): EdgeClass
+  detach(): void
   reload(hard?: boolean): void
   satisfiedBy(node: SafeNode): boolean
 }
@@ -84,11 +99,11 @@ export class SafeEdge extends Edge {
     this.reload(true)
   }
 
-  get accept() {
+  override get accept() {
     return this.#safeAccept
   }
 
-  get bundled() {
+  override get bundled() {
     return !!this.#safeFrom?.package?.bundleDependencies?.includes(this.name)
   }
 
@@ -187,7 +202,7 @@ export class SafeEdge extends Edge {
     return this.#safeTo
   }
 
-  detach() {
+  override detach() {
     this.#safeExplanation = null
     // Patch replacing
     // if (this.#safeTo) {

src/shadow/arborist/lib/node.ts

@@ -9,14 +9,34 @@ import type { Node as BaseNode } from '@npmcli/arborist'
 
 type NodeClass = Omit<
   BaseNode,
+  | 'addEdgeIn'
+  | 'addEdgeOut'
+  | 'canDedupe'
+  | 'canReplace'
+  | 'canReplaceWith'
+  | 'deleteEdgeIn'
   | 'edgesIn'
   | 'edgesOut'
   | 'from'
+  | 'hasShrinkwrap'
+  | 'inDepBundle'
+  | 'inShrinkwrap'
   | 'integrity'
   | 'isTop'
+  | 'matches'
+  | 'meta'
+  | 'name'
+  | 'overrides'
+  | 'packageName'
   | 'parent'
+  | 'recalculateOutEdgesOverrides'
   | 'resolve'
+  | 'resolveParent'
   | 'root'
+  | 'updateOverridesEdgeInAdded'
+  | 'updateOverridesEdgeInRemoved'
+  | 'version'
+  | 'versions'
 > & {
   name: string
   version: string
@@ -41,7 +61,7 @@ type NodeClass = Omit<
   new (...args: any): NodeClass
   addEdgeIn(edge: SafeEdge): void
   addEdgeOut(edge: SafeEdge): void
-  canDedupe(preferDedupe: boolean): boolean
+  canDedupe(preferDedupe?: boolean): boolean
   canReplace(node: SafeNode, ignorePeers?: string[]): boolean
   canReplaceWith(node: SafeNode, ignorePeers?: string[]): boolean
   deleteEdgeIn(edge: SafeEdge): void
@@ -115,7 +135,7 @@ export class SafeNode extends Node {
   // root dependency brings peer deps along with it.  In that case, we
   // will go ahead and create the invalid state, and then try to resolve
   // it with more tree construction, because it's a user request.
-  override canReplaceWith(node: SafeNode, ignorePeers?: string[]) {
+  override canReplaceWith(node: SafeNode, ignorePeers?: string[]): boolean {
     if (this.name !== node.name || this.packageName !== node.packageName) {
       return false
     }

src/utils/strings.ts

@@ -1,5 +1,5 @@
 export function stringJoinWithSeparateFinalSeparator(
-  list: (string | undefined)[],
+  list: string[],
   separator: string = ' and '
 ): string {
   const values = list.filter(Boolean)
@@ -8,7 +8,7 @@ export function stringJoinWithSeparateFinalSeparator(
     return ''
   }
   if (length === 1) {
-    return values[0]
+    return values[0]!
   }
   const finalValue = values.pop()
   return `${values.join(', ')}${separator}${finalValue}`