Merged
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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
package starfederation.datastar.enums;

public enum Namespace {
HTML, SVG, MATHML
}
Original file line numberDiff line numberDiff 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

This file was deleted.

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
package starfederation.datastar.enums;

public enum Namespace {
HTML, SVG, MATHML
}
Original file line numberDiff line numberDiff 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

This file was deleted.

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
package starfederation.datastar.enums;

public enum Namespace {
HTML, SVG, MATHML
}
Original file line numberDiff line numberDiff 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

This file was deleted.

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
package starfederation.datastar.enums;

public enum Namespace {
HTML, SVG, MATHML
}
Original file line numberDiff line numberDiff 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

This file was deleted.

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
package starfederation.datastar.enums;

public enum Namespace {
HTML, SVG, MATHML
}
Original file line numberDiff line numberDiff 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

This file was deleted.

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
package starfederation.datastar.enums;

public enum Namespace {
HTML, SVG, MATHML
}
Original file line numberDiff line numberDiff 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

This file was deleted.

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
package starfederation.datastar.enums;

public enum Namespace {
HTML, SVG, MATHML
}
Original file line numberDiff line numberDiff 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

This file was deleted.

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
package starfederation.datastar.enums;

public enum Namespace {
HTML, SVG, MATHML
}
Original file line numberDiff line numberDiff 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

This file was deleted.

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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