@astrojs/ts-plugin 1.0.5 → 1.0.6
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/.turbo/turbo-build.log +2 -2
- package/CHANGELOG.md +6 -0
- package/dist/astro-sys.js +7 -14
- package/dist/index.js +2 -2
- package/dist/language-service/diagnostics.js +6 -13
- package/dist/language-service/index.js +3 -3
- package/dist/module-loader.js +2 -2
- package/package.json +1 -1
- package/src/astro-sys.ts +7 -7
- package/src/index.ts +1 -1
- package/src/language-service/diagnostics.ts +9 -7
- package/src/language-service/index.ts +2 -1
- package/src/module-loader.ts +1 -1
- package/tsconfig.json +1 -0
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
@astrojs/ts-plugin:build: cache hit, replaying output
|
|
1
|
+
@astrojs/ts-plugin:build: cache hit, replaying output 3f3b3eeed56ebe05
|
|
2
2
|
@astrojs/ts-plugin:build:
|
|
3
|
-
@astrojs/ts-plugin:build: > @astrojs/ts-plugin@1.0.
|
|
3
|
+
@astrojs/ts-plugin:build: > @astrojs/ts-plugin@1.0.6 build /home/runner/work/language-tools/language-tools/packages/ts-plugin
|
|
4
4
|
@astrojs/ts-plugin:build: > astro-scripts build "src/**/*.ts"
|
|
5
5
|
@astrojs/ts-plugin:build:
|
package/CHANGELOG.md
CHANGED
package/dist/astro-sys.js
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __create = Object.create;
|
|
3
2
|
var __defProp = Object.defineProperty;
|
|
4
3
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
4
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
-
var __getProtoOf = Object.getPrototypeOf;
|
|
7
5
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
6
|
var __export = (target, all) => {
|
|
9
7
|
for (var name in all)
|
|
@@ -17,31 +15,26 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
17
15
|
}
|
|
18
16
|
return to;
|
|
19
17
|
};
|
|
20
|
-
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
-
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
22
|
-
mod
|
|
23
|
-
));
|
|
24
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
25
19
|
var astro_sys_exports = {};
|
|
26
20
|
__export(astro_sys_exports, {
|
|
27
21
|
createAstroSys: () => createAstroSys
|
|
28
22
|
});
|
|
29
23
|
module.exports = __toCommonJS(astro_sys_exports);
|
|
30
|
-
var import_typescript = __toESM(require("typescript"));
|
|
31
24
|
var import_utils = require("./utils.js");
|
|
32
|
-
function createAstroSys(logger) {
|
|
25
|
+
function createAstroSys(logger, typescript) {
|
|
33
26
|
const astroSys = {
|
|
34
|
-
...
|
|
27
|
+
...typescript.sys,
|
|
35
28
|
fileExists(path) {
|
|
36
|
-
return
|
|
29
|
+
return typescript.sys.fileExists((0, import_utils.ensureRealAstroFilePath)(path));
|
|
37
30
|
},
|
|
38
31
|
readDirectory(path, extensions, exclude, include, depth) {
|
|
39
32
|
const extensionsWithAstro = (extensions != null ? extensions : []).concat(".astro");
|
|
40
|
-
return
|
|
33
|
+
return typescript.sys.readDirectory(path, extensionsWithAstro, exclude, include, depth);
|
|
41
34
|
}
|
|
42
35
|
};
|
|
43
|
-
if (
|
|
44
|
-
const realpath =
|
|
36
|
+
if (typescript.sys.realpath) {
|
|
37
|
+
const realpath = typescript.sys.realpath;
|
|
45
38
|
astroSys.realpath = function(path) {
|
|
46
39
|
if ((0, import_utils.isVirtualAstroFilePath)(path)) {
|
|
47
40
|
return realpath((0, import_utils.toRealAstroFilePath)(path)) + ".ts";
|
|
@@ -55,4 +48,4 @@ function createAstroSys(logger) {
|
|
|
55
48
|
0 && (module.exports = {
|
|
56
49
|
createAstroSys
|
|
57
50
|
});
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvLXN5cy50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFQSxtQkFBcUY7QUFLOUUsU0FBUyxlQUFlLFFBQWdCLFlBQTZEO0FBQzNHLFFBQU0sV0FBc0I7QUFBQSxJQUMzQixHQUFHLFdBQVc7QUFBQSxJQUNkLFdBQVcsTUFBYztBQUN4QixhQUFPLFdBQVcsSUFBSSxlQUFXLHNDQUF3QixJQUFJLENBQUM7QUFBQSxJQUMvRDtBQUFBLElBQ0EsY0FBYyxNQUFNLFlBQVksU0FBUyxTQUFTLE9BQU87QUFDeEQsWUFBTSx1QkFBdUIsa0NBQWMsQ0FBQyxHQUFHLE9BQU8sUUFBUTtBQUU5RCxhQUFPLFdBQVcsSUFBSSxjQUFjLE1BQU0scUJBQXFCLFNBQVMsU0FBUyxLQUFLO0FBQUEsSUFDdkY7QUFBQSxFQUNEO0FBRUEsTUFBSSxXQUFXLElBQUksVUFBVTtBQUM1QixVQUFNLFdBQVcsV0FBVyxJQUFJO0FBQ2hDLGFBQVMsV0FBVyxTQUFVLE1BQU07QUFDbkMsY0FBSSxxQ0FBdUIsSUFBSSxHQUFHO0FBQ2pDLGVBQU8sYUFBUyxrQ0FBb0IsSUFBSSxDQUFDLElBQUk7QUFBQSxNQUM5QztBQUNBLGFBQU8sU0FBUyxJQUFJO0FBQUEsSUFDckI7QUFBQSxFQUNEO0FBRUEsU0FBTztBQUNSOyIsCiAgIm5hbWVzIjogW10KfQo=
|
package/dist/index.js
CHANGED
|
@@ -30,7 +30,7 @@ function init(modules) {
|
|
|
30
30
|
);
|
|
31
31
|
}
|
|
32
32
|
(0, import_module_loader.patchModuleLoader)(logger, snapshotManager, modules.typescript, info.languageServiceHost, info.project);
|
|
33
|
-
return (0, import_language_service.decorateLanguageService)(info.languageService, snapshotManager, logger);
|
|
33
|
+
return (0, import_language_service.decorateLanguageService)(info.languageService, snapshotManager, ts, logger);
|
|
34
34
|
}
|
|
35
35
|
function getExternalFiles(project) {
|
|
36
36
|
var _a, _b;
|
|
@@ -54,4 +54,4 @@ function init(modules) {
|
|
|
54
54
|
return { create, getExternalFiles };
|
|
55
55
|
}
|
|
56
56
|
module.exports = init;
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQUNBLDZCQUFxQztBQUNyQyw4QkFBbUQ7QUFDbkQsb0JBQXVCO0FBQ3ZCLDJCQUFrQztBQUNsQyxpQ0FBeUM7QUFDekMsbUJBQXFFO0FBRXJFLFNBQVMsS0FBSyxTQUEwRTtBQUN2RixRQUFNLEtBQUssUUFBUTtBQUVuQixXQUFTLE9BQU8sTUFBc0Q7QUFYdkU7QUFZRSxVQUFNLFNBQVMsSUFBSSxxQkFBTyxLQUFLLFFBQVEsZUFBZSxNQUFNO0FBQzVELFVBQU0scUJBQW9CLGdCQUFLLHFCQUFvQix5QkFBekIsZ0NBQWdELHNDQUF3QixLQUFLLE9BQU87QUFFOUcsUUFBSSxDQUFDLGVBQWUsS0FBSyxTQUFTLGlCQUFpQixHQUFHO0FBQ3JELGFBQU8sSUFBSSx1RUFBdUU7QUFDbEYsYUFBTyxLQUFLO0FBQUEsSUFDYjtBQUVBLFlBQUksbUNBQVUsS0FBSyxlQUFlLEdBQUc7QUFDcEMsYUFBTyxLQUFLO0FBQUEsSUFDYjtBQUVBLFdBQU8sSUFBSSx1QkFBdUI7QUFFbEMsVUFBTSxrQkFBa0IsSUFBSSw0Q0FBcUIsUUFBUSxZQUFZLEtBQUssUUFBUSxnQkFBZ0IsTUFBTTtBQUN4RyxRQUFJLG1CQUFtQjtBQUN0QixVQUFJO0FBQUEsUUFDSCxRQUFRO0FBQUEsUUFDUixLQUFLO0FBQUEsUUFDTCxLQUFLO0FBQUEsUUFDTDtBQUFBLFFBQ0E7QUFBQSxNQUNEO0FBQUEsSUFDRDtBQUVBLGdEQUFrQixRQUFRLGlCQUFpQixRQUFRLFlBQVksS0FBSyxxQkFBcUIsS0FBSyxPQUFPO0FBQ3JHLGVBQU8saURBQXdCLEtBQUssaUJBQWlCLGlCQUFpQixJQUFJLE1BQU07QUFBQSxFQUNqRjtBQUVBLFdBQVMsaUJBQWlCLFNBQXNDO0FBekNqRTtBQTBDRSxZQUFPLCtEQUF5QixZQUFZLFFBQVEsZUFBZSxDQUFDLE1BQTdELG1CQUFnRSxlQUFoRSxZQUE4RSxDQUFDO0FBQUEsRUFDdkY7QUFFQSxXQUFTLGVBQWUsU0FBNEIsbUJBQXFEO0FBQ3hHLFFBQUksbUJBQW1CO0FBQ3RCLFlBQU0saUJBQWEsMENBQTRCLElBQUksU0FBUyxpQkFBaUI7QUFFN0UsVUFBSSxXQUFXLFNBQVM7QUFBRyxlQUFPO0FBQUEsSUFDbkM7QUFFQSxRQUFJO0FBQ0gsWUFBTSxrQkFBa0IsUUFBUSxtQkFBbUI7QUFDbkQsWUFBTSxvQkFDTCxPQUFPLGdCQUFnQixtQkFBbUIsWUFDMUMsUUFBUSxRQUFRLFNBQVMsRUFBRSxPQUFPLENBQUMsZ0JBQWdCLGNBQWMsRUFBRSxDQUFDO0FBRXJFLGFBQU87QUFBQSxJQUNSLFNBQVMsR0FBUDtBQUNELGNBQVEsZUFBZSxPQUFPLEtBQUssQ0FBVztBQUM5QyxhQUFPO0FBQUEsSUFDUjtBQUFBLEVBQ0Q7QUFFQSxTQUFPLEVBQUUsUUFBUSxpQkFBaUI7QUFDbkM7QUFFQSxpQkFBUzsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __create = Object.create;
|
|
3
2
|
var __defProp = Object.defineProperty;
|
|
4
3
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
4
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
-
var __getProtoOf = Object.getPrototypeOf;
|
|
7
5
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
6
|
var __export = (target, all) => {
|
|
9
7
|
for (var name in all)
|
|
@@ -17,10 +15,6 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
17
15
|
}
|
|
18
16
|
return to;
|
|
19
17
|
};
|
|
20
|
-
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
-
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
22
|
-
mod
|
|
23
|
-
));
|
|
24
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
25
19
|
var diagnostics_exports = {};
|
|
26
20
|
__export(diagnostics_exports, {
|
|
@@ -28,15 +22,14 @@ __export(diagnostics_exports, {
|
|
|
28
22
|
decorateDiagnostics: () => decorateDiagnostics
|
|
29
23
|
});
|
|
30
24
|
module.exports = __toCommonJS(diagnostics_exports);
|
|
31
|
-
var import_tsserverlibrary = __toESM(require("typescript/lib/tsserverlibrary"));
|
|
32
25
|
var import_utils = require("../utils.js");
|
|
33
26
|
var DiagnosticCodes = /* @__PURE__ */ ((DiagnosticCodes2) => {
|
|
34
27
|
DiagnosticCodes2[DiagnosticCodes2["CANNOT_FIND_MODULE"] = 2307] = "CANNOT_FIND_MODULE";
|
|
35
28
|
return DiagnosticCodes2;
|
|
36
29
|
})(DiagnosticCodes || {});
|
|
37
|
-
function decorateDiagnostics(ls) {
|
|
30
|
+
function decorateDiagnostics(ls, typescript) {
|
|
38
31
|
decorateSyntacticDiagnostics(ls);
|
|
39
|
-
decorateSemanticDiagnostics(ls);
|
|
32
|
+
decorateSemanticDiagnostics(ls, typescript);
|
|
40
33
|
decorateSuggestionDiagnostics(ls);
|
|
41
34
|
}
|
|
42
35
|
function decorateSyntacticDiagnostics(ls) {
|
|
@@ -48,7 +41,7 @@ function decorateSyntacticDiagnostics(ls) {
|
|
|
48
41
|
return getSyntacticDiagnostics(fileName);
|
|
49
42
|
};
|
|
50
43
|
}
|
|
51
|
-
function decorateSemanticDiagnostics(ls) {
|
|
44
|
+
function decorateSemanticDiagnostics(ls, typescript) {
|
|
52
45
|
const getSemanticDiagnostics = ls.getSemanticDiagnostics;
|
|
53
46
|
ls.getSemanticDiagnostics = (fileName) => {
|
|
54
47
|
if ((0, import_utils.isAstroFilePath)(fileName)) {
|
|
@@ -56,9 +49,9 @@ function decorateSemanticDiagnostics(ls) {
|
|
|
56
49
|
}
|
|
57
50
|
let diagnostics = getSemanticDiagnostics(fileName);
|
|
58
51
|
diagnostics = diagnostics.map((diag) => {
|
|
59
|
-
const message =
|
|
52
|
+
const message = typescript.flattenDiagnosticMessageText(diag.messageText, typescript.sys.newLine);
|
|
60
53
|
if (diag.code === 2307 /* CANNOT_FIND_MODULE */ && message.includes("astro:content") && !message.includes("content collections")) {
|
|
61
|
-
diag.messageText = message + `${
|
|
54
|
+
diag.messageText = message + `${typescript.sys.newLine}${typescript.sys.newLine}If you're using content collections, make sure to run \`astro dev\`, \`astro build\` or \`astro sync\` to first generate the types so you can import from them. If you already ran one of those commands, restarting the TS Server might be necessary in order for the change to take effect.`;
|
|
62
55
|
}
|
|
63
56
|
return diag;
|
|
64
57
|
});
|
|
@@ -79,4 +72,4 @@ function decorateSuggestionDiagnostics(ls) {
|
|
|
79
72
|
DiagnosticCodes,
|
|
80
73
|
decorateDiagnostics
|
|
81
74
|
});
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvZGlhZ25vc3RpY3MudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDQSxtQkFBZ0M7QUFJekIsSUFBSyxrQkFBTCxrQkFBS0EscUJBQUw7QUFDTixFQUFBQSxrQ0FBQSx3QkFBcUIsUUFBckI7QUFEVyxTQUFBQTtBQUFBLEdBQUE7QUFJTCxTQUFTLG9CQUFvQixJQUF3QixZQUF1QjtBQUNsRiwrQkFBNkIsRUFBRTtBQUMvQiw4QkFBNEIsSUFBSSxVQUFVO0FBQzFDLGdDQUE4QixFQUFFO0FBQ2pDO0FBRUEsU0FBUyw2QkFBNkIsSUFBOEI7QUFDbkUsUUFBTSwwQkFBMEIsR0FBRztBQUNuQyxLQUFHLDBCQUEwQixDQUFDLGFBQXFCO0FBR2xELFlBQUksOEJBQWdCLFFBQVEsR0FBRztBQUM5QixhQUFPLENBQUM7QUFBQSxJQUNUO0FBQ0EsV0FBTyx3QkFBd0IsUUFBUTtBQUFBLEVBQ3hDO0FBQ0Q7QUFFQSxTQUFTLDRCQUE0QixJQUF3QixZQUF1QjtBQUNuRixRQUFNLHlCQUF5QixHQUFHO0FBQ2xDLEtBQUcseUJBQXlCLENBQUMsYUFBcUI7QUFHakQsWUFBSSw4QkFBZ0IsUUFBUSxHQUFHO0FBQzlCLGFBQU8sQ0FBQztBQUFBLElBQ1Q7QUFFQSxRQUFJLGNBQWMsdUJBQXVCLFFBQVE7QUFDakQsa0JBQWMsWUFBWSxJQUFJLENBQUMsU0FBUztBQUN2QyxZQUFNLFVBQVUsV0FBVyw2QkFBNkIsS0FBSyxhQUFhLFdBQVcsSUFBSSxPQUFPO0FBQ2hHLFVBQ0MsS0FBSyxTQUFTLGlDQUNkLFFBQVEsU0FBUyxlQUFlLEtBR2hDLENBQUMsUUFBUSxTQUFTLHFCQUFxQixHQUN0QztBQUNELGFBQUssY0FDSixVQUNBLEdBQUcsV0FBVyxJQUFJLFVBQVUsV0FBVyxJQUFJO0FBQUEsTUFFN0M7QUFFQSxhQUFPO0FBQUEsSUFDUixDQUFDO0FBRUQsV0FBTztBQUFBLEVBQ1I7QUFDRDtBQUVBLFNBQVMsOEJBQThCLElBQThCO0FBQ3BFLFFBQU0sMkJBQTJCLEdBQUc7QUFDcEMsS0FBRywyQkFBMkIsQ0FBQyxhQUFxQjtBQUduRCxZQUFJLDhCQUFnQixRQUFRLEdBQUc7QUFDOUIsYUFBTyxDQUFDO0FBQUEsSUFDVDtBQUNBLFdBQU8seUJBQXlCLFFBQVE7QUFBQSxFQUN6QztBQUNEOyIsCiAgIm5hbWVzIjogWyJEaWFnbm9zdGljQ29kZXMiXQp9Cg==
|
|
@@ -34,11 +34,11 @@ const astroPluginPatchSymbol = Symbol("astroPluginPatchSymbol");
|
|
|
34
34
|
function isPatched(ls) {
|
|
35
35
|
return ls[astroPluginPatchSymbol] === true;
|
|
36
36
|
}
|
|
37
|
-
function decorateLanguageService(ls, snapshotManager, logger) {
|
|
37
|
+
function decorateLanguageService(ls, snapshotManager, ts, logger) {
|
|
38
38
|
const proxy = new Proxy(ls, createProxyHandler());
|
|
39
39
|
(0, import_line_column_offset.decorateLineColumnOffset)(proxy, snapshotManager);
|
|
40
40
|
(0, import_rename.decorateRename)(proxy, snapshotManager, logger);
|
|
41
|
-
(0, import_diagnostics.decorateDiagnostics)(proxy);
|
|
41
|
+
(0, import_diagnostics.decorateDiagnostics)(proxy, ts);
|
|
42
42
|
(0, import_find_references.decorateFindReferences)(proxy, snapshotManager, logger);
|
|
43
43
|
(0, import_completions.decorateCompletions)(proxy, logger);
|
|
44
44
|
(0, import_definition.decorateGetDefinition)(proxy, snapshotManager);
|
|
@@ -67,4 +67,4 @@ function createProxyHandler() {
|
|
|
67
67
|
decorateLanguageService,
|
|
68
68
|
isPatched
|
|
69
69
|
});
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvaW5kZXgudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFHQSx5QkFBb0M7QUFDcEMsd0JBQXNDO0FBQ3RDLHlCQUFvQztBQUNwQyw2QkFBMEM7QUFDMUMsNkJBQXVDO0FBQ3ZDLDRCQUEwQztBQUMxQyxnQ0FBeUM7QUFDekMsb0JBQStCO0FBRS9CLE1BQU0seUJBQXlCLE9BQU8sd0JBQXdCO0FBRXZELFNBQVMsVUFBVSxJQUF3QjtBQUNqRCxTQUFRLEdBQVcsNEJBQTRCO0FBQ2hEO0FBRU8sU0FBUyx3QkFDZixJQUNBLGlCQUNBLElBQ0EsUUFDcUI7QUFDckIsUUFBTSxRQUFRLElBQUksTUFBTSxJQUFJLG1CQUFtQixDQUFDO0FBRWhELDBEQUF5QixPQUFPLGVBQWU7QUFDL0Msb0NBQWUsT0FBTyxpQkFBaUIsTUFBTTtBQUM3Qyw4Q0FBb0IsT0FBTyxFQUFFO0FBQzdCLHFEQUF1QixPQUFPLGlCQUFpQixNQUFNO0FBQ3JELDhDQUFvQixPQUFPLE1BQU07QUFDakMsK0NBQXNCLE9BQU8sZUFBZTtBQUM1Qyx1REFBMEIsT0FBTyxlQUFlO0FBQ2hELHdEQUEwQixPQUFPLGVBQWU7QUFFaEQsU0FBTztBQUNSO0FBRUEsU0FBUyxxQkFBdUQ7QUFDL0QsUUFBTSxZQUF5QyxDQUFDO0FBRWhELFNBQU87QUFBQSxJQUNOLElBQUksUUFBUSxHQUFHO0FBMUNqQjtBQTJDRyxVQUFJLE1BQU0sd0JBQXdCO0FBQ2pDLGVBQU87QUFBQSxNQUNSO0FBRUEsY0FBTyxlQUFVLE9BQVYsWUFBNEMsT0FBTztBQUFBLElBQzNEO0FBQUEsSUFDQSxJQUFJLEdBQUcsR0FBRyxPQUFPO0FBQ2hCLGdCQUFVLEtBQWlDO0FBRTNDLGFBQU87QUFBQSxJQUNSO0FBQUEsRUFDRDtBQUNEOyIsCiAgIm5hbWVzIjogW10KfQo=
|
package/dist/module-loader.js
CHANGED
|
@@ -49,7 +49,7 @@ class ModuleResolutionCache {
|
|
|
49
49
|
}
|
|
50
50
|
function patchModuleLoader(logger, snapshotManager, typescript, lsHost, project) {
|
|
51
51
|
var _a, _b;
|
|
52
|
-
const astroSys = (0, import_astro_sys.createAstroSys)(logger);
|
|
52
|
+
const astroSys = (0, import_astro_sys.createAstroSys)(logger, typescript);
|
|
53
53
|
const moduleCache = new ModuleResolutionCache();
|
|
54
54
|
const origResolveModuleNames = (_a = lsHost.resolveModuleNames) == null ? void 0 : _a.bind(lsHost);
|
|
55
55
|
const origResolveModuleNamLiterals = (_b = lsHost.resolveModuleNameLiterals) == null ? void 0 : _b.bind(lsHost);
|
|
@@ -148,4 +148,4 @@ function patchModuleLoader(logger, snapshotManager, typescript, lsHost, project)
|
|
|
148
148
|
0 && (module.exports = {
|
|
149
149
|
patchModuleLoader
|
|
150
150
|
});
|
|
151
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,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QXNCLFdBQVc7QUFBQSxNQUN0QztBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLElBQ0QsRUFBRTtBQUNGLFFBQUksQ0FBQyx1QkFBdUIsS0FBQyxxQ0FBdUIsb0JBQW9CLGdCQUFnQixHQUFHO0FBQzFGLGFBQU87QUFBQSxJQUNSO0FBRUEsVUFBTSx1QkFBbUIsc0NBQXdCLG9CQUFvQixnQkFBZ0I7QUFDckYsV0FBTyxJQUFJLFlBQVksTUFBTSxpQkFBaUIsZ0JBQWdCO0FBQzlELFVBQU0sV0FBVyxnQkFBZ0IsT0FBTyxnQkFBZ0I7QUFDeEQsUUFBSSxDQUFDLFVBQVU7QUFDZCxhQUFPO0FBQUEsSUFDUjtBQUVBLFVBQU0sc0JBQTZDO0FBQUEsTUFDbEQsV0FBVyxXQUFXLFVBQVU7QUFBQSxNQUNoQztBQUFBLElBQ0Q7QUFDQSxXQUFPO0FBQUEsRUFDUjtBQUVBLFdBQVMsMEJBQ1IsZ0JBQ0EsZ0JBQ0EscUJBQ0EsU0FDQSxzQkFDQSxhQUN3RDtBQTdKMUQsUUFBQUE7QUE4SkUsV0FBTyxJQUFJLGlDQUFpQyxjQUFjO0FBSzFELFVBQU0sWUFDTEEsTUFBQTtBQUFBLE1BQ0M7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLFVBTkQsT0FBQUEsTUFRQSxlQUFlO0FBQUEsTUFDZCxPQUFtRDtBQUFBLFFBQ2xELGdCQUFnQjtBQUFBLE1BQ2pCO0FBQUEsSUFDRDtBQUVELFdBQU8sU0FBUyxJQUFJLENBQUMsa0JBQWtCLFFBQVE7QUFDOUMsWUFBTSxhQUFhLGVBQWUsS0FBSztBQUN2QyxVQUFJLGlCQUFpQixrQkFBa0IsS0FBQyxzQ0FBd0IsVUFBVSxFQUFFLFNBQVMsUUFBUSxHQUFHO0FBQy9GLGVBQU87QUFBQSxNQUNSO0FBRUEsYUFBTyxnQ0FBZ0MsWUFBWSxnQkFBZ0IsT0FBTztBQUFBLElBQzNFLENBQUM7QUFBQSxFQUNGO0FBRUEsV0FBUyxnQ0FBZ0MsWUFBb0IsZ0JBQXdCLFNBQTZCO0FBQ2pILFVBQU0sZUFBZSxZQUFZLElBQUksWUFBWSxjQUFjO0FBQy9ELFFBQUksY0FBYztBQUNqQixhQUFPO0FBQUEsUUFDTixnQkFBZ0I7QUFBQSxNQUNqQjtBQUFBLElBQ0Q7QUFFQSxVQUFNLGlCQUFpQixrQkFBa0IsWUFBWSxnQkFBZ0IsT0FBTztBQUM1RSxnQkFBWSxJQUFJLFlBQVksZ0JBQWdCLGNBQWM7QUFDMUQsV0FBTztBQUFBLE1BQ047QUFBQSxJQUNEO0FBQUEsRUFDRDtBQUNEOyIsCiAgIm5hbWVzIjogWyJfYSJdCn0K
|
package/package.json
CHANGED
package/src/astro-sys.ts
CHANGED
|
@@ -1,25 +1,25 @@
|
|
|
1
|
-
import ts from 'typescript';
|
|
1
|
+
import type ts from 'typescript/lib/tsserverlibrary';
|
|
2
2
|
import type { Logger } from './logger.js';
|
|
3
3
|
import { ensureRealAstroFilePath, isVirtualAstroFilePath, toRealAstroFilePath } from './utils.js';
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
* This should only be accessed by TS astro module resolution.
|
|
7
7
|
*/
|
|
8
|
-
export function createAstroSys(logger: Logger) {
|
|
8
|
+
export function createAstroSys(logger: Logger, typescript: typeof import('typescript/lib/tsserverlibrary')) {
|
|
9
9
|
const astroSys: ts.System = {
|
|
10
|
-
...
|
|
10
|
+
...typescript.sys,
|
|
11
11
|
fileExists(path: string) {
|
|
12
|
-
return
|
|
12
|
+
return typescript.sys.fileExists(ensureRealAstroFilePath(path));
|
|
13
13
|
},
|
|
14
14
|
readDirectory(path, extensions, exclude, include, depth) {
|
|
15
15
|
const extensionsWithAstro = (extensions ?? []).concat('.astro');
|
|
16
16
|
|
|
17
|
-
return
|
|
17
|
+
return typescript.sys.readDirectory(path, extensionsWithAstro, exclude, include, depth);
|
|
18
18
|
},
|
|
19
19
|
};
|
|
20
20
|
|
|
21
|
-
if (
|
|
22
|
-
const realpath =
|
|
21
|
+
if (typescript.sys.realpath) {
|
|
22
|
+
const realpath = typescript.sys.realpath;
|
|
23
23
|
astroSys.realpath = function (path) {
|
|
24
24
|
if (isVirtualAstroFilePath(path)) {
|
|
25
25
|
return realpath(toRealAstroFilePath(path)) + '.ts';
|
package/src/index.ts
CHANGED
|
@@ -36,7 +36,7 @@ function init(modules: { typescript: typeof import('typescript/lib/tsserverlibra
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
patchModuleLoader(logger, snapshotManager, modules.typescript, info.languageServiceHost, info.project);
|
|
39
|
-
return decorateLanguageService(info.languageService, snapshotManager, logger);
|
|
39
|
+
return decorateLanguageService(info.languageService, snapshotManager, ts, logger);
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
function getExternalFiles(project: ts.server.ConfiguredProject) {
|
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
import ts from 'typescript/lib/tsserverlibrary';
|
|
1
|
+
import type ts from 'typescript/lib/tsserverlibrary';
|
|
2
2
|
import { isAstroFilePath } from '../utils.js';
|
|
3
3
|
|
|
4
|
+
type _ts = typeof ts;
|
|
5
|
+
|
|
4
6
|
export enum DiagnosticCodes {
|
|
5
7
|
CANNOT_FIND_MODULE = 2307, // Cannot find module '{0}' or its corresponding type declarations.
|
|
6
8
|
}
|
|
7
9
|
|
|
8
|
-
export function decorateDiagnostics(ls: ts.LanguageService): void {
|
|
10
|
+
export function decorateDiagnostics(ls: ts.LanguageService, typescript: _ts): void {
|
|
9
11
|
decorateSyntacticDiagnostics(ls);
|
|
10
|
-
decorateSemanticDiagnostics(ls);
|
|
12
|
+
decorateSemanticDiagnostics(ls, typescript);
|
|
11
13
|
decorateSuggestionDiagnostics(ls);
|
|
12
14
|
}
|
|
13
15
|
|
|
@@ -23,7 +25,7 @@ function decorateSyntacticDiagnostics(ls: ts.LanguageService): void {
|
|
|
23
25
|
};
|
|
24
26
|
}
|
|
25
27
|
|
|
26
|
-
function decorateSemanticDiagnostics(ls: ts.LanguageService): void {
|
|
28
|
+
function decorateSemanticDiagnostics(ls: ts.LanguageService, typescript: _ts): void {
|
|
27
29
|
const getSemanticDiagnostics = ls.getSemanticDiagnostics;
|
|
28
30
|
ls.getSemanticDiagnostics = (fileName: string) => {
|
|
29
31
|
// Diagnostics inside Astro files are done
|
|
@@ -34,7 +36,7 @@ function decorateSemanticDiagnostics(ls: ts.LanguageService): void {
|
|
|
34
36
|
|
|
35
37
|
let diagnostics = getSemanticDiagnostics(fileName);
|
|
36
38
|
diagnostics = diagnostics.map((diag) => {
|
|
37
|
-
const message =
|
|
39
|
+
const message = typescript.flattenDiagnosticMessageText(diag.messageText, typescript.sys.newLine);
|
|
38
40
|
if (
|
|
39
41
|
diag.code === DiagnosticCodes.CANNOT_FIND_MODULE &&
|
|
40
42
|
message.includes('astro:content') &&
|
|
@@ -44,8 +46,8 @@ function decorateSemanticDiagnostics(ls: ts.LanguageService): void {
|
|
|
44
46
|
) {
|
|
45
47
|
diag.messageText =
|
|
46
48
|
message +
|
|
47
|
-
`${
|
|
48
|
-
"If you're using content collections, make sure to run `astro dev`, `astro build` or `astro sync` to first generate the types so you can import from them. If you already ran one of those commands, restarting the TS Server might be necessary in order for the change to take effect";
|
|
49
|
+
`${typescript.sys.newLine}${typescript.sys.newLine}` +
|
|
50
|
+
"If you're using content collections, make sure to run `astro dev`, `astro build` or `astro sync` to first generate the types so you can import from them. If you already ran one of those commands, restarting the TS Server might be necessary in order for the change to take effect.";
|
|
49
51
|
}
|
|
50
52
|
|
|
51
53
|
return diag;
|
|
@@ -19,13 +19,14 @@ export function isPatched(ls: ts.LanguageService) {
|
|
|
19
19
|
export function decorateLanguageService(
|
|
20
20
|
ls: ts.LanguageService,
|
|
21
21
|
snapshotManager: AstroSnapshotManager,
|
|
22
|
+
ts: typeof import('typescript/lib/tsserverlibrary'),
|
|
22
23
|
logger: Logger
|
|
23
24
|
): ts.LanguageService {
|
|
24
25
|
const proxy = new Proxy(ls, createProxyHandler());
|
|
25
26
|
|
|
26
27
|
decorateLineColumnOffset(proxy, snapshotManager);
|
|
27
28
|
decorateRename(proxy, snapshotManager, logger);
|
|
28
|
-
decorateDiagnostics(proxy);
|
|
29
|
+
decorateDiagnostics(proxy, ts);
|
|
29
30
|
decorateFindReferences(proxy, snapshotManager, logger);
|
|
30
31
|
decorateCompletions(proxy, logger);
|
|
31
32
|
decorateGetDefinition(proxy, snapshotManager);
|
package/src/module-loader.ts
CHANGED
|
@@ -60,7 +60,7 @@ export function patchModuleLoader(
|
|
|
60
60
|
lsHost: ts.LanguageServiceHost,
|
|
61
61
|
project: ts.server.Project
|
|
62
62
|
): void {
|
|
63
|
-
const astroSys = createAstroSys(logger);
|
|
63
|
+
const astroSys = createAstroSys(logger, typescript);
|
|
64
64
|
const moduleCache = new ModuleResolutionCache();
|
|
65
65
|
const origResolveModuleNames = lsHost.resolveModuleNames?.bind(lsHost);
|
|
66
66
|
const origResolveModuleNamLiterals = lsHost.resolveModuleNameLiterals?.bind(lsHost);
|