@magnusopera/fscript 0.77.1 → 0.78.1

package/dist/FScript.Language/Types.js

@@ -1,12 +1,12 @@
 
-import { Union } from "../fable_modules/fable-library-js.5.2.0/Types.js";
-import { union_type, int32_type, option_type, class_type, string_type, list_type } from "../fable_modules/fable-library-js.5.2.0/Reflection.js";
-import { fold, map } from "../fable_modules/fable-library-js.5.2.0/List.js";
-import { toList, ofList, difference, singleton, empty, union } from "../fable_modules/fable-library-js.5.2.0/Set.js";
-import { comparePrimitives } from "../fable_modules/fable-library-js.5.2.0/Util.js";
-import { fold as fold_1, map as map_1 } from "../fable_modules/fable-library-js.5.2.0/Seq.js";
-import { toList as toList_1, values } from "../fable_modules/fable-library-js.5.2.0/Map.js";
-import { join, printf, toText } from "../fable_modules/fable-library-js.5.2.0/String.js";
+import { Union } from "../fable_modules/fable-library-js.5.13.0/Types.js";
+import { union_type, int32_type, option_type, class_type, string_type, list_type } from "../fable_modules/fable-library-js.5.13.0/Reflection.js";
+import { empty as empty_1, fold, map } from "../fable_modules/fable-library-js.5.13.0/List.js";
+import { toList, isEmpty, ofList, difference, singleton, empty, union } from "../fable_modules/fable-library-js.5.13.0/Set.js";
+import { comparePrimitives } from "../fable_modules/fable-library-js.5.13.0/Util.js";
+import { fold as fold_1, map as map_1 } from "../fable_modules/fable-library-js.5.13.0/Seq.js";
+import { toList as toList_1, values } from "../fable_modules/fable-library-js.5.13.0/Map.js";
+import { join, printf, toText } from "../fable_modules/fable-library-js.5.13.0/String.js";
 
 export class Type extends Union {
     constructor(tag, fields) {
@@ -17,6 +17,12 @@ export class Type extends Union {
     cases() {
         return ["TUnit", "TInt", "TFloat", "TBool", "TString", "TList", "TTask", "TTuple", "TRecord", "TMap", "TOption", "TFun", "TNamed", "TUnion", "TTypeToken", "TVar"];
     }
+    static TUnit = new Type(0, []);
+    static TInt = new Type(1, []);
+    static TFloat = new Type(2, []);
+    static TBool = new Type(3, []);
+    static TString = new Type(4, []);
+    static TTypeToken = new Type(14, []);
 }
 
 export function Type_$reflection() {
@@ -43,7 +49,7 @@ let Types_nextId = 0;
 export function Types_freshVar() {
     const id = Types_nextId | 0;
     Types_nextId = ((Types_nextId + 1) | 0);
-    return new Type(15, [id]);
+    return new Type(/* TVar */ 15, [id]);
 }
 
 export function Types_ftvType(t_mut) {
@@ -112,7 +118,13 @@ export function Types_ftvEnv(env) {
 }
 
 export function Types_generalize(env, t) {
-    return new Scheme(toList(difference(Types_ftvType(t), Types_ftvEnv(env))), t);
+    const typeVariables = Types_ftvType(t);
+    if (isEmpty(typeVariables)) {
+        return new Scheme(empty_1(), t);
+    }
+    else {
+        return new Scheme(toList(difference(typeVariables, Types_ftvEnv(env))), t);
+    }
 }
 
 export function Types_typeToString(t) {

package/dist/FScript.Language/Value.js

@@ -1,6 +1,6 @@
 
-import { Record, FSharpRef, Union } from "../fable_modules/fable-library-js.5.2.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.2.0/Reflection.js";
+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 { Scheme_$reflection, Type_$reflection } from "./Types.js";
 import { Expr_$reflection } from "./Ast.js";
 import { EvalError$_$reflection } from "./Error.js";
@@ -29,6 +29,7 @@ export class Value extends Union {
     cases() {
         return ["VUnit", "VInt", "VFloat", "VBool", "VString", "VList", "VTuple", "VRecord", "VMap", "VOption", "VUnionCase", "VUnionCtor", "VTypeToken", "VTask", "VClosure", "VExternal"];
     }
+    static VUnit = new Value(0, []);
 }
 
 export function Value_$reflection() {

package/dist/Library.js

@@ -1,23 +1,24 @@
 
-import { Record } from "./fable_modules/fable-library-js.5.2.0/Types.js";
-import { obj_type, class_type, record_type, list_type, string_type } from "./fable_modules/fable-library-js.5.2.0/Reflection.js";
+import { Record } from "./fable_modules/fable-library-js.5.13.0/Types.js";
+import { obj_type, class_type, record_type, list_type, string_type } from "./fable_modules/fable-library-js.5.13.0/Reflection.js";
 import { Stmt_$reflection } from "./FScript.Language/Ast.js";
 import { ExternalFunction, MapKey, Value, Value_$reflection, ExternalFunction_$reflection } from "./FScript.Language/Value.js";
 import { inferProgramWithExterns, TypedStmt_$reflection } from "./FScript.Language/TypeInfer.js";
 import { Scheme, Type, Types_typeToString, Type_$reflection } from "./FScript.Language/Types.js";
-import { map, defaultArg, value as value_18, some } from "./fable_modules/fable-library-js.5.2.0/Option.js";
-import { stringHash, compare, comparePrimitives, createObj, Exception } from "./fable_modules/fable-library-js.5.2.0/Util.js";
-import { concat } from "./fable_modules/fable-library-js.5.2.0/String.js";
+import { submit as submit_1, create, Session_$reflection } from "./FScript.Language/Interactive.js";
+import { defaultArg, value as value_18, some } from "./fable_modules/fable-library-js.5.13.0/Option.js";
+import { stringHash, compare, comparePrimitives, createObj, Exception } from "./fable_modules/fable-library-js.5.13.0/Util.js";
+import { concat } from "./fable_modules/fable-library-js.5.13.0/String.js";
 import { EvalError$, EvalException, TypeException, ParseException } from "./FScript.Language/Error.js";
-import { toInt32_unchecked, fromFloat64, toInt64_unchecked } from "./fable_modules/fable-library-js.5.2.0/BigInt.js";
-import { parse as parse_1 } from "./fable_modules/fable-library-js.5.2.0/Long.js";
-import { parse as parse_2 } from "./fable_modules/fable-library-js.5.2.0/Int32.js";
-import { append, choose, sort, filter, exists, singleton, collect, empty, ofArray, length, map as map_1, toArray } from "./fable_modules/fable-library-js.5.2.0/List.js";
-import { FSharpMap__get_Item, FSharpMap__TryFind, ofList, toList } from "./fable_modules/fable-library-js.5.2.0/Map.js";
+import { toInt32_unchecked, fromFloat64, toInt64_unchecked } from "./fable_modules/fable-library-js.5.13.0/BigInt.js";
+import { parse as parse_1 } from "./fable_modules/fable-library-js.5.13.0/Long.js";
+import { parse as parse_2 } from "./fable_modules/fable-library-js.5.13.0/Int32.js";
+import { choose, filter, sort, exists, singleton, collect, empty, ofArray, length, map, toArray } from "./fable_modules/fable-library-js.5.13.0/List.js";
+import { FSharpMap__get_Item, FSharpMap__TryFind, ofList, toList } from "./fable_modules/fable-library-js.5.13.0/Map.js";
 import { parseProgramFromSourceWithIncludesResolver } from "./FScript.Language/IncludeResolver.js";
 import { invokeValue, evalProgramWithExterns, evalProgramWithExternsState } from "./FScript.Language/Eval.js";
-import { List_distinct } from "./fable_modules/fable-library-js.5.2.0/Seq2.js";
-import { FSharpSet__Contains, ofList as ofList_1 } from "./fable_modules/fable-library-js.5.2.0/Set.js";
+import { List_distinct } from "./fable_modules/fable-library-js.5.13.0/Seq2.js";
+import { FSharpSet__Contains, ofList as ofList_1 } from "./fable_modules/fable-library-js.5.13.0/Set.js";
 import { valueToString } from "./FScript.Language/Pretty.js";
 import { Span, Position } from "./FScript.Language/Span.js";
 
@@ -69,17 +70,17 @@ export function LoadedScriptHandle_$reflection() {
 }
 
 export class SessionHandle extends Record {
-    constructor(kind, retainedProgram, options, externs) {
+    constructor(kind, interactiveSession, options, externs) {
         super();
         this.kind = kind;
-        this.retainedProgram = retainedProgram;
+        this.interactiveSession = interactiveSession;
         this.options = options;
         this.externs = externs;
     }
 }
 
 export function SessionHandle_$reflection() {
-    return record_type("FScript.JavaScript.SessionHandle", [], SessionHandle, () => [["kind", string_type], ["retainedProgram", list_type(Stmt_$reflection())], ["options", obj_type], ["externs", list_type(ExternalFunction_$reflection())]]);
+    return record_type("FScript.JavaScript.SessionHandle", [], SessionHandle, () => [["kind", string_type], ["interactiveSession", Session_$reflection()], ["options", obj_type], ["externs", list_type(ExternalFunction_$reflection())]]);
 }
 
 function tryGetProperty(name, value) {
@@ -118,8 +119,9 @@ function isFScriptError(value) {
 }
 
 function positionToObj(position) {
+    let option_1;
     return {
-        file: defaultArg(map((value) => value, position.File), null),
+        file: defaultArg((option_1 = position.File, (option_1 != null) ? some(option_1) : undefined), null),
         line: position.Line,
         column: position.Column,
     };
@@ -227,6 +229,7 @@ function mapKeyToTagged(key) {
 }
 
 function valueToTagged(value) {
+    let option_1;
     switch (value.tag) {
         case 1:
             return {
@@ -251,22 +254,22 @@ function valueToTagged(value) {
         case 5:
             return {
                 kind: "list",
-                values: toArray(map_1(valueToTagged, value.fields[0])),
+                values: toArray(map(valueToTagged, value.fields[0])),
             };
         case 6:
             return {
                 kind: "tuple",
-                values: toArray(map_1(valueToTagged, value.fields[0])),
+                values: toArray(map(valueToTagged, value.fields[0])),
             };
         case 7:
             return {
                 kind: "record",
-                fields: createObj(map_1((tupledArg) => [tupledArg[0], valueToTagged(tupledArg[1])], toList(value.fields[0]))),
+                fields: createObj(map((tupledArg) => [tupledArg[0], valueToTagged(tupledArg[1])], toList(value.fields[0]))),
             };
         case 8:
             return {
                 kind: "map",
-                entries: toArray(map_1((tupledArg_1) => ({
+                entries: toArray(map((tupledArg_1) => ({
                     key: mapKeyToTagged(tupledArg_1[0]),
                     value: valueToTagged(tupledArg_1[1]),
                 }), toList(value.fields[0]))),
@@ -290,7 +293,7 @@ function valueToTagged(value) {
                 kind: "union",
                 typeName: value.fields[0],
                 caseName: value.fields[1],
-                value: defaultArg(map(valueToTagged, value.fields[2]), null),
+                value: defaultArg((option_1 = value.fields[2], (option_1 != null) ? some(valueToTagged(option_1)) : undefined), null),
             };
         case 11:
             return {
@@ -332,31 +335,31 @@ function valueToTagged(value) {
 function valueFromJs(value) {
     let optionValue, payloadValue, payloadValue_1, payloadValue_2;
     if (typeof value === 'undefined' || value === null) {
-        return new Value(0, []);
+        return Value.VUnit;
     }
     else if (Array.isArray(value)) {
-        return new Value(5, [map_1(valueFromJs, ofArray(value))]);
+        return new Value(/* VList */ 5, [map(valueFromJs, ofArray(value))]);
     }
     else {
         const matchValue = typeof value;
         switch (matchValue) {
             case "boolean":
-                return new Value(3, [value]);
+                return new Value(/* VBool */ 3, [value]);
             case "bigint":
-                return new Value(1, [value]);
+                return new Value(/* VInt */ 1, [value]);
             case "number":
                 if ((Number.isInteger(value)) && (Number.isSafeInteger(value))) {
-                    return new Value(1, [toInt64_unchecked(fromFloat64(value))]);
+                    return new Value(/* VInt */ 1, [toInt64_unchecked(fromFloat64(value))]);
                 }
                 else {
-                    return new Value(2, [value]);
+                    return new Value(/* VFloat */ 2, [value]);
                 }
             case "string":
-                return new Value(4, [value]);
+                return new Value(/* VString */ 4, [value]);
             case "object": {
                 const matchValue_1 = tryGetProperty("kind", value);
                 if (matchValue_1 == null) {
-                    return new Value(7, [ofList(map_1((name_1) => [name_1, valueFromJs(value[name_1])], ofArray(Object.keys(value))), {
+                    return new Value(/* VRecord */ 7, [ofList(map((name_1) => [name_1, valueFromJs(value[name_1])], ofArray(Object.keys(value))), {
                         Compare: (x_2, y_2) => (comparePrimitives(x_2, y_2) | 0),
                     })]);
                 }
@@ -364,29 +367,29 @@ function valueFromJs(value) {
                     const matchValue_2 = value_18(matchValue_1);
                     switch (matchValue_2) {
                         case "unit":
-                            return new Value(0, []);
+                            return Value.VUnit;
                         case "int":
-                            return new Value(1, [int64FromObj(getRequiredProperty("value", value))]);
+                            return new Value(/* VInt */ 1, [int64FromObj(getRequiredProperty("value", value))]);
                         case "float":
-                            return new Value(2, [getRequiredProperty("value", value)]);
+                            return new Value(/* VFloat */ 2, [getRequiredProperty("value", value)]);
                         case "bool":
-                            return new Value(3, [getRequiredProperty("value", value)]);
+                            return new Value(/* VBool */ 3, [getRequiredProperty("value", value)]);
                         case "string":
-                            return new Value(4, [getRequiredProperty("value", value)]);
+                            return new Value(/* VString */ 4, [getRequiredProperty("value", value)]);
                         case "list":
-                            return new Value(5, [map_1(valueFromJs, ofArray(getRequiredProperty("values", value)))]);
+                            return new Value(/* VList */ 5, [map(valueFromJs, ofArray(getRequiredProperty("values", value)))]);
                         case "tuple":
-                            return new Value(6, [map_1(valueFromJs, ofArray(getRequiredProperty("values", value)))]);
+                            return new Value(/* VTuple */ 6, [map(valueFromJs, ofArray(getRequiredProperty("values", value)))]);
                         case "record": {
                             const fields = getRequiredProperty("fields", value);
-                            return new Value(7, [ofList(map_1((name) => [name, valueFromJs(fields[name])], ofArray(Object.keys(fields))), {
+                            return new Value(/* VRecord */ 7, [ofList(map((name) => [name, valueFromJs(fields[name])], ofArray(Object.keys(fields))), {
                                 Compare: (x, y) => (comparePrimitives(x, y) | 0),
                             })]);
                         }
                         case "map":
-                            return new Value(8, [ofList(map_1((entry) => {
+                            return new Value(/* VMap */ 8, [ofList(map((entry) => {
                                 const keyValue = valueFromJs(getRequiredProperty("key", entry));
-                                return [(keyValue.tag === 4) ? (new MapKey(0, [keyValue.fields[0]])) : ((keyValue.tag === 1) ? (new MapKey(1, [keyValue.fields[0]])) : (() => {
+                                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))];
                             }, ofArray(getRequiredProperty("entries", value))), {
@@ -397,22 +400,22 @@ function valueFromJs(value) {
                             if (matchValue_3 != null) {
                                 if ((optionValue = value_18(matchValue_3), typeof optionValue === 'undefined' || optionValue === null)) {
                                     const optionValue_1 = value_18(matchValue_3);
-                                    return new Value(9, [undefined]);
+                                    return new Value(/* VOption */ 9, [undefined]);
                                 }
                                 else {
                                     const optionValue_2 = value_18(matchValue_3);
-                                    return new Value(9, [valueFromJs(optionValue_2)]);
+                                    return new Value(/* VOption */ 9, [valueFromJs(optionValue_2)]);
                                 }
                             }
                             else {
-                                return new Value(9, [undefined]);
+                                return new Value(/* VOption */ 9, [undefined]);
                             }
                         }
                         case "union": {
                             let payload;
                             const matchValue_4 = tryGetProperty("value", value);
                             payload = ((matchValue_4 != null) ? (((payloadValue = value_18(matchValue_4), typeof payloadValue === 'undefined' || payloadValue === null)) ? ((payloadValue_1 = value_18(matchValue_4), undefined)) : ((payloadValue_2 = value_18(matchValue_4), valueFromJs(payloadValue_2)))) : undefined);
-                            return new Value(10, [getRequiredProperty("typeName", value), getRequiredProperty("caseName", value), payload]);
+                            return new Value(/* VUnionCase */ 10, [getRequiredProperty("typeName", value), getRequiredProperty("caseName", value), payload]);
                         }
                         default:
                             throw new Exception(concat("Unsupported FScript tagged value kind \'", matchValue_2, "\'"));
@@ -524,7 +527,7 @@ function declaredExportedNames(program) {
             case 0:
                 return singleton(name_1);
             case 1:
-                return map_1((tupledArg) => tupledArg[0], bindings_1);
+                return map((tupledArg) => tupledArg[0], bindings_1);
             default:
                 return empty();
         }
@@ -542,17 +545,6 @@ function hasExpression(statements) {
     }, statements);
 }
 
-function retainedStatements(statements) {
-    return filter((_arg) => {
-        if (_arg.tag === 5) {
-            return false;
-        }
-        else {
-            return true;
-        }
-    }, statements);
-}
-
 function loadTyped(typed, externs) {
     const state = evalProgramWithExternsState(externs, typed);
     const exportedNames = sort(List_distinct(declaredExportedNames(typed), {
@@ -573,7 +565,15 @@ function loadTyped(typed, externs) {
     const functionSet = ofList_1(functionNames, {
         Compare: (x_2, y_2) => (comparePrimitives(x_2, y_2) | 0),
     });
-    const functions = ofList(choose((name_1) => map((value_1) => [name_1, value_1], FSharpMap__TryFind(state.Env, name_1)), functionNames), {
+    const functions = ofList(choose((name_1) => {
+        const option_1 = FSharpMap__TryFind(state.Env, name_1);
+        if (option_1 != null) {
+            return [name_1, option_1];
+        }
+        else {
+            return undefined;
+        }
+    }, functionNames), {
         Compare: (x_3, y_3) => (comparePrimitives(x_3, y_3) | 0),
     });
     const valueNames = filter((name_2) => {
@@ -587,7 +587,15 @@ function loadTyped(typed, externs) {
     }, exportedNames);
     return new LoadedScriptHandle("loaded", state.TypeDefs, state.Env, functionNames, functionSet, functions, valueNames, ofList_1(valueNames, {
         Compare: (x_4, y_4) => (comparePrimitives(x_4, y_4) | 0),
-    }), ofList(choose((name_3) => map((value_3) => [name_3, value_3], FSharpMap__TryFind(state.Env, name_3)), valueNames), {
+    }), ofList(choose((name_3) => {
+        const option_3 = FSharpMap__TryFind(state.Env, name_3);
+        if (option_3 != null) {
+            return [name_3, option_3];
+        }
+        else {
+            return undefined;
+        }
+    }, valueNames), {
         Compare: (x_5, y_5) => (comparePrimitives(x_5, y_5) | 0),
     }), state.LastValue, externs);
 }
@@ -623,13 +631,16 @@ export function run(source, options) {
 }
 
 export function createSession(options) {
-    return withStructuredErrors(() => (new SessionHandle("session", empty(), options, externsFromOptions(options))));
+    return withStructuredErrors(() => {
+        const externs = externsFromOptions(options);
+        return new SessionHandle("session", create(externs), options, externs);
+    });
 }
 
 export function resetSession(session) {
     return withStructuredErrors(() => {
         const session_1 = session;
-        session_1.retainedProgram = empty();
+        session_1.interactiveSession = create(session_1.externs);
         return session_1;
     });
 }
@@ -638,15 +649,16 @@ export function submit(session, source) {
     return withStructuredErrors(() => {
         const session_1 = session;
         const parsed = parseSource(source, session_1.options, session_1.externs);
-        const state = evalProgramWithExternsState(session_1.externs, inferProgramWithExterns(session_1.externs, append(session_1.retainedProgram, parsed.program)));
+        const submission = submit_1(session_1.interactiveSession, parsed.program);
+        session_1.interactiveSession = submission.Session;
+        const state = submission.State;
         const submittedHasExpression = hasExpression(parsed.program);
-        session_1.retainedProgram = append(session_1.retainedProgram, retainedStatements(parsed.program));
         return {
             kind: "session-result",
             hasValue: submittedHasExpression,
             value: submittedHasExpression ? valueToTagged(state.LastValue) : (null),
             text: submittedHasExpression ? valueToString(state.LastValue) : "",
-            retainedCount: length(session_1.retainedProgram),
+            retainedCount: submission.RetainedCount,
         };
     });
 }
@@ -680,7 +692,7 @@ export function invoke(loaded, name, args) {
                 throw new EvalException(new EvalError$(concat("Unknown exported function \'", name, "\'"), new Span(new Position(undefined, 0, 0), new Position(undefined, 0, 0))));
             }
         }
-        return valueToTagged(invokeValue(loaded_1.typeDefs, FSharpMap__get_Item(loaded_1.exportedFunctions, name), (typeof args === 'undefined' || args === null) ? empty() : map_1(valueFromJs, ofArray(args))));
+        return valueToTagged(invokeValue(loaded_1.typeDefs, FSharpMap__get_Item(loaded_1.exportedFunctions, name), (typeof args === 'undefined' || args === null) ? empty() : map(valueFromJs, ofArray(args))));
     });
 }
 
@@ -697,24 +709,24 @@ export function fromJs(value, _expectedType) {
 }
 
 export const T = {
-    unit: new Type(0, []),
-    int: new Type(1, []),
-    float: new Type(2, []),
-    bool: new Type(3, []),
-    string: new Type(4, []),
-    typeToken: new Type(14, []),
-    var: (value) => (new Type(15, [intFromObj(value)])),
-    list: (value_1) => (new Type(5, [value_1])),
-    task: (value_2) => (new Type(6, [value_2])),
-    option: (value_3) => (new Type(10, [value_3])),
-    map: (value_4) => (new Type(9, [new Type(4, []), value_4])),
-    tuple: (values) => (new Type(7, [map_1((value_6) => value_6, ofArray(values))])),
-    record: (fields) => (new Type(8, [ofList(map_1((name) => [name, fields[name]], ofArray(Object.keys(fields))), {
+    unit: Type.TUnit,
+    int: Type.TInt,
+    float: Type.TFloat,
+    bool: Type.TBool,
+    string: Type.TString,
+    typeToken: Type.TTypeToken,
+    var: (value) => (new Type(/* TVar */ 15, [intFromObj(value)])),
+    list: (value_1) => (new Type(/* TList */ 5, [value_1])),
+    task: (value_2) => (new Type(/* TTask */ 6, [value_2])),
+    option: (value_3) => (new Type(/* TOption */ 10, [value_3])),
+    map: (value_4) => (new Type(/* TMap */ 9, [Type.TString, value_4])),
+    tuple: (values) => (new Type(/* TTuple */ 7, [map((value_6) => value_6, ofArray(values))])),
+    record: (fields) => (new Type(/* TRecord */ 8, [ofList(map((name) => [name, fields[name]], ofArray(Object.keys(fields))), {
         Compare: (x, y) => (comparePrimitives(x, y) | 0),
     })])),
-    func: (left, right) => (new Type(11, [left, right])),
+    func: (left, right) => (new Type(/* TFun */ 11, [left, right])),
     scheme: (value_8) => (new Scheme(empty(), value_8)),
-    forall: (vars, value_9) => (new Scheme(map_1((value_11) => (intFromObj(value_11) | 0), ofArray(vars)), value_9)),
+    forall: (vars, value_9) => (new Scheme(map((value_11) => (intFromObj(value_11) | 0), ofArray(vars)), value_9)),
 };
 
 export function extern(definition) {
@@ -725,7 +737,7 @@ export function extern(definition) {
         const invoke_1 = getRequiredProperty("invoke", definition);
         return new ExternalFunction(name, scheme, (_arg, args) => {
             let _arg_1;
-            return valueFromJs((_arg_1 = toArray(map_1(valueToTagged, args)), invoke_1(_arg_1)));
+            return valueFromJs((_arg_1 = toArray(map(valueToTagged, args)), invoke_1(_arg_1)));
         }, arity);
     });
 }