KevinMidboe/inline-html
1
0
Fork 0
mirror of https://github.com/KevinMidboe/inline-html.git synced 2025-10-29 17:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor.

Browse Source
This commit is contained in:
Alexandre Gigliotti
2015-12-01 09:50:47 -08:00
parent 3881565a28
commit b3d479224e
4 changed files with 157 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/css-url.js
View File

@@ -10,8 +10,6 @@ const url = require('url');
const collapseWhitespace = str => string(str).collapseWhitespace().toString();
const forEachIndexed = R.addIndex(R.forEach);
const format = (path) => url.format(path);
const parse = (path) => url.parse(path);
const resolve = path.resolve;
const augmentError = (error, filename, files) => {
@@ -24,13 +22,12 @@ const augmentError = (error, filename, files) => {
* Returns url path without query string and hash if present.
*
* @param path
*
* @returns path
*/
const cleanUrl = R.pipe(
parse,
url.parse,
R.pick(['protocol', 'host', 'pathname']),
format,
url.format,
decodeURI
);
/**
@@ -68,16 +65,14 @@ const inlineStyles = ($, filename) => {
try {
const styles = $('style')
.toArray();
const contents = R.map(style => {
const css = $(style).html();
const result = inlineUrl(filename, css);
files = R.concat(files, result.files);
return result.css;
}, styles);
forEachIndexed((style, index) => $(style).html(contents[index]), styles);
const replaceStyle = (style, index) => $(style).html(contents[index]);
forEachIndexed(replaceStyle, styles);
return { $, files };
}
catch (error) { throw augmentError(error, filename, files); }
@@ -95,7 +90,6 @@ const inlineStyleAttributes = ($, filename) => {
const elements = $('*')
.filter('[style]')
.toArray();
const styles = R.map(element => {
var style = $(element).attr('style');
const rule = wrap(style);
@@ -104,9 +98,8 @@ const inlineStyleAttributes = ($, filename) => {
style = R.pipe( collapseWhitespace, unwrap )(result.css);
return style;
}, elements);
forEachIndexed((element, index) => $(element).attr('style', styles[index]), elements);
const replaceElementStyle = (element, index) => $(element).attr('style', styles[index]);
forEachIndexed(replaceElementStyle, elements);
return { $, files };
}
catch (error) { throw augmentError(error, filename, files); }

13
lib/img.js
View File

@@ -6,7 +6,6 @@ const path = require('path');
const R = require('ramda');
const forEachIndexed = R.addIndex(R.forEach);
const resolve = R.curry((a,b) => path.resolve(a,b));
/**
* Inline sourced image files
@@ -17,11 +16,8 @@ const resolve = R.curry((a,b) => path.resolve(a,b));
* Filename used to resolve relative sources being inlined
*/
const inlineImg = co.wrap(function * ($, filename) {
var files;
const basedir = path.dirname(filename);
const getAttr = R.curry((attr, element) => $(element).attr(attr));
const setAttr = R.curry((attr, element, value) => $(element).attr(attr, value));
const getFilename = R.pipe(getAttr('src'), resolve(basedir));
var files;
try {
const images = $('img')
.filter((index, element) => {
@@ -29,13 +25,12 @@ const inlineImg = co.wrap(function * ($, filename) {
return isLocalPath(source) && !isTemplateExpression(source);
})
.toArray();
const getFilename = element => path.resolve(basedir, $(element).attr('src'));
const filenames = R.map(getFilename, images);
files = R.uniq(filenames);
const uris = yield R.map(datauri, filenames);
forEachIndexed((image, index) => setAttr('src', image, uris[index]), images);
const replaceImageSource = (image, index) => $(image).attr('src', uris[index]);
forEachIndexed(replaceImageSource, images);
return { $, files };
}
catch (error) {

18
lib/link-less.js
View File

@@ -7,7 +7,6 @@ const R = require('ramda');
const Ru = require('@panosoft/ramda-utils');
const forEachIndexed = R.addIndex(R.forEach);
const resolve = R.curry((a,b) => path.resolve(a,b));
const render = R.curryN(2, co.wrap(function * (options, filename) {
options = R.merge(options || {}, { filename });
@@ -28,24 +27,21 @@ const render = R.curryN(2, co.wrap(function * (options, filename) {
const inlineLess = co.wrap(function * ($, filename, options) {
options = Ru.defaults({ less: {} }, options || {});
options = Ru.defaults({ relativeUrls: true }, options.less);
var files = [];
const basedir = path.dirname(filename);
const getAttr = R.curry((attr, element) => $(element).attr(attr));
const getStylesheet = R.pipe(getAttr('href'), resolve(basedir));
var files = [];
try {
const links = $('link[rel="stylesheet/less"]')
.filter((index, link) => isLocalPath($(link).attr('href')))
.toArray();
const stylesheets = R.map(getStylesheet, links);
files = R.concat(files, stylesheets);
const outputs = yield R.map(render(options), stylesheets);
const getHref = element => path.resolve(basedir, $(element).attr('href'));
const hrefs = R.map(getHref, links);
files = R.concat(files, hrefs);
const outputs = yield R.map(render(options), hrefs);
const imports = R.flatten(R.map(R.prop('imports'), outputs));
files = R.concat(files, imports);
const styles = R.map(output => $('<style>').html(output.css), outputs);
forEachIndexed((link, index) => $(link).replaceWith(styles[index]), links);
const replaceLink = (link, index) => $(link).replaceWith(styles[index]);
forEachIndexed(replaceLink, links);
files = R.uniq(files);
return { $, files };
}