Remove entity and notation events, not coming for 6.5.0.

CHANGELOG.md

@@ -5,7 +5,6 @@
 * Add support for most XPath 1.0 variables and functions, including set-operations and ensuring document order in the result.
 * Add `XmlNode.xpathGenerate` to create a readable XPath for all nodes.
 * Add support for node comparison: `XmlNode.isEqualNode` and `XmlNode.compareNodePosition`.
-* Add events and node types for _entity_ and _notation_ nodes.
 
 ## 6.4.0
 

lib/src/xml_events/converters/node_decoder.dart

@@ -20,8 +20,6 @@ import '../events/comment.dart';
 import '../events/declaration.dart';
 import '../events/doctype.dart';
 import '../events/end_element.dart';
-import '../events/entity.dart';
-import '../events/notation.dart';
 import '../events/processing.dart';
 import '../events/start_element.dart';
 import '../events/text.dart';
@@ -101,16 +99,6 @@ class _XmlNodeDecoderSink
     }
   }
 
-  @override
-  void visitEntityEvent(XmlEntityEvent event) {
-    // TODO: add node to DOM
-  }
-
-  @override
-  void visitNotationEvent(XmlNotationEvent event) {
-    // TODO: add node to DOM
-  }
-
   @override
   void visitProcessingEvent(XmlProcessingEvent event) =>
       commit(XmlProcessing(event.target, event.value), event);

lib/src/xml_events/streams/each_event.dart

@@ -6,8 +6,6 @@ import '../events/comment.dart';
 import '../events/declaration.dart';
 import '../events/doctype.dart';
 import '../events/end_element.dart';
-import '../events/entity.dart';
-import '../events/notation.dart';
 import '../events/processing.dart';
 import '../events/start_element.dart';
 import '../events/text.dart';
