@codemirror/language 0.19.3 → 0.19.4

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.19.4 (2021-11-13)
+
+### New features
+
+`LanguageDescription.of` now takes an optional already-loaded extension.
+
 ## 0.19.3 (2021-09-13)
 
 ### Bug fixes

package/dist/index.cjs

@@ -611,16 +611,17 @@ class LanguageDescription {
     Optional filename pattern that should be associated with this
     language.
     */
-    filename, loadFunc) {
+    filename, loadFunc, 
+    /**
+    If the language has been loaded, this will hold its value.
+    */
+    support = undefined) {
         this.name = name;
         this.alias = alias;
         this.extensions = extensions;
         this.filename = filename;
         this.loadFunc = loadFunc;
-        /**
-        If the language has been loaded, this will hold its value.
-        */
-        this.support = undefined;
+        this.support = support;
         this.loading = null;
     }
     /**
@@ -635,7 +636,13 @@ class LanguageDescription {
     Create a language description.
     */
     static of(spec) {
-        return new LanguageDescription(spec.name, (spec.alias || []).concat(spec.name).map(s => s.toLowerCase()), spec.extensions || [], spec.filename, spec.load);
+        let { load, support } = spec;
+        if (!load) {
+            if (!support)
+                throw new RangeError("Must pass either 'load' or 'support' to LanguageDescription.of");
+            load = () => Promise.resolve(support);
+        }
+        return new LanguageDescription(spec.name, (spec.alias || []).concat(spec.name).map(s => s.toLowerCase()), spec.extensions || [], spec.filename, load, support);
     }
     /**
     Look for a language in the given array of descriptions that

package/dist/index.d.ts

@@ -298,7 +298,8 @@ declare class LanguageDescription {
         */
         alias?: readonly string[];
         /**
-        An optional array of extensions associated with this language.
+        An optional array of filename extensions associated with this
+        language.
         */
         extensions?: readonly string[];
         /**
@@ -308,7 +309,12 @@ declare class LanguageDescription {
         /**
         A function that will asynchronously load the language.
         */
-        load: () => Promise<LanguageSupport>;
+        load?: () => Promise<LanguageSupport>;
+        /**
+        Alternatively to `load`, you can provide an already loaded
+        support object. Either this or `load` should be provided.
+        */
+        support?: LanguageSupport;
     }): LanguageDescription;
     /**
     Look for a language in the given array of descriptions that

package/dist/index.js

@@ -1,5 +1,5 @@
 import { NodeProp, Tree, TreeFragment, Parser, NodeType } from '@lezer/common';
-import { Facet, EditorState, StateEffect, StateField } from '@codemirror/state';
+import { StateEffect, StateField, Facet, EditorState } from '@codemirror/state';
 import { ViewPlugin } from '@codemirror/view';
 import { countColumn } from '@codemirror/text';
 
@@ -607,16 +607,17 @@ class LanguageDescription {
     Optional filename pattern that should be associated with this
     language.
     */
-    filename, loadFunc) {
+    filename, loadFunc, 
+    /**
+    If the language has been loaded, this will hold its value.
+    */
+    support = undefined) {
         this.name = name;
         this.alias = alias;
         this.extensions = extensions;
         this.filename = filename;
         this.loadFunc = loadFunc;
-        /**
-        If the language has been loaded, this will hold its value.
-        */
-        this.support = undefined;
+        this.support = support;
         this.loading = null;
     }
     /**
@@ -631,7 +632,13 @@ class LanguageDescription {
     Create a language description.
     */
     static of(spec) {
-        return new LanguageDescription(spec.name, (spec.alias || []).concat(spec.name).map(s => s.toLowerCase()), spec.extensions || [], spec.filename, spec.load);
+        let { load, support } = spec;
+        if (!load) {
+            if (!support)
+                throw new RangeError("Must pass either 'load' or 'support' to LanguageDescription.of");
+            load = () => Promise.resolve(support);
+        }
+        return new LanguageDescription(spec.name, (spec.alias || []).concat(spec.name).map(s => s.toLowerCase()), spec.extensions || [], spec.filename, load, support);
     }
     /**
     Look for a language in the given array of descriptions that

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/language",
-  "version": "0.19.3",
+  "version": "0.19.4",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",