Skip to content

Type: File handling #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
baronfel wants to merge 5 commits into from
Closed

Type: File handling #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98007d2
add file upload and get endpoints
baronfel Mar 14, 2018
51ce9f1
do work around filestreams more betterer
baronfel Mar 14, 2018
4d3f9e8
tpsdk update
baronfel Mar 14, 2018
9bffba1
attemp to fix strange error
sergey-tihon Mar 18, 2018
7ca9486
logging
baronfel Apr 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ GITHUB
src/CommonRuntime/NameUtils.fs (0fa6a6799172565f8f49bea5e572c1bb191406ff)
src/CommonRuntime/Pluralizer.fs (0fa6a6799172565f8f49bea5e572c1bb191406ff)
remote: fsprojects/FSharp.TypeProviders.SDK
src/ProvidedTypes.fs (259244bd893f6f266f2f1c043cb6a52eba3cd3ce)
src/ProvidedTypes.fsi (259244bd893f6f266f2f1c043cb6a52eba3cd3ce)
src/ProvidedTypes.fs (f0c4a6300db313eb2616c4f792cd6ae68c255e56)
src/ProvidedTypes.fsi (f0c4a6300db313eb2616c4f792cd6ae68c255e56)
GROUP Build
RESTRICTION: == net461
NUGET
Expand Down
19 changes: 10 additions & 9 deletions src/SwaggerProvider.DesignTime/Configuration.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ open System.Configuration
open System.Collections.Generic

type Logging() =
static member logf (s: string) =
() // File.AppendAllLines("swaggerlog", [|s|])
static member logf f =
Printf.kprintf (fun result -> File.AppendAllLines("swaggerlog", [|result|])) f


/// Returns the Assembly object of SwaggerProvider.Runtime.dll (this needs to
/// work when called from SwaggerProvider.DesignTime.dll)
Expand Down Expand Up @@ -51,13 +52,13 @@ let probingLocations =
try
let rootExe = getAssemblyLocation swaggerRuntimeAssy
let rootDir = Path.GetDirectoryName rootExe
Logging.logf <| sprintf "Root %s" rootDir
Logging.logf "Root %s" rootDir
let config = System.Configuration.ConfigurationManager.OpenExeConfiguration(rootExe)
let pattern = config.AppSettings.Settings.["ProbingLocations"]
if isNull pattern
then []
else
Logging.logf <| sprintf "Probing patterns %A" (pattern.Value.Split(';'))
Logging.logf "Probing patterns %A" (pattern.Value.Split(';'))
let dirs =
[ yield rootDir
let pattern = pattern.Value.Split(';', ',') |> List.ofSeq
Expand All @@ -66,7 +67,7 @@ let probingLocations =
for dir in roots |> searchDirectories (List.ofSeq (pat.Split('/','\\'))) do
if Directory.Exists(dir)
then yield Path.GetFullPath(dir) ]
Logging.logf (sprintf "Found probing directories: %A" dirs)
Logging.logf "Found probing directories: %A" dirs
dirs
with :? ConfigurationErrorsException | :? KeyNotFoundException -> []

Expand All @@ -85,7 +86,7 @@ let resolveReferencedAssembly (asmName:string) =
|> Seq.tryFind (fun a -> AssemblyName.ReferenceMatchesDefinition(fullName, a.GetName()))
match loadedAsm with
| Some asm ->
Logging.logf (sprintf "found assembly %s" asm.FullName)
Logging.logf "found assembly %s" asm.FullName
asm
| None ->
// Otherwise, search the probing locations for a DLL file
Expand All @@ -96,7 +97,7 @@ let resolveReferencedAssembly (asmName:string) =
let asm = probingLocations |> Seq.tryPick (fun dir ->
let library = Path.Combine(dir, libraryName+".dll")
if File.Exists(library) then
Logging.logf <| sprintf "Found assembly, checking version! (%s)" library
Logging.logf "Found assembly, checking version! (%s)" library
// We do a ReflectionOnlyLoad so that we can check the version
let refAssem = Assembly.ReflectionOnlyLoadFrom(library)
// If it matches, we load the actual assembly
Expand All @@ -107,8 +108,8 @@ let resolveReferencedAssembly (asmName:string) =
Logging.logf "...version mismatch, skipping"
None
else
Logging.logf <| sprintf "Didn't find library %s" libraryName
Logging.logf "Didn't find library %s" libraryName
None)

