refactor!(core): Add context parameter to Middleware

tweed5/attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImpl.java

@@ -15,6 +15,8 @@ import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
 import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReaderMiddlewareContext;
+import de.siphalor.tweed5.serde.extension.api.extension.WriterMiddlewareContext;
 import de.siphalor.tweed5.serde.extension.api.read.result.TweedReadResult;
 import de.siphalor.tweed5.serde.extension.impl.TweedEntryReaderWriterImpls;
 import de.siphalor.tweed5.serde_api.api.DelegatingTweedDataWriter;
@@ -158,7 +160,7 @@ public class AttributesReadWriteFilterExtensionImpl
 		}
 	}
 
-	private class ReaderMiddleware implements Middleware<TweedEntryReader<?, ?>> {
+	private class ReaderMiddleware implements Middleware<TweedEntryReader<?, ?>, ReaderMiddlewareContext> {
 		@Override
 		public String id() {
 			return EXTENSION_ID;
@@ -175,28 +177,28 @@ public class AttributesReadWriteFilterExtensionImpl
 		}
 
 		@Override
-		public TweedEntryReader<?, ?> process(TweedEntryReader<?, ?> inner) {
+		public TweedEntryReader<?, ?> process(TweedEntryReader<?, ?> inner, ReaderMiddlewareContext context) {
 			assert readWriteContextDataAccess != null;
 			//noinspection unchecked
 			TweedEntryReader<Object, ConfigEntry<Object>> innerCasted
 					= (TweedEntryReader<Object, @NonNull ConfigEntry<Object>>) inner;
 
-			return (TweedEntryReader<Object, ConfigEntry<Object>>) (reader, entry, context) -> {
+			return (TweedEntryReader<Object, ConfigEntry<Object>>) (reader, entry, readContext) -> {
-				ReadWriteContextCustomData contextData = context.extensionsData().get(readWriteContextDataAccess);
+				ReadWriteContextCustomData contextData = readContext.extensionsData().get(readWriteContextDataAccess);
 				if (contextData == null) {
 					contextData = new ReadWriteContextCustomData();
-					context.extensionsData().set(readWriteContextDataAccess, contextData);
+					readContext.extensionsData().set(readWriteContextDataAccess, contextData);
 				}
 				if (!doFiltersMatch(entry, contextData)) {
-					TweedEntryReaderWriterImpls.NOOP_READER_WRITER.read(reader, entry, context);
+					TweedEntryReaderWriterImpls.NOOP_READER_WRITER.read(reader, entry, readContext);
 					return TweedReadResult.empty();
 				}
-				return innerCasted.read(reader, entry, context);
+				return innerCasted.read(reader, entry, readContext);
 			};
 		}
 	}
 
-	private class WriterMiddleware implements Middleware<TweedEntryWriter<?, ?>> {
+	private class WriterMiddleware implements Middleware<TweedEntryWriter<?, ?>, WriterMiddlewareContext> {
 		@Override
 		public String id() {
 			return EXTENSION_ID;
@@ -213,18 +215,18 @@ public class AttributesReadWriteFilterExtensionImpl
 		}
 
 		@Override
-		public TweedEntryWriter<?, ?> process(TweedEntryWriter<?, ?> inner) {
+		public TweedEntryWriter<?, ?> process(TweedEntryWriter<?, ?> inner, WriterMiddlewareContext context) {
 			assert readWriteContextDataAccess != null;
 			//noinspection unchecked
 			TweedEntryWriter<Object, ConfigEntry<Object>> innerCasted
 					= (TweedEntryWriter<Object, @NonNull ConfigEntry<Object>>) inner;
 
 			return (TweedEntryWriter<@Nullable Object, @NonNull ConfigEntry<@Nullable Object>>)
-					(writer, value, entry, context) -> {
+					(writer, value, entry, writeContext) -> {
-						ReadWriteContextCustomData contextData = context.extensionsData()
+						ReadWriteContextCustomData contextData = writeContext.extensionsData()
 								.get(readWriteContextDataAccess);
 						if (contextData == null || contextData.attributeFilters().isEmpty()) {
-							innerCasted.write(writer, value, entry, context);
+							innerCasted.write(writer, value, entry, writeContext);
 							return;
 						}
 
@@ -234,7 +236,7 @@ public class AttributesReadWriteFilterExtensionImpl
 						}
 
 						if (doFiltersMatch(entry, contextData)) {
-							innerCasted.write(writer, value, entry, context);
+							innerCasted.write(writer, value, entry, writeContext);
 						} else {
 							try {
 								writer.visitValue(TWEED_DATA_NOTHING_VALUE);

tweed5/comment-loader-extension/src/main/java/de/siphalor/tweed5/commentloaderextension/impl/CommentLoaderExtensionImpl.java

@@ -6,6 +6,7 @@ import de.siphalor.tweed5.core.api.container.ConfigContainer;
 import de.siphalor.tweed5.core.api.container.ConfigContainerSetupPhase;
 import de.siphalor.tweed5.core.api.extension.TweedExtensionSetupContext;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
+import de.siphalor.tweed5.defaultextensions.comment.api.CommentProducerMiddlewareContext;
 import de.siphalor.tweed5.serde_api.api.IntuitiveVisitingTweedDataReader;
 import de.siphalor.tweed5.serde_api.api.TweedDataReadException;
 import de.siphalor.tweed5.serde_api.api.TweedDataReader;
@@ -44,8 +45,8 @@ public class CommentLoaderExtensionImpl implements CommentLoaderExtension, Comme
 	}
 
 	@Override
-	public Middleware<CommentProducer> commentMiddleware() {
+	public Middleware<CommentProducer, CommentProducerMiddlewareContext> commentMiddleware() {
-		return new Middleware<CommentProducer>() {
+		return new Middleware<CommentProducer, CommentProducerMiddlewareContext>() {
 			@Override
 			public String id() {
 				return EXTENSION_ID;
@@ -62,7 +63,10 @@ public class CommentLoaderExtensionImpl implements CommentLoaderExtension, Comme
 			}
 
 			@Override
-			public CommentProducer process(CommentProducer inner) {
+			public CommentProducer process(CommentProducer inner, CommentProducerMiddlewareContext context) {
+				if (context.entry().extensionsData().get(loadedCommentAccess) == null) {
+					return inner;
+				}
 				return entry -> {
 					String loadedComment = entry.extensionsData().get(loadedCommentAccess);
 					String innerComment = inner.createComment(entry);

tweed5/core/src/main/java/de/siphalor/tweed5/core/api/middleware/DefaultMiddlewareContainer.java

@@ -8,11 +8,11 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-public class DefaultMiddlewareContainer<M> implements MiddlewareContainer<M> {
+public class DefaultMiddlewareContainer<M, C> implements MiddlewareContainer<M, C> {
 	private static final String CONTAINER_ID = "";
 
 	@Getter
-	private List<Middleware<M>> middlewares = new ArrayList<>();
+	private List<Middleware<M, C>> middlewares = new ArrayList<>();
 	private final Set<String> middlewareIds = new HashSet<>();
 	private boolean sealed = false;
 
@@ -22,10 +22,10 @@ public class DefaultMiddlewareContainer<M> implements MiddlewareContainer<M> {
 	}
 
 	@Override
-	public void registerAll(Collection<Middleware<M>> middlewares) {
+	public void registerAll(Collection<Middleware<M, C>> middlewares) {
 		requireUnsealed();
 
-		for (Middleware<M> middleware : middlewares) {
+		for (Middleware<M, C> middleware : middlewares) {
 			if (middleware.id().isEmpty()) {
 				throw new IllegalArgumentException("Middleware id cannot be empty");
 			}
@@ -37,7 +37,7 @@ public class DefaultMiddlewareContainer<M> implements MiddlewareContainer<M> {
 	}
 
 	@Override
-	public void register(Middleware<M> middleware) {
+	public void register(Middleware<M, C> middleware) {
 		requireUnsealed();
 
 		if (middleware.id().isEmpty()) {
@@ -76,7 +76,7 @@ public class DefaultMiddlewareContainer<M> implements MiddlewareContainer<M> {
 
 		AcyclicGraphSorter sorter = new AcyclicGraphSorter(allMentionedMiddlewareIds.length);
 
-		for (Middleware<M> middleware : middlewares) {
+		for (Middleware<M, C> middleware : middlewares) {
 			Integer currentIndex = indecesByMiddlewareId.get(middleware.id());
 
 			middleware.mustComeAfter().stream()
@@ -87,7 +87,8 @@ public class DefaultMiddlewareContainer<M> implements MiddlewareContainer<M> {
 					.forEach(afterIndex -> sorter.addEdge(currentIndex, afterIndex));
 		}
 
-		Map<String, Middleware<M>> middlewaresById = middlewares.stream().collect(Collectors.toMap(Middleware::id, Function.identity()));
+		Map<String, Middleware<M, C>> middlewaresById = middlewares.stream()
+				.collect(Collectors.toMap(Middleware::id, Function.identity()));
 
 		try {
 			int[] sortedIndeces = sorter.sort();
@@ -107,13 +108,27 @@ public class DefaultMiddlewareContainer<M> implements MiddlewareContainer<M> {
 	}
 
 	@Override
+	public M process(M inner, C context) {
+		if (!sealed) {
+			throw new IllegalStateException("Middleware container has not been sealed");
+		}
+		M combined = inner;
+		for (int i = middlewares.size() - 1; i >= 0; i--) {
+			Middleware<M, C> middleware = middlewares.get(i);
+			combined = middleware.process(combined, context);
+		}
+		return combined;
+	}
+
+	@Override
+	@Deprecated
 	public M process(M inner) {
 		if (!sealed) {
 			throw new IllegalStateException("Middleware container has not been sealed");
 		}
 		M combined = inner;
 		for (int i = middlewares.size() - 1; i >= 0; i--) {
-			Middleware<M> middleware = middlewares.get(i);
+			Middleware<M, C> middleware = middlewares.get(i);
 			combined = middleware.process(combined);
 		}
 		return combined;

tweed5/core/src/main/java/de/siphalor/tweed5/core/api/middleware/Middleware.java

@@ -1,9 +1,11 @@
 package de.siphalor.tweed5.core.api.middleware;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import java.util.Collections;
 import java.util.Set;
 
-public interface Middleware<M> {
+public interface Middleware<M, C> {
 	String DEFAULT_START = "$default.start";
 	String DEFAULT_END = "$default.end";
 
@@ -16,5 +18,13 @@ public interface Middleware<M> {
 		return Collections.singleton(DEFAULT_START);
 	}
 
-	M process(M inner);
+	default M process(M inner, C context) {
+		return process(inner);
+	}
+
+	@Deprecated
+	@ApiStatus.OverrideOnly
+	default M process(M inner) {
+		return inner;
+	}
 }

tweed5/core/src/main/java/de/siphalor/tweed5/core/api/middleware/MiddlewareContainer.java

@@ -2,11 +2,11 @@ package de.siphalor.tweed5.core.api.middleware;
 
 import java.util.Collection;
 
-public interface MiddlewareContainer<M> extends Middleware<M> {
+public interface MiddlewareContainer<M, C> extends Middleware<M, C> {
-	default void registerAll(Collection<Middleware<M>> middlewares) {
+	default void registerAll(Collection<Middleware<M, C>> middlewares) {
 		middlewares.forEach(this::register);
 	}
-	void register(Middleware<M> middleware);
+	void register(Middleware<M, C> middleware);
 	void seal();
-	Collection<Middleware<M>> middlewares();
+	Collection<Middleware<M, C>> middlewares();
 }

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/api/CommentModifyingExtension.java

@@ -3,5 +3,5 @@ package de.siphalor.tweed5.defaultextensions.comment.api;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
 
 public interface CommentModifyingExtension {
-	Middleware<CommentProducer> commentMiddleware();
+	Middleware<CommentProducer, CommentProducerMiddlewareContext> commentMiddleware();
 }

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/api/CommentProducerMiddlewareContext.java

@@ -0,0 +1,14 @@
+package de.siphalor.tweed5.defaultextensions.comment.api;
+
+import de.siphalor.tweed5.core.api.entry.ConfigEntry;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Value;
+
+@Value
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Builder
+public class CommentProducerMiddlewareContext {
+	ConfigEntry<?> entry;
+}

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/impl/CommentExtensionImpl.java

@@ -6,6 +6,7 @@ import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.extension.TweedExtension;
 import de.siphalor.tweed5.core.api.extension.TweedExtensionSetupContext;
 import de.siphalor.tweed5.core.api.middleware.DefaultMiddlewareContainer;
+import de.siphalor.tweed5.defaultextensions.comment.api.CommentProducerMiddlewareContext;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentExtension;
@@ -20,7 +21,7 @@ public class CommentExtensionImpl implements ReadWriteRelatedExtension, CommentE
 	private final ConfigContainer<?> configContainer;
 	@Getter
 	private final PatchworkPartAccess<CustomEntryData> customEntryDataAccess;
-	private final DefaultMiddlewareContainer<CommentProducer> middlewareContainer;
+	private final DefaultMiddlewareContainer<CommentProducer, CommentProducerMiddlewareContext> middlewareContainer;
 	@Getter
 	private @Nullable PatchworkPartAccess<Boolean> writerInstalledReadWriteContextAccess;
 
@@ -71,7 +72,10 @@ public class CommentExtensionImpl implements ReadWriteRelatedExtension, CommentE
 	public void recomputeFullComments() {
 		configContainer.rootEntry().visitInOrder(entry -> {
 			CustomEntryData entryData = getOrCreateCustomEntryData(entry);
-			entryData.commentProducer(middlewareContainer.process(_entry -> entryData.baseComment()));
+			entryData.commentProducer(middlewareContainer.process(
+					_entry -> entryData.baseComment(),
+					CommentProducerMiddlewareContext.builder().entry(entry).build()
+			));
 		});
 	}
 

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/comment/impl/TweedEntryWriterCommentMiddleware.java

@@ -3,6 +3,7 @@ package de.siphalor.tweed5.defaultextensions.comment.impl;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
 import de.siphalor.tweed5.serde.extension.api.TweedEntryWriter;
+import de.siphalor.tweed5.serde.extension.api.extension.WriterMiddlewareContext;
 import de.siphalor.tweed5.serde_api.api.DelegatingTweedDataWriter;
 import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
 import de.siphalor.tweed5.serde_api.api.decoration.TweedDataCommentDecoration;
@@ -17,7 +18,7 @@ import java.util.ArrayDeque;
 import java.util.Deque;
 
 @RequiredArgsConstructor
-class TweedEntryWriterCommentMiddleware implements Middleware<TweedEntryWriter<?, ?>> {
+class TweedEntryWriterCommentMiddleware implements Middleware<TweedEntryWriter<?, ?>, WriterMiddlewareContext> {
 	private final CommentExtensionImpl commentExtension;
 
 	@Override
@@ -26,15 +27,15 @@ class TweedEntryWriterCommentMiddleware implements Middleware<TweedEntryWriter<?
 	}
 
 	@Override
-	public TweedEntryWriter<?, ?> process(TweedEntryWriter<?, ?> inner) {
+	public TweedEntryWriter<?, ?> process(TweedEntryWriter<?, ?> inner, WriterMiddlewareContext context) {
 		PatchworkPartAccess<Boolean> writerInstalledAccess = commentExtension.writerInstalledReadWriteContextAccess();
 		assert writerInstalledAccess != null;
 
 		//noinspection unchecked
 		TweedEntryWriter<Object, ConfigEntry<Object>> innerCasted = (TweedEntryWriter<Object, @NonNull ConfigEntry<Object>>) inner;
-		return (TweedEntryWriter<Object, @NonNull ConfigEntry<Object>>) (writer, value, entry, context) -> {
+		return (TweedEntryWriter<Object, @NonNull ConfigEntry<Object>>) (writer, value, entry, writeContext) -> {
-			if (!Boolean.TRUE.equals(context.extensionsData().get(writerInstalledAccess))) {
+			if (!Boolean.TRUE.equals(writeContext.extensionsData().get(writerInstalledAccess))) {
-				context.extensionsData().set(writerInstalledAccess, Boolean.TRUE);
+				writeContext.extensionsData().set(writerInstalledAccess, Boolean.TRUE);
 
 				writer = new MapEntryKeyDeferringWriter(writer);
 			}
@@ -44,7 +45,7 @@ class TweedEntryWriterCommentMiddleware implements Middleware<TweedEntryWriter<?
 				writer.visitDecoration(new PiercingCommentDecoration(() -> comment));
 			}
 
-			innerCasted.write(writer, value, entry, context);
+			innerCasted.write(writer, value, entry, writeContext);
 		};
 	}
 

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/patch/impl/PatchExtensionImpl.java

@@ -6,6 +6,7 @@ import de.siphalor.tweed5.core.api.middleware.Middleware;
 import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReaderMiddlewareContext;
 import de.siphalor.tweed5.serde.extension.api.read.result.TweedReadResult;
 import de.siphalor.tweed5.defaultextensions.patch.api.PatchExtension;
 import de.siphalor.tweed5.defaultextensions.patch.api.PatchInfo;
@@ -81,22 +82,22 @@ public class PatchExtensionImpl implements PatchExtension, ReadWriteRelatedExten
 		}
 	}
 
-	private class ReaderMiddleware implements Middleware<TweedEntryReader<?, ?>> {
+	private class ReaderMiddleware implements Middleware<TweedEntryReader<?, ?>, ReaderMiddlewareContext> {
 		@Override
 		public String id() {
 			return "patch-info-collector";
 		}
 
 		@Override
-		public TweedEntryReader<?, ?> process(TweedEntryReader<?, ?> inner) {
+		public TweedEntryReader<?, ?> process(TweedEntryReader<?, ?> inner, ReaderMiddlewareContext context) {
 			assert readWriteContextDataAccess != null;
 
 			//noinspection unchecked
 			TweedEntryReader<Object, ConfigEntry<Object>> innerCasted =
 					(TweedEntryReader<Object, @NonNull ConfigEntry<Object>>) inner;
-			return (TweedEntryReader<Object, ConfigEntry<Object>>) (reader, entry, context) -> {
+			return (TweedEntryReader<Object, ConfigEntry<Object>>) (reader, entry, readContext) -> {
-				TweedReadResult<Object> readResult = innerCasted.read(reader, entry, context);
+				TweedReadResult<Object> readResult = innerCasted.read(reader, entry, readContext);
-				ReadWriteContextCustomData customData = context.extensionsData().get(readWriteContextDataAccess);
+				ReadWriteContextCustomData customData = readContext.extensionsData().get(readWriteContextDataAccess);
 				if (customData != null && customData.patchInfo() != null) {
 					customData.patchInfo().addEntry(entry);
 				}

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/impl/PatherExtensionImpl.java

@@ -5,6 +5,8 @@ import de.siphalor.tweed5.core.api.middleware.Middleware;
 import de.siphalor.tweed5.serde.extension.api.*;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReaderMiddlewareContext;
+import de.siphalor.tweed5.serde.extension.api.extension.WriterMiddlewareContext;
 import de.siphalor.tweed5.serde_api.api.TweedDataReader;
 import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
 import de.siphalor.tweed5.defaultextensions.pather.api.PathTracking;
@@ -48,59 +50,59 @@ public class PatherExtensionImpl implements PatherExtension, ReadWriteRelatedExt
 		return pathTracking.currentPath();
 	}
 
-	private Middleware<TweedEntryReader<?, ?>> createEntryReaderMiddleware() {
+	private Middleware<TweedEntryReader<?, ?>, ReaderMiddlewareContext> createEntryReaderMiddleware() {
-		return new Middleware<TweedEntryReader<?, ?>>() {
+		return new Middleware<TweedEntryReader<?, ?>, ReaderMiddlewareContext>() {
 			@Override
 			public String id() {
 				return EXTENSION_ID;
 			}
 
 			@Override
-			public TweedEntryReader<?, ?> process(TweedEntryReader<?, ?> inner) {
+			public TweedEntryReader<?, ?> process(TweedEntryReader<?, ?> inner, ReaderMiddlewareContext context) {
 				assert rwContextPathTrackingAccess != null;
 
 				//noinspection unchecked
 				val castedInner = (TweedEntryReader<Object, @NonNull ConfigEntry<Object>>) inner;
 
-				return (TweedDataReader reader, ConfigEntry<Object> entry, TweedReadContext context) -> {
+				return (TweedDataReader reader, ConfigEntry<Object> entry, TweedReadContext readContext) -> {
-					PathTracking pathTracking = context.extensionsData().get(rwContextPathTrackingAccess);
+					PathTracking pathTracking = readContext.extensionsData().get(rwContextPathTrackingAccess);
 					if (pathTracking != null) {
-						return castedInner.read(reader, entry, context);
+						return castedInner.read(reader, entry, readContext);
 					}
 
 					pathTracking = PathTracking.create();
-					context.extensionsData().set(rwContextPathTrackingAccess, pathTracking);
+					readContext.extensionsData().set(rwContextPathTrackingAccess, pathTracking);
-					return castedInner.read(new PathTrackingDataReader(reader, pathTracking), entry, context);
+					return castedInner.read(new PathTrackingDataReader(reader, pathTracking), entry, readContext);
 				};
 			}
 		};
 	}
 
-	private Middleware<TweedEntryWriter<?, ?>> createEntryWriterMiddleware() {
+	private Middleware<TweedEntryWriter<?, ?>, WriterMiddlewareContext> createEntryWriterMiddleware() {
-		return new Middleware<TweedEntryWriter<?, ?>>() {
+		return new Middleware<TweedEntryWriter<?, ?>, WriterMiddlewareContext>() {
 			@Override
 			public String id() {
 				return EXTENSION_ID;
 			}
 
 			@Override
-			public TweedEntryWriter<?, ?> process(TweedEntryWriter<?, ?> inner) {
+			public TweedEntryWriter<?, ?> process(TweedEntryWriter<?, ?> inner, WriterMiddlewareContext context) {
 				assert rwContextPathTrackingAccess != null;
 
 				//noinspection unchecked
 				val castedInner = (TweedEntryWriter<Object, @NonNull ConfigEntry<Object>>) inner;
 
-				return (TweedDataVisitor writer, Object value, ConfigEntry<Object> entry, TweedWriteContext context) -> {
+				return (TweedDataVisitor writer, Object value, ConfigEntry<Object> entry, TweedWriteContext writeContext) -> {
-					PathTracking pathTracking = context.extensionsData().get(rwContextPathTrackingAccess);
+					PathTracking pathTracking = writeContext.extensionsData().get(rwContextPathTrackingAccess);
 					if (pathTracking != null) {
-						castedInner.write(writer, value, entry, context);
+						castedInner.write(writer, value, entry, writeContext);
 						return;
 					}
 
 					pathTracking = PathTracking.create();
-					context.extensionsData().set(rwContextPathTrackingAccess, pathTracking);
+					writeContext.extensionsData().set(rwContextPathTrackingAccess, pathTracking);
 					try {
-						castedInner.write(new PathTrackingDataVisitor(writer, pathTracking), value, entry, context);
+						castedInner.write(new PathTrackingDataVisitor(writer, pathTracking), value, entry, writeContext);
 					} catch (TweedEntryWriteException e) {
 						PathTracking exceptionPathTracking =
 								e.context().extensionsData().get(rwContextPathTrackingAccess);

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/readfallback/impl/ReadFallbackExtensionImpl.java

@@ -10,6 +10,7 @@ import de.siphalor.tweed5.defaultextensions.pather.api.PatherExtension;
 import de.siphalor.tweed5.defaultextensions.presets.api.PresetsExtension;
 import de.siphalor.tweed5.defaultextensions.readfallback.api.ReadFallbackExtension;
 import de.siphalor.tweed5.defaultextensions.validation.api.ValidationExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReaderMiddlewareContext;
 import de.siphalor.tweed5.serde.extension.api.read.result.TweedReadResult;
 import lombok.extern.apachecommons.CommonsLog;
 import org.jspecify.annotations.NonNull;
@@ -30,7 +31,7 @@ public class ReadFallbackExtensionImpl implements ReadFallbackExtension, ReadWri
 		PresetsExtension presetsExtension = configContainer.extension(PresetsExtension.class)
 				.orElseThrow(() -> new IllegalStateException(getClass().getSimpleName()
 						+ " requires " + ReadFallbackExtension.class.getSimpleName()));
-		context.registerReaderMiddleware(new Middleware<TweedEntryReader<?, ?>>() {
+		context.registerReaderMiddleware(new Middleware<TweedEntryReader<?, ?>, ReaderMiddlewareContext>() {
 			@Override
 			public String id() {
 				return EXTENSION_ID;
@@ -47,18 +48,18 @@ public class ReadFallbackExtensionImpl implements ReadFallbackExtension, ReadWri
 			}
 
 			@Override
-			public TweedEntryReader<?, ?> process(TweedEntryReader<?, ?> inner) {
+			public TweedEntryReader<?, ?> process(TweedEntryReader<?, ?> inner, ReaderMiddlewareContext context) {
 				//noinspection unchecked
 				TweedEntryReader<Object, ConfigEntry<Object>> castedInner =
 						(TweedEntryReader<Object, @NonNull ConfigEntry<Object>>) inner;
-				return (TweedEntryReader<Object, @NonNull ConfigEntry<Object>>) (reader, entry, context) ->
+				return (TweedEntryReader<Object, @NonNull ConfigEntry<Object>>) (reader, entry, readContext) ->
-						castedInner.read(reader, entry, context).catchError(
+						castedInner.read(reader, entry, readContext).catchError(
 								issues -> {
 									Object fallback =
 											presetsExtension.presetValue(entry, PresetsExtension.DEFAULT_PRESET_NAME);
 									return TweedReadResult.withIssues(fallback, issues);
 								},
-								context
+								readContext
 						);
 			}
 		});

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/api/ValidationExtension.java

@@ -8,6 +8,7 @@ import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationResu
 import de.siphalor.tweed5.defaultextensions.validation.api.validators.SimpleValidatorMiddleware;
 import de.siphalor.tweed5.defaultextensions.validation.impl.ValidationExtensionImpl;
 import de.siphalor.tweed5.patchwork.api.Patchwork;
+import org.jetbrains.annotations.UnknownNullability;
 import org.jspecify.annotations.Nullable;
 
 import java.util.*;
@@ -55,7 +56,10 @@ public interface ValidationExtension extends TweedExtension {
 			lastId = id;
 		}
 	}
-	<T> void addValidatorMiddleware(ConfigEntry<T> entry, Middleware<ConfigEntryValidator> validator);
+	<T> void addValidatorMiddleware(
+			ConfigEntry<T> entry,
+			Middleware<ConfigEntryValidator, ValidatorMiddlewareContext> validator
+	);
 
 	ValidationIssues captureValidationIssues(Patchwork readContextExtensionsData);
 

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/api/ValidationProvidingExtension.java

@@ -3,5 +3,5 @@ package de.siphalor.tweed5.defaultextensions.validation.api;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
 
 public interface ValidationProvidingExtension {
-	Middleware<ConfigEntryValidator> validationMiddleware();
+	Middleware<ConfigEntryValidator, ValidatorMiddlewareContext> validationMiddleware();
 }

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/api/ValidatorMiddlewareContext.java

@@ -0,0 +1,13 @@
+package de.siphalor.tweed5.defaultextensions.validation.api;
+
+import de.siphalor.tweed5.core.api.entry.ConfigEntry;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Value;
+
+@Value
+@AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
+@Builder
+public class ValidatorMiddlewareContext {
+	ConfigEntry<?> entry;
+}

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/api/validators/SimpleValidatorMiddleware.java

@@ -3,6 +3,7 @@ package de.siphalor.tweed5.defaultextensions.validation.api.validators;
 import de.siphalor.tweed5.core.api.entry.ConfigEntry;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
 import de.siphalor.tweed5.defaultextensions.validation.api.ConfigEntryValidator;
+import de.siphalor.tweed5.defaultextensions.validation.api.ValidatorMiddlewareContext;
 import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationResult;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -10,12 +11,12 @@ import org.jspecify.annotations.Nullable;
 
 @Getter
 @AllArgsConstructor
-public class SimpleValidatorMiddleware implements Middleware<ConfigEntryValidator> {
+public class SimpleValidatorMiddleware implements Middleware<ConfigEntryValidator, ValidatorMiddlewareContext> {
 	String id;
 	ConfigEntryValidator validator;
 
 	@Override
-	public ConfigEntryValidator process(ConfigEntryValidator inner) {
+	public ConfigEntryValidator process(ConfigEntryValidator inner, ValidatorMiddlewareContext context) {
 		return new ConfigEntryValidator() {
 			@Override
 			public <T extends @Nullable Object> ValidationResult<T> validate(ConfigEntry<T> configEntry, T value) {

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validation/impl/ValidationExtensionImpl.java

@@ -11,6 +11,7 @@ import de.siphalor.tweed5.core.api.middleware.Middleware;
 import de.siphalor.tweed5.core.api.middleware.MiddlewareContainer;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentModifyingExtension;
 import de.siphalor.tweed5.defaultextensions.comment.api.CommentProducer;
+import de.siphalor.tweed5.defaultextensions.comment.api.CommentProducerMiddlewareContext;
 import de.siphalor.tweed5.defaultextensions.pather.api.PathTracking;
 import de.siphalor.tweed5.defaultextensions.pather.api.PathTrackingConfigEntryValueVisitor;
 import de.siphalor.tweed5.defaultextensions.pather.api.PatherExtension;
@@ -18,6 +19,7 @@ import de.siphalor.tweed5.defaultextensions.pather.api.ValuePathTracking;
 import de.siphalor.tweed5.defaultextensions.validation.api.ConfigEntryValidator;
 import de.siphalor.tweed5.defaultextensions.validation.api.ValidationExtension;
 import de.siphalor.tweed5.defaultextensions.validation.api.ValidationProvidingExtension;
+import de.siphalor.tweed5.defaultextensions.validation.api.ValidatorMiddlewareContext;
 import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationIssue;
 import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationIssueLevel;
 import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationIssues;
@@ -28,10 +30,12 @@ import de.siphalor.tweed5.serde.extension.api.TweedEntryReader;
 import de.siphalor.tweed5.serde.extension.api.TweedReadContext;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReaderMiddlewareContext;
 import de.siphalor.tweed5.serde.extension.api.read.result.TweedReadIssue;
 import de.siphalor.tweed5.serde.extension.api.read.result.TweedReadResult;
 import de.siphalor.tweed5.serde_api.api.TweedDataReader;
 import lombok.*;
+import org.jetbrains.annotations.UnknownNullability;
 import org.jspecify.annotations.Nullable;
 
 import java.util.*;
@@ -70,8 +74,8 @@ public class ValidationExtensionImpl implements ReadWriteRelatedExtension, Valid
 
 	private final ConfigContainer<?> configContainer;
 	private final PatchworkPartAccess<CustomEntryData> customEntryDataAccess;
-	private final MiddlewareContainer<ConfigEntryValidator> entryValidatorMiddlewareContainer
+	private final MiddlewareContainer<ConfigEntryValidator, ValidatorMiddlewareContext>
-			= new DefaultMiddlewareContainer<>();
+			entryValidatorMiddlewareContainer = new DefaultMiddlewareContainer<>();
 	private @Nullable PatchworkPartAccess<ValidationIssues> readContextValidationIssuesAccess;
 	private @Nullable PatherExtension patherExtension;
 
@@ -97,15 +101,15 @@ public class ValidationExtensionImpl implements ReadWriteRelatedExtension, Valid
 	}
 
 	@Override
-	public Middleware<CommentProducer> commentMiddleware() {
+	public Middleware<CommentProducer, CommentProducerMiddlewareContext> commentMiddleware() {
-		return new Middleware<CommentProducer>() {
+		return new Middleware<CommentProducer, CommentProducerMiddlewareContext>() {
 			@Override
 			public String id() {
 				return EXTENSION_ID;
 			}
 
 			@Override
-			public CommentProducer process(CommentProducer inner) {
+			public CommentProducer process(CommentProducer inner, CommentProducerMiddlewareContext context) {
 				return entry -> {
 					String baseComment = inner.createComment(entry);
 					CustomEntryData entryData = entry.extensionsData().get(customEntryDataAccess);
@@ -135,7 +139,10 @@ public class ValidationExtensionImpl implements ReadWriteRelatedExtension, Valid
 	}
 
 	@Override
-	public <T> void addValidatorMiddleware(ConfigEntry<T> entry, Middleware<ConfigEntryValidator> validator) {
+	public <T> void addValidatorMiddleware(
+			ConfigEntry<T> entry,
+			Middleware<ConfigEntryValidator, ValidatorMiddlewareContext> validator
+	) {
 		CustomEntryData entryData = getOrCreateCustomEntryData(entry);
 		entryData.addValidator(validator);
 	}
@@ -152,13 +159,20 @@ public class ValidationExtensionImpl implements ReadWriteRelatedExtension, Valid
 		CustomEntryData entryData = getOrCreateCustomEntryData(configEntry);
 
 		if (entryData.validators().isEmpty()) {
-			entryData.completeValidator(entryValidatorMiddlewareContainer.process(baseValidator));
+			entryData.completeValidator(entryValidatorMiddlewareContainer.process(
+					baseValidator,
+					ValidatorMiddlewareContext.builder().entry(configEntry).build()
+			));
 		} else {
-			DefaultMiddlewareContainer<ConfigEntryValidator> entrySpecificValidatorContainer = new DefaultMiddlewareContainer<>();
+			DefaultMiddlewareContainer<ConfigEntryValidator, ValidatorMiddlewareContext> entrySpecificValidatorContainer
+					= new DefaultMiddlewareContainer<>();
 			entrySpecificValidatorContainer.registerAll(entryValidatorMiddlewareContainer.middlewares());
 			entrySpecificValidatorContainer.registerAll(entryData.validators());
 			entrySpecificValidatorContainer.seal();
-			entryData.completeValidator(entrySpecificValidatorContainer.process(baseValidator));
+			entryData.completeValidator(entrySpecificValidatorContainer.process(
+					baseValidator,
+					ValidatorMiddlewareContext.builder().entry(configEntry).build()
+			));
 		}
 	}
 
@@ -199,14 +213,14 @@ public class ValidationExtensionImpl implements ReadWriteRelatedExtension, Valid
 	@Data
 	private static class CustomEntryData {
 		@Setter(AccessLevel.NONE)
-		private @Nullable List<Middleware<ConfigEntryValidator>> validators;
+		private @Nullable List<Middleware<ConfigEntryValidator, ValidatorMiddlewareContext>> validators;
 		private @Nullable ConfigEntryValidator completeValidator;
 
-		public List<Middleware<ConfigEntryValidator>> validators() {
+		public List<Middleware<ConfigEntryValidator, ValidatorMiddlewareContext>> validators() {
 			return validators == null ? Collections.emptyList() : validators;
 		}
 
-		public void addValidator(Middleware<ConfigEntryValidator> validator) {
+		public void addValidator(Middleware<ConfigEntryValidator, ValidatorMiddlewareContext> validator) {
 			if (validators == null) {
 				validators = new ArrayList<>();
 			}
@@ -214,7 +228,8 @@ public class ValidationExtensionImpl implements ReadWriteRelatedExtension, Valid
 		}
 	}
 
-	private class EntryValidationReaderMiddleware implements Middleware<TweedEntryReader<?, ?>> {
+	private class EntryValidationReaderMiddleware
+			implements Middleware<TweedEntryReader<?, ?>, ReaderMiddlewareContext> {
 		@Override
 		public String id() {
 			return EXTENSION_ID;
@@ -226,15 +241,15 @@ public class ValidationExtensionImpl implements ReadWriteRelatedExtension, Valid
 		}
 
 		@Override
-		public TweedEntryReader<?, ?> process(TweedEntryReader<?, ?> inner) {
+		public TweedEntryReader<?, ?> process(TweedEntryReader<?, ?> inner, ReaderMiddlewareContext context) {
 			assert readContextValidationIssuesAccess != null && patherExtension != null;
 
 			//noinspection unchecked
 			TweedEntryReader<Object, ConfigEntry<Object>> castedInner = (TweedEntryReader<Object, ConfigEntry<Object>>) inner;
-			return (TweedDataReader reader, ConfigEntry<Object> entry, TweedReadContext context) -> {
+			return (TweedDataReader reader, ConfigEntry<Object> entry, TweedReadContext readContext) -> {
-				ValidationIssues validationIssues = getOrCreateValidationIssues(context.extensionsData());
+				ValidationIssues validationIssues = getOrCreateValidationIssues(readContext.extensionsData());
 
-				return castedInner.read(reader, entry, context).andThen(value -> {
+				return castedInner.read(reader, entry, readContext).andThen(value -> {
 					ConfigEntryValidator entryValidator = entry.extensionsData()
 							.get(customEntryDataAccess)
 							.completeValidator();
@@ -246,22 +261,22 @@ public class ValidationExtensionImpl implements ReadWriteRelatedExtension, Valid
 						return TweedReadResult.ok(validationResult.value());
 					}
 
-					String path = patherExtension.getPath(context);
+					String path = patherExtension.getPath(readContext);
 					validationIssues.issuesByPath().put(path, new ValidationIssues.EntryIssues(
 							entry,
 							validationResult.issues()
 					));
 					if (validationResult.hasError()) {
 						return TweedReadResult.failed(
-								mapValidationIssuesToReadIssues(validationResult.issues(), context)
+								mapValidationIssuesToReadIssues(validationResult.issues(), readContext)
 						);
 					} else {
 						return TweedReadResult.withIssues(
 								validationResult.value(),
-								mapValidationIssuesToReadIssues(validationResult.issues(), context)
+								mapValidationIssuesToReadIssues(validationResult.issues(), readContext)
 						);
 					}
-				}, context);
+				}, readContext);
 			};
 		}
 	}

tweed5/default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/validationfallback/impl/ValidationFallbackExtensionImpl.java

@@ -7,6 +7,7 @@ import de.siphalor.tweed5.core.api.middleware.Middleware;
 import de.siphalor.tweed5.defaultextensions.presets.api.PresetsExtension;
 import de.siphalor.tweed5.defaultextensions.validation.api.ConfigEntryValidator;
 import de.siphalor.tweed5.defaultextensions.validation.api.ValidationProvidingExtension;
+import de.siphalor.tweed5.defaultextensions.validation.api.ValidatorMiddlewareContext;
 import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationIssue;
 import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationIssueLevel;
 import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationResult;
@@ -62,11 +63,11 @@ public class ValidationFallbackExtensionImpl implements ValidationFallbackExtens
 	}
 
 	@Override
-	public Middleware<ConfigEntryValidator> validationMiddleware() {
+	public Middleware<ConfigEntryValidator, ValidatorMiddlewareContext> validationMiddleware() {
 		return new ValidationFallbackMiddleware();
 	}
 
-	private class ValidationFallbackMiddleware implements Middleware<ConfigEntryValidator> {
+	private class ValidationFallbackMiddleware implements Middleware<ConfigEntryValidator, ValidatorMiddlewareContext> {
 		@Override
 		public String id() {
 			return EXTENSION_ID;
@@ -83,7 +84,7 @@ public class ValidationFallbackExtensionImpl implements ValidationFallbackExtens
 		}
 
 		@Override
-		public ConfigEntryValidator process(ConfigEntryValidator inner) {
+		public ConfigEntryValidator process(ConfigEntryValidator inner, ValidatorMiddlewareContext context) {
 			return new ConfigEntryValidator() {
 				@Override
 				public <T extends @Nullable Object> ValidationResult<T> validate(ConfigEntry<T> configEntry, T value) {

tweed5/default-extensions/src/test/java/de/siphalor/tweed5/defaultextensions/comment/impl/CommentExtensionImplTest.java

@@ -9,6 +9,7 @@ import de.siphalor.tweed5.core.impl.DefaultConfigContainer;
 import de.siphalor.tweed5.core.impl.entry.NullableConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.SimpleConfigEntryImpl;
 import de.siphalor.tweed5.core.impl.entry.StaticMapCompoundConfigEntryImpl;
+import de.siphalor.tweed5.defaultextensions.comment.api.CommentProducerMiddlewareContext;
 import de.siphalor.tweed5.serde.extension.api.ReadWriteExtension;
 import de.siphalor.tweed5.serde.hjson.HjsonCommentType;
 import de.siphalor.tweed5.serde.hjson.HjsonWriter;
@@ -144,7 +145,7 @@ class CommentExtensionImplTest {
 		}
 
 		@Override
-		public Middleware<CommentProducer> commentMiddleware() {
+		public Middleware<CommentProducer, CommentProducerMiddlewareContext> commentMiddleware() {
 			return new Middleware<>() {
 				@Override
 				public String id() {
@@ -152,7 +153,7 @@ class CommentExtensionImplTest {
 				}
 
 				@Override
-				public CommentProducer process(CommentProducer inner) {
+				public CommentProducer process(CommentProducer inner, CommentProducerMiddlewareContext context) {
 					return entry -> "The comment is:\n" + inner.createComment(entry) + "\nEND";
 				}
 			};

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/extension/ReadWriteExtensionSetupContext.java

@@ -7,6 +7,6 @@ import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess;
 
 public interface ReadWriteExtensionSetupContext {
 	<E> PatchworkPartAccess<E> registerReadWriteContextExtensionData(Class<E> extensionDataClass);
-	void registerReaderMiddleware(Middleware<TweedEntryReader<?, ?>> middleware);
+	void registerReaderMiddleware(Middleware<TweedEntryReader<?, ?>, ReaderMiddlewareContext> middleware);
-	void registerWriterMiddleware(Middleware<TweedEntryWriter<?, ?>> middleware);
+	void registerWriterMiddleware(Middleware<TweedEntryWriter<?, ?>, WriterMiddlewareContext> middleware);
 }

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/extension/ReaderMiddlewareContext.java

@@ -0,0 +1,11 @@
+package de.siphalor.tweed5.serde.extension.api.extension;
+
+import de.siphalor.tweed5.core.api.entry.ConfigEntry;
+import lombok.*;
+
+@Value
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Builder
+public class ReaderMiddlewareContext {
+	ConfigEntry<?> entry;
+}

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/api/extension/WriterMiddlewareContext.java

@@ -0,0 +1,14 @@
+package de.siphalor.tweed5.serde.extension.api.extension;
+
+import de.siphalor.tweed5.core.api.entry.ConfigEntry;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Value;
+
+@Value
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Builder
+public class WriterMiddlewareContext {
+	ConfigEntry<?> entry;
+}

tweed5/serde-extension/src/main/java/de/siphalor/tweed5/serde/extension/impl/ReadWriteExtensionImpl.java

@@ -6,16 +6,18 @@ import de.siphalor.tweed5.core.api.extension.TweedExtension;
 import de.siphalor.tweed5.core.api.extension.TweedExtensionSetupContext;
 import de.siphalor.tweed5.core.api.middleware.DefaultMiddlewareContainer;
 import de.siphalor.tweed5.core.api.middleware.Middleware;
+import de.siphalor.tweed5.patchwork.api.Patchwork;
+import de.siphalor.tweed5.patchwork.api.PatchworkFactory;
+import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess;
 import de.siphalor.tweed5.serde.extension.api.*;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteExtensionSetupContext;
 import de.siphalor.tweed5.serde.extension.api.extension.ReadWriteRelatedExtension;
+import de.siphalor.tweed5.serde.extension.api.extension.ReaderMiddlewareContext;
+import de.siphalor.tweed5.serde.extension.api.extension.WriterMiddlewareContext;
 import de.siphalor.tweed5.serde.extension.api.read.result.TweedReadResult;
 import de.siphalor.tweed5.serde_api.api.TweedDataReader;
 import de.siphalor.tweed5.serde_api.api.TweedDataVisitor;
 import de.siphalor.tweed5.serde_api.api.TweedDataWriteException;
-import de.siphalor.tweed5.patchwork.api.Patchwork;
-import de.siphalor.tweed5.patchwork.api.PatchworkFactory;
-import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess;
 import lombok.Data;
 import org.jspecify.annotations.Nullable;
 
@@ -24,12 +26,10 @@ import java.util.Collection;
 public class ReadWriteExtensionImpl implements ReadWriteExtension {
 	private final ConfigContainer<?> configContainer;
 	private final PatchworkPartAccess<CustomEntryData> customEntryDataAccess;
-	private DefaultMiddlewareContainer<TweedEntryReader<?, ?>>
+	private DefaultMiddlewareContainer<TweedEntryReader<?, ?>, ReaderMiddlewareContext>
-			entryReaderMiddlewareContainer
+			entryReaderMiddlewareContainer = new DefaultMiddlewareContainer<>();
-			= new DefaultMiddlewareContainer<>();
+	private DefaultMiddlewareContainer<TweedEntryWriter<?, ?>, WriterMiddlewareContext>
-	private DefaultMiddlewareContainer<TweedEntryWriter<?, ?>>
+			entryWriterMiddlewareContainer = new DefaultMiddlewareContainer<>();
-			entryWriterMiddlewareContainer
-			= new DefaultMiddlewareContainer<>();
 	private @Nullable PatchworkFactory readWriteContextPatchworkFactory;
 
 	public ReadWriteExtensionImpl(ConfigContainer<?> configContainer, TweedExtensionSetupContext context) {
@@ -52,12 +52,16 @@ public class ReadWriteExtensionImpl implements ReadWriteExtension {
 			}
 
 			@Override
-			public void registerReaderMiddleware(Middleware<TweedEntryReader<?, ?>> middleware) {
+			public void registerReaderMiddleware(
+					Middleware<TweedEntryReader<?, ?>, ReaderMiddlewareContext> middleware
+			) {
 				entryReaderMiddlewareContainer.register(middleware);
 			}
 
 			@Override
-			public void registerWriterMiddleware(Middleware<TweedEntryWriter<?, ?>> middleware) {
+			public void registerWriterMiddleware(
+					Middleware<TweedEntryWriter<?, ?>, WriterMiddlewareContext> middleware
+			) {
 				entryWriterMiddlewareContainer.register(middleware);
 			}
 		};
@@ -118,8 +122,14 @@ public class ReadWriteExtensionImpl implements ReadWriteExtension {
 	@Override
 	public void initEntry(ConfigEntry<?> configEntry) {
 		CustomEntryData customEntryData = getOrCreateCustomEntryData(configEntry);
-		customEntryData.readerChain(entryReaderMiddlewareContainer.process(customEntryData.readerDefinition()));
+		customEntryData.readerChain(entryReaderMiddlewareContainer.process(
-		customEntryData.writerChain(entryWriterMiddlewareContainer.process(customEntryData.writerDefinition()));
+				customEntryData.readerDefinition(),
+				ReaderMiddlewareContext.builder().entry(configEntry).build()
+		));
+		customEntryData.writerChain(entryWriterMiddlewareContainer.process(
+				customEntryData.writerDefinition(),
+				WriterMiddlewareContext.builder().entry(configEntry).build()
+		));
 	}
 
 	private CustomEntryData getOrCreateCustomEntryData(ConfigEntry<?> entry) {