volar-service-json - npm Package Compare versions

Comparing version 0.0.11 to 0.0.12

out/index.d.ts

@@ -8,3 +8,3 @@ import type { Service } from '@volar/language-service';
 }
-declare const _default: (settings?: json.LanguageSettings) => Service<Provide>;
-export default _default;
+export declare function create(settings?: json.LanguageSettings): Service<Provide>;
+export default create;

out/index.js

@@ -26,127 +26,132 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.create = void 0;
 const json = __importStar(require("vscode-json-languageservice"));
 const vscode_uri_1 = require("vscode-uri");
-exports.default = (settings) => (context) => {
-    // https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/json-language-features/server/src/jsonServer.ts#L150
-    const triggerCharacters = ['"', ':'];
-    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;
+// 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;
                 }
-                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,
+            },
+            triggerCharacters,
+            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.11",
+	"version": "0.0.12",
 	"main": "out/index.js",
@@ -30,3 +30,3 @@ "license": "MIT",
 	},
-	"gitHead": "5be7c0c4fc41f4ebe3d8f3d272d3a0d8377973ad"
+	"gitHead": "7422c8d99d498df660ff9be3491545a5b45b3622"
 }

No alert changes

Improved metrics

Total package byte prevSize

7921

increased by7.59%

Lines of code

164

increased by3.14%

No dependency changes