@astrojs/ts-plugin 1.9.3 → 1.10.0

package/dist/astro2tsx.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.astro2tsx = void 0;
+exports.astro2tsx = astro2tsx;
 const node_path_1 = __importDefault(require("node:path"));
 const sync_1 = require("@astrojs/compiler/sync");
 const sourcemap_codec_1 = require("@jridgewell/sourcemap-codec");
@@ -53,7 +53,6 @@ function astro2tsx(input, fileName) {
         diagnostics: tsx.diagnostics,
     };
 }
-exports.astro2tsx = astro2tsx;
 function getVirtualFileTSX(input, tsx, fileName) {
     tsx.code = patchTSX(tsx.code, fileName);
     const v3Mappings = (0, sourcemap_codec_1.decode)(tsx.map.mappings);

package/dist/frontmatter.d.ts

@@ -0,0 +1,24 @@
+import { type CodeMapping, type LanguagePlugin, type VirtualCode } from '@volar/language-core';
+import type ts from 'typescript';
+export declare const frontmatterRE: RegExp;
+export type CollectionConfig = {
+    folder: string;
+    config: {
+        collections: {
+            hasSchema: boolean;
+            name: string;
+        }[];
+        entries: Record<string, string>;
+    };
+};
+export declare function getFrontmatterLanguagePlugin(collectionConfigs: CollectionConfig[]): LanguagePlugin<string, FrontmatterHolder>;
+export declare class FrontmatterHolder implements VirtualCode {
+    fileName: string;
+    languageId: string;
+    snapshot: ts.IScriptSnapshot;
+    collection: string | undefined;
+    id: string;
+    mappings: CodeMapping[];
+    embeddedCodes: VirtualCode[];
+    constructor(fileName: string, languageId: string, snapshot: ts.IScriptSnapshot, collection: string | undefined);
+}

package/dist/frontmatter.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FrontmatterHolder = exports.frontmatterRE = void 0;
+exports.getFrontmatterLanguagePlugin = getFrontmatterLanguagePlugin;
+const node_url_1 = require("node:url");
+const yaml2ts_1 = require("@astrojs/yaml2ts");
+const language_core_1 = require("@volar/language-core");
+const SUPPORTED_FRONTMATTER_EXTENSIONS = { md: 'markdown', mdx: 'mdx', mdoc: 'mdoc' };
+const SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS = Object.keys(SUPPORTED_FRONTMATTER_EXTENSIONS);
+const SUPPORTED_FRONTMATTER_EXTENSIONS_VALUES = Object.values(SUPPORTED_FRONTMATTER_EXTENSIONS);
+exports.frontmatterRE = /^---(.*?)^---/ms;
+function getCollectionName(collectionConfigs, fsPath) {
+    for (const collection of collectionConfigs) {
+        if (collection.config.entries[fsPath]) {
+            return collection.config.entries[fsPath];
+        }
+    }
+}
+function getFrontmatterLanguagePlugin(collectionConfigs) {
+    return {
+        getLanguageId(scriptId) {
+            const fileType = SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS.find((ext) => scriptId.endsWith(`.${ext}`));
+            if (fileType) {
+                return SUPPORTED_FRONTMATTER_EXTENSIONS[fileType];
+            }
+        },
+        createVirtualCode(scriptId, languageId, snapshot) {
+            if (SUPPORTED_FRONTMATTER_EXTENSIONS_VALUES.includes(languageId)) {
+                const fileName = scriptId.replace(/\\/g, '/');
+                return new FrontmatterHolder(fileName, languageId, snapshot, 
+                // In TypeScript plugins, unlike in the language server, the scriptId is just a string file path
+                // so we'll have to convert it to a URL to match the collection config entries
+                getCollectionName(collectionConfigs, (0, node_url_1.pathToFileURL)(fileName).toString().toLowerCase()));
+            }
+        },
+        typescript: {
+            extraFileExtensions: SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS.map((ext) => ({
+                extension: ext,
+                isMixedContent: true,
+                scriptKind: 7,
+            })),
+            getServiceScript(astroCode) {
+                for (const code of (0, language_core_1.forEachEmbeddedCode)(astroCode)) {
+                    if (code.id === yaml2ts_1.VIRTUAL_CODE_ID) {
+                        return {
+                            code,
+                            extension: '.ts',
+                            scriptKind: 3,
+                        };
+                    }
+                }
+                return undefined;
+            },
+        },
+    };
+}
+class FrontmatterHolder {
+    constructor(fileName, languageId, snapshot, collection) {
+        this.fileName = fileName;
+        this.languageId = languageId;
+        this.snapshot = snapshot;
+        this.collection = collection;
+        this.id = 'frontmatter-holder';
+        this.mappings = [
+            {
+                sourceOffsets: [0],
+                generatedOffsets: [0],
+                lengths: [this.snapshot.getLength()],
+                data: {
+                    verification: true,
+                    completion: true,
+                    semantic: true,
+                    navigation: true,
+                    structure: true,
+                    format: true,
+                },
+            },
+        ];
+        this.embeddedCodes = [];
+        this.snapshot = snapshot;
+        if (!this.collection)
+            return;
+        const frontmatterContent = exports.frontmatterRE.exec(this.snapshot.getText(0, this.snapshot.getLength()))?.[0];
+        if (!frontmatterContent)
+            return;
+        const yaml2tsResult = (0, yaml2ts_1.yaml2ts)(frontmatterContent, this.collection);
+        this.embeddedCodes.push(yaml2tsResult.virtualCode);
+    }
+}
+exports.FrontmatterHolder = FrontmatterHolder;

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: ts.server.PluginModuleFactory;
+declare const _default: import("typescript").server.PluginModuleFactory;
 export = _default;

package/dist/index.js

@@ -1,6 +1,29 @@
 "use strict";
 const createLanguageServicePlugin_js_1 = require("@volar/typescript/lib/quickstart/createLanguageServicePlugin.js");
+const frontmatter_js_1 = require("./frontmatter.js");
 const language_js_1 = require("./language.js");
-module.exports = (0, createLanguageServicePlugin_js_1.createLanguageServicePlugin)(() => ({
-    languagePlugins: [(0, language_js_1.getLanguagePlugin)()],
-}));
+module.exports = (0, createLanguageServicePlugin_js_1.createLanguageServicePlugin)((ts, info) => {
+    let collectionConfig = undefined;
+    try {
+        const currentDir = info.project.getCurrentDirectory();
+        const fileContent = ts.sys.readFile(currentDir + '/.astro/collections/collections.json');
+        if (fileContent) {
+            collectionConfig = {
+                folder: currentDir,
+                config: JSON.parse(fileContent),
+            };
+        }
+    }
+    catch (err) {
+        // If the file doesn't exist, we don't really care, but if it's something else, we want to know
+        if (err && err.code !== 'ENOENT')
+            console.error(err);
+    }
+    let languagePlugins = [(0, language_js_1.getLanguagePlugin)()];
+    if (collectionConfig) {
+        languagePlugins.push((0, frontmatter_js_1.getFrontmatterLanguagePlugin)([collectionConfig]));
+    }
+    return {
+        languagePlugins,
+    };
+});

package/dist/language.js

@@ -1,7 +1,8 @@
 "use strict";
 /// <reference types="@volar/typescript" />
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AstroVirtualCode = exports.getLanguagePlugin = void 0;
+exports.AstroVirtualCode = void 0;
+exports.getLanguagePlugin = getLanguagePlugin;
 const language_core_1 = require("@volar/language-core");
 const astro2tsx_js_1 = require("./astro2tsx.js");
 function getLanguagePlugin() {
@@ -32,7 +33,6 @@ function getLanguagePlugin() {
         },
     };
 }
