Expose tools to modify SVG path data: #95

zathras · May 1, 2024 · 899b202 · 899b202
1 parent cf478e3
commit 899b202
Show file tree

Hide file tree

Showing 9 changed files with 197 additions and 54 deletions.
diff --git a/lib/dom.dart b/lib/dom.dart
@@ -100,8 +100,11 @@ export 'src/svg_graph.dart'
         SvgFontWeight,
         SvgFontSize;
 
+export 'src/path_noui.dart' show PathParser, PathBuilder, StringPathBuilder;
+
 export 'src/common_noui.dart'
     show
+        ParseError,
         SIFillType,
         SIStrokeJoin,
         SIStrokeCap,

diff --git a/lib/src/common_noui.dart b/lib/src/common_noui.dart
@@ -136,7 +136,7 @@ abstract class SIBuilder<PathDataT, IM> extends SIVisitor<PathDataT, IM, void> {
   /// will return null, and the scalable image will re-use the previously
   /// built, equivalent path.
   ///
-  PathBuilder? startPath(SIPaint paint, Object key);
+  EnhancedPathBuilder? startPath(SIPaint paint, Object key);
 }
 
 class SIImageData {
@@ -496,10 +496,10 @@ class SIColorVisitor {
 /// Mixin for SIBuilder that builds paths from strings
 ///
 mixin SIStringPathMaker {
-  void makePath(String pathData, PathBuilder pb,
+  void makePath(String pathData, EnhancedPathBuilder pb,
       {required void Function(String) warn}) {
     try {
-      PathParser(pb, pathData).parse();
+      RealPathParser(pb, pathData).parse();
     } catch (e) {
       warn(e.toString());
       // As per the SVG spec, paths shall be parsed up to the first error,

diff --git a/lib/src/compact.dart b/lib/src/compact.dart
@@ -1225,7 +1225,7 @@ class _ExportedIDContext {
 }
 
 mixin _SICompactPathBuilder {
-  void makePath(CompactChildData pathData, PathBuilder pb,
+  void makePath(CompactChildData pathData, EnhancedPathBuilder pb,
       {required void Function(String) warn}) {
     CompactPathParser(pathData, pb).parse();
   }

diff --git a/lib/src/compact_noui.dart b/lib/src/compact_noui.dart
@@ -971,7 +971,7 @@ class CompactChildData {
 }
 
 // This is the dual of _CompactPathBuilder
-class CompactPathParser extends AbstractPathParser {
+class CompactPathParser extends AbstractPathParser<EnhancedPathBuilder> {
   final ByteBufferDataInputStream children;
   final FloatBufferInputStream args;
   bool _nextNybble = false;
@@ -1527,7 +1527,7 @@ abstract class SIGenericCompactBuilder<PathDataT, IM>
   }
 
   @override
-  PathBuilder? startPath(SIPaint paint, Object? key) {
+  EnhancedPathBuilder? startPath(SIPaint paint, Object? key) {
     final int? pathNumber = _pathShare[key];
     final int? paintNumber = _paintShare[paint];
     children.writeByte(PATH_CODE |
@@ -1550,7 +1550,7 @@ abstract class SIGenericCompactBuilder<PathDataT, IM>
     }
   }
 
-  void makePath(PathDataT pathData, PathBuilder pb,
+  void makePath(PathDataT pathData, EnhancedPathBuilder pb,
       {required void Function(String) warn});
 
   PathDataT immutableKey(PathDataT pathData);
@@ -1657,7 +1657,7 @@ enum _PathCommand {
   arcToPointEllipseLargeCW
 }
 
-class CompactPathBuilder<PathDataT, IM> extends PathBuilder {
+class CompactPathBuilder<PathDataT, IM> extends EnhancedPathBuilder {
   final DataOutputSink _children;
   final FloatSink _args;
 

diff --git a/lib/src/dag.dart b/lib/src/dag.dart
@@ -712,7 +712,7 @@ abstract class SIGenericDagBuilder<PathDataT, IM>
   }
 
   @override
-  PathBuilder? startPath(SIPaint paint, Object key) {
+  EnhancedPathBuilder? startPath(SIPaint paint, Object key) {
     final p = paths[key];
     if (p != null) {
       final sip = _daggerize(SIPath(p, paint));
@@ -726,7 +726,7 @@ abstract class SIGenericDagBuilder<PathDataT, IM>
     });
   }
 
-  void makePath(PathDataT pathData, PathBuilder pb,
+  void makePath(PathDataT pathData, EnhancedPathBuilder pb,
       {required void Function(String) warn});
 
   @override

diff --git a/lib/src/path.dart b/lib/src/path.dart
@@ -36,9 +36,9 @@ import 'common_noui.dart';
 import 'dart:math' show pi;
 
 ///
-/// Buidler of a Flutter UI path.  See [PathBuilder] for usage.
+/// Buidler of a Flutter UI path.  See [EnhancedPathBuilder] for usage.
 ///
-class UIPathBuilder implements PathBuilder {
+class UIPathBuilder implements EnhancedPathBuilder {
   final void Function(UIPathBuilder)? _onEnd;
 
   UIPathBuilder({void Function(UIPathBuilder)? onEnd}) : _onEnd = onEnd;