Merge branch 'develop' into epic-reducer-project

.github/workflows/ci-cachix.yml

@@ -0,0 +1,87 @@
+name: Nix build
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+    branches:
+      - master
+      - develop
+      - reducer-dev
+      - epic-reducer-project
+
+jobs:
+  flake-lints:
+    name: All lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install nix
+        uses: cachix/install-nix-action@v17
+        with:
+          nix_path: nixpkgs=channel:nixos-22.05
+      - name: Use cachix
+        uses: cachix/cachix-action@v10
+        with:
+          name: quantified-uncertainty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      - name: Check that lang lints
+        run: nix build .#lang-lint
+      - name: Check that components lints
+        run: nix build .#components-lint
+      - name: Check that website lints
+        run: nix build .#docusaurus-lint
+      - name: Check that vscode extension lints
+        run: nix build .#vscode-lint
+      - name: Check that cli lints
+        run: nix build .#cli-lint
+
+  flake-packages:
+    name: Builds, tests, and bundles
+    runs-on: ubuntu-latest
+    needs: flake-lints
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install nix
+        uses: cachix/install-nix-action@v17
+        with:
+          nix_path: nixpkgs=channel:nixos-22.05
+      - name: Use cachix
+        uses: cachix/cachix-action@v10
+        with:
+          name: quantified-uncertainty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      - name: Check all lang tests
+        run: nix build .#lang-test
+      - name: Check that lang bundles
+        run: nix build .#lang-bundle
+      - name: Check that components builds
+        run: nix build .#components
+      - name: Check that components bundles
+        run: nix build .#components-bundle
+
+  flake-devshells:
+    name: Development shell environment
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install nix
+        uses: cachix/install-nix-action@v17
+        with:
+          nix_path: nixpkgs=channel:nixos-22.05
+      - name: Use cachix
+        uses: cachix/cachix-action@v10
+        with:
+          name: quantified-uncertainty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+      - name: Build js devshell
+        run: nix develop .#js --profile just-js
+      - name: Build js & wasm devshell
+        run: nix develop --profile full-shell

.github/workflows/ci.yml

@@ -10,6 +10,7 @@ on:
       - master
       - develop
       - reducer-dev
+      - epic-reducer-project
 
 jobs:
   pre_check:
@@ -48,26 +49,26 @@ jobs:
         with:
           paths: '["packages/cli/**"]'
 
-  lang-lint:
+  #  lang-lint:
-    name: Language lint
+  #    name: Language lint
-    runs-on: ubuntu-latest
+  #    runs-on: ubuntu-latest
-    needs: pre_check
+  #    needs: pre_check
-    if: ${{ needs.pre_check.outputs.should_skip_lang != 'true' }}
+  #    if: ${{ needs.pre_check.outputs.should_skip_lang != 'true' }}
-    defaults:
+  #    defaults:
-      run:
+  #      run:
-        shell: bash
+  #        shell: bash
-        working-directory: packages/squiggle-lang
+  #        working-directory: packages/squiggle-lang
-    steps:
+  #    steps:
-      - uses: actions/checkout@v3
+  #      - uses: actions/checkout@v3
-      - name: Install Dependencies
+  #      - name: Install Dependencies
-        run: cd ../../ && yarn
+  #        run: cd ../../ && yarn
-      - name: Check rescript lint
+  #      - name: Check rescript lint
-        run: yarn lint:rescript
+  #        run: yarn lint:rescript
-      - name: Check javascript, typescript, and markdown lint
+  #      - name: Check javascript, typescript, and markdown lint
-        uses: creyD/prettier_action@v4.2
+  #        uses: creyD/prettier_action@v4.2
-        with:
+  #        with:
-          dry: true
+  #          dry: true
-          prettier_options: --check packages/squiggle-lang
+  #          prettier_options: --check packages/squiggle-lang
 
   lang-build-test-bundle:
     name: Language build, test, and bundle
@@ -97,95 +98,96 @@ jobs:
       - name: Upload typescript coverage report
         run: yarn coverage:ts:ci
 
-  components-lint:
+  #  components-lint:
-    name: Components lint
+  #    name: Components lint
-    runs-on: ubuntu-latest
+  #    runs-on: ubuntu-latest
-    needs: pre_check
+  #    needs: pre_check
-    if: ${{ needs.pre_check.outputs.should_skip_components != 'true' }}
+  #    if: ${{ needs.pre_check.outputs.should_skip_components != 'true' }}
-    defaults:
+  #    defaults:
-      run:
+  #      run:
-        shell: bash
+  #        shell: bash
-        working-directory: packages/components
+  #        working-directory: packages/components
-    steps:
+  #    steps:
-      - uses: actions/checkout@v3
+  #      - uses: actions/checkout@v3
-      - name: Check javascript, typescript, and markdown lint
+  #      - name: Check javascript, typescript, and markdown lint
-        uses: creyD/prettier_action@v4.2
+  #        uses: creyD/prettier_action@v4.2
-        with:
+  #        with:
-          dry: true
+  #          dry: true
-          prettier_options: --check packages/components --ignore-path packages/components/.prettierignore
+  #          prettier_options: --check packages/components --ignore-path packages/components/.prettierignore
+  #
+  #  components-bundle-build:
+  #    name: Components bundle and build
+  #    runs-on: ubuntu-latest
+  #    needs: pre_check
+  #    if: ${{ (needs.pre_check.outputs.should_skip_components != 'true') || (needs.pre_check.outputs.should_skip_lang != 'true') }}
+  #    defaults:
+  #      run:
+  #        shell: bash
+  #        working-directory: packages/components
+  #    steps:
+  #      - uses: actions/checkout@v3
+  #      - 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
 
