[WIP] add replacements for System.Numerics Vector3 / Quaternion

src/Fable.Transforms/FSharp2Fable.fs

@@ -578,6 +578,7 @@ let private transformExpr (com: IFableCompiler) (ctx: Context) fsExpr =
         | _ -> return failwith "makeFunctionArgs returns args with different length"
 
     // Getters and Setters
+
     | BasicPatterns.AnonRecordGet(callee, calleeType, fieldIndex) ->
         let! callee = transformExpr com ctx callee
         let fieldName = calleeType.AnonRecordTypeDetails.SortedFieldNames.[fieldIndex]
@@ -746,6 +747,7 @@ let private transformExpr (com: IFableCompiler) (ctx: Context) fsExpr =
         let typ = makeType com ctx.GenericArgs fsExpr.Type
         return Fable.DecisionTreeSuccess(targetIndex, boundValues, typ)
 
+    // read a static field (Example: Decimal.Zero)
     | BasicPatterns.ILFieldGet(None, ownerTyp, fieldName) ->
         let ownerTyp = makeType com ctx.GenericArgs ownerTyp
         let typ = makeType com ctx.GenericArgs fsExpr.Type
@@ -755,6 +757,23 @@ let private transformExpr (com: IFableCompiler) (ctx: Context) fsExpr =
             return sprintf "Cannot compile ILFieldGet(%A, %s)" ownerTyp fieldName
             |> addErrorAndReturnNull com ctx.InlinePath (makeRangeFrom fsExpr)
 
+    // read a member field (Example: Vector3.X)
+    | BasicPatterns.ILFieldGet(Some callee, calleeType, fieldName)
+       when (Replacements.isILMemberFieldSupported (makeType com ctx.GenericArgs calleeType) fieldName) ->
+        let! callee = transformExpr com ctx callee
+        let typ = makeType com ctx.GenericArgs fsExpr.Type
+        let kind = Fable.FieldGet(fieldName, true, typ)
+        let typ = makeType com ctx.GenericArgs fsExpr.Type
+        return Fable.Get(callee, kind, typ, makeRangeFrom fsExpr)
+
+    // write a member field (example: Vector3.X)
+    | BasicPatterns.ILFieldSet(Some callee, calleeType, fieldName, value)
+       when (Replacements.isILMemberFieldSupported (makeType com ctx.GenericArgs calleeType) fieldName) ->
+        let! callee = transformExpr com ctx callee
+        let! value = transformExpr com ctx value
+        let typ = makeType com ctx.GenericArgs fsExpr.Type
+        return Fable.Set(callee, Fable.FieldSet(fieldName, typ), value, makeRangeFrom fsExpr)
+
     | BasicPatterns.Quote _ ->
         return "Quotes are not currently supported by Fable"
         |> addErrorAndReturnNull com ctx.InlinePath (makeRangeFrom fsExpr)
@@ -763,8 +782,7 @@ let private transformExpr (com: IFableCompiler) (ctx: Context) fsExpr =
     | BasicPatterns.AddressOf(expr) ->
         let! expr = transformExpr com ctx expr
         return expr
-
-    // | BasicPatterns.ILFieldSet _
+
     // | BasicPatterns.AddressSet _
     // | BasicPatterns.ILAsm _
     | expr ->

src/Fable.Transforms/Fable2Babel.fs

@@ -471,6 +471,8 @@ module Util =
             | Replacements.BuiltinEntity kind ->
                 match kind with
                 | Replacements.BclGuid
+                | Replacements.BclVector3
+                | Replacements.BclQuaternion
                 | Replacements.BclTimeSpan
                 | Replacements.BclDateTime
                 | Replacements.BclDateTimeOffset
@@ -870,6 +872,8 @@ module Util =
             | Replacements.BclUInt64 -> jsInstanceof (coreValue com ctx "Long" "default") expr
             | Replacements.BclDecimal -> jsInstanceof (coreValue com ctx "Decimal" "default") expr
             | Replacements.BclBigInt -> coreLibCall com ctx None "BigInt" "isBigInt" [|com.TransformAsExpr(ctx, expr)|]
