volar-service-json - npm Package Compare versions

Comparing version 0.0.17 to 0.0.18

out/index.d.ts

@@ -1,2 +0,2 @@
-import type { Service } from '@volar/language-service';
+import type { ServicePlugin } from '@volar/language-service';
 import * as json from 'vscode-json-languageservice';
@@ -8,4 +8,3 @@ import type { TextDocument } from 'vscode-languageserver-textdocument';
 }
-export declare function create(settings?: json.LanguageSettings): Service<Provide>;
-export default create;
+export declare function create(settings?: json.LanguageSettings): ServicePlugin;
 //# sourceMappingURL=index.d.ts.map

out/index.js

@@ -6,129 +6,126 @@ "use strict";
 const vscode_uri_1 = require("vscode-uri");
-// https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/json-language-features/server/src/jsonServer.ts#L150
-const triggerCharacters = ['"', ':'];
 function create(settings) {
-    return (context) => {
-        if (!context) {
-            return { triggerCharacters };
-        }
-        const jsonDocuments = new WeakMap();
-        const workspaceContext = {
-            resolveRelativePath: (ref, base) => {
-                if (ref.match(/^\w[\w\d+.-]*:/)) {
-                    // starts with a schema
-                    return ref;
-                }
-                if (ref[0] === '/') { // resolve absolute path against the current workspace folder
-                    return base + ref;
-                }
-                const baseUri = vscode_uri_1.URI.parse(base);
-                const baseUriDir = baseUri.path.endsWith('/') ? baseUri : vscode_uri_1.Utils.dirname(baseUri);
-                return vscode_uri_1.Utils.resolvePath(baseUriDir, ref).toString(true);
-            },
-        };
-        const jsonLs = json.getLanguageService({
-            schemaRequestService: async (uri) => await context.env.fs?.readFile(uri) ?? '',
-            workspaceContext,
-            clientCapabilities: context.env.clientCapabilities,
-        });
-        if (settings) {
-            jsonLs.configure(settings);
-        }
-        return {
-            provide: {
-                'json/jsonDocument': getJsonDocument,
-                'json/languageService': () => jsonLs,
-            },
-            triggerCharacters,
-            provideCompletionItems(document, position) {
-                return worker(document, async (jsonDocument) => {
-                    return await jsonLs.doComplete(document, position, jsonDocument);
-                });
-            },
-            resolveCompletionItem(item) {
-                return jsonLs.doResolve(item);
-            },
-            provideDefinition(document, position) {
-                return worker(document, async (jsonDocument) => {
-                    return await jsonLs.findDefinition(document, position, jsonDocument);
-                });
-            },
-            provideDiagnostics(document) {
-                return worker(document, async (jsonDocument) => {
-                    const documentLanguageSettings = undefined; // await getSettings(); // TODO
-                    return await jsonLs.doValidation(document, jsonDocument, documentLanguageSettings, undefined);
-                });
-            },
-            provideHover(document, position) {
-                return worker(document, async (jsonDocument) => {
-                    return await jsonLs.doHover(document, position, jsonDocument);
-                });
-            },
-            provideDocumentLinks(document) {
-                return worker(document, async (jsonDocument) => {
-                    return await jsonLs.findLinks(document, jsonDocument);
-                });
-            },
-            provideDocumentSymbols(document) {
-                return worker(document, async (jsonDocument) => {
-                    return await jsonLs.findDocumentSymbols2(document, jsonDocument);
-                });
-            },
-            provideDocumentColors(document) {
-                return worker(document, async (jsonDocument) => {
-                    return await jsonLs.findDocumentColors(document, jsonDocument);
-                });
-            },
-            provideColorPresentations(document, color, range) {
-                return worker(document, async (jsonDocument) => {
-                    return await jsonLs.getColorPresentations(document, jsonDocument, color, range);
-                });
-            },
-            provideFoldingRanges(document) {
-                return worker(document, async () => {
-                    return await jsonLs.getFoldingRanges(document);
-                });
-            },
-            provideSelectionRanges(document, positions) {
-                return worker(document, async (jsonDocument) => {
-                    return await jsonLs.getSelectionRanges(document, positions, jsonDocument);
-                });
-            },
-            provideDocumentFormattingEdits(document, range, options) {
-                return worker(document, async () => {
-                    const options_2 = await context.env.getConfiguration?.('json.format');
-                    if (!(options_2?.enable ?? true)) {
-                        return;
+    return {
+        // https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/json-language-features/server/src/jsonServer.ts#L150
+        triggerCharacters: ['"', ':'],
+        create(context) {
+            const jsonDocuments = new WeakMap();
+            const workspaceContext = {
+                resolveRelativePath: (ref, base) => {
+                    if (ref.match(/^\w[\w\d+.-]*:/)) {
+                        // starts with a schema
+                        return ref;
                     }
-                    return jsonLs.format(document, range, {
-                        ...options_2,
-                        ...options,
+                    if (ref[0] === '/') { // resolve absolute path against the current workspace folder
+                        return base + ref;
+                    }
+                    const baseUri = vscode_uri_1.URI.parse(base);
+                    const baseUriDir = baseUri.path.endsWith('/') ? baseUri : vscode_uri_1.Utils.dirname(baseUri);
+                    return vscode_uri_1.Utils.resolvePath(baseUriDir, ref).toString(true);
+                },
+            };
+            const jsonLs = json.getLanguageService({
+                schemaRequestService: async (uri) => await context.env.fs?.readFile(uri) ?? '',
+                workspaceContext,
+                clientCapabilities: context.env.clientCapabilities,
+            });
+            if (settings) {
+                jsonLs.configure(settings);
+            }
+            return {
+                provide: {
+                    'json/jsonDocument': getJsonDocument,
+                    'json/languageService': () => jsonLs,
+                },
+                provideCompletionItems(document, position) {
+                    return worker(document, async (jsonDocument) => {
+                        return await jsonLs.doComplete(document, position, jsonDocument);
                     });
-                });
-            },
-        };
-        function worker(document, callback) {
-            const jsonDocument = getJsonDocument(document);
-            if (!jsonDocument)
-                return;
-            return callback(jsonDocument);
-        }
-        function getJsonDocument(textDocument) {
-            if (textDocument.languageId !== 'json' && textDocument.languageId !== 'jsonc')
-                return;
-            const cache = jsonDocuments.get(textDocument);
-            if (cache) {
-                const [cacheVersion, cacheDoc] = cache;
-                if (cacheVersion === textDocument.version) {
-                    return cacheDoc;
+                },
+                resolveCompletionItem(item) {
+                    return jsonLs.doResolve(item);
+                },
+                provideDefinition(document, position) {
+                    return worker(document, async (jsonDocument) => {
+                        return await jsonLs.findDefinition(document, position, jsonDocument);
+                    });
+                },
+                provideDiagnostics(document) {
+                    return worker(document, async (jsonDocument) => {
+                        const documentLanguageSettings = undefined; // await getSettings(); // TODO
+                        return await jsonLs.doValidation(document, jsonDocument, documentLanguageSettings, undefined);
+                    });
+                },
+                provideHover(document, position) {
+                    return worker(document, async (jsonDocument) => {
+                        return await jsonLs.doHover(document, position, jsonDocument);
+                    });
+                },
+                provideDocumentLinks(document) {
+                    return worker(document, async (jsonDocument) => {
+                        return await jsonLs.findLinks(document, jsonDocument);
+                    });
+                },
+                provideDocumentSymbols(document) {
+                    return worker(document, async (jsonDocument) => {
+                        return await jsonLs.findDocumentSymbols2(document, jsonDocument);
+                    });
+                },
+                provideDocumentColors(document) {
+                    return worker(document, async (jsonDocument) => {
+                        return await jsonLs.findDocumentColors(document, jsonDocument);
+                    });
+                },
+                provideColorPresentations(document, color, range) {
+                    return worker(document, async (jsonDocument) => {
+                        return await jsonLs.getColorPresentations(document, jsonDocument, color, range);
+                    });
+                },
+                provideFoldingRanges(document) {
+                    return worker(document, async () => {
+                        return await jsonLs.getFoldingRanges(document);
+                    });
+                },
+                provideSelectionRanges(document, positions) {
+                    return worker(document, async (jsonDocument) => {
+                        return await jsonLs.getSelectionRanges(document, positions, jsonDocument);
+                    });
+                },
+                provideDocumentFormattingEdits(document, range, options) {
+                    return worker(document, async () => {
+                        const options_2 = await context.env.getConfiguration?.('json.format');
+                        if (!(options_2?.enable ?? true)) {
+                            return;
+                        }
+                        return jsonLs.format(document, range, {
+                            ...options_2,
+                            ...options,
+                        });
+                    });
+                },
+            };
+            function worker(document, callback) {
+                const jsonDocument = getJsonDocument(document);
+                if (!jsonDocument)
+                    return;
+                return callback(jsonDocument);
+            }
+            function getJsonDocument(textDocument) {
+                if (textDocument.languageId !== 'json' && textDocument.languageId !== 'jsonc')
+                    return;
+                const cache = jsonDocuments.get(textDocument);
+                if (cache) {
+                    const [cacheVersion, cacheDoc] = cache;
+                    if (cacheVersion === textDocument.version) {
+                        return cacheDoc;
+                    }
                 }
+                const doc = jsonLs.parseJSONDocument(textDocument);
+                jsonDocuments.set(textDocument, [textDocument.version, doc]);
+                return doc;
             }
-            const doc = jsonLs.parseJSONDocument(textDocument);
-            jsonDocuments.set(textDocument, [textDocument.version, doc]);
-            return doc;
-        }
+        },
     };
 }
 exports.create = create;
-exports.default = create;
 //# sourceMappingURL=index.js.map

package.json

 {
 	"name": "volar-service-json",
-	"version": "0.0.17",
+	"version": "0.0.18",
 	"description": "Integrate vscode-json-languageservice into Volar",
@@ -35,3 +35,3 @@ "homepage": "https://github.com/volarjs/services/tree/master/packages/json",
 	"peerDependencies": {
-		"@volar/language-service": "~1.11.0"
+		"@volar/language-service": "2.0.0-alpha.0"
 	},
@@ -43,3 +43,3 @@ "peerDependenciesMeta": {
 	},
-	"gitHead": "bf42bae9b399b69125fd28c7a9bf95882c96068a"
+	"gitHead": "8dedd3c6e73740fc7c1fe06df32b727ca504adc0"
 }

No alert changes

Improved metrics

Total package byte prevSize

9112

increased by3.95%

Worsened metrics

Lines of code

137

decreased by-2.84%

No dependency changes