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

package/CollectionUtil.js

@@ -1,4 +1,4 @@
-import { equals, isArrayLike } from "./Util.js";
+import { Exception, equals, isArrayLike } from "./Util.js";
 export function count(col) {
     if (typeof col["System.Collections.Generic.ICollection`1.get_Count"] === "function") {
         return col["System.Collections.Generic.ICollection`1.get_Count"](); // collection
@@ -32,7 +32,7 @@ export function isReadOnly(col) {
     }
     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.size === "number") {
@@ -105,7 +105,7 @@ export function add(col, item) {
                         col.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 {

package/Date.js

@@ -8,7 +8,7 @@
  * Basically; invariant: date.getTime() always return UTC time.
  */
 import { toInt64, toFloat64 } from "./BigInt.js";
-import { compareDates, dateOffset, padWithZeros } from "./Util.js";
+import { Exception, compareDates, DateTimeKind, dateOffset, padWithZeros } from "./Util.js";
 const shortDays = [
     "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 ];
@@ -56,7 +56,7 @@ function parseQuotedString(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 {
@@ -65,7 +65,7 @@ function parseQuotedString(format, pos) {
     }
     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];
 }
@@ -73,7 +73,7 @@ function dateToStringWithCustomFormat(date, format, utc) {
     let cursorPos = 0;
     let tokenLength = 0;
     let result = "";
-    const localizedDate = utc ? DateTime(date.getTime(), 1 /* DateKind.UTC */) : date;
+    const localizedDate = utc ? DateTime(date.getTime(), DateTimeKind.Utc) : date;
     while (cursorPos < format.length) {
         const token = format[cursorPos];
         switch (token) {
@@ -176,14 +176,14 @@ function dateToStringWithCustomFormat(date, format, utc) {
                 cursorPos += tokenLength;
                 switch (tokenLength) {
                     case 1:
-                        switch (kind(localizedDate)) {
-                            case 1 /* DateKind.UTC */:
+                        switch (getKind(localizedDate)) {
+                            case DateTimeKind.Utc:
                                 result += "Z";
                                 break;
-                            case 2 /* DateKind.Local */:
+                            case DateTimeKind.Local:
                                 result += dateOffsetToString(localizedDate.getTimezoneOffset() * -60000);
                                 break;
-                            case 0 /* DateKind.Unspecified */:
+                            case DateTimeKind.Unspecified:
                                 break;
                         }
                         break;
@@ -268,14 +268,14 @@ function dateToStringWithCustomFormat(date, format, utc) {
                 tokenLength = parseRepeatToken(format, cursorPos, "z");
                 cursorPos += tokenLength;
                 let utcOffsetText = "";
-                switch (kind(localizedDate)) {
-                    case 1 /* DateKind.UTC */:
+                switch (getKind(localizedDate)) {
+                    case DateTimeKind.Utc:
                         utcOffsetText = "+00:00";
                         break;
-                    case 2 /* DateKind.Local */:
+                    case DateTimeKind.Local:
                         utcOffsetText = dateOffsetToString(localizedDate.getTimezoneOffset() * -60000);
                         break;
-                    case 0 /* DateKind.Unspecified */:
+                    case DateTimeKind.Unspecified:
                         utcOffsetText = dateOffsetToString(toLocalTime(localizedDate).getTimezoneOffset() * -60000);
                         break;
                 }
@@ -315,7 +315,7 @@ function dateToStringWithCustomFormat(date, format, utc) {
                     result += dateToStringWithCustomFormat(localizedDate, String.fromCharCode(nextChar), utc);
                 }
                 else {
-                    throw new Error("Invalid format string");
+                    throw new Exception("Invalid format string");
                 }
                 break;
             case "\\":
@@ -325,7 +325,7 @@ function dateToStringWithCustomFormat(date, format, utc) {
                     result += String.fromCharCode(nextChar2);
                 }
                 else {
-                    throw new Error("Invalid format string");
+                    throw new Exception("Invalid format string");
                 }
                 break;
             default:
@@ -336,8 +336,8 @@ function dateToStringWithCustomFormat(date, format, utc) {
     }
     return result;
 }
-export function kind(value) {
-    return value.kind || 0;
+export function getKind(value) {
+    return value.kind ?? DateTimeKind.Unspecified;
 }
 export function unixEpochMillisecondsToTicks(ms, offset) {
     return toInt64(((BigInt(ms) + 62135596800000n) + BigInt(offset)) * 10000n);
@@ -360,7 +360,7 @@ function dateToISOString(d, utc) {
     }
     else {
         // JS Date is always local
-        const printOffset = d.kind == null ? true : d.kind === 2 /* 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" +
@@ -388,7 +388,7 @@ function dateToStringWithOffset(date, format) {
             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 {
@@ -416,7 +416,7 @@ function dateToString_t(date) {
         + ":" + padWithZeros(minute(date), 2);
 }
 function dateToStringWithKind(date, format) {
-    const utc = date.kind === 1 /* DateKind.UTC */;
+    const utc = date.kind === DateTimeKind.Utc;
     if (typeof format !== "string") {
         return utc ? date.toUTCString() : date.toLocaleString();
     }
@@ -430,7 +430,7 @@ function dateToStringWithKind(date, format) {
             case "o":
                 return dateToISOString(date, utc);
             default:
-                throw new Error("Unrecognized Date print format");
+                throw new Exception("Unrecognized Date print format");
         }
     }
     else {
@@ -444,24 +444,28 @@ export function toString(date, format, _provider) {
 }
 export function DateTime(value, kind) {
     const d = new Date(value);
-    d.kind = (kind == null ? 0 /* DateKind.Unspecified */ : kind) | 0;
+    d.kind = (kind == null ? DateTimeKind.Unspecified : kind);
     return d;
 }
 export function fromTicks(ticks, kind) {
-    kind = kind != null ? kind : 2 /* DateKind.Local */; // better default than Unspecified
+    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 !== 1 /* DateKind.UTC */) {
+    if (kind !== DateTimeKind.Utc) {
         date = DateTime(date.getTime() - dateOffset(date), kind);
     }
     return date;
 }
+export function fromDateTime(dateOnly, timeOnly, kind) {
+    const d = DateTime(dateOnly.getTime() + timeOnly, kind);
+    return DateTime(d.getTime() - dateOffset(d), kind);
+}
 export function fromDateTimeOffset(date, kind) {
     switch (kind) {
-        case 1 /* DateKind.UTC */: return DateTime(date.getTime(), 1 /* DateKind.UTC */);
-        case 2 /* DateKind.Local */: return DateTime(date.getTime(), 2 /* 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);
@@ -472,15 +476,15 @@ export function getTicks(date) {
 }
 export function minValue() {
     // This is "0001-01-01T00:00:00.000Z", actual JS min value is -8640000000000000
-    return DateTime(-62135596800000, 1 /* 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, 1 /* DateKind.UTC */);
+    return DateTime(253402300799999, DateTimeKind.Utc);
 }
 export function parseRaw(input) {
     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() === "") {
         fail();
@@ -556,8 +560,8 @@ export function parse(str, detectUTC = false) {
     // .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" ? 1 /* DateKind.UTC */ : 2 /* DateKind.Local */)
-        : 0 /* DateKind.Unspecified */;
+        ? (detectUTC && offset === "Z" ? DateTimeKind.Utc : DateTimeKind.Local)
+        : DateTimeKind.Unspecified;
     return DateTime(date.getTime(), kind);
 }
 export function tryParse(v, defValue) {
@@ -570,11 +574,11 @@ export function tryParse(v, defValue) {
     }
 }
 export function create(year, month, day, h = 0, m = 0, s = 0, ms = 0, kind) {
-    const date = kind === 1 /* DateKind.UTC */
+    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 === 1 /* DateKind.UTC */) {
+        if (kind === DateTimeKind.Utc) {
             date.setUTCFullYear(year, month - 1, day);
         }
         else {
@@ -583,15 +587,15 @@ export function create(year, month, day, h = 0, m = 0, s = 0, ms = 0, kind) {
     }
     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(), 2 /* DateKind.Local */);
+    return DateTime(Date.now(), DateTimeKind.Local);
 }
 export function utcNow() {
-    return DateTime(Date.now(), 1 /* DateKind.UTC */);
+    return DateTime(Date.now(), DateTimeKind.Utc);
 }
 export function today() {
     return date(now());
@@ -605,10 +609,10 @@ export function daysInMonth(year, month) {
         : (month >= 8 ? (month % 2 === 0 ? 31 : 30) : (month % 2 === 0 ? 30 : 31));
 }
 export function toUniversalTime(date) {
-    return date.kind === 1 /* DateKind.UTC */ ? date : DateTime(date.getTime(), 1 /* DateKind.UTC */);
+    return date.kind === DateTimeKind.Utc ? date : DateTime(date.getTime(), DateTimeKind.Utc);
 }
 export function toLocalTime(date) {
-    return date.kind === 2 /* DateKind.Local */ ? date : DateTime(date.getTime(), 2 /* DateKind.Local */);
+    return date.kind === DateTimeKind.Local ? date : DateTime(date.getTime(), DateTimeKind.Local);
 }
 export function specifyKind(d, kind) {
     return create(year(d), month(d), day(d), hour(d), minute(d), second(d), millisecond(d), kind);
@@ -623,28 +627,28 @@ export function date(d) {
     return create(year(d), month(d), day(d), 0, 0, 0, 0, d.kind);
 }
 export function day(d) {
-    return d.kind === 1 /* DateKind.UTC */ ? d.getUTCDate() : d.getDate();
+    return d.kind === DateTimeKind.Utc ? d.getUTCDate() : d.getDate();
 }
 export function hour(d) {
-    return d.kind === 1 /* DateKind.UTC */ ? d.getUTCHours() : d.getHours();
+    return d.kind === DateTimeKind.Utc ? d.getUTCHours() : d.getHours();
 }
 export function millisecond(d) {
-    return d.kind === 1 /* DateKind.UTC */ ? d.getUTCMilliseconds() : d.getMilliseconds();
+    return d.kind === DateTimeKind.Utc ? d.getUTCMilliseconds() : d.getMilliseconds();
 }
 export function minute(d) {
-    return d.kind === 1 /* DateKind.UTC */ ? d.getUTCMinutes() : d.getMinutes();
+    return d.kind === DateTimeKind.Utc ? d.getUTCMinutes() : d.getMinutes();
 }
 export function month(d) {
-    return (d.kind === 1 /* DateKind.UTC */ ? d.getUTCMonth() : d.getMonth()) + 1;
+    return (d.kind === DateTimeKind.Utc ? d.getUTCMonth() : d.getMonth()) + 1;
 }
 export function second(d) {
-    return d.kind === 1 /* DateKind.UTC */ ? d.getUTCSeconds() : d.getSeconds();
+    return d.kind === DateTimeKind.Utc ? d.getUTCSeconds() : d.getSeconds();
 }
 export function year(d) {
-    return d.kind === 1 /* DateKind.UTC */ ? d.getUTCFullYear() : d.getFullYear();
+    return d.kind === DateTimeKind.Utc ? d.getUTCFullYear() : d.getFullYear();
 }
 export function dayOfWeek(d) {
-    return d.kind === 1 /* DateKind.UTC */ ? d.getUTCDay() : d.getDay();
+    return d.kind === DateTimeKind.Utc ? d.getUTCDay() : d.getDay();
 }
 export function dayOfYear(d) {
     const _year = year(d);
@@ -657,7 +661,7 @@ export function dayOfYear(d) {
 }
 export function add(d, ts) {
     const newDate = DateTime(d.getTime() + ts, d.kind);
-    if (d.kind !== 1 /* DateKind.UTC */) {
+    if (d.kind !== DateTimeKind.Utc) {
         const oldTzOffset = d.getTimezoneOffset();
         const newTzOffset = newDate.getTimezoneOffset();
         return oldTzOffset !== newTzOffset

package/DateOffset.js

@@ -13,8 +13,8 @@
  * Basically; invariant: date.getTime() always return UTC time.
  */
 import { fromFloat64, toFloat64 } from "./BigInt.js";
-import DateTime, { create as createDate, dateOffsetToString, daysInMonth, parseRaw, ticksToUnixEpochMilliseconds, unixEpochMillisecondsToTicks } from "./Date.js";
-import { compareDates, padWithZeros } from "./Util.js";
+import DateTime, { create as createDate, daysInMonth, parseRaw, ticksToUnixEpochMilliseconds, unixEpochMillisecondsToTicks } from "./Date.js";
+import { Exception, compareDates, DateTimeKind } from "./Util.js";
 export default function DateTimeOffset(value, offset) {
     checkOffsetInRange(offset);
     const d = new Date(value);
@@ -27,29 +27,29 @@ export function offset(value) {
 function checkOffsetInRange(offset) {
     if (offset != null && offset !== 0) {
         if (offset % 60000 !== 0) {
-            throw new Error("Offset must be specified in whole minutes.");
+            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.");
         }
     }
 }
 export function fromDate(date, offset) {
     let offset2 = 0;
     switch (date.kind) {
-        case 1 /* 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 2 /* DateKind.Local */:
+        case DateTimeKind.Local:
             offset2 = date.getTimezoneOffset() * -60000;
             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 0 /* DateKind.Unspecified */:
+        case DateTimeKind.Unspecified:
         default:
             if (offset == null) {
                 offset2 = date.getTimezoneOffset() * -60000;
@@ -61,6 +61,9 @@ export function fromDate(date, offset) {
     }
     return DateTimeOffset(date.getTime(), offset2);
 }
+export function fromDateTime(dateOnly, timeOnly, offset) {
+    return DateTimeOffset(dateOnly.getTime() - offset + timeOnly, offset);
+}
 export function fromTicks(ticks, offset) {
     const ms = ticksToUnixEpochMilliseconds(ticks) - offset;
     return DateTimeOffset(ms, offset);
@@ -104,85 +107,72 @@ export function create(year, month, day, h, m, s, ms, offset) {
         ms = 0;
     }
     checkOffsetInRange(offset);
-    let 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);
+    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) {
-    return DateTime(date.getTime(), 1 /* DateKind.UTC */);
+    return DateTime(date.getTime(), DateTimeKind.Utc);
 }
 export function toLocalTime(date) {
-    return DateTime(date.getTime() + offset(now()), 2 /* DateKind.Local */);
+    return DateTime(date.getTime(), DateTimeKind.Local);
 }
 export function localDateTime(date) {
-    return DateTime(date.getTime(), 2 /* DateKind.Local */);
+    return DateTime(date.getTime(), DateTimeKind.Local);
 }
 export function timeOfDay(d) {
-    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.getUTCSeconds() * 1000
         + d2.getUTCMilliseconds();
 }
 export function date(d) {
-    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) {
-    return new Date(d.getTime() + (d.offset ?? 0)).getUTCDate();
+    return new Date(d.getTime() + offset(d)).getUTCDate();
 }
 export function hour(d) {
-    return new Date(d.getTime() + (d.offset ?? 0)).getUTCHours();
+    return new Date(d.getTime() + offset(d)).getUTCHours();
 }
 export function millisecond(d) {
-    return new Date(d.getTime() + (d.offset ?? 0)).getUTCMilliseconds();
+    return new Date(d.getTime() + offset(d)).getUTCMilliseconds();
 }
 export function minute(d) {
-    return new Date(d.getTime() + (d.offset ?? 0)).getUTCMinutes();
+    return new Date(d.getTime() + offset(d)).getUTCMinutes();
 }
 export function month(d) {
-    return new Date(d.getTime() + (d.offset ?? 0)).getUTCMonth() + 1;
+    return new Date(d.getTime() + offset(d)).getUTCMonth() + 1;
 }
 export function second(d) {
-    return new Date(d.getTime() + (d.offset ?? 0)).getUTCSeconds();
+    return new Date(d.getTime() + offset(d)).getUTCSeconds();
 }
 export function year(d) {
-    return new Date(d.getTime() + (d.offset ?? 0)).getUTCFullYear();
+    return new Date(d.getTime() + offset(d)).getUTCFullYear();
 }
 export function dayOfWeek(d) {
-    return new Date(d.getTime() + (d.offset ?? 0)).getUTCDay();
+    return new Date(d.getTime() + offset(d)).getUTCDay();
 }
 export function dayOfYear(d) {
-    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();
@@ -192,7 +182,7 @@ export function dayOfYear(d) {
     return _day;
 }
 export function add(d, ts) {
-    return DateTimeOffset(d.getTime() + ts, (d.offset ?? 0));
+    return DateTimeOffset(d.getTime() + ts, offset(d));
 }
 export function addDays(d, v) {
     return add(d, v * 86400000);
@@ -217,10 +207,10 @@ export function addYears(d, v) {
     const newYear = d.getUTCFullYear() + v;
     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));
+    return create(newYear, newMonth, newDay, d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(), d.getUTCMilliseconds(), offset(d));
 }
 export function addMonths(d, v) {
-    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;
@@ -237,11 +227,11 @@ export function addMonths(d, v) {
     const newYear = d2.getUTCFullYear() + yearOffset;
     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));
+    return create(newYear, newMonth, newDay, d2.getUTCHours(), d2.getUTCMinutes(), d2.getUTCSeconds(), d2.getUTCMilliseconds(), offset(d));
 }
 export function subtract(d, that) {
     return typeof that === "number"
-        ? DateTimeOffset(d.getTime() - that, (d.offset ?? 0))
+        ? DateTimeOffset(d.getTime() - that, offset(d))
         : d.getTime() - that.getTime();
 }
 export function equals(d1, d2) {

package/DateOnly.js

@@ -1,7 +1,7 @@
 import { DateTime, getTicks, dayOfYear as Date_dayOfYear, year as Date_year, month as Date_month, day as Date_day, daysInMonth as Date_daysInMonth, ticksToUnixEpochMilliseconds } from "./Date.js";
-import { padWithZeros } from "./Util.js";
+import { Exception, DateTimeKind, padWithZeros } from "./Util.js";
 export function fromUnixMilliseconds(value) {
-    return DateTime(value, 1 /* DateKind.UTC */);
+    return DateTime(value, DateTimeKind.Utc);
 }
 export function create(year, month, day) {
     const d = fromUnixMilliseconds(Date.UTC(year, month - 1, day));
@@ -43,12 +43,12 @@ export function dayOfWeek(d) {
 export function dayOfYear(d) {
     return Date_dayOfYear(d);
 }
-export function toDateTime(d, time, kind = 0 /* DateKind.Unspecified */) {
-    return DateTime(d.getTime() + time + (kind !== 1 /* DateKind.UTC */ ? d.getTimezoneOffset() : 0) * 60000, kind);
+export function toDateTime(d, time, kind = DateTimeKind.Unspecified) {
+    return DateTime(d.getTime() + time + (kind !== DateTimeKind.Utc ? d.getTimezoneOffset() : 0) * 60000, kind);
 }
 export function toString(d, format = "d", _provider) {
     if (["d", "o", "O"].indexOf(format) === -1) {
-        throw new Error("Custom formats are not supported");
+        throw new Exception("Custom formats are not supported");
     }
     const y = padWithZeros(year(d), 4);
     const m = padWithZeros(month(d), 2);
@@ -57,7 +57,7 @@ export function toString(d, format = "d", _provider) {
 }
 export function parse(str) {
     function fail() {
-        throw new Error(`String '${str}' was not recognized as a valid DateOnly.`);
+        throw new Exception(`String '${str}' was not recognized as a valid DateOnly.`);
     }
     // Allowed separators: . , / -
     // TODO whitespace alone as the separator

package/Decimal.js

@@ -1,7 +1,7 @@
 import Decimal from "./lib/big.js";
 import { symbol } from "./Numeric.js";
 import { FSharpRef } from "./Types.js";
-import { combineHashCodes } from "./Util.js";
+import { Exception, combineHashCodes } from "./Util.js";
 import { fromDecimal } from "./BigInt.js";
 import * as bigInt from "./BigInt.js";
 Decimal.prototype.GetHashCode = function () {
@@ -109,7 +109,7 @@ export function parse(str) {
         return defValue.contents;
     }
     else {
-        throw new Error(`The input string ${str} was not in a correct format.`);
+        throw new Exception(`The input string ${str} was not in a correct format.`);
     }
 }
 export function toNumber(x) {
@@ -118,7 +118,7 @@ export function toNumber(x) {
 export function toChar(x) {
     const n = toNumber(x);
     if (n < 0 || n > 65535 || isNaN(n)) {
-        throw new Error("Value was either too large or too small for a character.");
+        throw new Exception("Value was either too large or too small for a character.");
     }
     return String.fromCharCode(n);
 }
@@ -221,7 +221,7 @@ export function getBits(d) {
 // export function makeRangeStepFunction(step: Decimal, last: Decimal) {
 //   const stepComparedWithZero = step.cmp(get_Zero);
 //   if (stepComparedWithZero === 0) {
-//     throw new Error("The step of a range cannot be zero");
+//     throw new Exception("The step of a range cannot be zero");
 //   }
 //   const stepGreaterThanZero = stepComparedWithZero > 0;
 //   return (x: Decimal) => {

package/Double.js

@@ -1,4 +1,5 @@
 import { FSharpRef } from "./Types.js";
+import { Exception } from "./Util.js";
 export function tryParse(str, defValue) {
     // TODO: test if value is valid and in range
     if (str != null && /\S/.test(str)) {
@@ -16,7 +17,7 @@ export function parse(str) {
         return defValue.contents;
     }
     else {
-        throw new Error(`The input string ${str} was not in a correct format.`);
+        throw new Exception(`The input string ${str} was not in a correct format.`);
     }
 }
 // JS Number.isFinite function evals false for NaN

package/FSharp.Collections.js

@@ -1,27 +1,45 @@
-import { compare, physicalHash, equals, structuralHash } from "./Util.js";
-export function HashIdentity_FromFunctions(hash, eq) {
+import { compare, physicalHash, equals as equals_1, structuralHash } from "./Util.js";
+export function HashIdentity_FromFunctions(hasher, equals) {
     return {
-        Equals(x, y) {
-            return eq(x, y);
+        GetHashCode(x) {
+            return hasher(x) | 0;
         },
-        GetHashCode(x_1) {
-            return hash(x_1) | 0;
+        Equals(x_1, y) {
+            return (x_1 == null) ? (y == null) : ((y == null) ? false : equals(x_1, y));
         },
     };
 }
 export function HashIdentity_Structural() {
-    return HashIdentity_FromFunctions((obj) => (structuralHash(obj) | 0), equals);
+    return {
+        GetHashCode(x) {
+            return structuralHash(x) | 0;
+        },
+        Equals(x_1, y) {
+            return equals_1(x_1, y);
+        },
+    };
 }
 export function HashIdentity_Reference() {
-    return HashIdentity_FromFunctions((obj) => (physicalHash(obj) | 0), (e, e_1) => (e === e_1));
+    return {
+        GetHashCode(x) {
+            return physicalHash(x) | 0;
+        },
+        Equals(x_1, y) {
+            return equals_1(x_1, y);
+        },
+    };
 }
 export function ComparisonIdentity_FromFunction(comparer) {
     return {
         Compare(x, y) {
-            return comparer(x, y) | 0;
+            return ((x == null) ? ((y == null) ? 0 : -1) : ((y == null) ? 1 : comparer(x, y))) | 0;
         },
     };
 }
 export function ComparisonIdentity_Structural() {
-    return ComparisonIdentity_FromFunction((e, e_1) => (compare(e, e_1) | 0));
+    return {
+        Compare(x, y) {
+            return compare(x, y) | 0;
+        },
+    };
 }