Merge pull request #578 from Parabeac/release/2.3.0

Release/2.3.0

lib/controllers/interpret.dart

@@ -12,6 +12,7 @@ import 'package:parabeac_core/interpret_and_optimize/services/pb_platform_orient
 import 'package:parabeac_core/interpret_and_optimize/services/pb_symbol_linker_service.dart';
 import 'package:parabeac_core/interpret_and_optimize/services/state_management_node_interpreter.dart';
 import 'package:quick_log/quick_log.dart';
+import 'package:sentry/sentry.dart';
 import 'package:tuple/tuple.dart';
 
 class Interpret {
@@ -160,8 +161,8 @@ class AITServiceBuilder {
               'The $name returned a null \"$treeName\" $PBIntermediateTree (or its rootnode is null)\n after its transformation, this will remove the tree from the process!');
           // throw NullThrownError();
         }
-      } catch (e) {
-        MainInfo().captureException(e);
+      } catch (e, stackTrace) {
+        await Sentry.captureException(e, stackTrace: stackTrace);
         log.error('${e.toString()} at $name');
       } finally {
         _stopwatch.stop();

lib/controllers/main_info.dart

@@ -6,12 +6,6 @@ import 'package:path/path.dart' as p;
 class MainInfo {
   static final MainInfo _singleton = MainInfo._internal();
 
-  final _sentry = DummySentry();
-
-  @Deprecated(
-      'Use the function handle error for logging and capturing the error')
-  get sentry => _sentry;
-
   /// Path representing where the output of parabeac-core will be produced to.
   ///
   /// First, we are going to check the if any path was passed as a flag to [outputPath],
@@ -99,11 +93,6 @@ class MainInfo {
     return p.normalize(p.absolute(path));
   }
 
-  /// Decoupling the exception capture client from the services that report the [exception]
-  void captureException(exception) {
-    // _sentry.captureException(exception: exception);
-  }
-
   factory MainInfo() {
     return _singleton;
   }
@@ -113,10 +102,3 @@ class MainInfo {
 
 /// The type of design that is being processed by Parabeac Core.
 enum DesignType { SKETCH, FIGMA, PBDL, UNKNOWN }
-
-class DummySentry {
-  /// Decoupling the exception capture client from the services that report the [exception]
-  void captureException({exception, stackTrace}) {
-    return;
-  }
-}

lib/generation/flutter_project_builder/flutter_project_builder.dart

@@ -6,13 +6,12 @@ import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_intermediate_node_tree.dart';
 import 'package:path/path.dart' as p;
 
-import 'package:archive/archive.dart';
 import 'package:parabeac_core/controllers/main_info.dart';
 import 'package:parabeac_core/generation/generators/value_objects/generation_configuration/pb_generation_configuration.dart';
-import 'package:parabeac_core/generation/generators/writers/pb_page_writer.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_project.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_state_management_linker.dart';
 import 'package:quick_log/quick_log.dart';
+import 'package:sentry/sentry.dart';
 import 'package:tuple/tuple.dart';
 
 /// The [FlutterProjectBuilder] generates the actual flutter project,
@@ -80,8 +79,8 @@ class FlutterProjectBuilder {
         });
       }
       return tuple;
-    } catch (e) {
-      MainInfo().captureException(e);
+    } catch (e, stackStrace) {
+      await Sentry.captureException(e, stackTrace: stackStrace);
       log.error(e.toString());
     }
   }
@@ -104,8 +103,8 @@ class FlutterProjectBuilder {
             workingDirectory: projectDir,
             runInShell: true)
         .then((result) => result.exitCode == 2 ? result.stderr : result.stdout)
