Skip to content

Ignore some base constructor calls #2298

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

Merged
merged 1 commit into from
Nov 27, 2020
Merged

Ignore some base constructor calls #2298

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 27 additions & 18 deletions src/Fable.Transforms/Fable2Babel.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,22 +986,31 @@ module Util =
let enumerator = CallExpression(get None (Identifier "this") "GetEnumerator", [||]) :> Expression
BlockStatement [|ReturnStatement(libCall com ctx None "Seq" "toIterator" [|enumerator|])|]

let extractBaseExprFromBaseCall com ctx baseCall =
let baseRef, args, hasSpread =
match baseCall with
| Fable.Call(baseRef, info, _, _) ->
baseRef, info.Args, info.HasSpread
| _ ->
"Unexpected base call expression, please report"
|> addError com [] baseCall.Range
Fable.Value(Fable.UnitConstant, None), [], false

let baseExpr =
match baseRef with
| Fable.IdentExpr id -> typedIdent com ctx id :> Expression
| _ -> transformAsExpr com ctx baseRef
let args = transformCallArgs com ctx hasSpread args
baseExpr, args
let extractBaseExprFromBaseCall (com: IBabelCompiler) (ctx: Context) (baseType: Fable.DeclaredType option) baseCall =
match baseCall, baseType with
| Some (Fable.Call(baseRef, info, _, _)), _ ->
let baseExpr =
match baseRef with
| Fable.IdentExpr id -> typedIdent com ctx id :> Expression
| _ -> transformAsExpr com ctx baseRef
let args = transformCallArgs com ctx info.HasSpread info.Args
Some (baseExpr, args)
| Some (Fable.Value _), Some baseType ->
// let baseEnt = com.GetEntity(baseType.Entity)
// let entityName = FSharp2Fable.Helpers.getEntityDeclarationName com baseType.Entity
// let entityType = FSharp2Fable.Util.getEntityType baseEnt
// let baseRefId = makeTypedIdent entityType entityName
// let baseExpr = (baseRefId |> typedIdent com ctx) :> Expression
// Some (baseExpr, []) // default base constructor
let range = baseCall |> Option.bind (fun x -> x.Range)
sprintf "Ignoring base call for %s" baseType.Entity.FullName |> addWarning com [] range
None
| Some _, _ ->
let range = baseCall |> Option.bind (fun x -> x.Range)
"Unexpected base call expression, please report" |> addError com [] range
None
| None, _ ->
None

let transformObjectExpr (com: IBabelCompiler) ctx (members: Fable.MemberDecl list) baseCall: Expression =
let compileAsClass =
Expand Down Expand Up @@ -1058,7 +1067,7 @@ module Util =

let baseExpr, classMembers =
baseCall
|> Option.map (extractBaseExprFromBaseCall com ctx)
|> extractBaseExprFromBaseCall com ctx None
|> Option.map (fun (baseExpr, baseArgs) ->
let consBody = BlockStatement [|callSuperAsStatement baseArgs|]
let cons = makeClassConstructor [||] consBody
Expand Down Expand Up @@ -1964,7 +1973,7 @@ module Util =

let baseExpr, consBody =
classDecl.BaseCall
|> Option.map (extractBaseExprFromBaseCall com ctx)
|> extractBaseExprFromBaseCall com ctx classEnt.BaseType
|> Option.orElseWith (fun () ->
if classEnt.IsValueType then Some(libValue com ctx "Types" "Record", [])
else None)
Expand Down