[JS/TS] Fix fable-compiler#4240 Missing DateTime constructor (fable-compiler#4242)

Author: ncave

src/Fable.Cli/CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+* [JS/TS] Fix #4240 Missing DateTime constructor (by @ncave)
 * [PHP] Fix php import extensions (by @MangelMaxime)
 * [TS] Fix #3973 Typescript imports file extension (by @ncave)
 * [TS] Fix support for abstract classes and members (by @ncave)

src/Fable.Compiler/CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+* [JS/TS] Fix #4240 Missing DateTime constructor (by @ncave)
 * [PHP] Fix php import extensions (by @MangelMaxime)
 * [TS] Fix #3973 Typescript imports file extension (by @ncave)
 * [TS] Fix support for abstract classes and members (by @ncave)

src/Fable.Transforms/Replacements.fs

@@ -3113,6 +3113,9 @@ let dateTime (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Expr op
         | ExprType(Number(Int64, _)) :: _ ->
             Helper.LibCall(com, moduleName, "fromTicks", t, args, i.SignatureArgTypes, ?loc = r)
             |> Some
+        | ExprType(DeclaredType(ent, [])) :: _ when ent.FullName = Types.dateOnly ->
+            Helper.LibCall(com, moduleName, "fromDateTime", t, args, i.SignatureArgTypes, ?loc = r)
+            |> Some
         | _ ->
             let last = List.last args
 
@@ -3167,6 +3170,9 @@ let dateTimeOffset (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: E
         | ExprType(DeclaredType(ent, [])) :: _ when ent.FullName = Types.datetime ->
             Helper.LibCall(com, moduleName, "fromDate", t, args, i.SignatureArgTypes, ?loc = r)
             |> Some
+        | ExprType(DeclaredType(ent, [])) :: _ when ent.FullName = Types.dateOnly ->
+            Helper.LibCall(com, moduleName, "fromDateTime", t, args, i.SignatureArgTypes, ?loc = r)
+            |> Some
         | _ ->
             match args.Length with
             | 7

src/fable-library-ts/Date.ts

@@ -200,7 +200,7 @@ function dateToStringWithCustomFormat(date: Date, format: string, utc: boolean)
                 result += "Z";
                 break;
               case DateTimeKind.Local:
-                result += dateOffsetToString(localizedDate.getTimezoneOffset() * -60000);
+                result += dateOffsetToString(localizedDate.getTimezoneOffset() * -60_000);
                 break;
               case DateTimeKind.Unspecified:
                 break;
@@ -293,10 +293,10 @@ function dateToStringWithCustomFormat(date: Date, format: string, utc: boolean)
             utcOffsetText = "+00:00";
             break;
           case DateTimeKind.Local:
-            utcOffsetText = dateOffsetToString(localizedDate.getTimezoneOffset() * -60000);
+            utcOffsetText = dateOffsetToString(localizedDate.getTimezoneOffset() * -60_000);
             break;
           case DateTimeKind.Unspecified:
-            utcOffsetText = dateOffsetToString(toLocalTime(localizedDate).getTimezoneOffset() * -60000);
+            utcOffsetText = dateOffsetToString(toLocalTime(localizedDate).getTimezoneOffset() * -60_000);
             break;
         }
 
@@ -374,7 +374,7 @@ export function dateOffsetToString(offset: number) {
   const isMinus = offset < 0;
   offset = Math.abs(offset);
   const hours = ~~(offset / 3600000);
-  const minutes = (offset % 3600000) / 60000;
+  const minutes = (offset % 3600000) / 60_000;
   return (isMinus ? "-" : "+") +
     padWithZeros(hours, 2) + ":" +
     padWithZeros(minutes, 2);
@@ -393,7 +393,7 @@ function dateToISOString(d: IDateTime, utc: boolean) {
       padWithZeros(d.getMinutes(), 2) + ":" +
       padWithZeros(d.getSeconds(), 2) + "." +
       padWithZeros(d.getMilliseconds(), 3) +
-      (printOffset ? dateOffsetToString(d.getTimezoneOffset() * -60000) : "");
+      (printOffset ? dateOffsetToString(d.getTimezoneOffset() * -60_000) : "");
   }
 }
 
@@ -490,6 +490,11 @@ export function fromTicks(ticks: number | bigint, kind?: DateTimeKind) {
   return date;
 }
 
+export function fromDateTime(dateOnly: IDateTime, timeOnly: number, kind?: DateTimeKind) {
+  const d = DateTime(dateOnly.getTime() + timeOnly, kind);
+  return DateTime(d.getTime() - dateOffset(d), kind);
+}
+
 export function fromDateTimeOffset(date: IDateTimeOffset, kind: DateTimeKind) {
   switch (kind) {
     case DateTimeKind.Utc: return DateTime(date.getTime(), DateTimeKind.Utc);
@@ -574,7 +579,7 @@ export function parseRaw(input: string): [Date, Offset] {
       }
       date = new Date(baseDate.getTime() + timeInSeconds * 1000);
       // correct for daylight savings time
-      date = new Date(date.getTime() + (date.getTimezoneOffset() - baseDate.getTimezoneOffset()) * 60000);
+      date = new Date(date.getTime() + (date.getTimezoneOffset() - baseDate.getTimezoneOffset()) * 60_000);
     } else {
       fail();
     }
@@ -664,7 +669,7 @@ export function specifyKind(d: IDateTime, kind: DateTimeKind) {
 
 export function timeOfDay(d: IDateTime) {
   return hour(d) * 3600000
-    + minute(d) * 60000
+    + minute(d) * 60_000
     + second(d) * 1000
     + millisecond(d);
 }
@@ -721,7 +726,7 @@ export function add(d: IDateTime, ts: number) {
     const oldTzOffset = d.getTimezoneOffset();
     const newTzOffset = newDate.getTimezoneOffset();
     return oldTzOffset !== newTzOffset
-      ? DateTime(newDate.getTime() + (newTzOffset - oldTzOffset) * 60000, d.kind)
+      ? DateTime(newDate.getTime() + (newTzOffset - oldTzOffset) * 60_000, d.kind)
       : newDate;
   } else {
     return newDate;
@@ -737,7 +742,7 @@ export function addHours(d: IDateTime, v: number) {
 }
 
 export function addMinutes(d: IDateTime, v: number) {
-  return add(d, v * 60000);
+  return add(d, v * 60_000);
 }
 
 export function addSeconds(d: IDateTime, v: number) {

src/fable-library-ts/DateOffset.ts

@@ -21,7 +21,7 @@ import { Exception, compareDates, DateTimeKind, IDateTime, IDateTimeOffset, padW
 export default function DateTimeOffset(value: number, offset?: number) {
   checkOffsetInRange(offset);
   const d = new Date(value) as IDateTimeOffset;
-  d.offset = offset != null ? offset : new Date().getTimezoneOffset() * -60000;
+  d.offset = offset != null ? offset : new Date().getTimezoneOffset() * -60_000;
   return d;
 }
 
@@ -31,7 +31,7 @@ export function offset(value: IDateTimeOffset): number {
 
 function checkOffsetInRange(offset?: number) {
   if (offset != null && offset !== 0) {
-    if (offset % 60000 !== 0) {
+    if (offset % 60_000 !== 0) {
       throw new Exception("Offset must be specified in whole minutes.");
     }
     if (Math.abs(offset / 3600000) > 14) {
@@ -72,6 +72,10 @@ export function fromDate(date: IDateTime, offset?: number) {
   return DateTimeOffset(date.getTime(), offset2);
 }
 
+export function fromDateTime(dateOnly: IDateTime, timeOnly: number, offset: number) {
+  return DateTimeOffset(dateOnly.getTime() - offset + timeOnly, offset);
+}
+
 export function fromTicks(ticks: int64, offset: number) {
   const ms = ticksToUnixEpochMilliseconds(ticks) - offset;
   return DateTimeOffset(ms, offset);
@@ -102,8 +106,8 @@ export function maxValue() {
 export function parse(str: string): IDateTimeOffset {
   const [date, offsetMatch] = parseRaw(str);
   const offset = offsetMatch == null
-    ? date.getTimezoneOffset() * -60000
-    : (offsetMatch === "Z" ? 0 : offsetMatch * 60000);
+    ? date.getTimezoneOffset() * -60_000
+    : (offsetMatch === "Z" ? 0 : offsetMatch * 60_000);
   return DateTimeOffset(date.getTime(), offset);
 }
 
@@ -125,23 +129,9 @@ export function create(
     ms = 0;
   }
   checkOffsetInRange(offset);
-  let date: Date;
-  if (offset === 0) {
-    date = new Date(Date.UTC(year, month - 1, day, h, m, s, ms));
-    if (year <= 99) {
-      date.setUTCFullYear(year, month - 1, day);
-    }
-  } else {
-    const str =
-      padWithZeros(year, 4) + "-" +
-      padWithZeros(month, 2) + "-" +
-      padWithZeros(day, 2) + "T" +
-      padWithZeros(h, 2) + ":" +
-      padWithZeros(m, 2) + ":" +
-      padWithZeros(s, 2) + "." +
-      padWithZeros(ms, 3) +
-      dateOffsetToString(offset);
-    date = new Date(str);
+  let date = new Date(Date.UTC(year, month - 1, day, h, m, s, ms) - offset);
+  if (year <= 99) {
+    date.setUTCFullYear(year, month - 1, day);
   }
   const dateValue = date.getTime();
   if (isNaN(dateValue)) {
@@ -152,12 +142,13 @@ export function create(
 
 export function now() {
   const date = new Date();
-  const offset = date.getTimezoneOffset() * -60000;
-  return DateTimeOffset(date.getTime(), offset);
+  const offset = date.getTimezoneOffset() * -60_000;
+  return DateTimeOffset(date.getTime() - offset, offset);
 }
 
 export function utcNow() {
-  const date = now();
+  const date = new Date();
+  // const offset = date.getTimezoneOffset() * -60_000;
   return DateTimeOffset(date.getTime(), 0);
 }
 
@@ -166,60 +157,60 @@ export function toUniversalTime(date: IDateTimeOffset): Date {
 }
 
 export function toLocalTime(date: IDateTimeOffset): Date {
-  return DateTime(date.getTime() + offset(now()), DateTimeKind.Local);
+  return DateTime(date.getTime(), DateTimeKind.Local);
 }
 
 export function localDateTime(date: IDateTimeOffset) : Date {
   return DateTime(date.getTime(), DateTimeKind.Local);
 }
 
 export function timeOfDay(d: IDateTimeOffset) {
-  const d2 = new Date(d.getTime() + (d.offset ?? 0));
+  const d2 = new Date(d.getTime() + offset(d));
   return d2.getUTCHours() * 3600000
-    + d2.getUTCMinutes() * 60000
+    + d2.getUTCMinutes() * 60_000
     + d2.getUTCSeconds() * 1000
     + d2.getUTCMilliseconds();
 }
 
 export function date(d: IDateTimeOffset) {
-  const d2 = new Date(d.getTime() + (d.offset ?? 0));
+  const d2 = new Date(d.getTime() + offset(d));
   return createDate(d2.getUTCFullYear(), d2.getUTCMonth() + 1, d2.getUTCDate(), 0, 0, 0, 0);
 }
 
 export function day(d: IDateTimeOffset) {
-  return new Date(d.getTime() + (d.offset ?? 0)).getUTCDate();
+  return new Date(d.getTime() + offset(d)).getUTCDate();
 }
 
 export function hour(d: IDateTimeOffset) {
-  return new Date(d.getTime() + (d.offset ?? 0)).getUTCHours();
+  return new Date(d.getTime() + offset(d)).getUTCHours();
 }
 
 export function millisecond(d: IDateTimeOffset) {
-  return new Date(d.getTime() + (d.offset ?? 0)).getUTCMilliseconds();
+  return new Date(d.getTime() + offset(d)).getUTCMilliseconds();
 }
 
 export function minute(d: IDateTimeOffset) {
-  return new Date(d.getTime() + (d.offset ?? 0)).getUTCMinutes();
+  return new Date(d.getTime() + offset(d)).getUTCMinutes();
 }
 
 export function month(d: IDateTimeOffset) {
-  return new Date(d.getTime() + (d.offset ?? 0)).getUTCMonth() + 1;
+  return new Date(d.getTime() + offset(d)).getUTCMonth() + 1;
 }
 
 export function second(d: IDateTimeOffset) {
-  return new Date(d.getTime() + (d.offset ?? 0)).getUTCSeconds();
+  return new Date(d.getTime() + offset(d)).getUTCSeconds();
 }
 
 export function year(d: IDateTimeOffset) {
-  return new Date(d.getTime() + (d.offset ?? 0)).getUTCFullYear();
+  return new Date(d.getTime() + offset(d)).getUTCFullYear();
 }
 
 export function dayOfWeek(d: IDateTimeOffset) {
-  return new Date(d.getTime() + (d.offset ?? 0)).getUTCDay();
+  return new Date(d.getTime() + offset(d)).getUTCDay();
 }
 
 export function dayOfYear(d: IDateTimeOffset) {
-  const d2 = new Date(d.getTime() + (d.offset ?? 0));
+  const d2 = new Date(d.getTime() + offset(d));
   const _year = d2.getUTCFullYear();
   const _month = d2.getUTCMonth() + 1;
   let _day = d2.getUTCDate();
@@ -230,7 +221,7 @@ export function dayOfYear(d: IDateTimeOffset) {
 }
 
 export function add(d: IDateTimeOffset, ts: number) {
-  return DateTimeOffset(d.getTime() + ts, (d.offset ?? 0));
+  return DateTimeOffset(d.getTime() + ts, offset(d));
 }
 
 export function addDays(d: IDateTimeOffset, v: number) {
@@ -242,7 +233,7 @@ export function addHours(d: IDateTimeOffset, v: number) {
 }
 
 export function addMinutes(d: IDateTimeOffset, v: number) {
-  return add(d, v * 60000);
+  return add(d, v * 60_000);
 }
 
 export function addSeconds(d: IDateTimeOffset, v: number) {
@@ -263,11 +254,11 @@ export function addYears(d: IDateTimeOffset, v: number) {
   const _daysInMonth = daysInMonth(newYear, newMonth);
   const newDay = Math.min(_daysInMonth, d.getUTCDate());
   return create(newYear, newMonth, newDay, d.getUTCHours(), d.getUTCMinutes(),
-    d.getUTCSeconds(), d.getUTCMilliseconds(), (d.offset ?? 0));
+    d.getUTCSeconds(), d.getUTCMilliseconds(), offset(d));
 }
 
 export function addMonths(d: IDateTimeOffset, v: number) {
-  const d2 = new Date(d.getTime() + (d.offset ?? 0));
+  const d2 = new Date(d.getTime() + offset(d));
   let newMonth = d2.getUTCMonth() + 1 + v;
   let newMonth_ = 0;
   let yearOffset = 0;
@@ -284,12 +275,12 @@ export function addMonths(d: IDateTimeOffset, v: number) {
   const _daysInMonth = daysInMonth(newYear, newMonth);
   const newDay = Math.min(_daysInMonth, d2.getUTCDate());
   return create(newYear, newMonth, newDay, d2.getUTCHours(), d2.getUTCMinutes(),
-    d2.getUTCSeconds(), d2.getUTCMilliseconds(), (d.offset ?? 0));
+    d2.getUTCSeconds(), d2.getUTCMilliseconds(), offset(d));
 }
 
 export function subtract<Input extends number | IDateTimeOffset, Output = Input extends number ? IDateTimeOffset : number>(d: IDateTimeOffset, that: Input): Output {
   return typeof that === "number"
-    ? DateTimeOffset(d.getTime() - that, (d.offset ?? 0)) as Output
+    ? DateTimeOffset(d.getTime() - that, offset(d)) as Output
     : d.getTime() - that.getTime() as Output;
 }
 

src/fable-library-ts/DateOnly.ts

@@ -58,7 +58,7 @@ export function dayOfYear(d: IDateTime) {
 }
 
 export function toDateTime(d: IDateTime, time: number, kind: DateTimeKind = DateTimeKind.Unspecified) {
-  return DateTime(d.getTime() + time + (kind !== DateTimeKind.Utc ? d.getTimezoneOffset() : 0) * 60000, kind);
+  return DateTime(d.getTime() + time + (kind !== DateTimeKind.Utc ? d.getTimezoneOffset() : 0) * 60_000, kind);
 }
 
 export function toString(d: IDateTime, format = "d", _provider?: any) {

src/fable-library-ts/TimeOnly.ts

@@ -8,7 +8,7 @@ export function create(h: number = 0, m: number = 0, s: number = 0, ms: number =
   if (h < 0 || m < 0 || s < 0 || ms < 0)
     throw new Exception("The parameters describe an unrepresentable TimeOnly.");
 
-  return h * 3600000 + m * 60000 + s * 1000 + ms;
+  return h * 3600000 + m * 60_000 + s * 1000 + ms;
 }
 
 export function fromTicks(ticks: number | bigint) {
@@ -61,7 +61,7 @@ export function addHours(t: number, h: number) {
 }
 
 export function addMinutes(t: number, m: number) {
-  return add(t, m * 60000);
+  return add(t, m * 60_000);
 }
 
 export function isBetween(t: number, start: number, end: number) {

src/fable-library-ts/TimeSpan.ts

@@ -28,7 +28,7 @@ export function create(d: number = 0, h: number = 0, m: number = 0, s: number =
       // d,h,m,s,ms
       break;
   }
-  return d * 86400000 + h * 3600000 + m * 60000 + s * 1000 + ms;
+  return d * 86400000 + h * 3600000 + m * 60_000 + s * 1000 + ms;
 }
 
 export function fromTicks(ticks: number | bigint) {
@@ -64,11 +64,11 @@ export function hours(ts: TimeSpan) {
 }
 
 export function minutes(ts: TimeSpan) {
-  return signedRound(ts % 3600000 / 60000);
+  return signedRound(ts % 3600000 / 60_000);
 }
 
 export function seconds(ts: TimeSpan) {
-  return signedRound(ts % 60000 / 1000);
+  return signedRound(ts % 60_000 / 1000);
 }
 
 export function milliseconds(ts: TimeSpan) {
@@ -88,7 +88,7 @@ export function totalHours(ts: TimeSpan) {
 }
 
 export function totalMinutes(ts: TimeSpan) {
-  return ts / 60000;
+  return ts / 60_000;
 }
 
 export function totalSeconds(ts: TimeSpan) {

src/fable-library-ts/Util.ts

@@ -341,7 +341,7 @@ export function dateOffset(date: IDateTime | IDateTimeOffset): number {
   return typeof date1.offset === "number"
     ? date1.offset
     : ((date as IDateTime).kind === DateTimeKind.Utc
-      ? 0 : date.getTimezoneOffset() * -60000);
+      ? 0 : date.getTimezoneOffset() * -60_000);
 }
 
 export function int16ToString(i: number, radix?: number) {