+            | Replacements.BclQuaternion -> jsInstanceof (coreValue com ctx "Quaternion" "default") expr
+            | Replacements.BclVector3 -> jsInstanceof (coreValue com ctx "Vector3" "default") expr
             | Replacements.BclHashSet _
             | Replacements.BclDictionary _
             | Replacements.FSharpSet _

src/Fable.Transforms/Replacements.fs

@@ -129,6 +129,8 @@ type BuiltinType =
     | BclUInt64
     | BclDecimal
     | BclBigInt
+    | BclQuaternion
+    | BclVector3
     | BclHashSet of Type
     | BclDictionary of key:Type * value:Type
     | FSharpSet of Type
@@ -151,6 +153,8 @@ let (|BuiltinEntity|_|) (ent: FSharpEntity, genArgs) =
     | Some Types.decimal, _
     | Some "Microsoft.FSharp.Core.decimal`1", _ -> Some BclDecimal
     | Some Types.bigint, _ -> Some BclBigInt
+    | Some Types.quaternion, _ -> Some BclQuaternion
+    | Some Types.vector3, _ -> Some BclVector3
     | Some Types.fsharpSet, [t] -> Some(FSharpSet(t))
     | Some Types.fsharpMap, [k;v] -> Some(FSharpMap(k,v))
     | Some Types.hashset, [t] -> Some(BclHashSet(t))
@@ -254,6 +258,8 @@ let coreModFor = function
     | BclDecimal -> "Decimal"
     | BclBigInt -> "BigInt"
     | BclTimeSpan -> "TimeSpan"
+    | BclQuaternion _ -> "Quaternion"
+    | BclVector3 _ -> "Vector3"
     | FSharpSet _ -> "Set"
     | FSharpMap _ -> "Map"
     | FSharpResult _ -> "Option"
@@ -2718,6 +2724,7 @@ let partialApplyAtRuntime t arity (fn: Expr) (args: Expr list) =
     let args = NewArray(ArrayValues args, Any) |> makeValue None
     Helper.CoreCall("Util", "partialApply", t, [makeIntConst arity; fn; args])
 
+/// try to map a static field (e.g. Decimal.Zero)
 let tryField returnTyp ownerTyp fieldName =
     match ownerTyp, fieldName with
     | Builtin BclDecimal, _ ->
@@ -2736,6 +2743,14 @@ let tryField returnTyp ownerTyp fieldName =
         | _ -> None
     | _ -> None
 
+// this is queried when an IL member field is read / written.
+// at the moment member fields are only supported for Vector3 / Quaternion, all other supported BCL types expose properties instead of fields.
+let isILMemberFieldSupported ownerTyp _fieldName =
+    match ownerTyp with
+    | Builtin BclQuaternion
+    | Builtin BclVector3 -> true
+    | _ -> false
+
 let private replacedModules =
   dict [
     "System.Math", operators
@@ -2844,6 +2859,8 @@ let private replacedModules =
     "Microsoft.FSharp.Control.ObservableModule", observable
     Types.type_, types
     "System.Reflection.TypeInfo", types
+    "System.Numerics.Vector3", bclType
+    "System.Numerics.Quaternion", bclType
 ]
 
 let tryCall (com: ICompiler) (ctx: Context) r t (info: CallInfo) (thisArg: Expr option) (args: Expr list) =

src/Fable.Transforms/Transforms.Util.fs

@@ -51,6 +51,8 @@ module Types =
     let [<Literal>] float64 = "System.Double"
     let [<Literal>] decimal = "System.Decimal"
     let [<Literal>] bigint = "System.Numerics.BigInteger"
+    let [<Literal>] quaternion = "System.Numerics.Quaternion"
+    let [<Literal>] vector3 = "System.Numerics.Vector3"
     let [<Literal>] regex = "System.Text.RegularExpressions.Regex"
     let [<Literal>] unit = "Microsoft.FSharp.Core.Unit"
     let [<Literal>] option = "Microsoft.FSharp.Core.FSharpOption`1"

src/fable-library/Fable.Library.fsproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="System.Numerics.fs" />
     <Compile Include="Global.fs" />
     <!-- <Compile Include="BigInt/n.fsi" /> -->
     <Compile Include="BigInt/n.fs" />