Merge branch 'develop' into project-serialization

.github/workflows/ci.yml

@@ -26,27 +26,27 @@ jobs:
     steps:
       - id: skip_lang_check
         name: Check if the changes are about squiggle-lang src files
-        uses: fkirc/skip-duplicate-actions@v5.1.0
+        uses: fkirc/skip-duplicate-actions@v5.2.0
         with:
           paths: '["packages/squiggle-lang/**"]'
       - id: skip_components_check
         name: Check if the changes are about components src files
-        uses: fkirc/skip-duplicate-actions@v5.1.0
+        uses: fkirc/skip-duplicate-actions@v5.2.0
         with:
           paths: '["packages/components/**"]'
       - id: skip_website_check
         name: Check if the changes are about website src files
-        uses: fkirc/skip-duplicate-actions@v5.1.0
+        uses: fkirc/skip-duplicate-actions@v5.2.0
         with:
           paths: '["packages/website/**"]'
       - id: skip_vscodeext_check
         name: Check if the changes are about vscode extension src files
-        uses: fkirc/skip-duplicate-actions@v5.1.0
+        uses: fkirc/skip-duplicate-actions@v5.2.0
         with:
           paths: '["packages/vscode-ext/**"]'
       - id: skip_cli_check
         name: Check if the changes are about cli src files
-        uses: fkirc/skip-duplicate-actions@v5.1.0
+        uses: fkirc/skip-duplicate-actions@v5.2.0
         with:
           paths: '["packages/cli/**"]'
 
@@ -116,8 +116,8 @@ jobs:
           dry: true
           prettier_options: --check packages/components --ignore-path packages/components/.prettierignore
 
-  components-bundle-build:
+  components-bundle-build-test:
-    name: Components bundle and build
+    name: Components bundle, build and test
     runs-on: ubuntu-latest
     needs: pre_check
     if: ${{ (needs.pre_check.outputs.should_skip_components != 'true') || (needs.pre_check.outputs.should_skip_lang != 'true') }}
@@ -135,6 +135,8 @@ jobs:
         run: yarn bundle
       - name: Build storybook
         run: yarn build
+      - name: Test components 
+        run: yarn test
 
   website-lint:
     name: Website lint

.github/workflows/release-please.yml

@@ -18,27 +18,27 @@ jobs:
     steps:
       - id: skip_lang_check
         name: Check if the changes are about squiggle-lang src files
-        uses: fkirc/skip-duplicate-actions@v5.1.0
+        uses: fkirc/skip-duplicate-actions@v5.2.0
         with:
           paths: '["packages/squiggle-lang/**"]'
       - id: skip_components_check
         name: Check if the changes are about components src files
-        uses: fkirc/skip-duplicate-actions@v5.1.0
+        uses: fkirc/skip-duplicate-actions@v5.2.0
         with:
           paths: '["packages/components/**"]'
       - id: skip_website_check
         name: Check if the changes are about website src files
-        uses: fkirc/skip-duplicate-actions@v5.1.0
+        uses: fkirc/skip-duplicate-actions@v5.2.0
         with:
           paths: '["packages/website/**"]'
       - id: skip_vscodeext_check
         name: Check if the changes are about vscode extension src files
-        uses: fkirc/skip-duplicate-actions@v5.1.0
+        uses: fkirc/skip-duplicate-actions@v5.2.0
         with:
           paths: '["packages/vscode-ext/**"]'
       - id: skip_cli_check
         name: Check if the changes are about cli src files
-        uses: fkirc/skip-duplicate-actions@v5.1.0
+        uses: fkirc/skip-duplicate-actions@v5.2.0
         with:
           paths: '["packages/cli/**"]'
 

packages/cli/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "chalk": "^5.0.1",
     "chokidar": "^3.5.3",
-    "commander": "^9.4.0",
+    "commander": "^9.4.1",
     "fs": "^0.0.1-security",
     "glob": "^8.0.3",
     "indent-string": "^5.0.0"

