modern-monaco 0.2.1 → 0.3.0

package/dist/index.mjs

@@ -1,4 +1,4 @@
-// node_modules/.pnpm/tm-themes@1.10.9/node_modules/tm-themes/themes/vitesse-dark.json
+// node_modules/.pnpm/tm-themes@1.10.12/node_modules/tm-themes/themes/vitesse-dark.json
 var vitesse_dark_default = {
   colors: {
     "activityBar.activeBorder": "#4d9375",
@@ -693,29 +693,7 @@ var vitesse_dark_default = {
   type: "dark"
 };
 
-// src/lsp/index.ts
-var builtinLSPProviders = {
-  html: {
-    // @ts-expect-error 'setup.js' is generated at build time
-    import: () => import("./lsp/html/setup.mjs")
-  },
-  css: {
-    aliases: ["less", "sass"],
-    // @ts-expect-error 'setup.js' is generated at build time
-    import: () => import("./lsp/css/setup.mjs")
-  },
-  json: {
-    // @ts-expect-error 'setup.js' is generated at build time
-    import: () => import("./lsp/json/setup.mjs")
-  },
-  typescript: {
-    aliases: ["javascript", "jsx", "tsx"],
-    // @ts-expect-error 'setup.js' is generated at build time
-    import: () => import("./lsp/typescript/setup.mjs")
-  }
-};
-
-// node_modules/.pnpm/tm-grammars@1.24.10/node_modules/tm-grammars/grammars/html.json
+// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/html.json
 var html_default = {
   displayName: "HTML",
   injections: {
@@ -3344,7 +3322,7 @@ var html_default = {
   scopeName: "text.html.basic"
 };
 
-// node_modules/.pnpm/tm-grammars@1.24.10/node_modules/tm-grammars/grammars/css.json
+// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/css.json
 var css_default = {
   displayName: "CSS",
   name: "css",
@@ -5206,7 +5184,7 @@ var css_default = {
   scopeName: "source.css"
 };
 
-// node_modules/.pnpm/tm-grammars@1.24.10/node_modules/tm-grammars/grammars/javascript.json
+// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/javascript.json
 var javascript_default = {
   displayName: "JavaScript",
   name: "javascript",
@@ -11204,7 +11182,7 @@ var javascript_default = {
   scopeName: "source.js"
 };
 
-// node_modules/.pnpm/tm-grammars@1.24.10/node_modules/tm-grammars/grammars/typescript.json
+// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/typescript.json
 var typescript_default = {
   displayName: "TypeScript",
   name: "typescript",
@@ -16953,7 +16931,7 @@ var typescript_default = {
   scopeName: "source.ts"
 };
 
-// node_modules/.pnpm/tm-grammars@1.24.10/node_modules/tm-grammars/grammars/jsx.json
+// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/jsx.json
 var jsx_default = {
   displayName: "JSX",
   name: "jsx",
@@ -22951,7 +22929,7 @@ var jsx_default = {
   scopeName: "source.js.jsx"
 };
 
-// node_modules/.pnpm/tm-grammars@1.24.10/node_modules/tm-grammars/grammars/tsx.json
+// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/tsx.json
 var tsx_default = {
   displayName: "TSX",
   name: "tsx",
@@ -28949,7 +28927,7 @@ var tsx_default = {
   scopeName: "source.tsx"
 };
 
-// node_modules/.pnpm/tm-grammars@1.24.10/node_modules/tm-grammars/grammars/json.json
+// node_modules/.pnpm/tm-grammars@1.25.3/node_modules/tm-grammars/grammars/json.json
 var json_default = {
   displayName: "JSON",
   name: "json",
@@ -29343,15 +29321,15 @@ var syntaxes = [
 ];
 
 // src/index.ts
-import { registerLSPProvider, registerSyntax, registerTheme } from "./core.mjs";
+import { registerSyntax, registerTheme } from "./core.mjs";
 import { errors, hydrate, init, lazy, Workspace } from "./core.mjs";
-for (const [lang, provider] of Object.entries(builtinLSPProviders)) {
-  registerLSPProvider(lang, provider);
-}
 for (const syntax of syntaxes) {
   registerSyntax(syntax);
 }
 registerTheme(vitesse_dark_default);
+Object.assign(globalThis, {
+  MonacoEnvironment: { useBuiltinLSP: true }
+});
 export {
   Workspace,
   errors,

package/dist/lsp/{language-service.mjs → client.mjs}

@@ -1181,7 +1181,7 @@ var Is;
   Is2.typedArray = typedArray;
 })(Is || (Is = {}));
 
-// src/lsp/language-service.ts
+// src/lsp/client.ts
 import { cache } from "../cache.mjs";
 var monaco;
 function init(monacoNS) {
@@ -1200,6 +1200,18 @@ function createHost(workspace) {
     }
   } : /* @__PURE__ */ Object.create(null);
 }
+async function walkFS(fs, dir = "/") {
+  const entries = [];
+  for (const [name, type] of await fs.readDirectory(dir || "/")) {
+    const path = (dir.endsWith("/") ? dir.slice(0, -1) : dir) + "/" + name;
+    if (type === 2) {
+      entries.push(...await walkFS(fs, path));
+    } else {
+      entries.push(path);
+    }
+  }
+  return entries;
+}
 function lspRequest(req, token) {
   return new Promise((resolve, reject) => {
     if (token.isCancellationRequested) {
@@ -1222,7 +1234,7 @@ function registerBasicFeatures(languageId, worker, completionTriggerCharacters,
   const { editor, languages } = monaco;
   const onDispose = async (model) => {
     const workerProxy = await worker.withSyncedResources([]);
-    workerProxy.removeDocumentCache(model.uri.toString());
+    workerProxy.releaseDocument(model.uri.toString());
   };
   editor.onDidChangeModelLanguage(({ model, oldLanguage }) => {
     if (oldLanguage === languageId) {
@@ -1263,12 +1275,6 @@ function registerBasicFeatures(languageId, worker, completionTriggerCharacters,
         worker.getProxy().then((proxy) => proxy.fsNotify(kind, path, type));
       }
     });
-    (async () => {
-      const workerProxy = await worker.getProxy();
-      for await (const [path, type] of workspace.fs.walk()) {
-        workerProxy.fsNotify("create", path, type);
-      }
-    })();
   }
 }
 function registerDiagnostics(languageId, worker) {
@@ -2240,5 +2246,6 @@ export {
   registerColorPresentation,
   registerDocumentLinks,
   registerEmbedded,
-  registerSignatureHelp
+  registerSignatureHelp,
+  walkFS
 };

package/dist/lsp/css/setup.mjs

@@ -1,5 +1,5 @@
 // src/lsp/css/setup.ts
-import * as ls from "../language-service.mjs";
+import * as client from "../client.mjs";
 async function setup(monaco, languageId, languageSettings, formattingOptions, workspace) {
   const { tabSize, insertSpaces, insertFinalNewline, trimFinalNewlines } = formattingOptions ?? {};
   const createData = {
@@ -18,26 +18,26 @@ async function setup(monaco, languageId, languageSettings, formattingOptions, wo
       spaceAroundSelectorSeparator: false,
       braceStyle: "collapse"
     },
-    workspace: !!workspace
+    fs: workspace ? await client.walkFS(workspace.fs, "/") : void 0
   };
   const worker = monaco.editor.createWebWorker({
     worker: getWorker(createData),
-    host: ls.createHost(workspace)
+    host: client.createHost(workspace)
   });
-  ls.registerBasicFeatures(languageId, worker, ["/", "-", ":", "("], workspace);
-  ls.registerCodeAction(languageId, worker);
-  ls.registerColorPresentation(languageId, worker);
-  ls.registerDocumentLinks(languageId, worker);
+  client.registerBasicFeatures(languageId, worker, ["/", "-", ":", "("], workspace);
+  client.registerCodeAction(languageId, worker);
+  client.registerColorPresentation(languageId, worker);
+  client.registerDocumentLinks(languageId, worker);
 }
 function createWebWorker() {
   const workerUrl = new URL("./worker.mjs", import.meta.url);
   if (workerUrl.origin !== location.origin) {
     return new Worker(
       URL.createObjectURL(new Blob([`import "${workerUrl.href}"`], { type: "application/javascript" })),
-      { type: "module" }
+      { type: "module", name: "css-worker" }
     );
   }
-  return new Worker(new URL("./worker.mjs", import.meta.url), { type: "module" });
+  return new Worker(workerUrl, { type: "module", name: "css-worker" });
 }
 function getWorker(createData) {
   const worker = createWebWorker();