types: fix makeChildrenNodes and childNodeLoader types #2097

* Make node types generic

Author: JadenSimon

src/apigateway/explorer/apiGatewayNodes.ts

@@ -35,14 +35,13 @@ export class ApiGatewayNode extends AWSTreeNodeBase {
 
                 return [...this.apiNodes.values()]
             },
-            getErrorNode: async (error: Error, logID: number) => 
-                new ErrorNode(this, error, logID),
+            getErrorNode: async (error: Error, logID: number) => new ErrorNode(this, error, logID),
             getNoChildrenPlaceholderNode: async () =>
                 new PlaceholderNode(
                     this,
                     localize('AWS.explorerNode.apigateway.noApis', '[No API Gateway REST APIs found]')
                 ),
-            sort: (nodeA: RestApiNode, nodeB: RestApiNode) => nodeA.label!.localeCompare(nodeB.label!),
+            sort: (nodeA, nodeB) => nodeA.label!.localeCompare(nodeB.label!),
         })
     }
 

src/apprunner/explorer/apprunnerNode.ts

@@ -39,8 +39,7 @@ export class AppRunnerNode extends AWSTreeNodeBase {
                     this,
                     localize('AWS.explorerNode.apprunner.noServices', '[No App Runner services found]')
                 ),
-            sort: (nodeA: AppRunnerServiceNode, nodeB: AppRunnerServiceNode) =>
-                nodeA.label!.localeCompare(nodeB.label!),
+            sort: (nodeA, nodeB) => nodeA.label!.localeCompare(nodeB.label!),
         })
     }
 

src/awsexplorer/awsExplorer.ts

@@ -143,7 +143,7 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
                 throw error
             },
             getNoChildrenPlaceholderNode: async () => this.ROOT_NODE_ADD_REGION,
-            sort: (nodeA: RegionNode, nodeB: RegionNode) => nodeA.regionName.localeCompare(nodeB.regionName),
+            sort: (nodeA, nodeB) => nodeA.regionName.localeCompare(nodeB.regionName),
         })
     }
 }

src/awsexplorer/childNodeCache.ts

@@ -11,8 +11,8 @@ import { ChildNodePage } from './childNodeLoader'
  *
  * Allows for easier appending to the node's children and less error-prone (resetting) of the node's internal state.
  */
