volar-service-prettier 0.0.9 → 0.0.10

package/out/index.d.ts

@@ -22,14 +22,23 @@ declare const _default: (options?: {
      * @see https://github.com/volarjs/services/issues/5
      */
     ignoreIdeOptions?: boolean | undefined;
+    /**
+     * Determine if IDE options should be used as a fallback if there's no Prettier specific settings in the workspace
+     */
+    useIdeOptionsFallback?: boolean | undefined;
     /**
      * Additional options to pass to Prettier
      * This is useful, for instance, to add specific plugins you need.
      */
-    additionalOptions?: ((resolvedConfig: Options) => Options) | undefined;
+    additionalOptions?: ((resolvedConfig: Options) => Options | Promise<Options>) | undefined;
     /**
      * Options to use when resolving the Prettier config
      */
     resolveConfigOptions?: ResolveConfigOptions | undefined;
-}, getPrettierConfig?: (config?: ResolveConfigOptions) => Options) => Service;
+    /**
+     * Prettier instance to use. If undefined, Prettier will be imported through a normal `import('prettier')`.
+     * This property is useful whenever you want to load a specific instance of Prettier (for instance, loading the Prettier version installed in the user's project)
+     */
+    prettier?: typeof import('prettier') | undefined;
+}, getPrettierConfig?: (prettier: typeof import('prettier'), config?: ResolveConfigOptions) => Promise<Options>) => Service;
 export default _default;

package/out/index.js

@@ -1,29 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const prettier_1 = require("prettier");
-exports.default = (options = {}, getPrettierConfig = (config) => {
-    const configFile = prettier_1.resolveConfigFile.sync();
+exports.default = (options = {}, getPrettierConfig = async (prettier, config) => {
+    const configFile = await prettier.resolveConfigFile();
     if (configFile) {
-        return prettier_1.resolveConfig.sync(configFile, config) ?? {};
+        return await prettier.resolveConfig(configFile, config) ?? {};
     }
     return {};
 }) => (context) => {
     if (!context) {
         return {};
     }
+    let prettier;
+    try {
+        prettier = options.prettier ?? require('prettier');
+    }
+    catch (e) {
+        throw new Error("Could not load Prettier: " + e);
+    }
     const languages = options.languages ?? ['html', 'css', 'scss', 'typescript', 'javascript'];
     return {
         async provideDocumentFormattingEdits(document, _, formatOptions) {
             if (!languages.includes(document.languageId)) {
                 return;
             }
-            const filePrettierOptions = getPrettierConfig(options.resolveConfigOptions);
-            const fileInfo = await (0, prettier_1.getFileInfo)(context.env.uriToFileName(document.uri), { ignorePath: '.prettierignore' });
+            const filePrettierOptions = await getPrettierConfig(prettier, options.resolveConfigOptions);
+            const fileInfo = await prettier.getFileInfo(context.env.uriToFileName(document.uri), { ignorePath: '.prettierignore' });
             if (fileInfo.ignored) {
                 return;
             }
             const editorPrettierOptions = await context.env.getConfiguration?.('prettier', document.uri);
-            const ideFormattingOptions = formatOptions !== undefined && !options.ignoreIdeOptions // We need to check for options existing here because some editors might not have it
+            const ideFormattingOptions = formatOptions !== undefined && options.useIdeOptionsFallback // We need to check for options existing here because some editors might not have it
                 ? {
                     tabWidth: formatOptions.tabSize,
                     useTabs: !formatOptions.insertSpaces,
@@ -43,7 +49,7 @@ exports.default = (options = {}, getPrettierConfig = (config) => {
             // - Use the editor's basic configuration settings
             const prettierOptions = returnObjectIfHasKeys(filePrettierOptions) || returnObjectIfHasKeys(editorPrettierOptions) || ideFormattingOptions;
             const currentPrettierConfig = {
-                ...options.additionalOptions ? options.additionalOptions(prettierOptions) : prettierOptions,
+                ...options.additionalOptions ? await options.additionalOptions(prettierOptions) : prettierOptions,
                 filepath: context.env.uriToFileName(document.uri),
             };
             if (!options.ignoreIdeOptions) {
@@ -51,7 +57,7 @@ exports.default = (options = {}, getPrettierConfig = (config) => {
                 currentPrettierConfig.tabWidth = formatOptions.tabSize;
             }
             return [{
-                    newText: (0, prettier_1.format)(oldText, currentPrettierConfig),
+                    newText: await prettier.format(oldText, currentPrettierConfig),
                     range: {
                         start: document.positionAt(0),
                         end: document.positionAt(fullText.length),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-prettier",
-	"version": "0.0.9",
+	"version": "0.0.10",
 	"main": "out/index.js",
 	"types": "out/index.d.ts",
 	"license": "MIT",
@@ -19,16 +19,19 @@
 		"url": "https://www.polv.cc"
 	},
 	"devDependencies": {
-		"@types/prettier": "^2.7.2"
+		"prettier": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "*",
-		"prettier": "*"
+		"@volar/language-service": "~1.9.0",
+		"prettier": "^2.2 || ^3.0"
 	},
 	"peerDependenciesMeta": {
+		"prettier": {
+			"optional": true
+		},
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "00ea02d9ac256317104c90e1adacdf3e315be46c"
+	"gitHead": "f3c11d5024bd8ae0d8abbae7cbfe8da8c80f4b71"
 }