Merge remote-tracking branch 'upstream/main' into dev_wanbing

Author: wanbing

README-zh.md

@@ -1,7 +1,7 @@
 ![social preview](social-dark.png)
 
 <p align="center">
-  <a href="https://pub.dev/packages/fair"><img src="https://img.shields.io/badge/pub-2.8.0-orange" alt="pub"></a>
+  <a href="https://pub.dev/packages/fair"><img src="https://img.shields.io/badge/pub-2.8.1-orange" alt="pub"></a>
   <a href="https://github.com/wuba/fair"><img src="https://img.shields.io/badge/platform-flutter-blue.svg" alt="github"></a>
   <a href="https://fair.58.com/"><img src="https://img.shields.io/badge/doc-fair.58.com-green.svg" alt="doc"></a>
   <a href="https://github.com/wuba/fair/LICENSE"><img src="https://img.shields.io/badge/license-BSD-green.svg" alt="license"></a>
@@ -22,7 +22,7 @@ Fair是为Flutter设计的动态化框架，通过Fair Compiler工具对原生Da
 **如果您需要热更新平台，可关注Fair Pushy**
 > 热更新平台：[FAIR PUSHY](https://github.com/wuba/FairPushy)
 
-![](fair/what-is-fair.png)
+![](what-is-fair.png)
 
 Fair的UI渲染是无损的，可以做到像素级别的还原，看一张转义Best Flutter UI Templates部分页面后的效果：
 
@@ -58,7 +58,7 @@ git clone https://github.com/wuba/fair.git
 ```yaml
 # add Fair dependency
 dependencies:
-  fair: 2.8.0
+  fair: 2.8.1
 
 # add build_runner and compiler dependency
 dev_dependencies:
@@ -157,6 +157,11 @@ faircli create -k carrier -n carrier_project_name
 
 ## 🔨最近版本
 
+### 2.8.1
+更新时间：2022.11.01
+
+- 修复 bug：CustomScrollView 引用外部函数构建 builder 报错。
+
 ### 2.8.0
 更新时间：2022.10.21
 

README.md

@@ -1,7 +1,7 @@
 ![social preview](social-dark.png)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 <p align="center">
-  <a href="https://pub.dev/packages/fair"><img src="https://img.shields.io/badge/pub-2.8.0-orange" alt="pub"></a>
+  <a href="https://pub.dev/packages/fair"><img src="https://img.shields.io/badge/pub-2.8.1-orange" alt="pub"></a>
   <a href="https://github.com/wuba/fair"><img src="https://img.shields.io/badge/platform-flutter-blue.svg" alt="github"></a>
   <a href="https://fair.58.com/"><img src="https://img.shields.io/badge/doc-fair.58.com-green.svg" alt="doc"></a>
   <a href="https://github.com/wuba/fair/LICENSE"><img src="https://img.shields.io/badge/license-BSD-green.svg" alt="license"></a>
@@ -17,7 +17,7 @@ Fair is a lightweight package for Flutter, which can be used to update widget tr
 
 We create Fair so we can dispatch any pages changes to users as bundle(s), the way similar to React Native. With Flutter Fair integrated, you can publish your pages without waiting for the next release date of your App. Fair provides standard widget and some logic plugins, it can be used as a new dynamic page or as part of existing Flutter page.
 
-![](fair/what-is-fair-en.png)
+![](what-is-fair-en.png)
 
 Fair's UI rendering is lossless and can be restored at the pixel level. Take a look at the effect of escaping some pages of Best Flutter UI Templates:
 
@@ -50,7 +50,7 @@ Assuming that the fair project and your own project are in the same folder:
 ```yaml
 # add Fair dependency
 dependencies:
-  fair: 2.8.0
+  fair: 2.8.1
 
 # add build_runner and compiler dependency
 dev_dependencies:
@@ -153,6 +153,11 @@ For more details, please refer to [fair_tools](fair_tools.md)
 
 ## versions
 
+### 2.8.1
+updateDate：2022.11.01
+
+- Fixed：CustomScrollView reference external function builder bug.
+
 ### 2.8.0
 updateDate：2022.10.21
 

compiler/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [1.4.1-dev.1]
+* bugfix.
+
 ## [1.4.0]
 * bugfix.
 

compiler/lib/src/generator.dart

@@ -81,7 +81,7 @@ class BindingGenerator extends GeneratorForAnnotation<FairBinding> {
       buffer = StringBuffer();
       buffer!.writeln('# Generated by Fair on ${DateTime.now()}.');
     }
-
+    StringBuffer? importsBuffer;
     var resource =
         annotation.peek('packages')?.listValue.map((e) => e.toStringValue());
     var list = [];
@@ -103,6 +103,9 @@ class BindingGenerator extends GeneratorForAnnotation<FairBinding> {
                   element.indexOf('\'') + 1, element.lastIndexOf('\''));
               elements
                   .add(element.contains('package:') ? package : str + package);
+            } else if (element.startsWith('import')) {
+              importsBuffer ??= StringBuffer();
+              importsBuffer!.writeln(element);
             }
           });
           if (elements.isNotEmpty) {
@@ -130,6 +133,11 @@ class BindingGenerator extends GeneratorForAnnotation<FairBinding> {
       buffer!.writeln('${buildStep.inputId.uri}');
       await _transitSource(buildStep, buildStep.inputId, dir);
     }
+    if (importsBuffer != null) {
+      File(path.join(dir, 'fair.binding.imports'))
+        ..createSync(recursive: true)
+        ..writeAsStringSync(importsBuffer!.toString());
+    }
     if (!generated) {
       generated = true;
       return '${package.absolute.path}';
@@ -214,7 +222,11 @@ class PackageBuilder extends Builder with FairCompiler {
         .where((l) => !l.startsWith('#'))
         .map((e) => 'import \'$e\';')
         .toSet();
-
+    var bindingImportsFile = File(path.join(
+        '.dart_tool', 'build', 'fairc', 'source', 'fair.binding.imports'));
+    if (bindingImportsFile.existsSync()) {
+      annotated.addAll(bindingImportsFile.readAsLinesSync().toSet());
+    }
     var dir = path.join('.dart_tool', 'build', 'fairc', 'source');
     var r = await compile(buildStep, ['-k', 'dart', '-d', dir]);
     String generated;
@@ -224,6 +236,8 @@ class PackageBuilder extends Builder with FairCompiler {
     }
     Directory(dir).deleteSync(recursive: true);
     var builder = StringBuffer('// Generated by Fair on ${DateTime.now()}.\n');
+    builder.writeln(
+        '// ignore_for_file: implementation_imports, unused_import, depend_on_referenced_packages, unused_shown_name, duplicate_import, always_specify_types');    
     annotated.forEach((element) => builder.writeln(element));
     builder.writeln(r.data);
     generated = builder.toString();

compiler/pubspec.yaml

@@ -1,6 +1,6 @@
 name: fair_compiler
 description: A complier which can generate Fair bundle for widget with annotation.
-version: 1.4.0
+version: 1.4.1-dev.1
 homepage: https://fair.58.com/
 
 environment:

dart2js/lib/src/__test_data__/Operators/Cascade.dart

@@ -0,0 +1,27 @@
+import '../../convertorV2.dart';
+
+String a = convertFunction('''
+void main(){
+var paint = Paint()..color = Colors.black
+  ..strokeCap = StrokeCap.round
+  ..strokeWidth = 5.0;
+  
+ 
+}
+    ''');
+
+// 语法不支持报错
+String b = convertFunction('''
+void main(){
+  querySelector('#confirm')?..text = 'Confirm' 
+  ..classes.add('important')
+  ..onClick.listen((e) => window.alert('Confirmed!'))
+  ..scrollIntoView();
+}
+    ''');
+
+void main() {
+  print(a);
+  print("-----------------------");
+  print(b);
+}

dart2js/lib/src/__test_data__/Operators/Conditional.dart

@@ -0,0 +1,14 @@
+import '../../convertorV2.dart';
+
+// as 关键字 被舍弃
+String a = convertFunction('''
+void main(){
+var visibility = isPublic ? 'public' : 'private';
+var x= name ?? 'Guest';
+String playerName(String? name) => name ?? 'Guest';
+}
+    ''');
+
+void main() {
+  print(a);
+}

dart2js/lib/src/__test_data__/Operators/DoWhile.dart

@@ -0,0 +1,27 @@
+import '../../convertorV2.dart';
+
+String a = convertFunction('''
+void main(){
+do {
+  printLine();
+} while (!atEndOfPage());
+
+while (true) {
+  if (shutDownRequested()) break;
+  processIncomingRequests();
+}
+
+for (int i = 0; i < candidates.length; i++) {
+  var candidate = candidates[i];
+  if (candidate.yearsExperience < 5) {
+    continue;
+  }
+  candidate.interview();
+}
+
+}
+    ''');
+
+void main() {
+  print(a);
+}

dart2js/lib/src/__test_data__/Operators/For.dart

@@ -0,0 +1,20 @@
+import '../../convertorV2.dart';
+
+String a = convertFunction('''
+void main(){
+var callbacks = [];
+for (var i = 0; i < 2; i++) {
+  callbacks.add(() => print(i));
+}
+
+for (final c in callbacks) {
+  c();
+}
+var collection = [1, 2, 3];
+collection.forEach(print); // 1 2 3
+}
+    ''');
+
+void main() {
+  print(a);
+}

dart2js/lib/src/__test_data__/Operators/IFElse.dart

@@ -0,0 +1,17 @@
+import '../../convertorV2.dart';
+
+String a = convertFunction('''
+void main(){
+if (isRaining()) {
+  you.bringRainCoat();
+} else if (isSnowing()) {
+  you.wearJacket();
+} else {
+  car.putTopDown();
+}
+}
+    ''');
+
+void main() {
+  print(a);
+}