Merge pull request #33 from olexale/nested_braces

Fix #22

Author: olexale

.github/workflows/dart.yml

@@ -26,6 +26,9 @@ jobs:
       - name: 🛠 Install dependencies
         run: flutter pub get
 
+      - name: 👨‍🎨 Validate formatting
+        run: flutter format --set-exit-if-changed lib test
+
       - name: 🕵️‍♀️ Analyze project source
         run: flutter analyze . --fatal-infos
 

lib/src/regex.dart

@@ -1,5 +1,3 @@
-final parametersRegExp = RegExp(r'\{(.*?)\}', caseSensitive: false);
 final examplesRegExp = RegExp(r'\<(.*?)\>', caseSensitive: false);
 final charactersAndNumbersRegExp = RegExp(r'[^\w\s\d]+');
 final repeatingSpacesRegExp = RegExp(r'\s+');
-final parametersValueRegExp = RegExp(r'(?<=\{).+?(?=\})', caseSensitive: false);

lib/src/step/generic_step.dart

@@ -1,5 +1,6 @@
 import 'package:bdd_widget_test/src/regex.dart';
 import 'package:bdd_widget_test/src/step/bdd_step.dart';
+import 'package:bdd_widget_test/src/step_generator.dart';
 
 class GenericStep implements BddStep {
   GenericStep(this.methodName, this.rawLine);
@@ -17,7 +18,7 @@ ${getStepSignature(rawLine)} {
 ''';
 
   String getStepSignature(String stepLine) {
-    final params = parametersRegExp.allMatches(stepLine);
+    final params = parseRawStepLine(stepLine).skip(1);
     if (params.isEmpty) {
       final examples = examplesRegExp.allMatches(stepLine);
       if (examples.isEmpty) {

lib/src/step_generator.dart

@@ -29,27 +29,17 @@ String getStepFilename(String stepText) {
 }
 
 String getStepMethodName(String stepText) {
-  final text = removeDiacritics(stepText)
-      .replaceAll(parametersRegExp, '')
-      .replaceAll(examplesRegExp, '')
-      .replaceAll(charactersAndNumbersRegExp, '')
-      .replaceAll(repeatingSpacesRegExp, ' ')
-      .trim()
-      .replaceAll(' ', '_');
-  return camelize(text);
+  final step = parseRawStepLine(stepText).first;
+  return _camelizedString(step);
 }
 
 String getStepMethodCall(String stepLine, {List<String>? forceParams}) {
-  final name = getStepMethodName(stepLine);
-
-  final params = parametersValueRegExp.allMatches(stepLine);
-  if (params.isEmpty && forceParams == null) {
-    return '$name(tester)';
-  }
-
-  final methodParameters =
-      forceParams ?? params.map((p) => p.group(0)).join(', ');
-  return '$name(tester, $methodParameters)';
+  final step = parseRawStepLine(stepLine);
+  final parameters = [
+    'tester',
+    if (forceParams != null) ...forceParams else ...step.skip(1)
+  ].join(', ');
+  return '${_camelizedString(step[0])}($parameters)';
 }
 
 String generateStepDart(String package, String line) {
@@ -85,3 +75,51 @@ final predefinedSteps = <String, BddStep Function(String, String)>{
   'iTapText': (_, __) => ITapText(),
   'iWait': (_, __) => IWait(),
 };
+
+/// Return an array of Strings where first element is the step name and the rest
+/// are parameters.
+List<String> parseRawStepLine(String stepLine) {
+  final name = StringBuffer();
+  final parameters = <String>[];
+  final parameter = StringBuffer();
+
+  var bracketsNesting = 0;
+  for (var i = 0; i < stepLine.length; ++i) {
+    final c = stepLine[i];
+    if (c == '{') {
+      // this is needed for cases when there is { inside parameter, like
+      // When I run {func foo(){} func bar() {print('hey');}} code
+      bracketsNesting++;
+      if (bracketsNesting == 1) {
+        // Found a parameter, skipping adding {
+        continue;
+      }
+    }
+    if (c == '}') {
+      bracketsNesting--;
+      if (bracketsNesting == 0) {
+        // The end of the parameter, flushing the value, skiping }
+        parameters.add(parameter.toString());
+        parameter.clear();
+        continue;
+      }
+    }
+
+    if (bracketsNesting == 0) {
+      name.write(c);
+    } else {
+      parameter.write(c);
+    }
+  }
+  return [name.toString(), ...parameters];
+}
+
+String _camelizedString(String input) {
+  final text = removeDiacritics(input)
+      .replaceAll(examplesRegExp, '')
+      .replaceAll(charactersAndNumbersRegExp, '')
+      .replaceAll(repeatingSpacesRegExp, ' ')
+      .trim()
+      .replaceAll(' ', '_');
+  return camelize(text);
+}

test/full_set_test.dart

@@ -12,6 +12,7 @@ Feature: Counter
         And _I do not see {'42'} text
     Scenario: Initial counter value is 0
         Given the app is running
+        And I run {'func foo() {}; func bar() { print("hey!"); };'} code
         Then I see {'0'} text
 ''';
 
@@ -24,6 +25,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 import './step/the_app_is_running.dart';
 import './step/_i_do_not_see_text.dart';
+import './step/i_run_code.dart';
 import 'package:bdd_sample/i_see_text.dart';
 
 void main() {
@@ -38,6 +40,7 @@ void main() {
       try {
         await bddSetUp(tester);
         await theAppIsRunning(tester);
+        await iRunCode(tester, 'func foo() {}; func bar() { print("hey!"); };');
         await iSeeText(tester, '0');
       } finally {
         await bddTearDown(tester);