@magnusopera/fscript 0.79.0 → 0.80.1

package/dist/FScript.Language/TypeInfer.js

@@ -1,9 +1,9 @@
 
 import { Span_$reflection, Span, Position } from "./Span.js";
-import { iterate as iterate_2, FSharpMap__Add, values, FSharpMap__get_Keys, keys, FSharpMap__TryFind, ofList, toList, FSharpMap__get_Item, FSharpMap__ContainsKey, FSharpMap__get_Count, exists as exists_1, add, fold as fold_1, remove, map as map_1, tryFind, isEmpty, empty } from "../fable_modules/fable-library-js.5.13.0/Map.js";
+import { iterate as iterate_2, FSharpMap__Add, values, forAll, FSharpMap__get_Keys, keys, FSharpMap__TryFind, ofList, toList, FSharpMap__get_Item, FSharpMap__ContainsKey, FSharpMap__get_Count, exists as exists_1, add, fold as fold_1, remove, map as map_1, tryFind, isEmpty, empty } from "../fable_modules/fable-library-js.5.13.0/Map.js";
 import { disposeSafe, getEnumerator, stringHash, compareArrays, equals, comparePrimitives } from "../fable_modules/fable-library-js.5.13.0/Util.js";
 import { Types_generalize, Types_freshNumeric, Type_$reflection, Types_freshVar, Types_typeToString, Scheme, Type } from "./Types.js";
-import { tryFind as tryFind_1, indexed, ofArray, collect, append, iterate, reverse, tryFindIndex, choose, tail as tail_2, cons, head as head_1, isEmpty as isEmpty_1, empty as empty_2, singleton, zip, length, exists, fold, map } from "../fable_modules/fable-library-js.5.13.0/List.js";
+import { tryFind as tryFind_1, indexed, ofArray, collect, append, reverse, iterate, tryFindIndex, choose, tail as tail_2, cons, head as head_1, isEmpty as isEmpty_1, empty as empty_2, singleton, zip, length, exists, fold, map } from "../fable_modules/fable-library-js.5.13.0/List.js";
 import { toList as toList_2, ofSeq, contains, add as add_1, empty as empty_1, FSharpSet__Add, FSharpSet__Contains } from "../fable_modules/fable-library-js.5.13.0/Set.js";
 import { TypeException, TypeError$ } from "./Error.js";
 import { endsWith, split, join, concat, isNullOrWhiteSpace, printf, toText } from "../fable_modules/fable-library-js.5.13.0/String.js";
@@ -1283,11 +1283,15 @@ function annotationTypeFromRef(typeDefs, span, tref) {
                 default:
                     throw new TypeException(new TypeError$(concat("Unknown type suffix \'", tref.fields[1], "\'"), span));
             }
-        case 4:
+        case 4: {
+            const key = annotationTypeFromRef(typeDefs, span, tref.fields[0]);
+            return new Type(/* TMap */ 9, [(key.tag === 16) ? Type.TInt : key, annotationTypeFromRef(typeDefs, span, tref.fields[1])]);
+        }
+        case 5:
             return resolveNamedRecordByShape(typeDefs, ofList(map((tupledArg) => [tupledArg[0], annotationTypeFromRef(typeDefs, span, tupledArg[1])], tref.fields[0]), {
                 Compare: (x, y) => (comparePrimitives(x, y) | 0),
             }), span);
-        case 5:
+        case 6:
             return new Type(/* TRecord */ 8, [ofList(map((tupledArg_1) => [tupledArg_1[0], annotationTypeFromRef(typeDefs, span, tupledArg_1[1])], tref.fields[0]), {
                 Compare: (x_1, y_1) => (comparePrimitives(x_1, y_1) | 0),
             })]);
@@ -1348,11 +1352,15 @@ function typeFromRef(decls, stack, tref) {
                     throw new TypeException(new TypeError$(concat("Unknown type suffix \'", suffix, "\'"), unknownSpan));
             }
         }
-        case 4:
+        case 4: {
+            const key = typeFromRef(decls, stack, tref.fields[0]);
+            return new Type(/* TMap */ 9, [(key.tag === 16) ? Type.TInt : key, typeFromRef(decls, stack, tref.fields[1])]);
+        }
+        case 5:
             return new Type(/* TRecord */ 8, [ofList(map((tupledArg_1) => [tupledArg_1[0], typeFromRef(decls, stack, tupledArg_1[1])], tref.fields[0]), {
                 Compare: (x_1, y_2) => (comparePrimitives(x_1, y_2) | 0),
             })]);
-        case 5:
+        case 6:
             return new Type(/* TRecord */ 8, [ofList(map((tupledArg_2) => [tupledArg_2[0], typeFromRef(decls, stack, tupledArg_2[1])], tref.fields[0]), {
                 Compare: (x_2, y_3) => (comparePrimitives(x_2, y_3) | 0),
             })]);