-  components-bundle-build:
+  #  website-lint:
-    name: Components bundle and build
+  #    name: Website lint
-    runs-on: ubuntu-latest
+  #    runs-on: ubuntu-latest
-    needs: pre_check
+  #    needs: pre_check
-    if: ${{ (needs.pre_check.outputs.should_skip_components != 'true') || (needs.pre_check.outputs.should_skip_lang != 'true') }}
+  #    if: ${{ needs.pre_check.outputs.should_skip_website != 'true' }}
-    defaults:
+  #    defaults:
-      run:
+  #      run:
-        shell: bash
+  #        shell: bash
-        working-directory: packages/components
+  #        working-directory: packages/website
-    steps:
+  #    steps:
-      - uses: actions/checkout@v3
+  #      - uses: actions/checkout@v3
-      - name: Install dependencies from monorepo level
+  #      - name: Check javascript, typescript, and markdown lint
-        run: cd ../../ && yarn
+  #        uses: creyD/prettier_action@v4.2
-      - name: Build rescript codebase in squiggle-lang
+  #        with:
-        run: cd ../squiggle-lang && yarn build
+  #          dry: true
-      - name: Run webpack
+  #          prettier_options: --check packages/website
-        run: yarn bundle
+  #
-      - name: Build storybook
+  #  website-build:
-        run: yarn build
+  #    name: Website build
-
+  #    runs-on: ubuntu-latest
-  website-lint:
+  #    needs: pre_check
-    name: Website lint
+  #    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') }}
-    runs-on: ubuntu-latest
+  #    defaults:
-    needs: pre_check
+  #      run:
-    if: ${{ needs.pre_check.outputs.should_skip_website != 'true' }}
+  #        shell: bash
-    defaults:
+  #        working-directory: packages/website
-      run:
+  #    steps:
-        shell: bash
+  #      - uses: actions/checkout@v3
-        working-directory: packages/website
+  #      - name: Install dependencies from monorepo level
-    steps:
+  #        run: cd ../../ && yarn
-      - uses: actions/checkout@v3
+  #      - name: Build rescript in squiggle-lang
-      - name: Check javascript, typescript, and markdown lint
+  #        run: cd ../squiggle-lang && yarn build
-        uses: creyD/prettier_action@v4.2
+  #      - name: Build components
-        with:
+  #        run: cd ../components && yarn build
-          dry: true
+  #      - name: Build website assets
-          prettier_options: --check packages/website
+  #        run: yarn build
-
+  #
-  website-build:
+  #  vscode-ext-lint:
-    name: Website build
+  #    name: VS Code extension lint
-    runs-on: ubuntu-latest
+  #    runs-on: ubuntu-latest
-    needs: pre_check
+  #    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_vscodeext != 'true' }}
-    defaults:
+  #    defaults:
-      run:
+  #      run:
-        shell: bash
+  #        shell: bash
-        working-directory: packages/website
+  #        working-directory: packages/vscode-ext
-    steps:
+  #    steps:
-      - uses: actions/checkout@v3
+  #      - uses: actions/checkout@v3
-      - name: Install dependencies from monorepo level
+  #      - name: Check javascript, typescript, and markdown lint
-        run: cd ../../ && yarn
+  #        uses: creyD/prettier_action@v4.2
-      - name: Build rescript in squiggle-lang
+  #        with:
-        run: cd ../squiggle-lang && yarn build
+  #          dry: true
-      - name: Build components
+  #          prettier_options: --check packages/vscode-ext
-        run: cd ../components && yarn build
-      - name: Build website assets
-        run: yarn build
-
-  vscode-ext-lint:
-    name: VS Code extension lint
-    runs-on: ubuntu-latest
-    needs: pre_check
-    if: ${{ needs.pre_check.outputs.should_skip_vscodeext != 'true' }}
-    defaults:
-      run:
-        shell: bash
-        working-directory: packages/vscode-ext
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies from monorepo level
-        run: cd ../../ && yarn
-      - name: Lint the VSCode Extension source code
-        run: yarn lint
 
   vscode-ext-build:
     name: VS Code extension build
@@ -202,20 +204,19 @@ jobs:
         run: cd ../../ && yarn
       - name: Build
         run: yarn compile
-
+#  cli-lint:
-  cli-lint:
+#    name: CLI lint
-    name: CLI lint
+#    runs-on: ubuntu-latest
-    runs-on: ubuntu-latest
+#    needs: pre_check
-    needs: pre_check
+#    if: ${{ needs.pre_check.outputs.should_skip_cli != 'true' }}
-    if: ${{ needs.pre_check.outputs.should_skip_cli != 'true' }}
+#    defaults:
-    defaults:
+#      run:
-      run:
+#        shell: bash
-        shell: bash
+#        working-directory: packages/cli
-        working-directory: packages/cli
+#    steps:
-    steps:
+#      - uses: actions/checkout@v3
-      - uses: actions/checkout@v3
+#      - name: Check javascript, typescript, and markdown lint
-      - name: Check javascript, typescript, and markdown lint
+#        uses: creyD/prettier_action@v4.2
-        uses: creyD/prettier_action@v4.2
+#        with:
-        with:
+#          dry: true
-          dry: true
+#          prettier_options: --check packages/cli
-          prettier_options: --check packages/cli

.github/workflows/release-please.yml

@@ -3,7 +3,7 @@ name: Run Release Please
 on:
   push:
     branches:
-      - develop
+      - master
 
 jobs:
   pre_check:
@@ -55,21 +55,22 @@ jobs:
           token: ${{secrets.GITHUB_TOKEN}}
           command: manifest-pr
           path: packages/squiggle-lang
-          bump-patch-for-minor-pre-major: true
+          # bump-patch-for-minor-pre-major: true
           skip-github-release: true
-  #      - name: Publish: Checkout source
+      - name: Publish- Checkout source
-  #        uses: actions/checkout@v2
+        uses: actions/checkout@v3
-  #        # these if statements ensure that a publication only occurs when
+        # these if statements ensure that a publication only occurs when
-  #        # a new release is created:
+        # a new release is created:
-  #        if: ${{ steps.release.outputs.release_created }}
+        if: ${{ steps.release.outputs.release_created }}
-  #      - name: Publish: Install dependencies
+      - name: Publish- Install dependencies
-  #        run: yarn
+        run: yarn
-  #        if: ${{ steps.release.outputs.release_created }}
+        if: ${{ steps.release.outputs.release_created }}
-  #      - name: Publish
+      - name: Publish
-  #        run: cd packages/squiggle-lang && yarn publish
+        run: cd packages/squiggle-lang && yarn publish
-  #        env:
+        env:
-  #          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-  #        if: ${{ steps.release.outputs.release_created }}
+        if: ${{ steps.release.outputs.release_created }}
+
   relplz-components:
     name: for components
     runs-on: ubuntu-latest
@@ -82,20 +83,20 @@ jobs:
           token: ${{secrets.GITHUB_TOKEN}}
           command: manifest-pr
           path: packages/components
-          bump-patch-for-minor-pre-major: true
+          # bump-patch-for-minor-pre-major: true
           skip-github-release: true
-  #      - name: Publish: Checkout source
+      - name: Publish- Checkout source
-  #        uses: actions/checkout@v2
+        uses: actions/checkout@v3
-  #        # these if statements ensure that a publication only occurs when
+        # these if statements ensure that a publication only occurs when
-  #        # a new release is created:
+        # a new release is created:
-  #        if: ${{ steps.release.outputs.release_created }}
+        if: ${{ steps.release.outputs.release_created }}
-  #      - name: Publish: Install dependencies
+      - name: Publish- Install dependencies
-  #        run: yarn
+        run: yarn
-  #        if: ${{ steps.release.outputs.release_created }}
+        if: ${{ steps.release.outputs.release_created }}
-  #      - name: Publish
+      - name: Publish
-  #        run: cd packages/components && yarn publish
+        run: cd packages/components && yarn publish
-  #        env:
+        env:
-  #          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
   relplz-website:
     name: for website
     runs-on: ubuntu-latest
@@ -108,7 +109,7 @@ jobs:
           token: ${{secrets.GITHUB_TOKEN}}
           command: manifest-pr
           path: packages/website
-          bump-patch-for-minor-pre-major: true
+          # bump-patch-for-minor-pre-major: true
           skip-github-release: true
   relplz-vscodeext:
     name: for vscode-ext
@@ -122,7 +123,7 @@ jobs:
           token: ${{secrets.GITHUB_TOKEN}}
           command: manifest-pr
           path: packages/vscode-ext
-          bump-patch-for-minor-pre-major: true
+          # bump-patch-for-minor-pre-major: true
           skip-github-release: true
   relplz-cl:
     name: for cli

.gitignore

@@ -7,3 +7,4 @@ yarn-error.log
 **/.sync.ffs_db
 .direnv
 .log
+result

.prettierignore

@@ -1,15 +1,16 @@
 .direnv
 *.bs.js
 *.gen.tsx
-packages/*/dist
 packages/components/storybook-static
 node_modules
 packages/*/node_modules
 packages/website/.docusaurus
 packages/squiggle-lang/lib
-packages/squiggle-lang/.nyc_output/
 packages/squiggle-lang/coverage/
 packages/squiggle-lang/.cache/
 packages/website/build/
 packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js
 packages/vscode-ext/media/vendor/
+packages/squiggle-lang/.nyc_output/
+packages/*/dist
+result

flake.lock

@@ -0,0 +1,79 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gentype": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1661855866,
+        "narHash": "sha256-+q0OOTyaq8eOn9BOWdPOCtSDOISW4A59v3mq3JOZyug=",
+        "owner": "rescript-association",
+        "repo": "genType",
+        "rev": "6b5f164b4f6ced456019b7579a0ab7e0a86518ad",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rescript-association",
+        "repo": "genType",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1661617163,
+        "narHash": "sha256-NN9Ky47j8ohgPhA9JZyfkYIbbAo6RJkGz+7h8/exVpE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0ba2543f8c855d7be8e90ef6c8dc89c1617e8a08",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-22.05",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "gentype": "gentype",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,99 @@
+{
+  description = "Squiggle packages";
+
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixos-22.05";
+    gentype = {
+      url = "github:rescript-association/genType";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, gentype, flake-utils }:
+    let
+      version = builtins.substring 0 8 self.lastModifiedDate;
+      overlays = [
+        (final: prev: {
+          # set the node version here
+          nodejs = prev.nodejs-18_x;
+          # The override is the only way to get it into mkYarnModules
+        })
+      ];
+
+      commonFn = pkgs: {
+        buildInputs = with pkgs; [ nodejs yarn ];
+        prettier = with pkgs.nodePackages; [ prettier ];
+        which = [ pkgs.which ];
+      };
+      gentypeOutputFn = pkgs: gentype.outputs.packages.${pkgs.system}.default;
+      langFn = { pkgs, ... }:
+        # Probably doesn't work on i686-linux
+        import ./nix/squiggle-lang.nix {
+          inherit pkgs commonFn gentypeOutputFn;
+        };
+      componentsFn = { pkgs, ... }:
+        import ./nix/squiggle-components.nix { inherit pkgs commonFn langFn; };
+      websiteFn = { pkgs, ... }:
+        import ./nix/squiggle-website.nix {
+          inherit pkgs commonFn langFn componentsFn;
+        };
+      vscodeextFn = { pkgs, ... }:
+        import ./nix/squiggle-vscode.nix {
+          inherit pkgs commonFn langFn componentsFn;
+        };
+      cliFn = { pkgs, ... }:
+        import ./nix/squiggle-cli.nix {
+          inherit pkgs commonFn;
+        };
+
+      # local machines
+      localFlakeOutputs = { pkgs, ... }:
+        let
+          lang = langFn pkgs;
+          components = componentsFn pkgs;
+          website = websiteFn pkgs;
+          vscodeext = vscodeextFn pkgs;
+          cli = cliFn pkgs;
+        in {
+          # validating
+          checks = flake-utils.lib.flattenTree {
+            lang-lint = lang.lint;
+            lang-test = lang.test;
+            components-lint = components.lint;
+            docusaurus-lint = website.lint;
+            cli-lint = cli.lint;
+          };
+          # building
+          packages = flake-utils.lib.flattenTree {
+            default = components.build;
+            lang = lang.build;
+            lang-bundle = lang.bundle;
+            lang-test = lang.test;
+            components = components.build;
+            components-bundle = components.bundle;
+
+            # Lint
+            lang-lint = lang.lint;
+            components-lint = components.lint;
+            docusaurus-lint = website.lint;
+            vscode-lint = vscodeext.lint;
+            cli-lint = cli.lint;
+          };
+
+          # developing
+          devShells = let shellNix = import ./nix/shell.nix { inherit pkgs; };
+          in flake-utils.lib.flattenTree {
+            default = shellNix.all;
+            js = shellNix.just-js;
+          };
+        };
+    in flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = overlays;
+        };
+
+      in localFlakeOutputs pkgs);
+}

nix/README.md

@@ -0,0 +1 @@
+Visit `quantified-uncertainty.cachix.org` for information about how to add our binary cache to your local dev environment.

nix/shell.nix

@@ -0,0 +1,25 @@
+{ pkgs }:
+with pkgs;
+let
+  js = [ yarn nodejs nodePackages.ts-node ];
+  rust = [
+    wasm-pack
+    cargo
+    rustup
+    pkg-config
+    libressl
+    rustfmt
+    wasmtime
+    binaryen
+    wasm-bindgen-cli
+  ];
+in {
+  all = mkShell {
+    name = "squiggle_yarn-wasm-devshell";
+    buildInputs = builtins.concatLists [ js rust [ nixfmt ] ];
+  };
+  just-js = mkShell {
+    name = "squiggle_yarn-devshell";
+    buildInputs = js ++ [ nixfmt ];
+  };
+}

nix/squiggle-cli.nix

@@ -0,0 +1,13 @@
+{ pkgs, commonFn }:
+
+rec {
+  common = commonFn pkgs;
+
+  lint = pkgs.stdenv.mkDerivation {
+    name = "squiggle-cli-lint";
+    buildInputs = common.buildInputs ++ common.prettier;
+    src = ../packages/cli;
+    buildPhase = "prettier --check .";
+    installPhase = "mkdir -p $out";
+  };
+}

nix/squiggle-components.nix

@@ -0,0 +1,75 @@
+{ pkgs, commonFn, langFn }:
+
+rec {
+  common = commonFn pkgs;
+  lang = langFn pkgs;
+  componentsPackageJson = let
+    raw = pkgs.lib.importJSON ../packages/components/package.json;
+    modified =
+      pkgs.lib.recursiveUpdate raw { dependencies.react-dom = "^18.2.0"; };
+    packageJsonString = builtins.toJSON modified;
+  in pkgs.writeText "packages/components/patched-package.json"
+  packageJsonString;
+  yarn-source = pkgs.mkYarnPackage {
+    name = "squiggle-components_yarnsource";
+    buildInputs = common.buildInputs;
+    src = ../packages/components;
+    packageJSON = componentsPackageJson;
+    yarnLock = ../yarn.lock;
+    packageResolutions."@quri/squiggle-lang" = lang.build;
+  };
+  lint = pkgs.stdenv.mkDerivation {
+    name = "squiggle-components-lint";
+    src = ../packages/components;
+    buildInputs = common.buildInputs ++ common.prettier;
+    buildPhase = "yarn lint";
+    installPhase = "mkdir -p $out";
+  };
+  build = pkgs.stdenv.mkDerivation {
+    name = "squiggle-components-build";
+    src = yarn-source + "/libexec/@quri/squiggle-components";
+    buildInputs = common.buildInputs;
+    buildPhase = ''
+      cp -r node_modules/@quri/squiggle-lang deps/@quri
+      pushd deps/@quri/squiggle-components
+
+      yarn --offline build:cjs
+      yarn --offline build:css
+      popd
+    '';
+    installPhase = ''
+      mkdir -p $out
+
+      # annoying hack because permissions on transitive dependencies later on
+      mv deps/@quri/squiggle-components/node_modules deps/@quri/squiggle-components/NODE_MODULES
+      mv node_modules deps/@quri/squiggle-components
+
+      # patching .gitignore so flake keeps build artefacts
+      sed -i /dist/d deps/@quri/squiggle-components/.gitignore
+      cp -r deps/@quri/squiggle-components/. $out
+    '';
+  };
+  bundle = pkgs.stdenv.mkDerivation {
+    name = "squiggle-components-bundle";
+    src = yarn-source + "/libexec/@quri/squiggle-components";
+    buildInputs = common.buildInputs;
+    buildPhase = ''
+      cp -r node_modules/@quri/squiggle-lang deps/@quri
+      pushd deps/@quri/squiggle-components
+
+      yarn --offline bundle
+      popd
+    '';
+    installPhase = ''
+      mkdir -p $out
+
+      # annoying hack because permissions on transitive dependencies later on
+      mv deps/@quri/squiggle-components/node_modules deps/@quri/squiggle-components/NODE_MODULES
+      mv node_modules deps/@quri/squiggle-components
+
+      # patching .gitignore so flake keeps build artefacts
+      sed -i /dist/d deps/@quri/squiggle-components/.gitignore
+      cp -r deps/@quri/squiggle-components/. $out
+    '';
+  };
+}

nix/squiggle-lang.nix

@@ -0,0 +1,125 @@
+{ pkgs, commonFn, gentypeOutputFn }:
+
+rec {
+  common = commonFn pkgs;
+  langPackageJson = let
+    raw = pkgs.lib.importJSON ../packages/squiggle-lang/package.json;
+    modified = pkgs.lib.recursiveUpdate raw {
+      devDependencies."@types/lodash" = "^4.14.167";
+    };
+    packageJsonString = builtins.toJSON modified;
+  in pkgs.writeText "packages/squiggle-lang/patched-package.json"
+  packageJsonString;
+  yarn-source = pkgs.mkYarnPackage {
+    name = "squiggle-lang_yarnsource";
+    src = ../packages/squiggle-lang;
+    packageJSON = langPackageJson;
+    yarnLock = ../yarn.lock;
+    pkgConfig = {
+      rescript = {
+        buildInputs = common.which
+          ++ (if pkgs.system != "i686-linux" then [ pkgs.gcc_multi ] else [ ]);
+        postInstall = ''
+          echo "PATCHELF'ING RESCRIPT EXECUTABLES (INCL NINJA)"
+          # Patching interpreter for linux/*.exe's
+          THE_LD=$(patchelf --print-interpreter $(which mkdir))
+          patchelf --set-interpreter $THE_LD linux/*.exe && echo "- patched interpreter for linux/*.exe's"
+
+          # Replacing needed shared library for linux/ninja.exe
+          THE_SO=$(find /nix/store/*/lib64 -name libstdc++.so.6 | head -n 1)
+          patchelf --replace-needed libstdc++.so.6 $THE_SO linux/ninja.exe && echo "- replaced needed for linux/ninja.exe"
+        '';
+      };
+      bisect_ppx = {
+        buildInputs = common.which;
+        postInstall = ''
+          echo "PATCHELF'ING BISECT_PPX EXECUTABLE"
+          THE_LD=$(patchelf --print-interpreter $(which mkdir))
+          patchelf --set-interpreter $THE_LD bin/linux/ppx
+          patchelf --set-interpreter $THE_LD bin/linux/bisect-ppx-report
+          cp bin/linux/ppx ppx
+        '';
+      };
+      gentype = {
+        postInstall = ''
+          mv gentype.exe ELFLESS-gentype.exe
+          cp ${gentypeOutputFn pkgs}/src/GenType.exe gentype.exe
+        '';
+      };
+    };
+  };
+  lint = pkgs.stdenv.mkDerivation {
+    name = "squiggle-lang-lint";
+    src = yarn-source + "/libexec/@quri/squiggle-lang/deps/@quri/squiggle-lang";
+    buildInputs = common.buildInputs ++ common.prettier;
+    buildPhase = ''
+      yarn lint:prettier
+      yarn lint:rescript
+    '';
+    installPhase = "mkdir -p $out";
+  };
+  build = pkgs.stdenv.mkDerivation {
+    name = "squiggle-lang-build";
+    # `peggy` is in the `node_modules` that's adjacent to `deps`.
+    src = yarn-source + "/libexec/@quri/squiggle-lang";
+    buildInputs = common.buildInputs;
+    buildPhase = ''
+      # so that the path to ppx doesn't need to be patched.
+      mv node_modules deps
+
+      pushd deps/@quri/squiggle-lang
+      yarn --offline build:peggy
+      yarn --offline build:rescript
+      yarn --offline build:typescript
+
+      # custom gitignore so that the flake keeps build artefacts
+      mv .gitignore GITIGNORE
+      sed -i /Reducer_Peggy_GeneratedParser.js/d GITIGNORE
+      sed -i /\*.bs.js/d GITIGNORE
+      sed -i /\*.gen.ts/d GITIGNORE
+      sed -i /\*.gen.tsx/d GITIGNORE
+      sed -i /\*.gen.js/d GITIGNORE
+      sed -i /helpers.js/d GITIGNORE
+
+      popd
+    '';
+    installPhase = ''
+      mkdir -p $out
+      # mkdir -p $out/node_modules
+      mv deps/@quri/squiggle-lang/GITIGNORE deps/@quri/squiggle-lang/.gitignore
+
+      # annoying hack because permissions on transitive dependencies later on
+      mv deps/@quri/squiggle-lang/node_modules deps/@quri/squiggle-lang/NODE_MODULES
+      mv deps/node_modules deps/@quri/squiggle-lang
+
+      # the proper install phase
+      cp -r deps/@quri/squiggle-lang/. $out
+    '';
+  };
+  test = pkgs.stdenv.mkDerivation {
+    name = "squiggle-lang-test";
+    src = build;
+    buildInputs = common.buildInputs;
+    buildPhase = ''
+      yarn --offline test
+    '';
+    installPhase = ''
+      mkdir -p $out
+      cp -r . $out
+    '';
+  };
+  bundle = pkgs.stdenv.mkDerivation {
+    name = "squiggle-lang-bundle";
+    src = test;
+    buildInputs = common.buildInputs;
+    buildPhase = ''
+      yarn --offline bundle
+    '';
+    installPhase = ''
+      mkdir -p $out
+      cp -r dist $out
+      cp *.json $out/dist
+    '';
+  };
+
+}

