chore: update builder and format code

Author: dsherret

.rustfmt.toml

@@ -0,0 +1,2 @@
+max_width = 160
+tab_spaces = 2

dprint.json

@@ -2,7 +2,8 @@
   "incremental": true,
   "indentWidth": 2,
   "rustfmt": {
-    "lineWidth": 160
+    "lineWidth": 160,
+    "imports_granularity": "Item"
   },
   "includes": ["**/*.{ts,tsx,js,jsx,cjs,mjs,json,md,toml,rs}"],
   "excludes": [
@@ -12,10 +13,10 @@
     "**/target"
   ],
   "plugins": [
-    "https://plugins.dprint.dev/typescript-0.62.1.wasm",
-    "https://plugins.dprint.dev/json-0.14.0.wasm",
-    "https://plugins.dprint.dev/markdown-0.12.1.wasm",
-    "https://plugins.dprint.dev/toml-0.5.3.wasm",
+    "https://plugins.dprint.dev/typescript-0.62.2.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"
   ]
 }

src/configuration/builder.rs

@@ -136,6 +136,13 @@ impl ConfigurationBuilder {
     self.insert("preferHanging", value.into())
   }
 
+  /// Behaviour to use for quotes on property names.
+  ///
+  /// Default: `preserve`
+  pub fn quote_props(&mut self, value: QuoteProps) -> &mut Self {
+    self.insert("quoteProps", value.to_string().into())
+  }
+
   /// Where to place the opening brace.
   ///
   /// Default: `BracePosition::SameLineUnlessHanging`