@@ -1398,6 +1406,137 @@ function typeFromRef(decls, stack, tref) {
     }
 }
 
+function ensureSupportedMapKeyType(typeDefs, span, t) {
+    switch (t.tag) {
+        case 4:
+        case 1:
+        case 3:
+        case 15:
+        case 16: {
+            break;
+        }
+        case 12: {
+            const matchValue = FSharpMap__TryFind(typeDefs, t.fields[0]);
+            let matchResult, cases_1;
+            if (matchValue != null) {
+                if (matchValue.tag === 13) {
+                    if (forAll((_arg, payload) => (payload == null), matchValue.fields[1])) {
+                        matchResult = 0;
+                        cases_1 = matchValue.fields[1];
+                    }
+                    else {
+                        matchResult = 1;
+                    }
+                }
+                else {
+                    matchResult = 1;
+                }
+            }
+            else {
+                matchResult = 1;
+            }
+            switch (matchResult) {
+                case 0: {
+                    break;
+                }
+                case 1: {
+                    throw new TypeException(new TypeError$(concat("Map key type must be string, int, bool, or a payload-free union, got ", Types_typeToString(t)), span));
+                    break;
+                }
+            }
+            break;
+        }
+        default:
+            throw new TypeException(new TypeError$(concat("Map key type must be string, int, bool, or a payload-free union, got ", Types_typeToString(t)), span));
+    }
+}
+
+function constrainMapKeyTypes(typeDefs, span, t) {
+    let subst = emptySubst;
+    const loop = (current_mut) => {
+        loop:
+        while (true) {
+            const current = current_mut;
+            const matchValue = applyType(subst, current);
+            let matchResult, inner;
+            switch (matchValue.tag) {
+                case 9: {
+                    matchResult = 0;
+                    break;
+                }
+                case 5: {
+                    matchResult = 1;
+                    inner = matchValue.fields[0];
+                    break;
+                }
+                case 6: {
+                    matchResult = 1;
+                    inner = matchValue.fields[0];
+                    break;
+                }
+                case 10: {
+                    matchResult = 1;
+                    inner = matchValue.fields[0];
+                    break;
+                }
+                case 7: {
+                    matchResult = 2;
+                    break;
+                }
+                case 8: {
+                    matchResult = 3;
+                    break;
+                }
+                case 11: {
+                    matchResult = 4;
+                    break;
+                }
+                default:
+                    matchResult = 5;
+            }
+            switch (matchResult) {
+                case 0: {
+                    const keyType = matchValue.fields[0];
+                    if (keyType.tag === 16) {
+                        subst = compose(unify(typeDefs, keyType, Type.TInt, span), subst);
+                    }
+                    else {
+                        ensureSupportedMapKeyType(typeDefs, span, keyType);
+                    }
+                    current_mut = matchValue.fields[1];
+                    continue loop;
+                    break;
+                }
+                case 1: {
+                    current_mut = inner;
+                    continue loop;
+                    break;
+                }
+                case 2: {
+                    iterate(loop, matchValue.fields[0]);
+                    break;
+                }
+                case 3: {
+                    iterate_1(loop, values(matchValue.fields[0]));
+                    break;
+                }
+                case 4: {
+                    loop(matchValue.fields[0]);
+                    current_mut = matchValue.fields[1];
+                    continue loop;
+                    break;
+                }
+                case 5: {
+                    break;
+                }
+            }
+            break;
+        }
+    };
+    loop(t);
+    return subst;
+}
+
 function inferPattern(telemetry, typeDefs, constructors, pat) {
     let table_5;
     switch (pat.tag) {
@@ -1457,15 +1596,8 @@ function inferPattern(telemetry, typeDefs, constructors, pat) {
             const tailPattern = pat.fields[1];
             const span_1 = pat.fields[2];
             const startIndex_1 = currentTelemetryCaptureCount(telemetry) | 0;
-            const ensureSupportedMapKeyType = (t_1) => {
-                switch (t_1.tag) {
-                    case 4:
-                    case 15: {
-                        break;
-                    }
-                    default:
-                        throw new TypeException(new TypeError$(concat("Map key type must be string, got ", Types_typeToString(t_1)), span_1));
-                }
+            const ensureSupportedMapKeyType_1 = (t_1) => {
+                ensureSupportedMapKeyType(typeDefs, span_1, t_1);
             };
             const mapKeyType = Types_freshVar();
             const valueType = Types_freshVar();
@@ -1481,7 +1613,7 @@ function inferPattern(telemetry, typeDefs, constructors, pat) {
                     const patternInput_7 = inferPattern(telemetry, typeDefs, constructors, forLoopVar[1]);
                     const sKey = unify(typeDefs, applyType(sAcc, patternInput_6[1]), applyType(sAcc, mapKeyType), span_1);
                     sAcc = compose(sKey, sAcc);
-                    ensureSupportedMapKeyType(applyType(sAcc, mapKeyType));
+                    ensureSupportedMapKeyType_1(applyType(sAcc, mapKeyType));
                     const sValue = unify(typeDefs, applyType(sAcc, patternInput_7[1]), applyType(sAcc, valueType), span_1);
                     sAcc = compose(sValue, sAcc);
                     const mergedClauseEnv = map_1((_arg_1, t_2) => applyType(sAcc, t_2), fold_1((acc_3, k_3, v_3) => add(k_3, v_3, acc_3), patternInput_7[0], patternInput_6[0]));
@@ -1500,7 +1632,7 @@ function inferPattern(telemetry, typeDefs, constructors, pat) {
                 sAcc = compose(sTail, sAcc);
                 envAcc_2 = ((table_5 = map_1((_arg_2, t_3) => applyType(sAcc, t_3), patternInput_8[0]), fold_1((acc_5, k_5, v_5) => add(k_5, v_5, acc_5), envAcc_2, table_5)));
             }
-            ensureSupportedMapKeyType(applyType(sAcc, mapKeyType));
+            ensureSupportedMapKeyType_1(applyType(sAcc, mapKeyType));
             applySubstToCapturedLocals(telemetry, startIndex_1, sAcc);
             return [map_1((_arg_3, t_4) => applyType(sAcc, t_4), envAcc_2), new Type(/* TMap */ 9, [applyType(sAcc, mapKeyType), applyType(sAcc, valueType)])];
         }
@@ -1577,7 +1709,7 @@ function constrainNumeric(typeDefs, t, span) {
     }
 }
 
-function validateMapKeyTypes(span, t) {
+function validateMapKeyTypes(typeDefs, span, t) {
     const loop = (t_1_mut) => {
         loop:
         while (true) {
@@ -1587,14 +1719,7 @@ function validateMapKeyTypes(span, t) {
                     const keyType = t_1.fields[0];
                     loop(keyType);
                     loop(t_1.fields[1]);
-                    switch (keyType.tag) {
-                        case 4:
-                        case 15: {
-                            break;
-                        }
-                        default:
-                            throw new TypeException(new TypeError$(concat("Map key type must be string, got ", Types_typeToString(keyType)), span));
-                    }
+                    ensureSupportedMapKeyType(typeDefs, span, keyType);
                     break;
                 }
                 case 5: {
@@ -1636,6 +1761,15 @@ function validateMapKeyTypes(span, t) {
 }
 
 function inferExpr(telemetry, typeDefs, constructors, env, expr) {
+    const patternInput = inferExprRaw(telemetry, typeDefs, constructors, env, expr);
+    const subst = patternInput[0];
+    const inferred = patternInput[1];
+    const combined = compose(constrainMapKeyTypes(typeDefs, Ast_spanOfExpr(expr), applyType(subst, inferred)), subst);
+    const resolved = applyType(combined, inferred);
+    return [combined, resolved, asTyped(expr, resolved)];
+}
+
+function inferExprRaw(telemetry, typeDefs, constructors, env, expr) {
     let expectedReturn, expectedReturn_1;
     switch (expr.tag) {
         case 1: {
@@ -1709,12 +1843,15 @@ function inferExpr(telemetry, typeDefs, constructors, env, expr) {
             return [s1_1, tFun, asTyped(expr, tFun)];
         }
         case 5: {
+            const span_4 = expr.fields[2];
             const patternInput_3 = inferExpr(telemetry, typeDefs, constructors, env, expr.fields[0]);
             const s1_2 = patternInput_3[0];
             const patternInput_4 = inferExpr(telemetry, typeDefs, constructors, applyEnv(s1_2, env), expr.fields[1]);
+            const t2 = patternInput_4[1];
             const s2 = patternInput_4[0];
             const tv_1 = Types_freshVar();
-            const s_1 = compose(unify(typeDefs, applyType(s2, patternInput_3[1]), new Type(/* TFun */ 11, [patternInput_4[1], tv_1]), expr.fields[2]), compose(s2, s1_2));
+            const combined = compose(unify(typeDefs, applyType(s2, patternInput_3[1]), new Type(/* TFun */ 11, [t2, tv_1]), span_4), compose(s2, s1_2));
+            const s_1 = compose(constrainMapKeyTypes(typeDefs, span_4, applyType(combined, new Type(/* TFun */ 11, [t2, tv_1]))), combined);
             const tRes = applyType(s_1, tv_1);
             return [s_1, tRes, asTyped(expr, tRes)];
         }
@@ -2078,15 +2215,8 @@ function inferExpr(telemetry, typeDefs, constructors, env, expr) {
             return [sAcc_5, tRes_8, asTyped(expr, tRes_8)];
         }
         case 18: {
-            const ensureSupportedMapKeyType = (t_3) => {
-                switch (t_3.tag) {
-                    case 4:
-                    case 15: {
-                        break;
-                    }
-                    default:
-                        throw new TypeException(new TypeError$(concat("Map key type must be string, got ", Types_typeToString(t_3)), expr.fields[1]));
-                }
+            const ensureSupportedMapKeyType_1 = (t_3) => {
+                ensureSupportedMapKeyType(typeDefs, expr.fields[1], t_3);
             };
             const keyType = Types_freshVar();
             const valueType = Types_freshVar();
@@ -2109,7 +2239,7 @@ function inferExpr(telemetry, typeDefs, constructors, env, expr) {
                         const patternInput_30 = inferExpr(telemetry, typeDefs, constructors, applyEnv(sAcc_6, env), keyExpr);
                         const sKey = patternInput_30[0];
                         const sAfterKey = compose(unify(typeDefs, applyType(sKey, patternInput_30[1]), applyType(sKey, applyType(sAcc_6, keyType)), Ast_spanOfExpr(keyExpr)), compose(sKey, sAcc_6));
-                        ensureSupportedMapKeyType(applyType(sAfterKey, keyType));
+                        ensureSupportedMapKeyType_1(applyType(sAfterKey, keyType));
                         const patternInput_31 = inferExpr(telemetry, typeDefs, constructors, applyEnv(sAfterKey, env), valueExpr_3);
                         const sValue_3 = patternInput_31[0];
                         const sValueType = unify(typeDefs, applyType(sValue_3, applyType(sAfterKey, valueType)), patternInput_31[1], Ast_spanOfExpr(valueExpr_3));
@@ -2120,7 +2250,7 @@ function inferExpr(telemetry, typeDefs, constructors, env, expr) {
             finally {
                 disposeSafe(enumerator_8);
             }
-            ensureSupportedMapKeyType(applyType(sAcc_6, keyType));
+            ensureSupportedMapKeyType_1(applyType(sAcc_6, keyType));
             const tRes_9 = new Type(/* TMap */ 9, [applyType(sAcc_6, keyType), applyType(sAcc_6, valueType)]);
             return [sAcc_6, tRes_9, asTyped(expr, tRes_9)];
         }
@@ -2369,7 +2499,9 @@ function inferExpr(telemetry, typeDefs, constructors, env, expr) {
                             matchResult_6 = 2;
                             break;
                         }
-                        case 4: {
+                        case 4:
+                        case 3:
+                        case 12: {
                             matchResult_6 = 3;
                             break;
                         }
@@ -2393,15 +2525,7 @@ function inferExpr(telemetry, typeDefs, constructors, env, expr) {
                 }
                 case 1: {
                     const s_13 = compose(unify(typeDefs, keyType_1, mapKeyType, span_19), compose(s2_10, s1_19));
-                    const matchValue_19 = applyType(s_13, mapKeyType);
-                    switch (matchValue_19.tag) {
-                        case 4:
-                        case 15: {
-                            break;
-                        }
-                        default:
-                            throw new TypeException(new TypeError$(concat("Map key type must be string, got ", Types_typeToString(matchValue_19)), span_19));
-                    }
+                    ensureSupportedMapKeyType(typeDefs, span_19, applyType(s_13, mapKeyType));
                     const tRes_13 = new Type(/* TOption */ 10, [applyType(s_13, valueType_1)]);
                     return [s_13, tRes_13, asTyped(expr, tRes_13)];
                 }
@@ -2413,12 +2537,13 @@ function inferExpr(telemetry, typeDefs, constructors, env, expr) {
                 }
                 case 3: {
                     const valueType_2 = Types_freshVar();
-                    const s_15 = compose(unify(typeDefs, targetType, new Type(/* TMap */ 9, [Type.TString, valueType_2]), span_19), compose(s2_10, s1_19));
+                    ensureSupportedMapKeyType(typeDefs, span_19, keyType_1);
+                    const s_15 = compose(unify(typeDefs, targetType, new Type(/* TMap */ 9, [keyType_1, valueType_2]), span_19), compose(s2_10, s1_19));
                     const tRes_15 = new Type(/* TOption */ 10, [applyType(s_15, valueType_2)]);
                     return [s_15, tRes_15, asTyped(expr, tRes_15)];
                 }
                 case 4:
-                    throw new TypeException(new TypeError$("Ambiguous index access: use a list with int index or a map with string key", span_19));
+                    throw new TypeException(new TypeError$("Ambiguous index access: annotate the list or map target", span_19));
                 default:
                     throw new TypeException(new TypeError$(concat("Index access requires a ", (keyType_1.tag === 1) ? "list" : ((keyType_1.tag === 4) ? "map" : "list or map"), " target with a compatible index type"), span_19));
             }
@@ -2431,11 +2556,13 @@ function inferExpr(telemetry, typeDefs, constructors, env, expr) {
             switch (op) {
                 case "|>": {
                     const patternInput_43 = inferExpr(telemetry, typeDefs, constructors, env, a);
+                    const tLeft = patternInput_43[1];
                     const s1_20 = patternInput_43[0];
                     const patternInput_44 = inferExpr(telemetry, typeDefs, constructors, applyEnv(s1_20, env), b);
                     const s2_11 = patternInput_44[0];
                     const tv_7 = Types_freshVar();
-                    const s_16 = compose(unify(typeDefs, applyType(s2_11, patternInput_44[1]), new Type(/* TFun */ 11, [applyType(s2_11, patternInput_43[1]), tv_7]), span_20), compose(s2_11, s1_20));
+                    const combined_1 = compose(unify(typeDefs, applyType(s2_11, patternInput_44[1]), new Type(/* TFun */ 11, [applyType(s2_11, tLeft), tv_7]), span_20), compose(s2_11, s1_20));
+                    const s_16 = compose(constrainMapKeyTypes(typeDefs, span_20, applyType(combined_1, new Type(/* TFun */ 11, [tLeft, tv_7]))), combined_1);
                     const tRes_16 = applyType(s_16, tv_7);
                     return [s_16, tRes_16, asTyped(expr, tRes_16)];
                 }
@@ -2467,18 +2594,18 @@ function inferExpr(telemetry, typeDefs, constructors, env, expr) {
                     const t2_3 = patternInput_50[1];
                     const s2_14 = patternInput_50[0];
                     const s3_11 = unify(typeDefs, applyType(s2_14, patternInput_49[1]), t2_3, span_20);
-                    const t_9 = applyType(s3_11, t2_3);
+                    const t_8 = applyType(s3_11, t2_3);
                     let patternInput_52;
                     switch (op) {
                         case "+":
                         case "-":
                         case "*":
                         case "/": {
-                            patternInput_52 = constrainNumeric(typeDefs, t_9, span_20);
+                            patternInput_52 = constrainNumeric(typeDefs, t_8, span_20);
                             break;
                         }
                         case "%": {
-                            patternInput_52 = [unify(typeDefs, t_9, Type.TInt, span_20), Type.TInt];
+                            patternInput_52 = [unify(typeDefs, t_8, Type.TInt, span_20), Type.TInt];
                             break;
                         }
                         case "=": {
@@ -2489,12 +2616,12 @@ function inferExpr(telemetry, typeDefs, constructors, env, expr) {
                         case ">":
                         case "<=":
                         case ">=": {
-                            patternInput_52 = [constrainNumeric(typeDefs, t_9, span_20)[0], Type.TBool];
+                            patternInput_52 = [constrainNumeric(typeDefs, t_8, span_20)[0], Type.TBool];
                             break;
                         }
                         case "&&":
                         case "||": {
-                            patternInput_52 = [unify(typeDefs, t_9, Type.TBool, span_20), Type.TBool];
+                            patternInput_52 = [unify(typeDefs, t_8, Type.TBool, span_20), Type.TBool];
                             break;
                         }
                         default:
@@ -2697,7 +2824,7 @@ function inferProgramWithExternsRawAndLocals(captureLocalVariables, externs, pro
                             applySubstToCapturedLocals(telemetry, startIndex, s);
                             const env$0027 = applyEnv(s, env);
                             const inferred = applyType(s, t1);
-                            validateMapKeyTypes(span_1, inferred);
+                            validateMapKeyTypes(typeDefs, span_1, inferred);
                             const scheme_1 = Types_generalize(env$0027, inferred);
                             env = add(name_2, scheme_1, env$0027);
                             void (typed.push(new TypedStmt(/* TSLet */ 1, [name_2, exprVal, inferred, true, isExported, span_1])));
@@ -2710,7 +2837,7 @@ function inferProgramWithExternsRawAndLocals(captureLocalVariables, externs, pro
                             applySubstToCapturedLocals(telemetry, startIndex, s_1);
                             const env$0027_1 = applyEnv(s_1, env);
                             const inferred_1 = applyType(s_1, t1_1);
-                            validateMapKeyTypes(span_1, inferred_1);
+                            validateMapKeyTypes(typeDefs, span_1, inferred_1);
                             const scheme_2 = Types_generalize(env$0027_1, inferred_1);
                             env = add(name_2, scheme_2, env$0027_1);
                             void (typed.push(new TypedStmt(/* TSLet */ 1, [name_2, exprVal, inferred_1, false, isExported, span_1])));
@@ -2737,7 +2864,7 @@ function inferProgramWithExternsRawAndLocals(captureLocalVariables, externs, pro
                         const envBase = applyEnv(s_2, env);
                         const typedBindings = map_1((_arg_1, ty) => applyType(s_2, ty), patternInput_3[0]);
                         iterate_2((_arg_2, ty_1) => {
-                            validateMapKeyTypes(span_2, ty_1);
+                            validateMapKeyTypes(typeDefs, span_2, ty_1);
                         }, typedBindings);
                         env = fold_1((state_1, name_3, bindingType) => add(name_3, Types_generalize(envBase, bindingType), state_1), envBase, typedBindings);
                         void (typed.push(new TypedStmt(/* TSLetPattern */ 2, [pattern, expr_1, typedBindings, stmt.fields[2], span_2])));
@@ -2802,7 +2929,7 @@ function inferProgramWithExternsRawAndLocals(captureLocalVariables, externs, pro
                         const schemes = map((tupledArg_8) => {
                             const name_9 = tupledArg_8[0];
                             const inferred_2 = applyType(sRec, FSharpMap__get_Item(freshByName, name_9));
-                            validateMapKeyTypes(span_3, inferred_2);
+                            validateMapKeyTypes(typeDefs, span_3, inferred_2);
                             return [name_9, Types_generalize(envGeneralize, inferred_2)];
                         }, foldedBindings);
                         const typedBindings_1 = map((tupledArg_9) => {
@@ -2828,7 +2955,7 @@ function inferProgramWithExternsRawAndLocals(captureLocalVariables, externs, pro
                         const s1_4 = patternInput_5[0];
                         const s_3 = compose((forLoopVar[0] < (length(program) - 1)) ? unify(typeDefs, applyType(s1_4, t1_3), Type.TUnit, Ast_spanOfExpr(expr_2)) : emptySubst, s1_4);
                         applySubstToCapturedLocals(telemetry, startIndex_3, s_3);
-                        validateMapKeyTypes(Ast_spanOfExpr(expr_2), applyType(s_3, t1_3));
+                        validateMapKeyTypes(typeDefs, Ast_spanOfExpr(expr_2), applyType(s_3, t1_3));
                         env = applyEnv(s_3, env);
                         void (typed.push(new TypedStmt(/* TSExpr */ 4, [patternInput_5[2]])));
                         break;

package/dist/FScript.Language/Types.js

@@ -222,9 +222,9 @@ export function Types_typeToString(t) {
                     return toText(printf("%s map"))(arg_6);
                 }
                 else {
-                    const arg_7 = go(tk);
-                    const arg_8 = go(tv);
-                    return toText(printf("map<%s, %s>"))(arg_7)(arg_8);
+                    const arg_7 = postfixArg(tv);
+                    const arg_8 = go(tk);
+                    return toText(printf("%s map[%s]"))(arg_7)(arg_8);
                 }
             }
             case 10: {

package/dist/FScript.Language/Value.js

@@ -1,6 +1,6 @@
 
 import { Record, FSharpRef, Union } from "../fable_modules/fable-library-js.5.13.0/Types.js";
-import { int32_type, unit_type, lambda_type, record_type, option_type, class_type, list_type, bool_type, float64_type, union_type, int64_type, string_type } from "../fable_modules/fable-library-js.5.13.0/Reflection.js";
+import { int32_type, unit_type, lambda_type, record_type, option_type, class_type, list_type, float64_type, union_type, bool_type, int64_type, string_type } from "../fable_modules/fable-library-js.5.13.0/Reflection.js";
 import { Scheme_$reflection, Type_$reflection } from "./Types.js";
 import { Expr_$reflection } from "./Ast.js";
 import { EvalError$_$reflection } from "./Error.js";
@@ -12,12 +12,12 @@ export class MapKey extends Union {
         this.fields = fields;
     }
     cases() {
-        return ["MKString", "MKInt"];
+        return ["MKString", "MKInt", "MKBool", "MKUnionCase"];
     }
 }
 
 export function MapKey_$reflection() {
-    return union_type("FScript.Language.MapKey", [], MapKey, () => [[["Item", string_type]], [["Item", int64_type]]]);
+    return union_type("FScript.Language.MapKey", [], MapKey, () => [[["Item", string_type]], [["Item", int64_type]], [["Item", bool_type]], [["Item1", string_type], ["Item2", string_type]]]);
 }
 
 export class Value extends Union {

package/dist/Library.js

@@ -214,17 +214,29 @@ function intFromObj(value) {
 }
 
 function mapKeyToTagged(key) {
-    if (key.tag === 1) {
-        return {
-            kind: "int",
-            value: key.fields[0],
-        };
-    }
-    else {
-        return {
-            kind: "string",
-            value: key.fields[0],
-        };
+    switch (key.tag) {
+        case 1:
+            return {
+                kind: "int",
+                value: key.fields[0],
+            };
+        case 2:
+            return {
+                kind: "bool",
+                value: key.fields[0],
+            };
+        case 3:
+            return {
+                kind: "union",
+                typeName: key.fields[0],
+                caseName: key.fields[1],
+                value: null,
+            };
+        default:
+            return {
+                kind: "string",
+                value: key.fields[0],
+            };
     }
 }
 
@@ -389,9 +401,11 @@ function valueFromJs(value) {
                         case "map":
                             return new Value(/* VMap */ 8, [ofList(map((entry) => {
                                 const keyValue = valueFromJs(getRequiredProperty("key", entry));
-                                return [(keyValue.tag === 4) ? (new MapKey(/* MKString */ 0, [keyValue.fields[0]])) : ((keyValue.tag === 1) ? (new MapKey(/* MKInt */ 1, [keyValue.fields[0]])) : (() => {
-                                    throw new Exception("Map key must be string or int");
-                                })()), valueFromJs(getRequiredProperty("value", entry))];
+                                return [(keyValue.tag === 4) ? (new MapKey(/* MKString */ 0, [keyValue.fields[0]])) : ((keyValue.tag === 1) ? (new MapKey(/* MKInt */ 1, [keyValue.fields[0]])) : ((keyValue.tag === 3) ? (new MapKey(/* MKBool */ 2, [keyValue.fields[0]])) : ((keyValue.tag === 10) ? ((keyValue.fields[2] == null) ? (new MapKey(/* MKUnionCase */ 3, [keyValue.fields[0], keyValue.fields[1]])) : (() => {
+                                    throw new Exception("Map key must be string, int, bool, or a payload-free union case");
+                                })()) : (() => {
+                                    throw new Exception("Map key must be string, int, bool, or a payload-free union case");
+                                })()))), valueFromJs(getRequiredProperty("value", entry))];
                             }, ofArray(getRequiredProperty("entries", value))), {
                                 Compare: (x_1, y_1) => (compare(x_1, y_1) | 0),
                             })]);

package/dist/fable_modules/project_cracked.json

@@ -1 +1 @@
-{"Version":"5.13.0","FableOptions":{"TypedArrays":true,"ClampByteArrays":false,"Language":["JavaScript"],"Define":["FABLE_COMPILER","FABLE_COMPILER_5","FABLE_COMPILER_JAVASCRIPT"],"DebugMode":false,"OptimizeFSharpAst":false,"Verbosity":["Normal"],"FileExtension":".js","TriggeredByDependency":false,"NoReflection":false},"ProjectPath":"/home/runner/work/FScript/FScript/src/FScript.JavaScript/FScript.JavaScript.fsproj","SourcePaths":["/home/runner/work/FScript/FScript/src/FScript.Language/Span.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Error.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Token.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Ast.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Types.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Value.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Lexer.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Parser.fs","/home/runner/work/FScript/FScript/src/FScript.Language/IncludeResolver.fs","/home/runner/work/FScript/FScript/src/FScript.Language/BuiltinTypes.fs","/home/runner/work/FScript/FScript/src/FScript.Language/BuiltinSignatures.fs","/home/runner/work/FScript/FScript/src/FScript.Language/BuiltinFunctions.fs","/home/runner/work/FScript/FScript/src/FScript.Language/TypeInfer.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Eval.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Interactive.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Pretty.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Library.fs","/home/runner/work/FScript/FScript/src/FScript.JavaScript/Library.fs"],"FSharpOptions":["--define:FABLE_COMPILER","--define:FABLE_COMPILER_5","--define:FABLE_COMPILER_JAVASCRIPT","--define:TRACE","--define:RELEASE","--define:NETSTANDARD","--define:NETSTANDARD2_1","--define:NETSTANDARD1_0_OR_GREATER","--define:NETSTANDARD1_1_OR_GREATER","--define:NETSTANDARD1_2_OR_GREATER","--define:NETSTANDARD1_3_OR_GREATER","--define:NETSTANDARD1_4_OR_GREATER","--define:NETSTANDARD1_5_OR_GREATER","--define:NETSTANDARD1_6_OR_GREATER","--define:NETSTANDARD2_0_OR_GREATER","--define:NETSTANDARD2_1_OR_GREATER","--define:NULLABLE","--langversion:preview","--nowarn:FS0988","--noframework","--nologo","--simpleresolution","--nocopyfsharpcore","--nowin32manifest","--warn:3","--fullpaths","--flaterrors","--optimize-","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.ValueTuple.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Threading.Thread.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Threading.Tasks.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Threading.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Text.RegularExpressions.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Text.Encoding.Extensions.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Text.Encoding.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Runtime.Numerics.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Runtime.InteropServices.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Runtime.Extensions.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Runtime.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Reflection.Primitives.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Reflection.Extensions.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Reflection.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Numerics.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Net.Requests.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.IO.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Globalization.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Diagnostics.Tracing.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Diagnostics.Tools.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Diagnostics.Debug.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Core.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Console.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.ComponentModel.TypeConverter.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.ComponentModel.Primitives.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.ComponentModel.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Collections.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Collections.Concurrent.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/netstandard.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/mscorlib.dll","-r:/home/runner/.nuget/packages/fable.core/5.2.0/lib/netstandard2.0/Fable.Core.dll","-r:/home/runner/.nuget/packages/fable/5.13.0/tools/net10.0/any/FSharp.Core.dll"],"References":["/home/runner/work/FScript/FScript/src/FScript.Language/FScript.Language.fsproj"],"OutDir":["Some","/home/runner/work/FScript/FScript/src/FScript.JavaScript/dist"],"FableLibDir":"/home/runner/work/FScript/FScript/src/FScript.JavaScript/dist/fable_modules/fable-library-js.5.13.0","FableModulesDir":"/home/runner/work/FScript/FScript/src/FScript.JavaScript/dist/fable_modules","OutputType":["Library"],"TargetFramework":["Some","netstandard2.1"],"Exclude":[],"SourceMaps":false,"SourceMapsRoot":null,"TreatWarningsAsErrors":true}
+{"Version":"5.13.0","FableOptions":{"TypedArrays":true,"ClampByteArrays":false,"Language":["JavaScript"],"Define":["FABLE_COMPILER","FABLE_COMPILER_5","FABLE_COMPILER_JAVASCRIPT"],"DebugMode":false,"OptimizeFSharpAst":false,"Verbosity":["Normal"],"FileExtension":".js","TriggeredByDependency":false,"NoReflection":false},"ProjectPath":"/home/runner/work/FScript/FScript/src/FScript.JavaScript/FScript.JavaScript.fsproj","SourcePaths":["/home/runner/work/FScript/FScript/src/FScript.Language/Span.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Error.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Token.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Ast.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Types.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Value.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Lexer.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Parser.fs","/home/runner/work/FScript/FScript/src/FScript.Language/IncludeResolver.fs","/home/runner/work/FScript/FScript/src/FScript.Language/BuiltinTypes.fs","/home/runner/work/FScript/FScript/src/FScript.Language/BuiltinSignatures.fs","/home/runner/work/FScript/FScript/src/FScript.Language/BuiltinFunctions.fs","/home/runner/work/FScript/FScript/src/FScript.Language/TypeInfer.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Eval.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Interactive.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Pretty.fs","/home/runner/work/FScript/FScript/src/FScript.Language/Library.fs","/home/runner/work/FScript/FScript/src/FScript.JavaScript/Library.fs"],"FSharpOptions":["--define:FABLE_COMPILER","--define:FABLE_COMPILER_5","--define:FABLE_COMPILER_JAVASCRIPT","--define:TRACE","--define:RELEASE","--define:NETSTANDARD","--define:NETSTANDARD2_1","--define:NETSTANDARD1_0_OR_GREATER","--define:NETSTANDARD1_1_OR_GREATER","--define:NETSTANDARD1_2_OR_GREATER","--define:NETSTANDARD1_3_OR_GREATER","--define:NETSTANDARD1_4_OR_GREATER","--define:NETSTANDARD1_5_OR_GREATER","--define:NETSTANDARD1_6_OR_GREATER","--define:NETSTANDARD2_0_OR_GREATER","--define:NETSTANDARD2_1_OR_GREATER","--define:NULLABLE","--langversion:preview","--nowarn:FS0988","--noframework","--nologo","--simpleresolution","--nocopyfsharpcore","--nowin32manifest","--warn:3","--fullpaths","--flaterrors","--optimize-","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.ValueTuple.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Threading.Thread.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Threading.Tasks.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Threading.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Text.RegularExpressions.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Text.Encoding.Extensions.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Text.Encoding.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Runtime.Numerics.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Runtime.InteropServices.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Runtime.Extensions.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Runtime.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Reflection.Primitives.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Reflection.Extensions.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Reflection.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Numerics.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Net.Requests.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.IO.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Globalization.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Diagnostics.Tracing.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Diagnostics.Tools.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Diagnostics.Debug.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Core.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Console.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.ComponentModel.TypeConverter.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.ComponentModel.Primitives.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.ComponentModel.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Collections.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/System.Collections.Concurrent.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/netstandard.dll","-r:/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/mscorlib.dll","-r:/home/runner/.nuget/packages/fable.core/5.3.0/lib/netstandard2.0/Fable.Core.dll","-r:/home/runner/.nuget/packages/fable/5.13.0/tools/net10.0/any/FSharp.Core.dll"],"References":["/home/runner/work/FScript/FScript/src/FScript.Language/FScript.Language.fsproj"],"OutDir":["Some","/home/runner/work/FScript/FScript/src/FScript.JavaScript/dist"],"FableLibDir":"/home/runner/work/FScript/FScript/src/FScript.JavaScript/dist/fable_modules/fable-library-js.5.13.0","FableModulesDir":"/home/runner/work/FScript/FScript/src/FScript.JavaScript/dist/fable_modules","OutputType":["Library"],"TargetFramework":["Some","netstandard2.1"],"Exclude":[],"SourceMaps":false,"SourceMapsRoot":null,"TreatWarningsAsErrors":true}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magnusopera/fscript",
-  "version": "0.79.0",
+  "version": "0.80.1",
   "description": "Embeddable FScript language engine: parser, type inference, and evaluator.",
   "type": "module",
   "main": "./dist/Library.js",