@magnusopera/fscript 0.80.1 → 0.81.1

package/dist/FScript.Language/Interactive.js

@@ -1,21 +1,22 @@
 
 import { Record } from "../fable_modules/fable-library-js.5.13.0/Types.js";
-import { ExternalFunction, Value, ExternalFunction_$reflection } from "./Value.js";
-import { int32_type, record_type, option_type, class_type, string_type, list_type } from "../fable_modules/fable-library-js.5.13.0/Reflection.js";
+import { ExtensionRegistration, ExternalFunction, Value, ExternalFunction_$reflection, ExtensionRegistration_$reflection } from "./Value.js";
 import { Stmt_$reflection } from "./Ast.js";
-import { evalProgramFromState, evalProgramWithExternsState, ProgramState_$reflection } from "./Eval.js";
-import { inferProgramWithExterns, TypedStmt_$reflection } from "./TypeInfer.js";
+import { int32_type, record_type, option_type, class_type, string_type, list_type } from "../fable_modules/fable-library-js.5.13.0/Reflection.js";
+import { evalProgramFromState, evalProgramWithRegistrationState, ProgramState_$reflection } from "./Eval.js";
+import { inferProgramWithRegistration, TypedStmt_$reflection } from "./TypeInfer.js";
 import { skip, reverse, append, exists, length, empty, choose, cons, fold, filter } from "../fable_modules/fable-library-js.5.13.0/List.js";
 import { toList } from "../fable_modules/fable-library-js.5.13.0/Set.js";
 import { Scheme, Types_ftvType } from "./Types.js";
 import { values, empty as empty_1, add, fold as fold_1 } from "../fable_modules/fable-library-js.5.13.0/Map.js";
 import { comparePrimitives } from "../fable_modules/fable-library-js.5.13.0/Util.js";
 import { toList as toList_1 } from "../fable_modules/fable-library-js.5.13.0/Seq.js";
