Dart: Add ResizeList

Author: alfonsogarciacaro

.vscode/settings.json

@@ -14,5 +14,13 @@
     },
     "files.trimTrailingWhitespace": true,
     "files.trimFinalNewlines": true,
-    "gitlens.codeLens.enabled": false
+    "gitlens.codeLens.enabled": false,
+    "FSharp.excludeProjectDirectories": [
+        ".git",
+        "paket-files",
+        "fable_modules",
+        "packages",
+        "node_modules",
+        "src/fcs-fable"
+    ]
 }

build.fsx

@@ -25,6 +25,7 @@ let BUILD_ARGS_LOWER =
 module Util =
     let cleanDirs dirs =
         for dir in dirs do
+            printfn $"Clean {dir}"
             removeDirRecursive dir
 
     let resolveDir dir =
@@ -175,6 +176,7 @@ let buildLibraryTs() =
 
 // TODO: move to PublishUtils.fs ?
 let copyFiles sourceDir searchPattern destDir =
+    printfn $"Copy {sourceDir </> searchPattern} to {destDir}"
     for source in IO.Directory.GetFiles(sourceDir, searchPattern) do
         let fileName = IO.Path.GetFileName(source)
         let target = destDir </> fileName
@@ -236,12 +238,16 @@ let buildLibraryRust() =
 //     if not (pathExists (baseDir </> "build/fable-library-rust")) then
 //         buildLibraryRust()
 
-let buildLibraryDart() =
+let buildLibraryDart(clean: bool) =
     let sourceDir = resolveDir "src/fable-library-dart"
     let buildDir = resolveDir "build/fable-library-dart"
-    cleanDirs [buildDir]
+    
+    if clean then
+        cleanDirs [buildDir]
+        makeDirRecursive buildDir
+        copyFiles sourceDir "pubspec.*" buildDir
+        copyFiles sourceDir "analysis_options.yaml" buildDir
 
