Improved data merging with component template (#14)

* Added processing of ValueReference in widgets at the stage of creating component descriptions

* Fixed types, impl id replacement method

* Upd package

CHANGELOG.md

@@ -1,6 +1,10 @@
+## 2.1.0
+
+- Implemented preliminary preparation of component layouts
+
 ## 2.0.1
 
-- Fixed a bug with generic factory types 
+- Fixed a bug with generic factory types
 
 ## 2.0.0
 

lib/src/registry_api/component_description.dart

@@ -1,23 +1,78 @@
+import 'package:duit_kernel/duit_kernel.dart';
+
 /// Description of the component for registering it
 /// in the [DuitRegistry] under the key corresponding to the [tag] property
 final class DuitComponentDescription {
   final String tag;
   final Map<String, dynamic> data;
+  final Set<RefWithTarget> refs;
 
   DuitComponentDescription({
     required this.tag,
     required this.data,
+    required this.refs,
   });
 
+  static void _replaceId(Map<String, dynamic> map) {
+    final type = map["type"];
+    final timestamp = DateTime.now().microsecondsSinceEpoch;
+    final id = "${type}_$timestamp";
+    map["id"] = id;
+  }
+
+  static void _prepareRefs(
+    Map<String, dynamic> obj,
+    Set<RefWithTarget> container,
+  ) {
+    if (obj['controlled'] == true) {
+      _replaceId(obj);
+    }
+
+    final attributes = obj['attributes'] as Map<String, dynamic>;
+    final refs = attributes['refs'];
+
+    if (refs != null) {
+      final list = List.from(
+        refs,
+        growable: false,
+      );
+
+      for (final ref in list) {
+        final rT = RefWithTarget(
+          target: attributes,
+          ref: ValueReference.fromJson(ref),
+        );
+        container.add(rT);
+      }
+    }
+
+    if (obj['children'] != null) {
+      final children = List.from(
+        obj['children'],
+        growable: false,
+      );
+      for (final child in children) {
+        _prepareRefs(child, container);
+      }
+    }
+
+    if (obj['child'] != null) {
+      _prepareRefs(obj['child'], container);
+    }
+  }
+
   factory DuitComponentDescription.fromJson(Map<String, dynamic> json) {
     assert(
         json['tag'] != null, "Tag must be provided in component description");
     assert(json['layoutRoot'] != null,
         "Layout must be provided in component description");
     final root = json['layoutRoot'];
+    final rf = <RefWithTarget>{};
+    _prepareRefs(root, rf);
     return DuitComponentDescription(
       tag: json['tag'],
       data: root,
+      refs: rf,
     );
   }
 }

lib/src/registry_api/factory_record.dart

@@ -1,8 +1,8 @@
-import '../index.dart';
+import 'package:duit_kernel/duit_kernel.dart';
 
 /// The [FactoryRecord] is a [Record] of factory functions that can be used to build custom components
 typedef FactoryRecord = ({
   AttributesFactory attributesFactory,
   ModelFactory modelFactory,
   BuildFactory buildFactory,
-});
+});

lib/src/registry_api/index.dart

@@ -3,4 +3,5 @@ export 'value_reference.dart';
 export 'component_description.dart';
 export 'model_factory.dart';
 export 'attributes_factory.dart';
-export 'build_factory.dart';
+export 'build_factory.dart';
+export 'reference_target.dart';

lib/src/registry_api/reference_target.dart

@@ -0,0 +1,11 @@
+import 'package:duit_kernel/duit_kernel.dart';
+
+final class RefWithTarget {
+  final Map<String, dynamic> target;
+  final ValueReference ref;
+
+  RefWithTarget({
+    required this.target,
+    required this.ref,
+  });
+}

lib/src/registry_api/value_reference.dart

@@ -2,16 +2,19 @@
 ///can be used to merge with a component description
 final class ValueReference {
   String objectKey, attributeKey;
+  Object? defaultValue;
 
   ValueReference({
     required this.objectKey,
     required this.attributeKey,
+    this.defaultValue,
   });
 
   factory ValueReference.fromJson(Map<String, dynamic> json) {
     return ValueReference(
       objectKey: json['objectKey'],
       attributeKey: json['attributeKey'],
+      defaultValue: json['defaultValue'],
     );
   }
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: duit_kernel
 description: "Core library for flutter_duit package.  Contains reusable models for developing third-party packages."
-version: 2.0.1
+version: 2.1.0
 repository: https://github.com/lesleysin/duit_kernel
 
 environment: