Merge pull request #2208 from fable-compiler/nagareyama-plugins

Plugins

Author: alfonsogarciacaro

.vscode/launch.json

@@ -57,7 +57,8 @@
             "name": "Run bench-compiler (.NET)",
             "program": "${workspaceFolder}/src/fable-standalone/test/bench-compiler/bin/Debug/netcoreapp3.1/bench-compiler.dll",
             // "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests"],
-            "args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--typescript"],
+            // "args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--typescript"],
+            "args": ["${workspaceRoot}/src/fable-library/Fable.Library.fsproj", "out-lib", "--typescript"],
             "cwd": "${workspaceFolder}/src/fable-standalone/test/bench-compiler"
         },
         {

Fable.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
@@ -22,16 +22,18 @@ EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Library", "src\fable-library\Fable.Library.fsproj", "{C6B876C9-8410-4FFF-AD89-46539E54253C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{54BD4E45-0C5B-455A-9C7C-37736B216015}"
-ProjectSection(SolutionItems) = preProject
-	build.fsx = build.fsx
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		build.fsx = build.fsx
+	EndProjectSection
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Standalone", "src\fable-standalone\src\Fable.Standalone.fsproj", "{D5817BB2-0664-4E0A-BBD1-06615D705E99}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Worker", "src\fable-standalone\src\Worker\Worker.fsproj", "{8CF1FD4C-0170-4E86-AD26-43012ED12929}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fable-compiler-js", "src\fable-compiler-js\src\fable-compiler-js.fsproj", "{C9A73E73-8ED5-4E5F-9E7A-7E4511F94858}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.AST", "src\Fable.AST\Fable.AST.fsproj", "{7D98854F-8786-4F4B-9B57-2C3F905BB53D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -186,6 +188,18 @@ Global
 		{C9A73E73-8ED5-4E5F-9E7A-7E4511F94858}.Release|x64.Build.0 = Release|Any CPU
 		{C9A73E73-8ED5-4E5F-9E7A-7E4511F94858}.Release|x86.ActiveCfg = Release|Any CPU
 		{C9A73E73-8ED5-4E5F-9E7A-7E4511F94858}.Release|x86.Build.0 = Release|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Debug|x64.Build.0 = Debug|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Debug|x86.Build.0 = Debug|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Release|x64.ActiveCfg = Release|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Release|x64.Build.0 = Release|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Release|x86.ActiveCfg = Release|Any CPU
+		{7D98854F-8786-4F4B-9B57-2C3F905BB53D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build.fsx

@@ -40,16 +40,20 @@ let cleanDirs dirs =
     for dir in dirs do
         removeDirRecursive dir
 
-let updateVersionInCliUtil() =
+let updateVersionInCliUtil version =
     let filePath = "src/Fable.Cli/Util.fs"
-    let version = Publish.loadReleaseVersion "src/Fable.Cli"
     // printfn "VERSION %s" version
     Regex.Replace(
         readFile filePath,
         @"let \[<Literal>] VERSION = "".*?""",
         sprintf "let [<Literal>] VERSION = \"%s\"" version)
     |> writeFile filePath
 
+let updatePkgVersionInFsproj projFile version =
+    readFile projFile
+    |> replaceRegex Publish.NUGET_PACKAGE_VERSION ["$1"; version; "$3"]
+    |> writeFile projFile
+
 let downloadAndExtractTo (url: string) (targetDir: string) =
     sprintf "npx download --extract --out %s \"%s\"" targetDir url |> run
 
@@ -77,6 +81,7 @@ let buildLibrary() =
     runFableWithArgs projectDir [
         "--outDir " + buildDir
         "--fableLib " + buildDir
+        "--noCache"
         "--exclude Fable.Core"
         "--define FX_NO_BIGINT"
     ]
@@ -117,6 +122,7 @@ let buildLibraryTs() =
     runFableWithArgs projectDir [
         "--outDir " + buildDirTs
         "--fableLib " + buildDirTs
+        "--noCache"
         "--typescript"
         "--exclude Fable.Core"
         "--define FX_NO_BIGINT"
@@ -135,7 +141,7 @@ let quicktest () =
     if pathExists quicktestJsPath |> not then
         writeFile quicktestJsPath "console.log('Getting ready, hold tight')"
 
-    run "dotnet watch -p src/Fable.Cli run -- watch --cwd ../quicktest --exclude Fable.Core --forcePkgs --runScript"
+    run "dotnet watch -p src/Fable.Cli run -- watch --cwd ../quicktest --exclude Fable.Core --noCache --runScript"
 
 let buildStandalone(minify: bool) =
     printfn "Building standalone%s..." (if minify then "" else " (no minification)")
@@ -155,8 +161,7 @@ let buildStandalone(minify: bool) =
     // build standalone bundle
     runFableWithArgs projectDir [
         "--outDir " + buildDir + "/bundle"
-        "--fableLib " + libraryDir
-        "--forcePkgs"
+        "--noCache"
         "--define FX_NO_CORHOST_SIGNER"
         "--define FX_NO_LINKEDRESOURCES"
         "--define FX_NO_PDB_READER"
@@ -171,8 +176,7 @@ let buildStandalone(minify: bool) =
     // build standalone worker
     runFableWithArgs (projectDir + "/Worker") [
         "--outDir " + buildDir + "/worker"
-        "--fableLib " + libraryDir
-        "--forcePkgs"
+        "--noCache"
     ]
 
     // make standalone bundle dist
@@ -215,7 +219,6 @@ let buildStandalone(minify: bool) =
 
 let buildCompilerJs(minify: bool) =
     let projectDir = "src/fable-compiler-js/src"
-    let libraryDir = "build/fable-library"
     let buildDir = "build/fable-compiler-js"
     let distDir = "src/fable-compiler-js/dist"
 
@@ -227,8 +230,7 @@ let buildCompilerJs(minify: bool) =
 
     runFableWithArgs projectDir [
         "--outDir " + buildDir
-        "--fableLib " + libraryDir
-        "--forcePkgs"
+        "--noCache"
         "--exclude Fable.Core"
     ]
 
@@ -277,8 +279,7 @@ let test() =
 
     runFableWithArgs projectDir [
         "--outDir " + buildDir
-        "--fableLib " + libraryDir
-        "--forcePkgs"
+        "--noCache"
         "--exclude Fable.Core"
     ]
 
@@ -290,37 +291,30 @@ let test() =
 
 let testRepos() =
     let repos = [
-        "https://github.com/alfonsogarciacaro/Fable.Jester:nagareyama"
+        "https://github.com/alfonsogarciacaro/Fable.Jester:nagareyama", "npm i && npm test"
+        "https://github.com/Zaid-Ajaj/Fable.SimpleJson:master", "npm i && npm run test-nagareyama"
     ]
 
-    // Make sure we don't install a cached version
-    let removeCachedPackage() =
-        run "rm -rf ~/.nuget/packages/fable"
-        // run "dotnet nuget locals all --clear"
-
-    let fableVersionRange = "3.0.0-nagareyama-*"
+    let version = "3.0.0-local-build-" + DateTime.Now.ToString("yyyyMMdd-HHmm")
     let testDir = "temp"
     let pkgDir = "pkg"
+
     cleanDirs [testDir]
     makeDirRecursive testDir
-
-    removeCachedPackage()
+    updateVersionInCliUtil version
+    updatePkgVersionInFsproj "src/Fable.Cli/Fable.Cli.fsproj" version
     run (sprintf "dotnet pack src/Fable.Cli/ -p:Pack=true -c Release -o %s" (testDir </> pkgDir))
 
-    for repo in repos do
+    for (repo, command) in repos do
         let url, branch = let i = repo.LastIndexOf(":") in repo.[..i-1], repo.[i+1..]
         let name = url.[url.LastIndexOf("/") + 1..]
         runInDir testDir (sprintf "git clone %s %s" url name)
         let repoDir = testDir </> name
         runInDir repoDir ("git checkout " + branch)
         runInDir repoDir "dotnet tool uninstall fable"
         runInDir repoDir (sprintf "dotnet tool install fable --version \"%s\" --add-source %s"
-                            fableVersionRange (".." </> pkgDir))
-        runInDir repoDir "dotnet tool restore"
-        runInDir repoDir "npm install" // yarn
-        runInDir repoDir "npm test"
-
-    removeCachedPackage()
+                            version (".." </> pkgDir))
+        runInDir repoDir command
 
 let coverage() =
     // report converter
@@ -422,10 +416,11 @@ let syncFcsRepo() =
     copyFcsRepo FCS_REPO_LOCAL
 
 let packages =
-    ["Fable.Cli", (fun () ->
-        updateVersionInCliUtil()
-        buildLibrary())
+    ["Fable.AST", doNothing
      "Fable.Core", doNothing
+     "Fable.Cli", (fun () ->
+        Publish.loadReleaseVersion "src/Fable.Cli" |> updateVersionInCliUtil
+        buildLibrary())
      "fable-compiler-js", fun () -> buildCompilerJs true
      "fable-metadata", doNothing
      "fable-publish-utils", doNothing

src/Fable.Transforms/AST/AST.Babel.fs renamed to src/Fable.AST/Babel.fs

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Fable AST</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Version>3.0.0</Version>
+    <PackageVersion>3.0.0-nagareyama-alpha-001</PackageVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Common.fs" />
+    <Compile Include="Fable.fs" />
+    <Compile Include="Babel.fs" />
+    <Compile Include="Plugins.fs" />
+  </ItemGroup>
+</Project>

src/Fable.Transforms/AST/AST.Common.fs renamed to src/Fable.AST/Common.fs

@@ -13,12 +13,12 @@ type EntityRef =
         fullName.Replace("+", ".")
 
 type DeclaredType =
-    abstract Definition: EntityRef
+    abstract Entity: EntityRef
     abstract GenericArgs: Type list
 
 type Attribute =
-    abstract FullName: string
-    abstract ConstructorArguments: obj list
+    abstract Entity: EntityRef
+    abstract ConstructorArgs: obj list
 
 type Field =
     abstract Name: string
@@ -66,7 +66,7 @@ type Entity =
     abstract DisplayName: string
     abstract FullName: string
     abstract Attributes: Attribute seq
-    abstract BaseDeclaration: DeclaredType option
+    abstract BaseType: DeclaredType option
     abstract AllInterfaces: DeclaredType seq
     abstract GenericParameters: GenericParam list
     abstract MembersFunctionsAndValues: MemberFunctionOrValue seq
@@ -118,6 +118,7 @@ type ActionDecl = {
 
 type MemberDecl = {
     Name: string
+    FullDisplayName: string
     Args: Ident list
     Body: Expr
     Info: MemberInfo

src/Fable.AST/Fable.AST.fsproj

@@ -0,0 +1,24 @@
+namespace Fable
+
+open System
+open Fable.AST
+open Fable.AST.Fable
+
+type PluginHelper =
+    abstract LogWarning: string * ?range: SourceLocation -> unit
+    abstract LogError: string * ?range: SourceLocation -> unit
+
+[<AbstractClass>]
+type PluginAttribute() =
+    inherit System.Attribute()
+    abstract FableMinimumVersion: string
+
+[<AbstractClass>]
+type MemberDeclarationPluginAttribute() =
+    inherit PluginAttribute()
+    abstract Transform: PluginHelper * MemberDecl -> MemberDecl
+
+[<AbstractClass>]
+type CallPluginAttribute() =
+    inherit PluginAttribute()
+    abstract Transform: PluginHelper * expr: Expr -> Expr

src/Fable.Transforms/AST/AST.Fable.fs renamed to src/Fable.AST/Fable.fs

@@ -0,0 +1,3 @@
+### 3.0.0-nagareyama-alpha-001
+
+* First alpha release

src/Fable.AST/Plugins.fs

@@ -45,15 +45,22 @@ Commands:
 Arguments:
   --cwd             Working directory
   --outDir          Redirect compilation output to a directory
+  --extension       Extension for generated JS files (default .fs.js)
+
   --define          Defines a symbol for use in conditional compilation
+  --verbose         Print more info during compilation
+  --typedArrays     Compile numeric arrays as JS typed arrays (default true)
+
   --run             The command after the argument will be executed after compilation
+  --runFast         The command after the argument will be executed BEFORE compilation
   --runWatch        Like run, but will execute after each watch compilation
-  --runScript       Runs the generated script for last file with node (requires "esm" npm package)
-  --typedArrays     Compile numeric arrays as JS typed arrays (default true)
-  --forcePkgs       Force a new copy of package sources into `.fable` folder
-  --extension       Extension for generated JS files (default .fs.js)
-  --verbose         Print more info during compilation
-  --exclude         Skip Fable compilation for files containing the pattern
+  --runScript       Runs the generated script for last file with node
+                    (Requires "esm" npm package)
+
+  --noCache         Ignore cached files during compilation
+  --exclude         Don't merge sources of referenced projects with specified pattern
+                    (Intended for plugin development)
+
   --optimize        Compile with optimized F# AST (experimental)
   --typescript      Compile to TypeScript (experimental)
 """
@@ -121,7 +128,7 @@ type Runner =
               RootDir = rootDir
               OutDir = argValue "--outDir" args
               WatchMode = watch
-              ForcePackages = flagEnabled "--forcePkgs" args
+              NoCache = flagEnabled "--noCache" args || flagEnabled "--forcePkgs" args
               Exclude = argValue "--exclude" args
               Define = defines
               RunProcess = runProc
@@ -179,14 +186,13 @@ let main argv =
             |> function
                 | argv, flag::runArgs ->
                     match flag, runArgs with
-                    | "--run", [] -> Error "Missing command after --run"
-                    | "--runWatch", [] -> Error "Missing command after --runWatch"
-                    | "--run", exeFile::args -> Ok(false, exeFile, args)
-                    | "--runWatch", exeFile::args -> Ok(true, exeFile, args)
-                    | "--runScript", args -> Ok(true, Naming.placeholder, args)
-                    | _ -> Error ""
-                    |> Result.map (fun (watch, exeFile, args) ->
-                        argv, Some(RunProcess(exeFile, args, watch)))
+                    | "--run", exeFile::args -> Ok(RunProcess(exeFile, args))
+                    | "--runFast", exeFile::args -> Ok(RunProcess(exeFile, args, fast=true))
+                    | "--runWatch", exeFile::args -> Ok(RunProcess(exeFile, args, watch=true))
+                    | "--runScript", args -> Ok(RunProcess(Naming.placeholder, args, watch=true))
+                    | _, [] -> Error("Missing command after "+ flag)
+                    | _ -> Error("Unknown argument " + flag)
+                    |> Result.map (fun runProc -> argv, Some runProc)
                 | argv, [] -> Ok(argv, None)
 
         let rootDir =