Merge remote-tracking branch 'origin/develop' into log-score-attempt

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quri/squiggle-components",
-  "version": "0.2.19",
+  "version": "0.2.20",
   "license": "MIT",
   "dependencies": {
     "@quri/squiggle-lang": "^0.2.8",
@@ -45,7 +45,7 @@
     "web-vitals": "^2.1.4",
     "webpack": "^5.72.0",
     "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "^4.8.1"
+    "webpack-dev-server": "^4.9.0"
   },
   "scripts": {
     "start": "cross-env REACT_APP_FAST_REFRESH=false && start-storybook -p 6006 -s public",

packages/components/src/components/SquiggleChart.tsx

@@ -54,7 +54,7 @@ export const VariableBox: React.FC<VariableBoxProps> = ({
       </variableBox.Component>
     );
   } else {
-    return <>{children}</>;
+    return <div>{children}</div>;
   }
 };
 

packages/components/src/vega-specs/spec-distributions.json

@@ -48,7 +48,7 @@
             "value": 0
           },
           "fill": {
-            "signal": "{gradient: 'linear', x1: 1, y1: 1, x2: 0, y2: 1, stops: [ {offset: 0.0, color: '#4C78A8'}] }"
+            "value": "#4C78A8"
           },
           "interpolate": {
             "value": "monotone"

packages/squiggle-lang/__tests__/Reducer/Reducer_MathJs/Reducer_MathJsParse_test.res

@@ -66,4 +66,9 @@ describe("MathJs parse", () => {
   describe("comments", () => {
     testDescriptionParse("define", "1 # This is a comment", "1")
   })
+
+  describe("ternary operator", () => {
+    testParse("1 ? 2 : 3", "ternary(1, 2, 3)")
+    testParse("1 ? 2 : 3 ? 4 : 5", "ternary(1, 2, ternary(3, 4, 5))")
+  })
 })

packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res

@@ -62,7 +62,7 @@ describe("call and bindings", () => {
   testEvalToBe("f(x)=x+1; g(x)=f(x)+1; g(2)", "Ok(4)")
 })
 
-describe("function trics", () => {
+describe("function tricks", () => {
   testParseToBe(
     "f(x)=f(y)=2; f(2)",
     "Ok((:$$block (:$$block (:$let :f (:$$lambda [x] (:$$block (:$let :f (:$$lambda [y] (:$$block 2)))))) (:f 2))))",

packages/squiggle-lang/__tests__/Reducer/Reducer_mapReduce_test.res

@@ -9,3 +9,8 @@ describe("map reduce", () => {
   testEvalToBe("arr=[1,2,3]; reverse(arr)", "Ok([3,2,1])")
   testEvalToBe("check(x)=(x==2);arr=[1,2,3]; keep(arr,check)", "Ok([2])")
 })
+
+Skip.describe("map reduce (sam)", () => {
+  testEvalToBe("addone(x)=x+1; map(2, addone)", "Error???")
+  testEvalToBe("addone(x)=x+1; map(2, {x: addone})", "Error???")
+})

packages/squiggle-lang/__tests__/Reducer/Reducer_ternaryOperator_test.res

@@ -1,12 +1,14 @@
 open Jest
 open Reducer_TestHelpers
 
-Skip.describe("Parse ternary operator", () => {
-  testParseToBe("true ? 'YES' : 'NO'", "Ok('YES')")
-  testParseToBe("false ? 'YES' : 'NO'", "Ok('NO')")
+describe("Parse ternary operator", () => {
+  testParseToBe("true ? 'YES' : 'NO'", "Ok((:$$block (:$$ternary true 'YES' 'NO')))")
 })
 
-Skip.describe("Evaluate ternary operator", () => {
+describe("Evaluate ternary operator", () => {
   testEvalToBe("true ? 'YES' : 'NO'", "Ok('YES')")
   testEvalToBe("false ? 'YES' : 'NO'", "Ok('NO')")
+  testEvalToBe("2 > 1 ? 'YES' : 'NO'", "Ok('YES')")
+  testEvalToBe("2 <= 1 ? 'YES' : 'NO'", "Ok('NO')")
+  testEvalToBe("1+1 ? 'YES' : 'NO'", "Error(Expected type: Boolean)")
 })

packages/squiggle-lang/src/rescript/Reducer/Reducer.res

@@ -1,11 +1,27 @@
 module ErrorValue = Reducer_ErrorValue
 module Expression = Reducer_Expression
+module ExpressionValue = ReducerInterface_ExpressionValue
+module Lambda = Reducer_Expression_Lambda
 
 type environment = ReducerInterface_ExpressionValue.environment
 type errorValue = Reducer_ErrorValue.errorValue
 type expressionValue = ReducerInterface_ExpressionValue.expressionValue
 type externalBindings = ReducerInterface_ExpressionValue.externalBindings
+type lambdaValue = ExpressionValue.lambdaValue
+
 let evaluate = Expression.evaluate
 let evaluateUsingOptions = Expression.evaluateUsingOptions
 let evaluatePartialUsingExternalBindings = Expression.evaluatePartialUsingExternalBindings
 let parse = Expression.parse
+
+let foreignFunctionInterface = (
+  lambdaValue: lambdaValue,
+  argArray: array<expressionValue>,
+  environment: ExpressionValue.environment,
+) => {
+  Lambda.foreignFunctionInterface(lambdaValue, argArray, environment, Expression.reduceExpression)
+}
+
+let defaultEnvironment = ExpressionValue.defaultEnvironment
+
+let defaultExternalBindings = ExpressionValue.defaultExternalBindings

packages/squiggle-lang/src/rescript/Reducer/Reducer.resi

@@ -9,6 +9,8 @@ type errorValue = Reducer_ErrorValue.errorValue
 type expressionValue = ReducerInterface_ExpressionValue.expressionValue
 @genType
 type externalBindings = ReducerInterface_ExpressionValue.externalBindings
+@genType
+type lambdaValue = ReducerInterface_ExpressionValue.lambdaValue
 
 @genType
 let evaluateUsingOptions: (
@@ -26,3 +28,16 @@ let evaluatePartialUsingExternalBindings: (
 let evaluate: string => result<expressionValue, errorValue>
 
 let parse: string => result<Expression.expression, errorValue>
+
+@genType
+let foreignFunctionInterface: (
+  QuriSquiggleLang.ReducerInterface_ExpressionValue.lambdaValue,
+  array<QuriSquiggleLang.ReducerInterface_ExpressionValue.expressionValue>,
+  QuriSquiggleLang.ReducerInterface_ExpressionValue.environment,
+) => result<expressionValue, errorValue>
+
+@genType
+let defaultEnvironment: environment
+
+@genType
+let defaultExternalBindings: externalBindings

packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res

@@ -132,6 +132,23 @@ let dispatchMacroCall = (
       eLambda(parameters, bindings->Bindings.toExternalBindings, lambdaDefinition),
     )->Ok
 
+  let doTernary = (
+    condition: expression,
+    ifTrue: expression,
+    ifFalse: expression,
+    bindings: ExpressionT.bindings,
+    environment,
+  ): result<expressionWithContext, errorValue> => {
+    let rCondition = reduceExpression(condition, bindings, environment)
+    rCondition->Result.flatMap(conditionValue =>
+      switch conditionValue {
+      | ExpressionValue.EvBool(false) => ExpressionWithContext.noContext(ifFalse)->Ok
+      | ExpressionValue.EvBool(true) => ExpressionWithContext.noContext(ifTrue)->Ok
+      | _ => REExpectedType("Boolean")->Error
+      }
+    )
+  }
+
   let expandExpressionList = (aList, bindings: ExpressionT.bindings, environment): result<
     expressionWithContext,
     errorValue,
@@ -162,6 +179,8 @@ let dispatchMacroCall = (
         lambdaDefinition,
       } =>
       doLambdaDefinition(bindings, parameters, lambdaDefinition)
+    | list{ExpressionT.EValue(EvCall("$$ternary")), condition, ifTrue, ifFalse} =>
+      doTernary(condition, ifTrue, ifFalse, bindings, environment)
     | _ => ExpressionWithContext.noContext(ExpressionT.EList(aList))->Ok
     }
 

packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res

@@ -13,6 +13,7 @@ type errorValue =
   | RESymbolNotFound(string)
   | RESyntaxError(string)
   | RETodo(string) // To do
+  | REExpectedType(string)
 
 type t = errorValue
 
@@ -46,4 +47,5 @@ let errorToString = err =>
   | RESymbolNotFound(symbolName) => `${symbolName} is not defined`
   | RESyntaxError(desc) => `Syntax Error: ${desc}`
   | RETodo(msg) => `TODO: ${msg}`
+  | REExpectedType(typeName) => `Expected type: ${typeName}`
   }

packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_Lambda.res

@@ -57,3 +57,13 @@ let applyParametersToLambda = (
 
 let doLambdaCall = (lambdaValue: ExpressionValue.lambdaValue, args, environment, reducer) =>
   applyParametersToLambda(lambdaValue, args, environment, reducer)
+
+let foreignFunctionInterface = (
+  lambdaValue: ExpressionValue.lambdaValue,
+  argArray: array<expressionValue>,
+  environment: ExpressionValue.environment,
+  reducer: ExpressionT.reducerFn,
+): result<expressionValue, 'e> => {
+  let args = argArray->Belt.List.fromArray
+  applyParametersToLambda(lambdaValue, args, environment, reducer)
+}

packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_Parse.res

@@ -9,7 +9,7 @@ type node = {"type": string, "isNode": bool, "comment": string}
 type arrayNode = {...node, "items": array<node>}
 type block = {"node": node}
 type blockNode = {...node, "blocks": array<block>}
-//conditionalNode
+type conditionalNode = {...node, "condition": node, "trueExpr": node, "falseExpr": node}
 type constantNode = {...node, "value": unit}
 type functionAssignmentNode = {...node, "name": string, "params": array<string>, "expr": node}
 type indexNode = {...node, "dimensions": array<node>}
@@ -31,6 +31,7 @@ external castAssignmentNode: node => assignmentNode = "%identity"
 external castAssignmentNodeWAccessor: node => assignmentNodeWAccessor = "%identity"
 external castAssignmentNodeWIndex: node => assignmentNodeWIndex = "%identity"
 external castBlockNode: node => blockNode = "%identity"
+external castConditionalNode: node => conditionalNode = "%identity"
 external castConstantNode: node => constantNode = "%identity"
 external castFunctionAssignmentNode: node => functionAssignmentNode = "%identity"
 external castFunctionNode: node => functionNode = "%identity"
@@ -58,6 +59,7 @@ type mathJsNode =
   | MjArrayNode(arrayNode)
   | MjAssignmentNode(assignmentNode)
   | MjBlockNode(blockNode)
+  | MjConditionalNode(conditionalNode)
   | MjConstantNode(constantNode)
   | MjFunctionAssignmentNode(functionAssignmentNode)
   | MjFunctionNode(functionNode)
@@ -82,6 +84,7 @@ let castNodeType = (node: node) => {
   | "ArrayNode" => node->castArrayNode->MjArrayNode->Ok
   | "AssignmentNode" => node->decideAssignmentNode
   | "BlockNode" => node->castBlockNode->MjBlockNode->Ok
+  | "ConditionalNode" => node->castConditionalNode->MjConditionalNode->Ok
   | "ConstantNode" => node->castConstantNode->MjConstantNode->Ok
   | "FunctionAssignmentNode" => node->castFunctionAssignmentNode->MjFunctionAssignmentNode->Ok
   | "FunctionNode" => node->castFunctionNode->MjFunctionNode->Ok
@@ -157,6 +160,10 @@ let rec toString = (mathJsNode: mathJsNode): string => {
   | MjAssignmentNode(aNode) =>
     `${aNode["object"]->toStringSymbolNode} = ${aNode["value"]->toStringMathJsNode}`
   | MjBlockNode(bNode) => `{${bNode["blocks"]->toStringBlocks}}`
+  | MjConditionalNode(cNode) =>
+    `ternary(${toStringMathJsNode(cNode["condition"])}, ${toStringMathJsNode(
+        cNode["trueExpr"],
+      )}, ${toStringMathJsNode(cNode["falseExpr"])})`
   | MjConstantNode(cNode) => cNode["value"]->toStringValue
   | MjFunctionAssignmentNode(faNode) => faNode->toStringFunctionAssignmentNode
   | MjFunctionNode(fNode) => fNode->toStringFunctionNode

packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_ToExpression.res

@@ -113,6 +113,20 @@ let rec fromInnerNode = (mathJsNode: Parse.node): result<expression, errorValue>
       aNode["items"]->Belt.List.fromArray->fromNodeList->Result.map(list => ExpressionT.EList(list))
     }
 
+    let caseConditionalNode = cndNode => {
+      let rCondition = fromInnerNode(cndNode["condition"])
+      let rTrueExpr = fromInnerNode(cndNode["trueExpr"])
+      let rFalse = fromInnerNode(cndNode["falseExpr"])
+
+      rCondition->Result.flatMap(condition =>
+        rTrueExpr->Result.flatMap(trueExpr =>
+          rFalse->Result.flatMap(falseExpr =>
+            ExpressionBuilder.eFunction("$$ternary", list{condition, trueExpr, falseExpr})->Ok
+          )
+        )
+      )
+    }
+
     let rFinalExpression: result<expression, errorValue> = switch typedMathJsNode {
     | MjAccessorNode(aNode) => caseAccessorNode(aNode["object"], aNode["index"])
     | MjArrayNode(aNode) => caseArrayNode(aNode)
@@ -123,6 +137,7 @@ let rec fromInnerNode = (mathJsNode: Parse.node): result<expression, errorValue>
         rExpr
       }
     | MjBlockNode(bNode) => bNode["blocks"]->Js.Array2.map(blockToNode)->caseBlock
+    | MjConditionalNode(cndNode) => caseConditionalNode(cndNode)
     | MjConstantNode(cNode) =>
       cNode["value"]->JavaScript.Gate.jsToEv->Result.flatMap(v => v->ExpressionT.EValue->Ok)
     | MjFunctionAssignmentNode(faNode) => caseFunctionAssignmentNode(faNode)

packages/website/package.json

@@ -12,8 +12,8 @@
     "format": "prettier --write ."
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.18",
-    "@docusaurus/preset-classic": "2.0.0-beta.18",
+    "@docusaurus/core": "2.0.0-beta.19",
+    "@docusaurus/preset-classic": "2.0.0-beta.19",
     "@quri/squiggle-components": "0.2.9",
     "clsx": "^1.1.1",
     "prism-react-renderer": "^1.2.1",