refactor: upgrade to the latest dprint-core

Author: dsherret

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dprint-plugin-typescript"
-version = "0.65.1"
+version = "0.66.0"
 authors = ["David Sherret <[email protected]>"]
 edition = "2021"
 homepage = "https://github.com/dprint/dprint-plugin-typescript"
@@ -27,7 +27,7 @@ tracing = ["dprint-core/tracing"]
 [dependencies]
 anyhow = "1.0.51"
 deno_ast = { version = "0.13.0", features = ["view"] }
-dprint-core = { version = "0.50.0", features = ["formatting"] }
+dprint-core = { version = "0.54.1", features = ["formatting"] }
 rustc-hash = "1.1.0"
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
@@ -37,5 +37,5 @@ parking_lot_core = "=0.8.0" # wait on string_cache to be updated in swc
 
 [dev-dependencies]
 debug-here = "0.2"
-dprint-development = "0.6.0"
+dprint-development = "0.8.0"
 serde_json = { version = "1.0" }

Cargo.toml

@@ -13,10 +13,10 @@
     "**/target"
   ],
   "plugins": [
-    "https://plugins.dprint.dev/typescript-0.62.2.wasm",
+    "https://plugins.dprint.dev/typescript-0.65.1.wasm",
     "https://plugins.dprint.dev/json-0.14.1.wasm",
     "https://plugins.dprint.dev/markdown-0.12.2.wasm",
     "https://plugins.dprint.dev/toml-0.5.4.wasm",
-    "https://plugins.dprint.dev/rustfmt-0.4.0.exe-plugin@c6bb223ef6e5e87580177f6461a0ab0554ac9ea6b54f78ea7ae8bf63b14f5bc2"
+    "https://plugins.dprint.dev/rustfmt-0.6.1.exe-plugin@99b89a0599fd3a63e597e03436862157901f3facae2f0c2fbd0b9f656cdbc2a5"
   ]
 }

dprint.json

@@ -1,7 +1,6 @@
 use super::resolve_config::resolve_config;
 use super::types::*;
 use dprint_core::configuration::*;
-use std::collections::HashMap;
 
 /// TypeScript formatting configuration builder.
 ///
@@ -35,7 +34,7 @@ impl ConfigurationBuilder {
     if let Some(global_config) = &self.global_config {
       resolve_config(self.config.clone(), global_config).config
     } else {
-      let global_config = resolve_global_config(HashMap::new(), &Default::default()).config;
+      let global_config = resolve_global_config(ConfigKeyMap::new(), &Default::default()).config;
       resolve_config(self.config.clone(), &global_config).config
     }
   }
@@ -1116,7 +1115,7 @@ mod tests {
 
     let inner_config = config.get_inner_config();
     assert_eq!(inner_config.len(), 155);
-    let diagnostics = resolve_config(inner_config, &resolve_global_config(HashMap::new(), &Default::default()).config).diagnostics;
+    let diagnostics = resolve_config(inner_config, &resolve_global_config(ConfigKeyMap::new(), &Default::default()).config).diagnostics;
     assert_eq!(diagnostics.len(), 0);
   }
 }

src/configuration/builder.rs

@@ -7,16 +7,16 @@ use dprint_core::configuration::*;
 /// # Example
 ///
 /// ```
-/// use std::collections::HashMap;
-/// use dprint_core::configuration::{resolve_global_config};
-/// use dprint_plugin_typescript::configuration::{resolve_config};
+/// use dprint_core::configuration::ConfigKeyMap;
+/// use dprint_core::configuration::resolve_global_config;
+/// use dprint_plugin_typescript::configuration::resolve_config;
 ///
-/// let config_map = HashMap::new(); // get a collection of key value pairs from somewhere
+/// let config_map = ConfigKeyMap::new(); // get a collection of key value pairs from somewhere
 /// let global_config_result = resolve_global_config(config_map, &Default::default());
 ///
 /// // check global_config_result.diagnostics here...
 ///
-/// let typescript_config_map = HashMap::new(); // get a collection of k/v pairs from somewhere
+/// let typescript_config_map = ConfigKeyMap::new(); // get a collection of k/v pairs from somewhere
 /// let config_result = resolve_config(
 ///     typescript_config_map,
 ///     &global_config_result.config