if asm = None then Logging.logf <| sprintf "Assembly not found! %s" asmName
if asm = None then Logging.logf "Assembly not found! %s" asmName
defaultArg asm null
82 changes: 45 additions & 37 deletions src/SwaggerProvider.DesignTime/DefinitionCompiler.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ open SwaggerProvider.Internal
open Microsoft.FSharp.Quotations

type DefinitionPath =
{
{
Namespace: string list
RequestedTypeName: string
ProvidedTypeNameCandidate: string
Expand All @@ -26,9 +26,9 @@ type DefinitionPath =
elif Char.IsLetterOrDigit definitionPath.[ind] || definitionPath.[ind] = nsSeparator then getCharInTypeName (ind+1)
else ind
let lastDot = definitionPath.LastIndexOf(nsSeparator, getCharInTypeName 0)
if lastDot < 0
if lastDot < 0
then {Namespace = []; RequestedTypeName = definitionPath; ProvidedTypeNameCandidate = nicePascalName definitionPath}
else
else
let nsPath = definitionPath.Substring(0, lastDot).Split([|nsSeparator|], StringSplitOptions.RemoveEmptyEntries) |> List.ofArray
let tyName = definitionPath.Substring(lastDot+1)
{Namespace = nsPath; RequestedTypeName = tyName; ProvidedTypeNameCandidate = nicePascalName tyName}
Expand All @@ -39,13 +39,14 @@ type NamespaceEntry =
| ProvidedType of ProvidedTypeDefinition
| Namespace of NamespaceAbstraction
| NestedType of ProvidedTypeDefinition * NamespaceAbstraction

and NamespaceAbstraction (name:string) =
let providedTys = Collections.Generic.Dictionary<string,NamespaceEntry>()
let updateReservation opName tyName updateFunc =
match providedTys.TryGetValue tyName with
| true, Reservation -> updateFunc()
| false, _ -> failwithf "Cannot %s '%s' because name was not reserved" opName tyName
| _, value -> failwithf "Cannot %s '%s' because the slot is used by %A" opName tyName value
| _, value -> failwithf "Cannot %s '%s' because the slot is used by %A" opName tyName value

/// Namespace name
member __.Name = name
Expand All @@ -54,7 +55,7 @@ and NamespaceAbstraction (name:string) =
let rec findUniq prefix i =
let newName = sprintf "%s%s" prefix (if i=0 then "" else i.ToString())
if not <| providedTys.ContainsKey newName
then newName
then newName
else findUniq prefix (i+1)
let newName = findUniq (namePref+nameSuffix) 0
providedTys.Add(newName, Reservation)
Expand All @@ -71,7 +72,7 @@ and NamespaceAbstraction (name:string) =
| true, Reservation -> providedTys.[tyName] <- ProvidedType ty
| true, Namespace ns -> providedTys.[tyName] <- NestedType(ty, ns)
| false, _ -> failwithf "Cannot register the type '%s' because name was not reserved" tyName
| _, value -> failwithf "Cannot register the type '%s' because the slot is used by %A" tyName value
| _, value -> failwithf "Cannot register the type '%s' because the slot is used by %A" tyName value
/// Get or create sub-namespace
member __.GetOrCreateNamespace name =
match providedTys.TryGetValue name with
Expand Down Expand Up @@ -106,7 +107,7 @@ and NamespaceAbstraction (name:string) =
| Namespace ns ->
let types = ns.GetProvidedTypes()
if types.Length = 0 then None
else
else
let nsTy = ProvidedTypeDefinition(ns.Name, Some typeof<obj>, isErased = false)
nsTy.AddMember <| ProvidedConstructor([], invokeCode = fun _ -> <@@ () @@>) // hack
nsTy.AddMembers <| types
Expand All @@ -116,52 +117,55 @@ and NamespaceAbstraction (name:string) =
Some ty)

/// Object for compiling definitions.
type DefinitionCompiler (schema:SwaggerObject, provideNullable) as this =
type DefinitionCompiler (schema: SwaggerObject, provideNullable) as this =
let definitionToSchemaObject = Map.ofSeq schema.Definitions
let definitionToType = Collections.Generic.Dictionary<_,_>()
let nsRoot = NamespaceAbstraction("Root")
let nsOps = nsRoot.GetOrCreateNamespace "OperationTypes"

let generateProperty (scope:UniqueNameGenerator) propName ty =
let propertyName = scope.MakeUnique <| nicePascalName propName
let providedField =
let providedField =
let fieldName = sprintf "_%c%s" (Char.ToLower propertyName.[0]) (propertyName.Substring(1))
ProvidedField(fieldName, ty)
let providedProperty =
ProvidedProperty(propertyName, ty,
getterCode = (fun [this] -> Expr.FieldGetUnchecked (this, providedField)),
setterCode = (fun [this;v] -> Expr.FieldSetUnchecked(this, providedField, v)))
setterCode = (fun [this;v] -> Expr.FieldSetUnchecked (this, providedField, v)))

