清理

chen56 · Apr 17, 2024 · 4bded9f · 4bded9f
1 parent 7806737
commit 4bded9f
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 697 deletions.
diff --git a/notes/flutter_core/lib/notes.g.dart b/notes/flutter_core/lib/notes.g.dart
diff --git a/packages/note_dart/lib/src/note_core.dart b/packages/note_dart/lib/src/note_core.dart
@@ -74,7 +74,7 @@ class Note {
 
   NoteSource _source = _emptyPageSource;
 
-  // TODO QRoute的 deferred处理可以看下 ：https://medium.com/@SchabanBo/reduce-your-flutter-web-app-loading-time-8018d8f442
+  @internal
   DeferredNotePageBuilder? deferredPageBuilder;
 
   NoteConf? conf;
@@ -223,10 +223,9 @@ class Note {
 
   String get confAssetPath => conventions.noteConfAssetPath(path);
 
-  Future<NotePage> loadPage({NotePageBuilder? builder}) async {
+  Future<NotePage> loadPage({required NotePageBuilder builder}) async {
     return NotePage(
         note: this,
-        // pageBuilder: await deferredPageBuilder!(this),
         pageBuilder: builder,
         conf: conf == null ? null : NoteConf.decode(await rootBundle.loadString(confAssetPath)),
         content: await rootBundle.loadString(dartAssetPath));
@@ -235,7 +234,7 @@ class Note {
 
 class NotePage {
   final Note note;
-  final NotePageBuilder? pageBuilder;
+  final NotePageBuilder pageBuilder;
   final NoteConf? conf;
   final String content; // source code content
   NotePage({
@@ -325,7 +324,7 @@ class Pen {
     // Skip the header code block
     $____________________________________________________________________();
 
-    notePage.pageBuilder!(context, this);
+    notePage.pageBuilder(context, this);
   }
 
   /// 新增一个cell，cell代表note中的一个代码块及其产生的内容

diff --git a/packages/note_dart/lib/src/note_layout.dart b/packages/note_dart/lib/src/note_layout.dart
@@ -18,8 +18,6 @@ class DeferredScreen extends StatelessWidget with Screen {
   @override
   Widget build(BuildContext context) {
     return FutureBuilder<NotePage>(
-      // https://medium.com/@SchabanBo/reduce-your-flutter-web-app-loading-time-8018d8f442
-      // QRoute的 deferred处理可以看下
       future: note.deferredPageBuilder!(note),
       builder: (context, snapshot) {
         if (snapshot.connectionState == ConnectionState.done) {

diff --git a/test/tools/gen_assets_test.dart → test/bin/note_cli_gen_assets_test.dart b/test/tools/gen_assets_test.dart → test/bin/note_cli_gen_assets_test.dart
@@ -3,11 +3,12 @@ import 'package:file/memory.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
-import '../../tools/note_dev_gen.dart';
+import '../../bin/notecli.dart';
+
 
 
 MemoryFileSystem fs = MemoryFileSystem();
-NotesGenerator gen = NotesGenerator(packageBaseName: "test_note", fs: fs, projectDir: path.absolute("/note"));
+NotesGenerator gen = NotesGenerator(packageBaseName: "test_note", fs: fs, projectDir: fs.directory(path.absolute("/note")));
 File memoryPubspec(String content) {
   MemoryFileSystem fs = MemoryFileSystem();
   var file = fs.file("/note/pubspec.yaml");

diff --git a/test/tools/note_dev_gen_test.dart → test/bin/note_cli_test.dart b/test/tools/note_dev_gen_test.dart → test/bin/note_cli_test.dart
@@ -1,7 +1,7 @@
 import 'package:file/memory.dart';
 import 'package:test/test.dart';
 
-import '../../tools/note_dev_gen.dart';
+import '../../bin/notecli.dart';
 
 void main() {
   late NotesGenerator gen;
@@ -15,15 +15,15 @@ void main() {
     gen = NotesGenerator(
       packageBaseName: "flutter_core",
       fs: fs,
-      projectDir: "./",
+      projectDir: fs.directory("./"),
     );
   });
 
   group("NotesGenerator", () {
     test('basic app_info', () {
-      expect(gen.projectDir, ".");
-      expect(gen.libDir, "./lib");
-      expect(gen.noteRootDir, "./lib/notes");
+      expect(gen.projectDir.path, "./");
+      expect(gen.libDir.path, "./lib");
+      expect(gen.noteRootDir.path, "./lib/notes");
     });
   });
 
@@ -46,8 +46,8 @@ void main() {
     test('absolute path', () {
       gen = NotesGenerator(
         packageBaseName: "flutter_core",
-        fs: MemoryFileSystem(),
-        projectDir: "/n",
+        fs: fs,
+        projectDir: fs.directory("/n"),
       );
 
       var testcases = [