@volar/monaco 2.4.0-alpha.4 → 2.4.0-alpha.5

package/lib/ata.d.ts

@@ -1,3 +1,3 @@
 import type { FileSystem } from '@volar/language-service';
 import type { URI } from 'vscode-uri';
-export declare function createJsDelivrNpmFileSystem(getCdnPath: (uri: URI) => string | undefined, resolvePackageName: (pkgName: string) => string, onFetch?: (paht: string, content: string) => void): FileSystem;
+export declare function createJsDelivrNpmFileSystem(getCdnPath?: (uri: URI) => string | undefined, getPackageVersion?: (pkgName: string) => string | undefined, onFetch?: (path: string, content: string) => void): FileSystem;

package/lib/ata.js

@@ -1,6 +1,13 @@
 const textCache = new Map();
 const jsonCache = new Map();
-export function createJsDelivrNpmFileSystem(getCdnPath, resolvePackageName, onFetch) {
+export function createJsDelivrNpmFileSystem(getCdnPath = (uri) => {
+    if (uri.path === '/node_modules') {
+        return '';
+    }
+    else if (uri.path.startsWith('/node_modules/')) {
+        return uri.path.slice('/node_modules'.length);
+    }
+}, getPackageVersion, onFetch) {
     const fetchResults = new Map();
     const flatResults = new Map();
     return {
@@ -9,6 +16,14 @@ export function createJsDelivrNpmFileSystem(getCdnPath, resolvePackageName, onFe
             if (path === undefined) {
                 return;
             }
+            if (path === '') {
+                return {
+                    type: 2,
+                    size: -1,
+                    ctime: -1,
+                    mtime: -1,
+                };
+            }
             return await _stat(path);
         },
         async readFile(uri) {
@@ -27,15 +42,15 @@ export function createJsDelivrNpmFileSystem(getCdnPath, resolvePackageName, onFe
         },
     };
     async function _stat(path) {
-        const pkgName = getPackageName(path);
-        if (!pkgName || !await isValidPackageName(pkgName)) {
+        const resolved = resolvePackageName(path);
+        if (!resolved || !await isValidPackageName(resolved[1])) {
             return;
         }
-        if (!flatResults.has(pkgName)) {
-            flatResults.set(pkgName, flat(pkgName));
+        if (!flatResults.has(resolved[0])) {
+            flatResults.set(resolved[0], flat(resolved[1], resolved[2]));
         }
-        const flatResult = await flatResults.get(pkgName);
-        const filePath = path.slice(pkgName.length);
+        const flatResult = await flatResults.get(resolved[0]);
+        const filePath = path.slice(resolved[0].length);
         const file = flatResult.find(file => file.name === filePath);
         if (file) {
             return {
@@ -55,15 +70,15 @@ export function createJsDelivrNpmFileSystem(getCdnPath, resolvePackageName, onFe
         }
     }
     async function _readDirectory(path) {
-        const pkgName = getPackageName(path);
-        if (!pkgName || !await isValidPackageName(pkgName)) {
+        const resolved = resolvePackageName(path);
+        if (!resolved || !await isValidPackageName(resolved[1])) {
             return [];
         }
-        if (!flatResults.has(pkgName)) {
-            flatResults.set(pkgName, flat(pkgName));
+        if (!flatResults.has(resolved[0])) {
+            flatResults.set(resolved[0], flat(resolved[1], resolved[2]));
         }
-        const flatResult = await flatResults.get(pkgName);
-        const dirPath = path.slice(pkgName.length);
+        const flatResult = await flatResults.get(resolved[0]);
+        const dirPath = path.slice(resolved[0].length);
         const files = flatResult
             .filter(f => f.name.substring(0, f.name.lastIndexOf('/')) === dirPath)
             .map(f => f.name.slice(dirPath.length + 1));
@@ -76,8 +91,8 @@ export function createJsDelivrNpmFileSystem(getCdnPath, resolvePackageName, onFe
         ];
     }
     async function _readFile(path) {
-        const pkgName = getPackageName(path);
-        if (!pkgName || !await isValidPackageName(pkgName)) {
+        const resolved = resolvePackageName(path);
+        if (!resolved || !await isValidPackageName(resolved[1])) {
             return;
         }
         if (!fetchResults.has(path)) {
@@ -94,13 +109,7 @@ export function createJsDelivrNpmFileSystem(getCdnPath, resolvePackageName, onFe
         }
         return await fetchResults.get(path);
     }
-    async function flat(pkgNameWithVersion) {
-        let pkgName = pkgNameWithVersion;
-        let version;
-        if (pkgNameWithVersion.substring(1).includes('@')) {
-            pkgName = pkgNameWithVersion.substring(0, pkgNameWithVersion.lastIndexOf('@'));
-            version = pkgNameWithVersion.substring(pkgNameWithVersion.lastIndexOf('@') + 1);
-        }
+    async function flat(pkgName, version) {
         version ??= 'latest';
         // resolve latest tag
         if (version === 'latest') {
@@ -117,10 +126,6 @@ export function createJsDelivrNpmFileSystem(getCdnPath, resolvePackageName, onFe
         return flat.files;
     }
     async function isValidPackageName(pkgName) {
-        // @aaa/bbb@latest -> @aaa/bbb
-        if (pkgName.lastIndexOf('@') >= 1) {
-            pkgName = pkgName.substring(0, pkgName.lastIndexOf('@'));
-        }
         // ignore @aaa/node_modules
         if (pkgName.endsWith('/node_modules')) {
             return false;
@@ -155,19 +160,25 @@ export function createJsDelivrNpmFileSystem(getCdnPath, resolvePackageName, onFe
      * "@a/b/c" -> "@a/b"
      * "@a/b@1.2.3/c" -> "@a/b@1.2.3"
      */
-    function getPackageName(path) {
+    function resolvePackageName(path) {
         const parts = path.split('/');
-        let pkgName = parts[0];
-        if (pkgName.startsWith('@')) {
+        let modName = parts[0];
+        if (modName.startsWith('@')) {
             if (!parts[1]) {
-                return undefined;
+                return;
             }
-            pkgName += '/' + parts[1];
+            modName += '/' + parts[1];
+        }
+        let pkgName = modName;
+        let version;
+        if (modName.lastIndexOf('@') >= 1) {
+            pkgName = modName.substring(0, modName.lastIndexOf('@'));
+            version = modName.substring(modName.lastIndexOf('@') + 1);
         }
-        if (resolvePackageName) {
-            pkgName = resolvePackageName(pkgName);
+        if (!version && getPackageVersion) {
+            getPackageVersion?.(pkgName);
         }
-        return pkgName;
+        return [modName, pkgName, version];
     }
 }
 async function fetchText(url) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "2.4.0-alpha.4",
+	"version": "2.4.0-alpha.5",
 	"license": "MIT",
 	"type": "module",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "2.4.0-alpha.4",
-		"@volar/typescript": "2.4.0-alpha.4",
+		"@volar/language-service": "2.4.0-alpha.5",
+		"@volar/typescript": "2.4.0-alpha.5",
 		"monaco-languageserver-types": "^0.3.4",
 		"monaco-types": "^0.1.0",
 		"vscode-uri": "^3.0.8"
@@ -22,5 +22,5 @@
 	"devDependencies": {
 		"monaco-editor-core": "latest"
 	},
-	"gitHead": "8a21a352c664a57eddceb87c5ca6a087d12cba58"
+	"gitHead": "bef4f4bf123264f3b0ce3da11adf1e0da387ce6d"
 }