Add isAzExtTreeItem util

utils/index.d.ts

@@ -464,6 +464,9 @@ export declare abstract class AzExtTreeItem implements IAzExtTreeItem {
     public resolveTooltip?(): Promise<string | MarkdownString>;
 }
 
+export declare function isAzExtTreeItem(maybeTreeItem: unknown): maybeTreeItem is AzExtTreeItem;
+export declare function isAzExtParentTreeItem(maybeParentTreeItem: unknown): maybeParentTreeItem is AzExtParentTreeItem;
+
 export interface IGenericTreeItemOptions {
     id?: string;
     label: string;

utils/src/index.ts

@@ -37,4 +37,5 @@ export * from './utils/contextUtils';
 export * from './activityLog/activities/ExecuteActivity';
 export * from './getAzExtResourceType';
 export * from './AzExtResourceType';
+export * from './tree/isAzExtParentTreeItem';
 // NOTE: The auto-fix action "source.organizeImports" does weird things with this file, but there doesn't seem to be a way to disable it on a per-file basis so we'll just let it happen

utils/src/tree/AzExtParentTreeItem.ts

@@ -11,7 +11,8 @@ import { localize } from '../localize';
 import { randomUtils } from '../utils/randomUtils';
 import { AzExtTreeItem } from './AzExtTreeItem';
 import { GenericTreeItem } from './GenericTreeItem';
-import { IAzExtParentTreeItemInternal, isAzExtParentTreeItem } from './InternalInterfaces';
+import { IAzExtParentTreeItemInternal } from './InternalInterfaces';
+import { isAzExtParentTreeItem } from './isAzExtParentTreeItem';
 import { runWithLoadingNotification } from './runWithLoadingNotification';
 import { loadMoreLabel } from './treeConstants';
 

utils/src/tree/AzExtTreeDataProvider.ts

@@ -14,7 +14,8 @@ import { AzExtParentTreeItem, InvalidTreeItem } from './AzExtParentTreeItem';
 import { AzExtTreeItem } from './AzExtTreeItem';
 import { CollapsibleStateTracker } from './CollapsibleStateTracker';
 import { GenericTreeItem } from './GenericTreeItem';
-import { IAzExtTreeDataProviderInternal, isAzExtParentTreeItem } from './InternalInterfaces';
+import { IAzExtTreeDataProviderInternal } from './InternalInterfaces';
+import { isAzExtParentTreeItem } from './isAzExtParentTreeItem';
 import { runWithLoadingNotification } from './runWithLoadingNotification';
 import { loadMoreLabel } from './treeConstants';
 

utils/src/tree/AzExtTreeItem.ts

@@ -8,11 +8,14 @@ import * as types from '../../index';
 import { NotImplementedError } from '../errors';
 import { localize } from '../localize';
 import { nonNullProp } from '../utils/nonNull';
-import { IAzExtParentTreeItemInternal, IAzExtTreeDataProviderInternal, isAzExtParentTreeItem } from "./InternalInterfaces";
+import { IAzExtParentTreeItemInternal, IAzExtTreeDataProviderInternal } from "./InternalInterfaces";
 import { settingUtils } from '../utils/settingUtils';
 import { showContextValueSetting } from '../constants';
+import { isAzExtParentTreeItem } from './isAzExtParentTreeItem';
 
 export abstract class AzExtTreeItem implements types.AzExtTreeItem {
+    public readonly _isAzExtTreeItem = true;
+
     //#region Properties implemented by base class
     public abstract label: string;
     public abstract contextValue: string;
@@ -120,7 +123,7 @@ export abstract class AzExtTreeItem implements types.AzExtTreeItem {
     }
 
     public get tooltip(): string | undefined {
-        if(process.env.DEBUGTELEMETRY === 'v' && !!settingUtils.getWorkspaceSetting<unknown>(showContextValueSetting)) {
+        if (process.env.DEBUGTELEMETRY === 'v' && !!settingUtils.getWorkspaceSetting<unknown>(showContextValueSetting)) {
             return `Context: "${this.contextValue}"`;
         } else {
             return this._tooltip;

utils/src/tree/InternalInterfaces.ts

@@ -5,13 +5,14 @@
 
 import { EventEmitter } from 'vscode';
 import * as types from '../../index';
-import { AzExtTreeItem } from './AzExtTreeItem';
+import { AzExtParentTreeItem } from './AzExtParentTreeItem';
+import type { AzExtTreeItem } from './AzExtTreeItem';
 import { CollapsibleStateTracker } from './CollapsibleStateTracker';
 
 // Interfaces for methods on the tree that aren't exposed outside of this package
 // We can't reference the classes directly because it would result in circular dependencies
 
-export interface IAzExtParentTreeItemInternal extends types.AzExtParentTreeItem, AzExtTreeItem {
+export interface IAzExtParentTreeItemInternal extends AzExtParentTreeItem {
     _isAzExtParentTreeItem: boolean;
     parent: IAzExtParentTreeItemInternal | undefined;
     treeDataProvider: IAzExtTreeDataProviderInternal;
@@ -24,10 +25,3 @@ export interface IAzExtTreeDataProviderInternal extends types.AzExtTreeDataProvi
     refreshUIOnly(treeItem: AzExtTreeItem | undefined): void;
     readonly collapsibleStateTracker: CollapsibleStateTracker | undefined;
 }
-
-/**
- * Using instanceof AzExtParentTreeItem causes issues whenever packages are linked for dev testing. Instead, check _isAzExtParentTreeItem
- */
-export function isAzExtParentTreeItem(item: {}): boolean {
-    return !!(<IAzExtParentTreeItemInternal>item)._isAzExtParentTreeItem;
-}

utils/src/tree/isAzExtParentTreeItem.ts

@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import type { AzExtParentTreeItem } from "./AzExtParentTreeItem";
+import type { AzExtTreeItem } from "./AzExtTreeItem";
+import type { IAzExtParentTreeItemInternal } from "./InternalInterfaces";
+
+/**
+ * Using instanceof AzExtParentTreeItem causes issues since each extension has their own version of the utils. Instead, check _isAzExtParentTreeItem
+ */
+export function isAzExtParentTreeItem(maybeParentTreeItem: unknown): maybeParentTreeItem is AzExtParentTreeItem {
+    return typeof maybeParentTreeItem === 'object' && (maybeParentTreeItem as IAzExtParentTreeItemInternal)._isAzExtParentTreeItem === true;
+}
+
+export function isAzExtTreeItem(maybeTreeItem: unknown): maybeTreeItem is AzExtTreeItem {
+    return typeof maybeTreeItem === 'object' && (maybeTreeItem as AzExtTreeItem)._isAzExtTreeItem === true;
+}