Skip to content

Commit

Permalink
cleanup+simplify api
Browse files Browse the repository at this point in the history
  • Loading branch information
@syjer
syjer committed Dec 24, 2024
1 parent cb8a0fe commit efdceae
Showing 1 changed file with 29 additions and 44 deletions.
73 changes: 29 additions & 44 deletions src/main/java/ch/digitalfondue/mjml4j/Mjml4j.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,30 +48,22 @@ public String value() {

interface IncludeResolver {
/**
* Read the content of the file (with UTF-8) at a given resolved path.
* Read the content of the resource at a given resolved path.
*
* @param resolvedResourcePath
* @return
* @throws IOException
*/
String resolveAsString(String resolvedResourcePath) throws IOException;

/**
* Read the content of the file (with UTF-8 content) and parse it's content.
*
* @param resolvedResourcePath
* @return
*/
org.w3c.dom.Document resolveAsDocument(String resolvedResourcePath) throws IOException;

/**
* Resolve the given path.
*
* @param name
* @param parents
* @param parent
* @return
*/
String resolvePath(String name, Deque<String> parents);
String resolvePath(String name, String parent);
}

/**
Expand All @@ -92,20 +84,15 @@ public String resolveAsString(String resolvedResourcePath) throws IOException {
return Files.readString(Path.of(resolvedResourcePath), StandardCharsets.UTF_8);
}

@Override
public org.w3c.dom.Document resolveAsDocument(String resolvedResourcePath) throws IOException {
return parseFragment(resolveAsString(resolvedResourcePath));
}

public void checkAccess(Path basePath, Path resolvedPath) {
if (!resolvedPath.startsWith(basePath)) {
throw new IllegalStateException("Cannot access path outside of basePath");
}
}

@Override
public String resolvePath(String name, Deque<String> parents) {
var resolvedPath = (parents.isEmpty() ? basePath.resolve(name) : Path.of(parents.peek()).getParent().resolve(name)).toAbsolutePath();
public String resolvePath(String name, String parent) {
var resolvedPath = (parent == null ? basePath.resolve(name) : Path.of(parent).getParent().resolve(name)).toAbsolutePath();
checkAccess(basePath, resolvedPath);
return resolvedPath.toString();
}
Expand All @@ -126,11 +113,16 @@ public Configuration(String language) {

private static final Configuration DEFAULT_CONFIG = new Configuration("und", TextDirection.AUTO);

private static org.w3c.dom.Document parseFragment(String template) {

private static List<ch.digitalfondue.jfiveparse.Node> parseHtmlFragment(String template) {
return JFiveParse.parseFragment(template, EnumSet.of(Option.DISABLE_IGNORE_TOKEN_IN_BODY_START_TAG, Option.INTERPRET_SELF_CLOSING_ANYTHING_ELSE, Option.DONT_TRANSFORM_ENTITIES));
}

private static org.w3c.dom.Document parseMjmlFragment(String template) {
//
var wrappedFragment = !template.contains("<mjml>") ? "<mjml><mj-body>" + template + "</mj-body></mjml>" : template;
//
var nodes = JFiveParse.parseFragment(wrappedFragment, EnumSet.of(Option.DISABLE_IGNORE_TOKEN_IN_BODY_START_TAG, Option.INTERPRET_SELF_CLOSING_ANYTHING_ELSE, Option.DONT_TRANSFORM_ENTITIES));
var nodes = parseHtmlFragment(wrappedFragment);
var doc = new Document();
for (var n : nodes) {
doc.appendChild(n);
Expand All @@ -146,9 +138,7 @@ private static org.w3c.dom.Document parseFragment(String template) {
* @return
*/
public static String render(String template, Configuration configuration) {
var nodes = JFiveParse.parseFragment(template, EnumSet.of(Option.DISABLE_IGNORE_TOKEN_IN_BODY_START_TAG, Option.INTERPRET_SELF_CLOSING_ANYTHING_ELSE, Option.DONT_TRANSFORM_ENTITIES));

var rootElemMaybe = nodes.stream().filter(node -> "mjml".equals(node.getNodeName())).findFirst();
var rootElemMaybe = parseHtmlFragment(template).stream().filter(node -> "mjml".equals(node.getNodeName())).findFirst();
if (rootElemMaybe.isEmpty()) {
throw new IllegalStateException("no root element mjml found");
}
Expand Down Expand Up @@ -494,19 +484,18 @@ private static BaseComponent handleInclude(Element element, BaseComponent parent
}

var includeResolver = context.includeResolver;
var resolvedPath = includeResolver.resolvePath(path, context.currentResourcePaths);
var resolvedPath = includeResolver.resolvePath(path, context.currentResourcePaths.peek());
var resource = "";
try {
resource = includeResolver.resolveAsString(resolvedPath);
} catch (IOException e) {
resource = "<!-- mj-include fails to read file : " + path + " at " + resolvedPath + " -->";
return new MjmlComponentRaw(element, parent, context, resource);
}

var attributeType = element.getAttribute("type");
if ("html".equals(attributeType) || "css".equals(attributeType)) {
var resource = "";
var failed = false;
try {
resource = includeResolver.resolveAsString(resolvedPath);
} catch (IOException e) {
failed = true;
resource = "<!-- mj-include fails to read file : " + path + " at " + resolvedPath + " -->";
}
if ("html".equals(attributeType) || failed) {
if ("html".equals(attributeType)) {
return new MjmlComponentRaw(element, parent, context, resource);
} else {
context.addStyle(resource, "inline".equals(element.getAttribute("css-inline")));
Expand All @@ -515,25 +504,21 @@ private static BaseComponent handleInclude(Element element, BaseComponent parent
} else {
context.currentResourcePaths.push(resolvedPath);
try {
var doc = includeResolver.resolveAsDocument(resolvedPath);
var doc = parseMjmlFragment(resource);
var includedDoc = buildMjmlDocument(doc, context);
findFirstComponent(includedDoc, "mj-head").ifPresent(head -> {
var root = Objects.requireNonNull(context.rootComponents.peekLast());
findFirstComponent(root, "mj-head").ifPresentOrElse((headToAppend) -> {
bindToParent(headToAppend, head.getChildren());
}, () -> {
var headToAppend = new MjmlComponentHead(context.document.createElement("mj-head"), root, context);
root.getChildren().add(0, headToAppend);
bindToParent(headToAppend, head.getChildren());
var targetRoot = Objects.requireNonNull(context.rootComponents.peekLast());
var targetHead = findFirstComponent(targetRoot, "mj-head").orElseGet(() -> {
var headToAppend = new MjmlComponentHead(context.document.createElement("mj-head"), targetRoot, context);
targetRoot.getChildren().add(0, headToAppend);
return headToAppend;
});
bindToParent(targetHead, head.getChildren());
});
findFirstComponent(includedDoc, "mj-body").ifPresent(body -> {
bindToParent(parent, body.getChildren());
});
return new MjmlComponentRaw(element, parent, context, ""); // dummy empty component
} catch (IOException e) {
// FIXME
return new MjmlComponentRaw(element, parent, context);
} finally {
context.currentResourcePaths.pop();
}
Expand Down

0 comments on commit efdceae

Please sign in to comment.