nix/squiggle-vscode.nix

@@ -0,0 +1,24 @@
+{ pkgs, commonFn, langFn, componentsFn }:
+
+rec {
+  common = commonFn pkgs;
+  lang = langFn pkgs;
+  components = componentsFn pkgs;
+
+  yarn-source = pkgs.mkYarnPackage {
+    name = "squiggle-vscodeext_yarnsource";
+    src = ../packages/vscode-ext;
+    packageJson = ../packages/vscode-ext/package.json;
+    yarnLock = ../yarn.lock;
+    packageResolutions."@quri/squiggle-lang" = lang.build;
+    packageResolutions."@quri/squiggle-components" = components.build;
+  };
+  lint = pkgs.stdenv.mkDerivation {
+    name = "squiggle-vscode-lint";
+    buildInputs = common.buildInputs ++ common.prettier;
+    src =
+      ../packages/vscode-ext; # yarn-source + "/libexec/vscode-squiggle/deps/vscode-squiggle";
+    buildPhase = "prettier --check .";
+    installPhase = "mkdir -p $out";
+  };
+}

nix/squiggle-website.nix

@@ -0,0 +1,30 @@
+{ pkgs, commonFn, langFn, componentsFn }:
+
+rec {
+  common = commonFn pkgs;
+  lang = langFn pkgs;
+  components = componentsFn pkgs;
+  websitePackageJson = let
+    raw = pkgs.lib.importJSON ../packages/website/package.json;
+    modified = pkgs.lib.recursiveUpdate raw {
+      dependencies.postcss-import = "^14.1.0";
+      dependencies.tailwindcss = "^3.1.8";
+    };
+    packageJsonString = builtins.toJSON modified;
+  in pkgs.writeText "packages/website/patched-package.json" packageJsonString;
+  yarn-source = pkgs.mkYarnPackage {
+    name = "squiggle-website_yarnsource";
+    src = ../packages/website;
+    packageJSON = websitePackageJson;
+    yarnLock = ../yarn.lock;
+    packageResolutions."@quri/squiggle-lang" = lang.build;
+    packageResolutions."@quri/squiggle-components" = components.build;
+  };
+  lint = pkgs.stdenv.mkDerivation {
+    name = "squiggle-website-lint";
+    buildInputs = common.buildInputs ++ common.prettier;
+    src = ../packages/website;
+    buildPhase = "yarn lint";
+    installPhase = "mkdir -p $out";
+  };
+}