-exports.getLanguagePlugin = getLanguagePlugin;
 class AstroVirtualCode {
     constructor(fileName, snapshot) {
         this.fileName = fileName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/ts-plugin",
-  "version": "1.9.3",
+  "version": "1.10.0",
   "description": "A TypeScript Plugin providing Astro intellisense",
   "main": "dist/index.js",
   "type": "commonjs",
@@ -22,10 +22,11 @@
   "author": "withastro",
   "license": "MIT",
   "dependencies": {
-    "@volar/language-core": "~2.4.0-alpha.15",
-    "@volar/typescript": "~2.4.0-alpha.15",
     "@astrojs/compiler": "^2.10.3",
+    "@astrojs/yaml2ts": "^0.2.0",
     "@jridgewell/sourcemap-codec": "^1.4.15",
+    "@volar/language-core": "~2.4.0-alpha.15",
+    "@volar/typescript": "~2.4.0-alpha.15",
     "semver": "^7.3.8",
     "vscode-languageserver-textdocument": "^1.0.11"
   },
@@ -36,7 +37,9 @@
     "@types/semver": "^7.3.13",
     "chai": "^4.3.7",
     "glob": "^8.0.3",
-    "mocha": "^10.2.0"
+    "mocha": "^10.2.0",
+    "vscode-uri": "^3.0.8",
+    "typescript": "^5.5.4"
   },
   "scripts": {
     "build": "tsc",