准备合并Print和Cell

bin/notecli.dart

@@ -17,7 +17,7 @@ import 'package:analyzer/dart/analysis/utilities.dart' as analyzer_util;
 import 'package:watcher/watcher.dart';
 import 'package:yaml_edit/yaml_edit.dart' show YamlEditor;
 
-import 'package:you_note_dart/src/utils_core.dart';
+import 'package:you_dart/src/core.dart';
 
 const String _libRoot = "lib";
 const String _notesRoot = "lib/notes";
@@ -124,15 +124,13 @@ class NotesGenerator {
       // final NoteRoute dev_devtool = put("/dev/devtool", (context,print) async => await dev_devtool_.loadLibrary().then((value) => dev_devtool_.build(context,print)));
       return """  final $noteVarNameWithPadding = put("${noteLib.noteKey}", (context,print) async => await ${noteLib.asVariableName}_.loadLibrary().then((value) => ${noteLib.asVariableName}_.build(context,print)));  """;
     }).join("\n");
-    Library importCode = Library(
-      (b) => b
-        ..comments.addAll(["Generated by gen_maters.dart, please don't edit! ", "ignore_for_file: library_prefixes, non_constant_identifier_names"])
-        ..directives.addAll(
-          noteLibs.map((lib) {
-            return code.Directive.importDeferredAs(lib.package, "${lib.asVariableName}_");
-          }),
-        )
-    );
+    Library importCode = Library((b) => b
+      ..comments.addAll(["Generated by gen_maters.dart, please don't edit! ", "ignore_for_file: library_prefixes, non_constant_identifier_names"])
+      ..directives.addAll(
+        noteLibs.map((lib) {
+          return code.Directive.importDeferredAs(lib.package, "${lib.asVariableName}_");
+        }),
+      ));
 
     String importCodeFmt = '${importCode.accept(DartEmitter(allocator: Allocator.none, orderDirectives: true, useNullSafetySyntax: true))}';
     importCodeFmt = _fmt.format(importCodeFmt);
@@ -496,7 +494,7 @@ class NoteParseResult {
   */
   Future<NoteParseResult> _gen(_NoteInfo source) async {
     var cells = source.cells.map((e) {
-      var comment = e.cellStatements.map((e) => e.toString().replaceAll("\n", " ").safeSubstring(0, 30));
+      var comment = e.cellStatements.map((e) => strings.safeSubstring(e.toString().replaceAll("\n", " "), 0, 30));
 
       var specialNodes = e.specialNodes.map((e) => """
             (

notes/flutter_web/pubspec.yaml

@@ -23,12 +23,6 @@ dependencies:
 
   analyzer: ^6.4.1
 
-  you_note_dart:
-    path: ../../packages/you_note_dart
-
-  note:
-    path: ../../
-
   path: ^1.8.2
   code_builder: ^4.4.0
   file: ^7.0.0
@@ -38,7 +32,11 @@ dependencies:
   source_map_stack_trace: ^2.1.1
   http: ^1.2.1
   source_maps: ^0.10.12
+
+  # you_*
+  you_dart: ^0.0.4
   you_flutter: ^0.0.4
+  you_note_dart: ^0.0.4
 
 dev_dependencies:
 
@@ -127,4 +125,16 @@ flutter:
   # https://flutter.dev/assets-and-images/#from-packages
 
   # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
+  # see https://flutter.dev/custom-fonts/#from-packages
+
+dependency_overrides:
+    #  dart CHANGELOG 3.0.0 2023-05-10
+    #   - dart pub publish will no longer warn about dependency_overrides.
+    #     Dependency overrides only take effect in the root package of a resolution.
+    #   - ref: https://github.com/dart-lang/sdk/blob/main/CHANGELOG.md
+  you_dart:
+    path: ../../packages/you_dart
+  you_note_dart:
+    path: ../../packages/you_note_dart
+  you_flutter:
+    path: ../../packages/you_flutter

packages/you_dart/lib/src/_core.dart → packages/you_dart/lib/src/core.dart

@@ -3,6 +3,7 @@ import 'package:meta/meta.dart';
 /// 基础包，不依赖其他业务代码
 
 Types types = Types();
+Strings strings = Strings();
 
 
 @experimental
@@ -55,17 +56,6 @@ base mixin class Types {
   }
 }
 
-extension type StringExt(String str) {
-  String safeSubstring(int start, [int? end]) {
-    end ??= str.length;
-    end = end <= str.length ? end : str.length;
-    try {
-      return str.substring(start, end);
-    } catch (e) {
-      throw Exception("$e, string $this");
-    }
-  }
-}
 
 /// 范型参数只有在类型内才能看见，比如Map Signal内的key, value类型外部是无法看见的，
 /// 只能通过钩子传出来
@@ -87,6 +77,9 @@ final class TypeHook<T> {
   bool isNullable() {
     return null is T;
   }
+  bool isNullableOf(T t) {
+    return null is T || t == null;
+  }
 
   bool isTypeOf(obj) {
     return obj is T;
@@ -106,3 +99,21 @@ class Unique {
   String toString() => '[#$name:${shortHash(this)}]';
 
 }
+
+class Strings {
+  /// content only space、/r/n ...not useful text
+  bool isBlankText(String str) {
+    // \s: 匹配任何空白字符，包括空格、制表符、换行符等。
+    return str.contains(RegExp(r'^\s*$'));
+  }
+
+  String safeSubstring(String str, int start, [int? end]) {
+    end ??= str.length;
+    end = end <= str.length ? end : str.length;
+    try {
+      return str.substring(start, end);
+    } catch (e) {
+      throw Exception("$e, string $this");
+    }
+  }
+}

packages/you_dart/lib/src/state.dart

@@ -6,7 +6,7 @@ import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 
 import 'package:meta/meta.dart';
-import 'package:you_dart/src/_core.dart';
+import 'package:you_dart/src/core.dart';
 
 _defaultOnSignalDoNothing(Signal signal) {}
 

packages/you_dart/lib/src/state_json.dart

@@ -2,7 +2,7 @@ import 'dart:collection';
 import 'dart:convert';
 
 import 'package:meta/meta.dart';
-import 'package:you_dart/src/_core.dart';
+import 'package:you_dart/src/core.dart';
 import 'package:you_dart/src/state.dart';
 
 /// [Store] 的编解码器，为[Store]对象赋予json等的能力, 目前支持

packages/you_dart/test/core_types_test.dart

@@ -1,6 +1,6 @@
 import 'package:checks/checks.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:you_dart/src/_core.dart';
+import 'package:you_dart/src/core.dart';
 
 void main() {
   group("types.isType", () {