different approach

Author: erickzanardo

bricks/dart_frog_dev_server/__brick__/server.dart

@@ -202,7 +202,7 @@ List<RouteFile> _getRouteFiles({
       name: filePath.toAlias(),
       path: relativeFilePath.replaceAll(r'\', '/'),
       route: fileRoute.toRoute(),
-      params: isWildcard ? [] : fileRoute.toParams(),
+      params: fileRoute.toParams(),
       wildcard: isWildcard,
     );
     onRoute(route);
@@ -220,29 +220,44 @@ List<RouteFile> _getRouteFiles({
   return files;
 }
 
-extension on String {
+/// Extension on [String] with helper methods regarding
+/// Dart Frog routes.
+extension RouteStringX on String {
+  /// Parses the stirng into a route alias.
   String toAlias() {
     final alias = path
         .withoutExtension(this)
         .replaceAll('[', r'$')
         .replaceAll(']', '')
         .replaceAll('/', '_')
-        .replaceAll('*', 'wildcard');
+        .replaceAll('...', 'wildcard_');
     if (alias == '') return 'index';
     return alias;
   }
 
-  bool isWildcard() => path.withoutExtension(this).endsWith('[*]');
+  /// Returns if this value matches a wildcard route.
+  bool isWildcard() {
+    final value = endsWith('.dart')
+        ? path.basenameWithoutExtension(this)
+        : path.basename(this);
 
+    return RegExp(r'\[\.\.\.(.*?)\]').hasMatch(value);
+  }
+
+  /// Parses the string into a route path.
   String toRoute() {
     if (isWildcard()) return '/';
     return replaceAll('[', '<').replaceAll(']', '>').replaceAll(r'\', '/');
   }
 
+  /// Parses the string into a list of route parameters.
   List<String> toParams() {
     final regexp = RegExp(r'\[(.*?)\]');
     final matches = regexp.allMatches(this);
-    return matches.map((m) => m[0]!.replaceAll(RegExp(r'\[|\]'), '')).toList();
+    return matches.map((m) {
+      final match = m[0]!;
+      return match.replaceAll(RegExp(r'\[|\]'), '').replaceFirst('...', '');
+    }).toList();
   }
 }
 

bricks/dart_frog_prod_server/__brick__/build/bin/server.dart

@@ -1229,18 +1229,18 @@ Future<void>init(InternetAddress ip,int port)async{}
       expect(configuration.rogueRoutes, isEmpty);
     });
 
-    test('includes wildecard routes', () {
+    test('includes wildcard routes', () {
       const expected = [
         {
           'name': '_test',
           'route': '/test',
           'middleware': [],
           'files': [
             {
-              'name': r'test_$wildcard',
-              'path': '../routes/test/[*].dart',
+              'name': r'test_$wildcard_value',
+              'path': '../routes/test/[...value].dart',
               'route': '/',
-              'file_params': [],
+              'file_params': ['value'],
               'wildcard': true,
             }
           ],
@@ -1249,7 +1249,7 @@ Future<void>init(InternetAddress ip,int port)async{}
       ];
 
       final configuration = buildRouteConfiguration(
-        createTempDir(files: ['routes/test/[*].dart']),
+        createTempDir(files: ['routes/test/[...value].dart']),
       );
 
       expect(
@@ -1259,19 +1259,33 @@ Future<void>init(InternetAddress ip,int port)async{}
       expect(
         configuration.endpoints,
         equals({
-          '/test': [isARouteFile(path: '../routes/test/[*].dart')]
+          '/test': [isARouteFile(path: '../routes/test/[...value].dart')]
         }),
       );
     });
 
     test('throws when a folder is mapped to a wildcard', () {
       expect(
         () => buildRouteConfiguration(
-          createTempDir(files: ['routes/[*]/index.dart']),
+          createTempDir(files: ['routes/[...value]/index.dart']),
         ),
         throwsArgumentError,
       );
     });
+
+    test('isWildcard returns correctly', () {
+      expect('/blog/[...slug].dart'.isWildcard(), isTrue);
+      expect('/blog/content/[...slug].dart'.isWildcard(), isTrue);
+      expect('/blog/content/[slug].dart'.isWildcard(), isFalse);
+      expect('/[...value]'.isWildcard(), isTrue);
+
+      expect(
+        '/blog/content/[...slug].dart'.toParams(),
+        equals(
+          ['slug'],
+        ),
+      );
+    });
   });
 }