feat: update to dprint-core 0.47 (#135)

Author: dsherret

.github/workflows/ci.yml

@@ -60,7 +60,7 @@ jobs:
     - uses: actions/setup-node@v2
       if: matrix.config.kind == 'test_release'
       with:
-        node-version: '18.x'
+        node-version: '20.x'
         registry-url: 'https://registry.npmjs.org'
 
     - name: Setup and test npm deployment

Cargo.lock

@@ -30,7 +30,7 @@ harness = false
 
 [dependencies]
 anyhow = "1.0.64"
-dprint-core = { version = "0.66.2", features = ["formatting"] }
+dprint-core = { version = "0.67.4", features = ["formatting"] }
 dprint-core-macros = "0.1.0"
 pulldown-cmark = { version = "0.11.2", default-features = false }
 regex = "1"

Cargo.toml

@@ -5,6 +5,9 @@ const getPath = require("./index").getPath;
 
 const buffer = require("fs").readFileSync(getPath());
 const formatter = createFromBuffer(buffer);
-const result = formatter.formatText("file.md", "#   Hello");
+const result = formatter.formatText({
+  filePath: "file.md",
+  fileText: "#   Hello",
+});
 
 assert.strictEqual(result, "# Hello\n");

deployment/npm/index.test.js

@@ -24,6 +24,6 @@
     "test": "node index.test.js"
   },
   "devDependencies": {
-    "@dprint/formatter": "~0.1.4"
+    "@dprint/formatter": "~0.4.0"
   }
 }

deployment/npm/package-lock.json

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.74.0"
+channel = "1.85.0"
 components = ["clippy"]

deployment/npm/package.json

@@ -1,15 +1,18 @@
-use std::path::Path;
 use std::path::PathBuf;
 
 use dprint_core::configuration::ConfigKeyMap;
 use dprint_core::configuration::GlobalConfiguration;
-use dprint_core::configuration::ResolveConfigurationResult;
 use dprint_core::generate_plugin_code;
+use dprint_core::plugins::CheckConfigUpdatesMessage;
+use dprint_core::plugins::ConfigChange;
 use dprint_core::plugins::FileMatchingInfo;
+use dprint_core::plugins::FormatRange;
 use dprint_core::plugins::FormatResult;
 use dprint_core::plugins::PluginInfo;
+use dprint_core::plugins::PluginResolveConfigurationResult;
+use dprint_core::plugins::SyncFormatRequest;
+use dprint_core::plugins::SyncHostFormatRequest;
 use dprint_core::plugins::SyncPluginHandler;
-use dprint_core::plugins::SyncPluginInfo;
 
 use super::configuration::resolve_config;
 use super::configuration::Configuration;
@@ -21,28 +24,15 @@ impl SyncPluginHandler<Configuration> for MarkdownPluginHandler {
     &mut self,
     config: ConfigKeyMap,
     global_config: &GlobalConfiguration,
-  ) -> ResolveConfigurationResult<Configuration> {
-    resolve_config(config, global_config)
-  }
-
-  // Markdown extensions: markdown, mdown, mkdn, mdwn, mkd, md
-  // ref: https://superuser.com/questions/249436/file-extension-for-markdown-files/285878#285878
-  // ref: https://github.com/denoland/deno_registry2/issues/206
-  fn plugin_info(&mut self) -> SyncPluginInfo {
-    let version = env!("CARGO_PKG_VERSION").to_string();
-    SyncPluginInfo {
-      info: PluginInfo {
-        name: env!("CARGO_PKG_NAME").to_string(),
-        version: version.clone(),
-        config_key: "markdown".to_string(),
-        help_url: "https://dprint.dev/plugins/markdown".to_string(),
-        config_schema_url: format!(
-          "https://plugins.dprint.dev/dprint/dprint-plugin-markdown/{}/schema.json",
-          version
-        ),
-        update_url: Some("https://plugins.dprint.dev/dprint/dprint-plugin-markdown/latest.json".to_string()),
-      },
+  ) -> PluginResolveConfigurationResult<Configuration> {
+    let config = resolve_config(config, global_config);
+    PluginResolveConfigurationResult {
+      config: config.config,
+      diagnostics: config.diagnostics,
       file_matching: FileMatchingInfo {
+        // Markdown extensions: markdown, mdown, mkdn, mdwn, mkd, md
+        // ref: https://superuser.com/questions/249436/file-extension-for-markdown-files/285878#285878
+        // ref: https://github.com/denoland/deno_registry2/issues/206
         file_extensions: vec![
           "md".to_string(),
           "mkd".to_string(),
@@ -56,24 +46,47 @@ impl SyncPluginHandler<Configuration> for MarkdownPluginHandler {
     }
   }
 
+  fn check_config_updates(&self, _message: CheckConfigUpdatesMessage) -> Result<Vec<ConfigChange>, anyhow::Error> {
+    Ok(Vec::new())
+  }
+
+  fn plugin_info(&mut self) -> PluginInfo {
+    let version = env!("CARGO_PKG_VERSION").to_string();
+    PluginInfo {
+      name: env!("CARGO_PKG_NAME").to_string(),
+      version: version.clone(),
+      config_key: "markdown".to_string(),
+      help_url: "https://dprint.dev/plugins/markdown".to_string(),
+      config_schema_url: format!(
+        "https://plugins.dprint.dev/dprint/dprint-plugin-markdown/{}/schema.json",
+        version
+      ),
+      update_url: Some("https://plugins.dprint.dev/dprint/dprint-plugin-markdown/latest.json".to_string()),
+    }
+  }
+
   fn license_text(&mut self) -> String {
     std::str::from_utf8(include_bytes!("../LICENSE")).unwrap().into()
   }
 
   fn format(
     &mut self,
-    _file_path: &Path,
-    file_bytes: Vec<u8>,
-    config: &Configuration,
-    mut format_with_host: impl FnMut(&Path, Vec<u8>, &ConfigKeyMap) -> FormatResult,
+    request: SyncFormatRequest<Configuration>,
+    mut format_with_host: impl FnMut(SyncHostFormatRequest) -> FormatResult,
   ) -> FormatResult {
-    let file_text = String::from_utf8(file_bytes)?;
-    return super::format_text(&file_text, config, |tag, file_text, line_width| {
+    let file_text = String::from_utf8(request.file_bytes)?;
+    return super::format_text(&file_text, request.config, |tag, file_text, line_width| {
       if let Some(ext) = tag_to_extension(tag) {
         let file_path = PathBuf::from(format!("file.{}", ext));
         let mut additional_config = ConfigKeyMap::new();
         additional_config.insert("lineWidth".into(), (line_width as i32).into());
-        let result = format_with_host(&file_path, file_text.to_string().into_bytes(), &additional_config);
+        let request = SyncHostFormatRequest {
+          file_path: &file_path,
+          file_bytes: file_text.as_bytes(),
+          range: FormatRange::None,
+          override_config: &additional_config,
+        };
+        let result = format_with_host(request);
         match result {
           Ok(Some(bytes)) => Ok(Some(String::from_utf8(bytes)?)),
           Ok(None) => Ok(None),