Rename FSStrings

Author: ncave

fcs/fcs-fable/FSStrings_.fs fcs/fcs-fable/FSStrings.fsfcs/fcs-fable/FSStrings_.fs renamed to fcs/fcs-fable/FSStrings.fs

@@ -4,9 +4,6 @@
 
 namespace System.IO
 
-module Directory =
-    let GetCurrentDirectory () = "." //TODO: proper xplat implementation
-
 module Path =
     let Combine (path1: string, path2: string) = //TODO: proper xplat implementation
         let path1 =
@@ -29,14 +26,11 @@ module Path =
         else path.Substring(i)
 
     let GetInvalidPathChars () = //TODO: proper xplat implementation
-        Seq.toArray "<>:\"|?*\b\t"
+        Seq.toArray "<>\"|?*\b\t"
 
     let GetInvalidFileNameChars () = //TODO: proper xplat implementation
         Seq.toArray "<>:\"|\\/?*\b\t"
 
-    let GetFullPath (path: string) = //TODO: proper xplat implementation
-        path
-
     let GetFileName (path: string) =
         let normPath = path.Replace("\\", "/").TrimEnd('/')
         let i = normPath.LastIndexOf("/")

fcs/fcs-fable/System.IO.fs

@@ -14,6 +14,12 @@ let measureTime (f: 'a -> 'b) x =
     sw.Stop()
     sw.ElapsedMilliseconds, res
 
+let normalizeFullPath (path: string) =
+    System.IO.Path.GetFullPath(path).Replace('\\', '/')
+
+let getRelativePath (pathFrom: string) (pathTo: string) =
+    System.IO.Path.GetRelativePath(pathFrom, pathTo).Replace('\\', '/')
+
 #else // !DOTNET_FILE_SYSTEM
 
 open Fable.Core.JsInterop
@@ -27,8 +33,13 @@ type private IProcess =
     abstract hrtime: unit -> float []
     abstract hrtime: float[] -> float[]
 
+type private IPath =
+    abstract resolve: string -> string
+    abstract relative: string * string -> string
+
 let private File: IFileSystem = importAll "fs"
 let private Process: IProcess = importAll "process"
+let private Path: IPath = importAll "path"
 
 let readAllBytes metadataPath (fileName:string) = File.readFileSync (metadataPath + fileName)
 let readAllText (filePath:string) = (File.readFileSync (filePath, "utf8")).TrimStart('\uFEFF')
@@ -40,6 +51,12 @@ let measureTime (f: 'a -> 'b) x =
     let elapsed = Process.hrtime(startTime)
     int64 (elapsed.[0] * 1e3 + elapsed.[1] / 1e6), res
 
+let normalizeFullPath (path: string) =
+    Path.resolve(path).Replace('\\', '/')
+
+let getRelativePath (pathFrom: string) (pathTo: string) =
+    Path.relative(pathFrom, pathTo).Replace('\\', '/')
+
 #endif
 
 module Path =

fcs/fcs-fable/test/Platform.fs

@@ -52,11 +52,9 @@ let rec parseProject projectPath =
 
     let projectFileDir = Path.GetDirectoryName projectPath
     let isAbsolutePath (path: string) = path.StartsWith("/") || path.IndexOf(":") = 1
-    let trimPath (path: string) = path.Replace("../", "").Replace("./", "").Replace(":", "")
     let makePath path = if isAbsolutePath path then path else Path.Combine(projectFileDir, path)
-    let makeName path = Path.Combine(projectFileDir, path) |> trimPath
 
-    let fileNames = sourceFiles |> Array.map (fun path -> path |> makeName)
+    let fileNames = sourceFiles |> Array.map (fun path -> path |> makePath |> normalizeFullPath)
     let sources = sourceFiles |> Array.map (fun path -> path |> makePath |> readAllText)
 
     let parsedProjects = projectRefs |> Array.map makePath |> Array.map parseProject
@@ -67,7 +65,11 @@ let rec parseProject projectPath =
     (projectFileName, fileNames, sources, defines |> Array.distinct)
 
 let dedupFileNames fileNames =
-    let nameSet = System.Collections.Generic.HashSet<string>()
+    let comparerIgnoreCase =
+        { new System.Collections.Generic.IEqualityComparer<string> with
+            member __.Equals(x, y) = x.ToLowerInvariant() = y.ToLowerInvariant()
+            member __.GetHashCode(x) = hash (x.ToLowerInvariant()) }
+    let nameSet = System.Collections.Generic.HashSet<string>(comparerIgnoreCase)
     let padName (name: string) =
         let pos = name.LastIndexOf(".")
         let nm = if pos < 0 then name else name.Substring(0, pos)

fcs/fcs-fable/test/bench.fs

@@ -1326,9 +1326,11 @@ module Shim =
             member __.FileStreamCreateShim (fileName: string) = new FileStream(fileName,FileMode.Create,FileAccess.Write,FileShare.Read ,0x1000,false) :> Stream
 
             member __.FileStreamWriteExistingShim (fileName: string) = new FileStream(fileName,FileMode.Open,FileAccess.Write,FileShare.Read ,0x1000,false) :> Stream
-#endif
 
             member __.GetFullPathShim (fileName: string) = System.IO.Path.GetFullPath fileName
+#else //FABLE_COMPILER
+            member __.GetFullPathShim (fileName: string) = fileName
+#endif
 
             member __.IsPathRootedShim (path: string) = Path.IsPathRooted path
 

src/absil/illib.fs

@@ -335,7 +335,11 @@ module Keywords =
                     if String.IsNullOrWhiteSpace(filename) then
                         String.Empty
                     else if filename = stdinMockFilename then
+#if !FABLE_COMPILER
                         System.IO.Directory.GetCurrentDirectory()
+#else //FABLE_COMPILER
+                        "."
+#endif
                     else
                         filename 
                         |> FileSystem.GetFullPathShim (* asserts that path is already absolute *)