-export class ChildNodeCache {
-    private _children: AWSTreeNodeBase[] = []
+export class ChildNodeCache<T extends AWSTreeNodeBase = AWSTreeNodeBase> {
+    private _children: T[] = []
     private _continuationToken: string | undefined = undefined
     private _isPristine: boolean = true
 
@@ -22,7 +22,7 @@ export class ChildNodeCache {
      * Once this has been called, the cache is no longer considered pristine ({@link isPristine} will return false).
      * This is true even if the original state of the cache remains unchanged (all items appended are empty/undefined).
      */
-    public appendPage(page: ChildNodePage): void {
+    public appendPage(page: ChildNodePage<T>): void {
         this._children = [...this._children, ...page.newChildren]
         this._continuationToken = page.newContinuationToken
         this._isPristine = false
@@ -31,7 +31,7 @@ export class ChildNodeCache {
     /**
      * The list of children nodes previously appended to the cache.
      */
-    public get children(): AWSTreeNodeBase[] {
+    public get children(): T[] {
         return this._children
     }
 

src/awsexplorer/childNodeLoader.ts

@@ -11,34 +11,34 @@ import * as AsyncLock from 'async-lock'
 
 const LOCK_KEY = 'ChildNodeLoader'
 
-export interface ChildNodePage {
-    newChildren: AWSTreeNodeBase[]
+export interface ChildNodePage<T extends AWSTreeNodeBase = AWSTreeNodeBase> {
+    newChildren: T[]
     newContinuationToken: string | undefined
 }
 
 /**
  * Controls loading paginated children for LoadMore nodes.
  */
-export class ChildNodeLoader {
-    private readonly loadPage: (continuationToken: string | undefined) => Promise<ChildNodePage>
+export class ChildNodeLoader<T extends AWSTreeNodeBase = AWSTreeNodeBase> {
+    private readonly loadPage: (continuationToken: string | undefined) => Promise<ChildNodePage<T>>
     private readonly moreResults: MoreResultsNode
     private readonly loadChildrenLock: AsyncLock
-    private cache: ChildNodeCache
+    private cache: ChildNodeCache<T>
 
     public constructor(
         parent: LoadMoreNode,
-        loadPage: (continuationToken: string | undefined) => Promise<ChildNodePage>
+        loadPage: (continuationToken: string | undefined) => Promise<ChildNodePage<T>>
     ) {
         this.loadPage = loadPage
         this.moreResults = new MoreResultsNode(parent)
         this.loadChildrenLock = new AsyncLock()
-        this.cache = new ChildNodeCache()
+        this.cache = new ChildNodeCache<T>()
     }
 
     /**
      * Gets the initial or previously-loaded children.
      */
-    public async getChildren(): Promise<AWSTreeNodeBase[]> {
+    public async getChildren(): Promise<(T | MoreResultsNode)[]> {
         await this.loadMoreChildrenIf(() => !this.initialChildrenLoaded())
         return this.getExistingChildren()
     }
@@ -74,7 +74,7 @@ export class ChildNodeLoader {
         return this.initialChildrenLoaded() && this.cache.continuationToken === undefined
     }
 
-    private getExistingChildren(): AWSTreeNodeBase[] {
+    private getExistingChildren(): (T | MoreResultsNode)[] {
         if (this.cache.continuationToken !== undefined) {
             return [...this.cache.children, this.moreResults]
         }

src/cloudWatchLogs/explorer/cloudWatchLogsNode.ts

@@ -45,7 +45,7 @@ export abstract class CloudWatchLogsBase extends AWSTreeNodeBase {
             getErrorNode: async (error: Error, logID: number) => new ErrorNode(this, error, logID),
             getNoChildrenPlaceholderNode: async () =>
                 new PlaceholderNode(this, localize('AWS.explorerNode.cloudWatchLogs.placeholder', '[No Logs found]')),
-            sort: (nodeA: LogGroupNode, nodeB: LogGroupNode) => nodeA.name.localeCompare(nodeB.name),
+            sort: (nodeA, nodeB) => nodeA.name.localeCompare(nodeB.name),
         })
     }
 

src/ecr/explorer/ecrNode.ts

@@ -32,12 +32,10 @@ export class EcrNode extends AWSTreeNodeBase {
 
                 return response.map(item => new EcrRepositoryNode(this, this.ecr, item))
             },
-            getErrorNode: async (error: Error, logID: number) =>
-                new ErrorNode(this, error, logID),
+            getErrorNode: async (error: Error, logID: number) => new ErrorNode(this, error, logID),
             getNoChildrenPlaceholderNode: async () =>
                 new PlaceholderNode(this, localize('AWS.explorerNode.ecr.noRepositories', '[No repositories found]')),
-            sort: (item1: EcrRepositoryNode, item2: EcrRepositoryNode) =>
-                item1.repository.repositoryName.localeCompare(item2.repository.repositoryName),
+            sort: (item1, item2) => item1.repository.repositoryName.localeCompare(item2.repository.repositoryName),
         })
     }
 

src/ecr/explorer/ecrRepositoryNode.ts

@@ -45,7 +45,7 @@ export class EcrRepositoryNode extends AWSTreeNodeBase implements AWSResourceNod
             getErrorNode: async (error: Error, logID: number) => new ErrorNode(this, error, logID),
             getNoChildrenPlaceholderNode: async () =>
                 new PlaceholderNode(this, localize('AWS.explorerNode.ecr.noTags', '[No tags found]')),
-            sort: (item1: EcrTagNode, item2: EcrTagNode) => item1.tag.localeCompare(item2.tag),
+            sort: (item1, item2) => item1.tag.localeCompare(item2.tag),
         })
     }
 

src/eventSchemas/explorer/registryItemNode.ts

@@ -50,11 +50,10 @@ export class RegistryItemNode extends AWSTreeNodeBase {
 
                 return [...this.schemaNodes.values()]
             },
-            getErrorNode: async (error: Error, logID: number) =>
-                new ErrorNode(this, error, logID),
+            getErrorNode: async (error: Error, logID: number) => new ErrorNode(this, error, logID),
             getNoChildrenPlaceholderNode: async () =>
                 new PlaceholderNode(this, localize('AWS.explorerNode.registry.noSchemas', '[No Registry Schemas]')),
-            sort: (nodeA: SchemaItemNode, nodeB: SchemaItemNode) => nodeA.schemaName.localeCompare(nodeB.schemaName),
+            sort: (nodeA, nodeB) => nodeA.schemaName.localeCompare(nodeB.schemaName),
         })
     }
 

src/eventSchemas/explorer/schemasNode.ts

@@ -35,12 +35,10 @@ export class SchemasNode extends AWSTreeNodeBase {
 
                 return [...this.registryNodes.values()]
             },
-            getErrorNode: async (error: Error, logID: number) =>
-                new ErrorNode(this, error, logID),
+            getErrorNode: async (error: Error, logID: number) => new ErrorNode(this, error, logID),
             getNoChildrenPlaceholderNode: async () =>
                 new PlaceholderNode(this, localize('AWS.explorerNode.schemas.noRegistry', '[No Schema Registries]')),
-            sort: (nodeA: RegistryItemNode, nodeB: RegistryItemNode) =>
-                nodeA.registryName.localeCompare(nodeB.registryName),
+            sort: (nodeA, nodeB) => nodeA.registryName.localeCompare(nodeB.registryName),
         })
     }