Allow using generated assets

Author: skreborn

packages/manganis/manganis-macro/.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+rustdocflags = ['--cfg', 'skip_out_tests']

…manganis-macro/assets/manganis_macro.dat …s/manganis-macro/out/generated-asset.txtpackages/manganis/manganis-macro/assets/manganis_macro.dat renamed to packages/manganis/manganis-macro/out/generated-asset.txt packages/manganis/manganis-macro/assets/manganis_macro.dat renamed to packages/manganis/manganis-macro/out/generated-asset.txt

@@ -1,4 +1,4 @@
-use crate::{linker::generate_link_section, resolve_path, AssetParseError};
+use crate::{linker::generate_link_section, AssetParseError, PathResolution, PathResolver};
 use macro_string::MacroString;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{quote, ToTokens};
@@ -44,8 +44,9 @@ impl Parse for AssetParser {
     // But we need to decide the hint first before parsing the options
     fn parse(input: ParseStream) -> syn::Result<Self> {
         // And then parse the options
+        let resolution = input.call(PathResolution::parse)?;
         let (MacroString(src), path_expr) = input.call(crate::parse_with_tokens)?;
-        let asset = resolve_path(&src, path_expr.span());
+        let asset = PathResolver::new(resolution, &src, &path_expr.span()).resolve();
         let _comma = input.parse::<Token![,]>();
         let options = input.parse()?;
 
@@ -133,7 +134,7 @@ impl AssetParser {
                 let asset_tokens = self.expand_asset_tokens(asset);
                 quote! { ::core::option::Option::Some(#asset_tokens) }
             }
-            Err(AssetParseError::AssetDoesntExist { .. }) => {
+            Err(AssetParseError::DoesNotExist { .. }) => {
                 quote! { ::core::option::Option::<manganis::Asset>::None }
             }
             Err(err) => self.error_tokens(err),

packages/manganis/manganis-macro/src/asset.rs

@@ -1,4 +1,4 @@
-use crate::{asset::AssetParser, resolve_path};
+use crate::{asset::AssetParser, PathResolution, PathResolver};
 use macro_string::MacroString;
 use manganis_core::{create_module_hash, get_class_mappings};
 use proc_macro2::{Span, TokenStream};
@@ -17,8 +17,9 @@ pub(crate) struct CssModuleAttribute {
 impl Parse for CssModuleAttribute {
     fn parse(input: ParseStream) -> syn::Result<Self> {
         // Asset path "/path.css"
+        let resolution = input.call(PathResolution::parse)?;
         let (MacroString(src), path_expr) = input.call(crate::parse_with_tokens)?;
-        let asset = resolve_path(&src, path_expr.span());
+        let asset = PathResolver::new(resolution, &src, &path_expr.span()).resolve();
 
         let _comma = input.parse::<Comma>();