if propName <> propertyName then
providedProperty.AddCustomAttribute
<| RuntimeHelpers.getPropertyNameAttribute propName
// Override the serialized name by setting a Json-serialization attribute to control the name
providedProperty.AddCustomAttribute <| RuntimeHelpers.getPropertyNameAttribute propName
providedField, providedProperty

let registerInNsAndInDef tyDefName (ns:NamespaceAbstraction) (name, ty: ProvidedTypeDefinition) =
if definitionToType.ContainsKey tyDefName
then failwithf "Second time compilation of type defition '%s'. This is a bug in DefinitionCompiler" tyDefName
else definitionToType.Add(tyDefName, ty)
ns.RegisterType(name, ty)

let rec compileDefinition (tyDefName:string) : Type=
let rec compileDefinition (tyDefName:string): Type=
match definitionToType.TryGetValue tyDefName with
| true, ty -> ty :> Type
| false, _ ->
match definitionToSchemaObject.TryFind tyDefName with
| Some(def) ->
| Some def ->
let ns, tyName = tyDefName |> DefinitionPath.Parse |> nsRoot.Resolve

let ty = compileSchemaObject ns tyName def true (registerInNsAndInDef tyDefName ns)
ty :> Type
| None when tyDefName.StartsWith("#/definitions/") ->
failwithf "Cannot find definition '%s' in schema definitions %A"
failwithf "Cannot find definition '%s' in schema definitions %A"
tyDefName (definitionToType.Keys |> Seq.toArray)
| None ->
failwithf "Cannot find definition '%s' (references to relative documents are not supported yet)" tyDefName
and compileSchemaObject (ns:NamespaceAbstraction) tyName (schemaObj:SchemaObject) isRequired registerNew =

