Add more case-conversion functions (#1383)

This commit is contained in:
Giancarlo França 2022-10-27 00:44:18 -03:00 committed by GitHub
parent 4349c1bac8
commit be11a26226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 127 additions and 1 deletions

1
Cargo.lock generated
View File

@ -316,6 +316,7 @@ dependencies = [
"edit-distance", "edit-distance",
"env_logger", "env_logger",
"executable-path", "executable-path",
"heck 0.4.0",
"lazy_static", "lazy_static",
"lexiclean", "lexiclean",
"libc", "libc",

View File

@ -26,6 +26,7 @@ derivative = "2.0.0"
dotenv = "0.15.0" dotenv = "0.15.0"
edit-distance = "2.0.0" edit-distance = "2.0.0"
env_logger = "0.9.0" env_logger = "0.9.0"
heck = "0.4.0"
lazy_static = "1.0.0" lazy_static = "1.0.0"
lexiclean = "0.0.1" lexiclean = "0.0.1"
libc = "0.2.0" libc = "0.2.0"

View File

@ -1145,12 +1145,24 @@ The executable is at: /bin/just
- `capitalize(s)`<sup>master</sup> - Convert first character of `s` to uppercase and the rest to lowercase. - `capitalize(s)`<sup>master</sup> - Convert first character of `s` to uppercase and the rest to lowercase.
- `kebabcase(s)`<sup>master</sup> - Convert `s` to `kebab-case`.
- `lowercamelcase(s)`<sup>master</sup> - Convert `s` to `lowerCamelCase`.
- `lowercase(s)` - Convert `s` to lowercase. - `lowercase(s)` - Convert `s` to lowercase.
- `quote(s)` - Replace all single quotes with `'\''` and prepend and append single quotes to `s`. This is sufficient to escape special characters for many shells, including most Bourne shell descendants. - `quote(s)` - Replace all single quotes with `'\''` and prepend and append single quotes to `s`. This is sufficient to escape special characters for many shells, including most Bourne shell descendants.
- `replace(s, from, to)` - Replace all occurrences of `from` in `s` to `to`. - `replace(s, from, to)` - Replace all occurrences of `from` in `s` to `to`.
- `shoutykebabcase(s)`<sup>master</sup> - Convert `s` to `SHOUTY-KEBAB-CASE`.
- `shoutysnakecase(s)`<sup>master</sup> - Convert `s` to `SHOUTY_SNAKE_CASE`.
- `snakecase(s)`<sup>master</sup> - Convert `s` to `snake_case`.
- `titlecase(s)`<sup>master</sup> - Convert `s` to `Title Case`.
- `trim(s)` - Remove leading and trailing whitespace from `s`. - `trim(s)` - Remove leading and trailing whitespace from `s`.
- `trim_end(s)` - Remove trailing whitespace from `s`. - `trim_end(s)` - Remove trailing whitespace from `s`.
@ -1167,6 +1179,8 @@ The executable is at: /bin/just
- `uppercase(s)` - Convert `s` to uppercase. - `uppercase(s)` - Convert `s` to uppercase.
- `uppercamelcase(s)`<sup>master</sup> - Convert `s` to `UpperCamelCase`.
#### Path Manipulation #### Path Manipulation
##### Fallible ##### Fallible

View File

@ -31,7 +31,7 @@ contexts:
- match: '\}\}' - match: '\}\}'
pop: true pop: true
functions: functions:
- match: \b(arch|os|os_family|env_var|env_var_or_default|invocation_directory|justfile|justfile_directory|just_executable|lowercase|quote|replace|trim|trim_end|trim_end_match|trim_end_matches|trim_start|trim_start_match|trim_start_matches|uppercase|absolute_path|extension|file_name|file_stem|parent_directory|without_extension|join|clean|path_exists|error|sha256|sha256_file|uuid|capitalize)\b(?=\() - match: \b(arch|os|os_family|env_var|env_var_or_default|invocation_directory|justfile|justfile_directory|just_executable|lowercase|quote|replace|trim|trim_end|trim_end_match|trim_end_matches|trim_start|trim_start_match|trim_start_matches|uppercase|absolute_path|extension|file_name|file_stem|parent_directory|without_extension|join|clean|path_exists|error|sha256|sha256_file|uuid|capitalize|uppercamelcase|lowercamelcase|snakecase|kebabcase|shoutysnakecase|titlecase|shoutykebabcase)\b(?=\()
scope: entity.name.function.just scope: entity.name.function.just
keywords: keywords:
- match: \b(if|else|while)\b - match: \b(if|else|while)\b

View File

@ -3,6 +3,11 @@
use super::*; use super::*;
use heck::{
ToKebabCase, ToLowerCamelCase, ToShoutyKebabCase, ToShoutySnakeCase, ToSnakeCase, ToTitleCase,
ToUpperCamelCase,
};
use Function::*; use Function::*;
pub(crate) enum Function { pub(crate) enum Function {
Nullary(fn(&FunctionContext) -> Result<String, String>), Nullary(fn(&FunctionContext) -> Result<String, String>),
@ -29,6 +34,8 @@ lazy_static! {
("just_executable", Nullary(just_executable)), ("just_executable", Nullary(just_executable)),
("justfile", Nullary(justfile)), ("justfile", Nullary(justfile)),
("justfile_directory", Nullary(justfile_directory)), ("justfile_directory", Nullary(justfile_directory)),
("kebabcase", Unary(kebabcase)),
("lowercamelcase", Unary(lowercamelcase)),
("lowercase", Unary(lowercase)), ("lowercase", Unary(lowercase)),
("os", Nullary(os)), ("os", Nullary(os)),
("os_family", Nullary(os_family)), ("os_family", Nullary(os_family)),
@ -38,6 +45,10 @@ lazy_static! {
("replace", Ternary(replace)), ("replace", Ternary(replace)),
("sha256", Unary(sha256)), ("sha256", Unary(sha256)),
("sha256_file", Unary(sha256_file)), ("sha256_file", Unary(sha256_file)),
("shoutykebabcase", Unary(shoutykebabcase)),
("shoutysnakecase", Unary(shoutysnakecase)),
("snakecase", Unary(snakecase)),
("titlecase", Unary(titlecase)),
("trim", Unary(trim)), ("trim", Unary(trim)),
("trim_end", Unary(trim_end)), ("trim_end", Unary(trim_end)),
("trim_end_match", Binary(trim_end_match)), ("trim_end_match", Binary(trim_end_match)),
@ -45,6 +56,7 @@ lazy_static! {
("trim_start", Unary(trim_start)), ("trim_start", Unary(trim_start)),
("trim_start_match", Binary(trim_start_match)), ("trim_start_match", Binary(trim_start_match)),
("trim_start_matches", Binary(trim_start_matches)), ("trim_start_matches", Binary(trim_start_matches)),
("uppercamelcase", Unary(uppercamelcase)),
("uppercase", Unary(uppercase)), ("uppercase", Unary(uppercase)),
("uuid", Nullary(uuid)), ("uuid", Nullary(uuid)),
("without_extension", Unary(without_extension)), ("without_extension", Unary(without_extension)),
@ -225,6 +237,14 @@ fn justfile_directory(context: &FunctionContext) -> Result<String, String> {
}) })
} }
fn kebabcase(_context: &FunctionContext, s: &str) -> Result<String, String> {
Ok(s.to_kebab_case())
}
fn lowercamelcase(_context: &FunctionContext, s: &str) -> Result<String, String> {
Ok(s.to_lower_camel_case())
}
fn lowercase(_context: &FunctionContext, s: &str) -> Result<String, String> { fn lowercase(_context: &FunctionContext, s: &str) -> Result<String, String> {
Ok(s.to_lowercase()) Ok(s.to_lowercase())
} }
@ -283,6 +303,22 @@ fn sha256_file(context: &FunctionContext, path: &str) -> Result<String, String>
Ok(format!("{:x}", hash)) Ok(format!("{:x}", hash))
} }
fn shoutykebabcase(_context: &FunctionContext, s: &str) -> Result<String, String> {
Ok(s.to_shouty_kebab_case())
}
fn shoutysnakecase(_context: &FunctionContext, s: &str) -> Result<String, String> {
Ok(s.to_shouty_snake_case())
}
fn snakecase(_context: &FunctionContext, s: &str) -> Result<String, String> {
Ok(s.to_snake_case())
}
fn titlecase(_context: &FunctionContext, s: &str) -> Result<String, String> {
Ok(s.to_title_case())
}
fn trim(_context: &FunctionContext, s: &str) -> Result<String, String> { fn trim(_context: &FunctionContext, s: &str) -> Result<String, String> {
Ok(s.trim().to_owned()) Ok(s.trim().to_owned())
} }
@ -311,6 +347,10 @@ fn trim_start_matches(_context: &FunctionContext, s: &str, pat: &str) -> Result<
Ok(s.trim_start_matches(pat).to_owned()) Ok(s.trim_start_matches(pat).to_owned())
} }
fn uppercamelcase(_context: &FunctionContext, s: &str) -> Result<String, String> {
Ok(s.to_upper_camel_case())
}
fn uppercase(_context: &FunctionContext, s: &str) -> Result<String, String> { fn uppercase(_context: &FunctionContext, s: &str) -> Result<String, String> {
Ok(s.to_uppercase()) Ok(s.to_uppercase())
} }