@@ -947,6 +954,7 @@ mod tests {
       .single_body_position(SingleBodyPosition::SameLine)
       .trailing_commas(TrailingCommas::Never)
       .use_braces(UseBraces::WhenNotSingleLine)
+      .quote_props(QuoteProps::AsNeeded)
       .prefer_hanging(false)
       /* situational */
       .arrow_function_use_parentheses(UseParentheses::Maintain)
@@ -1101,7 +1109,7 @@ mod tests {
       .while_statement_space_after_while_keyword(true);
 
     let inner_config = config.get_inner_config();
-    assert_eq!(inner_config.len(), 153);
+    assert_eq!(inner_config.len(), 154);
     let diagnostics = resolve_config(inner_config, &resolve_global_config(HashMap::new(), &Default::default()).config).diagnostics;
     assert_eq!(diagnostics.len(), 0);
   }

src/configuration/resolve_config.rs

@@ -292,7 +292,8 @@ pub fn resolve_config(config: ConfigKeyMap, global_config: &GlobalConfiguration)
 
 #[cfg(test)]
 mod tests {
-  use dprint_core::configuration::{resolve_global_config, NewLineKind};
+  use dprint_core::configuration::resolve_global_config;
+  use dprint_core::configuration::NewLineKind;
   use std::collections::HashMap;
 
   use super::super::builder::ConfigurationBuilder;

src/configuration/types.rs

@@ -1,6 +1,7 @@
 use dprint_core::configuration::*;
 use dprint_core::generate_str_to_from;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 
 /// Semi colon possibilities.
 #[derive(Clone, PartialEq, Copy, Serialize, Deserialize)]
@@ -206,7 +207,7 @@ pub enum JsxQuoteStyle {
 
 generate_str_to_from![JsxQuoteStyle, [PreferDouble, "preferDouble"], [PreferSingle, "preferSingle"]];
 
-/// How to decide to use single or double quotes.
+/// Behaviour to use for quotes on property names.
 #[derive(Clone, PartialEq, Copy, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum QuoteProps {
@@ -216,12 +217,7 @@ pub enum QuoteProps {
   AsNeeded,
 }
 
-generate_str_to_from![
-  QuoteProps,
-  [Preserve, "preserve"],
-  [AsNeeded, "asNeeded"]
-];
-
+generate_str_to_from![QuoteProps, [Preserve, "preserve"], [AsNeeded, "asNeeded"]];
 
 /// Whether to surround a JSX element or fragment with parentheses
 /// when it's the top JSX node and it spans multiple lines.

src/generation/context.rs

@@ -4,7 +4,8 @@ use deno_ast::swc::common::Span;
 use deno_ast::swc::common::Spanned;
 use deno_ast::swc::parser::token::TokenAndSpan;
 use deno_ast::view::*;
-use dprint_core::formatting::{ConditionReference, Info};
+use dprint_core::formatting::ConditionReference;
+use dprint_core::formatting::Info;
 use rustc_hash::FxHashMap;
 use rustc_hash::FxHashSet;
 

src/generation/generate.rs

@@ -1,12 +1,18 @@
-use deno_ast::swc::common::comments::{Comment, CommentKind};
-use deno_ast::swc::common::{BytePos, Span, Spanned};
+use deno_ast::swc::common::comments::Comment;
+use deno_ast::swc::common::comments::CommentKind;
+use deno_ast::swc::common::BytePos;
+use deno_ast::swc::common::Span;
+use deno_ast::swc::common::Spanned;
 use deno_ast::swc::parser::lexer::util::CharExt;
-use deno_ast::swc::parser::token::{Token, TokenAndSpan};
+use deno_ast::swc::parser::token::Token;
+use deno_ast::swc::parser::token::TokenAndSpan;
 use deno_ast::view::*;
 use deno_ast::MediaType;
 use deno_ast::ParsedSource;
+use dprint_core::formatting::condition_resolvers;
+use dprint_core::formatting::conditions::*;
+use dprint_core::formatting::ir_helpers::*;
 use dprint_core::formatting::*;
-use dprint_core::formatting::{condition_resolvers, conditions::*, ir_helpers::*};
 use std::rc::Rc;
 
 use super::sorting::*;
@@ -3506,28 +3512,27 @@ fn gen_string_literal<'a>(node: &'a Str, context: &mut Context<'a>) -> PrintItem
       Node::TsGetterSignature(parent) => match_key_expr(parent.key),
       Node::TsSetterSignature(parent) => match_key_expr(parent.key),
       Node::TsMethodSignature(parent) => match_key_expr(parent.key),
-      _ => false
+      _ => false,
     }
   }
 
   fn match_key_expr(key: Expr) -> bool {
     match key {
-        Expr::Lit(Lit::Str(_str)) => true,
-        Expr::Tpl(_tpl) => true,
-        _ => false
+      Expr::Lit(Lit::Str(_str)) => true,
+      Expr::Tpl(_tpl) => true,
+      _ => false,
     }
   }
   fn match_key_prop_name(key: PropName) -> bool {
     match key {
       PropName::Str(_str) => true,
-      _ => false
+      _ => false,
     }
   }
-  
 
   fn get_string_literal_text(string_value: String, is_jsx_attribute: bool, should_remove_quotes_if_identifier: bool, context: &mut Context) -> String {
     if should_remove_quotes_if_identifier && is_valid_identifier(&string_value) {
-      return string_value
+      return string_value;
     }
     return if is_jsx_attribute {
       // JSX attributes cannot contain escaped quotes so regardless of
@@ -3547,12 +3552,14 @@ fn gen_string_literal<'a>(node: &'a Str, context: &mut Context<'a>) -> PrintItem
     };
 
     fn is_valid_identifier(string_value: &str) -> bool {
-      if string_value.len() == 0 { return false }
+      if string_value.len() == 0 {
+        return false;
+      }
       for (i, c) in string_value.chars().enumerate() {
         if (i == 0 && !c.is_ident_start()) || !c.is_ident_part() {
-          return false
+          return false;
         }
-      };
+      }
       true
     }
 

src/generation/sorting/mod.rs

@@ -1,7 +1,8 @@
 mod module_specifiers;
 use module_specifiers::*;
 
-use deno_ast::swc::common::{Span, Spanned};
+use deno_ast::swc::common::Span;
+use deno_ast::swc::common::Spanned;
 use deno_ast::view::*;
 use std::cmp::Ordering;
 

src/swc.rs

@@ -2,7 +2,9 @@ use anyhow::anyhow;
 use anyhow::bail;
 use anyhow::Result;
 use deno_ast::swc::parser::error::SyntaxError;
-use deno_ast::{Diagnostic, ParsedSource, SourceTextInfo};
+use deno_ast::Diagnostic;
+use deno_ast::ParsedSource;
+use deno_ast::SourceTextInfo;
 use std::path::Path;
 
 pub fn parse_swc_ast(file_path: &Path, file_text: &str) -> Result<ParsedSource> {

src/utils/char_iterator.rs

@@ -1,4 +1,5 @@
-use std::{iter::Peekable, str::Chars};
+use std::iter::Peekable;
+use std::str::Chars;
 
 pub trait IteratorCharExt: Iterator<Item = char> {
   fn peek(&mut self) -> Option<&char>;