@prospective.co/procss 0.1.8 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prospective.co/procss",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "A simple CSS parsing and transformation framework.",
   "repository": {
     "type": "git",

package/src/ast/selector/selector_term.rs

@@ -22,25 +22,48 @@ use crate::ast::token::*;
 use crate::parser::*;
 use crate::render::*;
 
+/// pseudo-selectors can be "pseudo-class" or "pseudo-element", and we are only
+/// concerned about the distinction between them in regards to their syntax.
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+pub enum PseudoMode {
+    PseudoClass,
+    PseudoElement,
+}
+
 /// A pseudo-selector component of a `Selector`, including optional argument
 /// selector (parenthesis delimited).
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
 pub struct Pseudo<'a> {
     property: &'a str,
     value: Option<SelectorTerm<'a, Option<&'a str>>>,
+    mode: PseudoMode,
 }
 
 impl<'a> ParseCss<'a> for Pseudo<'a> {
     fn parse<E: ParseError<&'a str>>(input: &'a str) -> IResult<&'a str, Self, E> {
-        let (input, property) = preceded(tuple((tag(":"), opt(tag(":")))), parse_symbol)(input)?;
+        let (input, mode) = tuple((tag(":"), opt(tag(":"))))(input)?;
+        let (input, property) = parse_symbol(input)?;
         let (input, value) = opt(delimited(tag("("), SelectorTerm::parse, tag(")")))(input)?;
-        Ok((input, Pseudo { property, value }))
+        let mode = mode
+            .1
+            .map(|_| PseudoMode::PseudoElement)
+            .unwrap_or(PseudoMode::PseudoClass);
+
+        Ok((input, Pseudo {
+            property,
+            value,
+            mode,
+        }))
     }
 }
 
 impl<'a> RenderCss for Pseudo<'a> {
     fn render(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, ":{}", self.property)?;
+        match self.mode {
+            PseudoMode::PseudoClass => write!(f, ":{}", self.property)?,
+            PseudoMode::PseudoElement => write!(f, "::{}", self.property)?,
+        };
+
         if let Some(x) = self.value.as_ref() {
             write!(f, "(")?;
             x.render(f)?;
@@ -283,7 +306,7 @@ mod tests {
                 tag: Some("div"),
                 pseudo,
                 ..
-            })) if pseudo.len() == 1 && matches!(pseudo[0], Pseudo{property: "hover", value: None })
+            })) if pseudo.len() == 1 && matches!(pseudo[0], Pseudo{property: "hover", value: None, mode: PseudoMode::PseudoClass })
         )
     }
 
@@ -295,7 +318,7 @@ mod tests {
                 tag: Some("div"),
                 pseudo,
                 ..
-            })) if pseudo.len() == 1 && matches!(pseudo[0], Pseudo{ property: "not", value: Some(_) })
+            })) if pseudo.len() == 1 && matches!(pseudo[0], Pseudo{ property: "not", value: Some(_), mode: PseudoMode::PseudoClass })
         )
     }
 
@@ -307,7 +330,7 @@ mod tests {
                 tag: Some("div"),
                 pseudo,
                 ..
-            })) if pseudo.len() == 1 && matches!(pseudo[0], Pseudo{ property: "nth-child", value: Some(_) })
+            })) if pseudo.len() == 1 && matches!(pseudo[0], Pseudo{ property: "nth-child", value: Some(_), mode: PseudoMode::PseudoClass })
         )
     }
 
@@ -322,4 +345,28 @@ mod tests {
             Ok("div:nth-child(2)")
         )
     }
+
+    #[test]
+    fn test_pesudo_element() {
+        assert_matches!(
+            SelectorTerm::parse::<()>("div::-webkit-scroll-thumb"),
+            Ok(("", SelectorTerm {
+                tag: Some("div"),
+                pseudo,
+                ..
+            })) if pseudo.len() == 1 && matches!(pseudo[0], Pseudo{property: "-webkit-scroll-thumb", value: None, mode: PseudoMode::PseudoElement })
+        )
+    }
+
+    #[test]
+    fn test_pesudo_element_renders_correctly() {
+        assert_matches!(
+            SelectorTerm::<Option<&str>>::parse::<nom::error::VerboseError<&str>>(
+                "div::-webkit-scroll-thumb"
+            )
+            .map(|x| x.as_css_string())
+            .as_deref(),
+            Ok("div::-webkit-scroll-thumb")
+        )
+    }
 }

package/src/lib.rs

@@ -86,7 +86,11 @@ mod parser;
 mod render;
 mod transform;
 pub mod transformers;
-mod utils;
+#[cfg(feature = "iotest")]
+pub mod utils;
+
+#[cfg(not(feature = "iotest"))]
+pub mod utils;
 
 use self::ast::Tree;
 pub use self::builder::BuildCss;

package/src/transformers/inline_url.rs

