feat: upgrade to wasm plugins v4

Cargo.toml

@@ -32,7 +32,7 @@ harness = false
 [dependencies]
 anyhow = "1.0.64"
 deno_ast = { version = "0.39.0", features = ["view"] }
-dprint-core = { version = "0.66.2", features = ["formatting"] }
+dprint-core = { version = "0.67.0", features = ["formatting"] }
 dprint-core-macros = "0.1.0"
 percent-encoding = "2.3.1"
 rustc-hash = "1.1.0"

deployment/npm/index.test.js

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

deployment/npm/package.json

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

src/wasm_plugin.rs

@@ -1,35 +1,27 @@
 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::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 std::path::Path;
 
 use super::configuration::resolve_config;
 use super::configuration::Configuration;
 
 struct TypeScriptPluginHandler;
 
 impl SyncPluginHandler<Configuration> for TypeScriptPluginHandler {
-  fn resolve_config(&mut self, config: ConfigKeyMap, global_config: &GlobalConfiguration) -> ResolveConfigurationResult<Configuration> {
-    resolve_config(config, global_config)
-  }
-
-  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: "typescript".to_string(),
-        help_url: "https://dprint.dev/plugins/typescript".to_string(),
-        config_schema_url: format!("https://plugins.dprint.dev/dprint/dprint-plugin-typescript/{}/schema.json", version),
-        update_url: Some("https://plugins.dprint.dev/dprint/dprint-plugin-typescript/latest.json".to_string()),
-      },
+  fn resolve_config(&mut self, config: ConfigKeyMap, global_config: &GlobalConfiguration) -> PluginResolveConfigurationResult<Configuration> {
+    let result = resolve_config(config, global_config);
+    PluginResolveConfigurationResult {
+      config: result.config,
+      diagnostics: result.diagnostics,
       file_matching: FileMatchingInfo {
         file_extensions: vec![
           String::from("ts"),
@@ -46,19 +38,33 @@ impl SyncPluginHandler<Configuration> for TypeScriptPluginHandler {
     }
   }
 
+  fn plugin_info(&mut self) -> PluginInfo {
+    let version = env!("CARGO_PKG_VERSION");
+    PluginInfo {
+      name: env!("CARGO_PKG_NAME").to_string(),
+      version: version.to_string(),
+      config_key: "typescript".to_string(),
+      help_url: "https://dprint.dev/plugins/typescript".to_string(),
+      config_schema_url: format!("https://plugins.dprint.dev/dprint/dprint-plugin-typescript/{}/schema.json", version),
+      update_url: Some("https://plugins.dprint.dev/dprint/dprint-plugin-typescript/latest.json".to_string()),
+    }
+  }
+
+  fn check_config_updates(&self, _message: CheckConfigUpdatesMessage) -> anyhow::Result<Vec<ConfigChange>> {
+    Ok(Vec::new())
+  }
+
   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,
-    _format_with_host: impl FnMut(&Path, Vec<u8>, &ConfigKeyMap) -> FormatResult,
-  ) -> FormatResult {
-    let file_text = String::from_utf8(file_bytes)?;
-    super::format_text(file_path, file_text, config).map(|maybe_text| maybe_text.map(|t| t.into_bytes()))
+  fn format(&mut self, request: SyncFormatRequest<Configuration>, _format_with_host: impl FnMut(SyncHostFormatRequest) -> FormatResult) -> FormatResult {
+    if request.range.is_some() {
+      return Ok(None); // not implemented
+    }
+
+    let file_text = String::from_utf8(request.file_bytes)?;
+    super::format_text(&request.file_path, file_text, request.config).map(|maybe_text| maybe_text.map(|t| t.into_bytes()))
   }
 }