Skip to content
Open
Show file tree
Hide file tree
Changes from 17 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 45 additions & 33 deletions vscode/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions vscode/packages/npm-package/index.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as cp from 'child_process';
import * as rpc from 'vscode-jsonrpc/node';
import { ensureKiotaIsPresent, getKiotaPath } from './install';
import { ensureKiotaIsPresent, getKiotaPath } from './install.js';


export default async function connectToKiota<T>(callback: (connection: rpc.MessageConnection) => Promise<T | undefined>, workingDirectory: string = process.cwd()): Promise<T | undefined | Error> {
Expand Down
6 changes: 3 additions & 3 deletions vscode/packages/npm-package/lib/generateClient.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as rpc from "vscode-jsonrpc/node";

import connectToKiota from "../connect";
import { checkForSuccess } from "../utils";
import { ConsumerOperation, GenerationConfiguration, KiotaGenerationLanguage, KiotaLogEntry, KiotaResult } from "../types";
import connectToKiota from "./connect.js";
import { checkForSuccess } from "./utils.js";
import { ConsumerOperation, GenerationConfiguration, KiotaGenerationLanguage, KiotaLogEntry, KiotaResult } from "./types.js";

export interface ClientGenerationOptions {
openAPIFilePath: string;
Expand Down
6 changes: 3 additions & 3 deletions vscode/packages/npm-package/lib/generatePlugin.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as rpc from "vscode-jsonrpc/node";

import connectToKiota from "../connect";
import { KiotaPluginType, GeneratePluginResult, ConsumerOperation, GenerationConfiguration, KiotaLogEntry, PluginAuthType } from "../types";
import connectToKiota from "./connect.js";
import { KiotaPluginType, GeneratePluginResult, ConsumerOperation, GenerationConfiguration, KiotaLogEntry, PluginAuthType } from "./types.js";
import * as path from "path";
import { checkForSuccess } from "../utils";
import { checkForSuccess } from "./utils.js";

export interface PluginGenerationOptions {
descriptionPath: string;
Expand Down
4 changes: 2 additions & 2 deletions vscode/packages/npm-package/lib/getKiotaTree.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as rpc from "vscode-jsonrpc/node";

import connectToKiota from "../connect";
import { KiotaTreeResult, KiotaShowConfiguration } from "../types";
import connectToKiota from "./connect.js";
import { KiotaTreeResult, KiotaShowConfiguration } from "./types.js";

export interface KiotaResultOptions {
descriptionPath: string;
Expand Down
2 changes: 1 addition & 1 deletion vscode/packages/npm-package/lib/getKiotaVersion.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as rpc from "vscode-jsonrpc/node";

import connectToKiota from '../connect';
import connectToKiota from './connect.js';

/**
* Retrieves the version of Kiota by connecting to the Kiota service.
Expand Down
4 changes: 2 additions & 2 deletions vscode/packages/npm-package/lib/getManifestDetails.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as rpc from "vscode-jsonrpc/node";

import connectToKiota from "../connect";
import { KiotaManifestResult, KiotaGetManifestDetailsConfiguration } from "../types";
import connectToKiota from "./connect.js";
import { KiotaManifestResult, KiotaGetManifestDetailsConfiguration } from "./types.js";

export interface ManifestOptions {
manifestPath: string;
Expand Down
4 changes: 2 additions & 2 deletions vscode/packages/npm-package/lib/getPluginManifest.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as rpc from "vscode-jsonrpc/node";

import connectToKiota from "../connect";
import { PluginManifestResult } from "../types";
import connectToKiota from "./connect.js";
import { PluginManifestResult } from "./types.js";

export interface GetPluginManifestOptions {
descriptionPath: string;
Expand Down
13 changes: 13 additions & 0 deletions vscode/packages/npm-package/lib/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export * from './config.js';
export * from './generateClient.js';
export * from './generatePlugin.js';
export * from './getKiotaTree.js';
export * from './getKiotaVersion.js';
export * from './getManifestDetails.js';
export * from './languageInformation.js';
export * from './migrateFromLockFile.js';
export * from './removeItem.js';
export * from './searchDescription.js';
export * from './updateClients.js';
export * from './types.js';
export * from './utils.js';
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { createHash } from 'crypto';
import * as https from 'https';
import * as fs from 'fs';
import * as path from 'path';
import { getKiotaConfig } from './config';
import { getKiotaConfig } from './config.js';

import runtimeJson from './runtime.json';
import runtimeJson from './runtime.json' with { type: 'json' };

const kiotaInstallStatusKey = "kiotaInstallStatus";
const installDelayInMs = 30000; // 30 seconds
Expand Down
4 changes: 2 additions & 2 deletions vscode/packages/npm-package/lib/languageInformation.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as rpc from "vscode-jsonrpc/node";

import connectToKiota from "../connect";
import { LanguagesInformation } from "../types";
import connectToKiota from "./connect.js";
import { LanguagesInformation } from "./types.js";

export interface LanguageInformationConfiguration {
descriptionUrl: string; clearCache: boolean;
Expand Down
4 changes: 2 additions & 2 deletions vscode/packages/npm-package/lib/migrateFromLockFile.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as rpc from "vscode-jsonrpc/node";

import connectToKiota from "../connect";
import { KiotaLogEntry } from "../types";
import connectToKiota from "./connect.js";
import { KiotaLogEntry } from "./types.js";

/**
* Migrates data from a lock file located in the specified directory.
Expand Down
8 changes: 4 additions & 4 deletions vscode/packages/npm-package/lib/removeItem.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as rpc from "vscode-jsonrpc/node";

import connectToKiota from "../connect";
import { KiotaResult, KiotaLogEntry } from "../types";
import connectToKiota from "./connect.js";
import { KiotaResult, KiotaLogEntry } from "./types.js";

export interface RemoveItemConfiguration {
cleanOutput: boolean;
Expand Down Expand Up @@ -44,7 +44,7 @@ export async function removePlugin({ pluginName, cleanOutput, workingDirectory }

if (result) {
return {
isSuccess: result.some(k => k.message.includes('removed successfully')),
isSuccess: result.some((k: any) => k.message.includes('removed successfully')),
logs: result
};
}
Expand Down Expand Up @@ -80,7 +80,7 @@ export async function removeClient({ clientName, cleanOutput, workingDirectory }

if (result) {
return {
isSuccess: result.some(k => k.message.includes('removed successfully')),
isSuccess: result.some((k: any) => k.message.includes('removed successfully')),
logs: result
};
}
Expand Down
4 changes: 2 additions & 2 deletions vscode/packages/npm-package/lib/searchDescription.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as rpc from "vscode-jsonrpc/node";

import connectToKiota from '../connect';
import { KiotaSearchResultItem, KiotaSearchResult } from "../types";
import connectToKiota from './connect.js';
import { KiotaSearchResultItem, KiotaSearchResult } from "./types.js";

export interface SearchConfiguration {
searchTerm: string;
Expand Down
4 changes: 2 additions & 2 deletions vscode/packages/npm-package/lib/updateClients.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as rpc from "vscode-jsonrpc/node";

import connectToKiota from "../connect";
import { KiotaLogEntry } from "../types";
import connectToKiota from "./connect.js";
import { KiotaLogEntry } from "./types.js";

export interface UpdateClientsConfiguration {
cleanOutput: boolean;
Expand Down
Loading