diff --git a/.github/ISSUE_TEMPLATE/developer-bug.md b/.github/ISSUE_TEMPLATE/developer-bug.md
index c86b21c0..0c62e4ab 100644
--- a/.github/ISSUE_TEMPLATE/developer-bug.md
+++ b/.github/ISSUE_TEMPLATE/developer-bug.md
@@ -1,14 +1,13 @@
---
name: Developer friction when contributing to Squiggle
-about: Have a testing-related task? Did your yarn scripts fail? Did the CI diverge from a README? Etc.
-labels: 'ops & testing'
+about: Have a testing-related task? Did your yarn scripts fail? Did the CI diverge from a README? Etc.
+labels: "ops & testing"
---
+
# Description:
-
# The OS and version, yarn version, etc. in which this came up
+
_delete this section if testing task_
# Desired behavior
-
-
diff --git a/.github/ISSUE_TEMPLATE/future.md b/.github/ISSUE_TEMPLATE/future.md
index 517892ec..6333a60e 100644
--- a/.github/ISSUE_TEMPLATE/future.md
+++ b/.github/ISSUE_TEMPLATE/future.md
@@ -1,7 +1,6 @@
---
name: Idea or feature request
-about: Where would you like to see Squiggle go over the next few months, several months, or few years?
+about: Where would you like to see Squiggle go over the next few months, several months, or few years?
---
+
# Description
-
-
diff --git a/.github/ISSUE_TEMPLATE/pl.md b/.github/ISSUE_TEMPLATE/pl.md
index ab4161a1..aa482feb 100644
--- a/.github/ISSUE_TEMPLATE/pl.md
+++ b/.github/ISSUE_TEMPLATE/pl.md
@@ -1,14 +1,13 @@
---
name: Regarding the programming language
about: Interpreter, parser, syntax, semantics, and including distributions
-labels: 'programming language'
+labels: "programming language"
---
-
-- _ Is refactor
-- _ Is new feature
-- _ Concerns documentation
+
+
+
+- \_ Is refactor
+- \_ Is new feature
+- \_ Concerns documentation
# Description of suggestion or shortcoming:
-
-
-
diff --git a/.github/ISSUE_TEMPLATE/user-bug.md b/.github/ISSUE_TEMPLATE/user-bug.md
index ca30abbe..281a859f 100644
--- a/.github/ISSUE_TEMPLATE/user-bug.md
+++ b/.github/ISSUE_TEMPLATE/user-bug.md
@@ -1,18 +1,17 @@
---
name: Bug reports for Squiggle users
-about: Rendering oddly, trouble with the playground, something like this?
-labels: 'bug'
+about: Rendering oddly, trouble with the playground, something like this?
+labels: "bug"
---
+
# Description:
-
# Steps to reproduce:
+
1.
2.
3.
# Expected behavior:
-
# What I got instead:
-
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2e47c178..2926ee85 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,6 @@ on:
- develop
jobs:
-
pre_check:
name: Precheck for skipping redundant jobs
runs-on: ubuntu-latest
@@ -40,26 +39,26 @@ jobs:
with:
paths: '["packages/website/**"]'
- lang-lint:
+ lang-lint:
name: Language lint
runs-on: ubuntu-latest
needs: pre_check
if: ${{ needs.pre_check.outputs.should_skip_lang != 'true' }}
- defaults:
- run:
+ 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 .
+ 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
@@ -71,34 +70,34 @@ jobs:
shell: bash
working-directory: packages/squiggle-lang
steps:
- - uses: actions/checkout@v2
- - name: Install dependencies from monorepo level
- run: cd ../../ && yarn
- - name: Build rescript codebase
- run: yarn build
- - name: Run tests
- run: yarn test
- - name: Run webpack
- run: yarn bundle
- - name: Upload coverage report
- run: yarn coverage:ci
+ - uses: actions/checkout@v2
+ - name: Install dependencies from monorepo level
+ run: cd ../../ && yarn
+ - name: Build rescript codebase
+ run: yarn build
+ - name: Run tests
+ run: yarn test
+ - name: Run webpack
+ run: yarn bundle
+ - name: Upload coverage report
+ run: yarn coverage:ci
components-lint:
name: Components lint
runs-on: ubuntu-latest
needs: pre_check
if: ${{ needs.pre_check.outputs.should_skip_components != 'true' }}
- defaults:
- run:
+ 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 .
+ 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
@@ -110,47 +109,47 @@ jobs:
shell: bash
working-directory: packages/components
steps:
- - uses: actions/checkout@v2
- - name: Install dependencies from monorepo level
- run: cd ../../ && yarn
- - name: Build rescript codebase in squiggle-lang
- run: cd ../squiggle-lang && yarn build
- - name: Run webpack
- run: yarn bundle
- - name: Build storybook
- run: yarn build
+ - uses: actions/checkout@v2
+ - name: Install dependencies from monorepo level
+ run: cd ../../ && yarn
+ - name: Build rescript codebase in squiggle-lang
+ run: cd ../squiggle-lang && yarn build
+ - name: Run webpack
+ run: yarn bundle
+ - 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') || (needs.pre_check.outputs.should_skip_lang != 'true') || (needs.pre_check.outputs.should_skip_components != 'true') }}
+ if: ${{ needs.pre_check.outputs.should_skip_website != 'true' }}
defaults:
run:
shell: bash
working-directory: packages/website
steps:
- - uses: actions/checkout@v2
- - name: Install dependencies from monorepo level
- run: cd ../../ && yarn
- - name: Build rescript in squiggle-lang
- run: cd ../squiggle-lang && yarn build
- - name: Build website assets
- run: yarn build
+ - 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') || (needs.pre_check.outputs.should_skip_lang != 'true') || (needs.pre_check.outputs.should_skip_components != 'true') }}
+ defaults:
+ run:
+ shell: bash
+ working-directory: packages/website
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install dependencies from monorepo level
+ run: cd ../../ && yarn
+ - name: Build rescript in squiggle-lang
+ run: cd ../squiggle-lang && yarn build
+ - name: Build website assets
+ run: yarn build
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0394c27d..83eb8152 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,20 +13,20 @@ name: "CodeQL"
on:
push:
- branches:
- - master
- - production
- - staging
- - develop
+ branches:
+ - master
+ - production
+ - staging
+ - develop
pull_request:
# The branches below must be a subset of the branches above
- branches:
- - master
- - production
- - staging
- - develop
+ branches:
+ - master
+ - production
+ - staging
+ - develop
schedule:
- - cron: '42 19 * * 0'
+ - cron: "42 19 * * 0"
jobs:
analyze:
@@ -40,39 +40,39 @@ jobs:
strategy:
fail-fast: false
matrix:
- language: [ 'javascript' ]
+ language: ["javascript"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support
steps:
- - name: Checkout repository
- uses: actions/checkout@v2
+ - name: Checkout repository
+ uses: actions/checkout@v2
- # Initializes the CodeQL tools for scanning.
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v1
- with:
- languages: ${{ matrix.language }}
- # If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
- # Prefix the list here with "+" to use these queries and those in the config file.
- # queries: ./path/to/local/query, your-org/your-repo/queries@main
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v1
+ with:
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+ # queries: ./path/to/local/query, your-org/your-repo/queries@main
- # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
- # If this step fails, then you should remove it and run the build manually (see below)
- - name: Autobuild
- uses: github/codeql-action/autobuild@v1
+ # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v1
- # âšī¸ Command-line programs to run using the OS shell.
- # đ https://git.io/JvXDl
+ # âšī¸ Command-line programs to run using the OS shell.
+ # đ https://git.io/JvXDl
- # âī¸ If the Autobuild fails above, remove it and uncomment the following three lines
- # and modify them (or add more) to build your code if your project
- # uses a compiled language
+ # âī¸ If the Autobuild fails above, remove it and uncomment the following three lines
+ # and modify them (or add more) to build your code if your project
+ # uses a compiled language
- #- run: |
- # make bootstrap
- # make release
+ #- run: |
+ # make bootstrap
+ # make release
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v1
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000..175742ce
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,9 @@
+.direnv
+*.bs.js
+*.gen.tsx
+packages/*/dist
+packages/components/storybook-static
+node_modules
+packages/*/node_modules
+packages/website/.docusaurus
+packages/squiggle-lang/lib
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3c17b1e7..22e5384f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,9 +2,9 @@ _The current document was written quickly and not exhaustively, yet, it's unfini
# Contributing to Squiggle
-We welcome contributions from developers, especially people in react/typescript, rescript, and interpreters/parsers. We also are keen to hear issues filed by users!
+We welcome contributions from developers, especially people in react/typescript, rescript, and interpreters/parsers. We also are keen to hear issues filed by users!
-Squiggle is currently pre-alpha.
+Squiggle is currently pre-alpha.
# Quick links
@@ -12,41 +12,43 @@ Squiggle is currently pre-alpha.
- The team presently communicates via the **EA Forecasting and Epistemics** slack (channels `#squiggle` and `#squiggle-ops`), you can track down an invite by reaching out to Ozzie Gooen
- [Squiggle documentation](https://www.squiggle-language.com/docs/Language)
- [Rescript documentation](https://rescript-lang.org/docs/manual/latest/introduction)
-- You can email `quinn@quantifieduncertainty.org` if you need assistance in onboarding or if you have questions
+- You can email `quinn@quantifieduncertainty.org` if you need assistance in onboarding or if you have questions
# Bug reports
-Anyone (with a github account) can file an issue at any time. Please allow Quinn, Sam, and Ozzie to triage, but otherwise just follow the suggestions in the issue templates.
+Anyone (with a github account) can file an issue at any time. Please allow Quinn, Sam, and Ozzie to triage, but otherwise just follow the suggestions in the issue templates.
# Project structure
-Squiggle is a **monorepo** with four **packages**.
+Squiggle is a **monorepo** with four **packages**.
+
- **components** is where we improve reactive interfacing with Squiggle
- **playground** is the site `playground.squiggle-language.com`
-- **squiggle-lang** is where the magic happens: probability distributions, the interpreter, etc.
+- **squiggle-lang** is where the magic happens: probability distributions, the interpreter, etc.
- **website** is the site `squiggle-language.com`
# Deployment ops
-We use netlify, and it should only concern Quinn, Sam, and Ozzie.
+We use netlify, and it should only concern Quinn, Sam, and Ozzie.
# Development environment, building, testing, dev server
-You need `yarn`.
+You need `yarn`.
-Being a monorepo, where packages are connected by dependency, it's important to follow `README.md`s closely. Each package has it's own `README.md`, which is where the bulk of information is.
+Being a monorepo, where packages are connected by dependency, it's important to follow `README.md`s closely. Each package has it's own `README.md`, which is where the bulk of information is.
-We aspire for `ci.yaml` and `README.md`s to be in one-to-one correspondence.
+We aspire for `ci.yaml` and `README.md`s to be in one-to-one correspondence.
## If you're on NixOS
-You'll need to run a command like this in order to get `yarn build` to run, especially in `packages/squiggle-lang`.
+You'll need to run a command like this in order to get `yarn build` to run, especially in `packages/squiggle-lang`.
+
```sh
-patchelf --set-interpreter $(patchelf --print-interpreter $(which mkdir)) ./node_modules/gentype/gentype.exe
+patchelf --set-interpreter $(patchelf --print-interpreter $(which mkdir)) ./node_modules/gentype/gentype.exe
```
See [here](https://github.com/NixOS/nixpkgs/issues/107375)
# Pull request protocol
-Please work against `staging` branch. **Do not** work against `master`. Please do not merge without approval from some subset of Quinn, Sam, and Ozzie; they will be auto-pinged.
+Please work against `staging` branch. **Do not** work against `master`. Please do not merge without approval from some subset of Quinn, Sam, and Ozzie; they will be auto-pinged.
diff --git a/README.md b/README.md
index cffb12ae..d1b85bb6 100644
--- a/README.md
+++ b/README.md
@@ -1,55 +1,58 @@
# Squiggle
+
[![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)
[![codecov](https://codecov.io/gh/quantified-uncertainty/squiggle/branch/develop/graph/badge.svg?token=QRLBL5CQ7C)](https://codecov.io/gh/quantified-uncertainty/squiggle)
-This is an experimental DSL/language for making probabilistic estimates. The full story can be found [here](https://www.lesswrong.com/s/rDe8QE5NvXcZYzgZ3).
+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 [![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
+- **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
+
+This monorepo has several packages that can be used for various purposes. All
the packages can be found in `packages`.
- `@quri/squiggle-lang` in `packages/squiggle-lang` contains the core language, particularly
-an interface to parse squiggle expressions and return descriptions of distributions
-or results.
+ an interface to parse squiggle expressions and return descriptions of distributions
+ or results.
- `@quri/squiggle-components` in `packages/components` contains React components that
-can be passed squiggle strings as props, and return a presentation of the result
-of the calculation.
+ can be passed squiggle strings as props, and return a presentation of the result
+ of the calculation.
- `@quri/squiggle-website` in `packages/website` The main descriptive website for squiggle,
-it is hosted at `squiggle-language.com`.
+ it is hosted at `squiggle-language.com`.
The playground depends on the components library which then depends on the language. This means that if you wish to work on the components library, you will need to build (no need to bundle) the language, and as of this writing playground doesn't really work.
# Develop
-For any project in the repo, begin by running `yarn` in the top level (TODO: is this true?)
+For any project in the repo, begin by running `yarn` in the top level (TODO: is this true?)
-``` sh
+```sh
yarn
```
-See `packages/*/README.md` to work with whatever project you're interested in.
+See `packages/*/README.md` to work with whatever project you're interested in.
-## `codium` for `rescript`
+## `codium` for `rescript`
-If you have `nix` installed with `flakes` enabled, you can build a `codium` in this repo for `rescript` development, if you don't want to pollute your machine's global editor with another mode/extension.
+If you have `nix` installed with `flakes` enabled, you can build a `codium` in this repo for `rescript` development, if you don't want to pollute your machine's global editor with another mode/extension.
-``` sh
+```sh
nix develop
-codium
+codium
```
-The `nix develop` shell also provides `yarn`.
+The `nix develop` shell also provides `yarn`.
# Contributing
-See `CONTRIBUTING.md`.
+
+See `CONTRIBUTING.md`.
diff --git a/package.json b/package.json
index 9601796a..4ae0287b 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
"packages/*"
],
"resolutions": {
- "@types/react": "^17.0.43"
+ "@types/react": "^18.0.1",
+ "react": "^18.0.0"
},
"packageManager": "yarn@1.22.17"
}
diff --git a/packages/components/.prettierignore b/packages/components/.prettierignore
deleted file mode 100644
index 009d61a2..00000000
--- a/packages/components/.prettierignore
+++ /dev/null
@@ -1,5 +0,0 @@
-dist
-build
-node_modules
-storybook-static
-.storybook
diff --git a/packages/components/.storybook/main.js b/packages/components/.storybook/main.js
index 7be66cf0..56f372fe 100644
--- a/packages/components/.storybook/main.js
+++ b/packages/components/.storybook/main.js
@@ -1,31 +1,37 @@
//const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
-const custom = require('../webpack.config.js');
+const custom = require("../webpack.config.js");
module.exports = {
- webpackFinal: async (config) => {
+ webpackFinal: async (config) => {
config.resolve.alias = custom.resolve.alias;
- return { ...config, module: { ...config.module, rules: config.module.rules.concat(custom.module.rules.filter(x => x.loader === "ts-loader")) } };
+ return {
+ ...config,
+ module: {
+ ...config.module,
+ rules: config.module.rules.concat(
+ custom.module.rules.filter((x) => x.loader === "ts-loader")
+ ),
+ },
+ };
},
- "stories": [
- "../src/**/*.stories.mdx",
- "../src/**/*.stories.@(js|jsx|ts|tsx)"
- ],
- "addons": [
+ stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
+ addons: [
"@storybook/addon-links",
"@storybook/addon-essentials",
- "@storybook/preset-create-react-app"
+ "@storybook/preset-create-react-app",
],
- "framework": "@storybook/react",
- "core": {
- "builder": "webpack5"
+ framework: "@storybook/react",
+ core: {
+ builder: "webpack5",
},
typescript: {
check: false,
checkOptions: {},
- reactDocgen: 'react-docgen-typescript',
+ reactDocgen: "react-docgen-typescript",
reactDocgenTypescriptOptions: {
shouldExtractLiteralValuesFromEnum: true,
- propFilter: (prop) => (prop.parent ? !/node_modules/.test(prop.parent.fileName) : true),
+ propFilter: (prop) =>
+ prop.parent ? !/node_modules/.test(prop.parent.fileName) : true,
},
},
-}
+};
diff --git a/packages/components/.storybook/preview.js b/packages/components/.storybook/preview.js
index 786b0e25..f089c7f9 100644
--- a/packages/components/.storybook/preview.js
+++ b/packages/components/.storybook/preview.js
@@ -6,4 +6,4 @@ export const parameters = {
date: /Date$/,
},
},
-}
+};
diff --git a/packages/components/package.json b/packages/components/package.json
index bea82967..2cef6bee 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -15,10 +15,10 @@
"cross-env": "^7.0.3",
"lodash": "^4.17.21",
"react": "^18.0.0",
+ "react-ace": "9.5.0",
"react-dom": "^18.0.0",
"react-scripts": "5.0.0",
"react-vega": "^7.5.0",
- "react-ace": "9.5.0",
"styled-components": "^5.3.5",
"tsconfig-paths-webpack-plugin": "^3.5.2",
"typescript": "^4.6.3",
@@ -32,8 +32,8 @@
"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",
- "lint": "prettier --check .",
+ "all": "yarn bundle && yarn build",
+ "lint": "prettier --check .",
"format": "prettier --write ."
},
"eslintConfig": {
@@ -65,9 +65,6 @@
]
},
"devDependencies": {
- "@types/styled-components": "^5.1.24",
- "css-loader": "^6.7.1",
- "style-loader": "^3.3.1",
"@babel/plugin-proposal-private-property-in-object": "^7.16.7",
"@storybook/addon-actions": "^6.4.20",
"@storybook/addon-essentials": "^6.4.20",
@@ -77,8 +74,10 @@
"@storybook/node-logger": "^6.4.20",
"@storybook/preset-create-react-app": "^4.1.0",
"@storybook/react": "^6.4.20",
+ "@types/styled-components": "^5.1.24",
"@types/webpack": "^4.41.32",
"react-codejar": "^1.1.2",
+ "style-loader": "^3.3.1",
"ts-loader": "^9.2.8",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
diff --git a/packages/components/src/components/DistPlusChart.tsx b/packages/components/src/components/DistPlusChart.tsx
deleted file mode 100644
index 02f2fabd..00000000
--- a/packages/components/src/components/DistPlusChart.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import * as React from "react";
-import _ from "lodash";
-import type { Spec } from "vega";
-import type {
- DistPlus,
-} from "@quri/squiggle-lang";
-import { createClassFromSpec } from "react-vega";
-import * as chartSpecification from "../vega-specs/spec-distributions.json";
-
-let SquiggleVegaChart = createClassFromSpec({
- spec: chartSpecification as Spec,
-});
-
-export const DistPlusChart: React.FC<{
- distPlus: DistPlus;
- width: number;
- height: number;
-}> = ({ distPlus, width, height }) => {
- let shape = distPlus.pointSetDist;
- if (shape.tag === "Continuous") {
- let xyShape = shape.value.xyShape;
- let totalY = xyShape.ys.reduce((a, b) => a + b);
- let total = 0;
- let cdf = xyShape.ys.map((y) => {
- total += y;
- return total / totalY;
- });
- let values = _.zip(cdf, xyShape.xs, xyShape.ys).map(([c, x, y]) => ({
- cdf: (c * 100).toFixed(2) + "%",
- x: x,
- y: y,
- }));
-
- return (
-
- );
- } else if (shape.tag === "Discrete") {
- let xyShape = shape.value.xyShape;
- let totalY = xyShape.ys.reduce((a, b) => a + b);
- let total = 0;
- let cdf = xyShape.ys.map((y) => {
- total += y;
- return total / totalY;
- });
- let values = _.zip(cdf, xyShape.xs, xyShape.ys).map(([c, x, y]) => ({
- cdf: (c * 100).toFixed(2) + "%",
- x: x,
- y: y,
- }));
-
- return ;
- } else if (shape.tag === "Mixed") {
- let discreteShape = shape.value.discrete.xyShape;
- let totalDiscrete = discreteShape.ys.reduce((a, b) => a + b);
-
- let discretePoints = _.zip(discreteShape.xs, discreteShape.ys);
- let continuousShape = shape.value.continuous.xyShape;
- let continuousPoints = _.zip(continuousShape.xs, continuousShape.ys);
-
- interface labeledPoint {
- x: number;
- y: number;
- type: "discrete" | "continuous";
- }
-
- let markedDisPoints: labeledPoint[] = discretePoints.map(([x, y]) => ({
- x: x,
- y: y,
- type: "discrete",
- }));
- let markedConPoints: labeledPoint[] = continuousPoints.map(([x, y]) => ({
- x: x,
- y: y,
- type: "continuous",
- }));
-
- let sortedPoints = _.sortBy(markedDisPoints.concat(markedConPoints), "x");
-
- let totalContinuous = 1 - totalDiscrete;
- let totalY = continuousShape.ys.reduce((a: number, b: number) => a + b);
-
- let total = 0;
- let cdf = sortedPoints.map((point: labeledPoint) => {
- if (point.type === "discrete") {
- total += point.y;
- return total;
- } else if (point.type === "continuous") {
- total += (point.y / totalY) * totalContinuous;
- return total;
- }
- });
-
- interface cdfLabeledPoint {
- cdf: string;
- x: number;
- y: number;
- type: "discrete" | "continuous";
- }
- let cdfLabeledPoint: cdfLabeledPoint[] = _.zipWith(
- cdf,
- sortedPoints,
- (c: number, point: labeledPoint) => ({
- ...point,
- cdf: (c * 100).toFixed(2) + "%",
- })
- );
- let continuousValues = cdfLabeledPoint.filter(
- (x) => x.type === "continuous"
- );
- let discreteValues = cdfLabeledPoint.filter((x) => x.type === "discrete");
-
- return (
-
- );
- }
-};
\ No newline at end of file
diff --git a/packages/components/src/components/DistributionChart.tsx b/packages/components/src/components/DistributionChart.tsx
new file mode 100644
index 00000000..6111476c
--- /dev/null
+++ b/packages/components/src/components/DistributionChart.tsx
@@ -0,0 +1,42 @@
+import * as React from "react";
+import _ from "lodash";
+import type { Spec } from "vega";
+import type { Distribution } from "@quri/squiggle-lang";
+import { distributionErrorToString } from "@quri/squiggle-lang";
+import { createClassFromSpec } from "react-vega";
+import * as chartSpecification from "../vega-specs/spec-distributions.json";
+import { ErrorBox } from "./ErrorBox";
+
+let SquiggleVegaChart = createClassFromSpec({
+ spec: chartSpecification as Spec,
+});
+
+type DistributionChartProps = {
+ distribution: Distribution;
+ width: number;
+ height: number;
+};
+
+export const DistributionChart: React.FC = ({
+ distribution,
+ width,
+ height,
+}: DistributionChartProps) => {
+ let shape = distribution.pointSet();
+ if (shape.tag === "Ok") {
+ return (
+
+ );
+ } else {
+ return (
+
+ {distributionErrorToString(shape.value)}
+
+ );
+ }
+};
diff --git a/packages/components/src/components/Error.tsx b/packages/components/src/components/ErrorBox.tsx
similarity index 68%
rename from packages/components/src/components/Error.tsx
rename to packages/components/src/components/ErrorBox.tsx
index 4f5236ae..58e46218 100644
--- a/packages/components/src/components/Error.tsx
+++ b/packages/components/src/components/ErrorBox.tsx
@@ -7,10 +7,10 @@ const ShowError = styled.div`
padding: 0.4em 0.8em;
`;
-export const Error: React.FC<{ heading: string; children: React.ReactNode }> = ({
- heading = "Error",
- children,
-}) => {
+export const ErrorBox: React.FC<{
+ heading: string;
+ children: React.ReactNode;
+}> = ({ heading = "Error", children }) => {
return (
{heading}
diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx
index 7625b2da..ea00aa9c 100644
--- a/packages/components/src/components/FunctionChart.tsx
+++ b/packages/components/src/components/FunctionChart.tsx
@@ -1,88 +1,101 @@
import * as React from "react";
import _ from "lodash";
import type { Spec } from "vega";
-import type { DistPlus } from "@quri/squiggle-lang";
+import type { Distribution, errorValue, result } from "@quri/squiggle-lang";
import { createClassFromSpec } from "react-vega";
import * as percentilesSpec from "../vega-specs/spec-percentiles.json";
-import { DistPlusChart } from "./DistPlusChart";
-import { Error } from "./Error";
+import { DistributionChart } from "./DistributionChart";
+import { ErrorBox } from "./ErrorBox";
let SquigglePercentilesChart = createClassFromSpec({
spec: percentilesSpec as Spec,
});
-type distPlusFn = (
- a: number
-) => { tag: "Ok"; value: DistPlus } | { tag: "Error"; value: string };
+type distPlusFn = (a: number) => result;
-const _rangeByCount = (start, stop, count) => {
+const _rangeByCount = (start: number, stop: number, count: number) => {
const step = (stop - start) / (count - 1);
const items = _.range(start, stop, step);
const result = items.concat([stop]);
return result;
};
+function unwrap(x: result): a {
+ if (x.tag === "Ok") {
+ return x.value;
+ } else {
+ throw Error("FAILURE TO UNWRAP");
+ }
+}
+
+function mapFilter(xs: a[], f: (x: a) => b | undefined): b[] {
+ let initial: b[] = [];
+ return xs.reduce((previous, current) => {
+ let value: b | undefined = f(current);
+ if (value !== undefined) {
+ return previous.concat([value]);
+ } else {
+ return previous;
+ }
+ }, initial);
+}
+
export const FunctionChart: React.FC<{
distPlusFn: distPlusFn;
diagramStart: number;
diagramStop: number;
diagramCount: number;
}> = ({ distPlusFn, diagramStart, diagramStop, diagramCount }) => {
- let [mouseOverlay, setMouseOverlay] = React.useState(NaN);
+ let [mouseOverlay, setMouseOverlay] = React.useState(0);
function handleHover(...args) {
setMouseOverlay(args[1]);
}
- function handleOut(...args) {
+ function handleOut() {
setMouseOverlay(NaN);
}
const signalListeners = { mousemove: handleHover, mouseout: handleOut };
- let percentileArray = [
- 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99,
- ];
let mouseItem = distPlusFn(mouseOverlay);
let showChart =
mouseItem.tag === "Ok" ? (
-
+
) : (
<>>
);
let data1 = _rangeByCount(diagramStart, diagramStop, diagramCount);
- let valueData = data1
- .map((x) => {
- let result = distPlusFn(x);
- if (result.tag === "Ok") {
- return { x: x, value: result.value };
- } else return null;
- })
- .filter((x) => x !== null)
- .map(({ x, value }) => {
- let percentiles = getPercentiles(percentileArray, value);
- return {
- x: x,
- p1: percentiles[0],
- p5: percentiles[1],
- p10: percentiles[2],
- p20: percentiles[3],
- p30: percentiles[4],
- p40: percentiles[5],
- p50: percentiles[6],
- p60: percentiles[7],
- p70: percentiles[8],
- p80: percentiles[9],
- p90: percentiles[10],
- p95: percentiles[11],
- p99: percentiles[12],
- };
- });
+ let valueData = mapFilter(data1, (x) => {
+ let result = distPlusFn(x);
+ if (result.tag === "Ok") {
+ return { x: x, value: result.value };
+ }
+ }).map(({ x, value }) => {
+ return {
+ x: x,
+ p1: unwrap(value.inv(0.01)),
+ p5: unwrap(value.inv(0.05)),
+ p10: unwrap(value.inv(0.12)),
+ p20: unwrap(value.inv(0.2)),
+ p30: unwrap(value.inv(0.3)),
+ p40: unwrap(value.inv(0.4)),
+ p50: unwrap(value.inv(0.5)),
+ p60: unwrap(value.inv(0.6)),
+ p70: unwrap(value.inv(0.7)),
+ p80: unwrap(value.inv(0.8)),
+ p90: unwrap(value.inv(0.9)),
+ p95: unwrap(value.inv(0.95)),
+ p99: unwrap(value.inv(0.99)),
+ };
+ });
- let errorData = data1
- .map((x) => {
- let result = distPlusFn(x);
- if (result.tag === "Error") {
- return { x: x, error: result.value };
- } else return null;
- })
- .filter((x) => x !== null);
+ let errorData = mapFilter(data1, (x) => {
+ let result = distPlusFn(x);
+ if (result.tag === "Error") {
+ return { x: x, error: result.value };
+ }
+ });
let error2 = _.groupBy(errorData, (x) => x.error);
return (
<>
@@ -93,96 +106,10 @@ export const FunctionChart: React.FC<{
/>
{showChart}
{_.keysIn(error2).map((k) => (
-
+
{`Values: [${error2[k].map((r) => r.x.toFixed(2)).join(",")}]`}
-
+
))}
>
);
};
-
-function getPercentiles(percentiles: number[], t: DistPlus) {
- if (t.pointSetDist.tag === "Discrete") {
- let total = 0;
- let maxX = _.max(t.pointSetDist.value.xyShape.xs);
- let bounds = percentiles.map((_) => maxX);
- _.zipWith(
- t.pointSetDist.value.xyShape.xs,
- t.pointSetDist.value.xyShape.ys,
- (x, y) => {
- total += y;
- percentiles.forEach((v, i) => {
- if (total > v && bounds[i] === maxX) {
- bounds[i] = x;
- }
- });
- }
- );
- return bounds;
- } else if (t.pointSetDist.tag === "Continuous") {
- let total = 0;
- let maxX = _.max(t.pointSetDist.value.xyShape.xs);
- let totalY = _.sum(t.pointSetDist.value.xyShape.ys);
- let bounds = percentiles.map((_) => maxX);
- _.zipWith(
- t.pointSetDist.value.xyShape.xs,
- t.pointSetDist.value.xyShape.ys,
- (x, y) => {
- total += y / totalY;
- percentiles.forEach((v, i) => {
- if (total > v && bounds[i] === maxX) {
- bounds[i] = x;
- }
- });
- }
- );
- return bounds;
- } else if (t.pointSetDist.tag === "Mixed") {
- let discreteShape = t.pointSetDist.value.discrete.xyShape;
- let totalDiscrete = discreteShape.ys.reduce((a, b) => a + b);
-
- let discretePoints = _.zip(discreteShape.xs, discreteShape.ys);
- let continuousShape = t.pointSetDist.value.continuous.xyShape;
- let continuousPoints = _.zip(continuousShape.xs, continuousShape.ys);
-
- interface labeledPoint {
- x: number;
- y: number;
- type: "discrete" | "continuous";
- }
-
- let markedDisPoints: labeledPoint[] = discretePoints.map(([x, y]) => ({
- x: x,
- y: y,
- type: "discrete",
- }));
- let markedConPoints: labeledPoint[] = continuousPoints.map(([x, y]) => ({
- x: x,
- y: y,
- type: "continuous",
- }));
-
- let sortedPoints = _.sortBy(markedDisPoints.concat(markedConPoints), "x");
-
- let totalContinuous = 1 - totalDiscrete;
- let totalY = continuousShape.ys.reduce((a: number, b: number) => a + b);
-
- let total = 0;
- let maxX = _.max(sortedPoints.map((x) => x.x));
- let bounds = percentiles.map((_) => maxX);
- sortedPoints.map((point: labeledPoint) => {
- if (point.type === "discrete") {
- total += point.y;
- } else if (point.type === "continuous") {
- total += (point.y / totalY) * totalContinuous;
- }
- percentiles.forEach((v, i) => {
- if (total > v && bounds[i] === maxX) {
- bounds[i] = total;
- }
- });
- return total;
- });
- return bounds;
- }
-}
diff --git a/packages/components/src/components/NumberShower.tsx b/packages/components/src/components/NumberShower.tsx
index ca9dc943..8d3ddae9 100644
--- a/packages/components/src/components/NumberShower.tsx
+++ b/packages/components/src/components/NumberShower.tsx
@@ -2,97 +2,97 @@ import * as React from "react";
import _ from "lodash";
const orderOfMagnitudeNum = (n: number) => {
- return Math.pow(10, n);
+ return Math.pow(10, n);
};
// 105 -> 3
const orderOfMagnitude = (n: number) => {
- return Math.floor(Math.log(n) / Math.LN10 + 0.000000001);
+ return Math.floor(Math.log(n) / Math.LN10 + 0.000000001);
};
function withXSigFigs(number: number, sigFigs: number) {
- const withPrecision = number.toPrecision(sigFigs);
- const formatted = Number(withPrecision);
- return `${formatted}`;
+ const withPrecision = number.toPrecision(sigFigs);
+ const formatted = Number(withPrecision);
+ return `${formatted}`;
}
class NumberShowerBuilder {
- number: number;
- precision: number;
+ number: number;
+ precision: number;
- constructor(number: number, precision = 2) {
- this.number = number;
- this.precision = precision;
+ constructor(number: number, precision = 2) {
+ this.number = number;
+ this.precision = precision;
+ }
+
+ convert() {
+ const number = Math.abs(this.number);
+ const response = this.evaluate(number);
+ if (this.number < 0) {
+ response.value = "-" + response.value;
+ }
+ return response;
+ }
+
+ metricSystem(number: number, order: number) {
+ const newNumber = number / orderOfMagnitudeNum(order);
+ const precision = this.precision;
+ return `${withXSigFigs(newNumber, precision)}`;
+ }
+
+ evaluate(number: number) {
+ if (number === 0) {
+ return { value: this.metricSystem(0, 0) };
}
- convert() {
- const number = Math.abs(this.number);
- const response = this.evaluate(number);
- if (this.number < 0) {
- response.value = "-" + response.value;
- }
- return response;
- }
-
- metricSystem(number: number, order: number) {
- const newNumber = number / orderOfMagnitudeNum(order);
- const precision = this.precision;
- return `${withXSigFigs(newNumber, precision)}`;
- }
-
- evaluate(number: number) {
- if (number === 0) {
- return { value: this.metricSystem(0, 0) };
- }
-
- const order = orderOfMagnitude(number);
- if (order < -2) {
- return { value: this.metricSystem(number, order), power: order };
- } else if (order < 4) {
- return { value: this.metricSystem(number, 0) };
- } else if (order < 6) {
- return { value: this.metricSystem(number, 3), symbol: "K" };
- } else if (order < 9) {
- return { value: this.metricSystem(number, 6), symbol: "M" };
- } else if (order < 12) {
- return { value: this.metricSystem(number, 9), symbol: "B" };
- } else if (order < 15) {
- return { value: this.metricSystem(number, 12), symbol: "T" };
- } else {
- return { value: this.metricSystem(number, order), power: order };
- }
+ const order = orderOfMagnitude(number);
+ if (order < -2) {
+ return { value: this.metricSystem(number, order), power: order };
+ } else if (order < 4) {
+ return { value: this.metricSystem(number, 0) };
+ } else if (order < 6) {
+ return { value: this.metricSystem(number, 3), symbol: "K" };
+ } else if (order < 9) {
+ return { value: this.metricSystem(number, 6), symbol: "M" };
+ } else if (order < 12) {
+ return { value: this.metricSystem(number, 9), symbol: "B" };
+ } else if (order < 15) {
+ return { value: this.metricSystem(number, 12), symbol: "T" };
+ } else {
+ return { value: this.metricSystem(number, order), power: order };
}
+ }
}
export function numberShow(number: number, precision = 2) {
- const ns = new NumberShowerBuilder(number, precision);
- return ns.convert();
+ const ns = new NumberShowerBuilder(number, precision);
+ return ns.convert();
}
export interface NumberShowerProps {
- number: number;
- precision?: number
+ number: number;
+ precision?: number;
}
export let NumberShower: React.FC = ({
- number,
- precision = 2
+ number,
+ precision = 2,
}: NumberShowerProps) => {
- let numberWithPresentation = numberShow(number, precision);
- return (
+ let numberWithPresentation = numberShow(number, precision);
+ return (
+
+ {numberWithPresentation.value}
+ {numberWithPresentation.symbol}
+ {numberWithPresentation.power ? (
- {numberWithPresentation.value}
- {numberWithPresentation.symbol}
- {numberWithPresentation.power ? (
-
- {"\u00b710"}
-
- {numberWithPresentation.power}
-
-
- ) : (
- <>>
- )}
+ {"\u00b710"}
+
+ {numberWithPresentation.power}
+
- );
-}
+ ) : (
+ <>>
+ )}
+
+ );
+};
diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx
index f5dc5667..b8be8c7f 100644
--- a/packages/components/src/components/SquiggleChart.tsx
+++ b/packages/components/src/components/SquiggleChart.tsx
@@ -1,15 +1,10 @@
import * as React from "react";
import _ from "lodash";
-import { run } from "@quri/squiggle-lang";
-import type {
- SamplingInputs,
- exportEnv,
- exportDistribution,
-} from "@quri/squiggle-lang";
+import { run, errorValueToString } from "@quri/squiggle-lang";
+import type { samplingParams, exportEnv } from "@quri/squiggle-lang";
import { NumberShower } from "./NumberShower";
-import { DistPlusChart } from "./DistPlusChart";
-import { FunctionChart } from "./FunctionChart";
-import { Error } from "./Error";
+import { DistributionChart } from "./DistributionChart";
+import { ErrorBox } from "./ErrorBox";
export interface SquiggleChartProps {
/** The input string for squiggle */
@@ -39,53 +34,43 @@ export const SquiggleChart: React.FC = ({
squiggleString = "",
sampleCount = 1000,
outputXYPoints = 1000,
- kernelWidth,
- pointDistLength = 1000,
- diagramStart = 0,
- diagramStop = 10,
- diagramCount = 20,
environment = [],
onEnvChange = () => {},
width = 500,
height = 60,
}: SquiggleChartProps) => {
- let samplingInputs: SamplingInputs = {
+ let samplingInputs: samplingParams = {
sampleCount: sampleCount,
- outputXYPoints: outputXYPoints,
- kernelWidth: kernelWidth,
- pointDistLength: pointDistLength,
+ xyPointLength: outputXYPoints,
};
- let result = run(squiggleString, samplingInputs, environment);
- if (result.tag === "Ok") {
- let environment = result.value.environment;
- let exports = result.value.exports;
+ let expressionResult = run(squiggleString, samplingInputs, environment);
+ if (expressionResult.tag === "Ok") {
onEnvChange(environment);
- let chartResults = exports.map((chartResult: exportDistribution) => {
- if (chartResult["NAME"] === "Float") {
- return ;
- } else if (chartResult["NAME"] === "DistPlus") {
- return (
-
- );
- } else if (chartResult.NAME === "Function") {
- return (
-
- );
- }
- });
- return <>{chartResults}>;
- } else if (result.tag === "Error") {
+ let expression = expressionResult.value;
+ if (expression.tag === "number") {
+ return ;
+ } else if (expression.tag === "distribution") {
+ return (
+
+ );
+ } else {
+ return (
+
+ {"We don't currently have a viewer for this type: " + expression.tag}
+
+ );
+ }
+ } else {
// At this point, we came across an error. What was our error?
- return {result.value};
+ return (
+
+ {errorValueToString(expressionResult.value)}
+
+ );
}
};
diff --git a/packages/components/src/components/SquiggleEditor.tsx b/packages/components/src/components/SquiggleEditor.tsx
index e606937d..f393a2d7 100644
--- a/packages/components/src/components/SquiggleEditor.tsx
+++ b/packages/components/src/components/SquiggleEditor.tsx
@@ -3,7 +3,7 @@ import * as ReactDOM from "react-dom";
import { SquiggleChart } from "./SquiggleChart";
import { CodeEditor } from "./CodeEditor";
import type { exportEnv } from "@quri/squiggle-lang";
-import styled from 'styled-components'
+import styled from "styled-components";
export interface SquiggleEditorProps {
/** The input string for squiggle */
diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx
index e6f4d3be..ae38563c 100644
--- a/packages/components/src/components/SquigglePlayground.tsx
+++ b/packages/components/src/components/SquigglePlayground.tsx
@@ -36,10 +36,8 @@ interface Props {
initialSquiggleString?: string;
}
-let SquigglePlayground: FC = ({initialSquiggleString=""}: Props) => {
- let [squiggleString, setSquiggleString] = useState(
- initialSquiggleString
- );
+let SquigglePlayground: FC = ({ initialSquiggleString = "" }: Props) => {
+ let [squiggleString, setSquiggleString] = useState(initialSquiggleString);
let [sampleCount, setSampleCount] = useState(1000);
let [outputXYPoints, setOutputXYPoints] = useState(1000);
let [pointDistLength, setPointDistLength] = useState(1000);
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index c16e5ac7..364e6dcb 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -1,5 +1,8 @@
export { SquiggleChart } from "./components/SquiggleChart";
-export { SquiggleEditor, renderSquiggleEditorToDom } from "./components/SquiggleEditor";
+export {
+ SquiggleEditor,
+ renderSquiggleEditorToDom,
+} from "./components/SquiggleEditor";
import SquigglePlayground, {
renderSquigglePlaygroundToDom,
} from "./components/SquigglePlayground";
diff --git a/packages/components/src/stories/Introduction.stories.mdx b/packages/components/src/stories/Introduction.stories.mdx
index 525c12bb..0217397c 100644
--- a/packages/components/src/stories/Introduction.stories.mdx
+++ b/packages/components/src/stories/Introduction.stories.mdx
@@ -3,4 +3,4 @@ import { Meta } from "@storybook/addon-docs";
This is the component library for Squiggle. These are React
-components, and can be used in any application that you see fit.
\ No newline at end of file
+components, and can be used in any application that you see fit.
diff --git a/packages/components/src/stories/NumberShower.stories.mdx b/packages/components/src/stories/NumberShower.stories.mdx
index fd9f39d1..56527106 100644
--- a/packages/components/src/stories/NumberShower.stories.mdx
+++ b/packages/components/src/stories/NumberShower.stories.mdx
@@ -14,10 +14,10 @@ It uses the symbols "K", "M", "B", and "T", to represent thousands, millions, bi
name="Ten Thousand"
args={{
number: 10000,
- precision: 2
+ precision: 2,
}}
>
- {args => }
+ {(args) => }
@@ -26,10 +26,10 @@ It uses the symbols "K", "M", "B", and "T", to represent thousands, millions, bi
name="Ten Billion"
args={{
number: 10000000000,
- precision: 2
+ precision: 2,
}}
>
- {args => }
+ {(args) => }
@@ -38,10 +38,10 @@ It uses the symbols "K", "M", "B", and "T", to represent thousands, millions, bi
name="1.2*10^15"
args={{
number: 1200000000000000,
- precision: 2
+ precision: 2,
}}
>
- {args => }
+ {(args) => }
@@ -50,10 +50,10 @@ It uses the symbols "K", "M", "B", and "T", to represent thousands, millions, bi
name="1.35*10^-13"
args={{
number: 0.000000000000135,
- precision: 2
+ precision: 2,
}}
>
- {args => }
+ {(args) => }
diff --git a/packages/components/src/stories/SquiggleChart.stories.mdx b/packages/components/src/stories/SquiggleChart.stories.mdx
index 9c4799e1..cd7c1c2c 100644
--- a/packages/components/src/stories/SquiggleChart.stories.mdx
+++ b/packages/components/src/stories/SquiggleChart.stories.mdx
@@ -50,7 +50,8 @@ could be continuous, discrete or mixed.
{Template.bind({})}
@@ -75,7 +76,7 @@ to allow large and small numbers being printed cleanly.
## Functions
-Full functions can be returned. These plot out the results of distributions between a set of x-coordinates.
+Full functions can be returned. These plot out the results of distributions between a set of x-coordinates.
The default is show 10 points between 0 and 10.
diff --git a/packages/components/src/vega-specs/spec-distributions.json b/packages/components/src/vega-specs/spec-distributions.json
index c8f340c3..d67c3762 100644
--- a/packages/components/src/vega-specs/spec-distributions.json
+++ b/packages/components/src/vega-specs/spec-distributions.json
@@ -160,7 +160,7 @@
"shape": {
"value": "circle"
},
- "size": [{"value": 30}],
+ "size": [{ "value": 30 }],
"tooltip": {
"signal": "datum.y"
}
diff --git a/packages/components/src/vega-specs/spec-percentiles.json b/packages/components/src/vega-specs/spec-percentiles.json
index a9fc08d4..d533a866 100644
--- a/packages/components/src/vega-specs/spec-percentiles.json
+++ b/packages/components/src/vega-specs/spec-percentiles.json
@@ -96,11 +96,11 @@
"signals": [
{
"name": "mousemove",
- "on": [{"events": "mousemove", "update": "invert('xscale', x())"}]
+ "on": [{ "events": "mousemove", "update": "invert('xscale', x())" }]
},
{
"name": "mouseout",
- "on": [{"events": "mouseout", "update": "invert('xscale', x())"}]
+ "on": [{ "events": "mouseout", "update": "invert('xscale', x())" }]
}
],
"axes": [
@@ -132,7 +132,7 @@
"type": "rule",
"encode": {
"update": {
- "xscale": {"scale": "xscale", "signal": "mousemove"}
+ "xscale": { "scale": "xscale", "signal": "mousemove" }
}
}
},
diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json
index 5152fc9b..c8d799d5 100644
--- a/packages/components/tsconfig.json
+++ b/packages/components/tsconfig.json
@@ -5,10 +5,12 @@
},
"module": "commonjs",
"jsx": "react",
+ "skipLibCheck": true,
"resolveJsonModule": true,
"noImplicitAny": false,
"esModuleInterop": true,
"removeComments": true,
+ "strict": true,
"preserveConstEnums": true,
"composite": true,
"outDir": "./dist",
@@ -16,7 +18,10 @@
"declaration": true,
"sourceMap": true
},
- "files": ["src/vega-specs/spec-distributions.json", "src/vega-specs/spec-percentiles.json"],
+ "files": [
+ "src/vega-specs/spec-distributions.json",
+ "src/vega-specs/spec-percentiles.json"
+ ],
"target": "ES6",
"include": ["src/**/*", "src/*"],
"exclude": ["node_modules", "**/*.spec.ts", "webpack.config.js"],
diff --git a/packages/components/webpack.config.js b/packages/components/webpack.config.js
index 6da80035..d0c93be0 100644
--- a/packages/components/webpack.config.js
+++ b/packages/components/webpack.config.js
@@ -3,13 +3,14 @@ const path = require("path");
module.exports = {
mode: "production",
devtool: "source-map",
+ profile: true,
entry: "./src/index.ts",
module: {
rules: [
{
test: /\.tsx?$/,
loader: "ts-loader",
- options: { projectReferences: true },
+ options: { projectReferences: true, transpileOnly: true },
exclude: /node_modules/,
},
{
diff --git a/packages/squiggle-lang/.prettierignore b/packages/squiggle-lang/.prettierignore
deleted file mode 100644
index 07e4ebf8..00000000
--- a/packages/squiggle-lang/.prettierignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.bs.js
-*.gen.tsx
-dist
diff --git a/packages/squiggle-lang/__tests__/JS__Test.ts b/packages/squiggle-lang/__tests__/JS__Test.ts
index ffba5b82..72f68ba4 100644
--- a/packages/squiggle-lang/__tests__/JS__Test.ts
+++ b/packages/squiggle-lang/__tests__/JS__Test.ts
@@ -1,11 +1,21 @@
-import { run, Distribution, resultMap } from "../src/js/index";
+import {
+ run,
+ Distribution,
+ resultMap,
+ squiggleExpression,
+ errorValueToString,
+} from "../src/js/index";
-let testRun = (x: string) => {
- let result = run(x);
- if (result.tag == "Ok") {
- return { tag: "Ok", value: result.value.exports };
+let testRun = (x: string): squiggleExpression => {
+ let result = run(x, { sampleCount: 100, xyPointLength: 100 });
+ expect(result.tag).toEqual("Ok");
+ if (result.tag === "Ok") {
+ return result.value;
} else {
- return result;
+ throw Error(
+ "Expected squiggle expression to evaluate but got error: " +
+ errorValueToString(result.value)
+ );
}
};
@@ -16,29 +26,19 @@ function Ok(x: b) {
describe("Simple calculations and results", () => {
test("mean(normal(5,2))", () => {
expect(testRun("mean(normal(5,2))")).toEqual({
- tag: "Ok",
- value: [{ NAME: "Float", VAL: 5 }],
+ tag: "number",
+ value: 5,
});
});
test("10+10", () => {
let foo = testRun("10 + 10");
- expect(foo).toEqual({ tag: "Ok", value: [{ NAME: "Float", VAL: 20 }] });
+ expect(foo).toEqual({ tag: "number", value: 20 });
});
});
describe("Log function", () => {
test("log(1) = 0", () => {
let foo = testRun("log(1)");
- expect(foo).toEqual({ tag: "Ok", value: [{ NAME: "Float", VAL: 0 }] });
- });
-});
-
-describe("Multimodal too many weights error", () => {
- test("mm(0,0,[0,0,0])", () => {
- let foo = testRun("mm(0,0,[0,0,0])");
- expect(foo).toEqual({
- tag: "Error",
- value: "Function multimodal error: Too many weights provided",
- });
+ expect(foo).toEqual({ tag: "number", value: 0 });
});
});
@@ -69,7 +69,7 @@ describe("Distribution", () => {
});
test("toPointSet", () => {
expect(
- resultMap(dist.toPointSet(), (r: Distribution) => r.toString()).value
+ resultMap(dist.toPointSet(), (r: Distribution) => r.toString())
).toEqual(Ok("Point Set Distribution"));
});
test("toSparkline", () => {
diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn_test.res
index 2fd2a976..1bb26e28 100644
--- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn_test.res
+++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn_test.res
@@ -4,7 +4,7 @@ open Jest
open Expect
let expectEvalToBe = (expr: string, answer: string) =>
- Reducer.eval(expr)->ExpressionValue.toStringResult->expect->toBe(answer)
+ Reducer.evaluate(expr)->ExpressionValue.toStringResult->expect->toBe(answer)
describe("builtin", () => {
// All MathJs operators and functions are available for string, number and boolean
diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_TestHelpers.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_TestHelpers.res
index 65f689cc..e6183ba0 100644
--- a/packages/squiggle-lang/__tests__/Reducer/Reducer_TestHelpers.res
+++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_TestHelpers.res
@@ -8,4 +8,4 @@ let expectParseToBe = (expr: string, answer: string) =>
Reducer.parse(expr)->Expression.toStringResult->expect->toBe(answer)
let expectEvalToBe = (expr: string, answer: string) =>
- Reducer.eval(expr)->ExpressionValue.toStringResult->expect->toBe(answer)
+ Reducer.evaluate(expr)->ExpressionValue.toStringResult->expect->toBe(answer)
diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json
index e9a109c7..53afae8b 100644
--- a/packages/squiggle-lang/package.json
+++ b/packages/squiggle-lang/package.json
@@ -14,8 +14,8 @@
"coverage:ci": "yarn clean; BISECT_ENABLE=yes yarn build; yarn test; bisect-ppx-report send-to Codecov",
"lint:rescript": "./lint.sh",
"lint:prettier": "prettier --check .",
- "lint": "yarn lint:rescript && yarn lint:prettier",
- "format": "rescript format -all && prettier --write .",
+ "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/js/index.ts b/packages/squiggle-lang/src/js/index.ts
index 8ff08228..8455c601 100644
--- a/packages/squiggle-lang/src/js/index.ts
+++ b/packages/squiggle-lang/src/js/index.ts
@@ -1,14 +1,26 @@
-import { runAll } from "../rescript/ProgramEvaluator.gen";
+import * as _ from "lodash";
import type {
- Inputs_SamplingInputs_t as SamplingInputs,
exportEnv,
- exportType,
exportDistribution,
} from "../rescript/ProgramEvaluator.gen";
-export type { SamplingInputs, exportEnv, exportDistribution };
-export type { t as DistPlus } from "../rescript/OldInterpreter/DistPlus.gen";
-import { genericDist, env, error } from "../rescript/TypescriptInterface.gen";
-export { makeSampleSetDist } from "../rescript/TypescriptInterface.gen";
+export type { exportEnv, exportDistribution };
+import {
+ genericDist,
+ samplingParams,
+ evaluate,
+ expressionValue,
+ errorValue,
+ distributionError,
+ toPointSet,
+ continuousShape,
+ discreteShape,
+ distributionErrorToString,
+} from "../rescript/TypescriptInterface.gen";
+export {
+ makeSampleSetDist,
+ errorValueToString,
+ distributionErrorToString,
+} from "../rescript/TypescriptInterface.gen";
import {
Constructors_mean,
Constructors_sample,
@@ -35,26 +47,14 @@ import {
Constructors_pointwiseLogarithm,
Constructors_pointwisePower,
} from "../rescript/Distributions/DistributionOperation/DistributionOperation.gen";
+export type { samplingParams, errorValue };
-export let defaultSamplingInputs: SamplingInputs = {
+export let defaultSamplingInputs: samplingParams = {
sampleCount: 10000,
- outputXYPoints: 10000,
- pointDistLength: 1000,
+ xyPointLength: 10000,
};
-export function run(
- squiggleString: string,
- samplingInputs?: SamplingInputs,
- environment?: exportEnv
-): result {
- let si: SamplingInputs = samplingInputs
- ? samplingInputs
- : defaultSamplingInputs;
- let env: exportEnv = environment ? environment : [];
- return runAll(squiggleString, si, env);
-}
-
-type result =
+export type result =
| {
tag: "Ok";
value: a;
@@ -75,147 +75,264 @@ export function resultMap(
}
}
+function Ok(x: a): result {
+ return { tag: "Ok", value: x };
+}
+
+type tagged = { tag: a; value: b };
+
+function tag(x: a, y: b): tagged {
+ return { tag: x, value: y };
+}
+
+export type squiggleExpression =
+ | tagged<"symbol", string>
+ | tagged<"string", string>
+ | tagged<"array", squiggleExpression[]>
+ | tagged<"boolean", boolean>
+ | tagged<"distribution", Distribution>
+ | tagged<"number", number>
+ | tagged<"record", { [key: string]: squiggleExpression }>;
+export function run(
+ squiggleString: string,
+ samplingInputs?: samplingParams,
+ _environment?: exportEnv
+): result {
+ let si: samplingParams = samplingInputs
+ ? samplingInputs
+ : defaultSamplingInputs;
+ let result: result = evaluate(squiggleString);
+ return resultMap(result, (x) => createTsExport(x, si));
+}
+
+function createTsExport(
+ x: expressionValue,
+ sampEnv: samplingParams
+): squiggleExpression {
+ switch (x.tag) {
+ case "EvArray":
+ return tag(
+ "array",
+ x.value.map((x) => createTsExport(x, sampEnv))
+ );
+ case "EvBool":
+ return tag("boolean", x.value);
+ case "EvDistribution":
+ return tag("distribution", new Distribution(x.value, sampEnv));
+ case "EvNumber":
+ return tag("number", x.value);
+ case "EvRecord":
+ return tag(
+ "record",
+ _.mapValues(x.value, (x) => createTsExport(x, sampEnv))
+ );
+ case "EvString":
+ return tag("string", x.value);
+ case "EvSymbol":
+ return tag("symbol", x.value);
+ }
+}
+
export function resultExn(r: result): a | c {
return r.value;
}
+export type point = { x: number; y: number };
+
+export type shape = {
+ continuous: point[];
+ discrete: point[];
+};
+
+function shapePoints(x: continuousShape | discreteShape): point[] {
+ let xs = x.xyShape.xs;
+ let ys = x.xyShape.ys;
+ return _.zipWith(xs, ys, (x, y) => ({ x, y }));
+}
+
export class Distribution {
t: genericDist;
- env: env;
+ env: samplingParams;
- constructor(t: genericDist, env: env) {
+ constructor(t: genericDist, env: samplingParams) {
this.t = t;
this.env = env;
return this;
}
- mapResultDist(r: result): result {
+ mapResultDist(
+ r: result
+ ): result {
return resultMap(r, (v: genericDist) => new Distribution(v, this.env));
}
- mean(): result {
+ mean(): result {
return Constructors_mean({ env: this.env }, this.t);
}
- sample(): result {
+ sample(): result {
return Constructors_sample({ env: this.env }, this.t);
}
- pdf(n: number): result {
+ pdf(n: number): result {
return Constructors_pdf({ env: this.env }, this.t, n);
}
- cdf(n: number): result {
+ cdf(n: number): result {
return Constructors_cdf({ env: this.env }, this.t, n);
}
- inv(n: number): result {
+ inv(n: number): result {
return Constructors_inv({ env: this.env }, this.t, n);
}
- normalize(): result {
+ normalize(): result {
return this.mapResultDist(
Constructors_normalize({ env: this.env }, this.t)
);
}
- toPointSet(): result {
+ pointSet(): result {
+ let pointSet = toPointSet(
+ this.t,
+ {
+ xyPointLength: this.env.xyPointLength,
+ sampleCount: this.env.sampleCount,
+ },
+ undefined
+ );
+ if (pointSet.tag === "Ok") {
+ let distribution = pointSet.value;
+ if (distribution.tag === "Continuous") {
+ return Ok({
+ continuous: shapePoints(distribution.value),
+ discrete: [],
+ });
+ } else if (distribution.tag === "Discrete") {
+ return Ok({
+ discrete: shapePoints(distribution.value),
+ continuous: [],
+ });
+ } else {
+ return Ok({
+ discrete: shapePoints(distribution.value.discrete),
+ continuous: shapePoints(distribution.value.continuous),
+ });
+ }
+ } else {
+ return pointSet;
+ }
+ }
+
+ toPointSet(): result {
return this.mapResultDist(
Constructors_toPointSet({ env: this.env }, this.t)
);
}
- toSampleSet(n: number): result {
+ toSampleSet(n: number): result {
return this.mapResultDist(
Constructors_toSampleSet({ env: this.env }, this.t, n)
);
}
- truncate(left: number, right: number): result {
+ truncate(
+ left: number,
+ right: number
+ ): result {
return this.mapResultDist(
Constructors_truncate({ env: this.env }, this.t, left, right)
);
}
- inspect(): result {
+ inspect(): result {
return this.mapResultDist(Constructors_inspect({ env: this.env }, this.t));
}
- toString(): result {
- return Constructors_toString({ env: this.env }, this.t);
+ toString(): string {
+ let result = Constructors_toString({ env: this.env }, this.t);
+ if (result.tag === "Ok") {
+ return result.value;
+ } else {
+ return distributionErrorToString(result.value);
+ }
}
- toSparkline(n: number): result {
+ toSparkline(n: number): result {
return Constructors_toSparkline({ env: this.env }, this.t, n);
}
- algebraicAdd(d2: Distribution): result {
+ algebraicAdd(d2: Distribution): result {
return this.mapResultDist(
Constructors_algebraicAdd({ env: this.env }, this.t, d2.t)
);
}
- algebraicMultiply(d2: Distribution): result {
+ algebraicMultiply(d2: Distribution): result {
return this.mapResultDist(
Constructors_algebraicMultiply({ env: this.env }, this.t, d2.t)
);
}
- algebraicDivide(d2: Distribution): result {
+ algebraicDivide(d2: Distribution): result {
return this.mapResultDist(
Constructors_algebraicDivide({ env: this.env }, this.t, d2.t)
);
}
- algebraicSubtract(d2: Distribution): result {
+ algebraicSubtract(d2: Distribution): result {
return this.mapResultDist(
Constructors_algebraicSubtract({ env: this.env }, this.t, d2.t)
);
}
- algebraicLogarithm(d2: Distribution): result {
+ algebraicLogarithm(
+ d2: Distribution
+ ): result {
return this.mapResultDist(
Constructors_algebraicLogarithm({ env: this.env }, this.t, d2.t)
);
}
- algebraicPower(d2: Distribution): result {
+ algebraicPower(d2: Distribution): result {
return this.mapResultDist(
Constructors_algebraicPower({ env: this.env }, this.t, d2.t)
);
}
- pointwiseAdd(d2: Distribution): result {
+ pointwiseAdd(d2: Distribution): result {
return this.mapResultDist(
Constructors_pointwiseAdd({ env: this.env }, this.t, d2.t)
);
}
- pointwiseMultiply(d2: Distribution): result {
+ pointwiseMultiply(d2: Distribution): result {
return this.mapResultDist(
Constructors_pointwiseMultiply({ env: this.env }, this.t, d2.t)
);
}
- pointwiseDivide(d2: Distribution): result {
+ pointwiseDivide(d2: Distribution): result {
return this.mapResultDist(
Constructors_pointwiseDivide({ env: this.env }, this.t, d2.t)
);
}
- pointwiseSubtract(d2: Distribution): result {
+ pointwiseSubtract(d2: Distribution): result {
return this.mapResultDist(
Constructors_pointwiseSubtract({ env: this.env }, this.t, d2.t)
);
}
- pointwiseLogarithm(d2: Distribution): result {
+ pointwiseLogarithm(
+ d2: Distribution
+ ): result {
return this.mapResultDist(
Constructors_pointwiseLogarithm({ env: this.env }, this.t, d2.t)
);
}
- pointwisePower(d2: Distribution): result {
+ pointwisePower(d2: Distribution): result {
return this.mapResultDist(
Constructors_pointwisePower({ env: this.env }, this.t, d2.t)
);
diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi
index 4565ec14..bd6755fd 100644
--- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi
+++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi
@@ -21,6 +21,7 @@ let toFloatOperation: (
~distToFloatOperation: Operation.distToFloatOperation,
) => result
+@genType
let toPointSet: (
t,
~xyPointLength: int,
diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist_Types.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist_Types.res
index 96e7d3f8..4d2ba9b6 100644
--- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist_Types.res
+++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist_Types.res
@@ -10,10 +10,21 @@ type error =
| DistributionVerticalShiftIsInvalid
| Other(string)
+@genType
module Error = {
type t = error
let fromString = (s: string): t => Other(s)
+
+ @genType
+ let toString = (x: t) => {
+ switch x {
+ | NotYetImplemented => "Not Yet Implemented"
+ | Unreachable => "Unreachable"
+ | DistributionVerticalShiftIsInvalid => "Distribution Vertical Shift Is Invalid"
+ | Other(s) => s
+ }
+ }
let resultStringToResultError: result<'a, string> => result<'a, error> = n =>
n->E.R2.errMap(r => r->fromString->Error)
@@ -51,6 +62,7 @@ module Operation = {
| #Sample
]
+ @genType
type pointsetXSelection = [#Linear | #ByWeight]
type toDist =
diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res
index 3b689453..3bd22018 100644
--- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res
+++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res
@@ -214,4 +214,4 @@ module T = Dist({
let getMeanOfSquares = t => t |> shapeMap(XYShape.T.square) |> mean
XYShape.Analysis.getVarianceDangerously(t, mean, getMeanOfSquares)
}
-})
\ No newline at end of file
+})
diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetTypes.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetTypes.res
index 2d7947c0..4de2e880 100644
--- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetTypes.res
+++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetTypes.res
@@ -19,6 +19,7 @@ type interpolationStrategy = XYShape.interpolationStrategy;
type extrapolationStrategy = XYShape.extrapolationStrategy;
type interpolator = XYShape.extrapolationStrategy;
+@genType
type rec continuousShape = {
xyShape: xyShape,
interpolation: interpolationStrategy,
@@ -26,12 +27,14 @@ type rec continuousShape = {
integralCache: option,
}
+@genType
type discreteShape = {
xyShape: xyShape,
integralSumCache: option,
integralCache: option,
}
+@genType
type mixedShape = {
continuous: continuousShape,
discrete: discreteShape,
diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer.res
index bc5f496d..7e93f367 100644
--- a/packages/squiggle-lang/src/rescript/Reducer/Reducer.res
+++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer.res
@@ -5,5 +5,6 @@ module Extra = Reducer_Extra
module Js = Reducer_Js
module MathJs = Reducer_MathJs
-let eval = Expression.eval
+type expressionValue = Reducer_Expression.expressionValue
+let evaluate = Expression.eval
let parse = Expression.parse
diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer.resi b/packages/squiggle-lang/src/rescript/Reducer/Reducer.resi
index 65b2a62a..b5b811e6 100644
--- a/packages/squiggle-lang/src/rescript/Reducer/Reducer.resi
+++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer.resi
@@ -4,5 +4,10 @@ module Expression = Reducer_Expression
module Extra = Reducer_Extra
module Js = Reducer_Js
module MathJs = Reducer_MathJs
-let eval: string => result
+
+@genType
+type expressionValue = Reducer_Expression.expressionValue
+
+@genType
+let evaluate: string => result
let parse: string => result
diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res
index 4f57bc2c..d0c85d59 100644
--- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res
+++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res
@@ -1,3 +1,4 @@
+@genType
type errorValue =
| REArrayIndexNotFound(string, int)
| REFunctionExpected(string)
@@ -7,6 +8,7 @@ type errorValue =
type t = errorValue
+@genType
let errorToString = err =>
switch err {
| REArrayIndexNotFound(msg, index) => `${msg}: ${Js.String.make(index)}`
diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.resi b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.resi
index 8b09c516..2a6db9bd 100644
--- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.resi
+++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.resi
@@ -1,7 +1,8 @@
module Result = Belt.Result
module T = Reducer_Expression_T
type expression = T.expression
-type expressionValue = ReducerInterface.ExpressionValue.expressionValue
+@genType
+type expressionValue = ReducerInterface_ExpressionValue.expressionValue
type t = expression
let toString: T.expression => Js.String.t
let toStringResult: result => string
diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res
index bfb79df1..8842ce8f 100644
--- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res
+++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res
@@ -5,6 +5,7 @@
module Extra_Array = Reducer_Extra_Array
module ErrorValue = Reducer_ErrorValue
+@genType
type rec expressionValue =
| EvBool(bool)
| EvNumber(float)
diff --git a/packages/squiggle-lang/src/rescript/TypescriptInterface.res b/packages/squiggle-lang/src/rescript/TypescriptInterface.res
index 6fe6f3d4..a706bdd2 100644
--- a/packages/squiggle-lang/src/rescript/TypescriptInterface.res
+++ b/packages/squiggle-lang/src/rescript/TypescriptInterface.res
@@ -8,20 +8,49 @@ The below few seem to work fine. In the future there's definitely more work to d
*/
@genType
-type env = DistributionOperation.env
+type samplingParams = DistributionOperation.env
@genType
type genericDist = GenericDist_Types.genericDist
@genType
-type error = GenericDist_Types.error
+type distributionError = GenericDist_Types.error
@genType
-type resultDist = result
-@genType
-type resultFloat = result
-@genType
-type resultString = result
+type resultDist = result
@genType
-let makeSampleSetDist = SampleSetDist.make
\ No newline at end of file
+type resultFloat = result
+
+@genType
+type resultString = result
+
+@genType
+let makeSampleSetDist = SampleSetDist.make
+
+@genType
+let evaluate = Reducer.evaluate
+
+@genType
+type expressionValue = Reducer_Expression.expressionValue
+
+@genType
+type errorValue = Reducer_ErrorValue.errorValue
+
+@genType
+let toPointSet = GenericDist.toPointSet
+
+@genType
+type mixedShape = PointSetTypes.mixedShape
+
+@genType
+type discreteShape = PointSetTypes.discreteShape
+
+@genType
+type continuousShape = PointSetTypes.continuousShape
+
+@genType
+let errorValueToString = Reducer_ErrorValue.errorToString
+
+@genType
+let distributionErrorToString = GenericDist_Types.Error.toString
diff --git a/packages/squiggle-lang/src/rescript/shims/Js.shim.ts b/packages/squiggle-lang/src/rescript/shims/Js.shim.ts
new file mode 100644
index 00000000..76f971a3
--- /dev/null
+++ b/packages/squiggle-lang/src/rescript/shims/Js.shim.ts
@@ -0,0 +1 @@
+export type Dict_t = { [key: string]: T };
diff --git a/packages/squiggle-lang/tsconfig.json b/packages/squiggle-lang/tsconfig.json
index 2f41e5e1..7a610d10 100644
--- a/packages/squiggle-lang/tsconfig.json
+++ b/packages/squiggle-lang/tsconfig.json
@@ -7,6 +7,7 @@
"removeComments": true,
"preserveConstEnums": true,
"sourceMap": true,
+ "strict": true,
"outDir": "./dist",
"declarationDir": "./dist",
"declaration": true,
diff --git a/packages/website/.prettierignore b/packages/website/.prettierignore
deleted file mode 100644
index b52c4a85..00000000
--- a/packages/website/.prettierignore
+++ /dev/null
@@ -1 +0,0 @@
-.docusaurus
diff --git a/packages/website/package.json b/packages/website/package.json
index a80076bb..e0b0132b 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -6,8 +6,8 @@
"start": "docusaurus start",
"build": "docusaurus build",
"clean": "docusaurus clear",
- "all": "yarn build",
- "lint": "prettier --check .",
+ "all": "yarn build",
+ "lint": "prettier --check .",
"format": "prettier --write ."
},
"dependencies": {
diff --git a/yarn.lock b/yarn.lock
index 363bb9de..c7b42e3c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1394,9 +1394,9 @@
postcss-value-parser "^4.2.0"
"@ctrl/tinycolor@^3.4.0":
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz#c3c5ae543c897caa9c2a68630bed355be5f9990f"
- integrity sha512-JZButFdZ1+/xAfpguQHoabIXkcqRRKpMrWKBkpEZZyxfY9C1DpADFB8PEqGSTeFr135SaTRfKqGKx5xSCLI7ZQ==
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz#75b4c27948c81e88ccd3a8902047bcd797f38d32"
+ integrity sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw==
"@discoveryjs/json-ext@^0.5.0", "@discoveryjs/json-ext@^0.5.3":
version "0.5.7"
@@ -3639,9 +3639,9 @@
"@types/react-dom" "^18.0.0"
"@testing-library/user-event@^14.0.4":
- version "14.0.4"
- resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.0.4.tgz#5b430a9c27f25078bff4471661b755115d0db9d4"
- integrity sha512-VBZe5lcUsmrQyOwIFvqOxLBoaTw1/Qy4Ek+VgmFYs719bs2SxUp42vbsb7ATlQDkHdj4OIQlucfpwxe5WoG1jA==
+ version "14.1.0"
+ resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.1.0.tgz#db479c06271b72a4d41cf595ec2ad7ff078c1d72"
+ integrity sha512-+CGfMXlVM+OwREHDEsfTGsXIMI+rjr3a7YBUSutq7soELht+8kQrM5k46xa/WLfHdtX/wqsDIleL6bi4i+xz0w==
"@tootallnate/once@1":
version "1.1.2"
@@ -4025,10 +4025,10 @@
dependencies:
"@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==
+"@types/react@*", "@types/react@^16.9.19", "@types/react@^18.0.1":
+ version "18.0.2"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.2.tgz#bc6a0572d434642ebe8b4ac0f121d18e2f2d8f7f"
+ integrity sha512-2poV9ReTwwV5ZNxkKyk7t6Vp/odeTfYI3vRjtDYWfUdEstx9mp26jzELfMBwV6gXg1irhHUnmZJH/dJW7xafcA==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
@@ -4181,13 +4181,13 @@
"@types/yargs-parser" "*"
"@typescript-eslint/eslint-plugin@^5.5.0":
- version "5.18.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz#950df411cec65f90d75d6320a03b2c98f6c3af7d"
- integrity sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==
+ version "5.19.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.19.0.tgz#9608a4b6d0427104bccf132f058cba629a6553c0"
+ integrity sha512-w59GpFqDYGnWFim9p6TGJz7a3qWeENJuAKCqjGSx+Hq/bwq3RZwXYqy98KIfN85yDqz9mq6QXiY5h0FjGQLyEg==
dependencies:
- "@typescript-eslint/scope-manager" "5.18.0"
- "@typescript-eslint/type-utils" "5.18.0"
- "@typescript-eslint/utils" "5.18.0"
+ "@typescript-eslint/scope-manager" "5.19.0"
+ "@typescript-eslint/type-utils" "5.19.0"
+ "@typescript-eslint/utils" "5.19.0"
debug "^4.3.2"
functional-red-black-tree "^1.0.1"
ignore "^5.1.8"
@@ -4196,75 +4196,75 @@
tsutils "^3.21.0"
"@typescript-eslint/experimental-utils@^5.0.0":
- version "5.18.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.18.0.tgz#a6b5662e6b0452cb0e75a13662ce3b33cd1be59d"
- integrity sha512-hypiw5N0aM2aH91/uMmG7RpyUH3PN/iOhilMwkMFZIbm/Bn/G3ZnbaYdSoAN4PG/XHQjdhBYLi0ZoRZsRYT4hA==
+ version "5.19.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.19.0.tgz#b7c8f1e22624d4f3d1b3683438530f5636086cb7"
+ integrity sha512-F+X/TTzmb2UXbghY1LrNLNDjMcGZMhKzXuzvu0xD+YEB77EamLM7zMOLuz2kP5807IJRDLBoAFFPYa7HT62sYg==
dependencies:
- "@typescript-eslint/utils" "5.18.0"
+ "@typescript-eslint/utils" "5.19.0"
"@typescript-eslint/parser@^5.5.0":
- version "5.18.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.18.0.tgz#2bcd4ff21df33621df33e942ccb21cb897f004c6"
- integrity sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==
+ version "5.19.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.19.0.tgz#05e587c1492868929b931afa0cb5579b0f728e75"
+ integrity sha512-yhktJjMCJX8BSBczh1F/uY8wGRYrBeyn84kH6oyqdIJwTGKmzX5Qiq49LRQ0Jh0LXnWijEziSo6BRqny8nqLVQ==
dependencies:
- "@typescript-eslint/scope-manager" "5.18.0"
- "@typescript-eslint/types" "5.18.0"
- "@typescript-eslint/typescript-estree" "5.18.0"
+ "@typescript-eslint/scope-manager" "5.19.0"
+ "@typescript-eslint/types" "5.19.0"
+ "@typescript-eslint/typescript-estree" "5.19.0"
debug "^4.3.2"
-"@typescript-eslint/scope-manager@5.18.0":
- version "5.18.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz#a7d7b49b973ba8cebf2a3710eefd457ef2fb5505"
- integrity sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ==
+"@typescript-eslint/scope-manager@5.19.0":
+ version "5.19.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.19.0.tgz#97e59b0bcbcb54dbcdfba96fc103b9020bbe9cb4"
+ integrity sha512-Fz+VrjLmwq5fbQn5W7cIJZ066HxLMKvDEmf4eu1tZ8O956aoX45jAuBB76miAECMTODyUxH61AQM7q4/GOMQ5g==
dependencies:
- "@typescript-eslint/types" "5.18.0"
- "@typescript-eslint/visitor-keys" "5.18.0"
+ "@typescript-eslint/types" "5.19.0"
+ "@typescript-eslint/visitor-keys" "5.19.0"
-"@typescript-eslint/type-utils@5.18.0":
- version "5.18.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz#62dbfc8478abf36ba94a90ddf10be3cc8e471c74"
- integrity sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==
+"@typescript-eslint/type-utils@5.19.0":
+ version "5.19.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.19.0.tgz#80f2125b0dfe82494bbae1ea99f1c0186d420282"
+ integrity sha512-O6XQ4RI4rQcBGshTQAYBUIGsKqrKeuIOz9v8bckXZnSeXjn/1+BDZndHLe10UplQeJLXDNbaZYrAytKNQO2T4Q==
dependencies:
- "@typescript-eslint/utils" "5.18.0"
+ "@typescript-eslint/utils" "5.19.0"
debug "^4.3.2"
tsutils "^3.21.0"
-"@typescript-eslint/types@5.18.0":
- version "5.18.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.18.0.tgz#4f0425d85fdb863071680983853c59a62ce9566e"
- integrity sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw==
+"@typescript-eslint/types@5.19.0":
+ version "5.19.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.19.0.tgz#12d3d600d754259da771806ee8b2c842d3be8d12"
+ integrity sha512-zR1ithF4Iyq1wLwkDcT+qFnhs8L5VUtjgac212ftiOP/ZZUOCuuF2DeGiZZGQXGoHA50OreZqLH5NjDcDqn34w==
-"@typescript-eslint/typescript-estree@5.18.0":
- version "5.18.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz#6498e5ee69a32e82b6e18689e2f72e4060986474"
- integrity sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ==
+"@typescript-eslint/typescript-estree@5.19.0":
+ version "5.19.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.19.0.tgz#fc987b8f62883f9ea6a5b488bdbcd20d33c0025f"
+ integrity sha512-dRPuD4ocXdaE1BM/dNR21elSEUPKaWgowCA0bqJ6YbYkvtrPVEvZ+zqcX5a8ECYn3q5iBSSUcBBD42ubaOp0Hw==
dependencies:
- "@typescript-eslint/types" "5.18.0"
- "@typescript-eslint/visitor-keys" "5.18.0"
+ "@typescript-eslint/types" "5.19.0"
+ "@typescript-eslint/visitor-keys" "5.19.0"
debug "^4.3.2"
globby "^11.0.4"
is-glob "^4.0.3"
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/utils@5.18.0", "@typescript-eslint/utils@^5.13.0":
- version "5.18.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.18.0.tgz#27fc84cf95c1a96def0aae31684cb43a37e76855"
- integrity sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==
+"@typescript-eslint/utils@5.19.0", "@typescript-eslint/utils@^5.13.0":
+ version "5.19.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.19.0.tgz#fe87f1e3003d9973ec361ed10d36b4342f1ded1e"
+ integrity sha512-ZuEckdupXpXamKvFz/Ql8YnePh2ZWcwz7APICzJL985Rp5C2AYcHO62oJzIqNhAMtMK6XvrlBTZeNG8n7gS3lQ==
dependencies:
"@types/json-schema" "^7.0.9"
- "@typescript-eslint/scope-manager" "5.18.0"
- "@typescript-eslint/types" "5.18.0"
- "@typescript-eslint/typescript-estree" "5.18.0"
+ "@typescript-eslint/scope-manager" "5.19.0"
+ "@typescript-eslint/types" "5.19.0"
+ "@typescript-eslint/typescript-estree" "5.19.0"
eslint-scope "^5.1.1"
eslint-utils "^3.0.0"
-"@typescript-eslint/visitor-keys@5.18.0":
- version "5.18.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz#c7c07709823804171d569017f3b031ced7253e60"
- integrity sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg==
+"@typescript-eslint/visitor-keys@5.19.0":
+ version "5.19.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.19.0.tgz#c84ebc7f6c744707a361ca5ec7f7f64cd85b8af6"
+ integrity sha512-Ym7zZoMDZcAKWsULi2s7UMLREdVQdScPQ/fKWMYefarCztWlHPFVJo8racf8R0Gc8FAEJ2eD4of8As1oFtnQlQ==
dependencies:
- "@typescript-eslint/types" "5.18.0"
+ "@typescript-eslint/types" "5.19.0"
eslint-visitor-keys "^3.0.0"
"@webassemblyjs/ast@1.11.1":
@@ -5019,22 +5019,24 @@ array-unique@^0.3.2:
integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.5:
- version "1.2.5"
- resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"
- integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
+ integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==
dependencies:
call-bind "^1.0.2"
define-properties "^1.1.3"
- es-abstract "^1.19.0"
+ es-abstract "^1.19.2"
+ es-shim-unscopables "^1.0.0"
array.prototype.flatmap@^1.2.1, array.prototype.flatmap@^1.2.5:
- version "1.2.5"
- resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
- integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz#a7e8ed4225f4788a70cd910abcf0791e76a5534f"
+ integrity sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==
dependencies:
- call-bind "^1.0.0"
+ call-bind "^1.0.2"
define-properties "^1.1.3"
- es-abstract "^1.19.0"
+ es-abstract "^1.19.2"
+ es-shim-unscopables "^1.0.0"
array.prototype.map@^1.0.4:
version "1.0.4"
@@ -5957,9 +5959,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001317:
- version "1.0.30001327"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz#c1546d7d7bb66506f0ccdad6a7d07fc6d668c858"
- integrity sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w==
+ version "1.0.30001328"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001328.tgz#0ed7a2ca65ec45872c613630201644237ba1e329"
+ integrity sha512-Ue55jHkR/s4r00FLNiX+hGMMuwml/QGqqzVeMQ5thUewznU2EdULFvI3JR7JJid6OrjJNfFvHY2G2dIjmRaDDQ==
capture-exit@^2.0.0:
version "2.0.0"
@@ -7023,9 +7025,9 @@ cyclist@^1.0.1:
integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
"d3-array@1 - 3", "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@^3.1.1:
- version "3.1.5"
- resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.1.5.tgz#ba8a09fc50aee6c02c3ca2a97c485b9ce68a8e34"
- integrity sha512-Rs6syGyepVjAYXWvhiFiVWUM8l4B/0p33tvlS+eXCVOaFrbz1dU7t+T16SJx/frnaLMXmFmKoXg/5aUVXxmMKQ==
+ version "3.1.6"
+ resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.1.6.tgz#0342c835925826f49b4d16eb7027aec334ffc97d"
+ integrity sha512-DCbBBNuKOeiR9h04ySRBMW52TFVc91O9wJziuyXw6Ztmy8D3oZbmCkOO3UHKC7ceNJsN2Mavo9+vwV8EAEUXzA==
dependencies:
internmap "1 - 2"
@@ -7665,9 +7667,9 @@ ejs@^3.1.6:
jake "^10.6.1"
electron-to-chromium@^1.4.84:
- version "1.4.106"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz#e7a3bfa9d745dd9b9e597616cb17283cc349781a"
- integrity sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==
+ version "1.4.107"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.107.tgz#564257014ab14033b4403a309c813123c58a3fb9"
+ integrity sha512-Huen6taaVrUrSy8o7mGStByba8PfOWWluHNxSHGBrCgEdFVLtvdQDBr9LBCF9Uci8SYxh28QNNMO0oC17wbGAg==
element-resize-detector@^1.2.2:
version "1.2.4"
@@ -7802,10 +7804,10 @@ error-stack-parser@^2.0.6:
dependencies:
stackframe "^1.1.1"
-es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
- version "1.19.2"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f"
- integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==
+es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2:
+ version "1.19.3"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.3.tgz#4dd9da55868192756c83c5c30c7878d04e77125d"
+ integrity sha512-4axXLNovnMYf0+csS5rVnS5hLmV1ek+ecx9MuCjByL1E5Nn54avf6CHQxIjgQIHBnfX9AMxTRIy0q+Yu5J/fXA==
dependencies:
call-bind "^1.0.2"
es-to-primitive "^1.2.1"
@@ -7818,7 +7820,7 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
is-callable "^1.2.4"
is-negative-zero "^2.0.2"
is-regex "^1.1.4"
- is-shared-array-buffer "^1.0.1"
+ is-shared-array-buffer "^1.0.2"
is-string "^1.0.7"
is-weakref "^1.0.2"
object-inspect "^1.12.0"
@@ -7852,6 +7854,13 @@ es-module-lexer@^0.9.0:
resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+es-shim-unscopables@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
+ integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+ dependencies:
+ has "^1.0.3"
+
es-to-primitive@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -8032,9 +8041,9 @@ eslint-plugin-react@^7.27.1:
string.prototype.matchall "^4.0.6"
eslint-plugin-testing-library@^5.0.1:
- version "5.2.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.2.1.tgz#3f89cd28ade81329a11584e0bbea129bede01619"
- integrity sha512-88qJv6uzYALtiYJDzhelP3ov0Px/GLgnu+UekjjDxL2nMyvgdTyboKqcDBsvFPmAeizlCoSWOjeBN4DxO0BxaA==
+ version "5.3.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.3.0.tgz#1f5a58827fefc240e1ec1bac706de4c24f5de7be"
+ integrity sha512-DpQmduNYNQamIz/rz2haCOlJVIVi8gZ8mpDCCX7IMWMK436HMpepXafHhdUZxdRoaAkziLSJosRg6bqGAFqT3w==
dependencies:
"@typescript-eslint/utils" "^5.13.0"
@@ -10108,7 +10117,7 @@ is-set@^2.0.2:
resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
-is-shared-array-buffer@^1.0.1:
+is-shared-array-buffer@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
@@ -11911,9 +11920,9 @@ node-libs-browser@^2.2.1:
vm-browserify "^1.0.1"
node-releases@^2.0.2:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
- integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.3.tgz#225ee7488e4a5e636da8da52854844f9d716ca96"
+ integrity sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==
normalize-package-data@^2.5.0:
version "2.5.0"
@@ -13778,9 +13787,9 @@ rc-pagination@~3.1.9:
classnames "^2.2.1"
rc-picker@~2.6.4:
- version "2.6.5"
- resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.6.5.tgz#a7cf8eb0723ec81e379c784c4b798b7fe076dd8c"
- integrity sha512-4pcg0PgEz4YXBfdwMuHIKaRWaADm3k3g0NtoPIgeGM+VVeOBdUowTx0YSXnT8mQEXcE9lWXX+ZX3biAzQwDM1w==
+ version "2.6.6"
+ resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.6.6.tgz#2ac71924c748f66c01a179038469f5018f450cfb"
+ integrity sha512-fLyvTRF9Vaa6ftBF6VTWztYbuhNDh0+k9GOeJBD/TFrYleqWEmDs27/WHlCTE6R15/nQLryofvS31cNPSpD+OA==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
@@ -13833,9 +13842,9 @@ rc-select@~14.0.0-alpha.23, rc-select@~14.0.0-alpha.8, rc-select@~14.0.2:
rc-virtual-list "^3.2.0"
rc-slider@~10.0.0-alpha.4:
- version "10.0.0-alpha.6"
- resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.0.0-alpha.6.tgz#d1f0098a2044a0063c912d049a1309e3357404d6"
- integrity sha512-4tMChJ3lzX0qlttcXqJ2xecQ+CmZYPXJGDOvPnIS5YWsiSl452vt377/l8A1ZnwjwKAAy2V6nrOXNdqPP2Tq7w==
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.0.0.tgz#8ffe1dd3c8799c9d1f81ac808976f18af3dca206"
+ integrity sha512-Bk54UIKWW4wyhHcL8ehAxt+wX+n69dscnHTX6Uv0FMxSke/TGrlkZz1LSIWblCpfE2zr/dwR2Ca8nZGk3U+Tbg==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.5"
@@ -13926,9 +13935,9 @@ rc-tree@~5.4.3:
rc-virtual-list "^3.4.2"
rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.10:
- version "5.2.12"
- resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.12.tgz#023728bf2e31a3bdd07bdca016e0991aae98e504"
- integrity sha512-+rymZRe23f2imQwuelWqWSKj3tAnlDbjEU8yjKzW5zh8AlChJ/brda7Qg3FQ4f2jcAquL7phVOwq5BZp2PdhAg==
+ version "5.2.15"
+ resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.15.tgz#f6bfed418e602513cc3e07853ddaf37e5c5339f4"
+ integrity sha512-VxZWqCObtUOzs9V9Be0dDA2JGchriDpvQaJpsCI2EQ4+KWHIvjFz6Ziina4uxK5drRsn0RnBi7nngmTl9j/F7Q==
dependencies:
"@babel/runtime" "^7.11.2"
classnames "^2.2.6"
@@ -13946,9 +13955,9 @@ rc-upload@~4.3.0:
rc-util "^5.2.0"
rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.14.0, rc-util@^5.15.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.19.3, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8:
- version "5.19.6"
- resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.19.6.tgz#76d714fd116d22bc5fd7421939589e27c1dfad19"
- integrity sha512-/xJ8UtpbuJj7+2ftxVQM6gUzLY+Towq4iB6sP6/2hhn6mwWNLij2I+1qOkLv75I1jqWKpS+gU8A2EmbfLtGxNg==
+ version "5.20.0"
+ resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.20.0.tgz#05915902313292cb3f0e8da9401a403be00c3f58"
+ integrity sha512-sHm129TjpUiJZuHCgX5moead5yag4ukIIZuwkK1SSlFMUceEx64sZNgJZJN7YQ9NJyDpabfJ8310fkcCXeyTog==
dependencies:
"@babel/runtime" "^7.12.5"
react-is "^16.12.0"
@@ -14105,9 +14114,9 @@ react-fast-compare@^3.0.1, react-fast-compare@^3.2.0:
integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
react-helmet-async@*, react-helmet-async@^1.0.7, react-helmet-async@^1.2.3:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.2.3.tgz#57326a69304ea3293036eafb49475e9ba454cb37"
- integrity sha512-mCk2silF53Tq/YaYdkl2sB+/tDoPnaxN7dFS/6ZLJb/rhUY2EWGI5Xj2b4jHppScMqY45MbgPSwTxDchKpZ5Kw==
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.3.0.tgz#7bd5bf8c5c69ea9f02f6083f14ce33ef545c222e"
+ integrity sha512-9jZ57/dAn9t3q6hneQS0wukqC2ENOBgMNVEhb/ZG9ZSxUetzVIw4iAmEU38IaVg3QGYauQPhSeUTuIUtFglWpg==
dependencies:
"@babel/runtime" "^7.12.5"
invariant "^2.2.4"
@@ -17068,9 +17077,9 @@ vega-transforms@~4.10.0:
vega-util "^1.16.1"
vega-typings@~0.22.0:
- version "0.22.2"
- resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.22.2.tgz#c5f5037680778664f5246c19a56e4cfffeb0d90b"
- integrity sha512-op4bNiyS150V7gnuIdjwFYB1belYB8qnapqLQQ+ZBJQ+r7a+IbvXphEUf8AkBlOoGPN1ITNdhlIsq9WWiuxu8Q==
+ version "0.22.3"
+ resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.22.3.tgz#f6c73b5ffcdb152539cfcc5ad240a413af579ba7"
+ integrity sha512-PREcya3nXT9Tk7xU0IhEpOLVTlqizNtKXV55NhI6ApBjJtqVYbJL7IBh2ckKxGBy3YeUQ37BQZl56UqqiYVWBw==
dependencies:
vega-event-selector "^3.0.0"
vega-expression "^5.0.0"