整理learn_dart

chen56 · Apr 28, 2024 · e65b258 · e65b258
1 parent 88eafa3
commit e65b258
Show file tree

Hide file tree

Showing 43 changed files with 10 additions and 23 deletions.
diff --git a/.../benchmark/collection_benchmark_test.dart → ...@benchmark/collection_benchmark_test.dart b/.../benchmark/collection_benchmark_test.dart → ...@benchmark/collection_benchmark_test.dart
diff --git a/...t/test/benchmark/exception_benchmark.dart → .../test/@benchmark/exception_benchmark.dart b/...t/test/benchmark/exception_benchmark.dart → .../test/@benchmark/exception_benchmark.dart
diff --git a/...st/benchmark/vs/map_vs_function_test.dart → ...t/@benchmark/vs/map_vs_function_test.dart b/...st/benchmark/vs/map_vs_function_test.dart → ...t/@benchmark/vs/map_vs_function_test.dart
diff --git a/notes/learn_dart/test/syntax/basic.dart → notes/learn_dart/test/@syntax/basic.dart b/notes/learn_dart/test/syntax/basic.dart → notes/learn_dart/test/@syntax/basic.dart
diff --git a/...ss_and_object/constroctor_order_test.dart → ...ss_and_object/constroctor_order_test.dart b/...ss_and_object/constroctor_order_test.dart → ...ss_and_object/constroctor_order_test.dart
diff --git a/...rt/test/syntax/class_and_object/meta.dart → ...t/test/@syntax/class_and_object/meta.dart b/...rt/test/syntax/class_and_object/meta.dart → ...t/test/@syntax/class_and_object/meta.dart
diff --git a/.../syntax/class_and_object/method_test.dart → ...@syntax/class_and_object/method_test.dart b/.../syntax/class_and_object/method_test.dart → ...@syntax/class_and_object/method_test.dart
diff --git a/...t/test/syntax/concurrency/async_test.dart → .../test/@syntax/concurrency/async_test.dart b/...t/test/syntax/concurrency/async_test.dart → .../test/@syntax/concurrency/async_test.dart
diff --git a/..._dart/test/syntax/dart3_augment/README.md → ...dart/test/@syntax/dart3_augment/README.md b/..._dart/test/syntax/dart3_augment/README.md → ...dart/test/@syntax/dart3_augment/README.md
diff --git a/...n_dart/test/syntax/dart3_augment/ext.dart → ..._dart/test/@syntax/dart3_augment/ext.dart b/...n_dart/test/syntax/dart3_augment/ext.dart → ..._dart/test/@syntax/dart3_augment/ext.dart
diff --git a/..._dart/test/syntax/dart3_augment/main.dart → ...dart/test/@syntax/dart3_augment/main.dart b/..._dart/test/syntax/dart3_augment/main.dart → ...dart/test/@syntax/dart3_augment/main.dart
diff --git a/...arn_dart/test/syntax/dart3_augment/x.dart → ...rn_dart/test/@syntax/dart3_augment/x.dart b/...arn_dart/test/syntax/dart3_augment/x.dart → ...rn_dart/test/@syntax/dart3_augment/x.dart
diff --git a/...t/test/syntax/error_handle/exception.dart → .../test/@syntax/error_handle/exception.dart b/...t/test/syntax/error_handle/exception.dart → .../test/@syntax/error_handle/exception.dart
diff --git a/...st/syntax/types/class-modifiers/base.dart → ...t/@syntax/types/class-modifiers/base.dart b/...st/syntax/types/class-modifiers/base.dart → ...t/@syntax/types/class-modifiers/base.dart
diff --git a/...ax/types/class-modifiers/base_client.dart → ...ax/types/class-modifiers/base_client.dart b/...ax/types/class-modifiers/base_client.dart → ...ax/types/class-modifiers/base_client.dart
diff --git a/...ntax/types/class-modifiers/interface.dart → ...ntax/types/class-modifiers/interface.dart b/...ntax/types/class-modifiers/interface.dart → ...ntax/types/class-modifiers/interface.dart
diff --git a/...t/syntax/types/class-modifiers/mixin.dart → .../@syntax/types/class-modifiers/mixin.dart b/...t/syntax/types/class-modifiers/mixin.dart → .../@syntax/types/class-modifiers/mixin.dart
diff --git a/.../syntax/types/class-modifiers/sealed.dart → ...@syntax/types/class-modifiers/sealed.dart b/.../syntax/types/class-modifiers/sealed.dart → ...@syntax/types/class-modifiers/sealed.dart
diff --git a/.../types/class-modifiers/sealed_client.dart → .../types/class-modifiers/sealed_client.dart b/.../types/class-modifiers/sealed_client.dart → .../types/class-modifiers/sealed_client.dart
diff --git a/...st/syntax/types/collection_type_test.dart → ...t/@syntax/types/collection_type_test.dart b/...st/syntax/types/collection_type_test.dart → ...t/@syntax/types/collection_type_test.dart
diff --git a/..._dart/test/syntax/types/dart3_record.dart → ...dart/test/@syntax/types/dart3_record.dart b/..._dart/test/syntax/types/dart3_record.dart → ...dart/test/@syntax/types/dart3_record.dart
diff --git a/...dart/test/syntax/types/generics_test.dart → ...art/test/@syntax/types/generics_test.dart b/...dart/test/syntax/types/generics_test.dart → ...art/test/@syntax/types/generics_test.dart
diff --git a/...rn_dart/test/syntax/types/types_test.dart → ...n_dart/test/@syntax/types/types_test.dart b/...rn_dart/test/syntax/types/types_test.dart → ...n_dart/test/@syntax/types/types_test.dart
diff --git a/notes/learn_dart/test/basic_lib/basic_lib_collection/list_test.dart b/notes/learn_dart/test/basic_lib/basic_lib_collection/list_test.dart
diff --git a/notes/learn_dart/test/basic_lib/basic_lib_collection/map_test.dart b/notes/learn_dart/test/basic_lib/basic_lib_collection/map_test.dart
diff --git a/notes/learn_dart/test/basic_lib/basic_lib_collection/queue.dart b/notes/learn_dart/test/basic_lib/basic_lib_collection/queue.dart
diff --git a/...rn_dart/test/basic_lib/test/test_api.dart → ...rn_dart/test/dark_lang|test/test_api.dart b/...rn_dart/test/basic_lib/test/test_api.dart → ...rn_dart/test/dark_lang|test/test_api.dart
diff --git a/...est/basic_lib/code_builder/code_test.dart → ...est/dart_lang|code_builder/code_test.dart b/...est/basic_lib/code_builder/code_test.dart → ...est/dart_lang|code_builder/code_test.dart
diff --git a/...arn_dart/test/pub_lib/glob/glob_test.dart → ...n_dart/test/dart_lang|glob/glob_test.dart b/...arn_dart/test/pub_lib/glob/glob_test.dart → ...n_dart/test/dart_lang|glob/glob_test.dart
diff --git a/.../learn_dart/test/basic_lib/path_test.dart → ...n_dart/test/dart_lang|path/path_test.dart b/.../learn_dart/test/basic_lib/path_test.dart → ...n_dart/test/dart_lang|path/path_test.dart
diff --git a/...b/basic_lib_collection/iterable_test.dart → ...k|dart:core/collection_iterable_test.dart b/...b/basic_lib_collection/iterable_test.dart → ...k|dart:core/collection_iterable_test.dart
diff --git a/...est/basic_lib/dart-core/convert_test.dart → ...dart_lang|sdk|dart:core/convert_test.dart b/...est/basic_lib/dart-core/convert_test.dart → ...dart_lang|sdk|dart:core/convert_test.dart
diff --git a/.../learn_dart/test/basic_lib/finalizer.dart → ...st/dart_lang|sdk|dart:core/finalizer.dart b/.../learn_dart/test/basic_lib/finalizer.dart → ...st/dart_lang|sdk|dart:core/finalizer.dart
diff --git a/.../test/basic_lib/dart-core/regex_test.dart → ...t/dart_lang|sdk|dart:core/regex_test.dart b/.../test/basic_lib/dart-core/regex_test.dart → ...t/dart_lang|sdk|dart:core/regex_test.dart
diff --git a/...rt/test/basic_lib/dart-core/str_test.dart → ...est/dart_lang|sdk|dart:core/str_test.dart b/...rt/test/basic_lib/dart-core/str_test.dart → ...est/dart_lang|sdk|dart:core/str_test.dart
diff --git a/...s/learn_dart/test/basic_lib/uri_test.dart → ...est/dart_lang|sdk|dart:core/uri_test.dart b/...s/learn_dart/test/basic_lib/uri_test.dart → ...est/dart_lang|sdk|dart:core/uri_test.dart
diff --git a/..._dart/test/basic_lib/dart-io/all_env.dart → ...t/test/dart_lang|sdk|dart:io/all_env.dart b/..._dart/test/basic_lib/dart-io/all_env.dart → ...t/test/dart_lang|sdk|dart:io/all_env.dart
diff --git a/...c_lib/analyzer/analyzer_list_alltype.dart → ...k|pkg|analyzer/analyzer_list_alltype.dart b/...c_lib/analyzer/analyzer_list_alltype.dart → ...k|pkg|analyzer/analyzer_list_alltype.dart
diff --git a/...sic_lib/analyzer/analyzer_parse_test.dart → ...sdk|pkg|analyzer/analyzer_parse_test.dart b/...sic_lib/analyzer/analyzer_parse_test.dart → ...sdk|pkg|analyzer/analyzer_parse_test.dart
diff --git a/..._lib/analyzer/mock_sdk_analyzer_test.dart → ...|pkg|analyzer/mock_sdk_analyzer_test.dart b/..._lib/analyzer/mock_sdk_analyzer_test.dart → ...|pkg|analyzer/mock_sdk_analyzer_test.dart
diff --git a/...art/test/basic_lib/vm_service/vm_uri.dart → .../dary_lang|sdk|pkg|vm_service/vm_uri.dart b/...art/test/basic_lib/vm_service/vm_uri.dart → .../dary_lang|sdk|pkg|vm_service/vm_uri.dart
diff --git a/...arn_dart/test/pub_lib/file/file_test.dart → ...dart/test/google|file.dart/file_test.dart b/...arn_dart/test/pub_lib/file/file_test.dart → ...dart/test/google|file.dart/file_test.dart
diff --git a/packages/you_cli/bin/cli.dart b/packages/you_cli/bin/cli.dart
@@ -82,6 +82,10 @@ class Cmd_gen_routes_g_dart extends Command {
   final description = "gen routes.g.dart .";
   final FileSystem fs;
 
+  YouCli? _cli;
+
+  YouCli get cli => _cli != null ? _cli! : _cli = YouCli(projectDir: dir);
+
   // example:
   //   - async page:
   //     (context, print) async => await notes_i18n_.loadLibrary().then((_) => notes_i18n_.build(context, print))
@@ -96,13 +100,14 @@ class Cmd_gen_routes_g_dart extends Command {
     if (layout != null) {
       builder = code.refer("${layout.flatName}__").property("layout").call([builder]);
     }
+
     if (async) {
       return code.Method((b) => b
         ..modifier = MethodModifier.async
         ..body = code.Block.of(
           [
             code.refer("${node.flatName}_").property("loadLibrary").call([]).awaited.statement,
-            if(layout != null) code.refer("${layout.flatName}__").property("loadLibrary").call([]).awaited.statement,
+            if (layout != null) code.refer("${layout.flatName}__").property("loadLibrary").call([]).awaited.statement,
             builder.returned.statement,
           ],
         )).closure;
@@ -112,15 +117,15 @@ class Cmd_gen_routes_g_dart extends Command {
   }
 
   String _genRouteTreeCode(RouteNode node) {
-    code.Expression? builder=builderExpression(node);
-    String builderStr=builder==null?"":builder.accept(code.DartEmitter()).toString().split("\n").join();
+    code.Expression? builder = builderExpression(node);
+    String builderStr = builder == null ? "" : builder.accept(code.DartEmitter()).toString().split("\n").join();
 
     String buildArg = !node.page_dart.existsSync() ? "" : ",builder:$builderStr";
     String padding = "".padLeft(node.level, '  ');
     if (node.children.isEmpty) {
-      return '''${padding}To${async?".lazy":""}("${node.dir.basename}" $buildArg) ''';
+      return '''${padding}To${async ? ".lazy" : ""}("${node.dir.basename}" $buildArg) ''';
     }
-    return '''${padding}To${async?".lazy":""}("${node.dir.basename}" $buildArg, children:[
+    return '''${padding}To${async ? ".lazy" : ""}("${node.dir.basename}" $buildArg, children:[
 ${node.children.map((child) => _genRouteTreeCode(child)).map((e) => "$e,").join("\n")}
 $padding])''';
   }
@@ -137,7 +142,6 @@ $padding])''';
       throw AssertionError("【--dir $dir】 not exists");
     }
 
-    YouCli cli = YouCli(projectDir: fs.directory(dir));
     var rootRoute = RouteNode.fromSync(cli.routeDir);
     Iterable<RouteNode> pageDirs = rootRoute.toList();