packages/components/jest.config.js

@@ -0,0 +1,6 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: "ts-jest",
+  setupFilesAfterEnv: ["<rootDir>/test/setup.js"],
+  testEnvironment: "jsdom",
+};

packages/components/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@quri/squiggle-components",
-  "version": "0.5.0-alpha.2",
+  "version": "0.5.0",
   "license": "MIT",
   "dependencies": {
     "@floating-ui/react-dom": "^1.0.0",
     "@floating-ui/react-dom-interactions": "^0.10.1",
-    "@headlessui/react": "^1.7.2",
+    "@headlessui/react": "^1.7.3",
     "@heroicons/react": "^1.0.6",
     "@hookform/resolvers": "^2.9.8",
-    "@quri/squiggle-lang": "^0.5.0-alpha.2",
+    "@quri/squiggle-lang": "^0.5.0",
     "@react-hook/size": "^2.1.2",
     "clsx": "^1.2.1",
-    "framer-motion": "^7.4.0",
+    "framer-motion": "^7.5.1",
     "lodash": "^4.17.21",
     "react": "^18.1.0",
     "react-ace": "^10.1.0",
@@ -38,12 +38,16 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
     "@types/jest": "^27.5.0",
-    "@types/lodash": "^4.14.185",
+    "@types/lodash": "^4.14.186",
-    "@types/node": "^18.7.22",
+    "@types/node": "^18.8.0",
     "@types/react": "^18.0.21",
     "@types/styled-components": "^5.1.26",
     "@types/webpack": "^5.28.0",
+    "canvas": "^2.10.1",
     "cross-env": "^7.0.3",
+    "jest": "^29.0.3",
+    "jest-environment-jsdom": "^29.0.3",
+    "jsdom": "^20.0.0",
     "mini-css-extract-plugin": "^2.6.1",
     "postcss-cli": "^10.0.0",
     "postcss-import": "^15.0.0",
@@ -53,9 +57,10 @@
     "react-scripts": "^5.0.1",
     "style-loader": "^3.3.1",
     "tailwindcss": "^3.1.8",
-    "ts-loader": "^9.4.0",
+    "ts-jest": "^29.0.2",
+    "ts-loader": "^9.4.1",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "typescript": "^4.8.3",
+    "typescript": "^4.8.4",
     "web-vitals": "^3.0.2",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
@@ -75,7 +80,9 @@
     "all": "yarn bundle && yarn build",
     "lint": "prettier --check .",
     "format": "prettier --write .",
-    "prepack": "yarn run build:cjs && yarn run bundle"
+    "prepack": "yarn run build:cjs && yarn run bundle",
+    "test": "jest",
+    "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand"
   },
   "eslintConfig": {
     "extends": [

packages/components/src/components/DistributionChart.tsx

@@ -83,18 +83,32 @@ export const DistributionChart: React.FC<DistributionChartProps> = (props) => {
       }
     }
 
-    const spec = buildVegaSpec(props);
+    const domain = shapes.value.flatMap((shape) =>
+      shape.discrete.concat(shape.continuous)
+    );
 
-    let widthProp = width ? width : size.width;
+    const spec = buildVegaSpec({
+      ...props,
+      minX: props.minX ?? Math.min(...domain.map((x) => x.x)),
+      maxX: props.minX ?? Math.max(...domain.map((x) => x.x)),
+      maxY: Math.max(...domain.map((x) => x.y)),
+    });
+
+    // I think size.width is sometimes not finite due to the component not being in a visible context
+    // This occurs during testing
+    let widthProp = width
+      ? width
+      : Number.isFinite(size.width)
+      ? size.width
+      : 400;
     if (widthProp < 20) {
       console.warn(
         `Width of Distribution is set to ${widthProp}, which is too small`
       );
       widthProp = 20;
     }
-    const domain = shapes.value.flatMap((shape) =>
+
-      shape.discrete.concat(shape.continuous)
+    const vegaData = { data: shapes.value, samples };
-    );
 
     return (
       <div style={{ width: widthProp }}>
@@ -105,7 +119,7 @@ export const DistributionChart: React.FC<DistributionChartProps> = (props) => {
         ) : (
           <Vega
             spec={spec}
-            data={{ data: shapes.value, domain, samples }}
+            data={vegaData}
             width={widthProp - 10}
             height={height}
             actions={actions}

packages/components/src/lib/distributionSpecBuilder.ts

@@ -26,7 +26,6 @@ export const linearXScale: LinearScale = {
   range: "width",
   zero: false,
   nice: false,
-  domain: { data: "domain", field: "x" },
 };
 
 export const logXScale: LogScale = {
@@ -37,7 +36,6 @@ export const logXScale: LogScale = {
   base: 10,
   nice: false,
   clamp: true,
-  domain: { data: "domain", field: "x" },
 };
 
 export const timeXScale: TimeScale = {
@@ -46,7 +44,6 @@ export const timeXScale: TimeScale = {
   type: "time",
   range: "width",
   nice: false,
-  domain: { data: "domain", field: "x" },
 };
 
 /** Y Scales */
@@ -55,7 +52,6 @@ export const linearYScale: LinearScale = {
   type: "linear",
   range: "height",
   zero: true,
-  domain: { data: "domain", field: "y" },
 };
 
 export const expYScale: PowScale = {
@@ -65,7 +61,6 @@ export const expYScale: PowScale = {
   range: "height",
   zero: true,
   nice: false,
-  domain: { data: "domain", field: "y" },
 };
 
 export const defaultTickFormat = ".9~s";
@@ -73,9 +68,17 @@ export const timeTickFormat = "%b %d, %Y %H:%M";
 const width = 500;
 
 export function buildVegaSpec(
-  specOptions: DistributionChartSpecOptions
+  specOptions: DistributionChartSpecOptions & { maxY: number }
 ): VisualizationSpec {
-  const { title, minX, maxX, logX, expY, xAxisType = "number" } = specOptions;
+  const {
+    title,
+    minX,
+    maxX,
+    logX,
+    expY,
+    xAxisType = "number",
+    maxY,
+  } = specOptions;
 
   const dateTime = xAxisType === "dateTime";
 
@@ -88,13 +91,15 @@ export function buildVegaSpec(
 
   let xScale = dateTime ? timeXScale : logX ? logXScale : linearXScale;
 
-  if (minX !== undefined && Number.isFinite(minX)) {
+  xScale = {
-    xScale = { ...xScale, domainMin: minX };
+    ...xScale,
-  }
+    domain: [minX ?? 0, maxX ?? 1],
+    domainMin: minX,
+    domainMax: maxX,
+  };
 
-  if (maxX !== undefined && Number.isFinite(maxX)) {
+  let yScale = expY ? expYScale : linearYScale;
-    xScale = { ...xScale, domainMax: maxX };
+  yScale = { ...yScale, domain: [0, maxY ?? 1], domainMin: 0, domainMax: maxY };
-  }
 
   const spec: VisualizationSpec = {
     $schema: "https://vega.github.io/schema/vega/v5.json",
@@ -128,7 +133,7 @@ export function buildVegaSpec(
     ],
     scales: [
       xScale,
-      expY ? expYScale : linearYScale,
+      yScale,
       {
         name: "color",
         type: "ordinal",

packages/components/src/stories/SquigglePartial.stories.mdx

@@ -1,51 +0,0 @@
-import { SquigglePartial, SquiggleEditor } from "../components/SquiggleEditor";
-import { useState } from "react";
-import { Canvas, Meta, Story, Props } from "@storybook/addon-docs";
-
-<Meta title="Squiggle/SquigglePartial" component={SquigglePartial} />
-
-export const Template = (props) => <SquigglePartial {...props} />;
-
-# Squiggle Partial
-
-A Squiggle Partial is an editor that does not return a graph to the user, but
-instead returns bindings that can be used by further Squiggle Editors.
-
-<Canvas>
-  <Story
-    name="Standalone"
-    args={{
-      defaultCode: "x = normal(5,2)",
-    }}
-  >
-    {Template.bind({})}
-  </Story>
-</Canvas>
-
-<Canvas>
-  <Story
-    name="With Editor"
-    args={{
-      initialPartialString: "x = normal(5,2)",
-      initialEditorString: "x",
-    }}
-  >
-    {(props) => {
-      let [bindings, setBindings] = useState({});
-      return (
-        <>
-          <SquigglePartial
-            {...props}
-            defaultCode={props.initialPartialString}
-            onChange={setBindings}
-          />
-          <SquiggleEditor
-            {...props}
-            defaultCode={props.initialEditorString}
-            bindings={bindings}
-          />
-        </>
-      );
-    }}
-  </Story>
-</Canvas>

packages/components/test/basic.test.tsx

@@ -0,0 +1,13 @@
+import { render } from "@testing-library/react";
+import React from "react";
+import "@testing-library/jest-dom";
+import { SquiggleChart } from "../src/index";
+
+test("Logs no warnings or errors", async () => {
+  debugger;
+  const { unmount } = render(<SquiggleChart code={"normal(0, 1)"} />);
+  unmount();
+
+  expect(console.warn).not.toBeCalled();
+  expect(console.error).not.toBeCalled();
+});

packages/components/test/setup.js

@@ -0,0 +1,8 @@
+global.console = {
+  ...console,
+  log: jest.fn(console.log),
+  debug: jest.fn(console.debug),
+  info: jest.fn(console.info),
+  warn: jest.fn(console.warn),
+  error: jest.fn(console.error),
+};

packages/squiggle-lang/__tests__/ReducerProject/ReducerProject_test.res

@@ -112,6 +112,25 @@ describe("project2", () => {
   })
 })
 
+describe("removing sources", () => {
+  let project = Project.createProject()
+  Project.setContinues(project, "main", ["second"])
+  Project.setContinues(project, "second", ["first"])
+  Project.setSource(project, "first", "x=1")
+  Project.setSource(project, "second", "y=2")
+  Project.setSource(project, "main", "y")
+
+  Project.removeSource(project, "main")
+
+  test("project doesn't have source", () => {
+    expect(Project.getSource(project, "main")) == None
+  })
+
+  test("dependents get updated", () => {
+    expect(Project.getDependents(project, "second")) == []
+  })
+})
+
 describe("project with include", () => {
   let project = Project.createProject()
   Project.setContinues(project, "main", ["second"])

packages/squiggle-lang/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quri/squiggle-lang",
-  "version": "0.5.0-alpha.2",
+  "version": "0.5.0",
   "homepage": "https://squiggle-language.com",
   "license": "MIT",
   "scripts": {
@@ -68,9 +68,9 @@
     "rescript-fast-check": "^1.1.1",
     "rescript-js-map": "^1.1.0",
     "ts-jest": "^27.1.4",
-    "ts-loader": "^9.4.0",
+    "ts-loader": "^9.4.1",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.3",
+    "typescript": "^4.8.4",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0"
   },

packages/squiggle-lang/src/js/SqProject.ts

@@ -22,6 +22,10 @@ export class SqProject {
     return RSProject.setSource(this._value, sourceId, value);
   }
 
+  removeSource(sourceId: string) {
+    RSProject.removeSource(this._value, sourceId);
+  }
+
   getSource(sourceId: string) {
     return RSProject.getSource(this._value, sourceId);
   }

packages/squiggle-lang/src/rescript/ForTS/ForTS_ReducerProject.res

@@ -51,6 +51,13 @@ Sets the source for a given source Id.
 let setSource = (project: reducerProject, sourceId: string, value: string): unit =>
   project->Private.setSource(sourceId, value)
 
+/*
+Removes the source for a given source Id.
+*/
+@genType
+let removeSource = (project: reducerProject, sourceId: string): unit =>
+  project->Private.removeSource(sourceId)
+
 /*
 Gets the source for a given source id.
 */

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

@@ -61,6 +61,10 @@ let setSource = (project: t, sourceId: string, value: string): unit => {
   touchDependents(project, sourceId)
 }
 
+let removeSource = (project: t, sourceId: string): unit => {
+  Belt.MutableMap.String.remove(project.items, sourceId)
+}
+
 let clean = (project: t, sourceId: string): unit => {
   let newItem = project->getItem(sourceId)->ProjectItem.clean
   project->setItem(sourceId, newItem)

packages/vscode-ext/package.json

@@ -3,7 +3,7 @@
   "displayName": "Squiggle",
   "description": "Squiggle language support",
   "license": "MIT",
-  "version": "0.5.0-alpha.2",
+  "version": "0.5.0",
   "publisher": "QURI",
   "repository": {
     "type": "git",
@@ -131,7 +131,7 @@
     "@types/vscode": "^1.70.0",
     "glob": "^8.0.3",
     "js-yaml": "^4.1.0",
-    "typescript": "^4.8.3",
+    "typescript": "^4.8.4",
     "vsce-yarn-patch": "^1.66.2"
   },
   "dependencies": {

packages/website/docs/Api/DistSampleSet.mdx

@@ -12,7 +12,7 @@ All regular distribution function work on sample set distributions. In addition,
 ### fromDist
 
 ```
-SampleSet.fromDist: (list<number>) => sampleSet
+SampleSet.fromDist: (distribution) => sampleSet
 ```
 
 ### fromList

packages/website/docusaurus.config.js

@@ -52,29 +52,30 @@ const config = {
   themeConfig:
     /** @type {import('@docusaurus/preset-classic').ThemeConfig} */
     ({
-      algolia: {
+      // TODO - disabled until we fix algolia search
-        // The application ID provided by Algolia
+      // algolia: {
-        appId: "KBED3M1CMD",
+      //   // The application ID provided by Algolia
+      //   appId: "KBED3M1CMD",
 
-        // Public API key: it is safe to commit it
+      //   // Public API key: it is safe to commit it
-        apiKey: "c61bc7603893cf287ed6971983af8bad",
+      //   apiKey: "c61bc7603893cf287ed6971983af8bad",
 
-        indexName: "squiggle_docs",
+      //   indexName: "squiggle_docs",
 
-        // Optional: see doc section below
+      //   // Optional: see doc section below
-        contextualSearch: true,
+      //   contextualSearch: true,
 
-        // Optional: Specify domains where the navigation should occur through window.location instead on history.push. Useful when our Algolia config crawls multiple documentation sites and we want to navigate with window.location.href to them.
+      //   // Optional: Specify domains where the navigation should occur through window.location instead on history.push. Useful when our Algolia config crawls multiple documentation sites and we want to navigate with window.location.href to them.
-        // externalUrlRegex: 'external\\.com|domain\\.com',
+      //   // externalUrlRegex: 'external\\.com|domain\\.com',
 
-        // Optional: Algolia search parameters
+      //   // Optional: Algolia search parameters
-        searchParameters: {},
+      //   searchParameters: {},
 
-        // Optional: path for search page that enabled by default (`false` to disable it)
+      //   // Optional: path for search page that enabled by default (`false` to disable it)
-        searchPagePath: "search",
+      //   searchPagePath: "search",
 
-        //... other Algolia params
+      //   //... other Algolia params
-      },
+      // },
       navbar: {
         title: "Squiggle",
         hideOnScroll: true,

packages/website/package.json

@@ -15,7 +15,7 @@
     "@docusaurus/core": "2.1.0",
     "@docusaurus/preset-classic": "2.1.0",
     "@heroicons/react": "^1.0.6",
-    "@quri/squiggle-components": "^0.5.0-alpha.2",
+    "@quri/squiggle-components": "^0.5.0",
     "base64-js": "^1.5.1",
     "clsx": "^1.2.1",
     "hast-util-is-element": "2.1.2",