and compileSchemaObject (ns: NamespaceAbstraction) tyName (schemaObj: SchemaObject) isRequired registerNew =
let compileNewObject (properties:DefinitionProperty[]) =
if properties.Length = 0
if properties.Length = 0
then
if not <| isNull tyName then
ns.MarkTypeAsNameAlias tyName
ns.MarkTypeAsNameAlias tyName
typeof<obj>
else
if isNull tyName then
Expand Down Expand Up @@ -194,36 +198,37 @@ type DefinitionCompiler (schema:SwaggerObject, provideNullable) as this =
ty.AddMember <| ProvidedConstructor([], invokeCode = fun _ -> <@@ () @@>)
// Add full-init constructor
let ctorParams, fields =
let required, optional =
let required, optional =
List.zip (List.ofArray properties) members
|> List.partition (fun (x,_) -> x.IsRequired)
(required @ optional)
|> List.map(fun (x,(f,p)) ->
|> List.map(fun (x,(f,p)) ->
let paramName = niceCamelName p.Name
let prParam =
let prParam =
if x.IsRequired
then ProvidedParameter(paramName, f.FieldType)
then ProvidedParameter(paramName, f.FieldType)
else
let paramDefaultValue = this.GetDefaultValue f.FieldType
ProvidedParameter(paramName, f.FieldType, false, paramDefaultValue)
prParam, f)
|> List.unzip

ty.AddMember <| ProvidedConstructor(ctorParams, invokeCode = fun args ->
let (this,args) =
let (this,args) =
match args with
| x::xs -> (x,xs)
| _ -> failwith "Wrong constructor arguments"
List.zip args fields
|> List.map (fun (arg, f) ->
Expr.FieldSetUnchecked(this, f, arg))
|> List.rev
|> List.fold (fun a b ->
|> List.fold (fun a b ->
Expr.Sequential(a, b)) (<@@ () @@>)
)

// Override `.ToString()`
let toStr =
ProvidedMethod("ToString", [], typeof<string>, isStatic = false,
let toStr =
ProvidedMethod("ToString", [], typeof<string>, isStatic = false,
invokeCode = fun args ->
let this = args.[0]
let (pNames, pValues) =
Expand All @@ -246,7 +251,7 @@ type DefinitionCompiler (schema:SwaggerObject, provideNullable) as this =
then
let elements =
[| for x in (v :?> Collections.IEnumerable) do
yield formatValue x
yield formatValue x
|]
String.Format("[{0}]", String.Join("; ", elements))
else v.ToString()
Expand All @@ -255,19 +260,21 @@ type DefinitionCompiler (schema:SwaggerObject, provideNullable) as this =
String.Format("{0}={1}",pNames.[i], formatValue v))
String.Format("{{{0}}}", String.Join("; ",strs))
@@>)

toStr.SetMethodAttrs(MethodAttributes.Public ||| MethodAttributes.Virtual)

let objToStr = (typeof<obj>).GetMethod("ToString",[||])
ty.DefineMethodOverride(toStr, objToStr)
ty.AddMember <| toStr

ty :> Type

let tyType =
match schemaObj with
| Reference path ->
ns.ReleaseNameReservation tyName
compileDefinition path
| Object props ->
| Object props ->
compileNewObject props
| _ ->
ns.MarkTypeAsNameAlias tyName
Expand All @@ -280,22 +287,23 @@ type DefinitionCompiler (schema:SwaggerObject, provideNullable) as this =
| Double -> typeof<double>
| String -> typeof<string>
| Date | DateTime -> typeof<DateTime>
| File -> typeof<byte>.MakeArrayType(1)
| File -> typeof<seq<string * IO.Stream>> // fileName * fileData
| Enum _ -> typeof<string> //NOTE: find better type
| Array eTy ->
| Array eTy ->
(compileSchemaObject ns (ns.ReserveUniqueName tyName "Item") eTy true ns.RegisterType).MakeArrayType(1)
| Dictionary eTy ->
ProvidedTypeBuilder.MakeGenericType(typedefof<Map<string, obj>>,
| Dictionary eTy ->
ProvidedTypeBuilder.MakeGenericType(typedefof<Map<string, obj>>,
[typeof<string>; compileSchemaObject ns (ns.ReserveUniqueName tyName "Item") eTy false ns.RegisterType])
| Reference _
| Reference _
| Object _ -> failwith "This case should be catched by other match statement"

if isRequired then tyType
else
if provideNullable then
else
if provideNullable then
if tyType.IsValueType
then ProvidedTypeBuilder.MakeGenericType(typedefof<Nullable<int>>, [tyType])
else tyType
else
else
ProvidedTypeBuilder.MakeGenericType(typedefof<Option<obj>>, [tyType])

// Precompile types defined in the `definitions` part of the schema
Expand Down
Loading