Add options to handle wrapped classes to extend the set of use cases

[dikkadev]

As discussed in #108, a new CLI option, class_wrapping, is added to cover more use cases in combination with the existing custom_regex option.

If the option is not supplied, the default value is used, and the behavior is not changed from before.

Fixes #108

[praveenperera]

Hey @Sett17 sorry I just saw this, could you resolve conflicts and add some tests and I’ll merge this in?

Thank you!

[dikkadev]

add some tests

Hey, I've already added some tests:

rustywind/rustywind-core/src/sorter.rs

Lines 514 to 607 in f56ca30

	// CLASS WRAPPING
	#[test_case(
	r#"flex-col inline flex"#,
	HowClassesAreWrapped::NoWrapping,
	vec![r#"flex-col"#, r#"inline"#, r#"flex"#]
	; "no wrapping"
	)]
	#[test_case(
	r#"'flex-col', 'inline', 'flex'"#,
	HowClassesAreWrapped::CommaSingleQuotes,
	vec![r#"flex-col"#, r#"inline"#, r#"flex"#]
	; "comma single quotes"
	)]
	#[test_case(
	r#""flex-col", "inline", "flex""#,
	HowClassesAreWrapped::CommaDoubleQuotes,
	vec![r#"flex-col"#, r#"inline"#, r#"flex"#]
	; "comma double quotes"
	)]
	fn test_unwrap_wrapped_classes<'a>(
	input: &str,
	wrapping: HowClassesAreWrapped,
	output: Vec<&str>,
	) {
	assert_eq!(unwrap_wrapped_classes(input, wrapping), output)
	}
	#[test_case(
	vec![r#"flex-col"#, r#"inline"#, r#"flex"#],
	HowClassesAreWrapped::NoWrapping,
	r#"flex-col inline flex"#
	; "no wrapping"
	)]
	#[test_case(
	vec![r#"flex-col"#, r#"inline"#, r#"flex"#],
	HowClassesAreWrapped::CommaSingleQuotes,
	r#"'flex-col', 'inline', 'flex'"#
	; "comma single quotes"
	)]
	#[test_case(
	vec![r#"flex-col"#, r#"inline"#, r#"flex"#],
	HowClassesAreWrapped::CommaDoubleQuotes,
	r#""flex-col", "inline", "flex""#
	; "comma double quotes"
	)]
	fn test_rewrap_wrapped_classes<'a>(
	input: Vec<&'a str>,
	wrapping: HowClassesAreWrapped,
	output: &str,
	) {
	assert_eq!(rewrap_wrapped_classes(input, wrapping), output)
	}
	#[test_case(
	None,
	HowClassesAreWrapped::NoWrapping,
	r#"<div class="flex-col inline flex"></div>"#,
	r#"<div class="inline flex flex-col"></div>"#
	; "normal HTML use case"
	)]
	#[test_case(
	Some(r#"(?:\[)([_a-zA-Z0-9\.,\-'"\s]+)(?:\])"#),
	HowClassesAreWrapped::CommaSingleQuotes,
	r#"classes = ['flex-col', 'inline', 'flex']"#,
	r#"classes = ['inline', 'flex', 'flex-col']"#
	; "array with single quotes"
	)]
	#[test_case(
	Some(r#"(?:\[)([_a-zA-Z0-9\.,\-'"\s]+)(?:\])"#),
	HowClassesAreWrapped::CommaDoubleQuotes,
	r#"classes = ["flex-col", "inline", "flex"]"#,
	r#"classes = ["inline", "flex", "flex-col"]"#
	; "array with double quotes"
	)]
	fn test_unusual_use_cases(
	regex_overwrite: Option<&str>,
	class_wrapping: HowClassesAreWrapped,
	input: &str,
	output: &str,
	) {
	let regex = match regex_overwrite {
	Some(re) => FinderRegex::CustomRegex(Regex::new(re).unwrap()),
	None => FinderRegex::DefaultRegex,
	};
	let opts = Options {
	regex,
	sorter: Sorter::DefaultSorter,
	allow_duplicates: false,
	class_wrapping,
	};
	assert_eq!(sort_file_contents(input, &opts), output);
	}

Are more or different tests needed?

[dikkadev]

Let me know if this works for you; I can remember having some problems with the workspace setup when I made the changes (although it was 2 months ago, so I probably don't remember it 100%)

[praveenperera]

Thanks @dikkadev, merged, will release 0.23 with this