Calculator.make(fn) should work for all functions, not just 0-paramater ones

packages/components/src/components/ui/FnDocumentation.tsx

@@ -1,5 +1,5 @@
 import { clsx } from "clsx";
-import React, { FC, PropsWithChildren } from "react";
+import { FC, PropsWithChildren } from "react";
 import ReactMarkdown from "react-markdown";
 
 import {
@@ -23,14 +23,14 @@ const StyleDefinition: FC<{ fullName: string; def: FnDefinition }> = ({
   const secondaryColor = "text-slate-400";
   const inputs = def.inputs.map((t, index) => (
     <span key={index}>
-      <span className={primaryColor}>{t.getName()}</span>
+      <span className={primaryColor}>{t.display()}</span>
       {isOptional(t) ? <span className={primaryColor}>?</span> : ""}
       {index !== def.inputs.length - 1 && (
         <span className={secondaryColor}>, </span>
       )}
     </span>
   ));
-  const output = def.output.getName();
+  const output = def.output.display();
   return (
     <div>
       <span className="text-slate-500">{fullName}</span>

packages/components/src/widgets/CalculatorWidget/CalculatorInput.tsx

@@ -18,13 +18,14 @@ export const CalculatorInput: FC<{
   result: SqValueResult | undefined;
   settings: PlaygroundSettings;
 }> = ({ id, input, result, settings }) => {
-  const { name, description } = input;
+  const { name, typeName, description } = input;
 
+  const newDescription = [typeName, description].filter((e) => e).join("\n\n");
   // common props for all *FormField components
   const commonProps = {
     name: `inputs.${id}` as const,
     label: name,
-    description,
+    description: newDescription,
   };
 
   return (

packages/components/src/widgets/LambdaWidget/index.tsx

@@ -23,7 +23,7 @@ widgetRegistry.register("Lambda", {
     const environment = value.context.project.getEnvironment();
     //It's kind of awkward that the documentation isn't connected to the function itself, but that's a greater effort.
     if (value.value.type === "BuiltinLambda") {
-      const name = value.value._value.getName();
+      const name = value.value._value.display();
       const documentation = getFunctionDocumentation(name);
       if (documentation) {
         return <FnDocumentation documentation={documentation} />;

packages/squiggle-lang/__tests__/reducer/frTypes_test.ts

@@ -330,9 +330,9 @@ describe("frOr", () => {
     });
   });
 
-  describe("getName", () => {
+  describe("display", () => {
     test("should return the correct name", () => {
-      expect(frNumberOrString.getName()).toBe("Number|String");
+      expect(frNumberOrString.display()).toBe("Number|String");
     });
   });
 });
@@ -350,18 +350,18 @@ describe("frNamed", () => {
     expect(namedNumberType.pack(testNumber)).toEqual(testValue);
   });
 
-  test("getName", () => {
+  test("display", () => {
     expect(namedNumberType).toBeDefined();
-    expect(namedNumberType.getName()).toBe("TestNumber: Number");
+    expect(namedNumberType.display()).toBe("TestNumber: Number");
   });
 
-  test("getName with Optional Type", () => {
+  test("display with Optional Type", () => {
     const optionalNumberType = frOptional(frNumber);
     const namedOptionalNumberType = frNamed(
       "OptionalTestNumber",
       optionalNumberType
     );
-    expect(namedOptionalNumberType.getName()).toBe(
+    expect(namedOptionalNumberType.display()).toBe(
       "OptionalTestNumber?: Number"
     );
   });
@@ -398,7 +398,7 @@ describe("frForceBoxed", () => {
     );
   });
 
-  test("GetName", () => {
-    expect(frBoxedNumber.getName()).toBe("Number");
+  test("display", () => {
+    expect(frBoxedNumber.display()).toBe("Number");
   });
 });

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

@@ -84,7 +84,7 @@ export const library = [
             fn: value,
             title: title || args.value.name || undefined,
             description: description || args.value.description || undefined,
-            inputs: inputs || [],
+            inputs: inputs || value.defaultInputs(),
             autorun: autorun === null || autorun === undefined ? true : autorun,
             sampleCount: sampleCount || undefined,
           });

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

@@ -90,7 +90,7 @@ export const library = [
     ],
   }),
   maker.make({
-    name: "getName",
+    name: "display",
     examples: [],
     definitions: [
       makeDefinition([frForceBoxed(frAny())], frString, ([{ args }]) => {

packages/squiggle-lang/src/library/registry/fnDefinition.ts

@@ -114,8 +114,8 @@ export function tryCallFnDefinition(
 
 export function fnDefinitionToString(fn: FnDefinition): string {
   const inputs = fn.inputs
-    .map((t) => t.getName() + (isOptional(t) && t.tag !== "named" ? "?" : ""))
+    .map((t) => t.display() + (isOptional(t) && t.tag !== "named" ? "?" : ""))
     .join(", ");
-  const output = fn.output.getName();
+  const output = fn.output.display();
   return `(${inputs})${output ? ` => ${output}` : ""}`;
 }