View File

@ -283,6 +283,76 @@ test! {
stderr: "echo bar\n", stderr: "echo bar\n",
} }
test! {
name: uppercamelcase,
justfile: "
foo:
echo {{ uppercamelcase('foo bar') }}
",
stdout: "FooBar\n",
stderr: "echo FooBar\n",
}
test! {
name: lowercamelcase,
justfile: "
foo:
echo {{ lowercamelcase('foo bar') }}
",
stdout: "fooBar\n",
stderr: "echo fooBar\n",
}
test! {
name: snakecase,
justfile: "
foo:
echo {{ snakecase('foo bar') }}
",
stdout: "foo_bar\n",
stderr: "echo foo_bar\n",
}
test! {
name: kebabcase,
justfile: "
foo:
echo {{ kebabcase('foo bar') }}
",
stdout: "foo-bar\n",
stderr: "echo foo-bar\n",
}
test! {
name: shoutysnakecase,
justfile: "
foo:
echo {{ shoutysnakecase('foo bar') }}
",
stdout: "FOO_BAR\n",
stderr: "echo FOO_BAR\n",
}
test! {
name: titlecase,
justfile: "
foo:
echo {{ titlecase('foo bar') }}
",
stdout: "Foo Bar\n",
stderr: "echo Foo Bar\n",
}
test! {
name: shoutykebabcase,
justfile: "
foo:
echo {{ shoutykebabcase('foo bar') }}
",
stdout: "FOO-BAR\n",
stderr: "echo FOO-BAR\n",
}
test! { test! {
name: trim, name: trim,
justfile: " justfile: "