nixos.sh

@@ -5,14 +5,14 @@
 # We need to patchelf rescript executables. https://github.com/NixOS/nixpkgs/issues/107375
 set -x
 
-fhsShellName="squiggle-development"
+fhsShellName="squiggle-fhs-development"
-fhsShellDotNix="{pkgs ? import <nixpkgs> {} }: (pkgs.buildFHSUserEnv { name = \"${fhsShellName}\"; targetPkgs = pkgs: [pkgs.yarn]; runScript = \"yarn\"; }).env"
+fhsShellDotNix="{pkgs ? import <nixpkgs> {} }: (pkgs.buildFHSUserEnv { name = \"${fhsShellName}\"; targetPkgs = pkgs: [pkgs.yarn pkgs.glibc]; runScript = \"yarn\"; }).env"
 nix-shell - <<<"$fhsShellDotNix"
 
 theLd=$(patchelf --print-interpreter $(which mkdir))
 patchelf --set-interpreter $theLd ./node_modules/gentype/gentype.exe
 patchelf --set-interpreter $theLd ./node_modules/rescript/linux/*.exe
 patchelf --set-interpreter $theLd ./node_modules/bisect_ppx/ppx
-patchelf --set-interpreter $theLd ./node_moduels/bisect_ppx/bisect-ppx-report
+patchelf --set-interpreter $theLd ./node_modules/bisect_ppx/bisect-ppx-report
-theSo=$(find /nix/store/*$fhsShellName*/lib64 -name libstdc++.so.6 | grep $fhsShellName | head -n 1)
+theSo=$(find /nix/store/*$fhsShellName*/lib64 -name libstdc++.so.6 | head -n 1)
 patchelf --replace-needed libstdc++.so.6 $theSo ./node_modules/rescript/linux/ninja.exe

packages/components/package.json

