fix: Fixed a bug where class names could not be defined.

mathrunet · Jan 19, 2023 · 552c5ba · 552c5ba
1 parent 6b9f0af
commit 552c5ba
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 35 deletions.
diff --git a/packages/katana_prefs/example/pubspec.lock b/packages/katana_prefs/example/pubspec.lock
@@ -297,17 +297,17 @@ packages:
     source: hosted
     version: "4.7.0"
   katana:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "../../katana"
-      relative: true
-    source: path
+      name: katana
+      url: "https://pub.dartlang.org"
+    source: hosted
     version: "0.15.10+2"
   katana_listenables_annotation:
     dependency: "direct overridden"
     description:
-      path: "/Users/mathru/Documents/github/flutter_masamune/packages/katana_prefs/example/../../katana_listenables_annotation"
-      relative: false
+      path: "../../katana_listenables_annotation"
+      relative: true
     source: path
     version: "1.2.9"
   katana_prefs:
@@ -316,21 +316,21 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0"
+    version: "1.1.0"
   katana_prefs_annotation:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "../../katana_prefs_annotation"
-      relative: true
-    source: path
-    version: "1.0.0"
+      name: katana_prefs_annotation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   katana_prefs_builder:
     dependency: "direct dev"
     description:
       path: "../../katana_prefs_builder"
       relative: true
     source: path
-    version: "1.0.0"
+    version: "1.1.0"
   lints:
     dependency: transitive
     description:

diff --git a/packages/katana_prefs/pubspec.lock b/packages/katana_prefs/pubspec.lock
@@ -152,17 +152,17 @@ packages:
   katana:
     dependency: "direct main"
     description:
-      path: "../katana"
-      relative: true
-    source: path
+      name: katana
+      url: "https://pub.dartlang.org"
+    source: hosted
     version: "0.15.10+2"
   katana_prefs_annotation:
     dependency: "direct main"
     description:
-      path: "../katana_prefs_annotation"
-      relative: true
-    source: path
-    version: "1.0.0"
+      name: katana_prefs_annotation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   matcher:
     dependency: transitive
     description:

diff --git a/packages/katana_prefs_annotation/pubspec.lock b/packages/katana_prefs_annotation/pubspec.lock
@@ -165,9 +165,9 @@ packages:
   katana:
     dependency: "direct main"
     description:
-      path: "../katana"
-      relative: true
-    source: path
+      name: katana
+      url: "https://pub.dartlang.org"
+    source: hosted
     version: "0.15.10+2"
   logging:
     dependency: transitive

diff --git a/packages/katana_prefs_builder/lib/common/base_class.dart b/packages/katana_prefs_builder/lib/common/base_class.dart
@@ -116,7 +116,7 @@ List<Spec> baseClass(
                 ..type = MethodType.getter
                 ..lambda = true
                 ..returns = Reference(
-                  "_\$_PrefsValue<${param.type.toString()}>",
+                  "_\$_${model.name}<${param.type.toString()}>",
                 )
                 ..body = const Code("throw UnimplementedError()"),
             );
@@ -230,7 +230,7 @@ List<Spec> baseClass(
                 (m) => m
                   ..name = param.name
                   ..returns = Reference(
-                    "_\$_PrefsValue<${param.type.toString()}>",
+                    "_\$_${model.name}<${param.type.toString()}>",
                   )
                   ..lambda = true
                   ..type = MethodType.getter
@@ -301,7 +301,7 @@ List<Spec> baseClass(
                 (m) => m
                   ..name = param.name
                   ..returns = Reference(
-                    "_\$_PrefsValue<${param.type.toString()}>",
+                    "_\$_${model.name}<${param.type.toString()}>",
                   )
                   ..lambda = true
                   ..type = MethodType.getter

diff --git a/packages/katana_prefs_builder/lib/value/parameter_value.dart b/packages/katana_prefs_builder/lib/value/parameter_value.dart
@@ -2,6 +2,8 @@ part of katana_prefs_builder;
 
 final _regexp = RegExp(r"@Default\(([^\)]+)\)");
 final _classRegExp = RegExp(r"[a-zA-Z0-9_$-]+\(([^\)]+)\)");
+final _listRegExp = RegExp(r"(<[^>]+>)?\[([^\]]*)\]");
+final _mapRegExp = RegExp(r"(<[^>]+>)?\{([^\}]*)\}");
 
 /// Parameter Value.
 ///
@@ -34,8 +36,10 @@ class ParamaterValue {
         continue;
       }
       exists = true;
-      final code = match.group(1);
-      if (_classRegExp.hasMatch(code ?? "")) {
+      final code = match.group(1)?.trim();
+      if (_classRegExp.hasMatch(code ?? "") ||
+          _listRegExp.hasMatch(code ?? "") ||
+          _mapRegExp.hasMatch(code ?? "")) {
         defaultValueCode = "const $code";
       } else {
         defaultValueCode = code;

diff --git a/packages/katana_prefs_builder/pubspec.lock b/packages/katana_prefs_builder/pubspec.lock
@@ -207,17 +207,17 @@ packages:
   katana:
     dependency: "direct main"
     description:
-      path: "../katana"
-      relative: true
-    source: path
+      name: katana
+      url: "https://pub.dartlang.org"
+    source: hosted
     version: "0.15.10+2"
   katana_prefs_annotation:
     dependency: "direct main"
     description:
-      path: "../katana_prefs_annotation"
-      relative: true
-    source: path
-    version: "1.0.0"
+      name: katana_prefs_annotation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   logging:
     dependency: transitive
     description: