modern-monaco 0.3.4 → 0.3.5

package/README.md

@@ -309,29 +309,69 @@ You can configure built-in LSPs in the `lazy`, `init`, or `hydrate` functions.
 
 ```js
 lazy({
-  // configure LSP for each language
   lsp: {
+    // formatting options for all languages
+    formatting: {/* ... */},
+    // configure LSP for languages
     html: {/* ... */},
+    css: {/* ... */},
     json: {/* ... */},
     typescript: {/* ... */},
   },
 });
 ```
 
-The `LSPLanguageConfig` interface is defined as:
+The `LSPConfig` interface is defined as:
 
 ```ts
-export interface LSPLanguageConfig {
+export interface LSPConfig {
+  /** Formatting options. */
+  formatting?: {
+    /** Size of a tab in spaces. Default: 4. */
+    tabSize?: number;
+    /** Prefer spaces over tabs. Default: true.*/
+    insertSpaces?: boolean;
+    /** Trim trailing whitespace on a line. Default: true. */
+    trimTrailingWhitespace?: boolean;
+    /** Insert a newline character at the end of the file if one does not exist. Default: false. */
+    insertFinalNewline?: boolean;
+    /** Trim all newlines after the final newline at the end of the file. Default: false. */
+    trimFinalNewlines?: boolean;
+    /** Semicolon preference for JavaScript and TypeScript. Default: "insert". */
+    semicolon?: "ignore" | "insert" | "remove";
+  }
+  /** HTML language configuration. */
   html?: {
     attributeDefaultValue?: "empty" | "singlequotes" | "doublequotes";
     customTags?: ITagData[];
     hideAutoCompleteProposals?: boolean;
+    hideEndTagSuggestions?: boolean;
   };
-  css?: {};
+  /** 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 };
+  };
+  /** JSON language configuration. */
   json?: {
-    /** JSON schemas for JSON language service. */
-    schemas?: JSONSchemaSource[];
+      /** By default, the validator will return syntax and semantic errors. Set to false to disable the validator. */
+      validate?: 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. */
+      schemas?: JSONSchemaSource[];
+      /** The severity of reported comments. Default is "error". */
+      comments?: SeverityLevel;
+      /** The severity of reported trailing commas. Default is "error". */
+      trailingCommas?: SeverityLevel;
+      /** The severity of problems from schema validation. Default is "warning". */
+      schemaValidation?: SeverityLevel;
+      /** The severity of problems that occurred when resolving and loading schemas. Default is "warning". */
+      schemaRequest?: SeverityLevel;
   };
+  /** TypeScript language configuration. */
   typescript?: {
     /** The compiler options. */
     compilerOptions?: ts.CompilerOptions;

package/dist/core.mjs

@@ -40,7 +40,7 @@ function isObject(v) {
 }
 
 // package.json
-var version = "0.3.4";
+var version = "0.3.5";
 
 // src/core.ts
 import { getExtnameFromLanguageId, getLanguageIdFromPath, grammars, initShiki, setDefaultWasmLoader, themes } from "./shiki.mjs";

package/dist/lsp/css/setup.mjs

@@ -5,8 +5,8 @@ async function setup(monaco, languageId, languageSettings, formattingOptions, wo
   const createData = {
     language: languageId,
     data: {
-      useDefaultDataProvider: true
-      // todo: custom data provider
+      useDefaultDataProvider: true,
+      ...languageSettings
     },
     format: {
       tabSize,

package/dist/lsp/html/setup.mjs

@@ -5,8 +5,9 @@ async function setup(monaco, languageId, languageSettings, formattingOptions, wo
   const { tabSize, insertSpaces, insertFinalNewline, trimFinalNewlines } = formattingOptions ?? {};
   const createData = {
     suggest: {
+      attributeDefaultValue: languageSettings?.attributeDefaultValue,
       hideAutoCompleteProposals: languageSettings?.hideAutoCompleteProposals,
-      attributeDefaultValue: languageSettings?.attributeDefaultValue
+      hideEndTagSuggestions: languageSettings?.hideEndTagSuggestions
     },
     format: {
       tabSize,

package/dist/lsp/json/setup.mjs

@@ -114,15 +114,17 @@ var schemas = [
 import * as client from "../client.mjs";
 async function setup(monaco, languageId, languageSettings, formattingOptions, workspace) {
   const { editor, languages } = monaco;
+  const schemas2 = Array.isArray(languageSettings?.schemas) ? schemas.concat(languageSettings.schemas) : schemas;
   const createData = {
     settings: {
       validate: true,
       allowComments: false,
-      schemas: Array.isArray(languageSettings?.schemas) ? schemas.concat(languageSettings.schemas) : schemas,
       comments: "error",
       trailingCommas: "error",
       schemaRequest: "warning",
-      schemaValidation: "warning"
+      schemaValidation: "warning",
+      ...languageSettings,
+      schemas: schemas2
     },
     format: {
       tabSize: 4,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-monaco",
   "description": "A modern version of Monaco Editor",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "type": "module",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",

package/types/lsp.d.ts

@@ -52,15 +52,18 @@ export interface IReference {
   name: string;
   url: string;
 }
+
 export interface IData {
   name: string;
   description?: string;
   references?: IReference[];
 }
+
 export interface IAttributeData extends IData {
   valueSet?: string;
   values?: IData[];
 }
+
 export interface ITagData extends IData {
   attributes: IAttributeData[];
   void?: boolean;
@@ -87,17 +90,45 @@ export interface LSPConfig extends LSPLanguageConfig {
   formatting?: FormatOptions;
 }
 
+export type SeverityLevel = "error" | "warning" | "ignore";
+
+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>)[];
+}
+
 declare global {
   interface LSPLanguageConfig {
     html?: {
       attributeDefaultValue?: "empty" | "singlequotes" | "doublequotes";
       customTags?: ITagData[];
+      hideEndTagSuggestions?: boolean;
       hideAutoCompleteProposals?: boolean;
     };
-    css?: {};
+    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 };
+    };
     json?: {
-      /** JSON schemas for JSON language service. */
+      /** By default, the validator will return syntax and semantic errors. Set to false to disable the validator. */
+      validate?: 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. */
       schemas?: JSONSchemaSource[];
+      /** The severity of reported comments. Default is "error". */
+      comments?: SeverityLevel;
+      /** The severity of reported trailing commas. Default is "error". */
+      trailingCommas?: SeverityLevel;
+      /** The severity of problems from schema validation. Default is "warning". */
+      schemaValidation?: SeverityLevel;
+      /** The severity of problems that occurred when resolving and loading schemas. Default is "warning". */
+      schemaRequest?: SeverityLevel;
     };
     typescript?: {
       /** The compiler options. */