@aws/lsp-yaml 0.0.1 → 0.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +3 -0
- package/README.md +4 -4
- package/out/language-server/yamlServer.d.ts +4 -2
- package/out/language-server/yamlServer.js +4 -5
- package/out/language-server/yamlServer.js.map +1 -1
- package/out/language-service/yamlLanguageService.d.ts +1 -1
- package/out/language-service/yamlLanguageService.js +17 -3
- package/out/language-service/yamlLanguageService.js.map +1 -1
- package/package.json +3 -3
- package/patchYamlPackage.js +25 -8
package/CHANGELOG.md
CHANGED
package/README.md
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
## Exports
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
|
|
3
|
+
── CreateYamlLanguageServer - a function that creates and returns a new instance of DEXP Language Server
|
|
4
|
+
── YamlLanguageService - YAML language service. Provides language features like hover, completion, diagnostics and formatting
|
|
5
5
|
|
|
6
6
|
## Temporary Patch for yaml-language-server Dependency
|
|
7
7
|
|
|
@@ -14,4 +14,4 @@ The script applies 2 patches:
|
|
|
14
14
|
|
|
15
15
|
The patch file is applied during the installation process using the `postinstall` script in the `package.json` file. This script runs the `patchYamlPackage.js` script, which searches path to the `yaml-language-server` package and applies the patches once.
|
|
16
16
|
|
|
17
|
-
### Note: This is a temporary solution, and we plan to remove the custom patching once the yaml-language-server package is updated. The features from PRs above should be merged to yaml-language-server package. After features are merged we need to update the version and enable skipSchemaValidation setting.
|
|
17
|
+
### Note: This is a temporary solution, and we plan to remove the custom patching once the yaml-language-server package is updated. The features from PRs above should be merged to yaml-language-server package. After features are merged we need to update the version and enable skipSchemaValidation setting.
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Server } from '@aws/language-server-runtimes/server-interface';
|
|
2
|
-
import { AwsLanguageService } from '@aws/lsp-core/out/base';
|
|
2
|
+
import { AwsLanguageService, UriResolver } from '@aws/lsp-core/out/base';
|
|
3
|
+
import { YamlLanguageService } from '../language-service/yamlLanguageService';
|
|
3
4
|
/**
|
|
4
5
|
* This is a demonstration language server that handles both JSON and YAML files according to the
|
|
5
6
|
* CloudFormation or SAM JSON-Schema.
|
|
@@ -8,4 +9,5 @@ import { AwsLanguageService } from '@aws/lsp-core/out/base';
|
|
|
8
9
|
* In this case, the service is a composition of a JSON processor and a YAML processor.
|
|
9
10
|
*/
|
|
10
11
|
export declare const YamlServerFactory: (service: AwsLanguageService) => Server;
|
|
11
|
-
export declare
|
|
12
|
+
export declare function createCustomYamlLanguageServer(customService: YamlLanguageService): Server;
|
|
13
|
+
export declare const CreateYamlLanguageServer: (displayName: string, defaultSchemaUri: string, uriResolver?: UriResolver) => Server;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CreateYamlLanguageServer = exports.YamlServerFactory = void 0;
|
|
4
|
+
exports.createCustomYamlLanguageServer = createCustomYamlLanguageServer;
|
|
4
5
|
const base_1 = require("@aws/lsp-core/out/base");
|
|
5
6
|
const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
|
|
6
7
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
@@ -95,12 +96,10 @@ const YamlServerFactory = (service) => ({ credentialsProvider, lsp, workspace, t
|
|
|
95
96
|
};
|
|
96
97
|
};
|
|
97
98
|
exports.YamlServerFactory = YamlServerFactory;
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
const schema = await (await response.blob()).text();
|
|
101
|
-
return schema;
|
|
99
|
+
function createCustomYamlLanguageServer(customService) {
|
|
100
|
+
return (0, exports.YamlServerFactory)(new base_1.MutuallyExclusiveLanguageService([customService]));
|
|
102
101
|
}
|
|
103
|
-
const CreateYamlLanguageServer = (displayName, defaultSchemaUri, uriResolver
|
|
102
|
+
const CreateYamlLanguageServer = (displayName, defaultSchemaUri, uriResolver) => (0, exports.YamlServerFactory)((0, yamlLanguageService_1.create)({
|
|
104
103
|
displayName: displayName,
|
|
105
104
|
defaultSchemaUri: defaultSchemaUri,
|
|
106
105
|
uriResolver: uriResolver,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlServer.js","sourceRoot":"","sources":["../../src/language-server/yamlServer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"yamlServer.js","sourceRoot":"","sources":["../../src/language-server/yamlServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { YamlFormattingOptions } from './formattingOptions';
|
|
|
5
5
|
export type YamlLanguageServiceProps = {
|
|
6
6
|
displayName: string;
|
|
7
7
|
defaultSchemaUri: string;
|
|
8
|
-
uriResolver
|
|
8
|
+
uriResolver?: UriResolver;
|
|
9
9
|
};
|
|
10
10
|
/**
|
|
11
11
|
* This is a thin wrapper around the Redhat Yaml Language Service
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.YamlLanguageService = void 0;
|
|
4
|
+
exports.create = create;
|
|
4
5
|
const base_1 = require("@aws/lsp-core/out/base");
|
|
5
6
|
const yaml_language_server_1 = require("yaml-language-server");
|
|
6
7
|
/**
|
|
@@ -8,15 +9,24 @@ const yaml_language_server_1 = require("yaml-language-server");
|
|
|
8
9
|
* https://github.com/redhat-developer/yaml-language-server/
|
|
9
10
|
*/
|
|
10
11
|
class YamlLanguageService {
|
|
12
|
+
props;
|
|
13
|
+
yamlService;
|
|
11
14
|
constructor(props) {
|
|
12
15
|
this.props = props;
|
|
16
|
+
let resolveUri;
|
|
17
|
+
if (props.uriResolver) {
|
|
18
|
+
resolveUri = props.uriResolver;
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
resolveUri = getSchema;
|
|
22
|
+
}
|
|
13
23
|
const workspaceContext = {
|
|
14
24
|
resolveRelativePath(relativePath, resource) {
|
|
15
25
|
return new URL(relativePath, resource).href;
|
|
16
26
|
},
|
|
17
27
|
};
|
|
18
28
|
this.yamlService = (0, yaml_language_server_1.getLanguageService)({
|
|
19
|
-
schemaRequestService:
|
|
29
|
+
schemaRequestService: resolveUri,
|
|
20
30
|
workspaceContext,
|
|
21
31
|
});
|
|
22
32
|
this.yamlService.configure({ schemas: [{ fileMatch: ['*'], uri: this.props.defaultSchemaUri }] });
|
|
@@ -60,9 +70,13 @@ class YamlLanguageService {
|
|
|
60
70
|
}
|
|
61
71
|
}
|
|
62
72
|
exports.YamlLanguageService = YamlLanguageService;
|
|
73
|
+
async function getSchema(url) {
|
|
74
|
+
const response = await fetch(url);
|
|
75
|
+
const schema = await (await response.blob()).text();
|
|
76
|
+
return schema;
|
|
77
|
+
}
|
|
63
78
|
function create(props) {
|
|
64
79
|
const jsonService = new YamlLanguageService(props);
|
|
65
80
|
return new base_1.MutuallyExclusiveLanguageService([jsonService]);
|
|
66
81
|
}
|
|
67
|
-
exports.create = create;
|
|
68
82
|
//# sourceMappingURL=yamlLanguageService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../src/language-service/yamlLanguageService.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../src/language-service/yamlLanguageService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws/lsp-yaml",
|
|
3
|
-
"version": "0.0
|
|
3
|
+
"version": "0.1.0",
|
|
4
4
|
"description": "YAML Language Server",
|
|
5
5
|
"main": "out/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
],
|
|
23
23
|
"scripts": {
|
|
24
24
|
"compile": "tsc --build",
|
|
25
|
-
"
|
|
26
|
-
"
|
|
25
|
+
"prepack": "shx cp ../../LICENSE ../../NOTICE ../../SECURITY.md .",
|
|
26
|
+
"postinstall": "node patchYamlPackage.js"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@aws/language-server-runtimes": "^0.2.5",
|
package/patchYamlPackage.js
CHANGED
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
const execFileSync = require('child_process').execFileSync
|
|
2
2
|
const fs = require('node:fs')
|
|
3
|
+
const path = require('path')
|
|
4
|
+
|
|
5
|
+
const locale = path[process.platform === 'win32' ? 'win32' : 'posix']
|
|
3
6
|
|
|
4
7
|
const pathToYamlPackage = require.resolve('yaml-language-server')
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
+
|
|
9
|
+
const pathToIndex = 'node_modules/yaml-language-server/out/server/src/index.js'.split('/').join(locale.sep)
|
|
10
|
+
const rootPackage = pathToYamlPackage.substring(0, pathToYamlPackage.indexOf(pathToIndex))
|
|
11
|
+
|
|
12
|
+
const pathToFileHover = path.join(
|
|
13
|
+
rootPackage,
|
|
14
|
+
'node_modules/yaml-language-server/lib/esm/languageservice/services/yamlHover.js'
|
|
8
15
|
)
|
|
9
|
-
const pathToFileHover = rootPackage + 'node_modules/yaml-language-server/lib/esm/languageservice/services/yamlHover.js'
|
|
10
16
|
|
|
11
17
|
const filePathToPatchPathMarkdown = {
|
|
12
18
|
'node_modules/yaml-language-server/lib/esm/languageservice/services/yamlHover.js':
|
|
@@ -32,14 +38,25 @@ const filePathToPatchPathUnsafeEval = {
|
|
|
32
38
|
'patches/unsafe-eval/yamlSchemaService.src.patch',
|
|
33
39
|
}
|
|
34
40
|
|
|
35
|
-
function
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
const patchProc = execFileSync('patch', [filePath, pathToPatch], {
|
|
41
|
+
function getPatchProcCommand(filePath, pathToPatch) {
|
|
42
|
+
if (process.platform === 'win32') {
|
|
43
|
+
return execFileSync('git', ['apply', '--ignore-whitespace', pathToPatch], {
|
|
39
44
|
cwd: rootPackage,
|
|
40
45
|
encoding: 'utf-8',
|
|
41
46
|
timeout: 2000,
|
|
42
47
|
})
|
|
48
|
+
}
|
|
49
|
+
return execFileSync('patch', [filePath, pathToPatch], {
|
|
50
|
+
cwd: rootPackage,
|
|
51
|
+
encoding: 'utf-8',
|
|
52
|
+
timeout: 2000,
|
|
53
|
+
})
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
function applyPatch(filePathToPatchPath) {
|
|
57
|
+
for (var filePath in filePathToPatchPath) {
|
|
58
|
+
const pathToPatch = `${__dirname}/${filePathToPatchPath[filePath]}`
|
|
59
|
+
const patchProc = getPatchProcCommand(filePath, pathToPatch)
|
|
43
60
|
|
|
44
61
|
console.log({
|
|
45
62
|
cmd: patchProc.spawnfile,
|