@astrojs/ts-plugin 0.3.0 → 0.4.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/.turbo/turbo-build.log +5 -2
- package/CHANGELOG.md +10 -0
- package/LICENSE +36 -0
- package/dist/astro-snapshots.js +48 -47
- package/dist/astro-sys.js +22 -35
- package/dist/astro2tsx.js +22 -26
- package/dist/index.js +38 -39
- package/dist/language-service/completions.js +42 -42
- package/dist/language-service/definition.js +22 -40
- package/dist/language-service/diagnostics.js +15 -18
- package/dist/language-service/file-references.js +52 -0
- package/dist/language-service/find-references.js +20 -38
- package/dist/language-service/implementation.js +18 -37
- package/dist/language-service/index.js +26 -42
- package/dist/language-service/line-column-offset.js +44 -0
- package/dist/language-service/rename.js +24 -37
- package/dist/logger.js +18 -5
- package/dist/module-loader.js +28 -22
- package/dist/project-astro-files.js +125 -0
- package/dist/utils.js +34 -19
- package/dist/workers/TSXService.js +39 -0
- package/dist/workers/TSXWorker.js +9 -0
- package/package.json +21 -11
- package/src/astro-snapshots.ts +17 -26
- package/src/astro-sys.ts +1 -1
- package/src/astro2tsx.ts +5 -46
- package/src/index.ts +34 -34
- package/src/language-service/completions.ts +15 -4
- package/src/language-service/definition.ts +2 -7
- package/src/language-service/diagnostics.ts +1 -2
- package/src/language-service/file-references.ts +31 -0
- package/src/language-service/find-references.ts +2 -2
- package/src/language-service/implementation.ts +2 -7
- package/src/language-service/index.ts +10 -25
- package/src/language-service/line-column-offset.ts +21 -0
- package/src/language-service/rename.ts +2 -2
- package/src/module-loader.ts +12 -4
- package/src/project-astro-files.ts +130 -0
- package/src/utils.ts +29 -20
- package/src/workers/TSXService.ts +11 -0
- package/src/workers/TSXWorker.ts +8 -0
- package/test/fixtures/MyAstroComponent.astro +5 -0
- package/test/fixtures/script.ts +9 -0
- package/test/fixtures/tsconfig.json +3 -0
- package/test/runTest.js +41 -0
- package/test/suite/extension.test.js +68 -0
- package/test/suite/index.js +38 -0
- package/test/tsconfig.json +14 -0
- package/test/utils.js +65 -0
- package/tsconfig.json +2 -1
- package/dist/source-mapper.js +0 -110
- package/src/source-mapper.ts +0 -107
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var line_column_offset_exports = {};
|
|
20
|
+
__export(line_column_offset_exports, {
|
|
21
|
+
decorateLineColumnOffset: () => decorateLineColumnOffset
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(line_column_offset_exports);
|
|
24
|
+
var import_utils = require("../utils");
|
|
25
|
+
function decorateLineColumnOffset(ls, snapshotManager) {
|
|
26
|
+
if (!ls.toLineColumnOffset) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
const toLineColumnOffset = ls.toLineColumnOffset;
|
|
30
|
+
ls.toLineColumnOffset = (fileName, position) => {
|
|
31
|
+
if ((0, import_utils.isAstroFilePath)(fileName)) {
|
|
32
|
+
const snapshot = snapshotManager.get(fileName);
|
|
33
|
+
if (snapshot) {
|
|
34
|
+
return snapshot.positionAt(position);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return toLineColumnOffset(fileName, position);
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
41
|
+
0 && (module.exports = {
|
|
42
|
+
decorateLineColumnOffset
|
|
43
|
+
});
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvbGluZS1jb2x1bW4tb2Zmc2V0LnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUVBLG1CQUFnQztBQUV6QixTQUFTLHlCQUF5QixJQUF3QixpQkFBdUM7QUFDdkcsTUFBSSxDQUFDLEdBQUcsb0JBQW9CO0FBQzNCO0FBQUEsRUFDRDtBQUdBLFFBQU0scUJBQXFCLEdBQUc7QUFDOUIsS0FBRyxxQkFBcUIsQ0FBQyxVQUFVLGFBQWE7QUFDL0MsWUFBSSw4QkFBZ0IsUUFBUSxHQUFHO0FBQzlCLFlBQU0sV0FBVyxnQkFBZ0IsSUFBSSxRQUFRO0FBQzdDLFVBQUksVUFBVTtBQUNiLGVBQU8sU0FBUyxXQUFXLFFBQVE7QUFBQSxNQUNwQztBQUFBLElBQ0Q7QUFDQSxXQUFPLG1CQUFtQixVQUFVLFFBQVE7QUFBQSxFQUM3QztBQUNEOyIsCiAgIm5hbWVzIjogW10KfQo=
|
|
@@ -1,51 +1,37 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
2
|
var __defProp = Object.defineProperty;
|
|
3
|
-
var __defProps = Object.defineProperties;
|
|
4
3
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
-
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
6
4
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
7
|
-
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
8
|
-
var __getProtoOf = Object.getPrototypeOf;
|
|
9
5
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
10
|
-
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
11
|
-
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
|
|
12
|
-
var __spreadValues = (a, b) => {
|
|
13
|
-
for (var prop in b || (b = {}))
|
|
14
|
-
if (__hasOwnProp.call(b, prop))
|
|
15
|
-
__defNormalProp(a, prop, b[prop]);
|
|
16
|
-
if (__getOwnPropSymbols)
|
|
17
|
-
for (var prop of __getOwnPropSymbols(b)) {
|
|
18
|
-
if (__propIsEnum.call(b, prop))
|
|
19
|
-
__defNormalProp(a, prop, b[prop]);
|
|
20
|
-
}
|
|
21
|
-
return a;
|
|
22
|
-
};
|
|
23
|
-
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
24
|
-
var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
|
|
25
6
|
var __export = (target, all) => {
|
|
26
7
|
for (var name in all)
|
|
27
|
-
__defProp(target, name, {get: all[name], enumerable: true});
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
28
9
|
};
|
|
29
|
-
var
|
|
30
|
-
if (
|
|
31
|
-
for (let key of __getOwnPropNames(
|
|
32
|
-
if (!__hasOwnProp.call(
|
|
33
|
-
__defProp(
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
34
15
|
}
|
|
35
|
-
return
|
|
36
|
-
};
|
|
37
|
-
var __toModule = (module2) => {
|
|
38
|
-
return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
|
|
16
|
+
return to;
|
|
39
17
|
};
|
|
40
|
-
|
|
41
|
-
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var rename_exports = {};
|
|
20
|
+
__export(rename_exports, {
|
|
42
21
|
decorateRename: () => decorateRename
|
|
43
22
|
});
|
|
44
|
-
|
|
23
|
+
module.exports = __toCommonJS(rename_exports);
|
|
24
|
+
var import_utils = require("../utils.js");
|
|
45
25
|
function decorateRename(ls, snapshotManager, logger) {
|
|
46
26
|
const findRenameLocations = ls.findRenameLocations;
|
|
47
27
|
ls.findRenameLocations = (fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) => {
|
|
48
|
-
const renameLocations = findRenameLocations(
|
|
28
|
+
const renameLocations = findRenameLocations(
|
|
29
|
+
fileName,
|
|
30
|
+
position,
|
|
31
|
+
findInStrings,
|
|
32
|
+
findInComments,
|
|
33
|
+
providePrefixAndSuffixTextForRename
|
|
34
|
+
);
|
|
49
35
|
return renameLocations == null ? void 0 : renameLocations.map((renameLocation) => {
|
|
50
36
|
const snapshot = snapshotManager.get(renameLocation.fileName);
|
|
51
37
|
if (!(0, import_utils.isAstroFilePath)(renameLocation.fileName) || !snapshot) {
|
|
@@ -55,9 +41,10 @@ function decorateRename(ls, snapshotManager, logger) {
|
|
|
55
41
|
if (!textSpan) {
|
|
56
42
|
return null;
|
|
57
43
|
}
|
|
58
|
-
const converted =
|
|
44
|
+
const converted = {
|
|
45
|
+
...renameLocation,
|
|
59
46
|
textSpan
|
|
60
|
-
}
|
|
47
|
+
};
|
|
61
48
|
if (converted.contextSpan) {
|
|
62
49
|
converted.contextSpan = void 0;
|
|
63
50
|
}
|
|
@@ -70,4 +57,4 @@ function decorateRename(ls, snapshotManager, logger) {
|
|
|
70
57
|
0 && (module.exports = {
|
|
71
58
|
decorateRename
|
|
72
59
|
});
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvcmVuYW1lLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUdBLG1CQUFzRDtBQUUvQyxTQUFTLGVBQWUsSUFBd0IsaUJBQXVDLFFBQXNCO0FBQ25ILFFBQU0sc0JBQXNCLEdBQUc7QUFDL0IsS0FBRyxzQkFBc0IsQ0FBQyxVQUFVLFVBQVUsZUFBZSxnQkFBZ0Isd0NBQXdDO0FBQ3BILFVBQU0sa0JBQWtCO0FBQUEsTUFDdkI7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsSUFDRDtBQUNBLFdBQU8sbURBQ0osSUFBSSxDQUFDLG1CQUFtQjtBQUN6QixZQUFNLFdBQVcsZ0JBQWdCLElBQUksZUFBZSxRQUFRO0FBQzVELFVBQUksS0FBQyw4QkFBZ0IsZUFBZSxRQUFRLEtBQUssQ0FBQyxVQUFVO0FBQzNELGVBQU87QUFBQSxNQUNSO0FBR0EsWUFBTSxXQUFXLFNBQVMsb0JBQW9CLGVBQWUsUUFBUTtBQUNyRSxVQUFJLENBQUMsVUFBVTtBQUNkLGVBQU87QUFBQSxNQUNSO0FBRUEsWUFBTSxZQUFZO0FBQUEsUUFDakIsR0FBRztBQUFBLFFBQ0g7QUFBQSxNQUNEO0FBQ0EsVUFBSSxVQUFVLGFBQWE7QUFFMUIsa0JBQVUsY0FBYztBQUFBLE1BQ3pCO0FBQ0EsYUFBTyxNQUFNLDhCQUE4QixTQUFTO0FBQ3BELGFBQU87QUFBQSxJQUNSLEdBQ0MsT0FBTztBQUFBLEVBQ1Y7QUFDRDsiLAogICJuYW1lcyI6IFtdCn0K
|
package/dist/logger.js
CHANGED
|
@@ -1,13 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
var __defProp = Object.defineProperty;
|
|
2
|
-
var
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
3
6
|
var __export = (target, all) => {
|
|
4
7
|
for (var name in all)
|
|
5
|
-
__defProp(target, name, {get: all[name], enumerable: true});
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
6
9
|
};
|
|
7
|
-
|
|
8
|
-
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var logger_exports = {};
|
|
20
|
+
__export(logger_exports, {
|
|
9
21
|
Logger: () => Logger
|
|
10
22
|
});
|
|
23
|
+
module.exports = __toCommonJS(logger_exports);
|
|
11
24
|
class Logger {
|
|
12
25
|
constructor(tsLogService, suppressNonAstroLogs = false, logDebug = false) {
|
|
13
26
|
this.tsLogService = tsLogService;
|
|
@@ -45,4 +58,4 @@ class Logger {
|
|
|
45
58
|
0 && (module.exports = {
|
|
46
59
|
Logger
|
|
47
60
|
});
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2xvZ2dlci50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFTyxNQUFNLE9BQU87QUFBQSxFQUNuQixZQUFvQixjQUFnQyx1QkFBdUIsT0FBZSxXQUFXLE9BQU87QUFBeEY7QUFBc0U7QUFDekYsUUFBSSxzQkFBc0I7QUFDekIsWUFBTSxNQUFNLEtBQUssYUFBYSxLQUFLLEtBQUssS0FBSyxZQUFZO0FBQ3pELFdBQUssYUFBYSxPQUFPLENBQUMsTUFBYztBQUN2QyxZQUFJLEVBQUUsV0FBVyxnQkFBZ0IsR0FBRztBQUNuQyxjQUFJLENBQUM7QUFBQSxRQUNOO0FBQUEsTUFDRDtBQUFBLElBQ0Q7QUFBQSxFQUNEO0FBQUEsRUFFQSxPQUFPLE1BQWE7QUFDbkIsVUFBTSxNQUFNLEtBQ1YsSUFBSSxDQUFDLFFBQVE7QUFDYixVQUFJLE9BQU8sUUFBUSxVQUFVO0FBQzVCLFlBQUk7QUFDSCxpQkFBTyxLQUFLLFVBQVUsR0FBRztBQUFBLFFBQzFCLFNBQVMsR0FBUDtBQUNELGlCQUFPO0FBQUEsUUFDUjtBQUFBLE1BQ0Q7QUFDQSxhQUFPO0FBQUEsSUFDUixDQUFDLEVBQ0EsS0FBSyxHQUFHO0FBQ1YsU0FBSyxhQUFhLEtBQUssb0JBQW9CLEdBQUc7QUFBQSxFQUMvQztBQUFBLEVBRUEsU0FBUyxNQUFhO0FBQ3JCLFFBQUksQ0FBQyxLQUFLLFVBQVU7QUFDbkI7QUFBQSxJQUNEO0FBQ0EsU0FBSyxJQUFJLEdBQUcsSUFBSTtBQUFBLEVBQ2pCO0FBQ0Q7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
package/dist/module-loader.js
CHANGED
|
@@ -1,34 +1,31 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
2
|
var __defProp = Object.defineProperty;
|
|
3
3
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
4
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
-
var __getProtoOf = Object.getPrototypeOf;
|
|
6
5
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
-
var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
|
|
8
6
|
var __export = (target, all) => {
|
|
9
7
|
for (var name in all)
|
|
10
|
-
__defProp(target, name, {get: all[name], enumerable: true});
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
9
|
};
|
|
12
|
-
var
|
|
13
|
-
if (
|
|
14
|
-
for (let key of __getOwnPropNames(
|
|
15
|
-
if (!__hasOwnProp.call(
|
|
16
|
-
__defProp(
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
17
15
|
}
|
|
18
|
-
return
|
|
16
|
+
return to;
|
|
19
17
|
};
|
|
20
|
-
var
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
__markAsModule(exports);
|
|
24
|
-
__export(exports, {
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var module_loader_exports = {};
|
|
20
|
+
__export(module_loader_exports, {
|
|
25
21
|
patchModuleLoader: () => patchModuleLoader
|
|
26
22
|
});
|
|
27
|
-
|
|
28
|
-
var
|
|
23
|
+
module.exports = __toCommonJS(module_loader_exports);
|
|
24
|
+
var import_astro_sys = require("./astro-sys.js");
|
|
25
|
+
var import_utils = require("./utils.js");
|
|
29
26
|
class ModuleResolutionCache {
|
|
30
27
|
constructor() {
|
|
31
|
-
this.cache = new Map();
|
|
28
|
+
this.cache = /* @__PURE__ */ new Map();
|
|
32
29
|
}
|
|
33
30
|
get(moduleName, containingFile) {
|
|
34
31
|
return this.cache.get(this.getKey(moduleName, containingFile));
|
|
@@ -62,8 +59,12 @@ function patchModuleLoader(logger, snapshotManager, typescript, lsHost, project)
|
|
|
62
59
|
moduleCache.delete(info.fileName);
|
|
63
60
|
return origRemoveFile(info, fileExists, detachFromProject);
|
|
64
61
|
};
|
|
62
|
+
const origReadDirectory = project.readDirectory.bind(project);
|
|
63
|
+
project.readDirectory = (path, extensions, exclude, include, depth) => {
|
|
64
|
+
const extensionsWithAstro = (extensions != null ? extensions : []).concat(".astro", ".md", ".mdx");
|
|
65
|
+
return origReadDirectory(path, extensionsWithAstro, exclude, include, depth);
|
|
66
|
+
};
|
|
65
67
|
function resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, compilerOptions) {
|
|
66
|
-
logger.log("Resolving modules names for " + containingFile);
|
|
67
68
|
const resolved = (origResolveModuleNames == null ? void 0 : origResolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, compilerOptions)) || Array.from(Array(moduleNames.length));
|
|
68
69
|
return resolved.map((moduleName, idx) => {
|
|
69
70
|
const fileName = moduleNames[idx];
|
|
@@ -80,7 +81,12 @@ function patchModuleLoader(logger, snapshotManager, typescript, lsHost, project)
|
|
|
80
81
|
});
|
|
81
82
|
}
|
|
82
83
|
function resolveModuleName(name, containingFile, compilerOptions) {
|
|
83
|
-
const astroResolvedModule = typescript.resolveModuleName(
|
|
84
|
+
const astroResolvedModule = typescript.resolveModuleName(
|
|
85
|
+
name,
|
|
86
|
+
containingFile,
|
|
87
|
+
compilerOptions,
|
|
88
|
+
astroSys
|
|
89
|
+
).resolvedModule;
|
|
84
90
|
if (!astroResolvedModule || !(0, import_utils.isVirtualAstroFilePath)(astroResolvedModule.resolvedFileName)) {
|
|
85
91
|
return astroResolvedModule;
|
|
86
92
|
}
|
|
@@ -91,7 +97,7 @@ function patchModuleLoader(logger, snapshotManager, typescript, lsHost, project)
|
|
|
91
97
|
return void 0;
|
|
92
98
|
}
|
|
93
99
|
const resolvedAstroModule = {
|
|
94
|
-
extension:
|
|
100
|
+
extension: typescript.Extension.Tsx,
|
|
95
101
|
resolvedFileName
|
|
96
102
|
};
|
|
97
103
|
return resolvedAstroModule;
|
|
@@ -101,4 +107,4 @@ function patchModuleLoader(logger, snapshotManager, typescript, lsHost, project)
|
|
|
101
107
|
0 && (module.exports = {
|
|
102
108
|
patchModuleLoader
|
|
103
109
|
});
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL21vZHVsZS1sb2FkZXIudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRUEsdUJBQStCO0FBRS9CLG1CQUFnRTtBQUtoRSxNQUFNLHNCQUFzQjtBQUFBLEVBQTVCO0FBQ0MsU0FBUSxRQUFRLG9CQUFJLElBQStCO0FBQUE7QUFBQSxFQUtuRCxJQUFJLFlBQW9CLGdCQUF1RDtBQUM5RSxXQUFPLEtBQUssTUFBTSxJQUFJLEtBQUssT0FBTyxZQUFZLGNBQWMsQ0FBQztBQUFBLEVBQzlEO0FBQUEsRUFLQSxJQUFJLFlBQW9CLGdCQUF3QixnQkFBK0M7QUFDOUYsUUFBSSxDQUFDLGdCQUFnQjtBQUNwQjtBQUFBLElBQ0Q7QUFDQSxTQUFLLE1BQU0sSUFBSSxLQUFLLE9BQU8sWUFBWSxjQUFjLEdBQUcsY0FBYztBQUFBLEVBQ3ZFO0FBQUEsRUFNQSxPQUFPLG9CQUFrQztBQUN4QyxTQUFLLE1BQU0sUUFBUSxDQUFDLEtBQUssUUFBUTtBQUNoQyxVQUFJLElBQUkscUJBQXFCLG9CQUFvQjtBQUNoRCxhQUFLLE1BQU0sT0FBTyxHQUFHO0FBQUEsTUFDdEI7QUFBQSxJQUNELENBQUM7QUFBQSxFQUNGO0FBQUEsRUFFUSxPQUFPLFlBQW9CLGdCQUF3QjtBQUMxRCxXQUFPLGlCQUFpQixZQUFRLHNDQUF3QixVQUFVO0FBQUEsRUFDbkU7QUFDRDtBQVdPLFNBQVMsa0JBQ2YsUUFDQSxpQkFDQSxZQUNBLFFBQ0EsU0FDTztBQTdEUjtBQThEQyxRQUFNLGVBQVcsaUNBQWUsTUFBTTtBQUN0QyxRQUFNLGNBQWMsSUFBSSxzQkFBc0I7QUFDOUMsUUFBTSwwQkFBeUIsWUFBTyx1QkFBUCxtQkFBMkIsS0FBSztBQUUvRCxTQUFPLHFCQUFxQjtBQUU1QixRQUFNLGlCQUFpQixRQUFRLFdBQVcsS0FBSyxPQUFPO0FBQ3RELFVBQVEsYUFBYSxDQUFDLE1BQU0sWUFBWSxzQkFBc0I7QUFDN0QsV0FBTyxJQUFJLDhDQUE4QyxLQUFLLFFBQVE7QUFDdEUsZ0JBQVksT0FBTyxLQUFLLFFBQVE7QUFDaEMsV0FBTyxlQUFlLE1BQU0sWUFBWSxpQkFBaUI7QUFBQSxFQUMxRDtBQUdBLFFBQU0sb0JBQW9CLFFBQVEsY0FBYyxLQUFLLE9BQU87QUFDNUQsVUFBUSxnQkFBZ0IsQ0FBQyxNQUFNLFlBQVksU0FBUyxTQUFTLFVBQVU7QUFDdEUsVUFBTSx1QkFBdUIsa0NBQWMsQ0FBQyxHQUFHLE9BQU8sVUFBVSxPQUFPLE1BQU07QUFDN0UsV0FBTyxrQkFBa0IsTUFBTSxxQkFBcUIsU0FBUyxTQUFTLEtBQUs7QUFBQSxFQUM1RTtBQUVBLFdBQVMsbUJBQ1IsYUFDQSxnQkFDQSxhQUNBLHFCQUNBLGlCQUN1QztBQU92QyxVQUFNLFlBQ0wsaUVBQXlCLGFBQWEsZ0JBQWdCLGFBQWEscUJBQXFCLHFCQUN4RixNQUFNLEtBQWdCLE1BQU0sWUFBWSxNQUFNLENBQUM7QUFFaEQsV0FBTyxTQUFTLElBQUksQ0FBQyxZQUFZLFFBQVE7QUFDeEMsWUFBTSxXQUFXLFlBQVk7QUFDN0IsVUFBSSxjQUFjLEtBQUMsc0NBQXdCLFFBQVEsRUFBRSxTQUFTLFFBQVEsR0FBRztBQUN4RSxlQUFPO0FBQUEsTUFDUjtBQUVBLFlBQU0sZUFBZSxZQUFZLElBQUksVUFBVSxjQUFjO0FBQzdELFVBQUksY0FBYztBQUNqQixlQUFPO0FBQUEsTUFDUjtBQUVBLFlBQU0saUJBQWlCLGtCQUFrQixVQUFVLGdCQUFnQixlQUFlO0FBQ2xGLGtCQUFZLElBQUksVUFBVSxnQkFBZ0IsY0FBYztBQUN4RCxhQUFPO0FBQUEsSUFDUixDQUFDO0FBQUEsRUFDRjtBQUVBLFdBQVMsa0JBQ1IsTUFDQSxnQkFDQSxpQkFDZ0M7QUFDaEMsVUFBTSxzQkFBc0IsV0FBVztBQUFBLE1BQ3RDO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsSUFDRCxFQUFFO0FBQ0YsUUFBSSxDQUFDLHVCQUF1QixLQUFDLHFDQUF1QixvQkFBb0IsZ0JBQWdCLEdBQUc7QUFDMUYsYUFBTztBQUFBLElBQ1I7QUFFQSxVQUFNLHVCQUFtQixzQ0FBd0Isb0JBQW9CLGdCQUFnQjtBQUNyRixXQUFPLElBQUksWUFBWSxNQUFNLGlCQUFpQixnQkFBZ0I7QUFDOUQsVUFBTSxXQUFXLGdCQUFnQixPQUFPLGdCQUFnQjtBQUN4RCxRQUFJLENBQUMsVUFBVTtBQUNkLGFBQU87QUFBQSxJQUNSO0FBRUEsVUFBTSxzQkFBNkM7QUFBQSxNQUNsRCxXQUFXLFdBQVcsVUFBVTtBQUFBLE1BQ2hDO0FBQUEsSUFDRDtBQUNBLFdBQU87QUFBQSxFQUNSO0FBQ0Q7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var project_astro_files_exports = {};
|
|
20
|
+
__export(project_astro_files_exports, {
|
|
21
|
+
ProjectAstroFilesManager: () => ProjectAstroFilesManager
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(project_astro_files_exports);
|
|
24
|
+
var import_utils = require("./utils");
|
|
25
|
+
const _ProjectAstroFilesManager = class {
|
|
26
|
+
constructor(typescript, project, serverHost, snapshotManager, parsedCommandLine) {
|
|
27
|
+
this.typescript = typescript;
|
|
28
|
+
this.project = project;
|
|
29
|
+
this.serverHost = serverHost;
|
|
30
|
+
this.snapshotManager = snapshotManager;
|
|
31
|
+
this.parsedCommandLine = parsedCommandLine;
|
|
32
|
+
this.files = /* @__PURE__ */ new Set();
|
|
33
|
+
this.directoryWatchers = /* @__PURE__ */ new Set();
|
|
34
|
+
this.setupWatchers();
|
|
35
|
+
this.updateProjectAstroFiles();
|
|
36
|
+
_ProjectAstroFilesManager.instances.set(project.getProjectName(), this);
|
|
37
|
+
}
|
|
38
|
+
static getInstance(projectName) {
|
|
39
|
+
return this.instances.get(projectName);
|
|
40
|
+
}
|
|
41
|
+
updateProjectConfig(serviceHost) {
|
|
42
|
+
var _a;
|
|
43
|
+
const parsedCommandLine = (_a = serviceHost.getParsedCommandLine) == null ? void 0 : _a.call(serviceHost, (0, import_utils.getConfigPathForProject)(this.project));
|
|
44
|
+
if (!parsedCommandLine) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
this.disposeWatchersAndFiles();
|
|
48
|
+
this.parsedCommandLine = parsedCommandLine;
|
|
49
|
+
this.setupWatchers();
|
|
50
|
+
this.updateProjectAstroFiles();
|
|
51
|
+
}
|
|
52
|
+
getFiles() {
|
|
53
|
+
return Array.from(this.files);
|
|
54
|
+
}
|
|
55
|
+
setupWatchers() {
|
|
56
|
+
for (const directory in this.parsedCommandLine.wildcardDirectories) {
|
|
57
|
+
if (!Object.prototype.hasOwnProperty.call(this.parsedCommandLine.wildcardDirectories, directory)) {
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
const watchDirectoryFlags = this.parsedCommandLine.wildcardDirectories[directory];
|
|
61
|
+
const watcher = this.serverHost.watchDirectory(
|
|
62
|
+
directory,
|
|
63
|
+
this.watcherCallback.bind(this),
|
|
64
|
+
watchDirectoryFlags === this.typescript.WatchDirectoryFlags.Recursive,
|
|
65
|
+
this.parsedCommandLine.watchOptions
|
|
66
|
+
);
|
|
67
|
+
this.directoryWatchers.add(watcher);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
watcherCallback(fileName) {
|
|
71
|
+
if (!(0, import_utils.isAstroFilePath)(fileName)) {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
this.updateProjectAstroFiles();
|
|
75
|
+
}
|
|
76
|
+
updateProjectAstroFiles() {
|
|
77
|
+
const fileNamesAfter = (0, import_utils.readProjectAstroFilesFromFs)(this.typescript, this.project, this.parsedCommandLine);
|
|
78
|
+
const removedFiles = new Set(...this.files);
|
|
79
|
+
const newFiles = fileNamesAfter.filter((fileName) => {
|
|
80
|
+
const has = this.files.has(fileName);
|
|
81
|
+
if (has) {
|
|
82
|
+
removedFiles.delete(fileName);
|
|
83
|
+
}
|
|
84
|
+
return !has;
|
|
85
|
+
});
|
|
86
|
+
for (const newFile of newFiles) {
|
|
87
|
+
this.addFileToProject(newFile);
|
|
88
|
+
this.files.add(newFile);
|
|
89
|
+
}
|
|
90
|
+
for (const removedFile of removedFiles) {
|
|
91
|
+
this.removeFileFromProject(removedFile, false);
|
|
92
|
+
this.files.delete(removedFile);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
addFileToProject(newFile) {
|
|
96
|
+
this.snapshotManager.create(newFile);
|
|
97
|
+
const snapshot = this.project.projectService.getScriptInfo(newFile);
|
|
98
|
+
if (snapshot) {
|
|
99
|
+
this.project.addRoot(snapshot);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
removeFileFromProject(file, exists = true) {
|
|
103
|
+
const info = this.project.getScriptInfo(file);
|
|
104
|
+
if (info) {
|
|
105
|
+
this.project.removeFile(info, exists, true);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
disposeWatchersAndFiles() {
|
|
109
|
+
this.directoryWatchers.forEach((watcher) => watcher.close());
|
|
110
|
+
this.directoryWatchers.clear();
|
|
111
|
+
this.files.forEach((file) => this.removeFileFromProject(file));
|
|
112
|
+
this.files.clear();
|
|
113
|
+
}
|
|
114
|
+
dispose() {
|
|
115
|
+
this.disposeWatchersAndFiles();
|
|
116
|
+
_ProjectAstroFilesManager.instances.delete(this.project.getProjectName());
|
|
117
|
+
}
|
|
118
|
+
};
|
|
119
|
+
let ProjectAstroFilesManager = _ProjectAstroFilesManager;
|
|
120
|
+
ProjectAstroFilesManager.instances = /* @__PURE__ */ new Map();
|
|
121
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
122
|
+
0 && (module.exports = {
|
|
123
|
+
ProjectAstroFilesManager
|
|
124
|
+
});
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3Byb2plY3QtYXN0cm8tZmlsZXMudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRUEsbUJBQXNGO0FBRS9FLE1BQU0sNEJBQU4sTUFBK0I7QUFBQSxFQVVyQyxZQUNrQixZQUNBLFNBQ0EsWUFDQSxpQkFDVCxtQkFDUDtBQUxnQjtBQUNBO0FBQ0E7QUFDQTtBQUNUO0FBZFQsU0FBUSxRQUFRLG9CQUFJLElBQVk7QUFDaEMsU0FBUSxvQkFBb0Isb0JBQUksSUFBb0I7QUFlbkQsU0FBSyxjQUFjO0FBQ25CLFNBQUssd0JBQXdCO0FBRTdCLDhCQUF5QixVQUFVLElBQUksUUFBUSxlQUFlLEdBQUcsSUFBSTtBQUFBLEVBQ3RFO0FBQUEsRUFmQSxPQUFPLFlBQVksYUFBcUI7QUFDdkMsV0FBTyxLQUFLLFVBQVUsSUFBSSxXQUFXO0FBQUEsRUFDdEM7QUFBQSxFQWVBLG9CQUFvQixhQUFxQztBQTNCMUQ7QUE0QkUsVUFBTSxxQkFBb0IsaUJBQVkseUJBQVoseUNBQW1DLHNDQUF3QixLQUFLLE9BQU87QUFFakcsUUFBSSxDQUFDLG1CQUFtQjtBQUN2QjtBQUFBLElBQ0Q7QUFFQSxTQUFLLHdCQUF3QjtBQUM3QixTQUFLLG9CQUFvQjtBQUN6QixTQUFLLGNBQWM7QUFDbkIsU0FBSyx3QkFBd0I7QUFBQSxFQUM5QjtBQUFBLEVBRUEsV0FBVztBQUNWLFdBQU8sTUFBTSxLQUFLLEtBQUssS0FBSztBQUFBLEVBQzdCO0FBQUEsRUFPUSxnQkFBZ0I7QUFDdkIsZUFBVyxhQUFhLEtBQUssa0JBQWtCLHFCQUFxQjtBQUNuRSxVQUFJLENBQUMsT0FBTyxVQUFVLGVBQWUsS0FBSyxLQUFLLGtCQUFrQixxQkFBcUIsU0FBUyxHQUFHO0FBQ2pHO0FBQUEsTUFDRDtBQUVBLFlBQU0sc0JBQXNCLEtBQUssa0JBQWtCLG9CQUFvQjtBQUN2RSxZQUFNLFVBQVUsS0FBSyxXQUFXO0FBQUEsUUFDL0I7QUFBQSxRQUNBLEtBQUssZ0JBQWdCLEtBQUssSUFBSTtBQUFBLFFBQzlCLHdCQUF3QixLQUFLLFdBQVcsb0JBQW9CO0FBQUEsUUFDNUQsS0FBSyxrQkFBa0I7QUFBQSxNQUN4QjtBQUVBLFdBQUssa0JBQWtCLElBQUksT0FBTztBQUFBLElBQ25DO0FBQUEsRUFDRDtBQUFBLEVBRVEsZ0JBQWdCLFVBQWtCO0FBQ3pDLFFBQUksS0FBQyw4QkFBZ0IsUUFBUSxHQUFHO0FBQy9CO0FBQUEsSUFDRDtBQUtBLFNBQUssd0JBQXdCO0FBQUEsRUFDOUI7QUFBQSxFQUVRLDBCQUEwQjtBQUNqQyxVQUFNLHFCQUFpQiwwQ0FBNEIsS0FBSyxZQUFZLEtBQUssU0FBUyxLQUFLLGlCQUFpQjtBQUN4RyxVQUFNLGVBQWUsSUFBSSxJQUFJLEdBQUcsS0FBSyxLQUFLO0FBQzFDLFVBQU0sV0FBVyxlQUFlLE9BQU8sQ0FBQyxhQUFhO0FBQ3BELFlBQU0sTUFBTSxLQUFLLE1BQU0sSUFBSSxRQUFRO0FBQ25DLFVBQUksS0FBSztBQUNSLHFCQUFhLE9BQU8sUUFBUTtBQUFBLE1BQzdCO0FBQ0EsYUFBTyxDQUFDO0FBQUEsSUFDVCxDQUFDO0FBRUQsZUFBVyxXQUFXLFVBQVU7QUFDL0IsV0FBSyxpQkFBaUIsT0FBTztBQUM3QixXQUFLLE1BQU0sSUFBSSxPQUFPO0FBQUEsSUFDdkI7QUFDQSxlQUFXLGVBQWUsY0FBYztBQUN2QyxXQUFLLHNCQUFzQixhQUFhLEtBQUs7QUFDN0MsV0FBSyxNQUFNLE9BQU8sV0FBVztBQUFBLElBQzlCO0FBQUEsRUFDRDtBQUFBLEVBRVEsaUJBQWlCLFNBQWlCO0FBQ3pDLFNBQUssZ0JBQWdCLE9BQU8sT0FBTztBQUNuQyxVQUFNLFdBQVcsS0FBSyxRQUFRLGVBQWUsY0FBYyxPQUFPO0FBRWxFLFFBQUksVUFBVTtBQUNiLFdBQUssUUFBUSxRQUFRLFFBQVE7QUFBQSxJQUM5QjtBQUFBLEVBQ0Q7QUFBQSxFQUVRLHNCQUFzQixNQUFjLFNBQVMsTUFBTTtBQUMxRCxVQUFNLE9BQU8sS0FBSyxRQUFRLGNBQWMsSUFBSTtBQUU1QyxRQUFJLE1BQU07QUFDVCxXQUFLLFFBQVEsV0FBVyxNQUFNLFFBQVEsSUFBSTtBQUFBLElBQzNDO0FBQUEsRUFDRDtBQUFBLEVBRVEsMEJBQTBCO0FBQ2pDLFNBQUssa0JBQWtCLFFBQVEsQ0FBQyxZQUFZLFFBQVEsTUFBTSxDQUFDO0FBQzNELFNBQUssa0JBQWtCLE1BQU07QUFFN0IsU0FBSyxNQUFNLFFBQVEsQ0FBQyxTQUFTLEtBQUssc0JBQXNCLElBQUksQ0FBQztBQUM3RCxTQUFLLE1BQU0sTUFBTTtBQUFBLEVBQ2xCO0FBQUEsRUFFQSxVQUFVO0FBQ1QsU0FBSyx3QkFBd0I7QUFFN0IsOEJBQXlCLFVBQVUsT0FBTyxLQUFLLFFBQVEsZUFBZSxDQUFDO0FBQUEsRUFDeEU7QUFDRDtBQTdITyxJQUFNLDJCQUFOO0FBQU0seUJBSUcsWUFBWSxvQkFBSSxJQUFzQzsiLAogICJuYW1lcyI6IFtdCn0K
|
package/dist/utils.js
CHANGED
|
@@ -1,20 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
var __defProp = Object.defineProperty;
|
|
2
|
-
var
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
3
6
|
var __export = (target, all) => {
|
|
4
7
|
for (var name in all)
|
|
5
|
-
__defProp(target, name, {get: all[name], enumerable: true});
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
6
9
|
};
|
|
7
|
-
|
|
8
|
-
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var utils_exports = {};
|
|
20
|
+
__export(utils_exports, {
|
|
9
21
|
ensureRealAstroFilePath: () => ensureRealAstroFilePath,
|
|
22
|
+
getConfigPathForProject: () => getConfigPathForProject,
|
|
10
23
|
isAstroFilePath: () => isAstroFilePath,
|
|
11
|
-
isInGeneratedCode: () => isInGeneratedCode,
|
|
12
|
-
isNoTextSpanInGeneratedCode: () => isNoTextSpanInGeneratedCode,
|
|
13
24
|
isNotNullOrUndefined: () => isNotNullOrUndefined,
|
|
14
25
|
isVirtualAstroFilePath: () => isVirtualAstroFilePath,
|
|
26
|
+
readProjectAstroFilesFromFs: () => readProjectAstroFilesFromFs,
|
|
15
27
|
replaceDeep: () => replaceDeep,
|
|
16
28
|
toRealAstroFilePath: () => toRealAstroFilePath
|
|
17
29
|
});
|
|
30
|
+
module.exports = __toCommonJS(utils_exports);
|
|
18
31
|
function isAstroFilePath(filePath) {
|
|
19
32
|
return filePath.endsWith(".astro");
|
|
20
33
|
}
|
|
@@ -30,16 +43,6 @@ function ensureRealAstroFilePath(filePath) {
|
|
|
30
43
|
function isNotNullOrUndefined(val) {
|
|
31
44
|
return val !== void 0 && val !== null;
|
|
32
45
|
}
|
|
33
|
-
function isInGeneratedCode(text, start, end) {
|
|
34
|
-
const lineStart = text.lastIndexOf("\n", start);
|
|
35
|
-
const lineEnd = text.indexOf("\n", end);
|
|
36
|
-
const lastStart = text.substring(lineStart, start).lastIndexOf("/*\u03A9ignore_start\u03A9*/");
|
|
37
|
-
const lastEnd = text.substring(lineStart, start).lastIndexOf("/*\u03A9ignore_end\u03A9*/");
|
|
38
|
-
return lastStart > lastEnd && text.substring(end, lineEnd).includes("/*\u03A9ignore_end\u03A9*/");
|
|
39
|
-
}
|
|
40
|
-
function isNoTextSpanInGeneratedCode(text, span) {
|
|
41
|
-
return !isInGeneratedCode(text, span.start, span.start + span.length);
|
|
42
|
-
}
|
|
43
46
|
function replaceDeep(obj, searchStr, replacementStr) {
|
|
44
47
|
return _replaceDeep(obj);
|
|
45
48
|
function _replaceDeep(_obj) {
|
|
@@ -58,15 +61,27 @@ function replaceDeep(obj, searchStr, replacementStr) {
|
|
|
58
61
|
return _obj;
|
|
59
62
|
}
|
|
60
63
|
}
|
|
64
|
+
function getConfigPathForProject(project) {
|
|
65
|
+
var _a;
|
|
66
|
+
return (_a = project.canonicalConfigFilePath) != null ? _a : project.getCompilerOptions().configFilePath;
|
|
67
|
+
}
|
|
68
|
+
function readProjectAstroFilesFromFs(ts, project, parsedCommandLine) {
|
|
69
|
+
const fileSpec = parsedCommandLine.raw;
|
|
70
|
+
const { include, exclude } = fileSpec;
|
|
71
|
+
if ((include == null ? void 0 : include.length) === 0) {
|
|
72
|
+
return [];
|
|
73
|
+
}
|
|
74
|
+
return ts.sys.readDirectory(project.getCurrentDirectory() || process.cwd(), [".astro"], exclude, include).map(ts.server.toNormalizedPath);
|
|
75
|
+
}
|
|
61
76
|
// Annotate the CommonJS export names for ESM import in node:
|
|
62
77
|
0 && (module.exports = {
|
|
63
78
|
ensureRealAstroFilePath,
|
|
79
|
+
getConfigPathForProject,
|
|
64
80
|
isAstroFilePath,
|
|
65
|
-
isInGeneratedCode,
|
|
66
|
-
isNoTextSpanInGeneratedCode,
|
|
67
81
|
isNotNullOrUndefined,
|
|
68
82
|
isVirtualAstroFilePath,
|
|
83
|
+
readProjectAstroFilesFromFs,
|
|
69
84
|
replaceDeep,
|
|
70
85
|
toRealAstroFilePath
|
|
71
86
|
});
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3V0aWxzLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQU8sU0FBUyxnQkFBZ0IsVUFBa0I7QUFDakQsU0FBTyxTQUFTLFNBQVMsUUFBUTtBQUNsQztBQUVPLFNBQVMsdUJBQXVCLFVBQWtCO0FBQ3hELFNBQU8sU0FBUyxTQUFTLFdBQVc7QUFDckM7QUFFTyxTQUFTLG9CQUFvQixVQUFrQjtBQUNyRCxTQUFPLFNBQVMsTUFBTSxHQUFHLENBQUMsTUFBTSxNQUFNO0FBQ3ZDO0FBRU8sU0FBUyx3QkFBd0IsVUFBa0I7QUFDekQsU0FBTyx1QkFBdUIsUUFBUSxJQUFJLG9CQUFvQixRQUFRLElBQUk7QUFDM0U7QUFFTyxTQUFTLHFCQUF3QixLQUFxQztBQUM1RSxTQUFPLFFBQVEsVUFBYSxRQUFRO0FBQ3JDO0FBS08sU0FBUyxZQUNmLEtBQ0EsV0FDQSxnQkFDSTtBQUNKLFNBQU8sYUFBYSxHQUFHO0FBRXZCLFdBQVMsYUFBYSxNQUFnQjtBQUNyQyxRQUFJLE9BQU8sU0FBUyxVQUFVO0FBQzdCLGFBQU8sS0FBSyxRQUFRLFdBQVcsY0FBYztBQUFBLElBQzlDO0FBQ0EsUUFBSSxNQUFNLFFBQVEsSUFBSSxHQUFHO0FBQ3hCLGFBQU8sS0FBSyxJQUFJLENBQUMsVUFBVSxhQUFhLEtBQUssQ0FBQztBQUFBLElBQy9DO0FBQ0EsUUFBSSxPQUFPLFNBQVMsVUFBVTtBQUM3QixhQUFPLE9BQU8sS0FBSyxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksUUFBUTtBQUM1QyxXQUFHLE9BQU8sYUFBYSxLQUFLLElBQUk7QUFDaEMsZUFBTztBQUFBLE1BQ1IsR0FBRyxDQUFDLENBQVE7QUFBQSxJQUNiO0FBQ0EsV0FBTztBQUFBLEVBQ1I7QUFDRDtBQUVPLFNBQVMsd0JBQXdCLFNBQTRCO0FBL0NwRTtBQWdEQyxVQUNFLGFBQXdDLDRCQUF4QyxZQUNBLFFBQVEsbUJBQW1CLEVBQVU7QUFFeEM7QUFFTyxTQUFTLDRCQUNmLElBQ0EsU0FDQSxtQkFDQztBQUNELFFBQU0sV0FBd0Isa0JBQWtCO0FBQ2hELFFBQU0sRUFBRSxTQUFTLFFBQVEsSUFBSTtBQUU3QixPQUFJLG1DQUFTLFlBQVcsR0FBRztBQUMxQixXQUFPLENBQUM7QUFBQSxFQUNUO0FBRUEsU0FBTyxHQUFHLElBQ1IsY0FBYyxRQUFRLG9CQUFvQixLQUFLLFFBQVEsSUFBSSxHQUFHLENBQUMsUUFBUSxHQUFHLFNBQVMsT0FBTyxFQUMxRixJQUFJLEdBQUcsT0FBTyxnQkFBZ0I7QUFDakM7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
9
|
+
for (var name in all)
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
17
|
+
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
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
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
25
|
+
var TSXService_exports = {};
|
|
26
|
+
__export(TSXService_exports, {
|
|
27
|
+
convertToTSX: () => convertToTSX
|
|
28
|
+
});
|
|
29
|
+
module.exports = __toCommonJS(TSXService_exports);
|
|
30
|
+
var import_synckit = require("synckit");
|
|
31
|
+
const convertToTSXSync = (0, import_synckit.createSyncFn)(require.resolve("./TSXWorker"));
|
|
32
|
+
function convertToTSX(source, options) {
|
|
33
|
+
return convertToTSXSync(source, options);
|
|
34
|
+
}
|
|
35
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
36
|
+
0 && (module.exports = {
|
|
37
|
+
convertToTSX
|
|
38
|
+
});
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3dvcmtlcnMvVFNYU2VydmljZS50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDQSxxQkFBNkI7QUFFN0IsTUFBTSx1QkFBbUIsNkJBQTZCLDhCQUFjO0FBSzdELFNBQVMsYUFBYSxRQUFnQixTQUE0QztBQUN4RixTQUFPLGlCQUFpQixRQUFRLE9BQU87QUFDeEM7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var import_synckit = require("synckit");
|
|
3
|
+
const dynamicImport = new Function("m", "return import(m)");
|
|
4
|
+
(0, import_synckit.runAsWorker)(async (source, options) => {
|
|
5
|
+
const { convertToTSX } = await dynamicImport("@astrojs/compiler");
|
|
6
|
+
const result = convertToTSX(source, options);
|
|
7
|
+
return result;
|
|
8
|
+
});
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3dvcmtlcnMvVFNYV29ya2VyLnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQUFBLHFCQUE0QjtBQUU1QixNQUFNLGdCQUFnQixJQUFJLFNBQVMsS0FBSyxrQkFBa0I7QUFBQSxJQUMxRCw0QkFBWSxPQUFPLFFBQWdCLFlBQW9DO0FBQ3RFLFFBQU0sRUFBRSxhQUFhLElBQUksTUFBTSxjQUFjLG1CQUFtQjtBQUNoRSxRQUFNLFNBQWMsYUFBYSxRQUFRLE9BQU87QUFDaEQsU0FBTztBQUNSLENBQUM7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@astrojs/ts-plugin",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "A TypeScript Plugin providing Astro intellisense",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "commonjs",
|
|
@@ -10,18 +10,28 @@
|
|
|
10
10
|
"javascript",
|
|
11
11
|
"plugin"
|
|
12
12
|
],
|
|
13
|
-
"scripts": {
|
|
14
|
-
"build": "astro-scripts build \"src/**/*.ts\"",
|
|
15
|
-
"dev": "astro-scripts dev \"src/**/*.ts\""
|
|
16
|
-
},
|
|
17
13
|
"author": "withastro",
|
|
18
14
|
"license": "MIT",
|
|
15
|
+
"dependencies": {
|
|
16
|
+
"@astrojs/compiler": "^0.29.15",
|
|
17
|
+
"@jridgewell/trace-mapping": "^0.3.15",
|
|
18
|
+
"synckit": "^0.8.4"
|
|
19
|
+
},
|
|
19
20
|
"devDependencies": {
|
|
20
|
-
"@
|
|
21
|
-
"@types/
|
|
22
|
-
"
|
|
21
|
+
"@types/chai": "^4.3.0",
|
|
22
|
+
"@types/mocha": "^9.1.1",
|
|
23
|
+
"@types/node": "^16.11.58",
|
|
24
|
+
"@types/vscode": "^1.67.0",
|
|
25
|
+
"@vscode/test-electron": "^2.1.5",
|
|
26
|
+
"astro-scripts": "*",
|
|
27
|
+
"chai": "^4.3.6",
|
|
28
|
+
"glob": "^8.0.3",
|
|
29
|
+
"mocha": "^9.2.2",
|
|
30
|
+
"typescript": "~4.8.2"
|
|
23
31
|
},
|
|
24
|
-
"
|
|
25
|
-
"
|
|
32
|
+
"scripts": {
|
|
33
|
+
"build": "astro-scripts build \"src/**/*.ts\"",
|
|
34
|
+
"dev": "astro-scripts dev \"src/**/*.ts\"",
|
|
35
|
+
"test": "node ./test/runTest.js"
|
|
26
36
|
}
|
|
27
|
-
}
|
|
37
|
+
}
|