Merge pull request #443 from quantified-uncertainty/publish-script

`lang v0.2.8` and `components v0.2.16`
2022-04-30 13:03:47 -04:00 · 2022-04-30 13:03:47 -04:00 · dabe76fed4
commit dabe76fed4
parent e8b8b6cd80 05ec19b2a4
6 changed files with 50 additions and 34 deletions
--- a/packages/components/README.md
+++ b/packages/components/README.md
@ -1,9 +1,9 @@
 [![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)

-# Squiggle Components
+# Squiggle components

-This package contains all the components for squiggle. These can be used either as a library or hosted as a [storybook](https://storybook.js.org/).
+This package contains the react components for squiggle. These can be used either as a library or hosted as a [storybook](https://storybook.js.org/).

 # Usage in a `react` project

@ -17,7 +17,7 @@ Add to `App.js`:

 ```jsx
 import { SquiggleEditor } from "@quri/squiggle-components";
-<SquiggleEditor initialSquiggleString="x = beta(3, 10); x + 20" />;
+<SquiggleEditor initialSquiggleString="x = beta($alpha, 10); x + $shift" jsImports={alpha: 3, shift: 20} />;
 ```

 # Build storybook for development
@ -38,9 +38,3 @@ Run a development server
 ```sh
 yarn start
 ```
-
-And build artefacts for production,
-
-```sh
-yarn build  # builds storybook app
-```
--- a/packages/components/package.json
+++ b/packages/components/package.json
@ -1,13 +1,13 @@
 {
  "name": "@quri/squiggle-components",
-  "version": "0.2.15",
+  "version": "0.2.16",
  "license": "MIT",
  "dependencies": {
-    "@quri/squiggle-lang": "^0.2.7",
+    "@quri/squiggle-lang": "^0.2.8",
    "@react-hook/size": "^2.1.2",
    "lodash": "^4.17.21",
    "react": "^18.1.0",
-    "react-ace": "10.1.0",
+    "react-ace": "^10.1.0",
    "react-dom": "^18.1.0",
    "react-vega": "^7.5.0",
    "styled-components": "^5.3.5",
@ -36,7 +36,7 @@
    "@types/styled-components": "^5.1.24",
    "@types/webpack": "^5.28.0",
    "cross-env": "^7.0.3",
-    "react-scripts": "5.0.1",
+    "react-scripts": "^5.0.1",
    "style-loader": "^3.3.1",
    "ts-loader": "^9.2.9",
    "tsconfig-paths-webpack-plugin": "^3.5.2",
@ -49,11 +49,11 @@
  "scripts": {
    "start": "cross-env REACT_APP_FAST_REFRESH=false && start-storybook -p 6006 -s public",
    "build": "tsc -b && build-storybook -s public",
-    "build:package": "tsc -b",
    "bundle": "webpack",
    "all": "yarn bundle && yarn build",
    "lint": "prettier --check .",
-    "format": "prettier --write ."
+    "format": "prettier --write .",
+    "prepack": "yarn bundle && tsc -b"
  },
  "eslintConfig": {
    "extends": [
@ -87,7 +87,7 @@
    "@types/react": "17.0.43"
  },
  "source": "./src/index.ts",
-  "browser": "dist/bundle.js",
-  "main": "dist/src/index.js",
-  "types": "dist/src/index.d.ts"
+  "browser": "./dist/bundle.js",
+  "main": "./dist/src/index.js",
+  "types": "./dist/src/index.d.ts"
 }
--- a/packages/squiggle-lang/README.md
+++ b/packages/squiggle-lang/README.md
@ -3,7 +3,26 @@

 # Squiggle language

-## Build for development
+_An estimation language_
+
+# Use the `npm` package
+
+For instance, in a javascript project, you can
+
+```sh
+yarn add @quri/squiggle-lang
+```
+
+```js
+import { run } from "@quri/squiggle-lang";
+run(
+  "normal(0, 1) * fromSamples([-3,-2,-1,1,2,3,3,3,4,9]"
+).value.value.toSparkline().value;
+```
+
+**However, for most use cases you'll prefer to use our [library of react components](https://www.npmjs.com/package/@quri/squiggle-components)**, and let your app transitively depend on `@quri/squiggle-lang`.
+
+# Build for development

 We assume that you ran `yarn` at the monorepo level.

@ -23,7 +42,7 @@ yarn test
 yarn coverage:rescript; o _coverage/index.html  # produces coverage report and opens it in browser
 ```

-## Distributing this package or using this package from other monorepo packages
+# Distributing this package or using this package from other monorepo packages

 As it says in the other `packages/*/README.md`s, building this package is an essential step of building other packages.

--- a/packages/squiggle-lang/package.json
+++ b/packages/squiggle-lang/package.json
@ -1,6 +1,6 @@
 {
  "name": "@quri/squiggle-lang",
-  "version": "0.2.7",
+  "version": "0.2.8",
  "homepage": "https://squiggle-language.com",
  "license": "MIT",
  "scripts": {
@ -24,6 +24,7 @@
    "format:rescript": "rescript format -all",
    "format:prettier": "prettier --write .",
    "format": "yarn format:rescript && yarn format:prettier",
+    "prepack": "yarn build && yarn test && yarn bundle",
    "all": "yarn build && yarn bundle && yarn test"
  },
  "keywords": [
@ -35,22 +36,22 @@
    "rescript": "^9.1.4",
    "jstat": "^1.9.5",
    "pdfast": "^0.2.0",
-    "mathjs": "10.5.0"
+    "mathjs": "^10.5.0"
  },
  "devDependencies": {
    "bisect_ppx": "^2.7.1",
-    "lodash": "4.17.21",
+    "lodash": "^4.17.21",
    "rescript-fast-check": "^1.1.1",
    "@glennsl/rescript-jest": "^0.9.0",
    "@istanbuljs/nyc-config-typescript": "^1.0.2",
    "@types/jest": "^27.4.0",
    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
    "chalk": "^5.0.1",
-    "codecov": "3.8.3",
-    "fast-check": "2.25.0",
+    "codecov": "^3.8.3",
+    "fast-check": "^2.25.0",
    "gentype": "^4.3.0",
    "jest": "^27.5.1",
-    "moduleserve": "0.9.1",
+    "moduleserve": "^0.9.1",
    "nyc": "^15.1.0",
    "reanalyze": "^2.19.0",
    "ts-jest": "^27.1.4",
@ -61,6 +62,7 @@
    "webpack-cli": "^4.9.2"
  },
  "source": "./src/js/index.ts",
+  "browser": "./dist/bundle.js",
  "main": "./dist/src/js/index.js",
  "types": "./dist/src/js/index.d.ts"
 }
--- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res
+++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res
@ -199,7 +199,8 @@ let rec run = (~env, functionCallInfo: functionCallInfo): outputType => {
    ->GenericDist.mixture(~scaleMultiplyFn=scaleMultiply, ~pointwiseAddFn=pointwiseAdd)
    ->E.R2.fmap(r => Dist(r))
    ->OutputLocal.fromResult
-  | FromSamples(xs) => xs
+  | FromSamples(xs) =>
+    xs
    ->SampleSetDist.make
    ->E.R2.errMap(x => DistributionTypes.SampleSetError(x))
    ->E.R2.fmap(x => x->DistributionTypes.SampleSet->Dist)
--- a/yarn.lock
+++ b/yarn.lock
@ -6498,7 +6498,7 @@ coa@^2.0.2:
    chalk "^2.4.1"
    q "^1.1.2"

-codecov@3.8.3:
+codecov@^3.8.3:
  version "3.8.3"
  resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.8.3.tgz#9c3e364b8a700c597346ae98418d09880a3fdbe7"
  integrity sha512-Y8Hw+V3HgR7V71xWH2vQ9lyS358CbGCldWlJFR0JirqoGtOoas3R3/OclRTvgUYFK29mmJICDPauVKmpqbwhOA==
@ -8607,7 +8607,7 @@ extglob@^2.0.4:
    snapdragon "^0.8.1"
    to-regex "^3.0.1"

-fast-check@2.25.0, fast-check@^2.17.0:
+fast-check@^2.17.0, fast-check@^2.25.0:
  version "2.25.0"
  resolved "https://registry.yarnpkg.com/fast-check/-/fast-check-2.25.0.tgz#5146601851bf3be0953bd17eb2b7d547936c6561"
  integrity sha512-wRUT2KD2lAmT75WNIJIHECawoUUMHM0I5jrlLXGtGeqmPL8jl/EldUDjY1VCp6fDY8yflyfUeIOsOBrIbIiArg==
@ -11627,7 +11627,7 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0:
  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=

-lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0:
+lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0:
  version "4.17.21"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@ -11751,7 +11751,7 @@ markdown-to-jsx@^7.1.3:
  resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.1.7.tgz#a5f22102fb12241c8cea1ca6a4050bb76b23a25d"
  integrity sha512-VI3TyyHlGkO8uFle0IOibzpO1c1iJDcXcS/zBrQrXQQvJ2tpdwVzVZ7XdKsyRz1NdRmre4dqQkMZzUHaKIG/1w==

-mathjs@10.5.0:
+mathjs@^10.5.0:
  version "10.5.0"
  resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-10.5.0.tgz#f81d0518fe7b4b2a0b85e1125b8ecfc364fb0292"
  integrity sha512-gRnSY9psN9zgiB2QV9F4XbuX5hwjxY5Ou7qoTFWDbn2vZ3UEs+sjfK/SRg2WP30TNfZWpwlGdp8H1knFJnpFdA==
@ -12120,7 +12120,7 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==

-moduleserve@0.9.1:
+moduleserve@^0.9.1:
  version "0.9.1"
  resolved "https://registry.yarnpkg.com/moduleserve/-/moduleserve-0.9.1.tgz#11bad4337ea248d7eaf10d2c7f8649a8c3b9c1f8"
  integrity sha512-WF2BeGnM2Ko7bdICgJO+Ibu+ZD33ExJHzOzTDsCUzfZnvnFfheEIYBTWyIqSRU0tXh4UTQ1krDOCglFTJPBMow==
@ -14439,7 +14439,7 @@ react-ace@10.0.0:
    lodash.isequal "^4.5.0"
    prop-types "^15.7.2"

-react-ace@10.1.0:
+react-ace@^10.1.0:
  version "10.1.0"
  resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-10.1.0.tgz#d348eac2b16475231779070b6cd16768deed565f"
  integrity sha512-VkvUjZNhdYTuKOKQpMIZi7uzZZVgzCjM7cLYu6F64V0mejY8a2XTyPUIMszC6A4trbeMIHbK5fYFcT/wkP/8VA==
@ -14693,7 +14693,7 @@ react-router@6.3.0, react-router@^6.0.0:
  dependencies:
    history "^5.2.0"

-react-scripts@5.0.1:
+react-scripts@^5.0.1:
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.1.tgz#6285dbd65a8ba6e49ca8d651ce30645a6d980003"
  integrity sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==