Merge pull request #2660 from quantified-uncertainty/fnmake

Adds Calculator.make(fn) call

.changeset/eleven-snakes-deliver.md

@@ -0,0 +1,5 @@
+---
+"@quri/squiggle-lang": patch
+---
+
+Added Calculator.make(fn) shorthand

packages/squiggle-lang/src/fr/calculator.ts

@@ -11,13 +11,23 @@ import {
   frCalculator,
 } from "../library/registry/frTypes.js";
 import { FnFactory } from "../library/registry/helpers.js";
-import { vCalculator } from "../value/index.js";
+import { Calculator, Value, vCalculator } from "../value/index.js";
 
 const maker = new FnFactory({
   nameSpace: "Calculator",
   requiresNamespace: true,
 });
 
+const validateCalculator = (calc: Calculator): Calculator => {
+  const _calc = vCalculator(calc);
+  const error = _calc.getError();
+  if (error) {
+    throw error;
+  } else {
+    return _calc.value;
+  }
+};
+
 export const library = [
   maker.make({
     name: "make",
@@ -36,22 +46,18 @@ export const library = [
           ),
         ],
         frCalculator,
-        ([{ fn, title, description, inputs, autorun, sampleCount }]) => {
-          const calc = vCalculator({
+        ([{ fn, title, description, inputs, autorun, sampleCount }]) =>
+          validateCalculator({
             fn,
             title: title || undefined,
             description: description || undefined,
             inputs: inputs || [],
             autorun: autorun === null ? true : autorun,
             sampleCount: sampleCount || undefined,
-          });
-          const error = calc.getError(); // this is awkward, we have to construct Calculator value only to call this method
-          if (error) {
-            throw error;
-          } else {
-            return calc.value;
-          }
-        }
+          })
+      ),
+      makeDefinition([frLambda], frCalculator, ([fn]) =>
+        validateCalculator(fn.toCalculator())
       ),
     ],
   }),

packages/squiggle-lang/src/reducer/lambda.ts

@@ -4,7 +4,7 @@ import { ASTNode } from "../ast/parse.js";
 import * as IError from "../errors/IError.js";
 import { REArityError, REOther } from "../errors/messages.js";
 import { Expression } from "../expression/index.js";
-import { VDomain, Value } from "../value/index.js";
+import { Calculator, VDomain, Value } from "../value/index.js";
 import * as Context from "./context.js";
 import { ReducerContext } from "./context.js";
 import { Stack } from "./stack.js";
@@ -16,6 +16,7 @@ import {
 import uniq from "lodash/uniq.js";
 import { sort } from "../utility/E_A_Floats.js";
 import { FRType } from "../library/registry/frTypes.js";
+import maxBy from "lodash/maxBy.js";
 
 export type UserDefinedLambdaParameter = {
   name: string;
@@ -33,6 +34,7 @@ export abstract class BaseLambda {
   abstract parameterString(): string;
   abstract parameterCounts(): number[];
   abstract parameterCountString(): string;
+  abstract toCalculator(): Calculator;
 
   callFrom(
     args: Value[],
@@ -136,6 +138,18 @@ export class UserDefinedLambda extends BaseLambda {
   parameterCountString() {
     return this.parameters.length.toString();
   }
+
+  toCalculator(): Calculator {
+    const only0Params = this.parameters.length === 0;
+    return {
+      fn: this,
+      inputs: this._getParameterNames().map((name) => ({
+        name: name,
+        type: "text",
+      })),
+      autorun: only0Params,
+    };
+  }
 }
 
 // Stdlib functions (everything in FunctionRegistry) are instances of this class.
@@ -197,6 +211,19 @@ export class BuiltinLambda extends BaseLambda {
     }
     throw new REOther(showNameMatchDefinitions());
   }
+
+  toCalculator(): Calculator {
+    const longestSignature = maxBy(this.signatures(), (s) => s.length) || [];
+    const autorun = longestSignature.length !== 0;
+    return {
+      fn: this,
+      inputs: longestSignature.map((sig, i) => ({
+        name: `Input ${i + 1}`,
+        type: sig.getName() === "Bool" ? "checkbox" : "text",
+      })),
+      autorun,
+    };
+  }
 }
 
 export type Lambda = UserDefinedLambda | BuiltinLambda;

packages/website/src/pages/docs/Api/Calculator.mdx

@@ -21,6 +21,7 @@ Calculator.make: ({
   autorun?: boolean = true,
   sampleCount?: number,
 }) => calculator
+Calculator.make(fn: ...arguments => any) => calculator
 ```
 
 ``Calculator.make`` takes in a function, a description, and a list of fields. The function should take in the same number of arguments as the number of fields, and the arguments should be of the same type as the default value of the field.