+import { ofExterns } from "./HostInterop.js";
 
 export class Session extends Record {
-    constructor(Externs, RetainedProgramRev, TypeDeclarations, InferenceBindings, EvaluationState) {
+    constructor(Registration, RetainedProgramRev, TypeDeclarations, InferenceBindings, EvaluationState) {
         super();
-        this.Externs = Externs;
+        this.Registration = Registration;
         this.RetainedProgramRev = RetainedProgramRev;
         this.TypeDeclarations = TypeDeclarations;
         this.InferenceBindings = InferenceBindings;
@@ -24,7 +25,7 @@ export class Session extends Record {
 }
 
 export function Session_$reflection() {
-    return record_type("FScript.Language.Interactive.Session", [], Session, () => [["Externs", list_type(ExternalFunction_$reflection())], ["RetainedProgramRev", list_type(Stmt_$reflection())], ["TypeDeclarations", list_type(Stmt_$reflection())], ["InferenceBindings", class_type("Microsoft.FSharp.Collections.FSharpMap`2", [string_type, ExternalFunction_$reflection()])], ["EvaluationState", option_type(ProgramState_$reflection())]]);
+    return record_type("FScript.Language.Interactive.Session", [], Session, () => [["Registration", ExtensionRegistration_$reflection()], ["RetainedProgramRev", list_type(Stmt_$reflection())], ["TypeDeclarations", list_type(Stmt_$reflection())], ["InferenceBindings", class_type("Microsoft.FSharp.Collections.FSharpMap`2", [string_type, ExternalFunction_$reflection()])], ["EvaluationState", option_type(ProgramState_$reflection())]]);
 }
 
 export class Submission extends Record {
@@ -99,8 +100,8 @@ function updateInferenceBindings(bindings, typedProgram) {
     }, bindings, typedProgram);
 }
 
-export function create(externs) {
-    return new Session(externs, empty(), empty(), empty_1({
+export function createWithRegistration(registration) {
+    return new Session(registration, empty(), empty(), empty_1({
         Compare: (x, y) => (comparePrimitives(x, y) | 0),
     }), undefined);
 }
@@ -123,27 +124,31 @@ export function submit(session, program) {
     const matchValue = session.EvaluationState;
     if (matchValue != null) {
         if (containsTypeDeclaration) {
-            const typed_1 = inferProgramWithExterns(session.Externs, append(reverse(session.RetainedProgramRev), program));
-            const state_1 = evalProgramWithExternsState(session.Externs, typed_1);
+            const typed_1 = inferProgramWithRegistration(session.Registration, append(reverse(session.RetainedProgramRev), program));
+            const state_1 = evalProgramWithRegistrationState(session.Registration, typed_1);
             const submittedTyped = skip(length(session.RetainedProgramRev), typed_1);
-            return new Submission(new Session(session.Externs, retainedRev, typeDeclarations(reverse(retainedRev)), updateInferenceBindings(empty_1({
+            return new Submission(new Session(session.Registration, retainedRev, typeDeclarations(reverse(retainedRev)), updateInferenceBindings(empty_1({
                 Compare: (x_1, y_1) => (comparePrimitives(x_1, y_1) | 0),
             }), typed_1), state_1), submittedTyped, state_1, retainedCount_1);
         }
         else {
             const previousState = matchValue;
-            const typed_2 = inferProgramWithExterns(append(session.Externs, toList_1(values(session.InferenceBindings))), append(session.TypeDeclarations, program));
+            const typed_2 = inferProgramWithRegistration(new ExtensionRegistration(session.Registration.Types, append(session.Registration.Functions, toList_1(values(session.InferenceBindings)))), append(session.TypeDeclarations, program));
             const submittedTyped_1 = skip(length(session.TypeDeclarations), typed_2);
             const state_2 = evalProgramFromState(previousState, submittedTyped_1);
-            return new Submission(new Session(session.Externs, retainedRev, session.TypeDeclarations, updateInferenceBindings(session.InferenceBindings, submittedTyped_1), state_2), submittedTyped_1, state_2, retainedCount_1);
+            return new Submission(new Session(session.Registration, retainedRev, session.TypeDeclarations, updateInferenceBindings(session.InferenceBindings, submittedTyped_1), state_2), submittedTyped_1, state_2, retainedCount_1);
         }
     }
     else {
-        const typed = inferProgramWithExterns(session.Externs, program);
-        const state = evalProgramWithExternsState(session.Externs, typed);
-        return new Submission(new Session(session.Externs, retainedRev, typeDeclarations(retainedStatements(program)), updateInferenceBindings(empty_1({
+        const typed = inferProgramWithRegistration(session.Registration, program);
+        const state = evalProgramWithRegistrationState(session.Registration, typed);
+        return new Submission(new Session(session.Registration, retainedRev, typeDeclarations(retainedStatements(program)), updateInferenceBindings(empty_1({
             Compare: (x, y) => (comparePrimitives(x, y) | 0),
         }), typed), state), typed, state, retainedCount_1);
     }
 }
 
+export function create(externs) {
+    return createWithRegistration(ofExterns(externs));
+}
+

package/dist/FScript.Language/Library.js

@@ -1,8 +1,8 @@
 
 import { parseProgramWithSourceName, parseProgram } from "./Parser.js";
 import { parseProgramFromSourceWithIncludesResolver, parseProgramFromSourceWithIncludes, parseProgramFromFile } from "./IncludeResolver.js";
-import { inferProgramWithExterns, inferProgram } from "./TypeInfer.js";
-import { evalProgramWithExterns, evalProgram } from "./Eval.js";
+import { inferProgramWithRegistration, inferProgramWithExterns, inferProgram } from "./TypeInfer.js";
+import { evalProgramWithExterns, evalProgram, evalProgramWithRegistration } from "./Eval.js";
 
 export const parse = parseProgram;
 
@@ -18,6 +18,10 @@ export const infer = inferProgram;
 
 export const inferWithExterns = (externs) => ((program) => inferProgramWithExterns(externs, program));
 
+export const inferWithRegistration = (registration) => ((program) => inferProgramWithRegistration(registration, program));
+
+export const evalWithRegistration = (registration) => ((program) => evalProgramWithRegistration(registration, program));
+
 export const eval$ = evalProgram;
 
 export const evalWithExterns = (externs) => ((program) => evalProgramWithExterns(externs, program));