@@ -4,14 +4,14 @@
   "license": "MIT",
   "dependencies": {
     "@floating-ui/react-dom": "^1.0.0",
-    "@floating-ui/react-dom-interactions": "^0.9.2",
+    "@floating-ui/react-dom-interactions": "^0.9.3",
     "@headlessui/react": "^1.6.6",
     "@heroicons/react": "^1.0.6",
     "@hookform/resolvers": "^2.9.7",
     "@quri/squiggle-lang": "^0.3.0",
     "@react-hook/size": "^2.1.2",
     "clsx": "^1.2.1",
-    "framer-motion": "^7.2.0",
+    "framer-motion": "^7.2.1",
     "lodash": "^4.17.21",
     "react": "^18.1.0",
     "react-ace": "^10.1.0",
@@ -39,7 +39,7 @@
     "@testing-library/user-event": "^14.4.3",
     "@types/jest": "^27.5.0",
     "@types/lodash": "^4.14.184",
-    "@types/node": "^18.7.9",
+    "@types/node": "^18.7.13",
     "@types/react": "^18.0.9",
     "@types/styled-components": "^5.1.26",
     "@types/webpack": "^5.28.0",
@@ -54,8 +54,8 @@
     "tailwindcss": "^3.1.8",
     "ts-loader": "^9.3.0",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "typescript": "^4.7.4",
+    "typescript": "^4.8.2",
-    "web-vitals": "^2.1.4",
+    "web-vitals": "^3.0.0",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.10.0"

packages/components/src/components/SquigglePlayground.tsx

@@ -232,7 +232,7 @@ export const PlaygroundContext = React.createContext<PlaygroundContextShape>({
 export const SquigglePlayground: FC<PlaygroundProps> = ({
   defaultCode = "",
   height = 500,
-  showSummary = false,
+  showSummary = true,
   logX = false,
   expY = false,
   title,

packages/components/src/components/ui/Checkbox.tsx

@@ -1,8 +1,8 @@
 import clsx from "clsx";
 import React from "react";
-import { Path, UseFormRegister } from "react-hook-form";
+import { Path, UseFormRegister, FieldValues } from "react-hook-form";
 
-export function Checkbox<T>({
+export function Checkbox<T extends FieldValues>({
   name,
   label,
   register,

packages/components/src/components/ui/InputItem.tsx

@@ -1,7 +1,7 @@
 import React from "react";
-import { Path, UseFormRegister } from "react-hook-form";
+import { Path, UseFormRegister, FieldValues } from "react-hook-form";
 
-export function InputItem<T>({
+export function InputItem<T extends FieldValues>({
   name,
   label,
   type,

packages/squiggle-lang/__tests__/E/A_test.res

@@ -0,0 +1,21 @@
+open Jest
+open TestHelpers
+
+describe("E.A.getByFmap", () => {
+  makeTest("Empty list returns None", E.A.getByFmap([], x => x + 1, x => mod(x, 2) == 0), None)
+  makeTest(
+    "Never predicate returns None",
+    E.A.getByFmap([1, 2, 3, 4, 5, 6], x => x + 1, _ => false),
+    None,
+  )
+  makeTest(
+    "function evaluates",
+    E.A.getByFmap([1, 1, 1, 1, 1, 1, 1, 2, 1, 1], x => 3 * x, x => x > 4),
+    Some(6),
+  )
+  makeTest(
+    "always predicate returns fn(fst(a))",
+    E.A.getByFmap([0, 1, 2, 3, 4, 5, 6], x => 10 + x, _ => true),
+    Some(10),
+  )
+})

packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res

@@ -74,6 +74,7 @@ describe("eval on distribution functions", () => {
     testEval("truncateLeft(normal(5,2), 3)", "Ok(Point Set Distribution)")
     testEval("truncateRight(normal(5,2), 3)", "Ok(Point Set Distribution)")
     testEval("truncate(normal(5,2), 3, 8)", "Ok(Point Set Distribution)")
+    testEval("truncate(normal(5,2) |> SampleSet.fromDist, 3, 8)", "Ok(Sample Set Distribution)")
     testEval("isNormalized(truncate(normal(5,2), 3, 8))", "Ok(true)")
   })
 

packages/squiggle-lang/__tests__/SquiggleLibrary/SquiggleLibrary_FunctionRegistryLibrary_test.res

@@ -67,6 +67,9 @@ describe("FunctionRegistry Library", () => {
     testEvalToBe("SampleSet.fromList([3,5,2,3,5,2,3,5,2,3,3,5])", "Ok(Sample Set Distribution)")
     testEvalToBe("SampleSet.fromList([3,5,2,3,5,2,3,5,2,3,3,5])", "Ok(Sample Set Distribution)")
     testEvalToBe("SampleSet.fromFn({|| sample(normal(5,2))})", "Ok(Sample Set Distribution)")
+    testEvalToBe("SampleSet.min(SampleSet.fromDist(normal(50,2)), 2)", "Ok(Sample Set Distribution)")
+    testEvalToBe("mean(SampleSet.min(SampleSet.fromDist(normal(50,2)), 2))", "Ok(2)")
+    testEvalToBe("SampleSet.max(SampleSet.fromDist(normal(50,2)), 10)", "Ok(Sample Set Distribution)")
     testEvalToBe(
       "addOne(t)=t+1; SampleSet.toList(SampleSet.map(SampleSet.fromList([1,2,3,4,5,6]), addOne))",
       "Ok([2,3,4,5,6,7])",

packages/squiggle-lang/__tests__/Stdlib_test.res

@@ -0,0 +1,20 @@
+open Jest
+open Expect
+
+let makeTest = (~only=false, str, item1, item2) =>
+  only
+    ? Only.test(str, () => expect(item1)->toEqual(item2))
+    : test(str, () => expect(item1)->toEqual(item2))
+
+describe("Stdlib", () => {
+  makeTest(
+    "Length of Random.sample",
+    Stdlib.Random.sample([1.0, 2.0], {probs: [0.5, 0.5], size: 10})->E.A.length,
+    10,
+  )
+  makeTest(
+    "Random.sample returns elements from input array (will fail with very slim probability)",
+    Stdlib.Random.sample([1.0, 2.0], {probs: [0.5, 0.5], size: 10})->E.A.uniq->E.A.Floats.sort,
+    [1.0, 2.0],
+  )
+})

packages/squiggle-lang/package.json

@@ -18,6 +18,7 @@
     "benchmark": "ts-node benchmark/conversion_tests.ts",
     "test": "jest",
     "test:ts": "jest __tests__/TS/",
+    "test:stdlib": "jest __tests__/Stdlib_test.bs.js",
     "test:rescript": "jest --modulePathIgnorePatterns=__tests__/TS/*",
     "test:watch": "jest --watchAll",
     "test:fnRegistry": "jest __tests__/SquiggleLibrary/SquiggleLibrary_FunctionRegistryLibrary_test.bs.js",
@@ -44,18 +45,18 @@
     "@stdlib/stats": "^0.0.13",
     "jstat": "^1.9.5",
     "lodash": "^4.17.21",
-    "mathjs": "^11.0.1",
+    "mathjs": "^11.1.0",
     "pdfast": "^0.2.0"
   },
   "devDependencies": {
-    "@glennsl/rescript-jest": "^0.9.0",
+    "@glennsl/rescript-jest": "^0.9.2",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/jest": "^27.5.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "bisect_ppx": "^2.7.1",
     "chalk": "^5.0.1",
     "codecov": "^3.8.3",
-    "fast-check": "^3.1.1",
+    "fast-check": "^3.1.2",
     "gentype": "^4.5.0",
     "jest": "^27.5.1",
     "moduleserve": "^0.9.1",
@@ -68,7 +69,7 @@
     "ts-jest": "^27.1.4",
     "ts-loader": "^9.3.0",
     "ts-node": "^10.9.1",
-    "typescript": "^4.7.4",
+    "typescript": "^4.8.2",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0"
   },

packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res

@@ -216,7 +216,7 @@ let rec run = (~env: env, functionCallInfo: functionCallInfo): outputType => {
   | FromFloat(subFnName, x) => reCall(~functionCallInfo=FromFloat(subFnName, x), ())
   | Mixture(dists) =>
     dists
-    ->GenericDist.mixture(~scaleMultiplyFn=scaleMultiply, ~pointwiseAddFn=pointwiseAdd)
+    ->GenericDist.mixture(~scaleMultiplyFn=scaleMultiply, ~pointwiseAddFn=pointwiseAdd, ~env)
     ->E.R2.fmap(r => Dist(r))
     ->OutputLocal.fromResult
   | FromSamples(xs) =>

packages/squiggle-lang/src/rescript/Distributions/GenericDist.res

@@ -243,11 +243,19 @@ module Truncate = {
       switch trySymbolicSimplification(leftCutoff, rightCutoff, t) {
       | Some(r) => Ok(r)
       | None =>
-        toPointSetFn(t)->E.R2.fmap(t => {
+        switch t {
-          DistributionTypes.PointSet(
+        | SampleSet(t) =>
-            PointSetDist.T.truncate(leftCutoff, rightCutoff, t)->PointSetDist.T.normalize,
+          switch SampleSetDist.truncate(t, ~leftCutoff, ~rightCutoff) {
-          )
+          | Ok(r) => Ok(SampleSet(r))
-        })
+          | Error(err) => Error(DistributionTypes.SampleSetError(err))
+          }
+        | _ =>
+          toPointSetFn(t)->E.R2.fmap(t => {
+            DistributionTypes.PointSet(
+              PointSetDist.T.truncate(leftCutoff, rightCutoff, t)->PointSetDist.T.normalize,
+            )
+          })
+        }
       }
     }
   }
@@ -492,15 +500,30 @@ let pointwiseCombinationFloat = (
   m->E.R2.fmap(r => DistributionTypes.PointSet(r))
 }
 
-//Note: The result should always cumulatively sum to 1. This would be good to test.
+//TODO: The result should always cumulatively sum to 1. This would be good to test.
-//Note: If the inputs are not normalized, this will return poor results. The weights probably refer to the post-normalized forms. It would be good to apply a catch to this.
+//TODO: If the inputs are not normalized, this will return poor results. The weights probably refer to the post-normalized forms. It would be good to apply a catch to this.
 let mixture = (
   values: array<(t, float)>,
   ~scaleMultiplyFn: scaleMultiplyFn,
   ~pointwiseAddFn: pointwiseAddFn,
+  ~env: env,
 ) => {
-  if E.A.length(values) == 0 {
+  let allValuesAreSampleSet = v => E.A.all(((t, _)) => isSampleSetSet(t), v)
+
+  if E.A.isEmpty(values) {
     Error(DistributionTypes.OtherError("Mixture error: mixture must have at least 1 element"))
+  } else if allValuesAreSampleSet(values) {
+    let withSampleSetValues = values->E.A2.fmap(((value, weight)) =>
+      switch value {
+      | SampleSet(sampleSet) => Ok((sampleSet, weight))
+      | _ => Error("Unreachable")
+      }->E.R2.toExn("Mixture coding error: SampleSet expected. This should be inaccessible.")
+    )
+    let sampleSetMixture = SampleSetDist.mixture(withSampleSetValues, env.sampleCount)
+    switch sampleSetMixture {
+    | Ok(sampleSet) => Ok(DistributionTypes.SampleSet(sampleSet))
+    | Error(err) => Error(DistributionTypes.Error.sampleErrorToDistErr(err))
+    }
   } else {
     let totalWeight = values->E.A2.fmap(E.Tuple2.second)->E.A.Floats.sum
     let properlyWeightedValues =

packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi

@@ -81,6 +81,7 @@ let mixture: (
   array<(t, float)>,
   ~scaleMultiplyFn: scaleMultiplyFn,
   ~pointwiseAddFn: pointwiseAddFn,
+  ~env: env,
 ) => result<t, error>
 
 let isSymbolic: t => bool

packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res

@@ -224,3 +224,8 @@ module T = Dist({
     XYShape.Analysis.getVarianceDangerously(t, mean, getMeanOfSquares)
   }
 })
+
+let sampleN = (t: t, n): array<float> => {
+  let normalized = t->T.normalize->getShape
+  Stdlib.Random.sample(normalized.xs, {probs: normalized.ys, size: n})
+}

packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res

@@ -257,3 +257,7 @@ let toSparkline = (t: t, bucketCount): result<string, PointSetTypes.sparklineErr
   ->E.O2.fmap(Continuous.downsampleEquallyOverX(bucketCount))
   ->E.O2.toResult(PointSetTypes.CannotSparklineDiscrete)
   ->E.R2.fmap(r => Continuous.getShape(r).ys->Sparklines.create())
+
+let makeDiscrete = (d): t => Discrete(d)
+let makeContinuous = (d): t => Continuous(d)
+let makeMixed = (d): t => Mixed(d)

packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res

@@ -131,3 +131,37 @@ let max = t => T.get(t)->E.A.Floats.max
 let stdev = t => T.get(t)->E.A.Floats.stdev
 let variance = t => T.get(t)->E.A.Floats.variance
 let percentile = (t, f) => T.get(t)->E.A.Floats.percentile(f)
+
+let mixture = (values: array<(t, float)>, intendedLength: int) => {
+  let totalWeight = values->E.A2.fmap(E.Tuple2.second)->E.A.Floats.sum
+  let discreteSamples =
+    values
+    ->Belt.Array.mapWithIndex((i, (_, weight)) => (E.I.toFloat(i), weight /. totalWeight))
+    ->XYShape.T.fromZippedArray
+    ->Discrete.make
+    ->Discrete.sampleN(intendedLength)
+  let dists = values->E.A2.fmap(E.Tuple2.first)->E.A2.fmap(T.get)
+  let samples =
+    discreteSamples
+    ->Belt.Array.mapWithIndex((index, distIndexToChoose) => {
+      let chosenDist = E.A.get(dists, E.Float.toInt(distIndexToChoose))
+      chosenDist->E.O.bind(E.A.get(_, index))
+    })
+    ->E.A.O.openIfAllSome
+  samples->E.O2.toExn("Mixture unreachable error")->T.make
+}
+
+let truncateLeft = (t, f) => T.get(t)->E.A2.filter(x => x >= f)->T.make
+let truncateRight = (t, f) => T.get(t)->E.A2.filter(x => x <= f)->T.make
+
+let truncate = (t, ~leftCutoff: option<float>, ~rightCutoff: option<float>) => {
+  let withTruncatedLeft = t => leftCutoff |> E.O.dimap(left => truncateLeft(t, left), _ => Ok(t))
+  let withTruncatedRight = t => rightCutoff |> E.O.dimap(left => truncateRight(t, left), _ => Ok(t))
+  t->withTruncatedLeft |> E.R2.bind(withTruncatedRight)
+}
+
+let minOfTwo = (t1: t, t2: t) => map2(~fn=(a, b) => Ok(Js.Math.min_float(a, b)), ~t1, ~t2)
+let maxOfTwo = (t1: t, t2: t) => map2(~fn=(a, b) => Ok(Js.Math.max_float(a, b)), ~t1, ~t2)
+
+let minOfFloat = (t: t, f: float) => samplesMap(~fn=a => Ok(Js.Math.min_float(a, f)), t)
+let maxOfFloat = (t: t, f: float) => samplesMap(~fn=a => Ok(Js.Math.max_float(a, f)), t)

packages/squiggle-lang/src/rescript/FunctionRegistry/Library/FR_Sampleset.res

@@ -85,7 +85,7 @@ module Internal = {
   }
 }
 
-let library = [
+let libaryBase = [
   Function.make(
     ~name="fromDist",
     ~nameSpace,
@@ -280,3 +280,63 @@ let library = [
     (),
   ),
 ]
+
+module Comparison = {
+  let template = (name, inputs, run) => {
+    FnDefinition.make(
+      ~name,
+      ~inputs,
+      ~run=(inputs, _, _, _) => {
+        run(inputs)
+      },
+      (),
+    )
+  }
+
+  let wrapper = r =>
+    r
+    ->E.R2.fmap(r => r->Wrappers.sampleSet->Wrappers.evDistribution)
+    ->E.R2.errMap(SampleSetDist.Error.toString)
+
+  let mkBig = (name, withDist, withFloat) =>
+    Function.make(
+      ~name,
+      ~nameSpace,
+      ~requiresNamespace=false,
+      ~examples=[
+        `SampleSet.${name}(SampleSet.fromDist(normal(5,2)), SampleSet.fromDist(normal(6,2)))`,
+        `SampleSet.${name}(SampleSet.fromDist(normal(5,2)), 3.0)`,
+        `SampleSet.${name}(4.0, SampleSet.fromDist(normal(6,2)))`,
+      ],
+      ~output=ReducerInterface_InternalExpressionValue.EvtDistribution,
+      ~definitions=[
+        template(name, [FRTypeDist, FRTypeDist], inputs => {
+          switch inputs {
+          | [IEvDistribution(SampleSet(dist1)), IEvDistribution(SampleSet(dist2))] =>
+            withDist(dist1, dist2)->wrapper
+          | _ => Error(impossibleError)
+          }
+        }),
+        template(name, [FRTypeDist, FRTypeNumber], inputs => {
+          switch inputs {
+          | [IEvDistribution(SampleSet(dist)), IEvNumber(f)] => withFloat(dist, f)->wrapper
+          | _ => Error(impossibleError)
+          }
+        }),
+        template(name, [FRTypeNumber, FRTypeDist], inputs => {
+          switch inputs {
+          | [IEvNumber(f), IEvDistribution(SampleSet(dist))] => withFloat(dist, f)->wrapper
+          | _ => Error(impossibleError)
+          }
+        }),
+      ],
+      (),
+    )
+
+  let library = [
+    mkBig("min", SampleSetDist.minOfTwo, SampleSetDist.minOfFloat),
+    mkBig("max", SampleSetDist.maxOfTwo, SampleSetDist.maxOfFloat),
+  ]
+}
+
+let library = E.A.append(libaryBase, Comparison.library)

packages/squiggle-lang/src/rescript/Utility/E.res

@@ -220,6 +220,7 @@ module I = {
   let increment = n => n + 1
   let decrement = n => n - 1
   let toString = Js.Int.toString
+  let toFloat = Js.Int.toFloat
 }
 
 exception Assertion(string)
@@ -572,12 +573,22 @@ module A = {
       |> (x => Ok(x))
     }
 
-  let getByOpen = (a, op, bin) =>
+  let getByFmap = (a, fn, boolCondition) => {
-    switch getBy(a, r => bin(op(r))) {
+    let i = ref(0)
-    | Some(r) => Some(op(r))
+    let finalFunctionValue = ref(None)
-    | None => None
+    let length = Belt.Array.length(a)
+
+    while i.contents < length && finalFunctionValue.contents == None {
+      let itemWithFnApplied = Belt.Array.getUnsafe(a, i.contents) |> fn
+      if boolCondition(itemWithFnApplied) {
+        finalFunctionValue := Some(itemWithFnApplied)
+      }
+      i := i.contents + 1
     }
 
+    finalFunctionValue.contents
+  }
+
   let tail = Belt.Array.sliceToEnd(_, 1)
 
   let zip = Belt.Array.zip
@@ -680,7 +691,7 @@ module A = {
     let firstSome = x => Belt.Array.getBy(x, O.isSome)
 
     let firstSomeFn = (r: array<unit => option<'a>>): option<'a> =>
-      O.flatten(getByOpen(r, l => l(), O.isSome))
+      O.flatten(getByFmap(r, l => l(), O.isSome))
 
     let firstSomeFnWithDefault = (r, default) => firstSomeFn(r)->O2.default(default)
 

packages/squiggle-lang/src/rescript/Utility/Stdlib.res

@@ -38,3 +38,12 @@ module Logistic = {
   @module external variance: (float, float) => float = "@stdlib/stats/base/dists/logistic/variance"
   let variance = variance
 }
+
+module Random = {
+  type sampleArgs = {
+    probs: array<float>,
+    size: int,
+  }
+  @module external sample: (array<float>, sampleArgs) => array<float> = "@stdlib/random/sample"
+  let sample = sample
+}

packages/squiggle-lang/webpack.config.js

@@ -14,6 +14,7 @@ module.exports = {
   },
   resolve: {
     extensions: [".tsx", ".ts", ".js"],
+    fallback: { buffer: ["@stdlib/buffer"] },
   },
   output: {
     filename: "bundle.js",

packages/vscode-ext/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": 6,
-    "sourceType": "module"
-  },
-  "plugins": ["@typescript-eslint"],
-  "rules": {
-    "@typescript-eslint/naming-convention": "warn",
-    "@typescript-eslint/semi": "warn",
-    "curly": "warn",
-    "eqeqeq": "warn",
-    "no-throw-literal": "warn",
-    "semi": "off"
-  },
-  "ignorePatterns": ["out", "dist", "**/*.d.ts"]
-}

packages/vscode-ext/.prettierignore

@@ -0,0 +1,3 @@
+out
+dist
+media/vendor

packages/vscode-ext/package.json

@@ -121,20 +121,17 @@
     "compile": "yarn run compile:vendor && yarn run compile:grammar && yarn run compile:tsc",
     "watch": "tsc -b -watch",
     "pretest": "yarn run compile && yarn run lint",
-    "lint": "eslint client/src server/src --ext ts",
+    "lint": "prettier --check .",
-    "format": "eslint client/src server/src --ext ts --fix",
+    "format": "prettier --write .",
     "package": "npx vsce package --yarn"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",
     "@types/node": "18.x",
     "@types/vscode": "^1.70.0",
-    "@typescript-eslint/eslint-plugin": "^5.33.1",
-    "@typescript-eslint/parser": "^5.33.1",
-    "eslint": "^8.22.0",
     "glob": "^8.0.3",
     "js-yaml": "^4.1.0",
-    "typescript": "^4.7.4",
+    "typescript": "^4.8.2",
     "vsce-yarn-patch": "^1.66.2"
   },
   "dependencies": {
@@ -143,4 +140,4 @@
     "vscode-languageserver-textdocument": "^1.0.5",
     "@quri/squiggle-lang": "^0.2.11"
   }
-}
+}

packages/website/docs/Api/Dist.mdx

@@ -290,12 +290,29 @@ quantile: (distribution, number) => number
 quantile(normal(5, 2), 0.5);
 ```
 
-### truncateLeft
+### truncate
 
-Truncates the left side of a distribution. Returns either a pointSet distribution or a symbolic distribution.
+Truncates both the left side and the right side of a distribution.
 
 ```
-truncateLeft: (distribution, l => number) => distribution
+truncate: (distribution, left: number, right: number) => distribution
+```
+
+<Admonition type="note" title="Implementation Details">
+  <p>
+    Sample set distributions are truncated by filtering samples, but point set
+    distributions are truncated using direct geometric manipulation. Uniform
+    distributions are truncated symbolically. Symbolic but non-uniform
+    distributions get converted to Point Set distributions.
+  </p>
+</Admonition>
+
+### truncateLeft
+
+Truncates the left side of a distribution.
+
+```
+truncateLeft: (distribution, left: number) => distribution
 ```
 
 **Examples**
@@ -306,10 +323,10 @@ truncateLeft(normal(5, 2), 3);
 
 ### truncateRight
 
-Truncates the right side of a distribution. Returns either a pointSet distribution or a symbolic distribution.
+Truncates the right side of a distribution.
 
 ```
-truncateRight: (distribution, r => number) => distribution
+truncateRight: (distribution, right: number) => distribution
 ```
 
 **Examples**
@@ -388,7 +405,7 @@ The only functions that do not return normalized distributions are the pointwise
 
 ### normalize
 
-Normalize a distribution. This means scaling it appropriately so that it's cumulative sum is equal to 1. This only impacts Pointset distributions, because those are the only ones that can be non-normlized.
+Normalize a distribution. This means scaling it appropriately so that it's cumulative sum is equal to 1. This only impacts Point Set distributions, because those are the only ones that can be non-normlized.
 
 ```
 normalize: (distribution) => distribution