remove unused props

codekeyz · codekeyz · commit f01954d81240 · 2025-07-06T17:47:43.000Z
diff --git a/packages/spanner/lib/src/parametric/definition.dart b/packages/spanner/lib/src/parametric/definition.dart
@@ -39,11 +39,7 @@ abstract class ParameterDefinition implements HandlerStore {
 
   bool matches(String route, {bool caseSensitive = false});
 
-  void resolveParams(
-    String pattern,
-    List<ParamAndValue> collector, {
-    bool caseSentive = false,
-  });
+  void resolveParams(String pattern, List<ParamAndValue> collector);
 }
 
 class SingleParameterDefn extends ParameterDefinition with HandlerStoreMixin {
@@ -66,12 +62,7 @@ class SingleParameterDefn extends ParameterDefinition with HandlerStoreMixin {
 
   @override
   bool matches(String route, {bool caseSensitive = false}) {
-    final match = matchPattern(
-      route,
-      prefix ?? '',
-      suffix ?? '',
-      caseSensitive,
-    );
+    final match = matchPattern(route, prefix ?? '', suffix ?? '');
     return match != null;
   }
 
@@ -84,15 +75,13 @@ class SingleParameterDefn extends ParameterDefinition with HandlerStoreMixin {
         _terminal = false;
 
   @override
-  void resolveParams(
-    final String pattern,
-    List<ParamAndValue> collector, {
-    bool caseSentive = false,
-  }) {
-    collector.add((
-      name: name,
-      value: matchPattern(pattern, prefix ?? "", suffix ?? "", caseSentive)
-    ));
+  void resolveParams(final String pattern, List<ParamAndValue> collector) {
+    collector.add(
+      (
+        name: name,
+        value: matchPattern(pattern, prefix ?? "", suffix ?? ""),
+      ),
+    );
   }
 
   @override
@@ -128,11 +117,7 @@ class CompositeParameterDefinition extends ParameterDefinition
       _template.hasMatch(route);
 
   @override
-  void resolveParams(
-    String pattern,
-    List<ParamAndValue> collector, {
-    bool caseSentive = false,
-  }) {
+  void resolveParams(String pattern, List<ParamAndValue> collector) {
     final match = _template.firstMatch(pattern);
     if (match == null) return;
 
diff --git a/packages/spanner/lib/src/parametric/utils.dart b/packages/spanner/lib/src/parametric/utils.dart
@@ -113,12 +113,12 @@ const _upperA = 65; //  'A'
 const _lowerZ = 122; // 'z'
 const _upperZ = 90; // 'Z'
 
-int _stringToBitmask(String s, bool caseSensitive) {
+int _stringToBitmask(String s) {
   int mask = 0;
 
   for (int i = 0; i < s.length; i++) {
     int charCode = s.codeUnitAt(i);
-    if (!caseSensitive && charCode >= _upperA && charCode <= _upperZ) {
+    if (charCode >= _upperA && charCode <= _upperZ) {
       charCode += 32; // Convert to lowercase
     }
     if (charCode >= _lowerA && charCode <= _lowerZ) {
@@ -128,29 +128,23 @@ int _stringToBitmask(String s, bool caseSensitive) {
   return mask;
 }
 
-String? matchPattern(
-  String input,
-  String prefix,
-  String suffix,
-  bool caseSensitive,
-) {
+String? matchPattern(String input, String prefix, String suffix) {
   if (prefix.isEmpty && suffix.isEmpty) return input;
 
-  final prefixMask = _stringToBitmask(prefix, caseSensitive);
-  final suffixMask = _stringToBitmask(suffix, caseSensitive);
+  final prefixMask = _stringToBitmask(prefix);
+  final suffixMask = _stringToBitmask(suffix);
 
   int matchStart = 0;
   int matchEnd = input.length;
 
-  final compareInput = caseSensitive ? input : input.toLowerCase();
-  final comparePrefix = caseSensitive ? prefix : prefix.toLowerCase();
-  final compareSuffix = caseSensitive ? suffix : suffix.toLowerCase();
+  final compareInput = input.toLowerCase();
+  final comparePrefix = prefix.toLowerCase();
+  final compareSuffix = suffix.toLowerCase();
 
   if (prefix.isNotEmpty) {
     bool prefixFound = false;
     for (int i = 0; i <= input.length - prefix.length; i++) {
-      if (_stringToBitmask(
-              compareInput.substring(i, i + prefix.length), caseSensitive) ==
+      if (_stringToBitmask(compareInput.substring(i, i + prefix.length)) ==
           prefixMask) {
         if (compareInput.substring(i, i + prefix.length) == comparePrefix) {
           matchStart = i + prefix.length;
@@ -165,8 +159,7 @@ String? matchPattern(
   if (suffix.isNotEmpty) {
     bool suffixFound = false;
     for (int i = input.length - suffix.length; i >= matchStart; i--) {
-      if (_stringToBitmask(
-              compareInput.substring(i, i + suffix.length), caseSensitive) ==
+      if (_stringToBitmask(compareInput.substring(i, i + suffix.length)) ==
           suffixMask) {
         if (compareInput.substring(i, i + suffix.length) == compareSuffix) {
           matchEnd = i;
diff --git a/packages/spanner/lib/src/tree/node.dart b/packages/spanner/lib/src/tree/node.dart
@@ -7,7 +7,7 @@ import '../parametric/utils.dart';
 
 part '../route/action.dart';
 
-abstract class Node with HandlerStoreMixin {
+sealed class Node with HandlerStoreMixin {
   final Map<String, Node> _nodesMap;
 
   Node() : _nodesMap = {};
@@ -191,13 +191,10 @@ class ParametricNode extends Node {
     HTTPMethod method,
     String part, {
     bool terminal = false,
-    bool caseSensitive = false,
-    String? nextPart,
   }) {
     return _definitionsMap[method]?.firstWhereOrNull(
       (e) =>
-          (!terminal || (e.terminal && e.hasMethod(method))) &&
-          e.matches(part, caseSensitive: caseSensitive),
+          (!terminal || (e.terminal && e.hasMethod(method))) && e.matches(part),
     );
   }
 }
diff --git a/packages/spanner/lib/src/tree/tree.dart b/packages/spanner/lib/src/tree/tree.dart
@@ -11,12 +11,10 @@ const BASE_PATH = '/';
 enum HTTPMethod { GET, HEAD, POST, PUT, DELETE, ALL, PATCH, OPTIONS, TRACE }
 
 class RouterConfig {
-  final String rootPath;
   final bool caseSensitive;
   final bool ignoreTrailingSlash;
 
   const RouterConfig({
-    this.rootPath = BASE_PATH,
     this.caseSensitive = true,
     this.ignoreTrailingSlash = true,
   });
@@ -32,8 +30,7 @@ class Spanner {
 
   int get _nextIndex => _currentIndex + 1;
 
-  Spanner({this.config = const RouterConfig()})
-      : _root = StaticNode(config.rootPath);
+  Spanner({this.config = const RouterConfig()}) : _root = StaticNode(BASE_PATH);
 
   void addRoute<T>(HTTPMethod method, String path, T handler) {
     _on(method, path).addRoute(method, (
@@ -88,29 +85,25 @@ class Spanner {
   }
 
   HandlerStore _on(HTTPMethod method, String path) {
-    final pathSegments = getRoutePathSegments(path);
+    final parts = getRoutePathSegments(path);
     Node rootNode = _root;
 
-    if (pathSegments.isEmpty) {
+    if (parts.isEmpty) {
       return rootNode;
     }
 
-    if (pathSegments[0] == WildcardNode.key) {
+    if (parts[0] == WildcardNode.key) {
       return rootNode.wildcardNode ??
           rootNode.addChildAndReturn(WildcardNode.key, WildcardNode());
     }
 
-    for (int i = 0; i < pathSegments.length; i++) {
-      final current = pathSegments[i];
-      final next = i + 1 < pathSegments.length ? pathSegments[i + 1] : null;
-
+    for (int index = 0; index < parts.length; index++) {
       final result = Spanner._computeNode(
         rootNode,
         method,
-        current,
+        index,
+        parts: parts,
         config: config,
-        fullPath: path,
-        nextPart: next,
       );
 
       if (result is! Node) return result;
@@ -137,13 +130,13 @@ class Spanner {
   static HandlerStore _computeNode(
     Node node,
     HTTPMethod method,
-    String routePart, {
+    int index, {
+    required List<String> parts,
     required RouterConfig config,
-    required String? nextPart,
-    required String fullPath,
   }) {
+    final routePart = parts[index];
+    final nextPart = parts.elementAtOrNull(index + 1);
     final part = config.caseSensitive ? routePart : routePart.toLowerCase();
-
     final child = node.maybeChild(part);
     if (child != null) {
       return node.addChildAndReturn(part, child);
@@ -152,7 +145,7 @@ class Spanner {
     } else if (part.isWildCard) {
       if (nextPart != null) {
         throw ArgumentError.value(
-          fullPath,
+          parts.join('/'),
           null,
           'Route definition is not valid. Wildcard must be the end of the route',
         );
@@ -184,6 +177,7 @@ class Spanner {
     final resolvedParams = <ParamAndValue>[];
     final resolvedHandlers = <IndexedValue>[...root.middlewares];
 
+    @pragma('vm:prefer-inline')
     getResults(IndexedValue? handler) =>
         handler != null ? (resolvedHandlers..add(handler)) : resolvedHandlers;
 
@@ -230,8 +224,6 @@ class Spanner {
         method,
         routePart,
         terminal: isLastPart,
-        caseSensitive: config.caseSensitive,
-        nextPart: isLastPart ? null : pathSegments[i + 1],
       );
 
       /// If we don't find a matching path or a matching definition, then
@@ -246,11 +238,7 @@ class Spanner {
         continue;
       }
 
-      definition!.resolveParams(
-        currPart,
-        resolvedParams,
-        caseSentive: config.caseSensitive,
-      );
+      definition!.resolveParams(currPart, resolvedParams);
 
       if (isLastPart && definition.terminal) {
         return RouteResult(
