modern-monaco 0.0.0-beta.5 → 0.1.1

package/dist/shiki.js

@@ -10,7 +10,7 @@ var define_TM_GRAMMARS_default = [{ name: "abap", scopeName: "source.abap" }, {
 // <define:TM_THEMES>
 var define_TM_THEMES_default = ["andromeeda", "aurora-x", "ayu-dark", "catppuccin-frappe", "catppuccin-latte", "catppuccin-macchiato", "catppuccin-mocha", "dark-plus", "dracula", "dracula-soft", "everforest-dark", "everforest-light", "github-dark", "github-dark-default", "github-dark-dimmed", "github-dark-high-contrast", "github-light", "github-light-default", "github-light-high-contrast", "gruvbox-dark-hard", "gruvbox-dark-medium", "gruvbox-dark-soft", "gruvbox-light-hard", "gruvbox-light-medium", "gruvbox-light-soft", "houston", "kanagawa-dragon", "kanagawa-lotus", "kanagawa-wave", "laserwave", "light-plus", "material-theme", "material-theme-darker", "material-theme-lighter", "material-theme-ocean", "material-theme-palenight", "min-dark", "min-light", "monokai", "night-owl", "nord", "one-dark-pro", "one-light", "plastic", "poimandres", "red", "rose-pine", "rose-pine-dawn", "rose-pine-moon", "slack-dark", "slack-ochin", "snazzy-light", "solarized-dark", "solarized-light", "synthwave-84", "tokyo-night", "vesper", "vitesse-black", "vitesse-dark", "vitesse-light"];
 
-// node_modules/.pnpm/@shikijs+types@3.9.1/node_modules/@shikijs/types/dist/index.mjs
+// node_modules/.pnpm/@shikijs+types@3.9.2/node_modules/@shikijs/types/dist/index.mjs
 var ShikiError = class extends Error {
   constructor(message) {
     super(message);
@@ -5405,7 +5405,7 @@ function all(parent) {
   return results.join("");
 }
 
-// node_modules/.pnpm/@shikijs+core@3.9.1/node_modules/@shikijs/core/dist/index.mjs
+// node_modules/.pnpm/@shikijs+core@3.9.2/node_modules/@shikijs/core/dist/index.mjs
 function resolveColorReplacements(theme, options) {
   const replacements = typeof theme === "string" ? {} : { ...theme.colorReplacements };
   const themeName = typeof theme === "string" ? theme : theme.name;
@@ -5700,11 +5700,15 @@ function transformerDecorations() {
           const line = converter.lines[p2.line];
           if (line === void 0)
             throw new ShikiError(`Invalid decoration position ${JSON.stringify(p2)}. Lines length: ${converter.lines.length}`);
-          if (p2.character < 0 || p2.character > line.length)
+          let character = p2.character;
+          if (character < 0)
+            character = line.length + character;
+          if (character < 0 || character > line.length)
             throw new ShikiError(`Invalid decoration position ${JSON.stringify(p2)}. Line ${p2.line} length: ${line.length}`);
           return {
             ...p2,
-            offset: converter.posToIndex(p2.line, p2.character)
+            character,
+            offset: converter.posToIndex(p2.line, character)
           };
         }
       };
@@ -7263,7 +7267,7 @@ async function createHighlighterCore(options) {
   };
 }
 
-// node_modules/.pnpm/@shikijs+engine-oniguruma@3.9.1/node_modules/@shikijs/engine-oniguruma/dist/index.mjs
+// node_modules/.pnpm/@shikijs+engine-oniguruma@3.9.2/node_modules/@shikijs/engine-oniguruma/dist/index.mjs
 var ShikiError3 = class extends Error {
   constructor(message) {
     super(message);
@@ -7707,8 +7711,8 @@ async function createOnigurumaEngine(options) {
   };
 }
 
-// node_modules/.pnpm/tm-grammars@1.24.1/node_modules/tm-grammars/package.json
-var version = "1.24.1";
+// node_modules/.pnpm/tm-grammars@1.24.3/node_modules/tm-grammars/package.json
+var version = "1.24.3";
 
 // node_modules/.pnpm/tm-themes@1.10.7/node_modules/tm-themes/package.json
 var version2 = "1.10.7";

package/dist/ssr/index.js

@@ -31,7 +31,7 @@ async function renderToString(input, options) {
 }
 async function renderToWebComponent(input, options) {
   const prerender = await renderToString(input, options);
-  return '<monaco-editor><script type="application/json" class="monaco-editor-options">' + JSON.stringify([input, options]) + '<\/script><div class="monaco-editor-prerender" style="width:100%;height:100%;">' + prerender + "</div></monaco-editor>";
+  return '<monaco-editor><script type="application/json" class="monaco-editor-options">' + JSON.stringify([input, options]).replaceAll("/", "\\/") + '<\/script><div class="monaco-editor-prerender" style="width:100%;height:100%;">' + prerender + "</div></monaco-editor>";
 }
 
 // src/ssr/index.ts

package/dist/ssr/workerd.js

@@ -30,7 +30,7 @@ async function renderToString(input, options) {
 }
 async function renderToWebComponent(input, options) {
   const prerender = await renderToString(input, options);
-  return '<monaco-editor><script type="application/json" class="monaco-editor-options">' + JSON.stringify([input, options]) + '<\/script><div class="monaco-editor-prerender" style="width:100%;height:100%;">' + prerender + "</div></monaco-editor>";
+  return '<monaco-editor><script type="application/json" class="monaco-editor-options">' + JSON.stringify([input, options]).replaceAll("/", "\\/") + '<\/script><div class="monaco-editor-prerender" style="width:100%;height:100%;">' + prerender + "</div></monaco-editor>";
 }
 
 // src/ssr/workerd.ts

package/dist/workspace.js

@@ -19,64 +19,10 @@ var Workspace = class {
   _viewState;
   _entryFile;
   constructor(options = {}) {
-    const { name = "default", browserHistory, initialFiles, entryFile } = options;
-    const db = new WorkspaceDatabase(
-      name,
-      {
-        name: "fs-meta",
-        keyPath: "url",
-        onCreate: async (store) => {
-          if (initialFiles) {
-            const promises = [];
-            const now = Date.now();
-            const reg = { type: 1, version: 1, ctime: now, mtime: now, size: 0 };
-            const dir = { type: 2, version: 1, ctime: now, mtime: now, size: 0 };
-            for (const [name2, data] of Object.entries(initialFiles)) {
-              const { pathname, href: url } = filenameToURL(name2);
-              let parent = pathname.slice(0, pathname.lastIndexOf("/"));
-              while (parent) {
-                promises.push(
-                  promisifyIDBRequest(
-                    store.put({ url: toURL(parent).href, ...dir })
-                  )
-                );
-                parent = parent.slice(0, parent.lastIndexOf("/"));
-              }
-              promises.push(
-                promisifyIDBRequest(
-                  store.put({ url, ...reg, size: encode(data).byteLength })
-                )
-              );
-            }
-            await Promise.all(promises);
-          }
-        }
-      },
-      {
-        name: "fs-blob",
-        keyPath: "url",
-        onCreate: async (store) => {
-          if (initialFiles) {
-            const promises = [];
-            for (const [name2, data] of Object.entries(initialFiles)) {
-              promises.push(
-                promisifyIDBRequest(
-                  store.put({ url: filenameToURL(name2).href, content: encode(data) })
-                )
-              );
-            }
-            await Promise.all(promises);
-          }
-        }
-      },
-      {
-        name: "viewstate",
-        keyPath: "url"
-      }
-    );
+    const { name = "default", browserHistory, initialFiles, entryFile, customFs } = options;
     this._monaco = promiseWithResolvers();
-    this._fs = new FS(db);
-    this._viewState = new WorkspaceStateStorage(db, "viewstate");
+    this._fs = customFs ?? new FS("modern-monaco-workspace:" + name, initialFiles);
+    this._viewState = new WorkspaceStateStorage("modern-monaco-viewstate:" + name);
     this._entryFile = entryFile;
     if (browserHistory) {
       if (!globalThis.history) {
@@ -170,10 +116,56 @@ var Workspace = class {
   }
 };
 var FS = class {
-  constructor(_db) {
-    this._db = _db;
-  }
   _watchers = /* @__PURE__ */ new Set();
+  _db;
+  constructor(scope, initialFiles) {
+    this._db = new WorkspaceDatabase(scope, {
+      name: "fs-meta",
+      keyPath: "url",
+      onCreate: async (store) => {
+        if (initialFiles) {
+          const promises = [];
+          const now = Date.now();
+          const reg = { type: 1, version: 1, ctime: now, mtime: now, size: 0 };
+          const dir = { type: 2, version: 1, ctime: now, mtime: now, size: 0 };
+          for (const [name, data] of Object.entries(initialFiles)) {
+            const { pathname, href: url } = filenameToURL(name);
+            let parent = pathname.slice(0, pathname.lastIndexOf("/"));
+            while (parent) {
+              promises.push(
+                promisifyIDBRequest(
+                  store.put({ url: toURL(parent).href, ...dir })
+                )
+              );
+              parent = parent.slice(0, parent.lastIndexOf("/"));
+            }
+            promises.push(
+              promisifyIDBRequest(
+                store.put({ url, ...reg, size: encode(data).byteLength })
+              )
+            );
+          }
+          await Promise.all(promises);
+        }
+      }
+    }, {
+      name: "fs-blob",
+      keyPath: "url",
+      onCreate: async (store) => {
+        if (initialFiles) {
+          const promises = [];
+          for (const [name, data] of Object.entries(initialFiles)) {
+            promises.push(
+              promisifyIDBRequest(
+                store.put({ url: filenameToURL(name).href, content: encode(data) })
+              )
+            );
+          }
+          await Promise.all(promises);
+        }
+      }
+    });
+  }
   async _getIdbObjectStore(storeName, readwrite = false) {
     const db = await this._db.open();
     return db.transaction(storeName, readwrite ? "readwrite" : "readonly").objectStore(storeName);
@@ -459,8 +451,8 @@ var ErrorNotFound = class extends Error {
 };
 var WorkspaceDatabase = class {
   _db;
-  constructor(workspaceName, ...stores) {
-    const open = () => openIDB("modern-monaco-workspace/" + workspaceName, 1, ...stores).then((db) => {
+  constructor(name, ...stores) {
+    const open = () => openIDB(name, 1, ...stores).then((db) => {
       db.onclose = () => {
         this._db = open();
       };
@@ -473,18 +465,24 @@ var WorkspaceDatabase = class {
   }
 };
 var WorkspaceStateStorage = class {
-  constructor(_db, _stateName) {
-    this._db = _db;
-    this._stateName = _stateName;
+  #db;
+  constructor(dbName) {
+    this.#db = new WorkspaceDatabase(
+      dbName,
+      {
+        name: "store",
+        keyPath: "url"
+      }
+    );
   }
   async get(uri) {
     const url = toURL(uri).href;
-    const store = (await this._db.open()).transaction(this._stateName, "readonly").objectStore(this._stateName);
+    const store = (await this.#db.open()).transaction("store", "readonly").objectStore("store");
     return promisifyIDBRequest(store.get(url)).then((result) => result?.state);
   }
   async save(uri, state) {
     const url = toURL(uri).href;
-    const store = (await this._db.open()).transaction(this._stateName, "readwrite").objectStore(this._stateName);
+    const store = (await this.#db.open()).transaction("store", "readwrite").objectStore("store");
     await promisifyIDBRequest(store.put({ url, state }));
   }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-monaco",
   "description": "A modern version of Monaco Editor",
-  "version": "0.0.0-beta.5",
+  "version": "0.1.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -65,10 +65,10 @@
   "sideEffects": false,
   "devDependencies": {
     "@esm.sh/import-map": "0.1.1",
-    "@shikijs/core": "3.9.1",
-    "@shikijs/engine-oniguruma": "3.9.1",
+    "@shikijs/core": "3.9.2",
+    "@shikijs/engine-oniguruma": "3.9.2",
     "monaco-editor-core": "0.52.2",
-    "tm-grammars": "1.24.1",
+    "tm-grammars": "1.24.3",
     "tm-themes": "1.10.7",
     "typescript": "5.9.2",
     "vscode-css-languageservice": "6.3.7",

package/types/index.d.ts

@@ -1,7 +1,7 @@
 import type monacoNS from "./monaco.d.ts";
 import type { LSPConfig } from "./lsp.d.ts";
 import type { TextmateGrammarName, TextmateThemeName } from "./textmate.d.ts";
-import type { ErrorNotFound, Workspace } from "./workspace.d.ts";
+import type { ErrorNotFound, FileSystem, Workspace } from "./workspace.d.ts";
 
 type Awaitable<T> = T | Promise<T>;
 type MaybeGetter<T> = Awaitable<MaybeModule<T>> | (() => Awaitable<MaybeModule<T>>);
@@ -60,11 +60,11 @@ export interface InitOptions extends ShikiInitOptions {
 }
 
 export function init(options?: InitOptions): Promise<typeof monacoNS>;
-export function lazy(options?: InitOptions): void;
-export function hydrate(options?: InitOptions): void;
+export function lazy(options?: InitOptions): Promise<void>;
+export function hydrate(options?: InitOptions): Promise<void>;
 
 export const errors: {
   NotFound: ErrorNotFound;
 };
 
-export { Workspace };
+export { Workspace, FileSystem };

package/types/ssr.d.ts

@@ -1,10 +1,9 @@
 import type monacoNS from "./monaco.d.ts";
 import type { ShikiInitOptions } from "./index.d.ts";
 
-export type RenderInput = string | { filename: string; code: string };
+export type RenderInput = string | { filename: string; code: string; version?: number };
 
 export interface RenderOptions extends monacoNS.editor.IStandaloneEditorConstructionOptions {
-  filename?: string;
   fontDigitWidth?: number;
   userAgent?: string;
   shiki?: ShikiInitOptions;

package/types/workspace.d.ts

@@ -14,6 +14,8 @@ export interface WorkspaceInit {
   server?: {
     url: string | URL;
   };
+  /** custom filesystem implementation to override the default IndexedDB filesystem */
+  customFs?: FileSystem;
 }
 
 export class Workspace {
@@ -62,13 +64,13 @@ export interface FileSystem {
   readTextFile(filename: string): Promise<string>;
   rename(oldName: string, newName: string, options?: { overwrite: boolean }): Promise<void>;
   stat(filename: string): Promise<FileStat>;
-  writeFile(filename: string, content: string | Uint8Array): Promise<void>;
+  writeFile(filename: string, content: string | Uint8Array, context?: { isModelContentChange: boolean }): Promise<void>;
   watch(filename: string, options: { recursive: boolean }, handle: FileSystemWatchHandle): () => void;
   watch(filename: string, handle: FileSystemWatchHandle): () => void;
 }
 
 export interface FileSystemWatchHandle {
-  (kind: "create" | "modify" | "remove", filename: string, type?: number): void;
+  (kind: "create" | "modify" | "remove", filename: string, type?: number, context?: { isModelContentChange: boolean }): void;
 }
 
 export class ErrorNotFound extends Error {}