Merge pull request #1 from graph-cn/master

fix: 修复list类型创建多余表头问题 (v0.0.1+2)

Author: CorvusYe

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.1+2
+### Bug修复
+- 在 list 类型的结构下，确保多行公用 list 的 submetas，从而避免重复创建多余的 submeta，减少不必要的列。
+
+
 ## 0.0.1+1
 - 支持在创建连接如指定了默认的space，则自动使用该space
 - 适配dart_gdbc v0.0.1+3

lib/src/ng_result_handler.dart

@@ -49,11 +49,11 @@ Map<GdbTypes, bool Function(dynamic)> typeGetter = {
   GdbTypes.unknown: (v) => true,
 };
 
-Map<
-        GdbTypes,
-        dynamic Function(
-            dynamic, ValueMetaData, int?, String? Function(int, dynamic)? nget)>
-    typeHandler = {
+typedef NameGetter = String? Function(int, dynamic)?;
+typedef TypeHandler = dynamic Function(
+    dynamic, ValueMetaData, int?, NameGetter);
+
+Map<GdbTypes, TypeHandler> typeHandler = {
   GdbTypes.none: (v, m, t, nget) => null,
   GdbTypes.prop: (v, m, t, nget) => _handleProp(v, m, t),
   GdbTypes.node: (v, m, t, nget) =>
@@ -218,7 +218,7 @@ dynamic _handleValue(
   int? timezoneOffset, {
   ValueMetaData? parent,
   List? parentVal,
-  String? Function(int, dynamic)? nameGetter,
+  NameGetter? nameGetter,
 }) {
   var type = typeGetter.entries.firstWhere((getter) => getter.value(v)).key;
   meta.type = type;
@@ -295,21 +295,26 @@ _handlePolygon(ng.Polygon v, ValueMetaData meta) {
   ];
 }
 
-String? _idxName(p1, dynamic v) => '$p1';
+// NameGetter _idxName = (p1, dynamic v) => '$p1';
+NameGetter _itemName = (p1, dynamic v) => 'item';
+
 _handleSet(ng.NSet v, ValueMetaData meta, int? timezoneOffset,
-    [String? Function(int p1, dynamic p2)? nget]) {
+    [NameGetter? nget]) {
   return _handleList(v.values?.toList() ?? [], meta, timezoneOffset, nget);
 }
 
 _handleList(List<dynamic> values, ValueMetaData meta, int? timezoneOffset,
-    [String? Function(int p1, dynamic p2)? nget]) {
-  nget ??= _idxName;
+    [NameGetter? nget]) {
+  nget ??= _itemName;
   var list = <dynamic>[];
+  ValueMetaData valueMeta = meta.submetas.isEmpty
+      ? (ValueMetaData()
+        ..name = 'item'
+        ..type = GdbTypes.unknown)
+      : meta.submetas.first;
   for (var v in values) {
-    ValueMetaData valueMeta = ValueMetaData()
-      ..name = nget(values.indexOf(v), v)
-      ..type = GdbTypes.unknown;
-    _handleValue(v, valueMeta, timezoneOffset, parent: meta, parentVal: list);
+    var val = _handleValue(v, valueMeta, timezoneOffset, parent: meta);
+    list.add(val);
   }
   return list;
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: nebula_dart_gdbc
 description: A database driver for nebula graph based on dart_gdbc, help you to access nebula graph in dart language
-version: 0.0.1+1
+version: 0.0.1+2
 repository: https://github.com/graph-cn/nebula_dart_gdbc
 
 environment:

test/ng_result_handler_test.dart

@@ -454,6 +454,7 @@ void main() {
               ..hour = now.hour
               ..minute = now.minute
               ..sec = now.second
+              // TODO check why there are  no milliseconds in nebula
               ..microsec = now.microsecond)
         ]
       ]
@@ -469,7 +470,7 @@ void main() {
           now.hour,
           now.minute,
           now.second,
-          now.millisecond,
+          // now.millisecond,
           now.microsecond,
         ),
         result);