@bhsd/lezer-json 2.2.0 → 2.3.0

package/README.md

@@ -19,6 +19,9 @@ npm install @bhsd/lezer-json
 
 ## Language Support
 
+You can directly import the language support that provides both the [language](#language)
+and the basic [completion source](#completion-source) for JSON or JSONC.
+
 ```ts
 import {json} from '@bhsd/lezer-json';
 import type {LanguageSupport} from '@codemirror/language';
@@ -36,10 +39,23 @@ for JSON or JSONC alone.
 import {jsonLanguage, jsoncLanguage} from '@bhsd/lezer-json';
 ```
 
+## Completion Source
+
+If you are importing the [language](#language) alone, you can choose to import
+the completion source which provides basic completion for both JSON and JSONC.
+
+```ts
+import {jsonCompletionSource, jsonLanguage, jsoncLanguage} from '@bhsd/lezer-json';
+import type {Extension} from '@codemirror/state';
+
+const jsonCompletion: Extension = jsonLanguage.data.of({autocomplete: jsonCompletionSource}),
+	jsoncCompletion: Extension = jsoncLanguage.data.of({autocomplete: jsonCompletionSource});
+```
+
 ## Lint Source
 
-This package also provides [lint sources](https://codemirror.net/docs/ref/#lint.LintSource)
-for JSON or JSONC syntax checking.
+This package also provides lint sources for JSON or JSONC syntax checking. This
+is not included in the language support by default.
 
 ```ts
 import {linter} from '@codemirror/lint';

package/dist/index.d.ts

@@ -1,9 +1,11 @@
 import { LRLanguage, LanguageSupport } from '@codemirror/language';
 import type { LintSource } from '@codemirror/lint';
+import type { CompletionSource } from '@codemirror/autocomplete';
 /** LR language for JSON. */
 export declare const jsonLanguage: LRLanguage;
 /** LR language for JSONC. */
 export declare const jsoncLanguage: LRLanguage;
+export declare const jsonCompletionSource: CompletionSource;
 /**
  * Get language support for JSON or JSONC.
  * @param dialect The dialect to use, either omitted or `'jsonc'` for JSON with comments.

package/dist/index.js

@@ -12,12 +12,6 @@ const props = [
 ], options = ['true', 'false', 'null'].map((label) => ({ label, type: 'keyword' })), languageData = {
     closeBrackets: { brackts: ['[', '{', '"'] },
     indentOnInput: /^\s*[}\]]$/u,
-    autocomplete({ state, pos }) {
-        const { name: n, parent: p, from } = syntaxTree(state).resolveInner(pos, -1);
-        return n !== 'PropertyName' && n !== ':' && (p === null || p === void 0 ? void 0 : p.name) === 'Property'
-            ? { from, options, validFor: /^[a-z]*$/iu }
-            : null;
-    },
 };
 /** LR language for JSON. */
 export const jsonLanguage = /* #__PURE__ */ (() => LRLanguage.define({
@@ -37,11 +31,29 @@ export const jsoncLanguage = /* #__PURE__ */ (() => LRLanguage.define({
         },
     },
 }))();
+export const jsonCompletionSource = context => {
+    const mt = context.matchBefore(/(?:^|[[,:])\s*[a-z]+$/u);
+    if (!mt) {
+        return null;
+    }
+    const { state, pos } = context, { name: n, parent: p } = syntaxTree(state).resolveInner(pos, -1), { from, text } = mt;
+    return (p === null || p === void 0 ? void 0 : p.name) === 'Array' && !text.startsWith(':')
+        || n !== 'PropertyName' && (p === null || p === void 0 ? void 0 : p.name) === 'Property' && !/^[[,]/u.test(text)
+        ? {
+            from: from + text.search(/[a-z]/iu),
+            options,
+            validFor: /^[a-z]*$/iu,
+        }
+        : null;
+};
 /**
  * Get language support for JSON or JSONC.
  * @param dialect The dialect to use, either omitted or `'jsonc'` for JSON with comments.
  */
-export const json = (dialect) => new LanguageSupport(dialect === 'jsonc' ? jsoncLanguage : jsonLanguage);
+export const json = (dialect) => {
+    const lang = dialect === 'jsonc' ? jsoncLanguage : jsonLanguage;
+    return new LanguageSupport(lang, lang.data.of({ autocomplete: jsonCompletionSource }));
+};
 const getLintSource = (lint) => ({ state: { doc } }) => lint(doc.toString())
     .map(({ message, from, to = from, severity }) => ({ message, severity, from, to }));
 /** Lint source for JSON */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/lezer-json",
-	"version": "2.2.0",
+	"version": "2.3.0",
 	"description": "Lezer-based JSON/JSONC grammar",
 	"keywords": [
 		"codemirror",
@@ -53,7 +53,7 @@
 		"@bhsd/common": "^4.1.0"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^4.2.0",
+		"@bhsd/code-standard": "^4.3.0",
 		"@codemirror/autocomplete": "^6.20.3",
 		"@codemirror/language": "^6.12.4",
 		"@codemirror/lint": "^6.9.7",