-    makeDirRecursive buildDir
     copyFiles sourceDir "*.dart" buildDir
 
     runFableWithArgsInDir sourceDir [
@@ -524,7 +530,7 @@ let testRust() =
 
 let testDart(isWatch) =
     if not (pathExists "build/fable-library-dart") then
-        buildLibraryDart()
+        buildLibraryDart(true)
 
     let runDir = "tests/Dart"
     let projectDir = runDir + "/src"
@@ -675,8 +681,8 @@ let publishPackages restArgs =
         else
             pushNpm ("src" </> pkg) buildAction
 
-let minify<'T> =
-    BUILD_ARGS_LOWER |> List.contains "--no-minify" |> not
+let hasFlag flag =
+    BUILD_ARGS_LOWER |> List.contains flag
 
 match BUILD_ARGS_LOWER with
 // | "check-sourcemaps"::_ ->
@@ -688,7 +694,9 @@ match BUILD_ARGS_LOWER with
 | "test-mocha"::_ -> compileAndRunTestsWithMocha true "Main"
 | "test-mocha-fast"::_ -> compileAndRunTestsWithMocha false "Main"
 | "test-react"::_ -> testReact()
-| "test-standalone"::_ -> testStandalone(minify)
+| "test-standalone"::_ ->
+    let minify = hasFlag "--no-minify" |> not
+    testStandalone(minify)
 | "test-standalone-fast"::_ -> testStandaloneFast()
 | "test-configs"::_ -> testProjectConfigs()
 | "test-integration"::_ -> testIntegration()
@@ -723,9 +731,16 @@ match BUILD_ARGS_LOWER with
 | ("fable-library-ts"|"library-ts")::_ -> buildLibraryTs()
 | ("fable-library-py"|"library-py")::_ -> buildLibraryPy()
 | ("fable-library-rust" | "library-rust")::_ -> buildLibraryRust()
-| ("fable-library-dart" | "library-dart")::_ -> buildLibraryDart()
-| ("fable-compiler-js"|"compiler-js")::_ -> buildCompilerJs(minify)
-| ("fable-standalone"|"standalone")::_ -> buildStandalone {|minify=minify; watch=false|}
+| ("fable-library-dart" | "library-dart")::_ ->
+    let clean = hasFlag "--no-clean" |> not
+    buildLibraryDart(clean)
+
+| ("fable-compiler-js"|"compiler-js")::_ ->
+    let minify = hasFlag "--no-minify" |> not
+    buildCompilerJs(minify)
+| ("fable-standalone"|"standalone")::_ ->
+    let minify = hasFlag "--no-minify" |> not
+    buildStandalone {|minify=minify; watch=false|}
 | "watch-standalone"::_ -> buildStandalone {|minify=false; watch=true|}
 | "publish"::restArgs -> publishPackages restArgs
 | "github-release"::_ ->

src/Fable.AST/Fable.fs

@@ -191,6 +191,7 @@ type MemberDecl = {
     /// for a declaration in the root scope
     ExportDefault: bool
     DeclaringEntity: EntityRef option
+    XmlDoc: string option
 } with
     member this.ArgIdents = this.Args |> List.map (fun a -> a.Ident)
     member this.ArgTypes = this.Args |> List.map (fun a -> a.Ident.Type)
@@ -201,6 +202,7 @@ type ClassDecl = {
     Constructor: MemberDecl option
     BaseCall: Expr option
     AttachedMembers: MemberDecl list
+    XmlDoc: string option
 }
 
 type ModuleDecl = {
@@ -462,7 +464,7 @@ type UnresolvedExpr =
     // TODO: Add also MemberKind from the flags?
     | UnresolvedTraitCall of sourceTypes: Type list * traitName: string * isInstance: bool * argTypes: Type list * argExprs: Expr list
     | UnresolvedReplaceCall of thisArg: Expr option * args: Expr list * info: ReplaceCallInfo * attachedCall: Expr option
-    | UnresolvedInlineCall of memberUniqueName: string * genArgs: Type list * witnesses: Witness list * callee: Expr option * info: CallInfo
+    | UnresolvedInlineCall of memberUniqueName: string * witnesses: Witness list * callee: Expr option * info: CallInfo
 
 type Expr =
     /// Identifiers that reference another expression

src/Fable.Cli/Properties/launchSettings.json

@@ -2,8 +2,8 @@
   "profiles": {
     "Fable.Cli": {
       "commandName": "Project",
-      "commandLineArgs": "watch src/Quicktest --noCache --exclude Fable.Core",
-      "workingDirectory": "C:\\Users\\alfon\\repos\\Fable"
+      "commandLineArgs": "src/quicktest-dart --lang dart --noCache --exclude Fable.Core",
+      "workingDirectory": "../../../../.."
     }
   }
 }

src/Fable.Transforms/Dart/Dart.fs

@@ -224,10 +224,12 @@ type Statement =
     static member switchStatement(discriminant, cases, ?defaultCase) =
         SwitchStatement(discriminant, cases, defaultCase)
 
-type FunctionArg(ident: Ident, ?isOptional: bool, ?isNamed: bool) =
+type FunctionArg(ident: Ident, ?isOptional: bool, ?isNamed: bool, ?isConsThisArg: bool) =
     member _.Ident = ident
     member _.IsOptional = defaultArg isOptional false
     member _.IsNamed = defaultArg isNamed false
+    member _.IsConsThisArg = defaultArg isConsThisArg false
+    member _.AsConsThisArg(name) = FunctionArg({ ident with Name = name }, ?isOptional=isOptional, ?isNamed=isNamed, isConsThisArg=true)
 
 type FunctionDecl =
     {
@@ -238,12 +240,8 @@ type FunctionDecl =
         ReturnType: Type
     }
 
-type ConsArg =
-    | ConsArg of Ident
-    | ConsThisArg of name: string
-
 type Constructor(?args, ?body, ?superArgs, ?isConst, ?isFactory) =
-    member _.Args: ConsArg list = defaultArg args []
+    member _.Args: FunctionArg list = defaultArg args []
     member _.Body: Statement list = defaultArg body []
     member _.SuperArgs: CallArg list = defaultArg superArgs []
     member _.IsConst = defaultArg isConst false

src/Fable.Transforms/Dart/DartPrinter.fs

@@ -74,8 +74,8 @@ module PrinterExtensions =
                         let subSegment =
                             // Remove whitespace in front of new lines,
                             // indent will be automatically applied
-                            if printer.Column = 0 then subSegments.[i - 1].TrimStart()
-                            else subSegments.[i - 1]
+                            if printer.Column = 0 then subSegments[i - 1].TrimStart()
+                            else subSegments[i - 1]
                         if subSegment.Length > 0 then
                             printer.Print(subSegment)
                             if i < subSegments.Length then
@@ -87,53 +87,53 @@ module PrinterExtensions =
                 value
                 |> replace @"\$(\d+)\.\.\." (fun m ->
                     let rep = ResizeArray()
-                    let i = int m.Groups.[1].Value
+                    let i = int m.Groups[1].Value
                     for j = i to args.Length - 1 do
                         rep.Add("$" + string j)
                     String.concat ", " rep)
 
                 |> replace @"\{\{\s*\$(\d+)\s*\?(.*?)\:(.*?)\}\}" (fun m ->
-                    let i = int m.Groups.[1].Value
-                    match args.[i] with
-                    | Literal(BooleanLiteral(value=value)) when value -> m.Groups.[2].Value
-                    | _ -> m.Groups.[3].Value)
+                    let i = int m.Groups[1].Value
+                    match args[i] with
+                    | Literal(BooleanLiteral(value=value)) when value -> m.Groups[2].Value
+                    | _ -> m.Groups[3].Value)
 
                 |> replace @"\{\{([^\}]*\$(\d+).*?)\}\}" (fun m ->
-                    let i = int m.Groups.[2].Value
+                    let i = int m.Groups[2].Value
                     match List.tryItem i args with
-                    | Some _ -> m.Groups.[1].Value
+                    | Some _ -> m.Groups[1].Value
                     | None -> "")
 
                 // If placeholder is followed by !, emit string literals as native code: "let $0! = $1"
                 |> replace @"\$(\d+)!" (fun m ->
-                    let i = int m.Groups.[1].Value
+                    let i = int m.Groups[1].Value
                     match List.tryItem i args with
                     | Some(Literal(StringLiteral value)) -> value
                     | _ -> "")
 
             let matches = Regex.Matches(value, @"\$\d+")
             if matches.Count > 0 then
                 for i = 0 to matches.Count - 1 do
