@fable-org/fable-library-ts 2.0.0-beta.3 → 2.0.0-beta.5

package/CollectionUtil.ts

@@ -1,4 +1,4 @@
-import { equals, isArrayLike } from "./Util.js";
+import { Exception, MutableArray, equals, isArrayLike } from "./Util.ts";
 
 export function count<T>(col: Iterable<T>): number {
   if (typeof (col as any)["System.Collections.Generic.ICollection`1.get_Count"] === "function") {
@@ -29,7 +29,7 @@ export function isReadOnly<T>(col: Iterable<T>): boolean {
     return (col as any)["System.Collections.Generic.ICollection`1.get_IsReadOnly"](); // collection
   } else {
     if (isArrayLike(col)) {
-      return ArrayBuffer.isView(col); // true for typed arrays, false for other arrays
+      return false; // array, resize array
     } else {
       if (typeof (col as any).size === "number") {
         return false; // map, set
@@ -41,7 +41,7 @@ export function isReadOnly<T>(col: Iterable<T>): boolean {
   }
 }
 
-export function copyTo<T>(col: Iterable<T>, array: T[], arrayIndex: number) {
+export function copyTo<T>(col: Iterable<T>, array: MutableArray<T>, arrayIndex: number) {
   if (typeof (col as any)["System.Collections.Generic.ICollection`1.CopyToZ3B4C077E"] === "function") {
     (col as any)["System.Collections.Generic.ICollection`1.CopyToZ3B4C077E"](array, arrayIndex); // collection
   } else {
@@ -94,7 +94,7 @@ export function add<T>(col: Iterable<T>, item: T): void {
           if ((col as any).has(item[0]) === false) {
             (col as any).set(item[0], item[1]); // map
           } else {
-            throw new Error("An item with the same key has already been added. Key: " + item[0]);
+            throw new Exception("An item with the same key has already been added. Key: " + item[0]);
           }
         } else {
           // TODO: throw for other collections?

package/Date.ts

@@ -8,9 +8,9 @@
  * Basically; invariant: date.getTime() always return UTC time.
  */
 
-import { int64, toInt64, toFloat64 } from "./BigInt.js";
-import { FSharpRef } from "./Types.js";
-import { compareDates, DateKind, dateOffset, IDateTime, IDateTimeOffset, padWithZeros } from "./Util.js";
+import { int64, toInt64, toFloat64 } from "./BigInt.ts";
+import { FSharpRef } from "./Types.ts";
+import { Exception, compareDates, DateTimeKind, dateOffset, IDateTime, IDateTimeOffset, padWithZeros } from "./Util.ts";
 
 export type OffsetInMinutes = number;
 export type Offset = "Z" | OffsetInMinutes | null;
@@ -75,7 +75,7 @@ function parseQuotedString(format: string, pos: number): [string, number] {
         result += format[pos];
       } else {
         // This means that '\' is the last character in the string.
-        throw new Error("Invalid string format");
+        throw new Exception("Invalid string format");
       }
     } else {
       result += currentChar;
@@ -84,7 +84,7 @@ function parseQuotedString(format: string, pos: number): [string, number] {
 
   if (!foundQuote) {
     // We could not find the matching quote
-    throw new Error(`Invalid string format could not find matching quote for ${quoteChar}`);
+    throw new Exception(`Invalid string format could not find matching quote for ${quoteChar}`);
   }
 
   return [result, pos - beginPos + 1];
@@ -94,7 +94,7 @@ function dateToStringWithCustomFormat(date: Date, format: string, utc: boolean)
   let cursorPos = 0;
   let tokenLength = 0;
   let result = "";
-  const localizedDate = utc ? DateTime(date.getTime(), DateKind.UTC) : date;
+  const localizedDate = utc ? DateTime(date.getTime(), DateTimeKind.Utc) : date;
 
   while (cursorPos < format.length) {
     const token = format[cursorPos];
@@ -195,14 +195,14 @@ function dateToStringWithCustomFormat(date: Date, format: string, utc: boolean)
         cursorPos += tokenLength;
         switch (tokenLength) {
           case 1:
-            switch (kind(localizedDate)) {
-              case DateKind.UTC:
+            switch (getKind(localizedDate)) {
+              case DateTimeKind.Utc:
                 result += "Z";
                 break;
-              case DateKind.Local:
-                result += dateOffsetToString(localizedDate.getTimezoneOffset() * -60000);
+              case DateTimeKind.Local:
+                result += dateOffsetToString(localizedDate.getTimezoneOffset() * -60_000);
                 break;
-              case DateKind.Unspecified:
+              case DateTimeKind.Unspecified:
                 break;
             }
             break;
@@ -288,15 +288,15 @@ function dateToStringWithCustomFormat(date: Date, format: string, utc: boolean)
         cursorPos += tokenLength;
         let utcOffsetText = "";
 
-        switch (kind(localizedDate)) {
-          case DateKind.UTC:
+        switch (getKind(localizedDate)) {
+          case DateTimeKind.Utc:
             utcOffsetText = "+00:00";
             break;
-          case DateKind.Local:
-            utcOffsetText = dateOffsetToString(localizedDate.getTimezoneOffset() * -60000);
+          case DateTimeKind.Local:
+            utcOffsetText = dateOffsetToString(localizedDate.getTimezoneOffset() * -60_000);
             break;
-          case DateKind.Unspecified:
-            utcOffsetText = dateOffsetToString(toLocalTime(localizedDate).getTimezoneOffset() * -60000);
+          case DateTimeKind.Unspecified:
+            utcOffsetText = dateOffsetToString(toLocalTime(localizedDate).getTimezoneOffset() * -60_000);
             break;
         }
 
@@ -336,7 +336,7 @@ function dateToStringWithCustomFormat(date: Date, format: string, utc: boolean)
           cursorPos += 2;
           result += dateToStringWithCustomFormat(localizedDate, String.fromCharCode(nextChar), utc);
         } else {
-          throw new Error("Invalid format string");
+          throw new Exception("Invalid format string");
         }
         break;
       case "\\":
@@ -345,7 +345,7 @@ function dateToStringWithCustomFormat(date: Date, format: string, utc: boolean)
           cursorPos += 2;
           result += String.fromCharCode(nextChar2);
         } else {
-          throw new Error("Invalid format string");
+          throw new Exception("Invalid format string");
         }
         break;
       default:
@@ -358,8 +358,8 @@ function dateToStringWithCustomFormat(date: Date, format: string, utc: boolean)
   return result;
 }
 
-export function kind(value: IDateTime): number {
-  return value.kind || 0;
+export function getKind(value: IDateTime): DateTimeKind {
+  return value.kind ?? DateTimeKind.Unspecified;
 }
 
 export function unixEpochMillisecondsToTicks(ms: number, offset: number): int64 {
@@ -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);
@@ -385,7 +385,7 @@ function dateToISOString(d: IDateTime, utc: boolean) {
     return d.toISOString();
   } else {
     // JS Date is always local
-    const printOffset = d.kind == null ? true : d.kind === DateKind.Local;
+    const printOffset = d.kind == null ? true : d.kind === DateTimeKind.Local;
     return padWithZeros(d.getFullYear(), 4) + "-" +
       padWithZeros(d.getMonth() + 1, 2) + "-" +
       padWithZeros(d.getDate(), 2) + "T" +
@@ -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) : "");
   }
 }
 
@@ -413,7 +413,7 @@ function dateToStringWithOffset(date: IDateTimeOffset, format?: string) {
       case "T": return dateToString_T(toUniversalTime(d));
       case "t": return dateToString_t(toUniversalTime(d));
       case "O": case "o": return dateToISOStringWithOffset(d, (date.offset ?? 0));
-      default: throw new Error("Unrecognized Date print format");
+      default: throw new Exception("Unrecognized Date print format");
     }
   } else {
     return dateToStringWithCustomFormat(d, format, true);
@@ -445,7 +445,7 @@ function dateToString_t(date: IDateTime) {
 }
 
 function dateToStringWithKind(date: IDateTime, format?: string) {
-  const utc = date.kind === DateKind.UTC;
+  const utc = date.kind === DateTimeKind.Utc;
   if (typeof format !== "string") {
     return utc ? date.toUTCString() : date.toLocaleString();
   } else if (format.length === 1) {
@@ -457,7 +457,7 @@ function dateToStringWithKind(date: IDateTime, format?: string) {
       case "O": case "o":
         return dateToISOString(date, utc);
       default:
-        throw new Error("Unrecognized Date print format");
+        throw new Exception("Unrecognized Date print format");
     }
   } else {
     return dateToStringWithCustomFormat(date, format, utc);
@@ -470,30 +470,35 @@ export function toString(date: IDateTime | IDateTimeOffset, format?: string, _pr
     : dateToStringWithKind(date, format);
 }
 
-export function DateTime(value: number, kind?: DateKind) {
+export function DateTime(value: number, kind?: DateTimeKind) {
   const d = new Date(value) as IDateTime;
-  d.kind = (kind == null ? DateKind.Unspecified : kind) | 0;
+  d.kind = (kind == null ? DateTimeKind.Unspecified : kind);
   return d;
 }
 
-export function fromTicks(ticks: number | bigint, kind?: DateKind) {
-  kind = kind != null ? kind : DateKind.Local; // better default than Unspecified
+export function fromTicks(ticks: number | bigint, kind?: DateTimeKind) {
+  kind = kind != null ? kind : DateTimeKind.Local; // better default than Unspecified
   let date = DateTime(ticksToUnixEpochMilliseconds(ticks), kind);
 
   // Ticks are local to offset (in this case, either UTC or Local/Unknown).
   // If kind is anything but UTC, that means that the tick number was not
   // in utc, thus getTime() cannot return UTC, and needs to be shifted.
-  if (kind !== DateKind.UTC) {
+  if (kind !== DateTimeKind.Utc) {
     date = DateTime(date.getTime() - dateOffset(date), kind);
   }
 
   return date;
 }
 
-export function fromDateTimeOffset(date: IDateTimeOffset, kind: DateKind) {
+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 DateKind.UTC: return DateTime(date.getTime(), DateKind.UTC);
-    case DateKind.Local: return DateTime(date.getTime(), DateKind.Local);
+    case DateTimeKind.Utc: return DateTime(date.getTime(), DateTimeKind.Utc);
+    case DateTimeKind.Local: return DateTime(date.getTime(), DateTimeKind.Local);
     default:
       const d = DateTime(date.getTime() + (date.offset ?? 0), kind);
       return DateTime(d.getTime() - dateOffset(d), kind);
@@ -506,17 +511,17 @@ export function getTicks(date: IDateTime | IDateTimeOffset) {
 
 export function minValue() {
   // This is "0001-01-01T00:00:00.000Z", actual JS min value is -8640000000000000
-  return DateTime(-62135596800000, DateKind.UTC);
+  return DateTime(-62135596800000, DateTimeKind.Utc);
 }
 
 export function maxValue() {
   // This is "9999-12-31T23:59:59.999Z", actual JS max value is 8640000000000000
-  return DateTime(253402300799999, DateKind.UTC);
+  return DateTime(253402300799999, DateTimeKind.Utc);
 }
 
 export function parseRaw(input: string): [Date, Offset] {
   function fail() {
-    throw new Error(`The string is not a valid Date: ${input}`);
+    throw new Exception(`The string is not a valid Date: ${input}`);
   }
 
   if (input == null || input.trim() === "") {
@@ -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();
     }
@@ -593,8 +598,8 @@ export function parse(str: string, detectUTC = false): IDateTime {
   // .NET always parses DateTime as Local if there's offset info (even "Z")
   // Newtonsoft.Json uses UTC if the offset is "Z"
   const kind = offset != null
-    ? (detectUTC && offset === "Z" ? DateKind.UTC : DateKind.Local)
-    : DateKind.Unspecified;
+    ? (detectUTC && offset === "Z" ? DateTimeKind.Utc : DateTimeKind.Local)
+    : DateTimeKind.Unspecified;
   return DateTime(date.getTime(), kind);
 }
 
@@ -610,12 +615,12 @@ export function tryParse(v: string, defValue: FSharpRef<IDateTime>): boolean {
 export function create(
   year: number, month: number, day: number,
   h: number = 0, m: number = 0, s: number = 0,
-  ms: number = 0, kind?: DateKind) {
-  const date = kind === DateKind.UTC
+  ms: number = 0, kind?: DateTimeKind) {
+  const date = kind === DateTimeKind.Utc
     ? new Date(Date.UTC(year, month - 1, day, h, m, s, ms))
     : new Date(year, month - 1, day, h, m, s, ms);
   if (year <= 99) {
-    if (kind === DateKind.UTC) {
+    if (kind === DateTimeKind.Utc) {
       date.setUTCFullYear(year, month - 1, day);
     } else {
       date.setFullYear(year, month - 1, day);
@@ -623,17 +628,17 @@ export function create(
   }
   const dateValue = date.getTime();
   if (isNaN(dateValue)) {
-    throw new Error("The parameters describe an unrepresentable Date.");
+    throw new Exception("The parameters describe an unrepresentable Date.");
   }
   return DateTime(dateValue, kind);
 }
 
 export function now() {
-  return DateTime(Date.now(), DateKind.Local);
+  return DateTime(Date.now(), DateTimeKind.Local);
 }
 
 export function utcNow() {
-  return DateTime(Date.now(), DateKind.UTC);
+  return DateTime(Date.now(), DateTimeKind.Utc);
 }
 
 export function today() {
@@ -651,20 +656,20 @@ export function daysInMonth(year: number, month: number) {
 }
 
 export function toUniversalTime(date: IDateTime) {
-  return date.kind === DateKind.UTC ? date : DateTime(date.getTime(), DateKind.UTC);
+  return date.kind === DateTimeKind.Utc ? date : DateTime(date.getTime(), DateTimeKind.Utc);
 }
 
 export function toLocalTime(date: IDateTime) {
-  return date.kind === DateKind.Local ? date : DateTime(date.getTime(), DateKind.Local);
+  return date.kind === DateTimeKind.Local ? date : DateTime(date.getTime(), DateTimeKind.Local);
 }
 
-export function specifyKind(d: IDateTime, kind: DateKind) {
+export function specifyKind(d: IDateTime, kind: DateTimeKind) {
   return create(year(d), month(d), day(d), hour(d), minute(d), second(d), millisecond(d), kind);
 }
 
 export function timeOfDay(d: IDateTime) {
   return hour(d) * 3600000
-    + minute(d) * 60000
+    + minute(d) * 60_000
     + second(d) * 1000
     + millisecond(d);
 }
@@ -674,35 +679,35 @@ export function date(d: IDateTime) {
 }
 
 export function day(d: IDateTime) {
-  return d.kind === DateKind.UTC ? d.getUTCDate() : d.getDate();
+  return d.kind === DateTimeKind.Utc ? d.getUTCDate() : d.getDate();
 }
 
 export function hour(d: IDateTime) {
-  return d.kind === DateKind.UTC ? d.getUTCHours() : d.getHours();
+  return d.kind === DateTimeKind.Utc ? d.getUTCHours() : d.getHours();
 }
 
 export function millisecond(d: IDateTime) {
-  return d.kind === DateKind.UTC ? d.getUTCMilliseconds() : d.getMilliseconds();
+  return d.kind === DateTimeKind.Utc ? d.getUTCMilliseconds() : d.getMilliseconds();
 }
 
 export function minute(d: IDateTime) {
-  return d.kind === DateKind.UTC ? d.getUTCMinutes() : d.getMinutes();
+  return d.kind === DateTimeKind.Utc ? d.getUTCMinutes() : d.getMinutes();
 }
 
 export function month(d: IDateTime) {
-  return (d.kind === DateKind.UTC ? d.getUTCMonth() : d.getMonth()) + 1;
+  return (d.kind === DateTimeKind.Utc ? d.getUTCMonth() : d.getMonth()) + 1;
 }
 
 export function second(d: IDateTime) {
-  return d.kind === DateKind.UTC ? d.getUTCSeconds() : d.getSeconds();
+  return d.kind === DateTimeKind.Utc ? d.getUTCSeconds() : d.getSeconds();
 }
 
 export function year(d: IDateTime) {
-  return d.kind === DateKind.UTC ? d.getUTCFullYear() : d.getFullYear();
+  return d.kind === DateTimeKind.Utc ? d.getUTCFullYear() : d.getFullYear();
 }
 
 export function dayOfWeek(d: IDateTime) {
-  return d.kind === DateKind.UTC ? d.getUTCDay() : d.getDay();
+  return d.kind === DateTimeKind.Utc ? d.getUTCDay() : d.getDay();
 }
 
 export function dayOfYear(d: IDateTime) {
@@ -717,11 +722,11 @@ export function dayOfYear(d: IDateTime) {
 
 export function add(d: IDateTime, ts: number) {
   const newDate = DateTime(d.getTime() + ts, d.kind);
-  if (d.kind !== DateKind.UTC) {
+  if (d.kind !== DateTimeKind.Utc) {
     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) {

package/DateOffset.ts

@@ -13,15 +13,15 @@
  * Basically; invariant: date.getTime() always return UTC time.
  */
 
-import { int64, fromFloat64, toFloat64 } from "./BigInt.js";
-import DateTime, { create as createDate, dateOffsetToString, daysInMonth, parseRaw, ticksToUnixEpochMilliseconds, unixEpochMillisecondsToTicks } from "./Date.js";
-import { FSharpRef } from "./Types.js";
-import { compareDates, DateKind, IDateTime, IDateTimeOffset, padWithZeros } from "./Util.js";
+import { int64, fromFloat64, toFloat64 } from "./BigInt.ts";
+import DateTime, { create as createDate, dateOffsetToString, daysInMonth, parseRaw, ticksToUnixEpochMilliseconds, unixEpochMillisecondsToTicks } from "./Date.ts";
+import { FSharpRef } from "./Types.ts";
+import { Exception, compareDates, DateTimeKind, IDateTime, IDateTimeOffset, padWithZeros } from "./Util.ts";
 
 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,11 +31,11 @@ export function offset(value: IDateTimeOffset): number {
 
 function checkOffsetInRange(offset?: number) {
   if (offset != null && offset !== 0) {
-    if (offset % 60000 !== 0) {
-      throw new Error("Offset must be specified in whole minutes.");
+    if (offset % 60_000 !== 0) {
+      throw new Exception("Offset must be specified in whole minutes.");
     }
     if (Math.abs(offset / 3600000) > 14) {
-      throw new Error("Offset must be within plus or minus 14 hours.");
+      throw new Exception("Offset must be within plus or minus 14 hours.");
     }
   }
 }
@@ -43,22 +43,22 @@ function checkOffsetInRange(offset?: number) {
 export function fromDate(date: IDateTime, offset?: number) {
   let offset2: number = 0;
   switch (date.kind) {
-    case DateKind.UTC:
+    case DateTimeKind.Utc:
       if(offset != null && offset !== 0) {
-        throw new Error("The UTC Offset for Utc DateTime instances must be 0.");
+        throw new Exception("The UTC Offset for Utc DateTime instances must be 0.");
       }
       offset2 = 0;
       break;
 
-    case DateKind.Local:
+    case DateTimeKind.Local:
       offset2 = date.getTimezoneOffset() * -60_000;
       if(offset != null && offset !== offset2) {
-        throw new Error("The UTC Offset of the local dateTime parameter does not match the offset argument.");
+        throw new Exception("The UTC Offset of the local dateTime parameter does not match the offset argument.");
       }
 
       break;
 
-    case DateKind.Unspecified:
+    case DateTimeKind.Unspecified:
     default:
       if(offset == null) {
         offset2 = date.getTimezoneOffset() * -60_000;
@@ -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,101 +129,88 @@ 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)) {
-    throw new Error("The parameters describe an unrepresentable Date");
+    throw new Exception("The parameters describe an unrepresentable Date");
   }
   return DateTimeOffset(dateValue, offset);
 }
 
 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);
 }
 
 export function toUniversalTime(date: IDateTimeOffset): Date {
-  return DateTime(date.getTime(), DateKind.UTC);
+  return DateTime(date.getTime(), DateTimeKind.Utc);
 }
 
 export function toLocalTime(date: IDateTimeOffset): Date {
-  return DateTime(date.getTime() + offset(now()), DateKind.Local);
+  return DateTime(date.getTime(), DateTimeKind.Local);
 }
 
 export function localDateTime(date: IDateTimeOffset) : Date {
-  return DateTime(date.getTime(), DateKind.Local);
+  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;
 }