Switch to mise, update precious config, and fix various linting issues

Author: autarch

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
-members = [ "generator", "integration", "macros" ]
-exclude = [ "test-project" ]
+members = ["generator", "integration", "macros"]
+exclude = ["test-project"]
 resolver = "2"
 
 [workspace.metadata.release]

README.md

@@ -1,5 +1,5 @@
-This repo contains a [tool to generate Rust code from Tailwind CSS](generator)
-and [a set of macros for working with that generated code](macros).
+This repo contains a [tool to generate Rust code from Tailwind CSS](generator) and
+[a set of macros for working with that generated code](macros).
 
 See the docs for those crates for more details.
 

_typos.toml

@@ -0,0 +1,4 @@
+[default.extend-words]
+# These are mod names for these groups of CSS classes.
+siz = "siz"
+typ = "typ"

dev/bin/install-dev-tools.sh

@@ -8,43 +8,40 @@
 
 ## v0.3.0 - 2023-02-18
 
-- The generated code now groups CSS classes into modules instead of
-  structs. This prevents stack overflows that happened when the structs were
-  put on the stack. Thanks to @mdochdev for identifying the issue and
-  suggesting this fix. GH #4.
+- The generated code now groups CSS classes into modules instead of structs. This prevents stack
+  overflows that happened when the structs were put on the stack. Thanks to @mdochdev for
+  identifying the issue and suggesting this fix. GH #4.
 
 - Updated the class categories for the latest TailwindCSS version, 3.2.7.
 
 ## v0.2.0 - 2023-02-05
 
 - Updated the class categories for the latest TailwindCSS version, 3.2.4.
 
-- Updated the docs to make it clearer how to configure `tailwind.config.js`
-  depending on whether or not you're using the macros, what templating system
-  you're using, etc.
+- Updated the docs to make it clearer how to configure `tailwind.config.js` depending on whether or
+  not you're using the macros, what templating system you're using, etc.
 
 ## v0.1.4 - 2022-04-24
 
-- Added a new `--tailwindcss` argument. This can be used to provide the path
-  to the `tailwindcss` executable.
+- Added a new `--tailwindcss` argument. This can be used to provide the path to the `tailwindcss`
+  executable.
 
 ## v0.1.3 - 2022-02-17
 
 - Documentation fixes.
 
 ## v0.1.2 - 2022-02-14
 
-- Fixed the handling of CSS class names with periods and forward slashes. The
-  generated Rust code included an escape for these names, so they'd end up as
-  things like `w-0\.5` or `w-3\/5` in your HTML, which is wrong. They should
-  not have a backslash escape in the generated HTML. Note that this also means
-  that the tailwind extractor code in the generator's `README.md` was wrong as
-  well. It has also been fixed.
+- Fixed the handling of CSS class names with periods and forward slashes. The generated Rust code
+  included an escape for these names, so they'd end up as things like `w-0\.5` or `w-3\/5` in your
+  HTML, which is wrong. They should not have a backslash escape in the generated HTML. Note that
+  this also means that the tailwind extractor code in the generator's `README.md` was wrong as well.
+  It has also been fixed.
 
 ## v0.1.1 - 2022-02-08
 
-- Fixed the repository metadata for the crate. Thanks to @overlisted on the
-  Dioxus Discord for pointing this out.
+- Fixed the repository metadata for the crate. Thanks to @overlisted on the Dioxus Discord for
+  pointing this out.
 
 ## v0.1.0 - 2022-02-08
 

generator/Changes.md

@@ -1,19 +1,16 @@
-The `tailwindcss-to-rust` CLI tool generates Rust code that allows you to
-refer to Tailwind classes from your Rust code. This means that any attempt to
-use a nonexistent class will lead to a compile-time error, and you can use
-code completion to list available classes.
+The `tailwindcss-to-rust` CLI tool generates Rust code that allows you to refer to Tailwind classes
+from your Rust code. This means that any attempt to use a nonexistent class will lead to a
+compile-time error, and you can use code completion to list available classes.
 
 **This tool has been tested with version 3.2.x of Tailwind.**
 
