From 042b21fdd09f1990836b601482f254ba146fd6e3 Mon Sep 17 00:00:00 2001 From: llibarona Date: Thu, 24 Feb 2022 18:34:37 -0300 Subject: [PATCH] wip anypoint-als client --- package-lock.json | 45 ++++++++++++++++----------------- package.json | 24 ++---------------- src/extension.ts | 2 +- src/features.ts | 4 +-- src/server/als.ts | 2 +- src/server/alsConfiguration.ts | 5 ++-- src/server/handlers.ts | 2 +- src/test/e2e/fileRename.test.ts | 2 +- src/types.ts | 2 +- src/ui/configurationView.ts | 2 +- 10 files changed, 35 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8a0b872..b8f6b9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,31 +1,9 @@ { "name": "aml-vscode", - "version": "0.5.0", + "version": "0.6.0-TopoEdition", "lockfileVersion": 1, "requires": true, "dependencies": { - "@aml-org/als-node-client": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@aml-org/als-node-client/-/als-node-client-5.0.1.tgz", - "integrity": "sha512-SbezWH1iN8lolOos3+aI8nNYB+x44ApvxFpFrrmqi7OZFaLlL4dr3SHUPxqMrIOKwP0IZPnW14rWa7d/EPYrmQ==", - "requires": { - "@aml-org/amf-custom-validator": "1.0.0", - "@aml-org/amf-custom-validator-web": "1.0.0", - "ajv": "6.12.6", - "vscode-jsonrpc": "6.0.0", - "vscode-languageserver-protocol": "3.16.0" - }, - "dependencies": { - "@aml-org/amf-custom-validator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@aml-org/amf-custom-validator/-/amf-custom-validator-1.0.0.tgz", - "integrity": "sha512-76NQmLpvxs7+jUQYtVw+E/fytl9VbvgNpDb/sAm3k9dPF4I64xp3cEdwm4u/pTD43zH/9PcfwgYE+K2B/VdG9Q==", - "requires": { - "pako": "^2.0.3" - } - } - } - }, "@aml-org/amf-custom-validator": { "version": "0.1.0-SNAPSHOT.16", "resolved": "https://registry.npmjs.org/@aml-org/amf-custom-validator/-/amf-custom-validator-0.1.0-SNAPSHOT.16.tgz", @@ -91,6 +69,27 @@ } } }, + "@mulesoft/anypoint-node-client": { + "version": "file:../anypoint-als/anypoint-node-client/node-package/mulesoft-anypoint-node-client-5.1.0-SNAPSHOT.tgz", + "integrity": "sha512-IEMYAOxcE6MQbAZ6hVm1qTQgPlhw4xpVtPI0kK3h5bU9ME8ovEtAqlY9Rc3sjwdgElCfCVogVnMeAhJxIRZgfw==", + "requires": { + "@aml-org/amf-custom-validator": "1.0.0", + "@aml-org/amf-custom-validator-web": "1.0.0", + "ajv": "6.12.6", + "vscode-jsonrpc": "6.0.0", + "vscode-languageserver-protocol": "3.16.0" + }, + "dependencies": { + "@aml-org/amf-custom-validator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@aml-org/amf-custom-validator/-/amf-custom-validator-1.0.0.tgz", + "integrity": "sha512-76NQmLpvxs7+jUQYtVw+E/fytl9VbvgNpDb/sAm3k9dPF4I64xp3cEdwm4u/pTD43zH/9PcfwgYE+K2B/VdG9Q==", + "requires": { + "pako": "^2.0.3" + } + } + } + }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", diff --git a/package.json b/package.json index f790b0c..2b52193 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "AML support", "description": "", "publisher": "MuleSoftInc", - "version": "0.5.0", + "version": "0.6.0-TopoEdition", "engines": { "vscode": "^1.52.0" }, @@ -271,26 +271,6 @@ "when": "resourceLangId == aml || resourceLangId == aml-json", "command": "als.conversion", "group": "7_modification" - }, - { - "when": "resourceLangId == aml || resourceLangId == aml-json", - "command": "als.setMainFile", - "group": "7_modification" - }, - { - "when": "resourceLangId == aml || resourceLangId == aml-json", - "command": "als.registerProfile", - "group": "7_modification" - }, - { - "when": "resourceLangId == aml || resourceLangId == aml-json", - "command": "als.unregisterProfile", - "group": "7_modification" - }, - { - "when": "resourceLangId == aml || resourceLangId == aml-json", - "command": "als.registerSemantic", - "group": "7_modification" } ] }, @@ -313,7 +293,7 @@ } }, "dependencies": { - "@aml-org/als-node-client": "5.0.1", + "@mulesoft/anypoint-node-client": "/Users/llibarona/mulesoft/anypoint-als/anypoint-node-client/node-package/mulesoft-anypoint-node-client-5.1.0-SNAPSHOT.tgz", "@types/mocha": "^8.2.1", "@types/node": "^11.15.20", "@types/vscode": "1.52.0", diff --git a/src/extension.ts b/src/extension.ts index 61d018e..fd1900e 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -18,7 +18,7 @@ import { AlsInitializeParamsFeature, ConversionFeature } from './features' import { AlsLanguageClient } from './server/als' import { SettingsManager } from './settings' -var jsAls = require.resolve("@aml-org/als-node-client") +var jsAls = require.resolve("@mulesoft/anypoint-node-client") export let alsLog = vscode.window.createOutputChannel("alsLog"); export class AlsResolver { diff --git a/src/features.ts b/src/features.ts index ae92b80..e75f582 100644 --- a/src/features.ts +++ b/src/features.ts @@ -1,4 +1,4 @@ -import { AlsClientCapabilities, AlsInitializeParams } from '@aml-org/als-node-client'; +import { AlsClientCapabilities, AlsInitializeParams } from '@mulesoft/anypoint-node-client'; import { DocumentSelector } from 'vscode'; import { ClientCapabilities, InitializeParams, ServerCapabilities, StaticFeature } from 'vscode-languageclient'; export class ConversionFeature implements StaticFeature { @@ -33,7 +33,7 @@ export class AlsInitializeParamsFeature implements StaticFeature { } fillInitializeParams?: (params: InitializeParams) => void = (params: InitializeParams) => { var castedParams = params as AlsInitializeParams - castedParams.hotReload = this.hotReload + // castedParams.hotReload = this.hotReload } fillClientCapabilities(capabilities: ClientCapabilities): void { diff --git a/src/server/als.ts b/src/server/als.ts index 8aa4085..9c93393 100644 --- a/src/server/als.ts +++ b/src/server/als.ts @@ -8,7 +8,7 @@ import { conversionHandler, registerProfileHandler, registerSemanticHandler, ren import { ConfigurationViewProvider } from '../ui/configurationView'; import { SettingsManager } from '../settings'; import { Disposable } from 'vscode'; -import { ConversionParams, DidChangeConfigurationNotificationParams, GetWorkspaceConfigurationParams, GetWorkspaceConfigurationResult, RenameFileActionParams, RenameFileActionResult, SerializationParams, SerializationResult, SerializedDocument } from '@aml-org/als-node-client'; +import { ConversionParams, DidChangeConfigurationNotificationParams, GetWorkspaceConfigurationParams, GetWorkspaceConfigurationResult, RenameFileActionParams, RenameFileActionResult, SerializationParams, SerializationResult, SerializedDocument } from '@mulesoft/anypoint-node-client'; import { messages } from '../types'; diff --git a/src/server/alsConfiguration.ts b/src/server/alsConfiguration.ts index 622e1be..bcf5b48 100644 --- a/src/server/alsConfiguration.ts +++ b/src/server/alsConfiguration.ts @@ -1,7 +1,7 @@ import { messages } from "../types"; import { LanguageClient } from "vscode-languageclient/node"; import { workspace } from "vscode"; -import { AlsConfiguration } from "@aml-org/als-node-client"; +import { AlsConfiguration } from "@mulesoft/anypoint-node-client"; export const initialConfiguration: AlsConfiguration = { @@ -9,7 +9,8 @@ export const initialConfiguration: AlsConfiguration = { "application/raml+yaml": { tabSize: 2, preferSpaces: true } }, templateType: "FULL", - prettyPrintSerialization: true + prettyPrintSerialization: true, + } export var currentConfiguration: AlsConfiguration = initialConfiguration diff --git a/src/server/handlers.ts b/src/server/handlers.ts index 3eac368..dbf474c 100644 --- a/src/server/handlers.ts +++ b/src/server/handlers.ts @@ -2,7 +2,7 @@ import { AlsLanguageClient } from "./als" import * as vscode from 'vscode'; import { awaitInputBox } from "../ui/ui"; import {alsLog} from "../extension" -import { DidChangeConfigurationNotificationParams } from "@aml-org/als-node-client"; +import { DidChangeConfigurationNotificationParams } from "@mulesoft/anypoint-node-client"; import { isDependencyConfiguration } from "../types"; var path = require("path") export const setMainFileHandler = (als: AlsLanguageClient) => { diff --git a/src/test/e2e/fileRename.test.ts b/src/test/e2e/fileRename.test.ts index b6fd442..a142b27 100644 --- a/src/test/e2e/fileRename.test.ts +++ b/src/test/e2e/fileRename.test.ts @@ -4,7 +4,7 @@ import * as vscode from 'vscode'; import * as assert from 'assert'; import { getDocUri, activate, testFilesDirectory, activateExtension } from '../helper'; import { messages } from '../../types'; -import { RenameFileActionParams, RenameFileActionResult } from '@aml-org/als-node-client'; +import { RenameFileActionParams, RenameFileActionResult } from '@mulesoft/anypoint-node-client'; suite('Should rename file', async function () { test('Rename file DataType.raml', async () => { diff --git a/src/types.ts b/src/types.ts index db31853..7f5639f 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,4 +1,4 @@ -import { AlsConfiguration, ConfigurationNotification, GetWorkspaceConfigurationRequestType, AlsRenameFileRequestType, RenameFileActionParams, RenameFileActionResult, SerializationRequestType, SerializationParams, SerializationResult, ConversionParams, SerializedDocument, ConversionRequestType, GetWorkspaceConfigurationParams, GetWorkspaceConfigurationResult, AlsDependency, Dependency } from "@aml-org/als-node-client" +import { AlsConfiguration, ConfigurationNotification, GetWorkspaceConfigurationRequestType, AlsRenameFileRequestType, RenameFileActionParams, RenameFileActionResult, SerializationRequestType, SerializationParams, SerializationResult, ConversionParams, SerializedDocument, ConversionRequestType, GetWorkspaceConfigurationParams, GetWorkspaceConfigurationResult, AlsDependency, Dependency } from "@mulesoft/anypoint-node-client" import { NotificationType, RequestType } from "vscode-languageclient" export namespace messages { diff --git a/src/ui/configurationView.ts b/src/ui/configurationView.ts index 0dc4aa7..2cb8bd0 100644 --- a/src/ui/configurationView.ts +++ b/src/ui/configurationView.ts @@ -2,7 +2,7 @@ import * as vscode from 'vscode'; import * as path from 'path'; import { AlsLanguageClient } from '../server/als'; import { isDependencyConfiguration } from '../types'; -import { AlsDependency, Dependency, GetWorkspaceConfigurationResult } from '@aml-org/als-node-client'; +import { AlsDependency, Dependency, GetWorkspaceConfigurationResult } from '@mulesoft/anypoint-node-client'; export class ConfigurationViewProvider implements vscode.TreeDataProvider { constructor(private workspaces: ReadonlyArray, private als: AlsLanguageClient) { }