Skip to content

Commit 5ded459

Browse files
ncavealfonsogarciacaro
ncave
authored and
alfonsogarciacaro
committed
Added --fableLib arg
1 parent 00aadd5 commit 5ded459

File tree

6 files changed

+23
-27
lines changed

6 files changed

+23
-27
lines changed

‎src/Fable.Cli/Util.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ module Imports =
230230
let importPath =
231231
if importPath.StartsWith("${outDir}")
232232
// NOTE: Path.Combine in Fable Prelude trims / at the start
233-
// of the 2nd argument, unline .NET IO.Path.Combine
233+
// of the 2nd argument, unlike .NET IO.Path.Combine
234234
then Path.Combine(outDir, importPath.Replace("${outDir}", ""))
235235
else importPath
236236
let sourceDir = Path.GetDirectoryName(sourcePath)

‎src/fable-compiler-js/src/Platform.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ open Fable.Core.JsInterop
44

55
type CmdLineOptions = {
66
outDir: string option
7-
// fableDir: string option
7+
libDir: string option
88
benchmark: bool
99
optimize: bool
1010
// sourceMaps: bool

‎src/fable-compiler-js/src/app.fs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ module Imports =
5959
let importPath =
6060
if importPath.StartsWith("${outDir}")
6161
// NOTE: Path.Combine in Fable Prelude trims / at the start
62-
// of the 2nd argument, unline .NET IO.Path.Combine
63-
then Path.Combine(outDir, importPath.Replace("${outDir}", ""))
62+
// of the 2nd argument, unlike .NET IO.Path.Combine
63+
then Path.Combine(outDir, importPath.Replace("${outDir}", "")) |> normalizeFullPath
6464
else importPath
6565
let sourceDir = Path.GetDirectoryName(sourcePath)
6666
let targetDir = Path.GetDirectoryName(targetPath)
@@ -151,7 +151,7 @@ let parseFiles projectFileName options =
151151

152152
// Fable (F# to JS)
153153
let projDir = projectFileName |> normalizeFullPath |> Path.GetDirectoryName
154-
let libDir = getFableLibDir() |> normalizeFullPath
154+
let libDir = options.libDir |> Option.defaultValue (getFableLibDir()) |> normalizeFullPath
155155
let parseFable (res, fileName) =
156156
fable.CompileToBabelAst(libDir, res, fileName,
157157
typedArrays = options.typedArrays,
@@ -201,15 +201,15 @@ let parseFiles projectFileName options =
201201
writeAllText outPath writer.Result
202202
} |> runAsync
203203

204-
let argValue key (args: string[]) =
204+
let argValue keys (args: string[]) =
205205
args
206206
|> Array.pairwise
207207
|> Array.tryPick (fun (k, v) ->
208-
if k = key && not (v.StartsWith("-"))
208+
if (List.contains k keys) && not (v.StartsWith("-"))
209209
then Some v else None)
210210

211211
let tryFlag flag (args: string[]) =
212-
match argValue flag args with
212+
match argValue [flag] args with
213213
| Some flag ->
214214
match System.Boolean.TryParse(flag) with
215215
| true, flag -> Some flag
@@ -231,8 +231,8 @@ let run opts projectFileName outDir =
231231
let runArgs = opts.[i+1..] |> String.concat " "
232232
sprintf "node %s %s" scriptFile runArgs)
233233
let options = {
234-
outDir = opts |> argValue "--outDir" |> Option.orElse outDir
235-
// fableDir = opts |> argValue "--fableDir"
234+
outDir = opts |> argValue ["--outDir"; "-o"] |> Option.orElse outDir
235+
libDir = opts |> argValue ["--fableLib"]
236236
benchmark = opts |> hasFlag "--benchmark"
237237
optimize = opts |> hasFlag "--optimize"
238238
// sourceMaps = opts |> hasFlag "--sourceMaps"

‎src/fable-standalone/test/bench-compiler/Platform.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module Fable.Compiler.Platform
22

33
type CmdLineOptions = {
44
outDir: string option
5-
// fableDir: string option
5+
libDir: string option
66
benchmark: bool
77
optimize: bool
88
// sourceMaps: bool

‎src/fable-standalone/test/bench-compiler/app.fs‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ module Imports =
4949
let importPath =
5050
if importPath.StartsWith("${outDir}")
5151
// NOTE: Path.Combine in Fable Prelude trims / at the start
52-
// of the 2nd argument, unline .NET IO.Path.Combine
53-
then Path.Combine(outDir, importPath.Replace("${outDir}", ""))
52+
// of the 2nd argument, unlike .NET IO.Path.Combine
53+
then Path.Combine(outDir, importPath.Replace("${outDir}", "")) |> normalizeFullPath
5454
else importPath
5555
let sourceDir = Path.GetDirectoryName(sourcePath)
5656
let targetDir = Path.GetDirectoryName(targetPath)
@@ -141,11 +141,7 @@ let parseFiles projectFileName options =
141141

142142
// Fable (F# to JS)
143143
let projDir = projectFileName |> normalizeFullPath |> Path.GetDirectoryName
144-
let libDir =
145-
// special case for fable-library, the libDir is the outDir
146-
if options.typescript && projectFileName.EndsWith("Fable.Library.fsproj") && Option.isSome options.outDir
147-
then options.outDir.Value |> normalizeFullPath
148-
else getFableLibDir() |> normalizeFullPath
144+
let libDir = options.libDir |> Option.defaultValue (getFableLibDir()) |> normalizeFullPath
149145

150146
let parseFable (res, fileName) =
151147
fable.CompileToBabelAst(libDir, res, fileName,
@@ -196,15 +192,15 @@ let parseFiles projectFileName options =
196192
writeAllText outPath writer.Result
197193
} |> runAsync
198194

199-
let argValue key (args: string[]) =
195+
let argValue keys (args: string[]) =
200196
args
201197
|> Array.pairwise
202198
|> Array.tryPick (fun (k, v) ->
203-
if k = key && not (v.StartsWith("-"))
199+
if (List.contains k keys) && not (v.StartsWith("-"))
204200
then Some v else None)
205201

206202
let tryFlag flag (args: string[]) =
207-
match argValue flag args with
203+
match argValue [flag] args with
208204
| Some flag ->
209205
match System.Boolean.TryParse(flag) with
210206
| true, flag -> Some flag
@@ -226,8 +222,8 @@ let run opts projectFileName outDir =
226222
let runArgs = opts.[i+1..] |> String.concat " "
227223
sprintf "node %s %s" scriptFile runArgs)
228224
let options = {
229-
outDir = opts |> argValue "--outDir" |> Option.orElse outDir
230-
// fableDir = opts |> argValue "--fableDir"
225+
outDir = opts |> argValue ["--outDir"; "-o"] |> Option.orElse outDir
226+
libDir = opts |> argValue ["--fableLib"]
231227
benchmark = opts |> hasFlag "--benchmark"
232228
optimize = opts |> hasFlag "--optimize"
233229
// sourceMaps = opts |> hasFlag "--sourceMaps"

‎src/fable-standalone/test/bench-compiler/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"type": "module",
44
"scripts": {
55
"build-cli": "dotnet run -c Release -p ../../../Fable.Cli -- bench-compiler.fsproj --outDir out-node",
6+
"postbuild-cli": "npm run rollup-bundle",
67

78
"prebuild-dotnet": "git clean -fdx",
89
"build-dotnet": "dotnet run -c Release bench-compiler.fsproj out-node",
@@ -24,10 +25,10 @@
2425
"terser-bundle": "npm run terser -- dist/bundle.js -o dist/bundle.min.js --mangle --compress",
2526
"webpack-bundle": "npm run webpack -- -p --entry ./out-node/app.js --output ./dist/bundle.min.js --target node",
2627

27-
"prebuild-lib-dotnet": "git clean -fdx",
28-
"build-lib-dotnet": "dotnet run -c Release ../../../fable-library/Fable.Library.fsproj out-lib",
28+
"prebuild-lib-dotnet": "git clean -fdx && npm run tsc -- -p ../../../fable-library --outDir ./out-lib",
29+
"build-lib-dotnet": "dotnet run -c Release ../../../fable-library/Fable.Library.fsproj out-lib --fableLib out-lib",
2930
"prebuild-lib-dotnet-ts": "git clean -fdx && mkdir out-lib && cp -R ../../../fable-library/*.ts out-lib",
30-
"build-lib-dotnet-ts": "dotnet run -c Release ../../../fable-library/Fable.Library.fsproj out-lib --typescript",
31+
"build-lib-dotnet-ts": "dotnet run -c Release ../../../fable-library/Fable.Library.fsproj out-lib --typescript --fableLib out-lib",
3132
"tsc-lib-init": "npm run tsc -- --init --target es2020 --module es2020 --allowJs",
3233
"tsc-lib": "npm run tsc -- -p ./out-lib --outDir ./out-lib-js",
3334

@@ -39,7 +40,6 @@
3940
"build-test-node-ts": "node out-node/app.js ../../../../../fable-test/fable-test.fsproj out-test --typescript",
4041
"test-node": "node ./out-test/src/test.js",
4142

42-
"prebuild-tests-dotnet": "git clean -fdx",
4343
"build-tests-dotnet": "dotnet run -c Release ../../../../tests/Main/Fable.Tests.fsproj out-tests",
4444
"build-tests-dotnet-ts": "dotnet run -c Release ../../../../tests/Main/Fable.Tests.fsproj out-tests --typescript",
4545
"build-tests-dotnet-opt": "dotnet run -c Release ../../../../tests/Main/Fable.Tests.fsproj out-tests --optimize",

0 commit comments

Comments
 (0)