-The generated code allows you to use Tailwind CSS classes in your Rust
-frontend code with compile-time checking of names and code completion for
-class names. These classes are grouped together based on the heading in the
-Tailwind docs. It also generates code for the full list of Tailwind modifiers
-like `lg`, `hover`, etc.
+The generated code allows you to use Tailwind CSS classes in your Rust frontend code with
+compile-time checking of names and code completion for class names. These classes are grouped
+together based on the heading in the Tailwind docs. It also generates code for the full list of
+Tailwind modifiers like `lg`, `hover`, etc.
 
-[**Check out the tailwindcss-to-rust-macros
-crate**](https://crates.io/crates/tailwindcss-to-rust-macros) for the most
-ergonomic way to use the code generated by this tool.
+[**Check out the tailwindcss-to-rust-macros crate**](https://crates.io/crates/tailwindcss-to-rust-macros)
+for the most ergonomic way to use the code generated by this tool.
 
 So instead of this:
 
@@ -27,8 +24,8 @@ You can write this:
 let class = C![C::spc::pt_4 C::pb_2 C::typ::text_white];
 ```
 
-Note that the typo in the first example, **"text-whit"** (missing the "e")
-would become a compile-time error if you wrote `C::typ::text_whit`.
+Note that the typo in the first example, **"text-whit"** (missing the "e") would become a
+compile-time error if you wrote `C::typ::text_whit`.
 
 Here's a quick start recipe:
 
@@ -38,23 +35,20 @@ Here's a quick start recipe:
    cargo install tailwindcss-to-rust
    ```
 
-2. [Install the `tailwindcss` CLI
-   tool](https://tailwindcss.com/docs/installation). You can install it with
-   `npm` or `npx`, or you can [download a standalone binary from the
-   tailwindcss repo](https://github.com/tailwindlabs/tailwindcss/releases).
+2. [Install the `tailwindcss` CLI tool](https://tailwindcss.com/docs/installation). You can install
+   it with `npm` or `npx`, or you can
+   [download a standalone binary from the tailwindcss repo](https://github.com/tailwindlabs/tailwindcss/releases).
 
 3. Create a `tailwind.config.js` file with the tool by running:
 
    ```sh
    tailwindcss init
    ```
 
-4. Edit this file however you like to add plugins or customize the generated
-   CSS.
+4. Edit this file however you like to add plugins or customize the generated CSS.
 
-5. Create a CSS input file for Tailwind. For the purposes of this example we
-   will assume that it's located at `css/tailwind.css`. The standard file
-   looks like this:
+5. Create a CSS input file for Tailwind. For the purposes of this example we will assume that it's
+   located at `css/tailwind.css`. The standard file looks like this:
 
    ```css
    @tailwind base;
@@ -72,12 +66,10 @@ Here's a quick start recipe:
         --rustfmt
    ```
 
-   **The `tailwindcss` executable must be in your `PATH` when you run
-   `tailwindcss-to-rust` or you must provide the path to the executable in the
-   `--tailwindcss` argument.**
+   **The `tailwindcss` executable must be in your `PATH` when you run `tailwindcss-to-rust` or you
+   must provide the path to the executable in the `--tailwindcss` argument.**
 
-7. Edit your `tailwind.config.js` file to look in your Rust files for Tailwind
-   class names:
+7. Edit your `tailwind.config.js` file to look in your Rust files for Tailwind class names:
 
    ```js
    /** @type {import('tailwindcss').Config} */
@@ -91,10 +83,7 @@ Here's a quick start recipe:
              if (rs.startsWith("two_")) {
                rs = rs.replace("two_", "2");
              }
-             return rs
-               .replaceAll("_of_", "/")
-               .replaceAll("_p_", ".")
-               .replaceAll("_", "-");
+             return rs.replaceAll("_of_", "/").replaceAll("_p_", ".").replaceAll("_", "-");
            };
 
            let one_class_re = "\\bC::[a-z0-9_]+::([a-z0-9_]+)\\b";
@@ -129,21 +118,15 @@ Here's a quick start recipe:
    };
    ```
 
-   **Note that you may need to customize the regexes in the
-   `extract` function to match your templating system!** The regexes in this
-   example will match the syntax you'd use with the
-   [tailwindcss-to-rust-macros](https://crates.io/crates/tailwindcss-to-rust-macros)
-   crate.
+   **Note that you may need to customize the regexes in the `extract` function to match your
+   templating system!** The regexes in this example will match the syntax you'd use with the
+   [tailwindcss-to-rust-macros](https://crates.io/crates/tailwindcss-to-rust-macros) crate.
 
-   For example, if you're using [askama](https://crates.io/crates/askama)
-   without the macros then you will need to match something like this:
+   For example, if you're using [askama](https://crates.io/crates/askama) without the macros then
+   you will need to match something like this:
 
    ```html
-   <div
-     class="{{ M::hover }}:{{ C::bg::bg_rose_500 }} {{ C::bg::bg_rose_800 }}"
-   >
-     ...
-   </div>
+   <div class="{{ M::hover }}:{{ C::bg::bg_rose_500 }} {{ C::bg::bg_rose_800 }}">...</div>
    ```
 
    The regexes for that would look something like this:
@@ -169,9 +152,9 @@ Here's a quick start recipe:
     <link data-trunk rel="css" href="/css/tailwind_compiled.css" />
     ```
 
-In this example, I'm using [Trunk](https://trunkrs.dev/), which is a great
-alternative to webpack for projects that want to use Rust -> WASM without any
-node.js tooling. My `Trunk.toml` looks like this:
+In this example, I'm using [Trunk](https://trunkrs.dev/), which is a great alternative to webpack
+for projects that want to use Rust -> WASM without any node.js tooling. My `Trunk.toml` looks like
+this:
 
 ```toml
 [build]
@@ -192,26 +175,23 @@ When I run `trunk` I have to make sure to ignore that generated file:
 trunk --ignore ./css/tailwind_compiled.css ...
 ```
 
-The generated names consist of all the class names present in the CSS file,
-except names that start with a dash (`-`), names that contain pseudo-elements,
-like `.placeholder-opacity-100::-moz-placeholder`, and names that contain
-modifiers like `lg` or `hover`. Names are transformed into Rust identifiers
-using the following algorithm:
+The generated names consist of all the class names present in the CSS file, except names that start
+with a dash (`-`), names that contain pseudo-elements, like
+`.placeholder-opacity-100::-moz-placeholder`, and names that contain modifiers like `lg` or `hover`.
+Names are transformed into Rust identifiers using the following algorithm:
 
 - All backslash escapes are removed entirely, for example in `.inset-0\.5`.
 - All dashes (`-`) become underscores (`_`).
 - All periods (`.`) become `_p_`, so `.inset-2\.5` becomes `inset_2_p_5`.
-- All forward slashes (`/`) become `_of_`, so `.inset-2\/4` becomes
-  `inset_2_of_4`.
-- If a name _starts_ with a `2`, as in `2xl`, it becomes `two_`, so the `2xl`
-  modifier becomes `two_xl`.
+- All forward slashes (`/`) become `_of_`, so `.inset-2\/4` becomes `inset_2_of_4`.
+- If a name _starts_ with a `2`, as in `2xl`, it becomes `two_`, so the `2xl` modifier becomes
+  `two_xl`.
 - The name `static` becomes `static_`.
 
-The generated code provides two modules containing all of the relevant
-strings.
+The generated code provides two modules containing all of the relevant strings.
 
-The `C` module contains a number of submodules, one for each group of classes
-as documented in the TailwindCSS docs. The groups are as follows:
+The `C` module contains a number of submodules, one for each group of classes as documented in the
+TailwindCSS docs. The groups are as follows:
 
 ```rust,ignore
 pub(crate) mod C {
@@ -262,20 +242,19 @@ pub(crate) mod C {
 }
 ```
 
-In your code, you can refer to classes with `C::typ::text_lg` or
-`C::lay::flex`. If you have any custom classes, these will end in an "unknown"
-group available from `C::unk`. Adding a way to put these custom classes in
-other groups is a todo item.
+In your code, you can refer to classes with `C::typ::text_lg` or `C::lay::flex`. If you have any
+custom classes, these will end in an "unknown" group available from `C::unk`. Adding a way to put
+these custom classes in other groups is a todo item.
 
-The modifiers have their own module, `M`, which contains one field per
-modifier, so it's used as `M::lg` or `M::hover`. A few modifiers which are
-parameterizable are not included, like `aria-*`, `data-*`, etc.
+The modifiers have their own module, `M`, which contains one field per modifier, so it's used as
+`M::lg` or `M::hover`. A few modifiers which are parameterizable are not included, like `aria-*`,
+`data-*`, etc.
 
-The best way to understand the generated modules is to open the generated code
-file in your editor and look at it.
+The best way to understand the generated modules is to open the generated code file in your editor
+and look at it.
 
-Then you can import these consts in your code and use them to refer to
-Tailwind CSS class names with compile time checking:
+Then you can import these consts in your code and use them to refer to Tailwind CSS class names with
+compile time checking:
 
 ```rust,ignore
 element.set_class(C::lay::aspect_auto);

generator/README.md

@@ -1,14 +1,14 @@
 #!/bin/bash
 
+declare -i status
 status=0
 
 PRECIOUS=$(which precious)
 if [[ -z $PRECIOUS ]]; then
     PRECIOUS=./bin/precious
 fi
 
-"$PRECIOUS" lint -s
-if (( $? != 0 )); then
+if ! "$PRECIOUS" lint -s; then
     status+=1
 fi
 

git/hooks/pre-commit.sh

@@ -1,16 +1,16 @@
 ## v0.1.3 - 2023-02-18
 
-- Updated the docs to reflect the changes in version 0.3.0 of the
-  tailwindcss-to-rust code generator.
+- Updated the docs to reflect the changes in version 0.3.0 of the tailwindcss-to-rust code
+  generator.
 
 ## v0.1.2 - 2022-02-17
 
 - Documentation and example fixes.
 
 ## v0.1.1 - 2022-02-08
 
-- Fixed the repository metadata for this crate. Thanks to @overlisted on the
-  Dioxus Discord for pointing this out.
+- Fixed the repository metadata for this crate. Thanks to @overlisted on the Dioxus Discord for
+  pointing this out.
 
 ## v0.1.0 - 2022-02-08
 

macros/Changes.md

@@ -1,10 +1,9 @@
 Helper macros for using the code generated by
 [tailwindcss-to-rust](https://crates.io/crates/tailwindcss-to-rust).
 
-The generated code provides a number of static structs where each field is
-a class name or modifier (like "lg" or "hover"). In typical use, you need
-to combine multiple names and modifiers into a single string to be set as
-an element's `class` attribute. This crate provides two macros to make
+The generated code provides a number of static structs where each field is a class name or modifier
+(like "lg" or "hover"). In typical use, you need to combine multiple names and modifiers into a
+single string to be set as an element's `class` attribute. This crate provides two macros to make
 using this a bit more ergonomic.
 
 A [Dioxus](https://dioxuslabs.com/) example:

macros/README.md

@@ -0,0 +1,9 @@
+[tools]
+node = "24.14.0"
+"npm:prettier" = "3.8.1"
+shellcheck = "0.11.0"
+shfmt = "3.13.0"
+taplo = "0.10.0"
+typos = "1.44.0"
+"github:houseabsolute/omegasort" = "0.1.3"
+"github:houseabsolute/precious" = "0.10.2"