@microsoft/vscode-azext-utils - npm Package Compare versions

Comparing version 0.4.0 to 0.4.1

hostapi.d.ts

@@ -6,4 +6,5 @@ /*---------------------------------------------------------------------------------------------
 
+import type { AzExtResourceType } from '@microsoft/vscode-azureresources-api';
 import type * as vscode from 'vscode';
-import type { AbstractAzExtTreeItem, AzExtParentTreeItem, AzExtResourceType, AzExtTreeDataProvider, AzExtTreeItem, IAzureQuickPickOptions, ISubscriptionContext, ITreeItemPickerContext, SealedAzExtTreeItem } from './index'; // This must remain `import type` or else a circular reference will result
+import type { AbstractAzExtTreeItem, AzExtParentTreeItem, AzExtTreeDataProvider, AzExtTreeItem, IAzureQuickPickOptions, ISubscriptionContext, ITreeItemPickerContext, SealedAzExtTreeItem } from './index'; // This must remain `import type` or else a circular reference will result
 
@@ -10,0 +11,0 @@ /**

out/src/getAzExtResourceType.js

@@ -8,3 +8,3 @@ "use strict";
 exports.getAzExtResourceType = void 0;
-const AzExtResourceType_1 = require("./AzExtResourceType");
+const vscode_azureresources_api_1 = require("@microsoft/vscode-azureresources-api");
 const FunctionAppKind = 'functionapp';
@@ -20,9 +20,9 @@ const LogicAppKind = 'workflowapp';
             if (kind.includes(FunctionAppKind) && kind.includes(LogicAppKind)) {
-                return AzExtResourceType_1.AzExtResourceType.LogicApp;
+                return vscode_azureresources_api_1.AzExtResourceType.LogicApp;
             }
             else if (kind.includes(FunctionAppKind)) {
-                return AzExtResourceType_1.AzExtResourceType.FunctionApp;
+                return vscode_azureresources_api_1.AzExtResourceType.FunctionApp;
             }
             else {
-                return AzExtResourceType_1.AzExtResourceType.AppServices;
+                return vscode_azureresources_api_1.AzExtResourceType.AppServices;
             }
@@ -35,61 +35,61 @@ default:
 const azureTypeToAzExtResourceTypeMap = {
-    'microsoft.resources/resourcegroups': AzExtResourceType_1.AzExtResourceType.ResourceGroup,
-    'microsoft.app/containerapps': AzExtResourceType_1.AzExtResourceType.ContainerApps,
-    'microsoft.app/managedenvironments': AzExtResourceType_1.AzExtResourceType.ContainerAppsEnvironment,
-    'microsoft.compute/virtualmachines': AzExtResourceType_1.AzExtResourceType.VirtualMachines,
-    'microsoft.dbforpostgresql/flexibleservers': AzExtResourceType_1.AzExtResourceType.PostgresqlServersFlexible,
-    'microsoft.dbforpostgresql/servers': AzExtResourceType_1.AzExtResourceType.PostgresqlServersStandard,
-    'microsoft.documentdb/databaseaccounts': AzExtResourceType_1.AzExtResourceType.AzureCosmosDb,
-    'microsoft.storage/storageaccounts': AzExtResourceType_1.AzExtResourceType.StorageAccounts,
-    'microsoft.web/staticsites': AzExtResourceType_1.AzExtResourceType.StaticWebApps,
+    'microsoft.resources/resourcegroups': vscode_azureresources_api_1.AzExtResourceType.ResourceGroup,
+    'microsoft.app/containerapps': vscode_azureresources_api_1.AzExtResourceType.ContainerApps,
+    'microsoft.app/managedenvironments': vscode_azureresources_api_1.AzExtResourceType.ContainerAppsEnvironment,
+    'microsoft.compute/virtualmachines': vscode_azureresources_api_1.AzExtResourceType.VirtualMachines,
+    'microsoft.dbforpostgresql/flexibleservers': vscode_azureresources_api_1.AzExtResourceType.PostgresqlServersFlexible,
+    'microsoft.dbforpostgresql/servers': vscode_azureresources_api_1.AzExtResourceType.PostgresqlServersStandard,
+    'microsoft.documentdb/databaseaccounts': vscode_azureresources_api_1.AzExtResourceType.AzureCosmosDb,
+    'microsoft.storage/storageaccounts': vscode_azureresources_api_1.AzExtResourceType.StorageAccounts,
+    'microsoft.web/staticsites': vscode_azureresources_api_1.AzExtResourceType.StaticWebApps,
     // The below are not supported by the Azure extensions but have icons in the Resources extension
-    'microsoft.apimanagement/service': AzExtResourceType_1.AzExtResourceType.ApiManagementService,
-    'microsoft.batch/batchaccounts': AzExtResourceType_1.AzExtResourceType.BatchAccounts,
-    'microsoft.cache/redis': AzExtResourceType_1.AzExtResourceType.CacheRedis,
-    'microsoft.cdn/profiles': AzExtResourceType_1.AzExtResourceType.FrontDoorAndCdnProfiles,
-    'microsoft.compute/availabilitysets': AzExtResourceType_1.AzExtResourceType.AvailabilitySets,
-    'microsoft.compute/disks': AzExtResourceType_1.AzExtResourceType.Disks,
-    'microsoft.compute/images': AzExtResourceType_1.AzExtResourceType.Images,
-    'microsoft.compute/virtualmachinescalesets': AzExtResourceType_1.AzExtResourceType.VirtualMachineScaleSets,
-    'microsoft.containerregistry/registries': AzExtResourceType_1.AzExtResourceType.ContainerRegistry,
-    'microsoft.containerservice/managedclusters': AzExtResourceType_1.AzExtResourceType.ContainerServiceManagedClusters,
-    'microsoft.dbformysql/servers': AzExtResourceType_1.AzExtResourceType.MysqlServers,
-    'microsoft.devices/iothubs': AzExtResourceType_1.AzExtResourceType.DeviceIotHubs,
-    'microsoft.devtestlab/labs': AzExtResourceType_1.AzExtResourceType.DevTestLabs,
-    'microsoft.eventgrid/domains': AzExtResourceType_1.AzExtResourceType.EventGridDomains,
-    'microsoft.eventgrid/eventsubscriptions': AzExtResourceType_1.AzExtResourceType.EventGridEventSubscriptions,
-    'microsoft.eventgrid/topics': AzExtResourceType_1.AzExtResourceType.EventGridTopics,
-    'microsoft.eventhub/namespaces': AzExtResourceType_1.AzExtResourceType.EventHubNamespaces,
-    'microsoft.extendedlocation/customlocations': AzExtResourceType_1.AzExtResourceType.CustomLocations,
-    'microsoft.insights/components': AzExtResourceType_1.AzExtResourceType.ApplicationInsights,
-    'microsoft.keyvault/vaults': AzExtResourceType_1.AzExtResourceType.KeyVaults,
-    'microsoft.kubernetes/connectedclusters': AzExtResourceType_1.AzExtResourceType.KubernetesConnectedClusters,
-    'microsoft.logic/workflows': AzExtResourceType_1.AzExtResourceType.LogicWorkflows,
-    'microsoft.managedidentity/userassignedidentities': AzExtResourceType_1.AzExtResourceType.ManagedIdentityUserAssignedIdentities,
-    'microsoft.network/applicationgateways': AzExtResourceType_1.AzExtResourceType.NetworkApplicationGateways,
-    'microsoft.network/applicationsecuritygroups': AzExtResourceType_1.AzExtResourceType.NetworkApplicationSecurityGroups,
-    'microsoft.network/loadbalancers': AzExtResourceType_1.AzExtResourceType.LoadBalancers,
-    'microsoft.network/localnetworkgateways': AzExtResourceType_1.AzExtResourceType.NetworkLocalNetworkGateways,
-    'microsoft.network/networkinterfaces': AzExtResourceType_1.AzExtResourceType.NetworkInterfaces,
-    'microsoft.network/networksecuritygroups': AzExtResourceType_1.AzExtResourceType.NetworkSecurityGroups,
-    'microsoft.network/networkwatchers': AzExtResourceType_1.AzExtResourceType.NetworkWatchers,
-    'microsoft.network/publicipaddresses': AzExtResourceType_1.AzExtResourceType.PublicIpAddresses,
-    'microsoft.network/publicipprefixes': AzExtResourceType_1.AzExtResourceType.NetworkPublicIpPrefixes,
-    'microsoft.network/routetables': AzExtResourceType_1.AzExtResourceType.NetworkRouteTables,
-    'microsoft.network/virtualnetworkgateways': AzExtResourceType_1.AzExtResourceType.NetworkVirtualNetworkGateways,
-    'microsoft.network/virtualnetworks': AzExtResourceType_1.AzExtResourceType.VirtualNetworks,
-    'microsoft.notificationhubs/namespaces': AzExtResourceType_1.AzExtResourceType.NotificationHubNamespaces,
-    'microsoft.operationalinsights/workspaces': AzExtResourceType_1.AzExtResourceType.OperationalInsightsWorkspaces,
-    'microsoft.operationsmanagement/solutions': AzExtResourceType_1.AzExtResourceType.OperationsManagementSolutions,
-    'microsoft.servicebus/namespaces': AzExtResourceType_1.AzExtResourceType.ServiceBusNamespaces,
-    'microsoft.servicefabric/clusters': AzExtResourceType_1.AzExtResourceType.ServiceFabricClusters,
-    'microsoft.servicefabricmesh/applications': AzExtResourceType_1.AzExtResourceType.ServiceFabricMeshApplications,
-    'microsoft.signalrservice/signalr': AzExtResourceType_1.AzExtResourceType.SignalRService,
-    'microsoft.appplatform/spring': AzExtResourceType_1.AzExtResourceType.SpringApps,
-    'microsoft.sql/servers': AzExtResourceType_1.AzExtResourceType.SqlServers,
-    'microsoft.sql/servers/databases': AzExtResourceType_1.AzExtResourceType.SqlDatabases,
-    'microsoft.web/hostingenvironments': AzExtResourceType_1.AzExtResourceType.WebHostingEnvironments,
-    'microsoft.web/kubeenvironments': AzExtResourceType_1.AzExtResourceType.AppServiceKubernetesEnvironment,
-    'microsoft.web/serverfarms': AzExtResourceType_1.AzExtResourceType.AppServicePlans,
+    'microsoft.apimanagement/service': vscode_azureresources_api_1.AzExtResourceType.ApiManagementService,
+    'microsoft.batch/batchaccounts': vscode_azureresources_api_1.AzExtResourceType.BatchAccounts,
+    'microsoft.cache/redis': vscode_azureresources_api_1.AzExtResourceType.CacheRedis,
+    'microsoft.cdn/profiles': vscode_azureresources_api_1.AzExtResourceType.FrontDoorAndCdnProfiles,
+    'microsoft.compute/availabilitysets': vscode_azureresources_api_1.AzExtResourceType.AvailabilitySets,
+    'microsoft.compute/disks': vscode_azureresources_api_1.AzExtResourceType.Disks,
+    'microsoft.compute/images': vscode_azureresources_api_1.AzExtResourceType.Images,
+    'microsoft.compute/virtualmachinescalesets': vscode_azureresources_api_1.AzExtResourceType.VirtualMachineScaleSets,
+    'microsoft.containerregistry/registries': vscode_azureresources_api_1.AzExtResourceType.ContainerRegistry,
+    'microsoft.containerservice/managedclusters': vscode_azureresources_api_1.AzExtResourceType.ContainerServiceManagedClusters,
+    'microsoft.dbformysql/servers': vscode_azureresources_api_1.AzExtResourceType.MysqlServers,
+    'microsoft.devices/iothubs': vscode_azureresources_api_1.AzExtResourceType.DeviceIotHubs,
+    'microsoft.devtestlab/labs': vscode_azureresources_api_1.AzExtResourceType.DevTestLabs,
+    'microsoft.eventgrid/domains': vscode_azureresources_api_1.AzExtResourceType.EventGridDomains,
+    'microsoft.eventgrid/eventsubscriptions': vscode_azureresources_api_1.AzExtResourceType.EventGridEventSubscriptions,
+    'microsoft.eventgrid/topics': vscode_azureresources_api_1.AzExtResourceType.EventGridTopics,
+    'microsoft.eventhub/namespaces': vscode_azureresources_api_1.AzExtResourceType.EventHubNamespaces,
+    'microsoft.extendedlocation/customlocations': vscode_azureresources_api_1.AzExtResourceType.CustomLocations,
+    'microsoft.insights/components': vscode_azureresources_api_1.AzExtResourceType.ApplicationInsights,
+    'microsoft.keyvault/vaults': vscode_azureresources_api_1.AzExtResourceType.KeyVaults,
+    'microsoft.kubernetes/connectedclusters': vscode_azureresources_api_1.AzExtResourceType.KubernetesConnectedClusters,
+    'microsoft.logic/workflows': vscode_azureresources_api_1.AzExtResourceType.LogicWorkflows,
+    'microsoft.managedidentity/userassignedidentities': vscode_azureresources_api_1.AzExtResourceType.ManagedIdentityUserAssignedIdentities,
+    'microsoft.network/applicationgateways': vscode_azureresources_api_1.AzExtResourceType.NetworkApplicationGateways,
+    'microsoft.network/applicationsecuritygroups': vscode_azureresources_api_1.AzExtResourceType.NetworkApplicationSecurityGroups,
+    'microsoft.network/loadbalancers': vscode_azureresources_api_1.AzExtResourceType.LoadBalancers,
+    'microsoft.network/localnetworkgateways': vscode_azureresources_api_1.AzExtResourceType.NetworkLocalNetworkGateways,
+    'microsoft.network/networkinterfaces': vscode_azureresources_api_1.AzExtResourceType.NetworkInterfaces,
+    'microsoft.network/networksecuritygroups': vscode_azureresources_api_1.AzExtResourceType.NetworkSecurityGroups,
+    'microsoft.network/networkwatchers': vscode_azureresources_api_1.AzExtResourceType.NetworkWatchers,
+    'microsoft.network/publicipaddresses': vscode_azureresources_api_1.AzExtResourceType.PublicIpAddresses,
+    'microsoft.network/publicipprefixes': vscode_azureresources_api_1.AzExtResourceType.NetworkPublicIpPrefixes,
+    'microsoft.network/routetables': vscode_azureresources_api_1.AzExtResourceType.NetworkRouteTables,
+    'microsoft.network/virtualnetworkgateways': vscode_azureresources_api_1.AzExtResourceType.NetworkVirtualNetworkGateways,
+    'microsoft.network/virtualnetworks': vscode_azureresources_api_1.AzExtResourceType.VirtualNetworks,
+    'microsoft.notificationhubs/namespaces': vscode_azureresources_api_1.AzExtResourceType.NotificationHubNamespaces,
+    'microsoft.operationalinsights/workspaces': vscode_azureresources_api_1.AzExtResourceType.OperationalInsightsWorkspaces,
+    'microsoft.operationsmanagement/solutions': vscode_azureresources_api_1.AzExtResourceType.OperationsManagementSolutions,
+    'microsoft.servicebus/namespaces': vscode_azureresources_api_1.AzExtResourceType.ServiceBusNamespaces,
+    'microsoft.servicefabric/clusters': vscode_azureresources_api_1.AzExtResourceType.ServiceFabricClusters,
+    'microsoft.servicefabricmesh/applications': vscode_azureresources_api_1.AzExtResourceType.ServiceFabricMeshApplications,
+    'microsoft.signalrservice/signalr': vscode_azureresources_api_1.AzExtResourceType.SignalRService,
+    'microsoft.appplatform/spring': vscode_azureresources_api_1.AzExtResourceType.SpringApps,
+    'microsoft.sql/servers': vscode_azureresources_api_1.AzExtResourceType.SqlServers,
+    'microsoft.sql/servers/databases': vscode_azureresources_api_1.AzExtResourceType.SqlDatabases,
+    'microsoft.web/hostingenvironments': vscode_azureresources_api_1.AzExtResourceType.WebHostingEnvironments,
+    'microsoft.web/kubeenvironments': vscode_azureresources_api_1.AzExtResourceType.AppServiceKubernetesEnvironment,
+    'microsoft.web/serverfarms': vscode_azureresources_api_1.AzExtResourceType.AppServicePlans,
 };
 //# sourceMappingURL=getAzExtResourceType.js.map

out/src/getPackageInfo.js

@@ -8,3 +8,2 @@ "use strict";
 exports.getPackageInfo = void 0;
-const fs = require("fs");
 const extensionVariables_1 = require("./extensionVariables");
@@ -17,3 +16,3 @@ let packageInfo;
         }
-        const packageJson = JSON.parse(fs.readFileSync(ctx.asAbsolutePath('package.json')).toString());
+        const packageJson = ctx.extension.packageJSON;
         const extensionName = packageJson.name;
@@ -20,0 +19,0 @@ const extensionVersion = packageJson.version;

out/src/index.js

@@ -21,3 +21,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerReportIssueCommand = exports.maskValue = exports.callWithMaskHandling = exports.addExtensionValueToMask = exports.registerUIExtensionVariables = exports.createExperimentationService = exports.createAzExtOutputChannel = void 0;
+exports.apiUtils = exports.registerReportIssueCommand = exports.maskValue = exports.callWithMaskHandling = exports.addExtensionValueToMask = exports.registerUIExtensionVariables = exports.createExperimentationService = exports.createAzExtOutputChannel = void 0;
 __exportStar(require("./activityLog/activities/ExecuteActivity"), exports);
@@ -27,3 +27,2 @@ __exportStar(require("./activityLog/Activity"), exports);
 Object.defineProperty(exports, "createAzExtOutputChannel", { enumerable: true, get: function () { return AzExtOutputChannel_1.createAzExtOutputChannel; } });
-__exportStar(require("./AzExtResourceType"), exports);
 __exportStar(require("./AzExtTreeFileSystem"), exports);
@@ -60,3 +59,2 @@ __exportStar(require("./callWithTelemetryAndErrorHandling"), exports);
 __exportStar(require("./tree/isAzExtTreeItem"), exports);
-__exportStar(require("./utils/apiUtils"), exports);
 __exportStar(require("./utils/AzExtFsExtra"), exports);
@@ -73,3 +71,6 @@ __exportStar(require("./utils/contextUtils"), exports);
 __exportStar(require("./wizard/DeleteConfirmationStep"), exports);
+// re-export api types and utils
+var vscode_azureresources_api_1 = require("@microsoft/vscode-azureresources-api");
+Object.defineProperty(exports, "apiUtils", { enumerable: true, get: function () { return vscode_azureresources_api_1.apiUtils; } });
 // 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
 //# sourceMappingURL=index.js.map

out/src/pickTreeItem/contextValue/compatibility/CompatibilityContextValueQuickPickStep.js

@@ -19,4 +19,4 @@ "use strict";
 const getLastNode_1 = require("../../getLastNode");
-const registerCommandWithTreeNodeUnwrapping_1 = require("../../../registerCommandWithTreeNodeUnwrapping");
 const isAzExtTreeItem_1 = require("../../../tree/isAzExtTreeItem");
+const vscode_azureresources_api_1 = require("@microsoft/vscode-azureresources-api");
 /**
@@ -47,3 +47,3 @@ * Provides compatability with {@link AzExtParentTreeItem.pickTreeItemImpl}
             const lastPickedItem = (0, getLastNode_1.getLastNode)(wizardContext);
-            const lastPickedItemUnwrapped = (0, registerCommandWithTreeNodeUnwrapping_1.isWrapper)(lastPickedItem) ? lastPickedItem.unwrap() : lastPickedItem;
+            const lastPickedItemUnwrapped = (0, vscode_azureresources_api_1.isWrapper)(lastPickedItem) ? lastPickedItem.unwrap() : lastPickedItem;
             if ((0, isAzExtTreeItem_1.isAzExtParentTreeItem)(lastPickedItemUnwrapped)) {
@@ -54,3 +54,3 @@ const children = yield this.treeDataProvider.getChildren(lastPickedItem);
                     const customPick = children.find((child) => {
-                        const ti = (0, registerCommandWithTreeNodeUnwrapping_1.isWrapper)(child) ? child.unwrap() : child;
+                        const ti = (0, vscode_azureresources_api_1.isWrapper)(child) ? child.unwrap() : child;
                         return ti.fullId === (customChild === null || customChild === void 0 ? void 0 : customChild.fullId);
@@ -57,0 +57,0 @@ });

out/src/pickTreeItem/contextValue/compatibility/CompatibilityRecursiveQuickPickStep.js

@@ -22,3 +22,3 @@ "use strict";
 const isAzExtTreeItem_1 = require("../../../tree/isAzExtTreeItem");
-const registerCommandWithTreeNodeUnwrapping_1 = require("../../../registerCommandWithTreeNodeUnwrapping");
+const vscode_azureresources_api_1 = require("@microsoft/vscode-azureresources-api");
 /**
@@ -69,3 +69,3 @@ * Recursive step which is compatible which adds create picks based if the node has {@link types.CompatibleQuickPickOptions.createChild quickPickOptions.createChild} defined.
             else {
-                const lastPickedItemTi = (0, registerCommandWithTreeNodeUnwrapping_1.isWrapper)(lastPickedItem) ? lastPickedItem.unwrap() : lastPickedItem;
+                const lastPickedItemTi = (0, vscode_azureresources_api_1.isWrapper)(lastPickedItem) ? lastPickedItem.unwrap() : lastPickedItem;
                 const promptOptions = (0, isAzExtTreeItem_1.isAzExtParentTreeItem)(lastPickedItemTi) ? {
@@ -72,0 +72,0 @@ placeHolder: (0, localize_1.localize)('selectTreeItem', 'Select {0}', lastPickedItemTi.childTypeLabel),

out/src/pickTreeItem/experiences/azureResourceExperience.js

@@ -24,4 +24,4 @@ "use strict";
 const AzureWizard_1 = require("../../wizard/AzureWizard");
-const registerCommandWithTreeNodeUnwrapping_1 = require("../../registerCommandWithTreeNodeUnwrapping");
 const CompatibilityRecursiveQuickPickStep_1 = require("../contextValue/compatibility/CompatibilityRecursiveQuickPickStep");
+const vscode_azureresources_api_1 = require("@microsoft/vscode-azureresources-api");
 function azureResourceExperience(context, tdp, resourceTypes, childItemFilter) {
@@ -68,3 +68,3 @@ return __awaiter(this, void 0, void 0, function* () {
         else {
-            return (!context.dontUnwrap && (0, registerCommandWithTreeNodeUnwrapping_1.isWrapper)(lastPickedItem)) ? lastPickedItem.unwrap() : lastPickedItem;
+            return (!context.dontUnwrap && (0, vscode_azureresources_api_1.isWrapper)(lastPickedItem)) ? lastPickedItem.unwrap() : lastPickedItem;
         }
@@ -71,0 +71,0 @@ });

out/src/pickTreeItem/experiences/compatibility/PickTreeItemWithCompatibility.js

@@ -21,3 +21,3 @@ "use strict";
 const errors_1 = require("../../../errors");
-const registerCommandWithTreeNodeUnwrapping_1 = require("../../../registerCommandWithTreeNodeUnwrapping");
+const vscode_azureresources_api_1 = require("@microsoft/vscode-azureresources-api");
 var PickTreeItemWithCompatibility;
@@ -72,3 +72,3 @@ (function (PickTreeItemWithCompatibility) {
             else {
-                return (0, registerCommandWithTreeNodeUnwrapping_1.isWrapper)(lastPickedItem) ? lastPickedItem.unwrap() : lastPickedItem;
+                return (0, vscode_azureresources_api_1.isWrapper)(lastPickedItem) ? lastPickedItem.unwrap() : lastPickedItem;
             }
@@ -75,0 +75,0 @@ });

out/src/pickTreeItem/experiences/contextValueExperience.js

@@ -21,3 +21,3 @@ "use strict";
 const AzureWizard_1 = require("../../wizard/AzureWizard");
-const registerCommandWithTreeNodeUnwrapping_1 = require("../../registerCommandWithTreeNodeUnwrapping");
+const vscode_azureresources_api_1 = require("@microsoft/vscode-azureresources-api");
 function contextValueExperience(context, tdp, contextValueFilter) {
@@ -44,3 +44,3 @@ return __awaiter(this, void 0, void 0, function* () {
         else {
-            return (0, registerCommandWithTreeNodeUnwrapping_1.isWrapper)(lastPickedItem) ? lastPickedItem.unwrap() : lastPickedItem;
+            return (0, vscode_azureresources_api_1.isWrapper)(lastPickedItem) ? lastPickedItem.unwrap() : lastPickedItem;
         }
@@ -47,0 +47,0 @@ });

out/src/registerCommandWithTreeNodeUnwrapping.js

@@ -16,48 +16,15 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWrapper = exports.unwrapArgs = exports.registerCommandWithTreeNodeUnwrapping = void 0;
+exports.unwrapTreeNodeCommandCallback = exports.registerCommandWithTreeNodeUnwrapping = void 0;
+const vscode_azureresources_api_1 = require("@microsoft/vscode-azureresources-api");
 const registerCommand_1 = require("./registerCommand");
 function registerCommandWithTreeNodeUnwrapping(commandId, treeNodeCallback, debounce, telemetryId) {
-    (0, registerCommand_1.registerCommand)(commandId, unwrapArgs(treeNodeCallback), debounce, telemetryId);
+    (0, registerCommand_1.registerCommand)(commandId, unwrapTreeNodeCommandCallback(treeNodeCallback), debounce, telemetryId);
 }
 exports.registerCommandWithTreeNodeUnwrapping = registerCommandWithTreeNodeUnwrapping;
-function unwrapArgs(treeNodeCallback) {
+function unwrapTreeNodeCommandCallback(treeNodeCallback) {
     return (context, ...args) => __awaiter(this, void 0, void 0, function* () {
-        const maybeNodeWrapper = args === null || args === void 0 ? void 0 : args[0];
-        const maybeNodeWrapperArray = args === null || args === void 0 ? void 0 : args[1];
-        const remainingArgs = args.slice(2);
-        let node;
-        if (maybeNodeWrapper && isWrapper(maybeNodeWrapper)) {
-            // If the first arg is a wrapper, unwrap it
-            node = yield maybeNodeWrapper.unwrap();
-        }
-        else if (maybeNodeWrapper) {
-            // Otherwise, assume it is just a T
-            node = maybeNodeWrapper;
-        }
-        let nodes;
-        if (maybeNodeWrapperArray && Array.isArray(maybeNodeWrapperArray) && maybeNodeWrapperArray.every(n => isWrapper(n))) {
-            // If the first arg is an array of wrappers, unwrap them
-            const wrappedNodes = maybeNodeWrapperArray;
-            nodes = [];
-            for (const n of wrappedNodes) {
-                nodes.push(n.unwrap());
-            }
-        }
-        else if (maybeNodeWrapperArray && Array.isArray(maybeNodeWrapperArray)) {
-            // Otherwise, assume it is just an array of T's
-            nodes = maybeNodeWrapperArray;
-        }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-        return treeNodeCallback(context, node, nodes, ...remainingArgs);
+        return treeNodeCallback(context, ...(0, vscode_azureresources_api_1.unwrapArgs)(args));
     });
 }
-exports.unwrapArgs = unwrapArgs;
-function isWrapper(maybeWrapper) {
-    if (maybeWrapper && typeof maybeWrapper === 'object' &&
-        maybeWrapper.unwrap && typeof maybeWrapper.unwrap === 'function') {
-        return true;
-    }
-    return false;
-}
-exports.isWrapper = isWrapper;
+exports.unwrapTreeNodeCommandCallback = unwrapTreeNodeCommandCallback;
 //# sourceMappingURL=registerCommandWithTreeNodeUnwrapping.js.map

package.json

 {
     "name": "@microsoft/vscode-azext-utils",
     "author": "Microsoft Corporation",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "Common UI tools for developing Azure extensions for VS Code",
@@ -35,2 +35,3 @@ "tags": [
     "dependencies": {
+        "@microsoft/vscode-azureresources-api": "^2.0.2",
         "@vscode/extension-telemetry": "^0.6.2",
@@ -37,0 +38,0 @@ "dayjs": "^1.11.2",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

915975

increased by135.65%

Number of package files

86

increased by2.38%

Number of low supply chain risk alerts

3

decreased by-25%

Worsened metrics

Dependency count

9

increased by12.5%

Lines of code

7076

decreased by-7.36%

Dependency changes

• + Added@microsoft/vscode-azureresources-api@^2.0.2

• + Added@azure/ms-rest-azure-env@2.0.0(transitive)

• + Added@microsoft/vscode-azureresources-api@2.3.2(transitive)