modern-monaco 0.3.8 → 0.4.1

package/dist/workspace.mjs

@@ -70,12 +70,19 @@ var Workspace = class {
   get viewState() {
     return this._viewState;
   }
-  async openTextDocument(uri, content) {
+  async openTextDocument(uri, content, editor) {
     const monaco = await this._monaco.promise;
-    return this._openTextDocument(uri, monaco.editor.getEditors()[0], void 0, content);
+    const getEditor = async () => {
+      const editors = monaco.editor.getEditors();
+      const editor2 = editors.find((e) => e.hasWidgetFocus() || e.hasTextFocus()) ?? editors[0];
+      if (!editor2) {
+        return new Promise((resolve) => setTimeout(() => resolve(getEditor()), 100));
+      }
+      return editor2;
+    };
+    return this._openTextDocument(monaco, editor ?? await getEditor(), uri, void 0, content);
   }
-  async _openTextDocument(uri, editor, selectionOrPosition, readonlyContent) {
-    const monaco = await this._monaco.promise;
+  async _openTextDocument(monaco, editor, uri, selectionOrPosition, readonlyContent) {
     const fs = this._fs;
     const href = normalizeURL(uri).href;
     const content = readonlyContent ?? await fs.readTextFile(href);
@@ -102,34 +109,32 @@ var Workspace = class {
       });
       Reflect.set(model, "__OB__", true);
     }
-    if (editor) {
-      editor.setModel(model);
-      editor.updateOptions({ readOnly: typeof readonlyContent === "string" });
-      if (typeof readonlyContent === "string") {
-        const disposable = editor.onDidChangeModel(() => {
-          model.dispose();
-          disposable.dispose();
-        });
+    editor.setModel(model);
+    editor.updateOptions({ readOnly: typeof readonlyContent === "string" });
+    if (typeof readonlyContent === "string") {
+      const disposable = editor.onDidChangeModel(() => {
+        model.dispose();
+        disposable.dispose();
+      });
+    }
+    if (selectionOrPosition) {
+      if ("startLineNumber" in selectionOrPosition) {
+        editor.setSelection(selectionOrPosition);
+      } else {
+        editor.setPosition(selectionOrPosition);
       }
-      if (selectionOrPosition) {
-        if ("startLineNumber" in selectionOrPosition) {
-          editor.setSelection(selectionOrPosition);
-        } else {
-          editor.setPosition(selectionOrPosition);
-        }
-        const pos = editor.getPosition();
-        if (pos) {
-          const svp = editor.getScrolledVisiblePosition(new monaco.Position(pos.lineNumber - 7, pos.column));
-          if (svp) {
-            editor.setScrollTop(svp.top);
-          }
+      const pos = editor.getPosition();
+      if (pos) {
+        const svp = editor.getScrolledVisiblePosition(new monaco.Position(pos.lineNumber - 7, pos.column));
+        if (svp) {
+          editor.setScrollTop(svp.top);
         }
-      } else if (viewState) {
-        editor.restoreViewState(viewState);
-      }
-      if (this._history.state.current !== href) {
-        this._history.push(href);
       }
+    } else if (viewState) {
+      editor.restoreViewState(viewState);
+    }
+    if (this._history.state.current !== href) {
+      this._history.push(href);
     }
     return model;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-monaco",
   "description": "A modern version of Monaco Editor",
-  "version": "0.3.8",
+  "version": "0.4.1",
   "type": "module",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
@@ -70,23 +70,23 @@
   },
   "sideEffects": ["dist/index.mjs"],
   "devDependencies": {
-    "@esm.sh/import-map": "0.1.1",
-    "@shikijs/core": "3.22.0",
-    "@shikijs/engine-oniguruma": "3.22.0",
-    "@types/bun": "1.3.9",
-    "esbuild": "0.27.3",
+    "@esm.sh/import-map": "0.4.0",
+    "@shikijs/core": "4.0.2",
+    "@shikijs/engine-oniguruma": "4.0.2",
+    "@types/bun": "1.3.13",
+    "esbuild": "0.28.0",
     "monaco-editor-core": "0.55.1",
-    "tm-grammars": "1.30.8",
-    "tm-themes": "1.11.1",
-    "typescript": "5.9.3",
-    "vscode-css-languageservice": "6.3.9",
-    "vscode-html-languageservice": "5.6.1",
-    "vscode-json-languageservice": "5.7.1",
+    "tm-grammars": "1.31.15",
+    "tm-themes": "1.12.2",
+    "typescript": "6.0.3",
+    "vscode-css-languageservice": "6.3.10",
+    "vscode-html-languageservice": "5.6.2",
+    "vscode-json-languageservice": "5.7.2",
     "vscode-languageserver-textdocument": "1.0.12",
     "vscode-languageserver-types": "3.17.5"
   },
   "peerDependencies": {
-    "typescript": ">= 5.0.0"
+    "typescript": ">= 6.0.0"
   },
   "repository": {
     "type": "git",

package/types/lsp.d.ts

@@ -53,10 +53,27 @@ export interface IReference {
   url: string;
 }
 
+export interface MarkupContent {
+  kind: "plaintext" | "markdown";
+  value: string;
+}
+
+export interface BaselineStatus {
+  baseline: false | "low" | "high";
+  baseline_low_date?: string;
+  baseline_high_date?: string;
+}
+
 export interface IData {
   name: string;
-  description?: string;
+  description?: string | MarkupContent;
   references?: IReference[];
+  browsers?: string[];
+  status?: BaselineStatus;
+}
+
+export interface ICSSData extends IData {
+  values?: IData[];
 }
 
 export interface IAttributeData extends IData {
@@ -64,6 +81,11 @@ export interface IAttributeData extends IData {
   values?: IData[];
 }
 
+export interface IValueSet {
+  name: string;
+  values: IData[];
+}
+
 export interface ITagData extends IData {
   attributes: IAttributeData[];
   void?: boolean;
@@ -92,31 +114,63 @@ export interface LSPConfig extends LSPLanguageConfig {
 
 export type SeverityLevel = "error" | "warning" | "ignore";
 
+export interface HTMLDataV1 {
+  version: 1 | 1.1;
+  tags?: ITagData[];
+  globalAttributes?: IAttributeData[];
+  valueSets?: IValueSet[];
+}
+
 export interface CSSDataV1 {
   version: 1 | 1.1;
-  properties?: (IData & Record<string, unknown>)[];
-  atDirectives?: (IData & Record<string, unknown>)[];
-  pseudoClasses?: (IData & Record<string, unknown>)[];
-  pseudoElements?: (IData & Record<string, unknown>)[];
+  properties?: (ICSSData & Record<string, unknown>)[];
+  atDirectives?: (ICSSData & Record<string, unknown>)[];
+  pseudoClasses?: (ICSSData & Record<string, unknown>)[];
+  pseudoElements?: (ICSSData & Record<string, unknown>)[];
+}
+
+export interface DiagnosticsOptions {
+  validate?: boolean;
+  codesToIgnore?: (string | number)[];
+  filter?: (diagnostic: monacoNS.editor.IMarkerData) => boolean;
 }
 
 declare global {
   interface LSPLanguageConfig {
+    /** HTML language configuration. */
     html?: {
-      attributeDefaultValue?: "empty" | "singlequotes" | "doublequotes";
+      /** Defines whether the standard HTML tags are shown. Default is true. */
+      useDefaultDataProvider?: boolean;
+      /** Provides a set of custom data providers. */
+      dataProviders?: { [providerId: string]: HTMLDataV1 };
+      /** Provides a set of custom HTML tags. */
       customTags?: ITagData[];
+      /** The default value for empty attributes. Default is "empty". */
+      attributeDefaultValue?: "empty" | "singlequotes" | "doublequotes";
+      /** Whether to hide end tag suggestions. Default is false. */
       hideEndTagSuggestions?: boolean;
+      /** Whether to hide auto complete proposals. Default is false. */
       hideAutoCompleteProposals?: boolean;
+      /** Whether to show the import map code lens. Default is true. */
+      importMapCodeLens?: boolean;
+      /** Options for the diagnostics. */
+      diagnosticsOptions?: DiagnosticsOptions;
     };
+    /** CSS language configuration. */
     css?: {
       /** Defines whether the standard CSS properties, at-directives, pseudoClasses and pseudoElements are shown. */
       useDefaultDataProvider?: boolean;
       /** Provides a set of custom data providers. */
       dataProviders?: { [providerId: string]: CSSDataV1 };
+      /** A list of valid properties that not defined in the standard CSS properties. */
+      validProperties?: string[];
+      /** Options for the diagnostics. */
+      diagnosticsOptions?: DiagnosticsOptions;
     };
+    /** JSON language configuration. */
     json?: {
-      /** By default, the validator will return syntax and semantic errors. Set to false to disable the validator. */
-      validate?: boolean;
+      /** Whether to show the import map code lens. Default is true. */
+      importMapCodeLens?: boolean;
       /** Defines whether comments are allowed or not. Default is disallowed. */
       allowComments?: boolean;
       /** A list of known schemas and/or associations of schemas to file names. */
@@ -129,12 +183,17 @@ declare global {
       schemaValidation?: SeverityLevel;
       /** The severity of problems that occurred when resolving and loading schemas. Default is "warning". */
       schemaRequest?: SeverityLevel;
+      /** Options for the diagnostics. */
+      diagnosticsOptions?: DiagnosticsOptions;
     };
+    /** TypeScript language configuration. */
     typescript?: {
+      /** The default import maps. */
+      importMap?: ImportMap;
       /** The compiler options. */
       compilerOptions?: ts.CompilerOptions;
-      /** The global import maps. */
-      importMap?: ImportMap;
+      /** Options for the diagnostics. */
+      diagnosticsOptions?: DiagnosticsOptions;
     };
   }
 }

package/types/textmate.d.ts

@@ -1,2 +1,2 @@
-export type TextmateThemeName = "andromeeda" | "aurora-x" | "ayu-dark" | "ayu-light" | "ayu-mirage" | "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" | "horizon" | "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" | "night-owl-light" | "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";
-export type TextmateGrammarName = "abap" | "actionscript-3" | "ada" | "angular-html" | "angular-ts" | "apache" | "apex" | "apl" | "applescript" | "ara" | "asciidoc" | "asm" | "astro" | "awk" | "ballerina" | "bat" | "beancount" | "berry" | "bibtex" | "bicep" | "blade" | "bsl" | "c" | "c3" | "cadence" | "cairo" | "clarity" | "clojure" | "cmake" | "cobol" | "codeowners" | "codeql" | "coffee" | "common-lisp" | "coq" | "cpp" | "crystal" | "csharp" | "css" | "csv" | "cue" | "cypher" | "d" | "dart" | "dax" | "desktop" | "diff" | "docker" | "dotenv" | "dream-maker" | "edge" | "elixir" | "elm" | "emacs-lisp" | "erb" | "erlang" | "fennel" | "fish" | "fluent" | "fortran-fixed-form" | "fortran-free-form" | "fsharp" | "gdresource" | "gdscript" | "gdshader" | "genie" | "gherkin" | "git-commit" | "git-rebase" | "gleam" | "glimmer-js" | "glimmer-ts" | "glsl" | "gn" | "gnuplot" | "go" | "graphql" | "groovy" | "hack" | "haml" | "handlebars" | "haskell" | "haxe" | "hcl" | "hjson" | "hlsl" | "html" | "html-derivative" | "http" | "hurl" | "hxml" | "hy" | "imba" | "ini" | "java" | "javascript" | "jinja" | "jison" | "json" | "json5" | "jsonc" | "jsonl" | "jsonnet" | "jssm" | "jsx" | "julia" | "kdl" | "kotlin" | "kusto" | "latex" | "lean" | "less" | "liquid" | "llvm" | "log" | "logo" | "lua" | "luau" | "make" | "markdown" | "marko" | "matlab" | "mdc" | "mdx" | "mermaid" | "mipsasm" | "mojo" | "moonbit" | "move" | "narrat" | "nextflow" | "nginx" | "nim" | "nix" | "nushell" | "objective-c" | "objective-cpp" | "ocaml" | "odin" | "openscad" | "pascal" | "perl" | "php" | "pkl" | "plsql" | "po" | "polar" | "postcss" | "powerquery" | "powershell" | "prisma" | "prolog" | "proto" | "pug" | "puppet" | "purescript" | "python" | "qml" | "qmldir" | "qss" | "r" | "racket" | "raku" | "razor" | "reg" | "regexp" | "rel" | "riscv" | "ron" | "rosmsg" | "rst" | "ruby" | "rust" | "sas" | "sass" | "scala" | "scheme" | "scss" | "sdbl" | "shaderlab" | "shellscript" | "shellsession" | "smalltalk" | "solidity" | "soy" | "sparql" | "splunk" | "sql" | "ssh-config" | "stata" | "stylus" | "surrealql" | "svelte" | "swift" | "system-verilog" | "systemd" | "talonscript" | "tasl" | "tcl" | "templ" | "terraform" | "tex" | "toml" | "ts-tags" | "tsv" | "tsx" | "turtle" | "twig" | "typescript" | "typespec" | "typst" | "v" | "vala" | "vb" | "verilog" | "vhdl" | "viml" | "vue" | "vue-html" | "vue-vine" | "vyper" | "wasm" | "wenyan" | "wgsl" | "wikitext" | "wit" | "wolfram" | "xml" | "xsl" | "yaml" | "zenscript" | "zig";
+export type TextmateThemeName = "andromeeda" | "aurora-x" | "ayu-dark" | "ayu-light" | "ayu-mirage" | "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" | "horizon" | "horizon-bright" | "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" | "night-owl-light" | "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";
+export type TextmateGrammarName = "abap" | "actionscript-3" | "ada" | "angular-html" | "angular-ts" | "apache" | "apex" | "apl" | "applescript" | "ara" | "asciidoc" | "asm" | "astro" | "awk" | "ballerina" | "bat" | "beancount" | "berry" | "bibtex" | "bicep" | "bird2" | "blade" | "bsl" | "c" | "c3" | "cadence" | "cairo" | "clarity" | "clojure" | "cmake" | "cobol" | "codeowners" | "codeql" | "coffee" | "common-lisp" | "coq" | "cpp" | "crystal" | "csharp" | "css" | "csv" | "cue" | "cypher" | "d" | "dart" | "dax" | "desktop" | "diff" | "docker" | "dotenv" | "dream-maker" | "edge" | "elixir" | "elm" | "emacs-lisp" | "erb" | "erlang" | "fennel" | "fish" | "fluent" | "fortran-fixed-form" | "fortran-free-form" | "fsharp" | "gdresource" | "gdscript" | "gdshader" | "genie" | "gherkin" | "git-commit" | "git-rebase" | "gleam" | "glimmer-js" | "glimmer-ts" | "glsl" | "gn" | "gnuplot" | "go" | "graphql" | "groovy" | "hack" | "haml" | "handlebars" | "haskell" | "haxe" | "hcl" | "hjson" | "hlsl" | "html" | "html-derivative" | "http" | "hurl" | "hxml" | "hy" | "imba" | "ini" | "java" | "javascript" | "jinja" | "jison" | "json" | "json5" | "jsonc" | "jsonl" | "jsonnet" | "jssm" | "jsx" | "julia" | "just" | "kdl" | "kotlin" | "kusto" | "latex" | "lean" | "less" | "liquid" | "llvm" | "log" | "logo" | "lua" | "luau" | "make" | "markdown" | "marko" | "matlab" | "mdc" | "mdx" | "mermaid" | "mipsasm" | "mojo" | "moonbit" | "move" | "narrat" | "nextflow" | "nextflow-groovy" | "nginx" | "nim" | "nix" | "nushell" | "objective-c" | "objective-cpp" | "ocaml" | "odin" | "openscad" | "pascal" | "perl" | "php" | "pkl" | "plsql" | "po" | "polar" | "postcss" | "powerquery" | "powershell" | "prisma" | "prolog" | "proto" | "pug" | "puppet" | "purescript" | "python" | "qml" | "qmldir" | "qss" | "r" | "racket" | "raku" | "razor" | "reg" | "regexp" | "rel" | "riscv" | "ron" | "rosmsg" | "rst" | "ruby" | "rust" | "sas" | "sass" | "scala" | "scheme" | "scss" | "sdbl" | "shaderlab" | "shellscript" | "shellsession" | "smalltalk" | "solidity" | "soy" | "sparql" | "splunk" | "sql" | "ssh-config" | "stata" | "stylus" | "surrealql" | "svelte" | "swift" | "system-verilog" | "systemd" | "talonscript" | "tasl" | "tcl" | "templ" | "terraform" | "tex" | "toml" | "ts-tags" | "tsv" | "tsx" | "turtle" | "twig" | "typescript" | "typespec" | "typst" | "v" | "vala" | "vb" | "verilog" | "vhdl" | "viml" | "vue" | "vue-html" | "vue-vine" | "vyper" | "wasm" | "wenyan" | "wgsl" | "wikitext" | "wit" | "wolfram" | "xml" | "xsl" | "yaml" | "zenscript" | "zig";

package/types/vscode.d.ts

@@ -229,6 +229,12 @@ export interface QuickPickOptions {
    */
   placeHolder?: string;
 
+  /**
+   * Optional text that provides instructions or context to the user.
+   * The prompt is displayed below the input box and above the list of items.
+   */
+  prompt?: string;
+
   /**
    * Set to `true` to keep the picker open when focus moves to another part of the editor or to another window.
    * This setting is ignored on iPad and is always false.

package/types/workspace.d.ts

@@ -20,7 +20,7 @@ export class Workspace {
   readonly fs: FileSystem;
   readonly history: WorkspaceHistory;
   readonly viewState: WorkspaceViewState;
-  openTextDocument(uri: string | URL, content?: string): Promise<editor.ITextModel>;
+  openTextDocument(uri: string | URL, content?: string, editor?: editor.ICodeEditor): Promise<editor.ITextModel>;
   showInputBox: typeof showInputBox;
   showQuickPick: typeof showQuickPick;
 }