factored into TestHelpers.ts file

.github/workflows/ci.yml

@@ -81,6 +81,7 @@ jobs:
         run: yarn coverage:rescript:ci
       - name: Upload typescript coverage report
         run: yarn coverage:ts:ci
+
   components-lint:
     name: Components lint
     runs-on: ubuntu-latest

packages/squiggle-lang/.gitignore

@@ -20,3 +20,4 @@ dist
 *.coverage
 _coverage
 coverage
+.nyc_output/

packages/squiggle-lang/__tests__/TS/Jstat_test.ts

@@ -1,19 +1,6 @@
-import {
+import { errorValueToString } from "../../src/js/index";
-  run,
-  Distribution,
-  squiggleExpression,
-  errorValueToString,
-  errorValue,
-  result,
-} from "../../src/js/index";
 import * as fc from "fast-check";
-
+import { testRun } from "./TestHelpers";
-let testRun = (x: string): any => {
-  //result<squiggleExpression, errorValue> => {
-  return run(x, { sampleCount: 1000, xyPointLength: 100 });
-};
-
-let failDefault = () => expect("codepath should never").toBe("be reached");
 
 describe("Jstat: cumulative density function", () => {
   test("of a normal distribution at 3 stdevs to the right of the mean is within epsilon of 1", () => {

packages/squiggle-lang/__tests__/TS/Parser_test.ts

@@ -4,12 +4,9 @@ import {
   errorValue,
   result,
 } from "../../src/js/index";
+import { testRun } from "./TestHelpers";
 import * as fc from "fast-check";
 
-let testRun = (x: string): result<squiggleExpression, errorValue> => {
-  return run(x, { sampleCount: 1000, xyPointLength: 100 });
-};
-
 describe("Squiggle is whitespace insensitive", () => {
   test("when assigning a distribution to a name and calling that name", () => {
     /*

packages/squiggle-lang/__tests__/TS/SampleSet_test.ts

@@ -1,19 +1,6 @@
-import {
+import { Distribution } from "../../src/js/index";
-  run,
-  Distribution,
-  squiggleExpression,
-  errorValueToString,
-  errorValue,
-  result,
-} from "../../src/js/index";
 import * as fc from "fast-check";
 
-let testRun = (x: string): result<squiggleExpression, errorValue> => {
-  return run(x, { sampleCount: 1000, xyPointLength: 100 });
-};
-
-let failDefault = () => expect("codepath should never").toBe("be reached");
-
 // Beware: float64Array makes it appear in an infinite loop.
 let arrayGen = () =>
   fc.float32Array({

packages/squiggle-lang/__tests__/TS/Scalars_test.ts

@@ -1,18 +1,7 @@
-import {
+import { errorValueToString } from "../../src/js/index";
-  run,
+import { testRun } from "./TestHelpers";
-  Distribution,
-  resultMap,
-  squiggleExpression,
-  errorValueToString,
-  errorValue,
-  result,
-} from "../../src/js/index";
 import * as fc from "fast-check";
 
-let testRun = (x: string): result<squiggleExpression, errorValue> => {
-  return run(x, { sampleCount: 100, xyPointLength: 100 });
-};
-
 describe("Scalar manipulation is well-modeled by javascript math", () => {
   test("in the case of logarithms (with assignment)", () => {
     fc.assert(

packages/squiggle-lang/__tests__/TS/Symbolic_test.ts

@@ -5,12 +5,9 @@ import {
   errorValue,
   result,
 } from "../../src/js/index";
+import { testRun } from "./TestHelpers";
 import * as fc from "fast-check";
 
-let testRun = (x: string): result<squiggleExpression, errorValue> => {
-  return run(x, { sampleCount: 100, xyPointLength: 100 });
-};
-
 describe("Symbolic mean", () => {
   let triangularInputError = {
     tag: "Error",

packages/squiggle-lang/__tests__/TS/TestHelpers.ts

@@ -0,0 +1,17 @@
+import {
+  run,
+  Distribution,
+  squiggleExpression,
+  errorValueToString,
+  errorValue,
+  result,
+} from "../../src/js/index";
+
+export function testRun(x: string): any {
+  //: result<squiggleExpression, errorValue> => {
+  return run(x, { sampleCount: 1000, xyPointLength: 100 });
+}
+
+export function failDefault() {
+  expect("be reached").toBe("codepath should never be");
+}

packages/squiggle-lang/jest.config.js

@@ -9,5 +9,6 @@ module.exports = {
     ".*Fixtures.bs.js",
     "/node_modules/",
     ".*Helpers.bs.js",
+    ".*Helpers.ts",
   ],
 };

packages/squiggle-lang/package.json

@@ -14,9 +14,9 @@
     "test:reducer": "jest __tests__/Reducer*/",
     "test:watch": "jest --watchAll",
     "coverage:rescript": "rm -f *.coverage; yarn clean; BISECT_ENABLE=yes yarn build; yarn test:rescript; bisect-ppx-report html",
-    "coverage:ts": "nyc yarn test:ts",
+    "coverage:ts": "nyc --reporter=lcov yarn test:ts",
-    "coverage:rescript:ci": "yarn clean; BISECT_ENABLE=yes yarn build; yarn test; bisect-ppx-report send-to Codecov",
+    "coverage:rescript:ci": "yarn clean; BISECT_ENABLE=yes yarn build; yarn test:rescript; bisect-ppx-report send-to Codecov",
-    "coverage:ts:ci": "nyc --reporter=lcov yarn test:ts && codecov",
+    "coverage:ts:ci": "yarn coverage:ts && codecov",
     "lint:rescript": "./lint.sh",
     "lint:prettier": "prettier --check .",
     "lint": "yarn lint:rescript && yarn lint:prettier",