@prospective.co/procss 0.1.11 → 0.1.13

package/package.json

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

package/src/builder.rs

@@ -10,7 +10,7 @@
 // └───────────────────────────────────────────────────────────────────────────┘
 
 use std::collections::HashMap;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use anyhow::Context;
 
@@ -25,15 +25,15 @@ use crate::{ast, transformers, utils};
 /// A CSS+ project build, comprising a collection of CSS+ files which may
 /// reference eachother (via `@import`).
 pub struct BuildCss<'a> {
-    paths: Vec<String>,
-    contents: HashMap<&'a str, String>,
-    trees: HashMap<&'a str, ast::Tree<'a>>,
-    css: HashMap<&'a str, ast::Css<'a>>,
-    rootdir: String,
+    paths: Vec<PathBuf>,
+    contents: HashMap<&'a Path, String>,
+    trees: HashMap<&'a Path, ast::Tree<'a>>,
+    css: HashMap<&'a Path, ast::Css<'a>>,
+    rootdir: PathBuf,
 }
 
 /// The compiled output of a [`BuildCss`] collection, obtained from
-/// [`BuildCss::compile`].  
+/// [`BuildCss::compile`].
 pub struct CompiledCss<'a>(&'a BuildCss<'a>);
 
 /// An incremental build struct for compiling a project's CSS sources.
