@fable-org/fable-library-js 2.10.0 → 2.12.0

package/Set.js

@@ -1,6 +1,7 @@
 import { record_type, bool_type, list_type, option_type, class_type } from "./Reflection.js";
 import { some, value as value_2 } from "./Option.js";
-import { structuralHash, toIterator, disposeSafe, getEnumerator, isArrayLike, Exception } from "./Util.js";
+import { structuralHash, toIterator, disposeSafe, getEnumerator, isArrayLike, physicalHash, Exception } from "./Util.js";
+import { Operators_InvalidOp, Operators_InvalidArg } from "./FSharp.Core.js";
 import { toString, Record } from "./Types.js";
 import { fold as fold_2, cons, singleton as singleton_1, empty as empty_1, ofArrayWithTail, tail, head, isEmpty as isEmpty_1, FSharpList } from "./List.js";
 import { fold as fold_1, fill, setItem } from "./Array.js";
@@ -51,7 +52,7 @@ export function SetTreeModule_countAux(t_mut, acc_mut) {
     SetTreeModule_countAux: while (true) {
         const t = t_mut, acc = acc_mut;
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 t_mut = SetTreeNode$1__get_Left(tn);
@@ -76,7 +77,7 @@ export function SetTreeModule_mk(l, k, r) {
     let hl;
     const t = l;
     if (t != null) {
-        const t2 = value_2(t);
+        const t2 = t;
         hl = ((t2 instanceof SetTreeNode$1) ? ((tn = t2, SetTreeNode$1__get_Height(tn))) : 1);
     }
     else {
@@ -85,7 +86,7 @@ export function SetTreeModule_mk(l, k, r) {
     let hr;
     const t_1 = r;
     if (t_1 != null) {
-        const t2_1 = value_2(t_1);
+        const t2_1 = t_1;
         hr = ((t2_1 instanceof SetTreeNode$1) ? ((tn_1 = t2_1, SetTreeNode$1__get_Height(tn_1))) : 1);
     }
     else {
@@ -104,7 +105,7 @@ export function SetTreeModule_rebalance(t1, v, t2) {
     let t1h;
     const t = t1;
     if (t != null) {
-        const t2_1 = value_2(t);
+        const t2_1 = t;
         t1h = ((t2_1 instanceof SetTreeNode$1) ? ((tn = t2_1, SetTreeNode$1__get_Height(tn))) : 1);
     }
     else {
@@ -113,7 +114,7 @@ export function SetTreeModule_rebalance(t1, v, t2) {
     let t2h;
     const t_1 = t2;
     if (t_1 != null) {
-        const t2_2 = value_2(t_1);
+        const t2_2 = t_1;
         t2h = ((t2_2 instanceof SetTreeNode$1) ? ((tn_1 = t2_2, SetTreeNode$1__get_Height(tn_1))) : 1);
     }
     else {
@@ -123,7 +124,7 @@ export function SetTreeModule_rebalance(t1, v, t2) {
         const matchValue = value_2(t2);
         if (matchValue instanceof SetTreeNode$1) {
             const t2$0027 = matchValue;
-            if (((t_2 = SetTreeNode$1__get_Left(t2$0027), (t_2 != null) ? ((t2_3 = value_2(t_2), (t2_3 instanceof SetTreeNode$1) ? ((tn_2 = t2_3, SetTreeNode$1__get_Height(tn_2))) : 1)) : 0)) > (t1h + 1)) {
+            if (((t_2 = SetTreeNode$1__get_Left(t2$0027), (t_2 != null) ? ((t2_3 = t_2, (t2_3 instanceof SetTreeNode$1) ? ((tn_2 = t2_3, SetTreeNode$1__get_Height(tn_2))) : 1)) : 0)) > (t1h + 1)) {
                 const matchValue_1 = value_2(SetTreeNode$1__get_Left(t2$0027));
                 if (matchValue_1 instanceof SetTreeNode$1) {
                     const t2l = matchValue_1;
@@ -145,7 +146,7 @@ export function SetTreeModule_rebalance(t1, v, t2) {
         const matchValue_2 = value_2(t1);
         if (matchValue_2 instanceof SetTreeNode$1) {
             const t1$0027 = matchValue_2;
-            if (((t_3 = SetTreeNode$1__get_Right(t1$0027), (t_3 != null) ? ((t2_4 = value_2(t_3), (t2_4 instanceof SetTreeNode$1) ? ((tn_3 = t2_4, SetTreeNode$1__get_Height(tn_3))) : 1)) : 0)) > (t2h + 1)) {
+            if (((t_3 = SetTreeNode$1__get_Right(t1$0027), (t_3 != null) ? ((t2_4 = t_3, (t2_4 instanceof SetTreeNode$1) ? ((tn_3 = t2_4, SetTreeNode$1__get_Height(tn_3))) : 1)) : 0)) > (t2h + 1)) {
                 const matchValue_3 = value_2(SetTreeNode$1__get_Right(t1$0027));
                 if (matchValue_3 instanceof SetTreeNode$1) {
                     const t1r = matchValue_3;
@@ -169,7 +170,7 @@ export function SetTreeModule_rebalance(t1, v, t2) {
 }
 export function SetTreeModule_add(comparer, k, t) {
     if (t != null) {
-        const t2 = value_2(t);
+        const t2 = t;
         const c = comparer.Compare(k, SetTreeLeaf$1__get_Key(t2)) | 0;
         if (t2 instanceof SetTreeNode$1) {
             const tn = t2;
@@ -202,9 +203,9 @@ export function SetTreeModule_add(comparer, k, t) {
 }
 export function SetTreeModule_balance(comparer, t1, k, t2) {
     if (t1 != null) {
-        const t1$0027 = value_2(t1);
+        const t1$0027 = t1;
         if (t2 != null) {
-            const t2$0027 = value_2(t2);
+            const t2$0027 = t2;
             if (t1$0027 instanceof SetTreeNode$1) {
                 const t1n = t1$0027;
                 if (t2$0027 instanceof SetTreeNode$1) {
@@ -237,7 +238,7 @@ export function SetTreeModule_balance(comparer, t1, k, t2) {
 }
 export function SetTreeModule_split(comparer, pivot, t) {
     if (t != null) {
-        const t2 = value_2(t);
+        const t2 = t;
         if (t2 instanceof SetTreeNode$1) {
             const tn = t2;
             const c = comparer.Compare(pivot, SetTreeLeaf$1__get_Key(tn)) | 0;
@@ -272,7 +273,7 @@ export function SetTreeModule_split(comparer, pivot, t) {
 }
 export function SetTreeModule_spliceOutSuccessor(t) {
     if (t != null) {
-        const t2 = value_2(t);
+        const t2 = t;
         if (t2 instanceof SetTreeNode$1) {
             const tn = t2;
             if (SetTreeNode$1__get_Left(tn) == null) {
@@ -293,7 +294,7 @@ export function SetTreeModule_spliceOutSuccessor(t) {
 }
 export function SetTreeModule_remove(comparer, k, t) {
     if (t != null) {
-        const t2 = value_2(t);
+        const t2 = t;
         const c = comparer.Compare(k, SetTreeLeaf$1__get_Key(t2)) | 0;
         if (t2 instanceof SetTreeNode$1) {
             const tn = t2;
@@ -331,7 +332,7 @@ export function SetTreeModule_mem(comparer_mut, k_mut, t_mut) {
     SetTreeModule_mem: while (true) {
         const comparer = comparer_mut, k = k_mut, t = t_mut;
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             const c = comparer.Compare(k, SetTreeLeaf$1__get_Key(t2)) | 0;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
@@ -365,7 +366,7 @@ export function SetTreeModule_iter(f_mut, t_mut) {
     SetTreeModule_iter: while (true) {
         const f = f_mut, t = t_mut;
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 SetTreeModule_iter(f, SetTreeNode$1__get_Left(tn));
@@ -385,7 +386,7 @@ export function SetTreeModule_foldBackOpt(f_mut, t_mut, x_mut) {
     SetTreeModule_foldBackOpt: while (true) {
         const f = f_mut, t = t_mut, x = x_mut;
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 f_mut = f;
@@ -410,7 +411,7 @@ export function SetTreeModule_foldOpt(f_mut, x_mut, t_mut) {
     SetTreeModule_foldOpt: while (true) {
         const f = f_mut, x = x_mut, t = t_mut;
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 f_mut = f;
@@ -435,7 +436,7 @@ export function SetTreeModule_forall(f_mut, t_mut) {
     SetTreeModule_forall: while (true) {
         const f = f_mut, t = t_mut;
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 if (f(SetTreeLeaf$1__get_Key(tn)) && SetTreeModule_forall(f, SetTreeNode$1__get_Left(tn))) {
@@ -461,7 +462,7 @@ export function SetTreeModule_exists(f_mut, t_mut) {
     SetTreeModule_exists: while (true) {
         const f = f_mut, t = t_mut;
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 if (f(SetTreeLeaf$1__get_Key(tn)) ? true : SetTreeModule_exists(f, SetTreeNode$1__get_Left(tn))) {
@@ -498,7 +499,7 @@ export function SetTreeModule_filterAux(comparer_mut, f_mut, t_mut, acc_mut) {
     SetTreeModule_filterAux: while (true) {
         const comparer = comparer_mut, f = f_mut, t = t_mut, acc = acc_mut;
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 const acc_1 = f(SetTreeLeaf$1__get_Key(tn)) ? SetTreeModule_add(comparer, SetTreeLeaf$1__get_Key(tn), acc) : acc;
@@ -531,7 +532,7 @@ export function SetTreeModule_diffAux(comparer_mut, t_mut, acc_mut) {
             return acc;
         }
         else if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 comparer_mut = comparer;
@@ -554,9 +555,9 @@ export function SetTreeModule_diff(comparer, a, b) {
 }
 export function SetTreeModule_union(comparer, t1, t2) {
     if (t1 != null) {
-        const t1$0027 = value_2(t1);
+        const t1$0027 = t1;
         if (t2 != null) {
-            const t2$0027 = value_2(t2);
+            const t2$0027 = t2;
             if (t1$0027 instanceof SetTreeNode$1) {
                 const t1n = t1$0027;
                 if (t2$0027 instanceof SetTreeNode$1) {
@@ -590,7 +591,7 @@ export function SetTreeModule_intersectionAux(comparer_mut, b_mut, t_mut, acc_mu
     SetTreeModule_intersectionAux: while (true) {
         const comparer = comparer_mut, b = b_mut, t = t_mut, acc = acc_mut;
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 const acc_1 = SetTreeModule_intersectionAux(comparer, b, SetTreeNode$1__get_Right(tn), acc);
@@ -630,7 +631,7 @@ export function SetTreeModule_partitionAux(comparer_mut, f_mut, t_mut, acc__mut,
         const comparer = comparer_mut, f = f_mut, t = t_mut, acc_ = acc__mut, acc__1 = acc__1_mut;
         const acc = [acc_, acc__1];
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 const acc_1 = SetTreeModule_partitionAux(comparer, f, SetTreeNode$1__get_Right(tn), acc[0], acc[1]);
@@ -659,7 +660,7 @@ export function SetTreeModule_minimumElementAux(t_mut, n_mut) {
     SetTreeModule_minimumElementAux: while (true) {
         const t = t_mut, n = n_mut;
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 t_mut = SetTreeNode$1__get_Left(tn);
@@ -678,7 +679,7 @@ export function SetTreeModule_minimumElementAux(t_mut, n_mut) {
 }
 export function SetTreeModule_minimumElementOpt(t) {
     if (t != null) {
-        const t2 = value_2(t);
+        const t2 = t;
         if (t2 instanceof SetTreeNode$1) {
             const tn = t2;
             return some(SetTreeModule_minimumElementAux(SetTreeNode$1__get_Left(tn), SetTreeLeaf$1__get_Key(tn)));
@@ -695,7 +696,7 @@ export function SetTreeModule_maximumElementAux(t_mut, n_mut) {
     SetTreeModule_maximumElementAux: while (true) {
         const t = t_mut, n = n_mut;
         if (t != null) {
-            const t2 = value_2(t);
+            const t2 = t;
             if (t2 instanceof SetTreeNode$1) {
                 const tn = t2;
                 t_mut = SetTreeNode$1__get_Right(tn);
@@ -714,7 +715,7 @@ export function SetTreeModule_maximumElementAux(t_mut, n_mut) {
 }
 export function SetTreeModule_maximumElementOpt(t) {
     if (t != null) {
-        const t2 = value_2(t);
+        const t2 = t;
         if (t2 instanceof SetTreeNode$1) {
             const tn = t2;
             return some(SetTreeModule_maximumElementAux(SetTreeNode$1__get_Right(tn), SetTreeLeaf$1__get_Key(tn)));
@@ -730,7 +731,7 @@ export function SetTreeModule_maximumElementOpt(t) {
 export function SetTreeModule_minimumElement(s) {
     const matchValue = SetTreeModule_minimumElementOpt(s);
     if (matchValue == null) {
-        throw new Exception("Set contains no elements");
+        throw Operators_InvalidArg("s", "Set contains no elements.");
     }
     else {
         return value_2(matchValue);
@@ -739,7 +740,7 @@ export function SetTreeModule_minimumElement(s) {
 export function SetTreeModule_maximumElement(s) {
     const matchValue = SetTreeModule_maximumElementOpt(s);
     if (matchValue == null) {
-        throw new Exception("Set contains no elements");
+        throw Operators_InvalidArg("s", "Set contains no elements.");
     }
     else {
         return value_2(matchValue);
@@ -751,6 +752,12 @@ export class SetTreeModule_SetIterator$1 extends Record {
         this.stack = stack;
         this.started = started;
     }
+    Equals(other) {
+        return this === other;
+    }
+    GetHashCode() {
+        return physicalHash(this);
+    }
 }
 export function SetTreeModule_SetIterator$1_$reflection(gen0) {
     return record_type("Set.SetTreeModule.SetIterator`1", [gen0], SetTreeModule_SetIterator$1, () => [["stack", list_type(option_type(SetTreeLeaf$1_$reflection(gen0)))], ["started", bool_type]]);
@@ -762,7 +769,7 @@ export function SetTreeModule_collapseLHS(stack_mut) {
             const x = head(stack);
             const rest = tail(stack);
             if (x != null) {
-                const x2 = value_2(x);
+                const x2 = x;
                 if (x2 instanceof SetTreeNode$1) {
                     const xn = x2;
                     stack_mut = ofArrayWithTail([SetTreeNode$1__get_Left(xn), SetTreeLeaf$1_$ctor_2B595(SetTreeLeaf$1__get_Key(xn)), SetTreeNode$1__get_Right(xn)], rest);
@@ -787,10 +794,10 @@ export function SetTreeModule_mkIterator(s) {
     return new SetTreeModule_SetIterator$1(SetTreeModule_collapseLHS(singleton_1(s)), false);
 }
 export function SetTreeModule_notStarted() {
-    throw new Exception("Enumeration not started");
+    throw Operators_InvalidOp("Enumeration has not started. Call MoveNext.");
 }
 export function SetTreeModule_alreadyFinished() {
-    throw new Exception("Enumeration already started");
+    throw Operators_InvalidOp("Enumeration already finished.");
 }
 export function SetTreeModule_current(i) {
     if (i.started) {
@@ -799,7 +806,7 @@ export function SetTreeModule_current(i) {
             return SetTreeModule_alreadyFinished();
         }
         else if (head(matchValue) != null) {
-            const t = value_2(head(matchValue));
+            const t = head(matchValue);
             return SetTreeLeaf$1__get_Key(t);
         }
         else {
@@ -815,7 +822,7 @@ export function SetTreeModule_moveNext(i) {
         const matchValue = i.stack;
         if (!isEmpty_1(matchValue)) {
             if (head(matchValue) != null) {
-                const t = value_2(head(matchValue));
+                const t = head(matchValue);
                 if (t instanceof SetTreeNode$1) {
                     throw new Exception("Please report error: Set iterator, unexpected stack for moveNext");
                 }
@@ -866,8 +873,8 @@ export function SetTreeModule_compareStacks(comparer_mut, l1_mut, l2_mut) {
             if (!isEmpty_1(l2)) {
                 if (head(l2) != null) {
                     if (head(l1) != null) {
-                        const x1_3 = value_2(head(l1));
-                        const x2_3 = value_2(head(l2));
+                        const x1_3 = head(l1);
+                        const x2_3 = head(l2);
                         if (x1_3 instanceof SetTreeNode$1) {
                             const x1n_2 = x1_3;
                             if (SetTreeNode$1__get_Left(x1n_2) == null) {
@@ -891,13 +898,13 @@ export function SetTreeModule_compareStacks(comparer_mut, l1_mut, l2_mut) {
                                             if (head(l1) != null) {
                                                 matchResult = 0;
                                                 t1_6 = tail(l1);
-                                                x1_4 = value_2(head(l1));
+                                                x1_4 = head(l1);
                                             }
                                             else if (!isEmpty_1(l2)) {
                                                 if (head(l2) != null) {
                                                     matchResult = 1;
                                                     t2_6 = tail(l2);
-                                                    x2_4 = value_2(head(l2));
+                                                    x2_4 = head(l2);
                                                 }
                                                 else {
                                                     matchResult = 2;
@@ -911,7 +918,7 @@ export function SetTreeModule_compareStacks(comparer_mut, l1_mut, l2_mut) {
                                             if (head(l2) != null) {
                                                 matchResult = 1;
                                                 t2_6 = tail(l2);
-                                                x2_4 = value_2(head(l2));
+                                                x2_4 = head(l2);
                                             }
                                             else {
                                                 matchResult = 2;
@@ -973,13 +980,13 @@ export function SetTreeModule_compareStacks(comparer_mut, l1_mut, l2_mut) {
                                     if (head(l1) != null) {
                                         matchResult_1 = 0;
                                         t1_7 = tail(l1);
-                                        x1_5 = value_2(head(l1));
+                                        x1_5 = head(l1);
                                     }
                                     else if (!isEmpty_1(l2)) {
                                         if (head(l2) != null) {
                                             matchResult_1 = 1;
                                             t2_7 = tail(l2);
-                                            x2_5 = value_2(head(l2));
+                                            x2_5 = head(l2);
                                         }
                                         else {
                                             matchResult_1 = 2;
@@ -993,7 +1000,7 @@ export function SetTreeModule_compareStacks(comparer_mut, l1_mut, l2_mut) {
                                     if (head(l2) != null) {
                                         matchResult_1 = 1;
                                         t2_7 = tail(l2);
-                                        x2_5 = value_2(head(l2));
+                                        x2_5 = head(l2);
                                     }
                                     else {
                                         matchResult_1 = 2;
@@ -1056,13 +1063,13 @@ export function SetTreeModule_compareStacks(comparer_mut, l1_mut, l2_mut) {
                                     if (head(l1) != null) {
                                         matchResult_2 = 0;
                                         t1_8 = tail(l1);
-                                        x1_6 = value_2(head(l1));
+                                        x1_6 = head(l1);
                                     }
                                     else if (!isEmpty_1(l2)) {
                                         if (head(l2) != null) {
                                             matchResult_2 = 1;
                                             t2_8 = tail(l2);
-                                            x2_6 = value_2(head(l2));
+                                            x2_6 = head(l2);
                                         }
                                         else {
                                             matchResult_2 = 2;
@@ -1076,7 +1083,7 @@ export function SetTreeModule_compareStacks(comparer_mut, l1_mut, l2_mut) {
                                     if (head(l2) != null) {
                                         matchResult_2 = 1;
                                         t2_8 = tail(l2);
-                                        x2_6 = value_2(head(l2));
+                                        x2_6 = head(l2);
                                     }
                                     else {
                                         matchResult_2 = 2;
@@ -1133,19 +1140,19 @@ export function SetTreeModule_compareStacks(comparer_mut, l1_mut, l2_mut) {
                         }
                     }
                     else {
-                        const x2 = value_2(head(l2));
+                        const x2 = head(l2);
                         let matchResult_3 = undefined, t1_2 = undefined, x1 = undefined, t2_2 = undefined, x2_1 = undefined;
                         if (!isEmpty_1(l1)) {
                             if (head(l1) != null) {
                                 matchResult_3 = 0;
                                 t1_2 = tail(l1);
-                                x1 = value_2(head(l1));
+                                x1 = head(l1);
                             }
                             else if (!isEmpty_1(l2)) {
                                 if (head(l2) != null) {
                                     matchResult_3 = 1;
                                     t2_2 = tail(l2);
-                                    x2_1 = value_2(head(l2));
+                                    x2_1 = head(l2);
                                 }
                                 else {
                                     matchResult_3 = 2;
@@ -1159,7 +1166,7 @@ export function SetTreeModule_compareStacks(comparer_mut, l1_mut, l2_mut) {
                             if (head(l2) != null) {
                                 matchResult_3 = 1;
                                 t2_2 = tail(l2);
-                                x2_1 = value_2(head(l2));
+                                x2_1 = head(l2);
                             }
                             else {
                                 matchResult_3 = 2;
@@ -1203,19 +1210,19 @@ export function SetTreeModule_compareStacks(comparer_mut, l1_mut, l2_mut) {
                     }
                 }
                 else if (head(l1) != null) {
-                    const x1_1 = value_2(head(l1));
+                    const x1_1 = head(l1);
                     let matchResult_4 = undefined, t1_4 = undefined, x1_2 = undefined, t2_4 = undefined, x2_2 = undefined;
                     if (!isEmpty_1(l1)) {
                         if (head(l1) != null) {
                             matchResult_4 = 0;
                             t1_4 = tail(l1);
-                            x1_2 = value_2(head(l1));
+                            x1_2 = head(l1);
                         }
                         else if (!isEmpty_1(l2)) {
                             if (head(l2) != null) {
                                 matchResult_4 = 1;
                                 t2_4 = tail(l2);
-                                x2_2 = value_2(head(l2));
+                                x2_2 = head(l2);
                             }
                             else {
                                 matchResult_4 = 2;
@@ -1229,7 +1236,7 @@ export function SetTreeModule_compareStacks(comparer_mut, l1_mut, l2_mut) {
                         if (head(l2) != null) {
                             matchResult_4 = 1;
                             t2_4 = tail(l2);
-                            x2_2 = value_2(head(l2));
+                            x2_2 = head(l2);
                         }
                         else {
                             matchResult_4 = 2;
@@ -1315,7 +1322,7 @@ export function SetTreeModule_toList(t) {
         loop: while (true) {
             const t$0027 = t$0027_mut, acc = acc_mut;
             if (t$0027 != null) {
-                const t2 = value_2(t$0027);
+                const t2 = t$0027;
                 if (t2 instanceof SetTreeNode$1) {
                     const tn = t2;
                     t$0027_mut = SetTreeNode$1__get_Left(tn);

package/String.js

@@ -1,5 +1,5 @@
 import { toString as dateToString } from "./Date.js";
-import { compare as numericCompare, divide, isNumeric, isIntegral, multiply, toExponential, toFixed, toHex, toPrecision } from "./Numeric.js";
+import { compare as numericCompare, divide, isNumeric, isIntegral, multiply, toExponential, toFixed, toHex, toPrecision, toRadix } from "./Numeric.js";
 import { escape } from "./RegExp.js";
 import { toString } from "./Types.js";
 import { Exception } from "./Util.js";
@@ -207,19 +207,16 @@ function formatReplacement(rep, flags, padLength, precision, format) {
     flags = flags || "";
     format = format || "";
     if (isNumeric(rep)) {
-        if (format.toLowerCase() !== "x") {
-            if (isLessThan(rep, 0)) {
-                rep = multiply(rep, -1);
-                sign = "-";
-            }
-            else {
-                if (flags.indexOf(" ") >= 0) {
-                    sign = " ";
-                }
-                else if (flags.indexOf("+") >= 0) {
-                    sign = "+";
-                }
-            }
+        const radix = format === "x" || format === "X" ? 16 : format === "o" ? 8 : 10;
+        if (radix === 10 && isLessThan(rep, 0)) {
+            rep = multiply(rep, -1);
+            sign = "-";
+        }
+        else if (flags.indexOf(" ") >= 0) {
+            sign = " ";
+        }
+        else if (flags.indexOf("+") >= 0) {
+            sign = "+";
         }
         precision = precision == null ? null : parseInt(precision, 10);
         switch (format) {
@@ -237,10 +234,11 @@ function formatReplacement(rep, flags, padLength, precision, format) {
                 rep = precision != null ? toExponential(rep, precision) : toExponential(rep);
                 break;
             case "x":
-                rep = toHex(rep);
+            case "o":
+                rep = toRadix(rep, radix);
                 break;
             case "X":
-                rep = toHex(rep).toUpperCase();
+                rep = toRadix(rep, radix).toUpperCase();
                 break;
             default: // AOid
                 rep = String(rep);
@@ -346,6 +344,53 @@ function splitIntAndDecimalPart(value) {
 function thousandSeparate(value) {
     return value.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 }
+function splitExponential(s) {
+    const eIdx = s.indexOf("e");
+    return [s.slice(0, eIdx).replace(".", ""), Number(s.slice(eIdx + 1))];
+}
+function shortestSingle(x) {
+    // 100 digits tell where a float32 lies between two candidates, and 9 digits always round-trip
+    const [digits, exponent] = splitExponential(x.toExponential(99));
+    for (let p = 1;; p++) {
+        const down = Number(digits.slice(0, p));
+        const rest = digits.slice(p);
+        const half = "5".padEnd(rest.length, "0");
+        const roundUp = rest > half || rest === half && down % 2 === 1;
+        for (const n of roundUp ? [down + 1, down] : [down, down + 1]) {
+            if (Math.fround(Number(n + "e" + (exponent - p + 1))) === x) {
+                return [String(n), exponent + String(n).length - p];
+            }
+        }
+    }
+}
+// .NET "G" and "R": fixed notation unless the exponent is below -4 or reaches the precision (17 for the shortest digits, 9 for a float32)
+function formatGeneral(x, format, precision, isSingle = false) {
+    if (!Number.isFinite(x)) {
+        return String(x);
+    }
+    const sign = x < 0 || Object.is(x, -0) ? "-" : "";
+    x = Math.abs(x);
+    // R ignores the precision and G0 is G
+    const p = format === "r" || format === "R" ? 0 : precision ?? 0;
+    const [significand, exponent] = p > 0 ? splitExponential(x.toExponential(p - 1)) : isSingle ? shortestSingle(x) : splitExponential(x.toExponential());
+    const digits = trimEnd(significand, "0") || "0";
+    if (exponent < -4 || exponent >= (p > 0 ? p : isSingle ? 9 : 17)) {
+        const mantissa = digits.length > 1 ? digits[0] + "." + digits.slice(1) : digits;
+        const eChar = format === "G" || format === "R" ? "E" : "e";
+        return sign + mantissa + eChar + (exponent < 0 ? "-" : "+") + padLeft(String(Math.abs(exponent)), 2, "0");
+    }
+    else if (exponent < 0) {
+        return sign + "0." + "0".repeat(-exponent - 1) + digits;
+    }
+    else {
+        const decimals = digits.slice(exponent + 1);
+        return sign + digits.slice(0, exponent + 1).padEnd(exponent + 1, "0") + (decimals ? "." + decimals : "");
+    }
+}
+export function formatSingle(str, x) {
+    const m = /^\{0:([GgRr])(\d{0,2})\}$/.exec(str);
+    return m != null ? formatGeneral(Math.fround(x), m[1], m[2] ? parseInt(m[2], 10) : null, true) : format(str, x);
+}
 export function format(str, ...args) {
     let str2;
     if (typeof str === "object") {
@@ -425,12 +470,18 @@ export function format(str, ...args) {
                     }
                     break;
                 case "g":
-                case "G": {
-                    if (precision == null && typeof rep !== "number" && typeof rep !== "bigint") {
+                case "G":
+                case "r":
+                case "R": {
+                    if (typeof rep === "number") {
+                        rep = formatGeneral(rep, format, precision);
+                        break;
+                    }
+                    if (precision == null) {
                         rep = String(rep);
                         break;
                     }
-                    rep = precision != null ? toPrecision(rep, precision) : toPrecision(rep);
+                    rep = toPrecision(rep, precision);
                     // Handle exponential notation: only trim trailing zeros from mantissa, not from exponent.
                     // .NET G format guarantees an exponent of at least 2 digits with an explicit sign (e.g. "E-07").
                     const eIdx = rep.indexOf("e");
@@ -439,7 +490,7 @@ export function format(str, ...args) {
                         const expSign = rep[eIdx + 1]; // toPrecision always emits "+" or "-"
                         const expDigits = rep.slice(eIdx + 2);
                         const paddedExpDigits = expDigits.length < 2 ? "0" + expDigits : expDigits;
-                        const eChar = format === "G" ? "E" : "e";
+                        const eChar = format === "G" || format === "R" ? "E" : "e";
                         rep = mantissa + eChar + expSign + paddedExpDigits;
                     }
                     else if (rep.indexOf(".") >= 0) {
@@ -471,9 +522,6 @@ export function format(str, ...args) {
                         rep = thousandSeparate(parts.integral) + " %";
                     }
                     break;
-                case "r":
-                case "R":
-                    throw new Exception("The round-trip format is not supported by Fable");
                 case "x":
                 case "X":
                     if (!isIntegral(rep)) {

package/System.Collections.Generic.js

@@ -5,6 +5,7 @@ import { toArray, empty, singleton, append, enumerateWhile, delay } from "./Seq.
 import { setItem, initialize, copyTo, fill, item as item_1 } from "./Array.js";
 import { max } from "./Double.js";
 import { ArgumentOutOfRangeException_$ctor_Z721C83C5 } from "./System.js";
+import { Operators_InvalidOp } from "./FSharp.Core.js";
 export class KeyNotFoundException extends Exception {
     constructor(message) {
         super(message);
@@ -231,7 +232,7 @@ export function Queue$1__Enqueue_2B595(_, value) {
 }
 export function Queue$1__Dequeue(_) {
     if (_.count === 0) {
-        throw new Exception("Queue is empty");
+        throw Operators_InvalidOp("Queue is empty");
     }
     const value = item_1(_.head, _.contents);
     _.head = (((_.head + 1) % Queue$1__size(_)) | 0);
@@ -240,7 +241,7 @@ export function Queue$1__Dequeue(_) {
 }
 export function Queue$1__Peek(_) {
     if (_.count === 0) {
-        throw new Exception("Queue is empty");
+        throw Operators_InvalidOp("Queue is empty");
     }
     return item_1(_.head, _.contents);
 }

package/System.Text.js

@@ -1,4 +1,4 @@
-import { replace, format, replicate, substring, isNullOrEmpty, join } from "./String.js";
+import { replace, getCharAtIndex, format, replicate, substring, isNullOrEmpty, join } from "./String.js";
 import { class_type } from "./Reflection.js";
 import { toString } from "./Types.js";
 import { Exception, clear, int64ToString, int32ToString, int16ToString } from "./Util.js";
@@ -160,7 +160,7 @@ export function StringBuilder__get_Chars_Z524259A4(x, index) {
     }
     else {
         const pos = (index - len) | 0;
-        return item(i, x.buf)[pos];
+        return getCharAtIndex(item(i, x.buf), pos);
     }
 }
 export function StringBuilder__set_Chars_413E0D0A(x, index, value) {