@@ -295,7 +295,6 @@ pub fn resolve_config(config: ConfigKeyMap, global_config: &GlobalConfiguration)
 mod tests {
   use dprint_core::configuration::resolve_global_config;
   use dprint_core::configuration::NewLineKind;
-  use std::collections::HashMap;
 
   use super::super::builder::ConfigurationBuilder;
   use super::*;
@@ -304,7 +303,7 @@ mod tests {
 
   #[test]
   fn handle_global_config() {
-    let mut global_config = HashMap::new();
+    let mut global_config = ConfigKeyMap::new();
     global_config.insert(String::from("lineWidth"), ConfigKeyValue::from_i32(80));
     global_config.insert(String::from("indentWidth"), ConfigKeyValue::from_i32(8));
     global_config.insert(String::from("newLineKind"), ConfigKeyValue::from_str("crlf"));
@@ -320,9 +319,9 @@ mod tests {
 
   #[test]
   fn handle_deno_config() {
-    let mut config = HashMap::new();
+    let mut config = ConfigKeyMap::new();
     config.insert(String::from("deno"), ConfigKeyValue::from_bool(true));
-    let global_config = resolve_global_config(HashMap::new(), &Default::default()).config;
+    let global_config = resolve_global_config(ConfigKeyMap::new(), &Default::default()).config;
     let result = resolve_config(config, &global_config);
     let expected_config = ConfigurationBuilder::new().deno().build();
     // todo: test that both objects equal each other
@@ -333,10 +332,10 @@ mod tests {
 
   #[test]
   fn handle_deno_config_with_overwrites() {
-    let mut config = HashMap::new();
+    let mut config = ConfigKeyMap::new();
     config.insert(String::from("deno"), ConfigKeyValue::from_bool(true));
     config.insert(String::from("indentWidth"), ConfigKeyValue::from_i32(8));
-    let global_config = resolve_global_config(HashMap::new(), &Default::default()).config;
+    let global_config = resolve_global_config(ConfigKeyMap::new(), &Default::default()).config;
     let result = resolve_config(config, &global_config);
     let expected_config = ConfigurationBuilder::new().deno().build();
     assert_eq!(result.config.indent_width, 8);

src/configuration/resolve_config.rs

@@ -38,36 +38,41 @@ use super::swc::parse_swc_ast;
 ///     // save result here...
 /// }
 /// ```
-pub fn format_text(file_path: &Path, file_text: &str, config: &Configuration) -> Result<String> {
+pub fn format_text(file_path: &Path, file_text: &str, config: &Configuration) -> Result<Option<String>> {
   if super::utils::file_text_has_ignore_comment(file_text, &config.ignore_file_comment_text) {
-    Ok(String::from(file_text))
+    Ok(None)
   } else {
     let parsed_source = parse_swc_ast(file_path, file_text)?;
     inner_format(&parsed_source, config)
   }
 }
 
 /// Formats an already parsed source. This is useful as a performance optimization.
-pub fn format_parsed_source(source: &ParsedSource, config: &Configuration) -> Result<String> {
+pub fn format_parsed_source(source: &ParsedSource, config: &Configuration) -> Result<Option<String>> {
   if super::utils::file_text_has_ignore_comment(source.source().text_str(), &config.ignore_file_comment_text) {
-    Ok(source.source().text_str().to_string())
+    Ok(None)
   } else {
     inner_format(source, config)
   }
 }
 
-fn inner_format(parsed_source: &ParsedSource, config: &Configuration) -> Result<String> {
+fn inner_format(parsed_source: &ParsedSource, config: &Configuration) -> Result<Option<String>> {
   ensure_no_specific_syntax_errors(parsed_source)?;
 
-  Ok(dprint_core::formatting::format(
+  let result = dprint_core::formatting::format(
     || {
       #[allow(clippy::let_and_return)]
       let print_items = generate(parsed_source, config);
       // println!("{}", print_items.get_as_text());
       print_items
     },
     config_to_print_options(parsed_source.source().text_str(), config),
-  ))
+  );
+  if result == parsed_source.source().text_str() {
+    Ok(None)
+  } else {
+    Ok(Some(result))
+  }
 }
 
 #[cfg(feature = "tracing")]