Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions core/src/main/java/starfederation/datastar/Consts.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
*/
public final class Consts {
public static final String DATASTAR_KEY = "datastar";
public static final String VERSION = "1.0.0-RC.1";

// The default duration for retrying SSE on connection reset. This is part of the underlying retry mechanism of SSE.
public static final int DEFAULT_SSE_RETRY_DURATION = 1000;

// Should elements be patched using the ViewTransition API?
public static final boolean DEFAULT_ELEMENTS_USE_VIEW_TRANSITIONS = false;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package starfederation.datastar.enums;

public enum Namespace {
HTML, SVG, MATHML
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.Objects;

sealed public abstract class AbstractDatastarEvent implements DatastarEvent permits PatchElements, PatchSignals,
ExecuteScript, CustomEvent {
ExecuteScript {

private final String[] dataLines;

Expand Down
13 changes: 0 additions & 13 deletions core/src/main/java/starfederation/datastar/events/CustomEvent.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import starfederation.datastar.enums.EventType;

sealed interface DatastarEvent permits AbstractDatastarEvent {

/**
* Returns the event type.
*/
Expand All @@ -17,10 +16,8 @@ sealed interface DatastarEvent permits AbstractDatastarEvent {
/**
* Returns the builder for the event.
*/

static AbstractBuilder<AbstractDatastarEvent> builder() {
throw new IllegalStateException("the builder method should be overridden to use the appropriate builder");
}

}

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package starfederation.datastar.events;

import starfederation.datastar.enums.EventType;
import static starfederation.datastar.Consts.ELEMENTS_DATALINE_LITERAL;

import java.util.ArrayList;
import java.util.List;
import java.util.function.Predicate;

import static starfederation.datastar.Consts.*;
import starfederation.datastar.enums.EventType;

public final class ExecuteScript extends AbstractDatastarEvent {

Expand All @@ -29,6 +29,7 @@ public static final class Builder extends AbstractBuilder<ExecuteScript> {

/**
* JavaScript to execute on the client. Do not wrap in HTML-script tags.
*
* @param script valid JavaScript
* @return a builder for fluent configuration
*/
Expand All @@ -39,6 +40,7 @@ public Builder script(String script) {
this.script = script;
return this;
}

private Builder() {
}

Expand All @@ -61,8 +63,7 @@ public ExecuteScript build() {
}

var wrappedScript = new StringBuilder("<script");
List<String> dataLines = new ArrayList<>();


// Add attributes if not default
if (attributes != null && !attributes.isBlank()) {
wrappedScript.append(' ').append(attributes);
Expand All @@ -76,9 +77,11 @@ public ExecuteScript build() {
wrappedScript.append(">").append(script).append("</script>");

// Add script
wrappedScript.toString().lines()
.filter(line -> !line.isBlank())
.forEach(line -> dataLines.add(ELEMENTS_DATALINE_LITERAL + line));
var dataLines = wrappedScript.toString()
.lines()
.filter(Predicate.not(String::isBlank))
.map(line -> ELEMENTS_DATALINE_LITERAL + line)
.toList();

return new ExecuteScript(EventType.PatchElements, dataLines);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
package starfederation.datastar.events;

import starfederation.datastar.enums.ElementPatchMode;
import starfederation.datastar.enums.EventType;
import static starfederation.datastar.Consts.DEFAULT_ELEMENTS_USE_VIEW_TRANSITIONS;
import static starfederation.datastar.Consts.DEFAULT_ELEMENT_PATCH_MODE;
import static starfederation.datastar.Consts.ELEMENTS_DATALINE_LITERAL;
import static starfederation.datastar.Consts.MODE_DATALINE_LITERAL;
import static starfederation.datastar.Consts.SELECTOR_DATALINE_LITERAL;
import static starfederation.datastar.Consts.USE_VIEW_TRANSITION_DATALINE_LITERAL;

import java.util.ArrayList;
import java.util.List;
import java.util.function.Predicate;

import static starfederation.datastar.Consts.*;
import starfederation.datastar.enums.ElementPatchMode;
import starfederation.datastar.enums.EventType;
import starfederation.datastar.enums.Namespace;

public final class PatchElements extends AbstractDatastarEvent {

Expand All @@ -27,6 +34,7 @@ public static final class Builder extends AbstractBuilder<PatchElements> {
private String selector;
private ElementPatchMode mode = DEFAULT_ELEMENT_PATCH_MODE; // Default
private boolean useViewTransition = DEFAULT_ELEMENTS_USE_VIEW_TRANSITIONS; // Default
private Namespace namespace = Namespace.HTML;
private String rawData;

private Builder() {
Expand All @@ -47,6 +55,11 @@ public Builder useViewTransition(boolean useViewTransition) {
return this;
}

public Builder namespace(Namespace namespace) {
this.namespace = namespace;
return this;
}

public Builder data(String rawData) {
this.rawData = rawData;
return this;
Expand All @@ -58,7 +71,7 @@ public PatchElements build() {
throw new IllegalArgumentException("Data cannot be null or empty");
}

List<String> dataLines = new ArrayList<>();
var dataLines = new ArrayList<String>();

// Add selector
if (selector != null && !selector.isEmpty()) {
Expand All @@ -75,11 +88,22 @@ public PatchElements build() {
dataLines.add(USE_VIEW_TRANSITION_DATALINE_LITERAL + useViewTransition);
}

// Add namespace
if (namespace != Namespace.HTML) {
var value = switch (namespace) {
case HTML -> "html";
case SVG -> "svg";
case MATHML -> "mathml";
};
dataLines.add("namespace " + value);
}

// Add raw data as fragments
if (rawData!= null)
rawData.lines()
.filter(line -> !line.isBlank())
.forEach(line -> dataLines.add(ELEMENTS_DATALINE_LITERAL + line));
.filter(Predicate.not(String::isBlank))
.map(line -> ELEMENTS_DATALINE_LITERAL + line)
.forEach(dataLines::add);

return new PatchElements(EventType.PatchElements, dataLines);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.junit.jupiter.api.Test;
import starfederation.datastar.enums.EventType;
import starfederation.datastar.enums.Namespace;
import starfederation.datastar.enums.ElementPatchMode;
import starfederation.datastar.events.PatchElements;

Expand Down Expand Up @@ -46,6 +47,27 @@ void builderShouldExcludeDefaultValues() {
assertArrayEquals(expectedDataLines, event.getDataLines());
}

@Test
void builderShouldRespectNamespace() {
PatchElements event = PatchElements.builder()
.selector("#feed")
.namespace(Namespace.SVG)
.mode(ElementPatchMode.Before)
.data("<div id=\"feed\"><span>1</span>\n</div>")
.build();

String[] expectedDataLines = {
"selector #feed",
"mode before",
"namespace svg",
"elements <div id=\"feed\"><span>1</span>",
"elements </div>"
};

assertArrayEquals(expectedDataLines, event.getDataLines());
assertEquals(EventType.PatchElements, event.getEventType());
}

@Test
void builderShouldThrowExceptionForNullData() {
assertThrows(IllegalArgumentException.class, () -> PatchElements.builder().build());
Expand Down
Loading