-        .catchError((error) {
-      MainInfo().captureException(error);
+        .catchError((error, stackTrace) async {
+      await Sentry.captureException(error, stackTrace: stackTrace);
       log.error(error.toString());
     });
   }

lib/generation/generators/attribute-helper/pb_size_helper.dart

@@ -51,6 +51,9 @@ class PBSizeHelper extends PBAttributesHelper {
 
       widthString = 'width: $width,';
     } else if (context.sizingContext == SizingValueContext.LayoutBuilderValue) {
+      relativeWidth = relativeWidth / screenWidth;
+      relativeHeight = relativeHeight / screenHeight;
+
       // Size for LayoutBuilder
       widthString =
           'width: constraints.maxWidth * ${relativeWidth.toStringAsFixed(3)},';

lib/generation/generators/middleware/command_gen_middleware.dart

@@ -7,6 +7,7 @@ import 'package:parabeac_core/generation/generators/value_objects/file_structure
 import 'package:parabeac_core/generation/generators/value_objects/file_structure_strategy/commands/write_symbol_command.dart';
 import 'package:parabeac_core/generation/generators/value_objects/generation_configuration/pb_generation_configuration.dart';
 import 'package:parabeac_core/generation/generators/value_objects/generation_configuration/pb_platform_orientation_generation_mixin.dart';
+import 'package:parabeac_core/interpret_and_optimize/entities/pb_shared_master_node.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/element_storage.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_intermediate_node_tree.dart';
@@ -62,11 +63,19 @@ class CommandGenMiddleware extends Middleware
             ?.isEmpty ??
         true) {
       // TODO: Find a more optimal way to exclude state management nodes
+      var relativePath = tree.name;
+      if (tree.rootNode is PBSharedMasterNode) {
+        var componentSetName =
+            (tree.rootNode as PBSharedMasterNode).componentSetName;
+        relativePath = componentSetName != null
+            ? relativePath + '/' + componentSetName.snakeCase
+            : relativePath;
+      }
       command = WriteSymbolCommand(
         tree.UUID,
         tree.identifier,
         generationManager.generate(tree.rootNode, context),
-        relativePath: tree.name,
+        relativePath: relativePath,
       );
     }
     if (command != null) {

lib/generation/generators/symbols/pb_instancesym_gen.dart

@@ -7,6 +7,7 @@ import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_inte
 import 'package:parabeac_core/interpret_and_optimize/helpers/override_helper.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_symbol_storage.dart';
+import 'package:parabeac_core/tags/custom_tag/custom_tag.dart';
 import 'package:quick_log/quick_log.dart';
 import 'package:recase/recase.dart';
 
@@ -40,6 +41,14 @@ class PBSymbolInstanceGenerator extends PBGenerator {
       buffer.write('}\n');
       // end of LayoutBuilder()
       buffer.write(')');
+      // To write the override properties for the class
+      if (source.parent is CustomTag) {
+        buffer.write(',' +
+            overridesToString(
+              source.sharedParamValues,
+              generatorContext,
+            ));
+      }
       return buffer.toString();
     }
     return '';
@@ -102,32 +111,39 @@ class PBSymbolInstanceGenerator extends PBGenerator {
         return override == null || override.value == null;
       });
 
-      _formatNameAndValues(overrideValues, context);
-      for (var element in overrideValues) {
-        if (element.overrideName != null && element.initialValue != null) {
-          // If the type is image, we should print the whole widget
-          // so the end user can place whatever kind of widget
-          // TODO: Refactor so it place the image from the instance not from component
-          if (element.type == 'image') {
-            var elementCode =
-                element.value.generator.generate(element.value, context);
-
-            buffer.write('${element.overrideName}: $elementCode,');
-          } else {
-            buffer.write('${element.overrideName}: ${element.valueName},');
-          }
-        }
-      }
+      formatNameAndValues(overrideValues, context);
+      buffer.write(overridesToString(overrideValues, context));
     }
 
     buffer.write(')\n');
 
     return buffer.toString();
   }
 
+  // Traverse all overridable properties to write them for class use
+  String overridesToString(
+      List<PBInstanceOverride> overrideValues, PBContext context) {
+    var buffer = StringBuffer();
+    for (var element in overrideValues) {
+      if (element.overrideName != null && element.initialValue != null) {
+        // If the type is image, we should print the whole widget
+        // so the end user can place whatever kind of widget
+        // TODO: Refactor so it place the image from the instance not from component
+        if (element.type == 'image') {
+          var elementCode =
+              element.value.generator.generate(element.value, context);
+
+          buffer.write('${element.overrideName}: $elementCode,');
+        } else {
+          buffer.write('${element.overrideName}: ${element.valueName},');
+        }
+      }
+    }
+    return buffer.toString();
+  }
+
   /// Traverses `params` and attempts to find the override `name` and `value` for each parameter.
