Removing the "Typed" suffix from the type providers.

fsprojects · May 3, 2012 · b49492c · b49492c
1 parent 50b20a1
commit b49492c
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/src/FSharpx.TypeProviders/AppSettingsProvider.fs b/src/FSharpx.TypeProviders/AppSettingsProvider.fs
@@ -40,7 +40,7 @@ let addTypedAppSettings (cfg:TypeProviderConfig) (configFileName:string) (tyDef:
     | exn -> tyDef
 
 let typedAppSettings (cfg:TypeProviderConfig) =
-    erasedType<obj> thisAssembly rootNamespace "AppSettingsTyped"
+    erasedType<obj> thisAssembly rootNamespace "AppSettings"
       |> staticParameter "configFileName" (fun typeName configFileName -> 
             erasedType<obj> thisAssembly rootNamespace typeName
                 |> addTypedAppSettings cfg configFileName )
diff --git a/src/FSharpx.TypeProviders/FileSystemProvider.fs b/src/FSharpx.TypeProviders/FileSystemProvider.fs
@@ -30,7 +30,7 @@ let rec annotateAsFileSystemInfo (fileSystemInfo:FileSystemInfo) (ownerTy:Provid
     | exn -> ownerTy
 
 let typedFileSystem =
-    erasedType<obj> thisAssembly rootNamespace "FileSystemTyped"
+    erasedType<obj> thisAssembly rootNamespace "FileSystem"
       |> staticParameter "path" (fun typeName path -> 
             annotateAsFileSystemInfo 
               (new DirectoryInfo(path))

diff --git a/src/FSharpx.TypeProviders/RegexProvider.fs b/src/FSharpx.TypeProviders/RegexProvider.fs
@@ -10,7 +10,7 @@ open FSharpx.TypeProviders.Settings
 open FSharpx.TypeProviders.DSL
 
 let regexTy = 
-    erasedType<Regex> thisAssembly rootNamespace "RegexTyped"
+    erasedType<Regex> thisAssembly rootNamespace "Regex"
     |> staticParameters
         ["pattern", typeof<string>, None]
         (fun typeName parameterValues ->

diff --git a/src/FSharpx.TypeProviders/RegistryProvider.fs b/src/FSharpx.TypeProviders/RegistryProvider.fs
@@ -53,5 +53,5 @@ let subNodes =
        |> Seq.map (fun key -> key,key.Name)
 
 let typedRegistry =
-    erasedType<obj> thisAssembly rootNamespace "RegistryTyped"
+    erasedType<obj> thisAssembly rootNamespace "Registry"
       |++> (Seq.map createRegistryNode subNodes)
diff --git a/tests/FSharpx.TypeProviders.Tests/AppSettings.Tests.fs b/tests/FSharpx.TypeProviders.Tests/AppSettings.Tests.fs
@@ -4,15 +4,15 @@ open NUnit.Framework
 open FSharpx
 open FsUnit
 
-type Settings = AppSettingsTyped<"Test.App.config">
+type Settings = AppSettings<"Test.App.config">
 
 [<Test>] 
 let ``Can return a string from the config file``() =   
     Settings.Test2.GetType() |> should equal typeof<string>   
     Settings.Test2 |> should equal "Some Test Value 5"
 
 [<Test>] 
-let ``Can return an integer from the config file``() =      
+let ``Can return an integer from the config file``() =
     Settings.TestInt.GetType() |> should equal typeof<int>
     Settings.TestInt |> should equal 102
 
@@ -24,4 +24,4 @@ let ``Can return a double from the config file``() =
 [<Test>] 
 let ``Can return a boolean from the config file``() =
     Settings.TestBool.GetType() |> should equal typeof<bool>
-    Settings.TestBool |> should equal true
+    Settings.TestBool |> should equal true
diff --git a/tests/FSharpx.TypeProviders.Tests/FileSystem.Tests.fs b/tests/FSharpx.TypeProviders.Tests/FileSystem.Tests.fs
@@ -4,8 +4,12 @@ open FSharpx
 open NUnit.Framework
 open FsUnit
 
-type T = FileSystemTyped< @"C:\Users\">
+type Users = FileSystem<"C:\\Users\\">
 
 [<Test>] 
 let ``Can create type for users path``() = 
-    T.Path |> should equal @"C:\Users\"
+    Users.Path |> should equal @"C:\Users\"
+
+[<Test>] 
+let ``Can access the default users path``() = 
+    Users.Default.Path |> should equal @"C:\Users\Default"
diff --git a/tests/FSharpx.TypeProviders.Tests/Regex.Tests.fs b/tests/FSharpx.TypeProviders.Tests/Regex.Tests.fs
@@ -4,7 +4,7 @@ open NUnit.Framework
 open FSharpx
 open FsUnit
 
-type PhoneRegex = RegexTyped< @"(?<AreaCode>^\d{3})-(?<PhoneNumber>\d{3}-\d{4}$)">
+type PhoneRegex = Regex< @"(?<AreaCode>^\d{3})-(?<PhoneNumber>\d{3}-\d{4}$)">
 
 [<Test>] 
 let ``Can call typed IsMatch function``() =      

diff --git a/tests/FSharpx.TypeProviders.Tests/Registry.Tests.fs b/tests/FSharpx.TypeProviders.Tests/Registry.Tests.fs
@@ -6,10 +6,10 @@ open FsUnit
 
 [<Test>] 
 let ``Can create type for HKEY_CURRENT_USER``() = 
-    RegistryTyped.HKEY_CURRENT_USER.Path 
-      |> should equal @"HKEY_CURRENT_USER"
+    Registry.HKEY_CURRENT_USER.Path 
+      |> should equal "HKEY_CURRENT_USER"
 
 [<Test>] 
 let ``Can create subtype for HKEY_LOCAL_MACHINE``() = 
-    RegistryTyped.HKEY_LOCAL_MACHINE.SOFTWARE.Path 
-      |> should equal @"HKEY_LOCAL_MACHINE\SOFTWARE"
+    Registry.HKEY_LOCAL_MACHINE.SOFTWARE.Path 
+      |> should equal @"HKEY_LOCAL_MACHINE\SOFTWARE"