Skip to content
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

Jump to bottom

Re-implement custom format support for JavaScript/TypeScript #3772

Merged
merged 4 commits into from
Feb 29, 2024
Merged

Re-implement custom format support for JavaScript/TypeScript #3772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8eef5b8
Fix quicktest tsconfig
MangelMaxime Feb 29, 2024
ef6d50a
Use native APIs for padding numbers with zeros
MangelMaxime Feb 29, 2024
8e80705
Re-implement custom format for DateTime & various improvements
MangelMaxime Feb 29, 2024
f82fb96
Comment timezone dependent tests
MangelMaxime Feb 29, 2024
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
13 changes: 9 additions & 4 deletions src/Fable.Cli/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

#### All
* [GH-3769](https://github.com/fable-compiler/Fable/pull/3769) [All] Local plugin build does not run indefinably. (by @nojaf)
* [GH-3769](https://github.com/fable-compiler/Fable/pull/3769) [JS/TS] Types hidden by signature files should not be exported. (by @nojaf)
* [GH-3772](https://github.com/fable-compiler/Fable/pull/3772) [JS/TS] Re-implement `DateTime.ToString` custom format handling (by @MangelMaxime)

* [GH-3769](https://github.com/fable-compiler/Fable/pull/3769) Local plugin build does not run indefinably. (by @nojaf)
It now supports all custom format specifiers, and behave as if `CultureInfo.InvariantCulture` was used (Fable does not support Globalization).
* [GH-3772](https://github.com/fable-compiler/Fable/pull/3772) [JS/TS] Make compilation fails if calling `DateTime` constructor with microseconds (by @MangelMaxime)

#### JavaScript
JavaScript `Date` does not support microseconds, we need to wait for `Temporal` to be widely supported before reconsidering this.

### Changed

* [GH-3769](https://github.com/fable-compiler/Fable/pull/3769) Types hidden by signature files should not be exported. (by @nojaf)
* [GH-3772](https://github.com/fable-compiler/Fable/pull/3772) [JS/TS] Split replacement for `DateTime` and `DateTimeOffset` (by @MangelMaxime)

## 4.13.0 - 2024-02-13

Expand Down
94 changes: 67 additions & 27 deletions src/Fable.Transforms/Replacements.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2840,15 +2840,8 @@
| "TryParse", input :: _culture :: defVal :: _ -> [ input; defVal ]
| _ -> args

let dates (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Expr option) (args: Expr list) =
let getTime (e: Expr) =
Helper.InstanceCall(e, "getTime", t, [])

let moduleName =
if i.DeclaringEntityFullName = Types.datetime then
"Date"
else
"DateOffset"
let dateTime (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Expr option) (args: Expr list) =
let moduleName = "Date"

match i.CompiledName with
| ".ctor" ->
Expand All @@ -2857,9 +2850,6 @@
| ExprType(Number(Int64, _)) :: _ ->
Helper.LibCall(com, moduleName, "fromTicks", t, args, i.SignatureArgTypes, ?loc = r)
|> Some
| ExprType(DeclaredType(e, [])) :: _ when e.FullName = Types.datetime ->
Helper.LibCall(com, "DateOffset", "fromDate", t, args, i.SignatureArgTypes, ?loc = r)
|> Some
| _ ->
let last = List.last args

Expand All @@ -2870,33 +2860,82 @@
let argTypes = (List.take 6 i.SignatureArgTypes) @ [ Int32.Number; last.Type ]

Helper.LibCall(com, "Date", "create", t, args, argTypes, ?loc = r) |> Some

// JavaScript Date doesn't support microseconds precision
| 8, Number(Int32, NumberInfo.Empty) ->
"JavaScript Date with doesn't support microseconds precision"
|> addError com ctx.InlinePath r

None
// | 8, Number(_, NumberInfo.IsEnum ent) when ent.FullName = "System.DateTimeKind" ->
// "JavaScript Date with doesn't support microseconds precision" |> addError com ctx.InlinePath r
// None

| _ ->
Helper.LibCall(com, moduleName, "create", t, args, i.SignatureArgTypes, ?loc = r)
|> Some
| "ToString" ->
Helper.LibCall(com, "Date", "toString", t, args, i.SignatureArgTypes, ?thisArg = thisArg, ?loc = r)
|> Some
| "get_Kind"
| "get_Offset" as meth ->
let moduleName =
if meth = "get_Kind" then
"Date"
else
"DateOffset"
// | "get_Kind" ->
// Helper.LibCall(com, moduleName, "kind", t, [ thisArg.Value ], [ thisArg.Value.Type ], ?loc = r)
// |> Some
// let y = DateTime.Now.UtcTicks
// let x = DateTimeOffset.Now.UtcTicks
// failwith "Not implemented"

| "get_Ticks" ->
Helper.LibCall(com, "Date", "getTicks", t, [ thisArg.Value ], [ thisArg.Value.Type ], ?loc = r)
Dismissed Show dismissed Hide dismissed
Dismissed Show dismissed Hide dismissed
|> Some
| meth ->
let args = ignoreFormatProvider meth args
let meth = Naming.removeGetSetPrefix meth |> Naming.lowerFirst

Helper.LibCall(com, moduleName, meth, t, [ thisArg.Value ], [ thisArg.Value.Type ], ?loc = r)
Helper.LibCall(com, moduleName, meth, t, args, i.SignatureArgTypes, ?thisArg = thisArg, ?loc = r)
|> Some


let dateTimeOffset (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Expr option) (args: Expr list) =
let moduleName = "DateOffset"

match i.CompiledName with
| ".ctor" ->
match args with
| [] -> Helper.LibCall(com, moduleName, "minValue", t, [], [], ?loc = r) |> Some
| ExprType(Number(Int64, _)) :: _ ->
Helper.LibCall(com, moduleName, "fromTicks", t, args, i.SignatureArgTypes, ?loc = r)
|> Some
| ExprType(DeclaredType(e, [])) :: _ when e.FullName = Types.datetime ->
Helper.LibCall(com, moduleName, "fromDate", t, args, i.SignatureArgTypes, ?loc = r)
|> Some
| _ ->
let last = List.last args

match args.Length, last.Type with
| 7, Number(_, NumberInfo.IsEnum ent) when ent.FullName = "System.DateTimeKind" ->
let args = (List.take 6 args) @ [ makeIntConst 0; last ]

let argTypes = (List.take 6 i.SignatureArgTypes) @ [ Int32.Number; last.Type ]

Helper.LibCall(com, "Date", "create", t, args, argTypes, ?loc = r) |> Some

| _ ->
Helper.LibCall(com, moduleName, "create", t, args, i.SignatureArgTypes, ?loc = r)
|> Some
| "ToString" ->
Helper.LibCall(com, "Date", "toString", t, args, i.SignatureArgTypes, ?thisArg = thisArg, ?loc = r)
|> Some
| "get_Offset" ->
Helper.LibCall(com, moduleName, "offset", t, [ thisArg.Value ], [ thisArg.Value.Type ], ?loc = r)
Dismissed Show dismissed Hide dismissed
Dismissed Show dismissed Hide dismissed
|> Some
// DateTimeOffset
| "get_LocalDateTime" ->
Helper.LibCall(com, "DateOffset", "toLocalTime", t, [ thisArg.Value ], [ thisArg.Value.Type ], ?loc = r)
|> Some
| "get_UtcDateTime" ->
Helper.LibCall(com, "DateOffset", "toUniversalTime", t, [ thisArg.Value ], [ thisArg.Value.Type ], ?loc = r)
|> Some
| "get_DateTime" ->
let kind = System.DateTimeKind.Unspecified |> int |> makeIntConst
let kind = DateTimeKind.Unspecified |> int |> makeIntConst

Helper.LibCall(
com,
Expand All @@ -2921,6 +2960,7 @@
Helper.LibCall(com, moduleName, meth, t, args, i.SignatureArgTypes, ?thisArg = thisArg, ?loc = r)
|> Some


let dateOnly (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Expr option) (args: Expr list) =
match i.CompiledName with
| ".ctor" when args.Length = 4 ->
Expand Down Expand Up @@ -3878,8 +3918,8 @@
"System.Console", console
"System.Diagnostics.Debug", debug
"System.Diagnostics.Debugger", debug
Types.datetime, dates
Types.datetimeOffset, dates
Types.datetime, dateTime
Types.datetimeOffset, dateTimeOffset
Types.dateOnly, dateOnly
Types.timeOnly, timeOnly
Types.timespan, timeSpans
Expand Down Expand Up @@ -4054,11 +4094,11 @@
| Builtin kind ->
match kind with
| BclGuid -> Some(Types.guid, guids, [])
| BclDateTime -> Some(Types.datetime, dates, [])
| BclDateTimeOffset -> Some(Types.datetimeOffset, dates, [])
| BclDateTime -> Some(Types.datetime, dateTime, [])
| BclDateTimeOffset -> Some(Types.datetimeOffset, dateTimeOffset, [])
| BclDateOnly -> Some(Types.dateOnly, dateOnly, [])
| BclTimeOnly -> Some(Types.timeOnly, timeOnly, [])
| BclTimer -> Some("System.Timers.Timer", timers, [])
| BclTimer -> Some(Types.timer, timers, [])
| BclTimeSpan -> Some(Types.timespan, timeSpans, [])
| BclHashSet genArg -> Some(Types.hashset, hashSets, [ genArg ])
| BclDictionary(key, value) -> Some(Types.dictionary, dictionaries, [ key; value ])
Expand Down
3 changes: 3 additions & 0 deletions src/Fable.Transforms/Transforms.Util.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ module Types =
[<Literal>]
let timeOnly = "System.TimeOnly"

[<Literal>]
let timer = "System.Timers.Timer"

[<Literal>]
let int8 = "System.SByte"

Expand Down
Loading
Loading