@@ -47,7 +47,7 @@ pub struct CompiledCss<'a>(&'a BuildCss<'a>);
 /// ```
 impl<'a> BuildCss<'a> {
     /// Create a new [`BuildCss`] rooted at `rootdir`.
-    pub fn new<S: Into<String>>(rootdir: S) -> Self {
+    pub fn new<P: Into<PathBuf>>(rootdir: P) -> Self {
         Self {
             paths: Default::default(),
             contents: Default::default(),
@@ -59,17 +59,17 @@ impl<'a> BuildCss<'a> {
 
     /// Add a file `path` to this build.
     #[cfg(not(target_arch = "wasm32"))]
-    pub fn add_file(&mut self, path: &'a str) {
-        self.paths.push(path.to_owned());
-        let inpath = PathBuf::from(&self.rootdir).join(path);
-        let txt = fs::read_to_string(inpath.as_path()).unwrap();
-        self.contents.insert(path, txt);
+    pub fn add_file<P: ?Sized + AsRef<Path>>(&mut self, path: &'a P) {
+        self.paths.push(path.as_ref().into());
+        let inpath = self.rootdir.join(path);
+        let txt = fs::read_to_string(&inpath).unwrap();
+        self.contents.insert(path.as_ref(), txt);
     }
 
     /// Add a file `path` to this build.
-    pub fn add_content(&mut self, path: &'a str, scss: String) {
-        self.paths.push(path.to_owned());
-        self.contents.insert(path, scss);
+    pub fn add_content<P: ?Sized + AsRef<Path>>(&mut self, path: &'a P, scss: String) {
+        self.paths.push(path.as_ref().into());
+        self.contents.insert(path.as_ref(), scss);
     }
 
     /// Compile this [`BuildCss`] start-to-finish, applying all transforms along
@@ -104,9 +104,9 @@ impl<'a> CompiledCss<'a> {
     /// subdirectory structure of the `input` sources passed to
     /// [`BuildCss::add`], relative to `outdir`.
     #[cfg(not(target_arch = "wasm32"))]
-    pub fn write(self, outdir: &'static str) -> anyhow::Result<()> {
+    pub fn write<P: AsRef<Path>>(self, outdir: P) -> anyhow::Result<()> {
         for (outfile, css, path) in self.iter_files().flatten() {
-            let outdir = utils::join_paths(outdir, path);
+            let outdir = utils::join_paths(outdir.as_ref(), path);
             fs::create_dir_all(outdir.clone()).unwrap_or_default();
             fs::write(outdir.join(outfile), css)?;
         }
@@ -126,7 +126,7 @@ impl<'a> CompiledCss<'a> {
         Ok(results)
     }
 
-    fn iter_files(&self) -> impl Iterator<Item = anyhow::Result<(String, String, &'_ str)>> {
+    fn iter_files(&self) -> impl Iterator<Item = anyhow::Result<(String, String, &'_ Path)>> {
         self.0.css.iter().map(|(path, css)| {
             let outpath = PathBuf::from(path);
             let outfile = format!(

package/src/main.rs

@@ -15,14 +15,13 @@ use procss::*;
 
 #[cfg(not(target_arch = "wasm32"))]
 mod init {
-    use std::path::Path;
     use std::{env, fs};
 
     use procss::*;
 
     pub fn init() -> anyhow::Result<String> {
         let args: Vec<String> = env::args().collect();
-        let contents = fs::read_to_string(Path::new(&args[1]));
+        let contents = fs::read_to_string(&args[1]);
         let css = parse(&contents?)?.flatten_tree().as_css_string();
         Ok(css)
     }

package/src/transformers/apply_import.rs

@@ -10,12 +10,13 @@
 // └───────────────────────────────────────────────────────────────────────────┘
 
 use std::collections::HashMap;
+use std::path::Path;
 
 use super::filter_refs;
 use crate::ast::Ruleset::{self};
 use crate::ast::*;
 
-pub fn apply_import<'a, 'b>(assets: &'b HashMap<&str, Tree<'a>>) -> impl Fn(&mut Tree<'a>) + 'b {
+pub fn apply_import<'a, 'b>(assets: &'b HashMap<&Path, Tree<'a>>) -> impl Fn(&mut Tree<'a>) + 'b {
     |tree| {
         tree.transform(|ruleset| {
             let mut replace = None;
@@ -23,15 +24,17 @@ pub fn apply_import<'a, 'b>(assets: &'b HashMap<&str, Tree<'a>>) -> impl Fn(&mut
                 if *name == "import" {
                     if let Some(val) = val {
                         if val.starts_with('\"') {
-                            replace = assets.get(&val[1..val.len() - 1]).cloned();
+                            replace = assets.get(Path::new(&val[1..val.len() - 1])).cloned();
                             if replace.is_none() {
                                 panic!("File not found: '{}'", &val[1..val.len() - 1])
                             }
                         } else if val.starts_with("url(\"ref://") {
-                            replace = assets.get(&val[11..val.len() - 2]).cloned().map(|mut x| {
-                                filter_refs(&mut x);
-                                x
-                            });
+                            replace = assets.get(Path::new(&val[11..val.len() - 2])).cloned().map(
+                                |mut x| {
+                                    filter_refs(&mut x);
+                                    x
+                                },
+                            );
 
                             if replace.is_none() {
                                 panic!("File not found: '{}'", &val[1..val.len() - 1])

package/src/transformers/inline_url.rs

@@ -21,21 +21,43 @@ use crate::utils::fs;
 #[cfg(feature = "iotest")]
 use crate::utils::IoTestFs;
 
+#[cfg(not(target_arch = "wasm32"))]
+fn read_file_sync(path: &Path) -> Option<Vec<u8>> {
+    fs::read(path).ok()
+}
+
+#[cfg(target_arch = "wasm32")]
+fn read_file_sync(path: &Path) -> Option<Vec<u8>> {
+    use wasm_bindgen::prelude::*;
+    #[wasm_bindgen(module = "fs")]
+    extern "C" {
+        #[wasm_bindgen(catch)]
+        fn readFileSync(path: &str) -> Result<Vec<u8>, JsValue>;
+    }
+
+    readFileSync(&*path.to_string_lossy()).ok()
+}
+
 fn parse_url(input: &str) -> nom::IResult<&str, &str> {
     let unquoted = delimited(tag("url("), is_not(")"), tag(")"));
     let quoted = delimited(tag("url(\""), is_not("\""), tag("\")"));
     alt((quoted, unquoted))(input)
 }
 
-fn into_data_uri<'a>(path: &Path) -> Cow<'a, str> {
-    let contents = fs::read(path).expect("Error reading file");
+fn into_data_uri<'a>(path: &Path) -> Option<Cow<'a, str>> {
+    if path.starts_with("data:") {
+        return None;
+    }
+
+    let contents = read_file_sync(path)?;
     let encoded = base64::encode(contents);
     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()
+
+    Some(format!("url(\"data:image/{};base64,{}\")", fmt, encoded).into())
 }
 
 fn inline_url_impl<'a>(newpath: &str, flat: &mut Css<'a>) {
@@ -46,7 +68,9 @@ fn inline_url_impl<'a>(newpath: &str, flat: &mut Css<'a>) {
 
         if let Some(path) = &path {
             if path.starts_with(".") || path.starts_with("/") {
-                rule.value = into_data_uri(path);
+                if let Some(value) = into_data_uri(path) {
+                    rule.value = value;
+                }
             }
         }
     })

package/src/utils.rs

@@ -9,8 +9,6 @@
 // │                                                                           │
 // └───────────────────────────────────────────────────────────────────────────┘
 
-use std::path::PathBuf;
-
 use crate::render::RenderCss;
 
 /// A wrapper around [`Vec`] which guarantees at least `N` elements.
@@ -56,8 +54,8 @@ impl<T: RenderCss, const N: usize> RenderCss for MinVec<T, N> {
 /// to the latter and join with the former.  If the latter path is not relative,
 /// return the former.  Useful for moving directory trees while retaining their
 /// relative structure to some root.
-pub fn join_paths(outdir: &str, path: &str) -> PathBuf {
-    if let Some(parent) = PathBuf::from(path).parent() {
+pub fn join_paths(outdir: &Path, path: &Path) -> PathBuf {
+    if let Some(parent) = path.parent() {
         PathBuf::from(outdir).join(parent)
     } else {
         PathBuf::from(outdir)
@@ -87,6 +85,7 @@ mod mock {
 
 #[cfg(not(feature = "iotest"))]
 pub use std::fs;
+use std::path::{Path, PathBuf};
 
 #[cfg(feature = "iotest")]
 pub use mock::{IoTestFs, MockIoTestFs as fs};

package/target/cjs/procss.js

@@ -1,8 +1,29 @@
 let imports = {};
 imports['__wbindgen_placeholder__'] = module.exports;
 let wasm;
+const { readFileSync } = require(`fs`);
 const { TextDecoder, TextEncoder } = require(`util`);
 
+const heap = new Array(32).fill(undefined);
+
+heap.push(undefined, null, true, false);
+
+function getObject(idx) { return heap[idx]; }
+
+let heap_next = heap.length;
+
+function dropObject(idx) {
+    if (idx < 36) return;
+    heap[idx] = heap_next;
+    heap_next = idx;
+}
+
+function takeObject(idx) {
+    const ret = getObject(idx);
+    dropObject(idx);
+    return ret;
+}
+
 let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 
 cachedTextDecoder.decode();
@@ -20,12 +41,6 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
 }
 
-const heap = new Array(32).fill(undefined);
-
-heap.push(undefined, null, true, false);
-
-let heap_next = heap.length;
-
 function addHeapObject(obj) {
     if (heap_next === heap.length) heap.push(heap.length + 1);
     const idx = heap_next;
@@ -35,20 +50,6 @@ function addHeapObject(obj) {
     return idx;
 }
 
-function getObject(idx) { return heap[idx]; }
-
-function dropObject(idx) {
-    if (idx < 36) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
 let WASM_VECTOR_LEN = 0;
 
 let cachedTextEncoder = new TextEncoder('utf-8');
@@ -112,6 +113,21 @@ function getInt32Memory0() {
     }
     return cachedInt32Memory0;
 }
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1);
+    getUint8Memory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+function handleError(f, args) {
+    try {
+        return f.apply(this, args);
+    } catch (e) {
+        wasm.__wbindgen_exn_store(addHeapObject(e));
+    }
+}
 /**
 * An implementation of `BuildCss` which owns its data, suitable for use as an
 * exported type in JavaScript.
@@ -177,54 +193,40 @@ class BuildCss {
 }
 module.exports.BuildCss = BuildCss;
 
-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.__wbg_readFileSync_05b78d1dec4f3f83 = function() { return handleError(function (arg0, arg1, arg2) {
+    const ret = readFileSync(getStringFromWasm0(arg1, arg2));
+    const ptr0 = passArray8ToWasm0(ret, wasm.__wbindgen_malloc);
+    const len0 = WASM_VECTOR_LEN;
+    getInt32Memory0()[arg0 / 4 + 1] = len0;
+    getInt32Memory0()[arg0 / 4 + 0] = ptr0;
+}, arguments) };
 
 module.exports.__wbindgen_object_drop_ref = function(arg0) {
     takeObject(arg0);
 };
 
-module.exports.__wbg_new_268f7b7dd3430798 = function() {
-    const ret = new Map();
+module.exports.__wbindgen_error_new = function(arg0, arg1) {
+    const ret = new Error(getStringFromWasm0(arg0, arg1));
     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_268f7b7dd3430798 = function() {
+    const ret = new Map();
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_new_0b9bfdd97583284e = function() {
-    const ret = new Object();
+module.exports.__wbindgen_string_new = function(arg0, arg1) {
+    const ret = getStringFromWasm0(arg0, arg1);
     return addHeapObject(ret);
 };
 
-module.exports.__wbindgen_error_new = function(arg0, arg1) {
-    const ret = new Error(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_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.__wbg_set_20cbc34131e76824 = function(arg0, arg1, arg2) {
-    getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
+module.exports.__wbindgen_throw = function(arg0, arg1) {
+    throw new Error(getStringFromWasm0(arg0, arg1));
 };
 
 const path = require('path').join(__dirname, 'procss_bg.wasm');

package/target/cjs/procss_bg.wasm.d.ts

@@ -9,4 +9,5 @@ export function buildcss_compile(a: number, b: number): void;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;
+export function __wbindgen_exn_store(a: number): void;
 export function __wbindgen_start(): void;

package/target/esm/procss.d.ts

@@ -33,6 +33,7 @@ export interface InitOutput {
   readonly __wbindgen_malloc: (a: number) => number;
   readonly __wbindgen_realloc: (a: number, b: number, c: number) => number;
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
+  readonly __wbindgen_exn_store: (a: number) => void;
   readonly __wbindgen_start: () => void;
 }
 

package/target/esm/procss.js

@@ -1,6 +1,27 @@
+import { readFileSync } from 'fs';
 
 let wasm;
 
+const heap = new Array(32).fill(undefined);
+
+heap.push(undefined, null, true, false);
+
+function getObject(idx) { return heap[idx]; }
+
+let heap_next = heap.length;
+
+function dropObject(idx) {
+    if (idx < 36) return;
+    heap[idx] = heap_next;
+    heap_next = idx;
+}
+
+function takeObject(idx) {
+    const ret = getObject(idx);
+    dropObject(idx);
+    return ret;
+}
+
 const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 
 cachedTextDecoder.decode();
@@ -18,12 +39,6 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
 }
 
-const heap = new Array(32).fill(undefined);
-
-heap.push(undefined, null, true, false);
-
-let heap_next = heap.length;
-
 function addHeapObject(obj) {
     if (heap_next === heap.length) heap.push(heap.length + 1);
     const idx = heap_next;
@@ -33,20 +48,6 @@ function addHeapObject(obj) {
     return idx;
 }
 
-function getObject(idx) { return heap[idx]; }
-
-function dropObject(idx) {
-    if (idx < 36) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
 let WASM_VECTOR_LEN = 0;
 
 const cachedTextEncoder = new TextEncoder('utf-8');
@@ -110,6 +111,21 @@ function getInt32Memory0() {
     }
     return cachedInt32Memory0;
 }
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1);
+    getUint8Memory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+function handleError(f, args) {
+    try {
+        return f.apply(this, args);
+    } catch (e) {
+        wasm.__wbindgen_exn_store(addHeapObject(e));
+    }
+}
 /**
 * An implementation of `BuildCss` which owns its data, suitable for use as an
 * exported type in JavaScript.
@@ -208,45 +224,34 @@ async function load(module, imports) {
 function getImports() {
     const imports = {};
     imports.wbg = {};
-    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.__wbg_readFileSync_05b78d1dec4f3f83 = function() { return handleError(function (arg0, arg1, arg2) {
+        const ret = readFileSync(getStringFromWasm0(arg1, arg2));
+        const ptr0 = passArray8ToWasm0(ret, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        getInt32Memory0()[arg0 / 4 + 1] = len0;
+        getInt32Memory0()[arg0 / 4 + 0] = ptr0;
+    }, arguments) };
     imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
         takeObject(arg0);
     };
-    imports.wbg.__wbg_new_268f7b7dd3430798 = function() {
-        const ret = new Map();
+    imports.wbg.__wbindgen_error_new = function(arg0, arg1) {
+        const ret = new Error(getStringFromWasm0(arg0, arg1));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_set_933729cf5b66ac11 = function(arg0, arg1, arg2) {
-        const ret = getObject(arg0).set(getObject(arg1), getObject(arg2));
+    imports.wbg.__wbg_new_268f7b7dd3430798 = function() {
+        const ret = new Map();
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_new_0b9bfdd97583284e = function() {
-        const ret = new Object();
+    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
+        const ret = getStringFromWasm0(arg0, arg1);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_error_new = function(arg0, arg1) {
-        const ret = new Error(getStringFromWasm0(arg0, arg1));
+    imports.wbg.__wbg_set_933729cf5b66ac11 = function(arg0, arg1, arg2) {
+        const ret = getObject(arg0).set(getObject(arg1), getObject(arg2));
         return addHeapObject(ret);
     };
-    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.__wbg_set_20cbc34131e76824 = function(arg0, arg1, arg2) {
-        getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
+    imports.wbg.__wbindgen_throw = function(arg0, arg1) {
+        throw new Error(getStringFromWasm0(arg0, arg1));
     };
 
     return imports;

package/target/esm/procss_bg.wasm.d.ts

@@ -9,4 +9,5 @@ export function buildcss_compile(a: number, b: number): void;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;
+export function __wbindgen_exn_store(a: number): void;
 export function __wbindgen_start(): void;