diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 99f465dc..b7dcbd2d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -8,15 +8,23 @@ # IMPORTANT NOTE: in order to actually get pinged, commit access is required. # This also holds true for GitHub teams. -# This file -/.github/CODEOWNERS @quinn-dougherty - -# Any rescript code +# Rescript *.res @Hazelfire @OAGr @quinn-dougherty +*.resi @Hazelfire @OAGr @quinn-dougherty -# Any typescript code +# Typescript *.tsx @Hazelfire @OAGr +*.ts @Hazelfire @OAGr + +# Javascript +*.js @Hazelfire # Any opsy files +.github/* @quinn-dougherty *.json @quinn-dougherty @Hazelfire *.y*ml @quinn-dougherty +*.config.js @Hazelfire + +# Documentation +*.md @quinn-dougherty @OAGr @Hazelfire +*.mdx @quinn-dougherty @OAGr @Hazelfire diff --git a/.github/ISSUE_TEMPLATE/developer-bug.md b/.github/ISSUE_TEMPLATE/developer-bug.md index 5c4ccb54..c86b21c0 100644 --- a/.github/ISSUE_TEMPLATE/developer-bug.md +++ b/.github/ISSUE_TEMPLATE/developer-bug.md @@ -1,6 +1,6 @@ --- name: Developer friction when contributing to Squiggle -about: Did your yarn scripts fail? Did the CI diverge from a README? Have a testing-related task? Etc. +about: Have a testing-related task? Did your yarn scripts fail? Did the CI diverge from a README? Etc. labels: 'ops & testing' --- # Description: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yml similarity index 57% rename from .github/workflows/ci.yaml rename to .github/workflows/ci.yml index e139caeb..2ca8dc3c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yml @@ -1,11 +1,12 @@ name: Squiggle packages check on: - push: # Delete this line if there becomes a scarcity of build minutes. pull_request: branches: - master + - production - staging + - develop jobs: @@ -33,8 +34,29 @@ jobs: with: paths: '["packages/website/**"]' - lang-build-test: - name: Language build and test + lang-lint: + name: Language lint + runs-on: ubuntu-latest + needs: pre_check + if: ${{ needs.pre_check.outputs.should_skip_lang != 'true' }} + defaults: + run: + shell: bash + working-directory: packages/squiggle-lang + steps: + - uses: actions/checkout@v2 + - name: Install Dependencies + run: cd ../../ && yarn + - name: Check rescript lint + run: yarn lint:rescript + - name: Check javascript, typescript, and markdown lint + uses: creyD/prettier_action@v4.2 + with: + dry: true + prettier_options: --check . + + lang-build-test-bundle: + name: Language build, test, and bundle runs-on: ubuntu-latest needs: pre_check if: ${{ needs.pre_check.outputs.should_skip_lang != 'true' }} @@ -53,11 +75,28 @@ jobs: - name: Run webpack run: yarn bundle - components-build-test: - name: Components build and test + components-lint: + name: Components lint runs-on: ubuntu-latest - needs: [pre_check] + needs: pre_check if: ${{ needs.pre_check.outputs.should_skip_components != 'true' }} + defaults: + run: + shell: bash + working-directory: packages/components + steps: + - uses: actions/checkout@v2 + - name: Check javascript, typescript, and markdown lint + uses: creyD/prettier_action@v4.2 + with: + dry: true + prettier_options: --check . + + components-bundle-build: + name: Components bundle and build + runs-on: ubuntu-latest + needs: pre_check + if: ${{ (needs.pre_check.outputs.should_skip_components != 'true') || (needs.pre_check.outputs.should_skip_lang != 'true') }} defaults: run: shell: bash @@ -73,11 +112,28 @@ jobs: - name: Build storybook run: yarn build + website-lint: + name: Website lint + runs-on: ubuntu-latest + needs: pre_check + if: ${{ needs.pre_check.outputs.should_skip_website != 'true' }} + defaults: + run: + shell: bash + working-directory: packages/website + steps: + - uses: actions/checkout@v2 + - name: Check javascript, typescript, and markdown lint + uses: creyD/prettier_action@v4.2 + with: + dry: true + prettier_options: --check . + website-build: name: Website build runs-on: ubuntu-latest needs: pre_check - if: ${{ needs.pre_check.outputs.should_skip_website != 'true' }} + if: ${{ (needs.pre_check.outputs.should_skip_website != 'true') || (needs.pre_check.outputs.should_skip_lang != 'true') || (needs.pre_check.outputs.should_skip_components != 'true') }} defaults: run: shell: bash diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 67007416..0394c27d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -15,12 +15,16 @@ on: push: branches: - master + - production - staging + - develop pull_request: # The branches below must be a subset of the branches above branches: - master + - production - staging + - develop schedule: - cron: '42 19 * * 0' diff --git a/README.md b/README.md index bdc6c8cf..6cb8e6b2 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,18 @@ # Squiggle -![Packages check](https://github.com/QURIresearch/squiggle/actions/workflows/ci.yaml/badge.svg) +[![Packages check](https://github.com/quantified-uncertainty/squiggle/actions/workflows/ci.yml/badge.svg)](https://github.com/quantified-uncertainty/squiggle/actions/workflows/ci.yml) [![npm version](https://badge.fury.io/js/@quri%2Fsquiggle-lang.svg)](https://www.npmjs.com/package/@quri/squiggle-lang) [![npm version](https://badge.fury.io/js/@quri%2Fsquiggle-components.svg)](https://www.npmjs.com/package/@quri/squiggle-components) - +[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/quantified-uncertainty/squiggle/blob/develop/LICENSE) + This is an experimental DSL/language for making probabilistic estimates. The full story can be found [here](https://www.lesswrong.com/s/rDe8QE5NvXcZYzgZ3). ## Our deployments -- **website/docs prod**: https://squiggle-language.com -- **website/docs staging**: https://staging--squiggle-documentation.netlify.app/ -- **old playground**: https://playground.squiggle-language.com +- **website/docs prod**: https://squiggle-language.com [![Netlify Status](https://api.netlify.com/api/v1/badges/2139af5c-671d-473d-a9f6-66c96077d8a1/deploy-status)](https://app.netlify.com/sites/squiggle-documentation/deploys) +- **website/docs staging**: https://develop--squiggle-documentation.netlify.app/ +- **components storybook prod**: https://squiggle-components.netlify.app/ [![Netlify Status](https://api.netlify.com/api/v1/badges/b7f724aa-6b20-4d0e-bf86-3fcd1a3e9a70/deploy-status)](https://app.netlify.com/sites/squiggle-components/deploys) +- **components storybook staging**: https://develop--squiggle-components.netlify.app/ +- **legacy (2020) playground**: https://playground.squiggle-language.com ## Packages This monorepo has several packages that can be used for various purposes. All diff --git a/package.json b/package.json index a527e1fa..9601796a 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,9 @@ "scripts": { "nodeclean": "rm -r node_modules && rm -r packages/*/node_modules" }, + "devDependencies": { + "prettier": "^2.6.2" + }, "workspaces": [ "packages/*" ], diff --git a/packages/components/package.json b/packages/components/package.json index 22bf24a4..bea82967 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -4,7 +4,7 @@ "dependencies": { "@quri/squiggle-lang": "0.2.2", "@testing-library/jest-dom": "^5.16.4", - "@testing-library/react": "^13.0.0", + "@testing-library/react": "^13.0.1", "@testing-library/user-event": "^14.0.4", "@types/jest": "^27.4.0", "@types/lodash": "^4.14.181", @@ -32,7 +32,9 @@ "start": "cross-env REACT_APP_FAST_REFRESH=false && start-storybook -p 6006 -s public", "build": "tsc -b && build-storybook -s public", "bundle": "webpack", - "all": "yarn bundle && yarn build" + "all": "yarn bundle && yarn build", + "lint": "prettier --check .", + "format": "prettier --write ." }, "eslintConfig": { "extends": [ @@ -76,7 +78,6 @@ "@storybook/preset-create-react-app": "^4.1.0", "@storybook/react": "^6.4.20", "@types/webpack": "^4.41.32", - "prettier": "^2.6.2", "react-codejar": "^1.1.2", "ts-loader": "^9.2.8", "webpack": "^5.72.0", diff --git a/packages/squiggle-lang/lint.sh b/packages/squiggle-lang/lint.sh new file mode 100755 index 00000000..071823c9 --- /dev/null +++ b/packages/squiggle-lang/lint.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +# Hat tip to @dfalling +# https://forum.rescript-lang.org/t/rescript-9-1-how-can-we-format-to-standard-out/1590/2?u=quinn-dougherty + +errors=false + +files=`ls src/rescript/**/**/*.res src/rescript/**/*.res src/rescript/*.res` +for file in $files +do + current=`cat $file` + linted=`echo "${current}" | rescript format -stdin .res` + diff=`diff <(echo $current) <(echo $linted)` + + if [ ${#diff} -gt 0 ] + then + echo "ERROR: $file doesn't pass lint" + errors=true + fi +done + +files=`ls src/rescript/**/**/*.resi src/rescript/**/*.resi` # src/rescript/*/resi +for file in $files +do + current=`cat $file` + linted=`echo "${current}" | rescript format -stdin .resi` + diff=`diff <(echo $current) <(echo $linted)` + if [ ${#diff} -gt 0 ] + then + echo "ERROR: $file doesn't pass lint" + errors=true + fi +done + + +if $errors +then + exit 1 +else + echo "All files pass lint" +fi \ No newline at end of file diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 28d8aaa1..044edfe3 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -11,7 +11,10 @@ "test": "jest", "test:watch": "jest --watchAll", "coverage": "rm -f *.coverage; yarn clean; BISECT_ENABLE=yes yarn build; yarn test; bisect-ppx-report html", - "reducer:format": "find src/rescript/Reducer src/rescript/ReducerInterface -type f \\( -name '*.res' -o -name '*.resi' \\) -exec sh -c 'bsc -format {} | sponge {}' \\;", + "lint:rescript": "./lint.sh", + "lint:prettier": "prettier --check .", + "lint": "yarn lint:rescript && yarn lint:prettier", + "format": "rescript format -all && prettier --write .", "all": "yarn build && yarn bundle && yarn test" }, "keywords": [ diff --git a/packages/squiggle-lang/src/rescript/OldInterpreter/ASTTypes.res b/packages/squiggle-lang/src/rescript/OldInterpreter/ASTTypes.res index 17477f8f..873eeb86 100644 --- a/packages/squiggle-lang/src/rescript/OldInterpreter/ASTTypes.res +++ b/packages/squiggle-lang/src/rescript/OldInterpreter/ASTTypes.res @@ -213,19 +213,20 @@ module SamplingDistribution = { let i1 = renderIfIsNotSamplingDistribution(evaluationParams, t1) let i2 = renderIfIsNotSamplingDistribution(evaluationParams, t2) E.R.merge(i1, i2) |> E.R.bind(_, ((a, b)) => { - let samples = getCombinationSamples( - evaluationParams.samplingInputs.sampleCount, - algebraicOp, - a, - b, - ) |> E.O.toResult("Could not get samples") + let samples = + getCombinationSamples( + evaluationParams.samplingInputs.sampleCount, + algebraicOp, + a, + b, + ) |> E.O.toResult("Could not get samples") - let sampleSetDist = samples -> E.R.bind(SampleSetDist.make) + let sampleSetDist = samples->E.R.bind(SampleSetDist.make) - let pointSetDist = - sampleSetDist - -> E.R.bind(r => - SampleSetDist.toPointSetDist(~samplingInputs=evaluationParams.samplingInputs, ~samples=r)); + let pointSetDist = + sampleSetDist->E.R.bind(r => + SampleSetDist.toPointSetDist(~samplingInputs=evaluationParams.samplingInputs, ~samples=r) + ) pointSetDist |> E.R.fmap(r => #Normalize(#RenderedDist(r))) }) } diff --git a/packages/squiggle-lang/src/rescript/OldInterpreter/DistPlus.res b/packages/squiggle-lang/src/rescript/OldInterpreter/DistPlus.res index 2b1688b0..f3297703 100644 --- a/packages/squiggle-lang/src/rescript/OldInterpreter/DistPlus.res +++ b/packages/squiggle-lang/src/rescript/OldInterpreter/DistPlus.res @@ -1,116 +1,87 @@ -open PointSetTypes; +open PointSetTypes @genType -type t = PointSetTypes.distPlus; +type t = PointSetTypes.distPlus -let pointSetDistIntegral = pointSetDist => PointSetDist.T.Integral.get(pointSetDist); -let make = - ( - ~pointSetDist, - ~squiggleString, - (), - ) - : t => { - let integral = pointSetDistIntegral(pointSetDist); - {pointSetDist, integralCache: integral, squiggleString}; -}; +let pointSetDistIntegral = pointSetDist => PointSetDist.T.Integral.get(pointSetDist) +let make = (~pointSetDist, ~squiggleString, ()): t => { + let integral = pointSetDistIntegral(pointSetDist) + {pointSetDist: pointSetDist, integralCache: integral, squiggleString: squiggleString} +} -let update = - ( - ~pointSetDist=?, - ~integralCache=?, - ~squiggleString=?, - t: t, - ) => { +let update = (~pointSetDist=?, ~integralCache=?, ~squiggleString=?, t: t) => { pointSetDist: E.O.default(t.pointSetDist, pointSetDist), integralCache: E.O.default(t.integralCache, integralCache), squiggleString: E.O.default(t.squiggleString, squiggleString), -}; +} let updateShape = (pointSetDist, t) => { - let integralCache = pointSetDistIntegral(pointSetDist); - update(~pointSetDist, ~integralCache, t); -}; + let integralCache = pointSetDistIntegral(pointSetDist) + update(~pointSetDist, ~integralCache, t) +} -let toPointSetDist = ({pointSetDist, _}: t) => pointSetDist; +let toPointSetDist = ({pointSetDist, _}: t) => pointSetDist -let pointSetDistFn = (fn, {pointSetDist}: t) => fn(pointSetDist); +let pointSetDistFn = (fn, {pointSetDist}: t) => fn(pointSetDist) -module T = - Distributions.Dist({ - type t = PointSetTypes.distPlus; - type integral = PointSetTypes.distPlus; - let toPointSetDist = toPointSetDist; - let toContinuous = pointSetDistFn(PointSetDist.T.toContinuous); - let toDiscrete = pointSetDistFn(PointSetDist.T.toDiscrete); +module T = Distributions.Dist({ + type t = PointSetTypes.distPlus + type integral = PointSetTypes.distPlus + let toPointSetDist = toPointSetDist + let toContinuous = pointSetDistFn(PointSetDist.T.toContinuous) + let toDiscrete = pointSetDistFn(PointSetDist.T.toDiscrete) - let normalize = (t: t): t => { - let normalizedShape = t |> toPointSetDist |> PointSetDist.T.normalize; - t |> updateShape(normalizedShape); - }; + let normalize = (t: t): t => { + let normalizedShape = t |> toPointSetDist |> PointSetDist.T.normalize + t |> updateShape(normalizedShape) + } - let truncate = (leftCutoff, rightCutoff, t: t): t => { - let truncatedShape = - t - |> toPointSetDist - |> PointSetDist.T.truncate(leftCutoff, rightCutoff); + let truncate = (leftCutoff, rightCutoff, t: t): t => { + let truncatedShape = t |> toPointSetDist |> PointSetDist.T.truncate(leftCutoff, rightCutoff) - t |> updateShape(truncatedShape); - }; + t |> updateShape(truncatedShape) + } - let xToY = (f, t: t) => - t - |> toPointSetDist - |> PointSetDist.T.xToY(f); + let xToY = (f, t: t) => t |> toPointSetDist |> PointSetDist.T.xToY(f) - let minX = pointSetDistFn(PointSetDist.T.minX); - let maxX = pointSetDistFn(PointSetDist.T.maxX); - let toDiscreteProbabilityMassFraction = - pointSetDistFn(PointSetDist.T.toDiscreteProbabilityMassFraction); + let minX = pointSetDistFn(PointSetDist.T.minX) + let maxX = pointSetDistFn(PointSetDist.T.maxX) + let toDiscreteProbabilityMassFraction = pointSetDistFn( + PointSetDist.T.toDiscreteProbabilityMassFraction, + ) - // This bit is kind of awkward, could probably use rethinking. - let integral = (t: t) => - updateShape(Continuous(t.integralCache), t); + // This bit is kind of awkward, could probably use rethinking. + let integral = (t: t) => updateShape(Continuous(t.integralCache), t) - let updateIntegralCache = (integralCache: option, t) => - update(~integralCache=E.O.default(t.integralCache, integralCache), t); + let updateIntegralCache = (integralCache: option, t) => + update(~integralCache=E.O.default(t.integralCache, integralCache), t) - let downsample = (i, t): t => - updateShape(t |> toPointSetDist |> PointSetDist.T.downsample(i), t); - // todo: adjust for limit, maybe? - let mapY = - ( - ~integralSumCacheFn=previousIntegralSum => None, - ~integralCacheFn=previousIntegralCache => None, - ~fn, - {pointSetDist, _} as t: t, - ) - : t => - PointSetDist.T.mapY(~integralSumCacheFn, ~fn, pointSetDist) - |> updateShape(_, t); + let downsample = (i, t): t => updateShape(t |> toPointSetDist |> PointSetDist.T.downsample(i), t) + // todo: adjust for limit, maybe? + let mapY = ( + ~integralSumCacheFn=previousIntegralSum => None, + ~integralCacheFn=previousIntegralCache => None, + ~fn, + {pointSetDist, _} as t: t, + ): t => PointSetDist.T.mapY(~integralSumCacheFn, ~fn, pointSetDist) |> updateShape(_, t) - // get the total of everything - let integralEndY = (t: t) => { - PointSetDist.T.Integral.sum( - toPointSetDist(t), - ); - }; + // get the total of everything + let integralEndY = (t: t) => { + PointSetDist.T.Integral.sum(toPointSetDist(t)) + } - // TODO: Fix this below, obviously. Adjust for limits - let integralXtoY = (f, t: t) => { - PointSetDist.T.Integral.xToY( - f, - toPointSetDist(t), - ) - }; + // TODO: Fix this below, obviously. Adjust for limits + let integralXtoY = (f, t: t) => { + PointSetDist.T.Integral.xToY(f, toPointSetDist(t)) + } - // TODO: This part is broken when there is a limit, if this is supposed to be taken into account. - let integralYtoX = (f, t: t) => { - PointSetDist.T.Integral.yToX(f, toPointSetDist(t)); - }; + // TODO: This part is broken when there is a limit, if this is supposed to be taken into account. + let integralYtoX = (f, t: t) => { + PointSetDist.T.Integral.yToX(f, toPointSetDist(t)) + } - let mean = (t: t) => { - PointSetDist.T.mean(t.pointSetDist); - }; - let variance = (t: t) => PointSetDist.T.variance(t.pointSetDist); - }); + let mean = (t: t) => { + PointSetDist.T.mean(t.pointSetDist) + } + let variance = (t: t) => PointSetDist.T.variance(t.pointSetDist) +}) diff --git a/packages/squiggle-lang/src/rescript/OldParser/Parser.res b/packages/squiggle-lang/src/rescript/OldParser/Parser.res index 6f5fd9ef..8a5e4390 100644 --- a/packages/squiggle-lang/src/rescript/OldParser/Parser.res +++ b/packages/squiggle-lang/src/rescript/OldParser/Parser.res @@ -121,17 +121,14 @@ module MathAdtToDistDst = { | (_, _, Ok(mu), Ok(sigma)) => Ok(#FunctionCall("lognormal", [mu, sigma])) | _ => Error("Lognormal distribution needs either mean and stdev or mu and sigma") } - | _ => - parseArgs() |> E.R.fmap((args: array) => - #FunctionCall("lognormal", args) - ) + | _ => parseArgs() |> E.R.fmap((args: array) => #FunctionCall("lognormal", args)) } // Error("Dotwise exponentiation needs two operands") - let operationParser = ( - name: string, - args: result, string>, - ): result => { + let operationParser = (name: string, args: result, string>): result< + ASTTypes.node, + string, + > => { let toOkAlgebraic = r => Ok(#AlgebraicCombination(r)) let toOkPointwise = r => Ok(#PointwiseCombination(r)) let toOkTruncate = r => Ok(#Truncate(r)) @@ -169,10 +166,7 @@ module MathAdtToDistDst = { } let functionParser = ( - nodeParser: MathJsonToMathJsAdt.arg => Belt.Result.t< - ASTTypes.node, - string, - >, + nodeParser: MathJsonToMathJsAdt.arg => Belt.Result.t, name: string, args: array, ): result => { @@ -224,17 +218,11 @@ module MathAdtToDistDst = { ) Ok(hash) } - | name => - parseArgs() |> E.R.fmap((args: array) => - #FunctionCall(name, args) - ) + | name => parseArgs() |> E.R.fmap((args: array) => #FunctionCall(name, args)) } } - let rec nodeParser: MathJsonToMathJsAdt.arg => result< - ASTTypes.node, - string, - > = x => + let rec nodeParser: MathJsonToMathJsAdt.arg => result = x => switch x { | Value(f) => Ok(#SymbolicDist(#Float(f))) | Symbol(sym) => Ok(#Symbol(sym)) @@ -267,8 +255,7 @@ module MathAdtToDistDst = { blocks |> E.A.fmap(b => topLevel(b)) |> E.A.R.firstErrorOrOpen |> E.R.fmap(E.A.concatMany) } - let run = (r): result => - r |> MathAdtCleaner.run |> topLevel + let run = (r): result => r |> MathAdtCleaner.run |> topLevel } /* The MathJs parser doesn't support '.+' syntax, but we want it because it diff --git a/packages/squiggle-lang/src/rescript/ProgramEvaluator.res b/packages/squiggle-lang/src/rescript/ProgramEvaluator.res index b2317050..96a765d8 100644 --- a/packages/squiggle-lang/src/rescript/ProgramEvaluator.res +++ b/packages/squiggle-lang/src/rescript/ProgramEvaluator.res @@ -39,17 +39,16 @@ module Inputs = { type exportDistribution = [ | #DistPlus(DistPlus.t) | #Float(float) - | #Function((float) => Belt.Result.t) + | #Function(float => Belt.Result.t) ] type exportEnv = array<(string, ASTTypes.node)> type exportType = { - environment : exportEnv, - exports: array + environment: exportEnv, + exports: array, } - module Internals = { let addVariable = ( {samplingInputs, squiggleString, environment}: Inputs.inputs, @@ -58,9 +57,7 @@ module Internals = { ): Inputs.inputs => { samplingInputs: samplingInputs, squiggleString: squiggleString, - environment: ASTTypes.Environment.update(environment, str, _ => Some( - node, - )), + environment: ASTTypes.Environment.update(environment, str, _ => Some(node)), } type outputs = { @@ -76,8 +73,7 @@ module Internals = { pointSetDistLength: inputs.samplingInputs.pointDistLength |> E.O.default(10000), } - let runNode = (inputs, node) => - AST.toLeaf(makeInputs(inputs), inputs.environment, node) + let runNode = (inputs, node) => AST.toLeaf(makeInputs(inputs), inputs.environment, node) let renderIfNeeded = (inputs: Inputs.inputs, node: ASTTypes.node): result< ASTTypes.node, @@ -106,16 +102,14 @@ module Internals = { let outputToDistPlus = (inputs: Inputs.inputs, pointSetDist: PointSetTypes.pointSetDist) => DistPlus.make(~pointSetDist, ~squiggleString=Some(inputs.squiggleString), ()) - let rec returnDist = (functionInfo : (array, ASTTypes.node), - inputs : Inputs.inputs, - env : ASTTypes.environment) => { - (input : float) => { - let foo: Inputs.inputs = {...inputs, environment: env}; - evaluateFunction( - foo, - functionInfo, - [#SymbolicDist(#Float(input))], - ) |> E.R.bind(_, a => + let rec returnDist = ( + functionInfo: (array, ASTTypes.node), + inputs: Inputs.inputs, + env: ASTTypes.environment, + ) => { + (input: float) => { + let foo: Inputs.inputs = {...inputs, environment: env} + evaluateFunction(foo, functionInfo, [#SymbolicDist(#Float(input))]) |> E.R.bind(_, a => switch a { | #DistPlus(d) => Ok(DistPlus.T.normalize(d)) | n => @@ -126,11 +120,10 @@ module Internals = { } } // TODO: Consider using ExpressionTypes.ExpressionTree.getFloat or similar in this function - and coersionToExportedTypes = ( - inputs, - env: ASTTypes.environment, - ex: ASTTypes.node, - ): result => + and coersionToExportedTypes = (inputs, env: ASTTypes.environment, ex: ASTTypes.node): result< + exportDistribution, + string, + > => ex |> renderIfNeeded(inputs) |> E.R.bind(_, x => @@ -143,56 +136,45 @@ module Internals = { } ) - and evaluateFunction = ( - inputs: Inputs.inputs, - fn: (array, ASTTypes.node), - fnInputs, - ) => { - let output = AST.runFunction( - makeInputs(inputs), - inputs.environment, - fnInputs, - fn, - ) + and evaluateFunction = (inputs: Inputs.inputs, fn: (array, ASTTypes.node), fnInputs) => { + let output = AST.runFunction(makeInputs(inputs), inputs.environment, fnInputs, fn) output |> E.R.bind(_, coersionToExportedTypes(inputs, inputs.environment)) } let runProgram = (inputs: Inputs.inputs, p: ASTTypes.program) => { let ins = ref(inputs) p - |> E.A.fmap(x => - switch x { - | #Assignment(name, node) => - ins := addVariable(ins.contents, name, node) - None - | #Expression(node) => - Some(runNode(ins.contents, node)) - } - ) - |> E.A.O.concatSomes + |> E.A.fmap(x => + switch x { + | #Assignment(name, node) => + ins := addVariable(ins.contents, name, node) + None + | #Expression(node) => Some(runNode(ins.contents, node)) + } + ) + |> E.A.O.concatSomes + |> E.A.R.firstErrorOrOpen + |> E.R.bind(_, d => + d + |> E.A.fmap(x => coersionToExportedTypes(inputs, ins.contents.environment, x)) |> E.A.R.firstErrorOrOpen - |> E.R.bind(_, d => - d - |> E.A.fmap(x => coersionToExportedTypes(inputs, ins.contents.environment, x)) - |> E.A.R.firstErrorOrOpen - ) - |> E.R.fmap(ex => - { - environment: Belt.Map.String.toArray(ins.contents.environment), - exports: ex - } - ) + ) + |> E.R.fmap(ex => { + environment: Belt.Map.String.toArray(ins.contents.environment), + exports: ex, + }) } let inputsToLeaf = (inputs: Inputs.inputs) => Parser.fromString(inputs.squiggleString) |> E.R.bind(_, g => runProgram(inputs, g)) - } - @genType -let runAll : (string, Inputs.SamplingInputs.t, exportEnv) => result = - (squiggleString, samplingInputs, environment) => { +let runAll: (string, Inputs.SamplingInputs.t, exportEnv) => result = ( + squiggleString, + samplingInputs, + environment, +) => { let inputs = Inputs.make( ~samplingInputs, ~squiggleString, diff --git a/packages/website/package.json b/packages/website/package.json index 8744677b..a80076bb 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -6,7 +6,9 @@ "start": "docusaurus start", "build": "docusaurus build", "clean": "docusaurus clear", - "all": "yarn build" + "all": "yarn build", + "lint": "prettier --check .", + "format": "prettier --write ." }, "dependencies": { "@docusaurus/core": "2.0.0-beta.18", diff --git a/yarn.lock b/yarn.lock index 007e0c31..363bb9de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3629,14 +3629,14 @@ lodash "^4.17.15" redent "^3.0.0" -"@testing-library/react@^13.0.0": - version "13.0.0" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.0.0.tgz#8cdaf4667c6c2b082eb0513731551e9db784e8bc" - integrity sha512-p0lYA1M7uoEmk2LnCbZLGmHJHyH59sAaZVXChTXlyhV/PRW9LoIh4mdf7tiXsO8BoNG+vN8UnFJff1hbZeXv+w== +"@testing-library/react@^13.0.1": + version "13.0.1" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.0.1.tgz#00d223e182923d341a9610590561fb9dd1324110" + integrity sha512-zeHx3PohYYp+4bTJwrixQY8zSBZjWUGwYc7OhD1EpWTHS92RleApLoP72NdwaWxOrM1P1Uezt3XvGf6t2XSWPQ== dependencies: "@babel/runtime" "^7.12.5" "@testing-library/dom" "^8.5.0" - "@types/react-dom" "*" + "@types/react-dom" "^18.0.0" "@testing-library/user-event@^14.0.4": version "14.0.4" @@ -3985,7 +3985,7 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@*", "@types/react-dom@^18.0.0": +"@types/react-dom@^18.0.0": version "18.0.0" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.0.tgz#b13f8d098e4b0c45df4f1ed123833143b0c71141" integrity sha512-49897Y0UiCGmxZqpC8Blrf6meL8QUla6eb+BBhn69dTXlmuOlzkfr7HHY/O8J25e1lTUMs+YYxSlVDAaGHCOLg== @@ -4025,7 +4025,7 @@ dependencies: "@types/react" "*" -"@types/react@*": +"@types/react@*", "@types/react@^16.9.19", "@types/react@^17.0.43", "@types/react@^18.0.1": version "17.0.44" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.44.tgz#c3714bd34dd551ab20b8015d9d0dbec812a51ec7" integrity sha512-Ye0nlw09GeMp2Suh8qoOv0odfgCoowfM/9MG6WeRD60Gq9wS90bdkdRtYbRkNhXOpG4H+YXGvj4wOWhAC0LJ1g== @@ -4034,24 +4034,6 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@^16.9.19": - version "16.14.24" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.24.tgz#f2c5e9fa78f83f769884b83defcf7924b9eb5c82" - integrity sha512-e7U2WC8XQP/xfR7bwhOhNFZKPTfW1ph+MiqtudKb8tSV8RyCsovQx2sNVtKoOryjxFKpHPPC/yNiGfdeVM5Gyw== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/react@^18.0.1": - version "18.0.1" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.1.tgz#1b2e02fb7613212518733946e49fb963dfc66e19" - integrity sha512-VnWlrVgG0dYt+NqlfMI0yUYb8Rdl4XUROyH+c6gq/iFCiZ805Vi//26UW38DHnxQkbDhnrIWTBiy6oKZqL11cw== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - "@types/resolve@1.17.1": version "1.17.1" resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"