-                    let m = matches.[i]
+                    let m = matches[i]
                     let isSurroundedWithParens =
                         m.Index > 0
                         && m.Index + m.Length < value.Length
-                        && value.[m.Index - 1] = '('
-                        && value.[m.Index + m.Length] = ')'
+                        && value[m.Index - 1] = '('
+                        && value[m.Index + m.Length] = ')'
 
                     let segmentStart =
-                        if i > 0 then matches.[i-1].Index + matches.[i-1].Length
+                        if i > 0 then matches[i-1].Index + matches[i-1].Length
                         else 0
 
                     printSegment printer value segmentStart m.Index
 
-                    let argIndex = int m.Value.[1..]
+                    let argIndex = int m.Value[1..]
                     match List.tryItem argIndex args with
                     | Some e when isSurroundedWithParens -> printer.Print(e)
                     | Some e -> printer.PrintWithParensIfComplex(e)
                     | None -> ()
 
-                let lastMatch = matches.[matches.Count - 1]
+                let lastMatch = matches[matches.Count - 1]
                 printSegment printer value (lastMatch.Index + lastMatch.Length) value.Length
             else
                 printSegment printer value 0 value.Length
@@ -496,14 +496,17 @@ module PrinterExtensions =
                         p.PushIndentation()
                         for s in c.Body do
                             p.Print(s)
-                            p.Print(";")
-                            p.PrintNewLine()
+                            p.PrintStatementSeparator()
+
+                        let rec needsBreak statements =
+                            match List.tryLast statements with
+                            | Some(ContinueStatement _)
+                            | Some(BreakStatement _)
+                            | Some(ReturnStatement _) -> false
+                            | Some(IfStatement(_, consequent, alternate)) -> needsBreak consequent || needsBreak alternate 
+                            | _ -> true
 
-                        match List.tryLast c.Body with
-                        | Some(ContinueStatement _)
-                        | Some(BreakStatement _)
-                        | Some(ReturnStatement _) -> ()
-                        | _ ->
+                        if needsBreak c.Body then
                             p.Print("break;")
                             p.PrintNewLine()
 
@@ -552,8 +555,8 @@ module PrinterExtensions =
                     else "'"
                 printer.Print(quotes)
                 for i = 0 to parts.Length - 2 do
-                    printer.Print(escape parts.[i])
-                    match values.[i] with
+                    printer.Print(escape parts[i])
+                    match values[i] with
                     | IdentExpression i ->
                         printer.Print("$")
                         printer.PrintIdent(i)
