From cd05092f9a41ace82c0a3916a022f152e153f44f Mon Sep 17 00:00:00 2001 From: Alex Weininger Date: Tue, 22 Aug 2023 13:10:17 -0700 Subject: [PATCH] Move internal api file into src and make it a ts file (#741) --- extension.bundle.ts | 1 + src/api/DefaultAzureResourceProvider.ts | 4 ++-- src/api/ResourceProviderManagers.ts | 2 +- src/api/createAzureResourcesHostApi.ts | 2 +- src/api/createWrappedAzureResourcesExtensionApi.ts | 2 +- src/extension.ts | 2 +- src/extensionVariables.ts | 2 +- hostapi.v2.internal.d.ts => src/hostapi.v2.internal.ts | 2 +- test/api/api.ts | 3 +-- 9 files changed, 10 insertions(+), 10 deletions(-) rename hostapi.v2.internal.d.ts => src/hostapi.v2.internal.ts (93%) diff --git a/extension.bundle.ts b/extension.bundle.ts index 7276243a..67eea889 100644 --- a/extension.bundle.ts +++ b/extension.bundle.ts @@ -32,6 +32,7 @@ export * from './src/services/AzureResourcesService'; // Export activate/deactivate for main.js export { activate, deactivate } from './src/extension'; export * from './src/extensionVariables'; +export * from './src/hostapi.v2.internal'; export * from './src/tree/BranchDataItemWrapper'; export * from './src/tree/InvalidItem'; export { ResourceGroupsItem } from './src/tree/ResourceGroupsItem'; diff --git a/src/api/DefaultAzureResourceProvider.ts b/src/api/DefaultAzureResourceProvider.ts index 9ef8bf95..a999fca0 100644 --- a/src/api/DefaultAzureResourceProvider.ts +++ b/src/api/DefaultAzureResourceProvider.ts @@ -5,10 +5,10 @@ import { GenericResource, ResourceGroup } from '@azure/arm-resources'; import { getResourceGroupFromId } from "@microsoft/vscode-azext-azureutils"; -import { callWithTelemetryAndErrorHandling, getAzExtResourceType, IActionContext, nonNullProp } from '@microsoft/vscode-azext-utils'; +import { IActionContext, callWithTelemetryAndErrorHandling, getAzExtResourceType, nonNullProp } from '@microsoft/vscode-azext-utils'; import * as vscode from 'vscode'; import { AzureResource, AzureSubscription } from '../../api/src/index'; -import { AzureResourceProvider } from '../../hostapi.v2.internal'; +import { AzureResourceProvider } from '../hostapi.v2.internal'; import { getAzureResourcesService } from '../services/AzureResourcesService'; export class DefaultAzureResourceProvider implements AzureResourceProvider { diff --git a/src/api/ResourceProviderManagers.ts b/src/api/ResourceProviderManagers.ts index 29b9e7d7..d8a4cf89 100644 --- a/src/api/ResourceProviderManagers.ts +++ b/src/api/ResourceProviderManagers.ts @@ -5,7 +5,7 @@ import * as vscode from 'vscode'; import { AzureResource, AzureSubscription, ResourceBase, ResourceProvider, WorkspaceResource, WorkspaceResourceProvider } from '../../api/src/index'; -import { AzureResourceProvider } from '../../hostapi.v2.internal'; +import { AzureResourceProvider } from '../hostapi.v2.internal'; export function isArray(maybeArray: T[] | null | undefined): maybeArray is T[] { return Array.isArray(maybeArray); diff --git a/src/api/createAzureResourcesHostApi.ts b/src/api/createAzureResourcesHostApi.ts index e7408f25..ab393e59 100644 --- a/src/api/createAzureResourcesHostApi.ts +++ b/src/api/createAzureResourcesHostApi.ts @@ -6,8 +6,8 @@ import { callWithTelemetryAndErrorHandling } from '@microsoft/vscode-azext-utils'; import * as vscode from 'vscode'; import { AzExtResourceType, AzureResource, BranchDataProvider, ResourceModelBase, VSCodeRevealOptions, WorkspaceResource, WorkspaceResourceProvider } from '../../api/src/index'; -import { AzureResourceProvider, AzureResourcesHostApiInternal } from '../../hostapi.v2.internal'; import { revealResource } from '../commands/revealResource'; +import { AzureResourceProvider, AzureResourcesHostApiInternal } from '../hostapi.v2.internal'; import { AzureResourceBranchDataProviderManager } from '../tree/azure/AzureResourceBranchDataProviderManager'; import { AzureResourceTreeDataProvider } from '../tree/azure/AzureResourceTreeDataProvider'; import { WorkspaceResourceBranchDataProviderManager } from '../tree/workspace/WorkspaceResourceBranchDataProviderManager'; diff --git a/src/api/createWrappedAzureResourcesExtensionApi.ts b/src/api/createWrappedAzureResourcesExtensionApi.ts index d3db9e01..bee30335 100644 --- a/src/api/createWrappedAzureResourcesExtensionApi.ts +++ b/src/api/createWrappedAzureResourcesExtensionApi.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IActionContext } from '@microsoft/vscode-azext-utils'; -import { AzureResourcesApiInternal } from '../../hostapi.v2.internal'; +import { AzureResourcesApiInternal } from '../hostapi.v2.internal'; import { wrapFunctionsInTelemetry, wrapFunctionsInTelemetrySync } from '../utils/wrapFunctionsInTelemetry'; export function createWrappedAzureResourcesExtensionApi(api: AzureResourcesApiInternal, extensionId: string): AzureResourcesApiInternal { diff --git a/src/extension.ts b/src/extension.ts index 048a0d5e..740d1a96 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -9,7 +9,6 @@ import { registerAzureUtilsExtensionVariables, setupAzureLogger } from '@microso import { AzExtTreeDataProvider, AzureExtensionApiFactory, IActionContext, callWithTelemetryAndErrorHandling, createApiProvider, createAzExtLogOutputChannel, registerUIExtensionVariables } from '@microsoft/vscode-azext-utils'; import { GetApiOptions, apiUtils } from 'api/src/utils/apiUtils'; import * as vscode from 'vscode'; -import { AzureResourcesApiInternal } from '../hostapi.v2.internal'; import { ActivityLogTreeItem } from './activityLog/ActivityLogsTreeItem'; import { registerActivity } from './activityLog/registerActivity'; import { DefaultAzureResourceProvider } from './api/DefaultAzureResourceProvider'; @@ -26,6 +25,7 @@ import { registerCommands } from './commands/registerCommands'; import { TagFileSystem } from './commands/tags/TagFileSystem'; import { registerTagDiagnostics } from './commands/tags/registerTagDiagnostics'; import { ext } from './extensionVariables'; +import { AzureResourcesApiInternal } from './hostapi.v2.internal'; import { createVSCodeAzureSubscriptionProviderFactory } from './services/VSCodeAzureSubscriptionProvider'; import { BranchDataItemCache } from './tree/BranchDataItemCache'; import { HelpTreeItem } from './tree/HelpTreeItem'; diff --git a/src/extensionVariables.ts b/src/extensionVariables.ts index d7ae3fd7..5bf9e5d2 100644 --- a/src/extensionVariables.ts +++ b/src/extensionVariables.ts @@ -7,9 +7,9 @@ import { AzureSubscriptionProvider } from "@microsoft/vscode-azext-azureauth"; import { AzExtTreeDataProvider, IAzExtLogOutputChannel } from "@microsoft/vscode-azext-utils"; import { AzExtResourceType } from "api/docs/vscode-azureresources-api"; import { DiagnosticCollection, Disposable, ExtensionContext, TreeView, UIKind, env } from "vscode"; -import { AzureResourcesApiInternal } from "../hostapi.v2.internal"; import { ActivityLogTreeItem } from "./activityLog/ActivityLogsTreeItem"; import { TagFileSystem } from "./commands/tags/TagFileSystem"; +import { AzureResourcesApiInternal } from "./hostapi.v2.internal"; import { AzureResourcesServiceFactory } from "./services/AzureResourcesService"; import { ResourceGroupsItem } from "./tree/ResourceGroupsItem"; import { TreeItemStateStore } from "./tree/TreeItemState"; diff --git a/hostapi.v2.internal.d.ts b/src/hostapi.v2.internal.ts similarity index 93% rename from hostapi.v2.internal.d.ts rename to src/hostapi.v2.internal.ts index 9d027459..d0f40988 100644 --- a/hostapi.v2.internal.d.ts +++ b/src/hostapi.v2.internal.ts @@ -1,6 +1,6 @@ import { ActivityApi } from '@microsoft/vscode-azext-utils/activity'; import * as vscode from 'vscode'; -import { AzureResource, AzureResourcesExtensionApi, AzureSubscription, ResourceProvider, ResourcesApi } from "./api/src/index"; +import { AzureResource, AzureResourcesExtensionApi, AzureSubscription, ResourceProvider, ResourcesApi } from "../api/src/index"; // v2 types that are internal to resource groups (for now) diff --git a/test/api/api.ts b/test/api/api.ts index 81d5a53d..c597beb5 100644 --- a/test/api/api.ts +++ b/test/api/api.ts @@ -1,4 +1,3 @@ -import { ext } from "../../extension.bundle"; -import { AzureResourcesHostApiInternal } from "../../hostapi.v2.internal"; +import { AzureResourcesHostApiInternal, ext } from "../../extension.bundle"; export const api = (): AzureResourcesHostApiInternal => ext.v2.api.resources;