@@ -27,8 +25,6 @@ extension XmlEachEventStreamExtension on Stream<XmlEvent> {
     EventHandler<XmlDeclarationEvent>? onDeclaration,
     EventHandler<XmlDoctypeEvent>? onDoctype,
     EventHandler<XmlEndElementEvent>? onEndElement,
-    EventHandler<XmlEntityEvent>? onEntityEvent,
-    EventHandler<XmlNotationEvent>? onNotationEvent,
     EventHandler<XmlProcessingEvent>? onProcessing,
     EventHandler<XmlStartElementEvent>? onStartElement,
     EventHandler<XmlTextEvent>? onText,
@@ -39,8 +35,6 @@ extension XmlEachEventStreamExtension on Stream<XmlEvent> {
       onDeclaration: onDeclaration,
       onDoctype: onDoctype,
       onEndElement: onEndElement,
-      onEntityEvent: onEntityEvent,
-      onNotationEvent: onNotationEvent,
       onProcessing: onProcessing,
       onStartElement: onStartElement,
       onText: onText,
@@ -61,8 +55,6 @@ extension XmlEachEventStreamExtension on Stream<XmlEvent> {
     EventHandler<XmlDeclarationEvent>? onDeclaration,
     EventHandler<XmlDoctypeEvent>? onDoctype,
     EventHandler<XmlEndElementEvent>? onEndElement,
-    EventHandler<XmlEntityEvent>? onEntityEvent,
-    EventHandler<XmlNotationEvent>? onNotationEvent,
     EventHandler<XmlProcessingEvent>? onProcessing,
     EventHandler<XmlStartElementEvent>? onStartElement,
     EventHandler<XmlTextEvent>? onText,
@@ -73,8 +65,6 @@ extension XmlEachEventStreamExtension on Stream<XmlEvent> {
         onDeclaration: onDeclaration,
         onDoctype: onDoctype,
         onEndElement: onEndElement,
-        onEntityEvent: onEntityEvent,
-        onNotationEvent: onNotationEvent,
         onProcessing: onProcessing,
         onStartElement: onStartElement,
         onText: onText,
@@ -93,8 +83,6 @@ extension XmlEachEventStreamListExtension on Stream<List<XmlEvent>> {
     EventHandler<XmlDeclarationEvent>? onDeclaration,
     EventHandler<XmlDoctypeEvent>? onDoctype,
     EventHandler<XmlEndElementEvent>? onEndElement,
-    EventHandler<XmlEntityEvent>? onEntityEvent,
-    EventHandler<XmlNotationEvent>? onNotationEvent,
     EventHandler<XmlProcessingEvent>? onProcessing,
     EventHandler<XmlStartElementEvent>? onStartElement,
     EventHandler<XmlTextEvent>? onText,
@@ -105,8 +93,6 @@ extension XmlEachEventStreamListExtension on Stream<List<XmlEvent>> {
       onDeclaration: onDeclaration,
       onDoctype: onDoctype,
       onEndElement: onEndElement,
-      onEntityEvent: onEntityEvent,
-      onNotationEvent: onNotationEvent,
       onProcessing: onProcessing,
       onStartElement: onStartElement,
       onText: onText,
@@ -127,8 +113,6 @@ extension XmlEachEventStreamListExtension on Stream<List<XmlEvent>> {
     EventHandler<XmlDeclarationEvent>? onDeclaration,
     EventHandler<XmlDoctypeEvent>? onDoctype,
     EventHandler<XmlEndElementEvent>? onEndElement,
-    EventHandler<XmlEntityEvent>? onEntityEvent,
-    EventHandler<XmlNotationEvent>? onNotationEvent,
     EventHandler<XmlProcessingEvent>? onProcessing,
     EventHandler<XmlStartElementEvent>? onStartElement,
     EventHandler<XmlTextEvent>? onText,
@@ -139,8 +123,6 @@ extension XmlEachEventStreamListExtension on Stream<List<XmlEvent>> {
         onDeclaration: onDeclaration,
         onDoctype: onDoctype,
         onEndElement: onEndElement,
-        onEntityEvent: onEntityEvent,
-        onNotationEvent: onNotationEvent,
         onProcessing: onProcessing,
         onStartElement: onStartElement,
         onText: onText,
@@ -154,8 +136,6 @@ class XmlEventHandler with XmlEventVisitor {
     this.onDeclaration,
     this.onDoctype,
     this.onEndElement,
-    this.onEntityEvent,
-    this.onNotationEvent,
     this.onProcessing,
     this.onStartElement,
     this.onText,
@@ -166,8 +146,6 @@ class XmlEventHandler with XmlEventVisitor {
   final EventHandler<XmlDeclarationEvent>? onDeclaration;
   final EventHandler<XmlDoctypeEvent>? onDoctype;
   final EventHandler<XmlEndElementEvent>? onEndElement;
-  final EventHandler<XmlEntityEvent>? onEntityEvent;
-  final EventHandler<XmlNotationEvent>? onNotationEvent;
   final EventHandler<XmlProcessingEvent>? onProcessing;
   final EventHandler<XmlStartElementEvent>? onStartElement;
   final EventHandler<XmlTextEvent>? onText;
@@ -189,13 +167,6 @@ class XmlEventHandler with XmlEventVisitor {
   void visitEndElementEvent(XmlEndElementEvent event) =>
       onEndElement?.call(event);
 
-  @override
-  void visitEntityEvent(XmlEntityEvent event) => onEntityEvent?.call(event);
-
-  @override
-  void visitNotationEvent(XmlNotationEvent event) =>
-      onNotationEvent?.call(event);
-
   @override
   void visitProcessingEvent(XmlProcessingEvent event) =>
       onProcessing?.call(event);

lib/src/xml_events/streams/with_parent.dart

@@ -8,8 +8,6 @@ import '../events/comment.dart';
 import '../events/declaration.dart';
 import '../events/doctype.dart';
 import '../events/end_element.dart';
-import '../events/entity.dart';
-import '../events/notation.dart';
 import '../events/processing.dart';
 import '../events/start_element.dart';
 import '../events/text.dart';
@@ -91,14 +89,6 @@ class _XmlWithParentEventsSink
     currentParent = parent.parent;
   }
 
-  @override
-  void visitEntityEvent(XmlEntityEvent event) =>
-      event.attachParent(currentParent);
-
-  @override
-  void visitNotationEvent(XmlNotationEvent event) =>
-      event.attachParent(currentParent);
-
   @override
   void visitProcessingEvent(XmlProcessingEvent event) =>
       event.attachParent(currentParent);

lib/src/xml_events/visitor.dart

@@ -4,8 +4,6 @@ import 'events/comment.dart';
 import 'events/declaration.dart';
 import 'events/doctype.dart';
 import 'events/end_element.dart';
-import 'events/entity.dart';
-import 'events/notation.dart';
 import 'events/processing.dart';
 import 'events/start_element.dart';
 import 'events/text.dart';
@@ -30,12 +28,6 @@ mixin XmlEventVisitor {
   /// Visit an [XmlEndElementEvent] event.
   void visitEndElementEvent(XmlEndElementEvent event) {}
 
-  /// Visit an [XmlEntityEvent] event.
-  void visitEntityEvent(XmlEntityEvent event) {}
-
-  /// Visit an [XmlNotationEvent] event.
-  void visitNotationEvent(XmlNotationEvent event) {}
-
   /// Visit an [XmlCommentEvent] event.
   void visitProcessingEvent(XmlProcessingEvent event) {}
 

pubspec.yaml

@@ -1,5 +1,5 @@
 name: xml
-version: 6.4.2
+version: 6.5.0
 
 description: A lightweight library for parsing, traversing, querying, transforming and building XML documents.
 homepage: https://github.com/renggli/dart-xml