Stop NGDynamicHTMLTag (internal parser logic) leaking into our nodes

Author: hugithordarson

ng-appserver/src/main/java/ng/appserver/templating/parser/NGTemplateParser.java

@@ -109,7 +109,13 @@ public void didParseClosingWebObjectTag( final String parsedString ) throws NGHT
 			throw new NGHTMLFormatException( message );
 		}
 
-		final PNode node = new PBasicNode( _currentDynamicTag );
+		final PNode node = new PBasicNode(
+				_currentDynamicTag.declaration().type(),
+				_currentDynamicTag.declaration().bindings(),
+				_currentDynamicTag.childrenWithStringsProcessedAndCombined(),
+				_currentDynamicTag.declaration().isInline(),
+				_currentDynamicTag.declaration().name() );
+
 		_currentDynamicTag = parentDynamicTag;
 		_currentDynamicTag.addChild( node );
 	}

ng-appserver/src/main/java/ng/appserver/templating/parser/model/PBasicNode.java

@@ -5,31 +5,13 @@
 import java.util.Objects;
 
 import ng.appserver.templating.parser.NGDeclaration.NGBindingValue;
-import ng.appserver.templating.parser.NGDynamicHTMLTag;
 
-public record PBasicNode( NGDynamicHTMLTag tag ) implements PNode {
+public record PBasicNode( String type, Map<String, NGBindingValue> bindings, List<PNode> children, boolean isInline, String declarationName ) implements PNode {
 
 	public PBasicNode {
-		Objects.requireNonNull( tag );
-	}
-
-	public boolean isInline() {
-		return tag().declaration().isInline();
-	}
-
-	public String type() {
-		return tag().declaration().type();
-	}
-
-	public Map<String, NGBindingValue> bindings() {
-		return tag().declaration().bindings();
-	}
-
-	public List<PNode> children() {
-		return tag().childrenWithStringsProcessedAndCombined();
-	}
-
-	public String declarationName() {
-		return tag().declaration().name();
+		Objects.requireNonNull( type );
+		Objects.requireNonNull( bindings );
+		Objects.requireNonNull( children );
+		Objects.requireNonNull( declarationName );
 	}
 }