@marko/language-server 0.10.1 → 0.11.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/dist/index.js CHANGED
@@ -77,11 +77,13 @@ connection.onDocumentFormatting(async ({ textDocument, options, }) => {
77
77
  const doc = documents.get(textDocument.uri);
78
78
  const { fsPath, scheme } = vscode_uri_1.URI.parse(textDocument.uri);
79
79
  const text = doc.getText();
80
- const formatted = prettier.format(text, Object.assign({ parser: "marko", filepath: fsPath, tabWidth: options.tabSize, useTabs: options.insertSpaces === false }, (scheme === "file" ? await prettier
81
- .resolveConfig(fsPath, {
82
- editorconfig: true,
83
- })
84
- .catch(() => null) : null)));
80
+ const formatted = prettier.format(text, Object.assign({ parser: "marko", filepath: fsPath, tabWidth: options.tabSize, useTabs: options.insertSpaces === false }, (scheme === "file"
81
+ ? await prettier
82
+ .resolveConfig(fsPath, {
83
+ editorconfig: true,
84
+ })
85
+ .catch(() => null)
86
+ : null)));
85
87
  return [
86
88
  node_1.TextEdit.replace(node_1.Range.create(doc.positionAt(0), doc.positionAt(text.length)), formatted),
87
89
  ];
@@ -96,7 +98,7 @@ connection.onDocumentFormatting(async ({ textDocument, options, }) => {
96
98
  connection.onDidChangeWatchedFiles(() => {
97
99
  const clearedCompilers = new Set();
98
100
  for (const doc of documents.all()) {
99
- const compiler = (0, compiler_1.getCompilerForDoc)(doc);
101
+ const { compiler } = (0, compiler_1.getCompilerAndTranslatorForDoc)(doc);
100
102
  if (!clearedCompilers.has(compiler)) {
101
103
  clearCaches(compiler);
102
104
  clearedCompilers.add(compiler);
@@ -106,7 +108,7 @@ connection.onDidChangeWatchedFiles(() => {
106
108
  documents.onDidChangeContent((change) => {
107
109
  queueValidation(change.document);
108
110
  if (change.document.version > 1) {
109
- clearCaches((0, compiler_1.getCompilerForDoc)(change.document));
111
+ clearCaches((0, compiler_1.getCompilerAndTranslatorForDoc)(change.document).compiler);
110
112
  }
111
113
  });
112
114
  function queueValidation(doc) {
@@ -129,13 +131,14 @@ function doValidate(doc) {
129
131
  if (scheme !== "file") {
130
132
  return [];
131
133
  }
132
- const compiler = (0, compiler_1.getCompilerForDoc)(doc);
134
+ const { compiler, translator } = (0, compiler_1.getCompilerAndTranslatorForDoc)(doc);
133
135
  const diagnostics = [];
134
136
  try {
135
137
  compiler.compileSync(doc.getText(), fsPath, {
136
138
  cache: getCacheForCompiler(compiler),
137
139
  output: "source",
138
140
  code: false,
141
+ translator,
139
142
  });
140
143
  }
141
144
  catch (e) {
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -52,11 +52,15 @@ export interface TagDefinition {
52
52
  targetProperty: string;
53
53
  }
54
54
  export declare type Compiler = typeof import("@marko/compiler");
55
+ export declare type CompilerAndTranslator = {
56
+ compiler: Compiler;
57
+ translator: string;
58
+ };
55
59
  export interface TagLibLookup {
56
60
  getTagsSorted(): TagDefinition[];
57
61
  getTag(tagName: string): TagDefinition;
58
62
  getAttribute(tagName: string, attrName: string): AttributeDefinition;
59
63
  forEachAttribute(tagName: string, callback: (attr: AttributeDefinition, tag: TagDefinition) => void): void;
60
64
  }
61
- export declare function getCompilerForDoc(doc: TextDocument): Compiler;
65
+ export declare function getCompilerAndTranslatorForDoc(doc: TextDocument): CompilerAndTranslator;
62
66
  export declare function getTagLibLookup(document: TextDocument): TagLibLookup | undefined;
@@ -1,33 +1,54 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getTagLibLookup = exports.getCompilerForDoc = void 0;
3
+ exports.getTagLibLookup = exports.getCompilerAndTranslatorForDoc = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const path_1 = (0, tslib_1.__importDefault)(require("path"));
6
6
  const vscode_uri_1 = require("vscode-uri");
7
7
  const resolve_from_1 = (0, tslib_1.__importDefault)(require("resolve-from"));
8
8
  const lasso_package_root_1 = (0, tslib_1.__importDefault)(require("lasso-package-root"));
9
- const compilerForDoc = new WeakMap();
10
- function getCompilerForDoc(doc) {
11
- let compiler = compilerForDoc.get(doc);
12
- if (!compiler) {
13
- compilerForDoc.set(doc, (compiler = loadCompiler(path_1.default.dirname(vscode_uri_1.URI.parse(doc.uri).fsPath))));
9
+ const compilerAndTranslatorForDoc = new WeakMap();
10
+ function getCompilerAndTranslatorForDoc(doc) {
11
+ let compilerAndTranslator = compilerAndTranslatorForDoc.get(doc);
12
+ if (!compilerAndTranslator) {
13
+ compilerAndTranslatorForDoc.set(doc, (compilerAndTranslator = loadCompiler(path_1.default.dirname(vscode_uri_1.URI.parse(doc.uri).fsPath))));
14
14
  }
15
- return compiler;
15
+ return compilerAndTranslator;
16
16
  }
17
- exports.getCompilerForDoc = getCompilerForDoc;
17
+ exports.getCompilerAndTranslatorForDoc = getCompilerAndTranslatorForDoc;
18
18
  function getTagLibLookup(document) {
19
- return getCompilerForDoc(document).taglib.buildLookup(vscode_uri_1.URI.parse(document.uri).fsPath);
19
+ try {
20
+ const { compiler, translator } = getCompilerAndTranslatorForDoc(document);
21
+ return compiler.taglib.buildLookup(vscode_uri_1.URI.parse(document.uri).fsPath, translator);
22
+ }
23
+ catch (_a) { }
20
24
  }
21
25
  exports.getTagLibLookup = getTagLibLookup;
22
26
  function loadCompiler(dir) {
23
27
  const rootDir = lasso_package_root_1.default.getRootDir(dir);
24
- const packagePath = rootDir && resolve_from_1.default.silent(rootDir, "@marko/compiler/package.json");
25
- if (packagePath && /^5\./.test(require(packagePath).version)) {
28
+ const pkgPath = rootDir && resolve_from_1.default.silent(rootDir, "@marko/compiler/package.json");
29
+ const pkg = pkgPath && require(pkgPath);
30
+ if (pkg && /^5\./.test(pkg.version)) {
26
31
  try {
27
- return require((0, resolve_from_1.default)(dir, "@marko/compiler"));
32
+ // Ensure translator is available in local package, or fallback to built in compiler.
33
+ let translator = []
34
+ .concat(Object.keys(pkg.dependencies), Object.keys(pkg.peerDependencies), Object.keys(pkg.devDependencies))
35
+ .find((name) => /^marko$|^(@\/marko\/|marko-)translator-/.test(name));
36
+ if (translator === "marko" || !translator) {
37
+ // Fallback to compiler default translator
38
+ translator = require((0, resolve_from_1.default)(dir, "@marko/compiler/config"))
39
+ .translator;
40
+ }
41
+ require((0, resolve_from_1.default)(dir, translator));
42
+ return {
43
+ compiler: require((0, resolve_from_1.default)(dir, "@marko/compiler")),
44
+ translator,
45
+ };
28
46
  }
29
47
  catch (_a) { }
30
48
  }
31
- return require("@marko/compiler");
49
+ return {
50
+ compiler: require("@marko/compiler"),
51
+ translator: "@marko/translator-default",
52
+ };
32
53
  }
33
54
  //# sourceMappingURL=compiler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/utils/compiler.ts"],"names":[],"mappings":";;;;AAAA,6DAAwB;AACxB,2CAAiC;AACjC,6EAAuC;AACvC,yFAAkD;AAkElD,MAAM,cAAc,GAAG,IAAI,OAAO,EAA0B,CAAC;AAE7D,SAAgB,iBAAiB,CAAC,GAAiB;IACjD,IAAI,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,CAAC,QAAQ,EAAE;QACb,cAAc,CAAC,GAAG,CAChB,GAAG,EACH,CAAC,QAAQ,GAAG,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CACnE,CAAC;KACH;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAVD,8CAUC;AAED,SAAgB,eAAe,CAC7B,QAAsB;IAEtB,OAAO,iBAAiB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CACnD,gBAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,CAC/B,CAAC;AACJ,CAAC;AAND,0CAMC;AAED,SAAS,YAAY,CAAC,GAAW;IAC/B,MAAM,OAAO,GAAG,4BAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,WAAW,GACf,OAAO,IAAI,sBAAW,CAAC,MAAM,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;IAEzE,IAAI,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE;QAC5D,IAAI;YACF,OAAO,OAAO,CAAC,IAAA,sBAAW,EAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAAC;SACrD;QAAC,WAAM,GAAE;KACX;IAED,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACpC,CAAC"}
1
+ {"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/utils/compiler.ts"],"names":[],"mappings":";;;;AAAA,6DAAwB;AACxB,2CAAiC;AACjC,6EAAuC;AACvC,yFAAkD;AAmElD,MAAM,2BAA2B,GAAG,IAAI,OAAO,EAG5C,CAAC;AAEJ,SAAgB,8BAA8B,CAC5C,GAAiB;IAEjB,IAAI,qBAAqB,GAAG,2BAA2B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjE,IAAI,CAAC,qBAAqB,EAAE;QAC1B,2BAA2B,CAAC,GAAG,CAC7B,GAAG,EACH,CAAC,qBAAqB,GAAG,YAAY,CACnC,cAAI,CAAC,OAAO,CAAC,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CACxC,CAAC,CACH,CAAC;KACH;IAED,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAdD,wEAcC;AAED,SAAgB,eAAe,CAC7B,QAAsB;IAEtB,IAAI;QACF,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,8BAA8B,CAAC,QAAQ,CAAC,CAAC;QAC1E,OAAO,QAAQ,CAAC,MAAM,CAAC,WAAW,CAChC,gBAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAC9B,UAAU,CACX,CAAC;KACH;IAAC,WAAM,GAAE;AACZ,CAAC;AAVD,0CAUC;AAED,SAAS,YAAY,CAAC,GAAW;IAC/B,MAAM,OAAO,GAAG,4BAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,OAAO,GACX,OAAO,IAAI,sBAAW,CAAC,MAAM,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;IACzE,MAAM,GAAG,GAAG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAExC,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,IAAI;YACF,qFAAqF;YACrF,IAAI,UAAU,GAAI,EAAe;iBAC9B,MAAM,CACL,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAC7B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,EACjC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CACjC;iBACA,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,yCAAyC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAExE,IAAI,UAAU,KAAK,OAAO,IAAI,CAAC,UAAU,EAAE;gBACzC,0CAA0C;gBAC1C,UAAU,GAAG,OAAO,CAAC,IAAA,sBAAW,EAAC,GAAG,EAAE,wBAAwB,CAAC,CAAC;qBAC7D,UAAoB,CAAC;aACzB;YAED,OAAO,CAAC,IAAA,sBAAW,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC;YACtC,OAAO;gBACL,QAAQ,EAAE,OAAO,CAAC,IAAA,sBAAW,EAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;gBACtD,UAAU;aACX,CAAC;SACH;QAAC,WAAM,GAAE;KACX;IAED,OAAO;QACL,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC;QACpC,UAAU,EAAE,2BAA2B;KACxC,CAAC;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@marko/language-server",
3
3
  "description": "Marko Language Server",
4
- "version": "0.10.1",
4
+ "version": "0.11.0",
5
5
  "author": "Diego Berrocal",
6
6
  "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
7
7
  "bin": {
@@ -38,5 +38,5 @@
38
38
  "type": "git",
39
39
  "url": "https://github.com/marko-js/language-server/tree/master/server"
40
40
  },
41
- "gitHead": "4b4e26447387e02d154d5a718b5a57714722ecea"
41
+ "gitHead": "05b82b9c449a13862267dba8988331d917f8a314"
42
42
  }