@@ -579,7 +582,11 @@ module PrinterExtensions =
                 | test, Literal(BooleanLiteral(false)), Literal(BooleanLiteral(true)) ->
                     printer.Print("!")
                     printer.PrintWithParensIfComplex(test)
-                | test, _, Literal(BooleanLiteral(false)) ->
+                | test, Literal(BooleanLiteral(true)), alternate ->
+                    printer.PrintWithParensIfComplex(test)
+                    printer.Print(" || ")
+                    printer.PrintWithParensIfComplex(alternate)
+                | test, consequent, Literal(BooleanLiteral(false)) ->
                     printer.PrintWithParensIfComplex(test)
                     printer.Print(" && ")
                     printer.PrintWithParensIfComplex(consequent)
@@ -709,9 +716,8 @@ module PrinterExtensions =
                     if v.IsOverride then
                         p.Print("@override")
                         p.PrintNewLine()
-                    match v.Kind with
-                    | Final when v.IsLate -> p.Print("late ")
-                    | _ -> ()
+                    if v.IsLate then
+                        p.Print("late ")
                     p.PrintVariableDeclaration(v.Ident, v.Kind, ?value=v.Value)
                     p.Print(";")
 
@@ -722,13 +728,7 @@ module PrinterExtensions =
                     if c.IsFactory then
                         p.Print("factory ")
                     p.Print(decl.Name)
-                    printer.PrintList("(", ", ", ")", c.Args, function
-                        | ConsThisArg name ->
-                            printer.Print("this.")
-                            printer.Print(name)
-                        | ConsArg i ->
-                            printer.PrintIdent(i, printType=true)
-                    )
+                    printer.PrintFunctionArgs(c.Args)
 
                     if callSuper then
                         p.Print(": super")
@@ -776,12 +776,7 @@ module PrinterExtensions =
                 printer.Print(" ")
                 printer.PrintBlock(body, skipNewLineAtEnd=(isExpression || isModuleOrClassMember))
 
-        member printer.PrintFunctionDeclaration(returnType: Type, name: string, genParams: GenericParam list, args: FunctionArg list, ?body: Statement list, ?isModuleOrClassMember) =
-            printer.PrintType(returnType)
-            printer.Print(" ")
-            printer.Print(name)
-            printer.PrintGenericParams(genParams)
-
+        member printer.PrintFunctionArgs(args: FunctionArg list) =
             let mutable prevArg: FunctionArg option = None
             printer.PrintList("(", ")", args, fun pos arg ->
                 if arg.IsNamed then
@@ -797,7 +792,10 @@ module PrinterExtensions =
                 else
                     ()
 
-                printer.PrintIdent(arg.Ident, printType=true)
+                if arg.IsConsThisArg then
+                    printer.Print("this." + arg.Ident.Name)
+                else
+                    printer.PrintIdent(arg.Ident, printType=true)    
 
                 match pos with
                 | IsSingle | IsLast ->
@@ -811,6 +809,13 @@ module PrinterExtensions =
 
                 prevArg <- Some arg
             )
+                    
+        member printer.PrintFunctionDeclaration(returnType: Type, name: string, genParams: GenericParam list, args: FunctionArg list, ?body: Statement list, ?isModuleOrClassMember) =
+            printer.PrintType(returnType)
+            printer.Print(" ")
+            printer.Print(name)
+            printer.PrintGenericParams(genParams)
+            printer.PrintFunctionArgs(args)
             printer.PrintFunctionBody(?body=body, ?isModuleOrClassMember=isModuleOrClassMember)
 
         member printer.PrintVariableDeclaration(ident: Ident, kind: VariableDeclarationKind, ?value: Expression) =
@@ -871,7 +876,7 @@ let run (writer: Writer) (file: File): Async<unit> =
         let printer = printerImpl :> Printer
 
         // If we manage to master null assertions maybe we can remove unnecessary_non_null_assertion
-        printer.Print("// ignore_for_file: non_constant_identifier_names, camel_case_types, constant_identifier_names, unnecessary_non_null_assertion")
+        printer.Print("// ignore_for_file: camel_case_types, constant_identifier_names, non_constant_identifier_names, unnecessary_non_null_assertion, unnecessary_this")
         printer.PrintNewLine()
 
         file.Imports