@@ -30,7 +30,12 @@ fn parse_url(input: &str) -> nom::IResult<&str, &str> {
 fn into_data_uri<'a>(path: &Path) -> Cow<'a, str> {
     let contents = fs::read_to_string(path).expect("Error reading file");
     let encoded = base64::encode(contents);
-    format!("url(data:image/svg+xml;base64,{})", encoded).into()
+    let fff = path.extension().unwrap_or_default().to_string_lossy();
+    let fmt = match fff.as_ref() {
+        "png" => "png",
+        _ => "svg+xml",
+    };
+    format!("url(\"data:image/{};base64,{}\")", fmt, encoded).into()
 }
 
 fn inline_url_impl<'a>(newpath: &str, flat: &mut Css<'a>) {
@@ -40,7 +45,9 @@ fn inline_url_impl<'a>(newpath: &str, flat: &mut Css<'a>) {
             .and_then(|x| x.0.is_empty().then_some(Path::new(newpath).join(x.1)));
 
         if let Some(path) = &path {
-            rule.value = into_data_uri(path);
+            if path.starts_with(".") || path.starts_with("/") {
+                rule.value = into_data_uri(path);
+            }
         }
     })
 }

package/target/cjs/procss.js

@@ -177,32 +177,54 @@ class BuildCss {
 }
 module.exports.BuildCss = BuildCss;
 
-module.exports.__wbindgen_error_new = function(arg0, arg1) {
-    const ret = new Error(getStringFromWasm0(arg0, arg1));
+module.exports.__wbindgen_throw = function(arg0, arg1) {
+    throw new Error(getStringFromWasm0(arg0, arg1));
+};
+
+module.exports.__wbindgen_string_new = function(arg0, arg1) {
+    const ret = getStringFromWasm0(arg0, arg1);
     return addHeapObject(ret);
 };
 
+module.exports.__wbindgen_is_string = function(arg0) {
+    const ret = typeof(getObject(arg0)) === 'string';
+    return ret;
+};
+
+module.exports.__wbindgen_object_drop_ref = function(arg0) {
+    takeObject(arg0);
+};
+
 module.exports.__wbg_new_268f7b7dd3430798 = function() {
     const ret = new Map();
     return addHeapObject(ret);
 };
 
-module.exports.__wbindgen_string_new = function(arg0, arg1) {
-    const ret = getStringFromWasm0(arg0, arg1);
+module.exports.__wbg_set_933729cf5b66ac11 = function(arg0, arg1, arg2) {
+    const ret = getObject(arg0).set(getObject(arg1), getObject(arg2));
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_set_933729cf5b66ac11 = function(arg0, arg1, arg2) {
-    const ret = getObject(arg0).set(getObject(arg1), getObject(arg2));
+module.exports.__wbg_new_0b9bfdd97583284e = function() {
+    const ret = new Object();
     return addHeapObject(ret);
 };
 
-module.exports.__wbindgen_object_drop_ref = function(arg0) {
-    takeObject(arg0);
+module.exports.__wbg_String_91fba7ded13ba54c = function(arg0, arg1) {
+    const ret = String(getObject(arg1));
+    const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    getInt32Memory0()[arg0 / 4 + 1] = len0;
+    getInt32Memory0()[arg0 / 4 + 0] = ptr0;
 };
 
-module.exports.__wbindgen_throw = function(arg0, arg1) {
-    throw new Error(getStringFromWasm0(arg0, arg1));
+module.exports.__wbindgen_error_new = function(arg0, arg1) {
+    const ret = new Error(getStringFromWasm0(arg0, arg1));
+    return addHeapObject(ret);
+};
+
+module.exports.__wbg_set_20cbc34131e76824 = function(arg0, arg1, arg2) {
+    getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
 };
 
 const path = require('path').join(__dirname, 'procss_bg.wasm');

package/target/esm/procss.js

@@ -208,27 +208,45 @@ async function load(module, imports) {
 function getImports() {
     const imports = {};
     imports.wbg = {};
-    imports.wbg.__wbindgen_error_new = function(arg0, arg1) {
-        const ret = new Error(getStringFromWasm0(arg0, arg1));
+    imports.wbg.__wbindgen_throw = function(arg0, arg1) {
+        throw new Error(getStringFromWasm0(arg0, arg1));
+    };
+    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
+        const ret = getStringFromWasm0(arg0, arg1);
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_is_string = function(arg0) {
+        const ret = typeof(getObject(arg0)) === 'string';
+        return ret;
+    };
+    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
+        takeObject(arg0);
+    };
     imports.wbg.__wbg_new_268f7b7dd3430798 = function() {
         const ret = new Map();
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
-        const ret = getStringFromWasm0(arg0, arg1);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbg_set_933729cf5b66ac11 = function(arg0, arg1, arg2) {
         const ret = getObject(arg0).set(getObject(arg1), getObject(arg2));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
-        takeObject(arg0);
+    imports.wbg.__wbg_new_0b9bfdd97583284e = function() {
+        const ret = new Object();
+        return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_throw = function(arg0, arg1) {
-        throw new Error(getStringFromWasm0(arg0, arg1));
+    imports.wbg.__wbg_String_91fba7ded13ba54c = function(arg0, arg1) {
+        const ret = String(getObject(arg1));
+        const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        getInt32Memory0()[arg0 / 4 + 1] = len0;
+        getInt32Memory0()[arg0 / 4 + 0] = ptr0;
+    };
+    imports.wbg.__wbindgen_error_new = function(arg0, arg1) {
+        const ret = new Error(getStringFromWasm0(arg0, arg1));
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_set_20cbc34131e76824 = function(arg0, arg1, arg2) {
+        getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
     };
 
     return imports;