Prepare for PetitParser 7.0.0

Author: renggli

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 7.0.0
+
+* Dart 3.6 and PetitParser 7 requirement.
+* [TODO] Full unicode decoding of names.
+* [TODO] Preserving namespaces of copied nodes.
+
 ## 6.5.0
 
 * Add support for most XPath 1.0 functions, including set-operations and ensuring document order for node-sets.

lib/src/xml_events/parser.dart

@@ -103,15 +103,15 @@ class XmlEventParser {
         XmlToken.openComment.toParser(),
         any()
             .starLazy(XmlToken.closeComment.toParser())
-            .flatten('"${XmlToken.closeComment}" expected'),
+            .flatten(message: '"${XmlToken.closeComment}" expected'),
         XmlToken.closeComment.toParser(),
       ).map3((_, text, __) => XmlCommentEvent(text));
 
   Parser<XmlCDATAEvent> cdata() => seq3(
         XmlToken.openCDATA.toParser(),
         any()
             .starLazy(XmlToken.closeCDATA.toParser())
-            .flatten('"${XmlToken.closeCDATA}" expected'),
+            .flatten(message: '"${XmlToken.closeCDATA}" expected'),
         XmlToken.closeCDATA.toParser(),
       ).map3((_, text, __) => XmlCDATAEvent(text));
 
@@ -129,7 +129,7 @@ class XmlEventParser {
           ref0(space),
           any()
               .starLazy(XmlToken.closeProcessing.toParser())
-              .flatten('"${XmlToken.closeProcessing}" expected'),
+              .flatten(message: '"${XmlToken.closeProcessing}" expected'),
         ).map2((_, text) => text).optionalWith(''),
         XmlToken.closeProcessing.toParser(),
       ).map4((_, target, text, __) => XmlProcessingEvent(target, text));
@@ -184,7 +184,7 @@ class XmlEventParser {
         ]
             .toChoiceParser()
             .starLazy(XmlToken.closeDoctypeIntSubset.toParser())
-            .flatten('"${XmlToken.closeDoctypeIntSubset}" expected'),
+            .flatten(message: '"${XmlToken.closeDoctypeIntSubset}" expected'),
         XmlToken.closeDoctypeIntSubset.toParser(),
       ).map3((_, contents, __) => contents);
 
@@ -236,13 +236,14 @@ class XmlEventParser {
 
   // Tokens
 
-  Parser<String> space() => whitespace().plusString('whitespace expected');
+  Parser<String> space() =>
+      whitespace().plusString(message: 'whitespace expected');
 
   Parser<String> spaceOptional() =>
-      whitespace().starString('whitespace expected');
+      whitespace().starString(message: 'whitespace expected');
 
-  Parser<String> nameToken() =>
-      seq2(ref0(nameStartChar), ref0(nameChar).star()).flatten('name expected');
+  Parser<String> nameToken() => seq2(ref0(nameStartChar), ref0(nameChar).star())
+      .flatten(message: 'name expected');
 
   Parser<String> nameStartChar() => pattern(XmlToken.nameStartChars);
 

lib/src/xpath/parser.dart

@@ -163,7 +163,9 @@ class XPathParser {
         digit().plus(),
         seq2(char('.'), digit().plus()).optional(),
         seq3(anyOf('eE'), anyOf('+-').optional(), digit().plus()).optional(),
-      ).flatten('number').map((value) => XPathNumber(num.parse(value)));
+      )
+          .flatten(message: 'number')
+          .map((value) => XPathNumber(num.parse(value)));
 
   Parser<XPathExpression> stringLiteral() => ref0(string).map(XPathString.new);
 

pubspec.yaml

@@ -1,5 +1,5 @@
 name: xml
-version: 6.5.0
+version: 7.0.0
 
 description: A lightweight library for parsing, traversing, querying, transforming and building XML documents.
 homepage: https://github.com/renggli/dart-xml
@@ -10,12 +10,16 @@ topics:
   - xpath
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 dependencies:
   collection: ^1.19.0
   meta: ^1.16.0
-  petitparser: ^6.0.0
+  petitparser: ^7.0.0
 dev_dependencies:
-  args: ^2.5.0
-  lints: ^5.0.0
+  args: ^2.6.0
+  lints: ^5.1.0
   test: ^1.25.0
+
+dependency_overrides:
+  petitparser:
+    git: https://github.com/petitparser/dart-petitparser.git