-  void _formatNameAndValues(
-      List<PBInstanceOverride> params, PBContext context) {
+  void formatNameAndValues(List<PBInstanceOverride> params, PBContext context) {
     params.forEach((param) {
       var overrideProp = OverrideHelper.getProperty(param.UUID, param.type);
 

lib/generation/generators/value_objects/generation_configuration/pb_generation_configuration.dart

@@ -28,6 +28,7 @@ import 'package:parabeac_core/interpret_and_optimize/services/pb_platform_orient
 import 'package:quick_log/quick_log.dart';
 import 'package:recase/recase.dart';
 import 'package:path/path.dart' as p;
+import 'package:sentry/sentry.dart';
 
 abstract class GenerationConfiguration with PBPlatformOrientationGeneration {
   FileStructureStrategy fileStructureStrategy;
@@ -124,7 +125,7 @@ abstract class GenerationConfiguration with PBPlatformOrientationGeneration {
     ///First we are going to perform a dry run in the generation to
     ///gather all the necessary information
     await setUpConfiguration(pb_project);
-    
+
     fileStructureStrategy.addFileObserver(_importProcessor);
     // pb_project.fileStructureStrategy = fileStructureStrategy;
 
@@ -237,9 +238,8 @@ abstract class GenerationConfiguration with PBPlatformOrientationGeneration {
       map.forEach((key, tree) {
         var uuidImport = _importProcessor.getImport(tree.UUID);
         if (uuidImport == null) {
-          MainInfo().sentry.captureException(
-              exception: Exception(
-                  'Import for tree with UUID ${tree.UUID} was null when getting imports from processor.'));
+          Sentry.captureException(Exception(
+              'Import for tree with UUID ${tree.UUID} was null when getting imports from processor.'));
         } else {
           imports.addAll(_importProcessor.getImport(tree.UUID));
         }

lib/generation/generators/visual-widgets/pb_align_gen.dart

@@ -1,9 +1,9 @@
-import 'package:parabeac_core/controllers/main_info.dart';
 import 'package:parabeac_core/generation/generators/pb_generator.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/alignments/injected_align.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart';
 import 'package:quick_log/quick_log.dart';
+import 'package:sentry/sentry.dart';
 
 class PBAlignGenerator extends PBGenerator {
   var log = Logger('Align Generator');
@@ -24,10 +24,7 @@ class PBAlignGenerator extends PBGenerator {
         buffer.write(
             'child: ${sourceChild.generator.generate(sourceChild, context)},');
       } catch (e, stackTrace) {
-        MainInfo().sentry.captureException(
-              exception: e,
-              stackTrace: stackTrace,
-            );
+        Sentry.captureException(e, stackTrace: stackTrace);
         log.error(e.toString());
       }
 

lib/generation/generators/visual-widgets/pb_positioned_gen.dart

@@ -1,10 +1,9 @@
-import 'package:parabeac_core/controllers/main_info.dart';
 import 'package:parabeac_core/generation/generators/pb_generator.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/alignments/injected_positioned.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_constraints.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart';
-import 'package:tuple/tuple.dart';
+import 'package:sentry/sentry.dart';
 
 class PBPositionedGenerator extends PBGenerator {
   /// The Flutter Position class allows it to override the `height` and the
@@ -61,11 +60,9 @@ class PBPositionedGenerator extends PBGenerator {
         // source.child.currentContext = source.currentContext;
         buffer.write(
             'child: ${sourceChildren.first.generator.generate(sourceChildren.first, context)},');
-      } catch (e) {
+      } catch (e, stackTrace) {
         logger.error(e.toString());
-        MainInfo().captureException(
-          e,
-        );
+        Sentry.captureException(e, stackTrace: stackTrace);
       }
 
       buffer.write(')');

lib/interpret_and_optimize/entities/layouts/auto_layout_align_strategy.dart

@@ -92,6 +92,7 @@ class AutoLayoutAlignStrategy extends AlignStrategy<PBLayoutIntermediateNode> {
         pointValueWidth: isVertical
             ? child.layoutCrossAxisSizing == ParentLayoutSizing.INHERIT
             : child.layoutMainAxisSizing == ParentLayoutSizing.INHERIT,
+        constraints: child.constraints.copyWith(),
       )
         ..layoutCrossAxisSizing = child.layoutCrossAxisSizing
         ..layoutMainAxisSizing = child.layoutMainAxisSizing;

lib/interpret_and_optimize/entities/layouts/group/frame_group.dart

@@ -39,7 +39,8 @@ class FrameGroup extends Group
       PBIntermediateNode parent, PBIntermediateTree tree) {
     var tempFrame = _$FrameGroupFromJson(json);
 
-    var tempChild = injectAContainer(json, tempFrame.frame);
+    var tempChild = injectAContainer(json, tempFrame.frame)
+      ..constraints = tempFrame.constraints.copyWith();
 
     if (tempChild != null) {
       tree.addEdges(tempFrame, [tempChild]);